保养任务 根据状态查询

java110-bean/src/main/java/com/java110/dto/maintainanceTask/MaintainanceTaskDto.java

@@ -39,6 +39,7 @@ public class MaintainanceTaskDto extends PageDto implements Serializable {
     private String taskId;
     private String mpsId;
     private String state;
+    private String[] states;
     private String stateName;
 
 
@@ -215,4 +216,12 @@ public class MaintainanceTaskDto extends PageDto implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String[] getStates() {
+        return states;
+    }
+
+    public void setStates(String[] states) {
+        this.states = states;
+    }
 }

java110-db/src/main/resources/mapper/community/MaintainanceTaskV1ServiceDaoImplMapper.xml

@@ -81,6 +81,15 @@
         <if test="mpsId !=null and mpsId != ''">
             and t.mps_id= #{mpsId}
         </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="states !=null ">
+            and t.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -203,6 +212,15 @@
         <if test="mpsId !=null and mpsId != ''">
             and t.mps_id= #{mpsId}
         </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="states !=null ">
+            and t.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
 
     </select>

service-community/src/main/java/com/java110/community/cmd/maintainanceTask/ListMaintainanceTaskCmd.java

@@ -65,8 +65,13 @@ public class ListMaintainanceTaskCmd extends Cmd {
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
+
+
            MaintainanceTaskDto maintainanceTaskDto = BeanConvertUtil.covertBean(reqJson, MaintainanceTaskDto.class);
 
+        if (reqJson.containsKey("moreState") && reqJson.getString("moreState").contains(",")) {
+            maintainanceTaskDto.setStates(reqJson.getString("moreState").split(","));
+        }
            int count = maintainanceTaskV1InnerServiceSMOImpl.queryMaintainanceTasksCount(maintainanceTaskDto);
 
            List<MaintainanceTaskDto> maintainanceTaskDtos = null;