优化 巡检功能

java110-bean/src/main/java/com/java110/dto/inspectionPlan/InspectionPlanDto.java

@@ -46,6 +46,12 @@ public class InspectionPlanDto extends PageDto implements Serializable {
     private String inspectionPlanPeriodName;
     private String signTypeName;
     private String keyWord;
+    private String inspectionMonth;
+    private String inspectionDay;
+    private String inspectionWorkday;
+    private String startDate;
+    private String endDate;
+    private String beforeTime;
 
 
     public String getInspectionPlanName() {
@@ -225,4 +231,52 @@ public class InspectionPlanDto extends PageDto implements Serializable {
     public void setCurTime(String curTime) {
         this.curTime = curTime;
     }
+
+    public String getInspectionMonth() {
+        return inspectionMonth;
+    }
+
+    public void setInspectionMonth(String inspectionMonth) {
+        this.inspectionMonth = inspectionMonth;
+    }
+
+    public String getInspectionDay() {
+        return inspectionDay;
+    }
+
+    public void setInspectionDay(String inspectionDay) {
+        this.inspectionDay = inspectionDay;
+    }
+
+    public String getInspectionWorkday() {
+        return inspectionWorkday;
+    }
+
+    public void setInspectionWorkday(String inspectionWorkday) {
+        this.inspectionWorkday = inspectionWorkday;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getBeforeTime() {
+        return beforeTime;
+    }
+
+    public void setBeforeTime(String beforeTime) {
+        this.beforeTime = beforeTime;
+    }
 }

java110-bean/src/main/java/com/java110/po/inspection/InspectionPlanPo.java

@@ -18,6 +18,8 @@ public class InspectionPlanPo implements Serializable {
     private String communityId;
     private String startTime;
     private String endTime;
+    private String startDate;
+    private String endDate;
     private String inspectionPlanPeriod;
     private String signType;
     private String state;
@@ -25,6 +27,12 @@ public class InspectionPlanPo implements Serializable {
     private String createUserId;
     private String createUserName;
     private String statusCd ="0";
+    private String inspectionMonth;
+    private String inspectionDay;
+    private String inspectionWorkday;
+    private String beforeTime;
+
+
 
     public String getInspectionPlanId() {
         return inspectionPlanId;
@@ -129,4 +137,52 @@ public class InspectionPlanPo implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getInspectionMonth() {
+        return inspectionMonth;
+    }
+
+    public void setInspectionMonth(String inspectionMonth) {
+        this.inspectionMonth = inspectionMonth;
+    }
+
+    public String getInspectionDay() {
+        return inspectionDay;
+    }
+
+    public void setInspectionDay(String inspectionDay) {
+        this.inspectionDay = inspectionDay;
+    }
+
+    public String getInspectionWorkday() {
+        return inspectionWorkday;
+    }
+
+    public void setInspectionWorkday(String inspectionWorkday) {
+        this.inspectionWorkday = inspectionWorkday;
+    }
+
+    public String getBeforeTime() {
+        return beforeTime;
+    }
+
+    public void setBeforeTime(String beforeTime) {
+        this.beforeTime = beforeTime;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/inspectionPlan/ApiInspectionPlanDataVo.java

@@ -28,6 +28,13 @@ public class ApiInspectionPlanDataVo implements Serializable {
     private String inspectionPlanPeriodName;
     private String signTypeName;
 
+    private String inspectionMonth;
+    private String inspectionDay;
+    private String inspectionWorkday;
+    private String startDate;
+    private String endDate;
+    private String beforeTime;
+
     public String getInspectionPlanId() {
         return inspectionPlanId;
     }
@@ -204,4 +211,52 @@ public class ApiInspectionPlanDataVo implements Serializable {
     public void setSignTypeName(String signTypeName) {
         this.signTypeName = signTypeName;
     }
+
+    public String getInspectionMonth() {
+        return inspectionMonth;
+    }
+
+    public void setInspectionMonth(String inspectionMonth) {
+        this.inspectionMonth = inspectionMonth;
+    }
+
+    public String getInspectionDay() {
+        return inspectionDay;
+    }
+
+    public void setInspectionDay(String inspectionDay) {
+        this.inspectionDay = inspectionDay;
+    }
+
+    public String getInspectionWorkday() {
+        return inspectionWorkday;
+    }
+
+    public void setInspectionWorkday(String inspectionWorkday) {
+        this.inspectionWorkday = inspectionWorkday;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getBeforeTime() {
+        return beforeTime;
+    }
+
+    public void setBeforeTime(String beforeTime) {
+        this.beforeTime = beforeTime;
+    }
 }

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

@@ -8,9 +8,13 @@
     <!-- 保存巡检计划信息 add by wuxw 2018-07-03 -->
     <insert id="saveInspectionPlanInfo" parameterType="Map">
         insert into inspection_plan(
-        inspection_plan_name,create_user_id,inspection_route_id,inspection_plan_period,remark,create_user_name,sign_type,start_time,inspection_plan_id,end_time,state,community_id
+        inspection_plan_name,create_user_id,inspection_route_id,inspection_plan_period,remark,
+        create_user_name,sign_type,start_time,inspection_plan_id,end_time,state,community_id,
+        start_date,end_date,inspection_month,inspection_day,inspection_workday,before_time
         ) values (
-        #{inspectionPlanName},#{createUserId},#{inspectionRouteId},#{inspectionPlanPeriod},#{remark},#{createUserName},#{signType},#{startTime},#{inspectionPlanId},#{endTime},#{state},#{communityId}
+        #{inspectionPlanName},#{createUserId},#{inspectionRouteId},#{inspectionPlanPeriod},#{remark},
+        #{createUserName},#{signType},#{startTime},#{inspectionPlanId},#{endTime},#{state},#{communityId},
+        #{startDate},#{endDate},#{inspectionMonth},#{inspectionDay},#{inspectionWorkday},#{beforeTime}
         )
     </insert>
 
@@ -23,7 +27,9 @@
         inspectionPlanPeriod,t.remark,t.create_user_name,t.create_user_name createUserName,t.status_cd,t.status_cd
         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
+        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,
+        t.inspection_workday inspectionWorkday,t.before_time beforeTime
         from inspection_plan t
         where 1 =1
         <if test="inspectionPlanName !=null and inspectionPlanName != ''">
@@ -59,6 +65,15 @@
         <if test="endTime !=null and endTime != ''">
             and t.end_time= #{endTime}
         </if>
+        <if test="startDate !=null and startDate != ''">
+            and t.start_date= #{startDate}
+        </if>
+        <if test="endDate !=null and endDate != ''">
+            and t.end_date= #{endDate}
+        </if>
+        <if test="beforeTime !=null and beforeTime != ''">
+            and t.before_time = #{beforeTime}
+        </if>
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
@@ -109,13 +124,34 @@
         <if test="state !=null and state != ''">
             , t.state= #{state}
         </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
+
+        <if test="startDate !=null and startDate != ''">
+            , t.start_date= #{startDate}
+        </if>
+        <if test="endDate !=null and endDate != ''">
+            , t.end_date= #{endDate}
+        </if>
+
+        <if test="inspectionMonth !=null and inspectionMonth != ''">
+            , t.inspection_month = #{inspectionMonth}
+        </if>
+        <if test="inspectionDay !=null and inspectionDay != ''">
+            , t.inspection_day= #{inspectionDay}
         </if>
+        <if test="inspectionWorkday !=null and inspectionWorkday != ''">
+            ,t.inspection_workday= #{inspectionWorkday}
+        </if>
+        <if test="beforeTime !=null and beforeTime != ''">
+            , t.before_time = #{beforeTime}
+        </if>
+
         where 1=1
         <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>
 
@@ -157,12 +193,21 @@
         <if test="endTime !=null and endTime != ''">
             and t.end_time= #{endTime}
         </if>
+        <if test="startDate !=null and startDate != ''">
+            and t.start_date= #{startDate}
+        </if>
+        <if test="endDate !=null and endDate != ''">
+            and t.end_date= #{endDate}
+        </if>
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="beforeTime !=null and beforeTime != ''">
+            and t.before_time = #{beforeTime}
+        </if>
 
 
     </select>

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

@@ -1,5 +1,6 @@
 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;
@@ -7,9 +8,11 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.user.UserDto;
+import com.java110.intf.community.IInspectionPlanStaffV1InnerServiceSMO;
 import com.java110.intf.community.IInspectionPlanV1InnerServiceSMO;
 import com.java110.intf.user.IUserV1InnerServiceSMO;
 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;
@@ -26,6 +29,9 @@ public class SaveInspectionPlanCmd extends Cmd {
     @Autowired
     private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IInspectionPlanStaffV1InnerServiceSMO inspectionPlanStaffV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
@@ -61,5 +67,19 @@ public class SaveInspectionPlanCmd extends Cmd {
         if (flag < 1) {
             throw new CmdException("保存巡检计划失败");
         }
+
+        JSONArray staffs = reqJson.getJSONArray("staffs");
+        InspectionPlanStaffPo inspectionPlanStaffPo = null;
+        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);
+        }
     }
 }