SAI开项管理 - 总数据tab页中“申请状态”下拉列表单选改为多选

master/src/main/java/com/ruoyi/project/production/controller/vo/SaiApplyQueryVO.java

@@ -49,6 +49,8 @@ public class SaiApplyQueryVO extends BaseEntity {
     @Excel(name = "申请状态")
     private long applyStatus;
 
+    private String applyStatusString;
+
     /** 登记人部门 */
     @Excel(name = "登记人部门")
     private String applicantDept;
@@ -176,6 +178,14 @@ public class SaiApplyQueryVO extends BaseEntity {
     /** 备注（执行阶段） */
     private String remarksExecute;
 
+    public String getApplyStatusString() {
+        return applyStatusString;
+    }
+
+    public void setApplyStatusString(String applyStatusString) {
+        this.applyStatusString = applyStatusString;
+    }
+
     public Long[] getIds() {
         return ids;
     }

master/src/main/java/com/ruoyi/project/production/domain/TSaiApply.java

@@ -37,6 +37,7 @@ public class TSaiApply extends BaseEntity
     /** 申请状态 */
     @Excel(name = "申请状态")
     private long applyStatus;
+    private String applyStatusString;
 
     /** 登记人部门 */
     @Excel(name = "登记人部门")
@@ -149,6 +150,14 @@ public class TSaiApply extends BaseEntity
     /** 备注（执行阶段） */
     private String remarksExecute;
 
+    public String getApplyStatusString() {
+        return applyStatusString;
+    }
+
+    public void setApplyStatusString(String applyStatusString) {
+        this.applyStatusString = applyStatusString;
+    }
+
     public String getWorkArea() {
         return workArea;
     }

master/src/main/resources/mybatis/production/TSaiApplyMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="deptId"    column="dept_id"    />
         <result property="applyStatus"    column="apply_status"    />
+        <result property="applyStatusString"    column="apply_status_string"    />
         <result property="apNo"    column="ap_no"    />
         <result property="processId"    column="process_id"    />
         <result property="applicant"    column="applicant"    />
@@ -81,6 +82,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="saiApplyId != null "> and sai_apply_id = #{saiApplyId}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="applyStatus != null  and applyStatus != ''"> and apply_status = #{applyStatus}</if>
+            <if test="applyStatusString != null  and applyStatusString != ''">
+                and
+                apply_status in
+                <foreach collection="applyStatusString.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="apNo != null  and apNo != ''"> and ap_no = #{apNo}</if>
             <if test="processId != null  and processId != ''"> and process_id = #{processId}</if>
             <if test="applicant != null  and applicant != ''"> and applicant = #{applicant}</if>

ui/src/views/production/apply/all/index.vue

@@ -53,7 +53,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="申请状态" prop="applyStatus">
-        <el-select v-model="queryParams.applyStatus" placeholder="请选择申请状态">
+        <el-select v-model="applyStatusString" placeholder="请选择申请状态" multiple>
           <el-option
             v-for="dict in applyStatusOptions"
             :key="dict.dictValue"
@@ -938,6 +938,7 @@ export default {
         applyDateEnd: null,
         estimateFinishDateStart: null,
         estimateFinishDateEnd: null,
+        applyStatusString: [],
       },
       // 表单参数
       form: {},
@@ -1013,6 +1014,7 @@ export default {
       // 是否禁用班组下拉框
       applicantTeamDisabled: false,
       workAreaList: [],
+      applyStatusString: [],
     };
   },
   watch: {
@@ -1458,6 +1460,7 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.tab = 3;
+      this.queryParams.applyStatusString = this.applyStatusString.join()
       if (this.queryParams.workArea != null && this.queryParams.workArea != "") {
         this.queryParams.workArea = this.queryParams.workArea.join();
       } else {
@@ -1550,6 +1553,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.applyStatusString = [];
       this.handleQuery();
     },
     // 多选框选中数据