优化巡检

java110-bean/src/main/java/com/java110/dto/inspectionTask/InspectionTaskDto.java

@@ -31,6 +31,7 @@ public class InspectionTaskDto extends PageDto implements Serializable {
     private String stateName;
     private Date scopeTime;
     private String ipStaffId;
+    private String[] states;
 
 
     private Date createTime;
@@ -181,4 +182,12 @@ public class InspectionTaskDto extends PageDto implements Serializable {
     public void setIpStaffId(String ipStaffId) {
         this.ipStaffId = ipStaffId;
     }
+
+    public String[] getStates() {
+        return states;
+    }
+
+    public void setStates(String[] states) {
+        this.states = states;
+    }
 }

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

@@ -171,6 +171,12 @@
         <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>
         <if test="scopeTime !=null ">
             and t.create_time &lt; #{scopeTime}
             and t.create_time &gt; #{createTime}
@@ -278,6 +284,15 @@
         <if test="taskId !=null and taskId != ''">
             and t.task_id= #{taskId}
         </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-api/src/main/java/com/java110/api/listener/inspectionTask/ListInspectionTasksListener.java

@@ -4,9 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
-import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
-import com.java110.dto.inspectionTask.InspectionTaskDto;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.dto.inspectionTask.InspectionTaskDto;
+import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
 import com.java110.utils.constant.ServiceCodeInspectionTaskConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -66,6 +66,10 @@ public class ListInspectionTasksListener extends AbstractServiceApiListener {
 
         InspectionTaskDto inspectionTaskDto = BeanConvertUtil.covertBean(reqJson, InspectionTaskDto.class);
 
+        if (reqJson.containsKey("moreState") && reqJson.getString("moreState").contains(",")) {
+            inspectionTaskDto.setStates(reqJson.getString("moreState").split(","));
+        }
+
         int count = inspectionTaskInnerServiceSMOImpl.queryInspectionTasksCount(inspectionTaskDto);
 
         List<ApiInspectionTaskDataVo> inspectionTasks = null;

service-api/src/main/java/com/java110/api/listener/inspectionTaskDetail/UpdateInspectionTaskDetailListener.java

@@ -93,22 +93,22 @@ public class UpdateInspectionTaskDetailListener extends AbstractServiceApiPlusLi
             reqJson.put("state", "20200406");
             inspectionTaskBMOImpl.updateInspectionTask(reqJson, context);
         }
-        ResponseEntity<String> responseEntity = inspectionTaskDetailBMOImpl.callService(context, service.getServiceCode(), businesses);
-        context.setResponseEntity(responseEntity);
+        super.commit(context);
+        ResponseEntity<String> responseEntity = context.getResponseEntity();
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             return;
         }
 
 
         //判断 巡检点是否都有巡检完
-        if (inspectionTaskDtos == null || inspectionTaskDtos.size() == 0) {
-            return;
-        }
+//        if (inspectionTaskDtos == null || inspectionTaskDtos.size() == 0) {
+//            return;
+//        }
 
         InspectionTaskDetailDto inspectionTaskDetailDto = new InspectionTaskDetailDto();
         inspectionTaskDetailDto.setCommunityId(reqJson.getString("communityId"));
         inspectionTaskDetailDto.setTaskId(reqJson.getString("taskId"));
-        inspectionTaskDetailDto.setState("20200407");
+        inspectionTaskDetailDto.setState("20200405");
         int count = inspectionTaskDetailInnerServiceSMOImpl.queryInspectionTaskDetailsCount(inspectionTaskDetailDto);
 
         if (count > 0) {//说明还没有巡检完
@@ -117,8 +117,7 @@ public class UpdateInspectionTaskDetailListener extends AbstractServiceApiPlusLi
         businesses = new JSONArray();
         reqJson.put("state", "20200407");//巡检完成
         inspectionTaskBMOImpl.updateInspectionTask(reqJson, context);
-        responseEntity = inspectionTaskDetailBMOImpl.callService(context, service.getServiceCode(), businesses);
-        context.setResponseEntity(responseEntity);
+
     }