巡检任务明细开发完成

CommunityService/src/main/java/com/java110/community/dao/IInspectionServiceDao.java

@@ -62,6 +62,7 @@ public interface IInspectionServiceDao {
 
 
 
+
     /**
      * 修改巡检点信息
      * @param info 修改信息
@@ -92,4 +93,14 @@ public interface IInspectionServiceDao {
      */
     public List<Map> getInspectionRelationShipInfo(Map info) throws DAOException ;
 
+
+    /**
+     * 查询巡检点信息（instance过程）
+     * 根据bId 查询巡检点信息
+     * @param info bId 信息
+     * @return 巡检点信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> queryInspectionsByPlan(Map info) throws DAOException;
+
 }

CommunityService/src/main/java/com/java110/community/dao/IInspectionTaskServiceDao.java

@@ -90,4 +90,10 @@ public interface IInspectionTaskServiceDao {
      */
      int insertInspectionTask(Map info);
 
+    /**
+     * 生成巡检任务明细信息
+     * @return
+     */
+    int insertInspectionTaskDetail(Map info);
+
 }

CommunityService/src/main/java/com/java110/community/dao/impl/InspectionServiceDaoImpl.java

@@ -157,5 +157,21 @@ public class InspectionServiceDaoImpl extends BaseServiceDao implements IInspect
         return businessInspectionInfos;
     }
 
+    /**
+     * 查询巡检点信息（instance过程）
+     * 根据bId 查询巡检点信息
+     * @param info bId 信息
+     * @return 巡检点信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> queryInspectionsByPlan(Map info) throws DAOException{
+        logger.debug("查询巡检点信息 入参 info : {}",info);
+
+        List<Map> businessInspectionInfos = sqlSessionTemplate.selectList("inspectionServiceDaoImpl.queryInspectionsByPlan",info);
+
+        return businessInspectionInfos;
+    }
+
 
 }

CommunityService/src/main/java/com/java110/community/dao/impl/InspectionTaskServiceDaoImpl.java

@@ -152,5 +152,14 @@ public class InspectionTaskServiceDaoImpl extends BaseServiceDao implements IIns
         return sqlSessionTemplate.update("inspectionTaskServiceDaoImpl.insertInspectionTask", info);
     }
 
+    /**
+     * 生成巡检任务明细信息
+     * @return
+     */
+    public int insertInspectionTaskDetail(Map info){
+        logger.debug("插入 巡检任务明细 入参 info : {}", info);
+
+        return sqlSessionTemplate.update("inspectionTaskServiceDaoImpl.insertInspectionTaskDetail", info);
+    }
 
 }

CommunityService/src/main/java/com/java110/community/smo/impl/InspectionInnerServiceSMOImpl.java

@@ -11,6 +11,8 @@ import com.java110.dto.PageDto;
 import com.java110.dto.user.UserDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -75,6 +77,12 @@ public class InspectionInnerServiceSMOImpl extends BaseServiceSMO implements IIn
     public int queryInspectionsRelationShipCount(@RequestBody InspectionDto inspectionDto) {
         return inspectionServiceDaoImpl.queryInspectionsRelationShipCount(BeanConvertUtil.beanCovertMap(inspectionDto));    }
 
+    @RequestMapping(value = "/queryInspectionsByPlan", method = RequestMethod.POST)
+    public List<InspectionDto> queryInspectionsByPlan(@RequestBody InspectionDto inspectionDto){
+        List<InspectionDto> inspections = BeanConvertUtil.covertBeanList(inspectionServiceDaoImpl.queryInspectionsByPlan(BeanConvertUtil.beanCovertMap(inspectionDto)), InspectionDto.class);
+        return inspections;
+    }
+
     public IInspectionServiceDao getInspectionServiceDaoImpl() {
         return inspectionServiceDaoImpl;
     }

CommunityService/src/main/java/com/java110/community/smo/impl/InspectionTaskInnerServiceSMOImpl.java

@@ -5,9 +5,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.community.dao.IInspectionTaskServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.smo.inspectionPoint.IInspectionInnerServiceSMO;
 import com.java110.core.smo.inspectionTask.IInspectionTaskInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
+import com.java110.dto.inspectionPoint.InspectionDto;
 import com.java110.dto.inspectionTask.InspectionTaskDto;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -15,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -34,6 +37,9 @@ public class InspectionTaskInnerServiceSMOImpl extends BaseServiceSMO implements
     @Autowired
     private IInspectionTaskServiceDao inspectionTaskServiceDaoImpl;
 
+    @Autowired
+    private IInspectionInnerServiceSMO inspectionInnerServiceSMOImpl;
+
     @Autowired
     private IUserInnerServiceSMO userInnerServiceSMOImpl;
 
@@ -73,11 +79,27 @@ public class InspectionTaskInnerServiceSMOImpl extends BaseServiceSMO implements
         param.put("inspectionPlanPeriod", "2020022");
         List<Map> inspectPlans = inspectionTaskServiceDaoImpl.queryTodayInspectionPlan(param);
         Map taskParam = new HashMap();
+        List<Map> taskDetails = new ArrayList<>();
+        Map taskDetailInfo = null;
+        InspectionDto inspectionDto = null;
         //#{task.planUserId},#{task.planInsTime},#{task.signType},#{task.inspectionPlanId},#{task.planUserName},#{task.communityId},'-1',#{task.taskId}
         if (inspectPlans != null && inspectPlans.size() > 0) {
             for (Map inspectPlan : inspectPlans) {
                 inspectPlan.put("planInsTime", new Date());
                 inspectPlan.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
+                inspectionDto = new InspectionDto();
+                inspectionDto.setCommunityId(inspectPlan.get("communityId") + "");
+                inspectionDto.setInspectionPlanId(inspectPlan.get("inspectionPlanId") + "");
+                List<InspectionDto> inspectionDtos = inspectionInnerServiceSMOImpl.queryInspectionsByPlan(inspectionDto);
+                for (InspectionDto tmpInspection : inspectionDtos) {
+                    taskDetailInfo = new HashMap();
+                    taskDetailInfo.put("taskId", inspectPlan.get("taskId"));
+                    taskDetailInfo.put("taskDetailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskDetailId));
+                    taskDetailInfo.put("inspectionId", tmpInspection.getInspectionId());
+                    taskDetailInfo.put("inspectionName", tmpInspection.getInspectionName());
+                    taskDetailInfo.put("state", "20200405");
+                    taskDetails.add(taskDetailInfo);
+                }
             }
             taskParam.put("tasks", inspectPlans);
             inspectionTaskServiceDaoImpl.insertInspectionTask(taskParam);
@@ -90,6 +112,19 @@ public class InspectionTaskInnerServiceSMOImpl extends BaseServiceSMO implements
             for (Map inspectPlan : inspectPlans) {
                 inspectPlan.put("planInsTime", new Date());
                 inspectPlan.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
+                inspectionDto = new InspectionDto();
+                inspectionDto.setCommunityId(inspectPlan.get("communityId") + "");
+                inspectionDto.setInspectionPlanId(inspectPlan.get("inspectionPlanId") + "");
+                List<InspectionDto> inspectionDtos = inspectionInnerServiceSMOImpl.queryInspectionsByPlan(inspectionDto);
+                for (InspectionDto tmpInspection : inspectionDtos) {
+                    taskDetailInfo = new HashMap();
+                    taskDetailInfo.put("taskId", inspectPlan.get("taskId"));
+                    taskDetailInfo.put("taskDetailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskDetailId));
+                    taskDetailInfo.put("inspectionId", tmpInspection.getInspectionId());
+                    taskDetailInfo.put("inspectionName", tmpInspection.getInspectionName());
+                    taskDetailInfo.put("state", "20200405");
+                    taskDetails.add(taskDetailInfo);
+                }
             }
             taskParam.put("tasks", inspectPlans);
             inspectionTaskServiceDaoImpl.insertInspectionTask(taskParam);
@@ -101,11 +136,29 @@ public class InspectionTaskInnerServiceSMOImpl extends BaseServiceSMO implements
             for (Map inspectPlan : inspectPlans) {
                 inspectPlan.put("planInsTime", new Date());
                 inspectPlan.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
+                inspectionDto = new InspectionDto();
+                inspectionDto.setCommunityId(inspectPlan.get("communityId") + "");
+                inspectionDto.setInspectionPlanId(inspectPlan.get("inspectionPlanId") + "");
+                List<InspectionDto> inspectionDtos = inspectionInnerServiceSMOImpl.queryInspectionsByPlan(inspectionDto);
+                for (InspectionDto tmpInspection : inspectionDtos) {
+                    taskDetailInfo = new HashMap();
+                    taskDetailInfo.put("taskId", inspectPlan.get("taskId"));
+                    taskDetailInfo.put("taskDetailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskDetailId));
+                    taskDetailInfo.put("inspectionId", tmpInspection.getInspectionId());
+                    taskDetailInfo.put("inspectionName", tmpInspection.getInspectionName());
+                    taskDetailInfo.put("state", "20200405");
+                    taskDetails.add(taskDetailInfo);
+                }
             }
             taskParam.put("tasks", inspectPlans);
             inspectionTaskServiceDaoImpl.insertInspectionTask(taskParam);
         }
 
+        if (taskDetails != null && taskDetails.size() > 0) {
+            Map taskDetailParam = new HashMap();
+            taskDetailParam.put("tasks", taskDetails);
+            inspectionTaskServiceDaoImpl.insertInspectionTaskDetail(taskParam);
+        }
 
         return param;
 

java110-bean/src/main/java/com/java110/dto/inspectionPoint/InspectionDto.java

@@ -28,6 +28,7 @@ public class InspectionDto extends PageDto implements Serializable {
     private String communityId;
     private String inspectionRouteId;
     private String relationship; //1 查询关联的巡检点 0 还未关联巡检点
+    private String inspectionPlanId;
 
 
     private Date createTime;
@@ -156,4 +157,12 @@ public class InspectionDto extends PageDto implements Serializable {
     public void setRelationship(String relationship) {
         this.relationship = relationship;
     }
+
+    public String getInspectionPlanId() {
+        return inspectionPlanId;
+    }
+
+    public void setInspectionPlanId(String inspectionPlanId) {
+        this.inspectionPlanId = inspectionPlanId;
+    }
 }

java110-core/src/main/java/com/java110/core/smo/inspectionPoint/IInspectionInnerServiceSMO.java

@@ -47,4 +47,7 @@ public interface IInspectionInnerServiceSMO {
 
     @RequestMapping(value = "/queryInspectionsRelationShipCount", method = RequestMethod.POST)
     public int queryInspectionsRelationShipCount(@RequestBody InspectionDto inspectionDto);
+
+    @RequestMapping(value = "/queryInspectionsByPlan", method = RequestMethod.POST)
+    List<InspectionDto> queryInspectionsByPlan(@RequestBody InspectionDto inspectionDto);
 }

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

@@ -276,4 +276,52 @@
         </if>
     </select>
 
+
+
+    <!-- 查询巡检点信息 add by wuxw 2018-07-03 -->
+    <select id="queryInspectionsByPlan" parameterType="Map" resultType="Map">
+        select
+        t.inspection_id,t.inspection_id inspectionId,t.machine_id,
+        t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,
+        t.inspection_name,t.inspection_name inspectionName,t.community_id,
+        t.community_id communityId,t.b_id,t.b_id bId,
+        m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
+        locationObjId,m.machine_id machineId,
+        d.name locationTypeName
+        from inspection_point t,machine m,t_dict d,inspection_route_point_rel c,inspection_plan ip
+        where 1 =1
+        and t.machine_id = m.machine_id
+        and m.status_cd = 0
+        and d.status_cd = m.location_type_cd
+        and d.table_name = 'machine'
+        and d.table_columns = 'location_type_cd'
+        and t.inspection_id = c.inspection_id
+        and c.status_cd = '0'
+        and c.inspection_route_id = ip.inspection_route_id
+        and ip.inspection_plan_id = #{inspectionPlanId}
+        <if test="inspectionId !=null and inspectionId != ''">
+            and t.inspection_id= #{inspectionId}
+        </if>
+        <if test="machineCode !=null and machineCode != ''">
+            and m.machine_code= #{machineCode}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="inspectionName !=null and inspectionName != ''">
+            and t.inspection_name like concat('%',#{inspectionName},'%')
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        group by t.inspection_id
+        order by t.create_time desc
+    </select>
+
 </mapper>

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

@@ -287,6 +287,7 @@
         ip.staff_name planUserName
         FROM
         inspection_plan ip
+        inner join
         LEFT JOIN inspection_task it ON ip.inspection_plan_id = it.inspection_plan_id
         AND ip.staff_id = it.plan_user_id
         AND it.status_cd = '0'
@@ -320,4 +321,16 @@
         </foreach>
     </insert>
 
+    <!-- 保存活动信息 add by wuxw 2018-07-03 -->
+    <insert id="insertInspectionTaskDetail" parameterType="Map">
+        insert into inspection_task_detail(
+        task_detail_id,b_id,community_id,task_id,inspection_id,inspection_name,state
+        )
+        <foreach collection="tasks" item="task" separator=",">
+            (#{task.taskDetailId},'-1',#{task.communityId},#{task.taskId},#{task.inspectionId},#{task.inspectionName},'20200405')
+        </foreach>
+    </insert>
+
+
+
 </mapper>

java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java

@@ -933,6 +933,7 @@ public class BusinessTypeConstant {
      *  3保存
      */
     public static final String BUSINESS_TYPE_UPDATE_INSPECTION_TASK_DETAIL="540200040001";
+
     public static final String BUSINESS_TYPE_DELETE_INSPECTION_TASK_DETAIL="540200050001";