优化巡检记录

CommunityService/src/main/java/com/java110/community/listener/inspectionTaskDetail/AbstractInspectionTaskDetailBusinessServiceDataFlowListener.java

@@ -44,6 +44,8 @@ public abstract class AbstractInspectionTaskDetailBusinessServiceDataFlowListene
         businessInspectionTaskDetailInfo.put("communityId", businessInspectionTaskDetailInfo.get("community_id"));
         businessInspectionTaskDetailInfo.put("taskId", businessInspectionTaskDetailInfo.get("task_id"));
         businessInspectionTaskDetailInfo.put("taskDetailId", businessInspectionTaskDetailInfo.get("task_detail_id"));
+        businessInspectionTaskDetailInfo.put("patrolType", businessInspectionTaskDetailInfo.get("patrol_type"));
+        businessInspectionTaskDetailInfo.put("description", businessInspectionTaskDetailInfo.get("description"));
         businessInspectionTaskDetailInfo.remove("bId");
         businessInspectionTaskDetailInfo.put("statusCd", statusCd);
     }
@@ -76,6 +78,9 @@ public abstract class AbstractInspectionTaskDetailBusinessServiceDataFlowListene
         currentInspectionTaskDetailInfo.put("taskId", currentInspectionTaskDetailInfo.get("task_id"));
         currentInspectionTaskDetailInfo.put("taskDetailId", currentInspectionTaskDetailInfo.get("task_detail_id"));
 
+        currentInspectionTaskDetailInfo.put("patrolType", currentInspectionTaskDetailInfo.get("patrol_type"));
+        currentInspectionTaskDetailInfo.put("description", currentInspectionTaskDetailInfo.get("description"));
+
 
         currentInspectionTaskDetailInfo.put("operate", StatusConstant.OPERATE_DEL);
         getInspectionTaskDetailServiceDaoImpl().saveBusinessInspectionTaskDetailInfo(currentInspectionTaskDetailInfo);

java110-bean/src/main/java/com/java110/dto/inspectionTaskDetail/InspectionTaskDetailDto.java

@@ -22,6 +22,8 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     private String communityId;
     private String taskId;
     private String taskDetailId;
+    private String patrolType;
+    private String description;
 
 
     private Date createTime;
@@ -101,4 +103,20 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getPatrolType() {
+        return patrolType;
+    }
+
+    public void setPatrolType(String patrolType) {
+        this.patrolType = patrolType;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/inspectionTaskDetail/ApiInspectionTaskDetailDataVo.java

@@ -16,6 +16,9 @@ public class ApiInspectionTaskDetailDataVo implements Serializable {
     private String taskId;
     private String taskDetailId;
 
+    private String patrolType;
+    private String description;
+
     public String getInspectionId() {
         return inspectionId;
     }
@@ -96,4 +99,20 @@ public class ApiInspectionTaskDetailDataVo implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getPatrolType() {
+        return patrolType;
+    }
+
+    public void setPatrolType(String patrolType) {
+        this.patrolType = patrolType;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
 }

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

@@ -7,9 +7,9 @@
     <!-- 保存巡检任务明细信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessInspectionTaskDetailInfo" parameterType="Map">
         insert into business_inspection_task_detail(
-        inspection_id,operate,inspection_name,state,community_id,b_id,task_id,task_detail_id
+        inspection_id,operate,inspection_name,state,community_id,b_id,task_id,task_detail_id,patrol_type,description
         ) values (
-        #{inspectionId},#{operate},#{inspectionName},#{state},#{communityId},#{bId},#{taskId},#{taskDetailId}
+        #{inspectionId},#{operate},#{inspectionName},#{state},#{communityId},#{bId},#{taskId},#{taskDetailId},#{patrolType},#{description}
         )
     </insert>
 
@@ -18,7 +18,7 @@
     <select id="getBusinessInspectionTaskDetailInfo" parameterType="Map" resultType="Map">
         select t.inspection_id,t.inspection_id inspectionId,t.operate,t.inspection_name,t.inspection_name
         inspectionName,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.task_id,t.task_id
-        taskId,t.task_detail_id,t.task_detail_id taskDetailId
+        taskId,t.task_detail_id,t.task_detail_id taskDetailId,t.patrol_type,t.description,t.patrol_type patrolType
         from business_inspection_task_detail t
         where 1 =1
         <if test="inspectionId !=null and inspectionId != ''">
@@ -52,8 +52,9 @@
     <!-- 保存巡检任务明细信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveInspectionTaskDetailInfoInstance" parameterType="Map">
         insert into inspection_task_detail(
-        inspection_id,status_cd,inspection_name,state,community_id,b_id,task_id,task_detail_id
-        ) select t.inspection_id,'0',t.inspection_name,t.state,t.community_id,t.b_id,t.task_id,t.task_detail_id from
+        inspection_id,status_cd,inspection_name,state,community_id,b_id,task_id,task_detail_id,patrol_type,description
+        ) select t.inspection_id,'0',t.inspection_name,t.state,t.community_id,t.b_id,t.task_id,t.task_detail_id,t.patrol_type,t.description
+        from
         business_inspection_task_detail t where 1=1
         <if test="inspectionId !=null and inspectionId != ''">
             and t.inspection_id= #{inspectionId}
@@ -86,7 +87,7 @@
         select t.inspection_id,t.inspection_id inspectionId,t.status_cd,t.status_cd
         statusCd,t.inspection_name,t.inspection_name inspectionName,t.state,t.community_id,t.community_id
         communityId,t.b_id,t.b_id bId,t.task_id,t.task_id taskId,t.task_detail_id,t.task_detail_id taskDetailId,
-        td1.name stateName
+        td1.name stateName,t.patrol_type,t.description,t.patrol_type patrolType
         from inspection_task_detail t,t_dict td1
         where 1 =1
         and t.state = td1.status_cd
@@ -116,6 +117,9 @@
         <if test="taskDetailId !=null and taskDetailId != ''">
             and t.task_detail_id= #{taskDetailId}
         </if>
+        <if test="patrolType !=null and patrolType != ''">
+            and t.patrol_type= #{patrolType}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -145,6 +149,12 @@
         <if test="taskId !=null and taskId != ''">
             , t.task_id= #{taskId}
         </if>
+        <if test="description !=null and description != ''">
+            , t.description= #{description}
+        </if>
+        <if test="patrolType !=null and patrolType != ''">
+            , t.patrol_type= #{patrolType}
+        </if>
         where 1=1
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
@@ -187,6 +197,9 @@
         <if test="taskDetailId !=null and taskDetailId != ''">
             and t.task_detail_id= #{taskDetailId}
         </if>
+        <if test="patrolType !=null and patrolType != ''">
+            and t.patrol_type= #{patrolType}
+        </if>
 
 
     </select>