建言献策

src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxQueryController.java

@@ -53,7 +53,12 @@ public class SuggestionBoxQueryController {
 
     @At
     @SaCheckPermission(value = {"suggestionBox.query", "h5.suggestionBox.query"}, mode = SaMode.OR)
-    public Result pageData(Integer pageNumber, Integer pageSize, String searchKeyword, Integer year) {
+    public Result pageData(Integer pageNumber,
+                           Integer pageSize,
+                           String searchKeyword,
+                           String unionId,
+                           String unitId,
+                           Integer year) {
         Sql sql = Sqls.create("""
                 SELECT
                   info.id,
@@ -91,6 +96,11 @@ public class SuggestionBoxQueryController {
         if (StrUtil.isNotBlank(searchKeyword)) {
             cnd.where().andLike("info.title", searchKeyword);
         }
+        // 工会、单位名称查询条件
+        cnd.andEX("unionId", "=", unionId);
+        cnd.andEX("unitId", "=", unitId);
+        // 只查询流程实例状态为20的数据（已完成状态）
+        cnd.and("ins.state", "=", 20);
         cnd.desc("info.submitTime");
         sql.setCondition(cnd);
         Pagination<NutMap> pagination = suggestionBoxService.listPageMap(pageNumber, pageSize, sql);

src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
@@ -51,7 +52,13 @@ public class SuggestionXghController {
 
     @At
     @SaCheckPermission(value = {"suggestionBox.xgh", "h5.suggestionBox.xgh"}, mode = SaMode.OR)
-    public Result pageData(PageForm pageForm, String taskId, String searchKeyword, Integer year, boolean approval) {
+    public Result pageData(PageForm pageForm,
+                           String taskId,
+                           String searchKeyword,
+                           Integer year,
+                           String unionId,
+                           String unitId,
+                           boolean approval) {
         Sql sql = Sqls.create("""
                 SELECT
                   info.id,
@@ -102,6 +109,10 @@ public class SuggestionXghController {
             cnd.where().andLike("info.title", searchKeyword);
         }
 
+        // 工会、单位名称查询条件
+        cnd.andEX("unionId", "=", unionId);
+        cnd.andEX("unitId", "=", unitId);
+
         if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
             cnd.desc("info.submitTime");
         } else {

src/main/resources/views/platform/zhgh/democratic/suggestionBox/mine/index.html

@@ -21,8 +21,8 @@ layout("/layouts/platform.html"){
                 <el-table-column prop="title" label="标题"></el-table-column>
                 <el-table-column prop="loginName" label="工号"></el-table-column>
                 <el-table-column prop="userName" label="姓名"></el-table-column>
-                <el-table-column prop="unitName" label="单位"></el-table-column>
+                <el-table-column prop="unionName" label="所属工会"></el-table-column>
-                <el-table-column prop="unionName" label="工会"></el-table-column>
+                <el-table-column prop="unitName" label="所属单位"></el-table-column>
                 <el-table-column prop="taskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
                     <template slot-scope="{row}">

src/main/resources/views/platform/zhgh/democratic/suggestionBox/query/index.html

@@ -12,17 +12,37 @@ layout("/layouts/platform.html"){
                 <search-item label="标题">
                     <el-input v-model="pageForm.title" placeholder="标题" clearable></el-input>
                 </search-item>
+                <search-item label="分工会">
+                    <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
+                               placeholder="请选择分工会" clearable>
+                        <el-option v-for="item in unionOptions"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="单位">
+                    <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
+                               placeholder="请选择单位" clearable>
+                        <el-option v-for="item in unitOptions"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
             </search>
         </el-card>
         <el-card shadow="never">
             <table-tool></table-tool>
             <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
                 <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
-                <el-table-column prop="title" label="投稿标题"></el-table-column>
+                <el-table-column prop="title" label="标题"></el-table-column>
-                <el-table-column prop="loginName" label="投稿人工号"></el-table-column>
+                <el-table-column prop="loginName" label="工号"></el-table-column>
-                <el-table-column prop="userName" label="投稿人姓名"></el-table-column>
+                <el-table-column prop="userName" label="姓名"></el-table-column>
-                <el-table-column prop="unitName" label="投稿人单位"></el-table-column>
+                <el-table-column prop="unionName" label="所属工会"></el-table-column>
-                <el-table-column prop="unionName" label="投稿人工会"></el-table-column>
+                <el-table-column prop="unitName" label="所属单位"></el-table-column>
 <!--                <el-table-column prop="submitTime" label="投稿时间"></el-table-column>-->
                 <el-table-column prop="taskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
@@ -58,7 +78,10 @@ layout("/layouts/platform.html"){
             "suggestion-info": SUGGESTION_INFO
         },
         data() {
-            return {}
+            return {
+                unionOptions: [],
+                unitOptions: [],
+            }
         },
         methods: {
             openView(row) {
@@ -101,6 +124,10 @@ layout("/layouts/platform.html"){
         },
         created() {
             this.pageData()
+            //工会查询
+            this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            //单位查询
+            this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
         }
     })
 </script>

src/main/resources/views/platform/zhgh/democratic/suggestionBox/xgh/index.html

@@ -12,6 +12,26 @@ layout("/layouts/platform.html"){
                 <search-item label="标题">
                     <el-input v-model="pageForm.title" placeholder="标题" clearable></el-input>
                 </search-item>
+                <search-item label="分工会">
+                    <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
+                               placeholder="请选择分工会" clearable>
+                        <el-option v-for="item in unionOptions"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="单位">
+                    <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
+                               placeholder="请选择单位" clearable>
+                        <el-option v-for="item in unitOptions"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
             </search>
         </el-card>
         <el-card shadow="never">
@@ -23,11 +43,11 @@ layout("/layouts/platform.html"){
             </table-tool>
             <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
                 <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
-                <el-table-column prop="title" label="投稿标题"></el-table-column>
+                <el-table-column prop="title" label="标题"></el-table-column>
-                <el-table-column prop="loginName" label="投稿人工号"></el-table-column>
+                <el-table-column prop="loginName" label="工号"></el-table-column>
-                <el-table-column prop="userName" label="投稿人姓名"></el-table-column>
+                <el-table-column prop="userName" label="姓名"></el-table-column>
-                <el-table-column prop="unitName" label="投稿人单位"></el-table-column>
+                <el-table-column prop="unionName" label="所属工会"></el-table-column>
-                <el-table-column prop="unionName" label="投稿人工会"></el-table-column>
+                <el-table-column prop="unitName" label="所属单位"></el-table-column>
                 <!--                <el-table-column prop="submitTime" label="投稿时间"></el-table-column>-->
                 <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
@@ -90,6 +110,8 @@ layout("/layouts/platform.html"){
                 pageForm: {
                     approval: false
                 },
+                unionOptions: [],
+                unitOptions: [],
                 formData: {},
                 showApprovalForm: false
             }
@@ -150,6 +172,10 @@ layout("/layouts/platform.html"){
         },
         created() {
             this.pageData()
+            //工会查询
+            this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            //单位查询
+            this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
         }
     })
 </script>