优化巡检功能完成

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

@@ -33,6 +33,7 @@ public class InspectionPlanDto extends PageDto implements Serializable {
     private String staffName;
     private String signType;
     private String startTime;
+    private String curTime;
     private String createUserId;
     private String createUserName;
     private String inspectionPlanId;
@@ -216,4 +217,12 @@ public class InspectionPlanDto extends PageDto implements Serializable {
     public void setKeyWord(String keyWord) {
         this.keyWord = keyWord;
     }
+
+    public String getCurTime() {
+        return curTime;
+    }
+
+    public void setCurTime(String curTime) {
+        this.curTime = curTime;
+    }
 }

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

@@ -182,16 +182,21 @@
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
-        <if test="endTime !=null and endTime != ''">
+        <if test="endTime !=null ">
             and t.end_time= #{endTime}
         </if>
 
         <if test="signType !=null and signType != ''">
             and t.sign_type= #{signType}
         </if>
-        <if test="startTime !=null and startTime != ''">
+        <if test="startTime !=null ">
             and t.start_time= #{startTime}
         </if>
+
+        <if test="curTime !=null ">
+            and t.start_time &lt; #{curTime}
+            and t.end_time &gt; #{curTime}
+        </if>
         <if test="createUserId !=null and createUserId != ''">
             and t.create_user_id= #{createUserId}
         </if>

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

@@ -323,7 +323,7 @@
     <insert id="insertInspectionTask" parameterType="Map">
         insert into inspection_task(
         plan_user_id,plan_ins_time,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,task_id,state,ip_staff_id
-        )
+        ) values
         <foreach collection="tasks" item="task" separator=",">
             (#{task.planUserId},#{task.planInsTime},#{task.signType},#{task.inspectionPlanId},#{task.planUserName},#{task.communityId},'-1',#{task.taskId},'20200405',#{task.ipStaffId})
         </foreach>
@@ -333,7 +333,7 @@
     <insert id="insertInspectionTaskDetail" parameterType="Map">
         insert into inspection_task_detail(
         task_detail_id,b_id,community_id,task_id,inspection_id,inspection_name,state
-        )
+        ) values
         <foreach collection="tasks" item="task" separator=",">
             (#{task.taskDetailId},'-1',#{task.communityId},#{task.taskId},#{task.inspectionId},#{task.inspectionName},'20200405')
         </foreach>

service-job/src/main/java/com/java110/job/task/inspection/GeneratorInspectionTaskTemplate.java

@@ -65,6 +65,7 @@ public class GeneratorInspectionTaskTemplate extends TaskSystemQuartz {
         InspectionPlanDto inspectionPlanDto = new InspectionPlanDto();
         inspectionPlanDto.setCommunityId(communityDto.getCommunityId());
         inspectionPlanDto.setState(InspectionPlanDto.STATE_RUN);
+        inspectionPlanDto.setCurTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         List<InspectionPlanDto> inspectionPlanDtos = inspectionPlanInnerServiceSMOImpl.queryInspectionPlans(inspectionPlanDto);
 
         for (InspectionPlanDto tmpInspectionPlanDto : inspectionPlanDtos) {
@@ -166,7 +167,7 @@ public class GeneratorInspectionTaskTemplate extends TaskSystemQuartz {
         inspectionTaskPo.setInspectionPlanId(tmpInspectionPlanDto.getInspectionPlanId());
         inspectionTaskPo.setCommunityId(tmpInspectionPlanDto.getCommunityId());
         inspectionTaskPo.setIpStaffId(tmpInspectionPlanStaffDto.getIpStaffId());
-        inspectionTaskPo.setPlanInsTime(nowTime + tmpInspectionPlanDto + ":00");
+        inspectionTaskPo.setPlanInsTime(nowTime + tmpInspectionPlanStaffDto.getStartTime() + ":00");
         inspectionTaskPo.setPlanUserId(tmpInspectionPlanStaffDto.getStaffId());
         inspectionTaskPo.setPlanUserName(tmpInspectionPlanStaffDto.getStaffName());
         inspectionTaskPo.setSignType(tmpInspectionPlanDto.getSignType());