优化 巡检功能

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

@@ -5,114 +5,112 @@
 <mapper namespace="inspectionPlanStaffV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存巡检人信息 add by wuxw 2018-07-03 -->
     <insert id="saveInspectionPlanStaffInfo" parameterType="Map">
         insert into inspection_plan_staff(
-ip_staff_id,staff_name,start_time,inspection_plan_id,end_time,community_id,staff_id
-) values (
-#{ipStaffId},#{staffName},#{startTime},#{inspectionPlanId},#{endTime},#{communityId},#{staffId}
-)
+        ip_staff_id,staff_name,start_time,inspection_plan_id,end_time,community_id,staff_id
+        ) values (
+        #{ipStaffId},#{staffName},#{startTime},#{inspectionPlanId},#{endTime},#{communityId},#{staffId}
+        )
     </insert>
 
 
-
     <!-- 查询巡检人信息 add by wuxw 2018-07-03 -->
     <select id="getInspectionPlanStaffInfo" parameterType="Map" resultType="Map">
-        select  t.ip_staff_id,t.ip_staff_id ipStaffId,t.staff_name,t.staff_name staffName,t.start_time,t.start_time startTime,t.inspection_plan_id,t.inspection_plan_id inspectionPlanId,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.staff_id,t.staff_id staffId 
-from inspection_plan_staff t 
-where 1 =1 
-<if test="ipStaffId !=null and ipStaffId != ''">
-   and t.ip_staff_id= #{ipStaffId}
-</if> 
-<if test="staffName !=null and staffName != ''">
-   and t.staff_name= #{staffName}
-</if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
-<if test="inspectionPlanId !=null and inspectionPlanId != ''">
-   and t.inspection_plan_id= #{inspectionPlanId}
-</if> 
-<if test="endTime !=null and endTime != ''">
-   and t.end_time= #{endTime}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.ip_staff_id,t.ip_staff_id ipStaffId,t.staff_name,t.staff_name staffName,t.start_time,t.start_time
+        startTime,t.inspection_plan_id,t.inspection_plan_id inspectionPlanId,t.end_time,t.end_time
+        endTime,t.community_id,t.community_id communityId,t.staff_id,t.staff_id staffId
+        from inspection_plan_staff t
+        where 1 =1
+        <if test="ipStaffId !=null and ipStaffId != ''">
+            and t.ip_staff_id= #{ipStaffId}
+        </if>
+        <if test="staffName !=null and staffName != ''">
+            and t.staff_name= #{staffName}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="inspectionPlanId !=null and inspectionPlanId != ''">
+            and t.inspection_plan_id= #{inspectionPlanId}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改巡检人信息 add by wuxw 2018-07-03 -->
     <update id="updateInspectionPlanStaffInfo" parameterType="Map">
-        update  inspection_plan_staff t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="staffName !=null and staffName != ''">
-, t.staff_name= #{staffName}
-</if> 
-<if test="startTime !=null and startTime != ''">
-, t.start_time= #{startTime}
-</if> 
-<if test="inspectionPlanId !=null and inspectionPlanId != ''">
-, t.inspection_plan_id= #{inspectionPlanId}
-</if> 
-<if test="endTime !=null and endTime != ''">
-, t.end_time= #{endTime}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-, t.staff_id= #{staffId}
-</if> 
- where 1=1 <if test="ipStaffId !=null and ipStaffId != ''">
-and t.ip_staff_id= #{ipStaffId}
-</if> 
-
+        update inspection_plan_staff t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="staffName !=null and staffName != ''">
+            , t.staff_name= #{staffName}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            , t.start_time= #{startTime}
+        </if>
+
+        <if test="endTime !=null and endTime != ''">
+            , t.end_time= #{endTime}
+        </if>
+
+        <if test="staffId !=null and staffId != ''">
+            , t.staff_id= #{staffId}
+        </if>
+        where 1=1
+        <if test="ipStaffId !=null and ipStaffId != ''">
+            and t.ip_staff_id= #{ipStaffId}
+        </if>
+        <if test="inspectionPlanId !=null and inspectionPlanId != ''">
+            and t.inspection_plan_id= #{inspectionPlanId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
     </update>
 
     <!-- 查询巡检人数量 add by wuxw 2018-07-03 -->
-     <select id="queryInspectionPlanStaffsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from inspection_plan_staff t 
-where 1 =1 
-<if test="ipStaffId !=null and ipStaffId != ''">
-   and t.ip_staff_id= #{ipStaffId}
-</if> 
-<if test="staffName !=null and staffName != ''">
-   and t.staff_name= #{staffName}
-</if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
-<if test="inspectionPlanId !=null and inspectionPlanId != ''">
-   and t.inspection_plan_id= #{inspectionPlanId}
-</if> 
-<if test="endTime !=null and endTime != ''">
-   and t.end_time= #{endTime}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
+    <select id="queryInspectionPlanStaffsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from inspection_plan_staff t
+        where 1 =1
+        <if test="ipStaffId !=null and ipStaffId != ''">
+            and t.ip_staff_id= #{ipStaffId}
+        </if>
+        <if test="staffName !=null and staffName != ''">
+            and t.staff_name= #{staffName}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="inspectionPlanId !=null and inspectionPlanId != ''">
+            and t.inspection_plan_id= #{inspectionPlanId}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

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

@@ -21,6 +21,7 @@
 
     <!-- 查询巡检计划信息 add by wuxw 2018-07-03 -->
     <select id="getInspectionPlanInfo" parameterType="Map" resultType="Map">
+
         select t.inspection_plan_name,t.inspection_plan_name inspectionPlanName,t.create_user_id,t.create_user_id
         createUserId,t.inspection_route_id,t.inspection_route_id
         inspectionRouteId,t.inspection_plan_period,t.inspection_plan_period
@@ -28,7 +29,7 @@
         statusCd,t.sign_type,t.sign_type signType,t.start_time,t.start_time
         startTime,t.inspection_plan_id,t.inspection_plan_id inspectionPlanId,t.end_time,t.end_time
         endTime,t.state,t.community_id,t.community_id communityId,
-        t.start_date startDate,t.end_date endDate,t.inspection_month inspectionMonth,t.inspection_day inspectionDay,
+        DATE_FORMAT(t.start_date,'%Y-%m-%d') startDate,DATE_FORMAT(t.end_date,'%Y-%m-%d') endDate,t.inspection_month inspectionMonth,t.inspection_day inspectionDay,
         t.inspection_workday inspectionWorkday,t.before_time beforeTime,t.create_time createTime,
         d.name stateName,
         c.name inspectionPlanPeriodName,

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

@@ -1,12 +1,16 @@
 package com.java110.community.cmd.inspectionPlan;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.community.IInspectionPlanStaffV1InnerServiceSMO;
 import com.java110.intf.community.IInspectionPlanV1InnerServiceSMO;
 import com.java110.po.inspection.InspectionPlanPo;
+import com.java110.po.inspection.InspectionPlanStaffPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -18,6 +22,10 @@ public class UpdateInspectionPlanCmd extends Cmd {
     @Autowired
     private IInspectionPlanV1InnerServiceSMO inspectionPlanV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IInspectionPlanStaffV1InnerServiceSMO inspectionPlanStaffV1InnerServiceSMOImpl;
+
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         Assert.hasKeyAndValue(reqJson, "inspectionPlanId", "inspectionPlanId不能为空");
@@ -32,10 +40,33 @@ public class UpdateInspectionPlanCmd extends Cmd {
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+
+
         InspectionPlanPo inspectionPlanPo = BeanConvertUtil.covertBean(reqJson, InspectionPlanPo.class);
         int flag = inspectionPlanV1InnerServiceSMOImpl.updateInspectionPlan(inspectionPlanPo);
         if (flag < 1) {
             throw new CmdException("修改巡检计划失败");
         }
+
+        InspectionPlanStaffPo inspectionPlanStaffPo = null;
+        inspectionPlanStaffPo = new InspectionPlanStaffPo();
+        inspectionPlanStaffPo.setInspectionPlanId(inspectionPlanPo.getInspectionPlanId());
+
+        inspectionPlanStaffV1InnerServiceSMOImpl.deleteInspectionPlanStaff(inspectionPlanStaffPo);
+
+
+        JSONArray staffs = reqJson.getJSONArray("staffs");
+        for(int staffIndex = 0; staffIndex < staffs.size() ; staffIndex++) {
+            inspectionPlanStaffPo = new InspectionPlanStaffPo();
+            inspectionPlanStaffPo.setCommunityId(reqJson.getString("communityId"));
+            inspectionPlanStaffPo.setEndTime(reqJson.getString("endTime"));
+            inspectionPlanStaffPo.setInspectionPlanId(inspectionPlanPo.getInspectionPlanId());
+            inspectionPlanStaffPo.setIpStaffId(GenerateCodeFactory.getGeneratorId("11"));
+            inspectionPlanStaffPo.setStaffId(staffs.getJSONObject(staffIndex).getString("userId"));
+            inspectionPlanStaffPo.setStaffName(staffs.getJSONObject(staffIndex).getString("name"));
+            inspectionPlanStaffPo.setStartTime(reqJson.getString("startTime"));
+            inspectionPlanStaffV1InnerServiceSMOImpl.saveInspectionPlanStaff(inspectionPlanStaffPo);
+        }
     }
 }