优化巡检功能完成

java110-bean/src/main/java/com/java110/vo/api/inspectionTask/ApiInspectionTaskDataVo.java

@@ -29,6 +29,9 @@ public class ApiInspectionTaskDataVo implements Serializable {
     private String transferDesc;
     private String taskType;
 
+    private String inspectionRouteId;
+
+
 
     public String getPlanUserId() {
         return planUserId;
@@ -213,4 +216,12 @@ public class ApiInspectionTaskDataVo implements Serializable {
     public void setTaskType(String taskType) {
         this.taskType = taskType;
     }
+
+    public String getInspectionRouteId() {
+        return inspectionRouteId;
+    }
+
+    public void setInspectionRouteId(String inspectionRouteId) {
+        this.inspectionRouteId = inspectionRouteId;
+    }
 }

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

@@ -34,6 +34,12 @@
         <if test="inspectionPlanId !=null and inspectionPlanId != ''">
             and t.inspection_plan_id= #{inspectionPlanId}
         </if>
+        <if test="inspectionPlanIds !=null ">
+            and t.inspection_plan_id in
+            <foreach collection="inspectionPlanIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="endTime !=null and endTime != ''">
             and t.end_time= #{endTime}
         </if>
@@ -100,6 +106,12 @@
         <if test="inspectionPlanId !=null and inspectionPlanId != ''">
             and t.inspection_plan_id= #{inspectionPlanId}
         </if>
+        <if test="inspectionPlanIds !=null ">
+            and t.inspection_plan_id in
+            <foreach collection="inspectionPlanIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="endTime !=null and endTime != ''">
             and t.end_time= #{endTime}
         </if>

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

@@ -127,7 +127,8 @@
         actUserId,t.task_id,t.task_id taskId,t.state,td1.name signTypeName,td2.name stateName,ip.inspection_plan_name
         inspectionPlanName,t.original_plan_user_id,t.original_plan_user_id
         originalPlanUserId,t.original_plan_user_name,t.original_plan_user_name originalPlanUserName,
-        t.transfer_desc,t.transfer_desc transferDesc,t.task_type,t.task_type taskType
+        t.transfer_desc,t.transfer_desc transferDesc,t.task_type,t.task_type taskType,
+        ip.inspection_route_id inspectionRouteId
         from inspection_task t,inspection_plan ip,t_dict td1,t_dict td2
         where 1 =1
         and t.sign_type = td1.status_cd

service-community/src/main/java/com/java110/community/cmd/inspectionPlanStaff/ListInspectionPlanStaffsCmd.java

@@ -1,4 +1,4 @@
-package com.java110.community.cmd.inspectionPlanStaff;
+package com.java110.community.cmd.inspection;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
@@ -8,6 +8,7 @@ import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.inspection.InspectionPlanStaffDto;
 import com.java110.intf.community.IInspectionPlanStaffInnerServiceSMO;
 import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.inspectionPlanStaff.ApiInspectionPlanStaffDataVo;
 import com.java110.vo.api.inspectionPlanStaff.ApiInspectionPlanStaffVo;
@@ -18,7 +19,7 @@ import org.springframework.http.ResponseEntity;
 import java.util.ArrayList;
 import java.util.List;
 
-@Java110Cmd(serviceCode = "inspectionPlanStaff.listInspectionPlanStaffs")
+@Java110Cmd(serviceCode = "inspection.listInspectionPlanStaffs")
 public class ListInspectionPlanStaffsCmd extends Cmd {
 
 
@@ -28,6 +29,8 @@ public class ListInspectionPlanStaffsCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区信息不能为空");
+
     }
 
     @Override

service-community/src/main/java/com/java110/community/cmd/inspectionPlan/ListInspectionPlansCmd.java

@@ -6,14 +6,18 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.inspection.InspectionPlanDto;
+import com.java110.dto.inspection.InspectionPlanStaffDto;
 import com.java110.dto.inspection.InspectionRouteDto;
 import com.java110.dto.org.OrgStaffRelDto;
+import com.java110.intf.community.IInspectionPlanStaffV1InnerServiceSMO;
 import com.java110.intf.community.IInspectionPlanV1InnerServiceSMO;
 import com.java110.intf.community.IInspectionRouteInnerServiceSMO;
 import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
+import com.java110.vo.ResultVo;
 import com.java110.vo.api.inspectionPlan.ApiInspectionPlanDataVo;
 import com.java110.vo.api.inspectionPlan.ApiInspectionPlanVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +40,9 @@ public class ListInspectionPlansCmd extends Cmd {
     @Autowired
     private IInspectionRouteInnerServiceSMO inspectionRouteInnerServiceSMOImpl;
 
+    @Autowired
+    private IInspectionPlanStaffV1InnerServiceSMO inspectionPlanStaffV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         super.validatePageInfo(reqJson);
@@ -48,22 +55,57 @@ public class ListInspectionPlansCmd extends Cmd {
 
         int count = inspectionPlanV1InnerServiceSMOImpl.queryInspectionPlansCount(inspectionPlanDto);
 
-        List<ApiInspectionPlanDataVo> inspectionPlans = null;
-
+        List<InspectionPlanDto> inspectionPlans = null;
         if (count > 0) {
-            inspectionPlans = BeanConvertUtil.covertBeanList(inspectionPlanV1InnerServiceSMOImpl.queryInspectionPlans(inspectionPlanDto), ApiInspectionPlanDataVo.class);
+            inspectionPlans = BeanConvertUtil.covertBeanList(inspectionPlanV1InnerServiceSMOImpl.queryInspectionPlans(inspectionPlanDto), InspectionPlanDto.class);
+            queryStaffs(inspectionPlans);
         } else {
             inspectionPlans = new ArrayList<>();
         }
 
-        ApiInspectionPlanVo apiInspectionPlanVo = new ApiInspectionPlanVo();
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, inspectionPlans);
 
-        apiInspectionPlanVo.setTotal(count);
-        apiInspectionPlanVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
-        apiInspectionPlanVo.setInspectionPlans(inspectionPlans);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionPlanVo), HttpStatus.OK);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
     }
+
+    /**
+     * 查询员工
+     *
+     * @param inspectionPlans
+     */
+    private void queryStaffs(List<InspectionPlanDto> inspectionPlans) {
+
+        if (ListUtil.isNull(inspectionPlans)) {
+            return;
+        }
+
+        List<String> planIds = new ArrayList<>();
+
+        for (InspectionPlanDto inspectionPlanDto : inspectionPlans) {
+            planIds.add(inspectionPlanDto.getInspectionPlanId());
+        }
+
+        InspectionPlanStaffDto inspectionPlanStaffDto = new InspectionPlanStaffDto();
+        inspectionPlanStaffDto.setInspectionPlanIds(planIds.toArray(new String[planIds.size()]));
+        inspectionPlanStaffDto.setCommunityId(inspectionPlans.get(0).getCommunityId());
+        List<InspectionPlanStaffDto> inspectionPlanStaffDtos = inspectionPlanStaffV1InnerServiceSMOImpl.queryInspectionPlanStaffs(inspectionPlanStaffDto);
+
+        if (ListUtil.isNull(inspectionPlanStaffDtos)) {
+            return;
+        }
+
+        List<InspectionPlanStaffDto> staffDtos = null;
+        for (InspectionPlanDto inspectionPlanDto : inspectionPlans) {
+            staffDtos = new ArrayList<>();
+            for (InspectionPlanStaffDto tmpInspectionPlanStaffDto : inspectionPlanStaffDtos) {
+                if (inspectionPlanDto.getInspectionPlanId().equals(tmpInspectionPlanStaffDto.getInspectionPlanId())) {
+                    staffDtos.add(tmpInspectionPlanStaffDto);
+                }
+            }
+            inspectionPlanDto.setStaffs(staffDtos);
+        }
+
+    }
 }

service-community/src/main/java/com/java110/community/dao/impl/InspectionPlanStaffV1ServiceDaoImpl.java

@@ -71,9 +71,9 @@ public class InspectionPlanStaffV1ServiceDaoImpl extends BaseServiceDao implemen
     public List<Map> getInspectionPlanStaffInfo(Map info) throws DAOException {
         logger.debug("查询 getInspectionPlanStaffInfo 入参 info : {}",info);
 
-        List<Map> businessInspectionPlanStaffInfos = sqlSessionTemplate.selectList("inspectionPlanStaffV1ServiceDaoImpl.getInspectionPlanStaffInfo",info);
+        List<Map> infos = sqlSessionTemplate.selectList("inspectionPlanStaffV1ServiceDaoImpl.getInspectionPlanStaffInfo",info);
 
-        return businessInspectionPlanStaffInfos;
+        return infos;
     }