侦听生成巡检任务

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

@@ -78,4 +78,16 @@ public interface IInspectionTaskServiceDao {
      */
     int queryInspectionTasksCount(Map info);
 
+    /**
+     * 查询今天巡检计划信息
+     * @return
+     */
+    List<Map> queryTodayInspectionPlan(Map info);
+
+    /**
+     * 生成巡检任务信息
+     * @return
+     */
+     int insertInspectionTask(Map info);
+
 }

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

@@ -130,5 +130,27 @@ public class InspectionTaskServiceDaoImpl extends BaseServiceDao implements IIns
         return Integer.parseInt(businessInspectionTaskInfos.get(0).get("count").toString());
     }
 
+    /**
+     * 查询今天巡检计划信息
+     * @return
+     */
+    public List<Map> queryTodayInspectionPlan(Map info){
+        logger.debug("查询活动数据 入参 info : {}", info);
+
+        List<Map> InspectionPlans = sqlSessionTemplate.selectList("inspectionTaskServiceDaoImpl.queryTodayInspectionPlan", info);
+
+        return InspectionPlans;
+    }
+
+    /**
+     * 生成巡检任务信息
+     * @return
+     */
+    public int insertInspectionTask(Map info){
+        logger.debug("插入 巡检任务 入参 info : {}", info);
+
+        return sqlSessionTemplate.update("inspectionTaskServiceDaoImpl.insertInspectionTask", info);
+    }
+
 
 }

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

@@ -1,18 +1,24 @@
 package com.java110.community.smo.impl;
 
 
+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.inspectionTask.IInspectionTaskInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.inspectionTask.InspectionTaskDto;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName FloorInnerServiceSMOImpl
@@ -53,6 +59,39 @@ public class InspectionTaskInnerServiceSMOImpl extends BaseServiceSMO implements
         return inspectionTaskServiceDaoImpl.queryInspectionTasksCount(BeanConvertUtil.beanCovertMap(inspectionTaskDto));
     }
 
+    /**
+     * 生成巡检任务
+     *
+     * @param param
+     * @return
+     */
+    public JSONObject generateInspectionTask(@RequestBody JSONObject param) {
+
+        Assert.hasKeyAndValue(param, "communityId", "请求报文中未包含小区信息");
+
+        //1.0查询出当前还没有执行的任务(按每天)
+        param.put("inspectionPlanPeriod", "2020022");
+        List<Map> inspectPlans = inspectionTaskServiceDaoImpl.queryTodayInspectionPlan(param);
+        Map taskParam = new HashMap();
+        //#{task.planUserId},#{task.planInsTime},#{task.signType},#{task.inspectionPlanId},#{task.planUserName},#{task.communityId},'-1',#{task.taskId}
+        for (Map inspectPlan : inspectPlans) {
+            inspectPlan.put("planInsTime", new Date());
+            inspectPlan.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
+        }
+        taskParam.put("tasks", inspectPlans);
+        inspectionTaskServiceDaoImpl.insertInspectionTask(taskParam);
+
+        //2.0查询当前周是否有执行任务（按每周）
+        param.put("inspectionPlanPeriod", "2020023");
+        inspectPlans = inspectionTaskServiceDaoImpl.queryTodayInspectionPlan(param);
+
+
+
+        return param;
+
+
+    }
+
     public IInspectionTaskServiceDao getInspectionTaskServiceDaoImpl() {
         return inspectionTaskServiceDaoImpl;
     }

java110-core/src/main/java/com/java110/core/smo/inspectionTask/IInspectionTaskInnerServiceSMO.java

@@ -1,5 +1,6 @@
 package com.java110.core.smo.inspectionTask;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.core.feign.FeignConfiguration;
 import com.java110.dto.inspectionTask.InspectionTaskDto;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -38,4 +39,13 @@ public interface IInspectionTaskInnerServiceSMO {
      */
     @RequestMapping(value = "/queryInspectionTasksCount", method = RequestMethod.POST)
     int queryInspectionTasksCount(@RequestBody InspectionTaskDto inspectionTaskDto);
+
+    /**
+     * 生成巡检任务
+     *
+     * @param param
+     * @return
+     */
+    @RequestMapping(value = "/generateInspectionTask", method = RequestMethod.POST)
+    JSONObject generateInspectionTask(@RequestBody JSONObject param);
 }

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

@@ -5,243 +5,289 @@
 <mapper namespace="inspectionTaskServiceDaoImpl">
 
     <!-- 保存活动信息 add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessInspectionTaskInfo" parameterType="Map">
-           insert into business_inspection_task(
-plan_user_id,act_ins_time,plan_ins_time,act_user_name,operate,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,act_user_id,task_id
-) values (
-#{planUserId},#{actInsTime},#{planInsTime},#{actUserName},#{operate},#{signType},#{inspectionPlanId},#{planUserName},#{communityId},#{bId},#{actUserId},#{taskId}
-)
-       </insert>
-
-
-       <!-- 查询活动信息（Business） add by wuxw 2018-07-03 -->
-       <select id="getBusinessInspectionTaskInfo" parameterType="Map" resultType="Map">
-           select  t.plan_user_id,t.plan_user_id planUserId,t.act_ins_time,t.act_ins_time actInsTime,t.plan_ins_time,t.plan_ins_time planInsTime,t.act_user_name,t.act_user_name actUserName,t.operate,t.sign_type,t.sign_type signType,t.inspection_plan_id,t.inspection_plan_id inspectionPlanId,t.plan_user_name,t.plan_user_name planUserName,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.act_user_id,t.act_user_id actUserId,t.task_id,t.task_id taskId 
-from business_inspection_task t 
-where 1 =1 
-<if test="planUserId !=null and planUserId != ''">
-   and t.plan_user_id= #{planUserId}
-</if> 
-<if test="actInsTime !=null and actInsTime != ''">
-   and t.act_ins_time= #{actInsTime}
-</if> 
-<if test="planInsTime !=null and planInsTime != ''">
-   and t.plan_ins_time= #{planInsTime}
-</if> 
-<if test="actUserName !=null and actUserName != ''">
-   and t.act_user_name= #{actUserName}
-</if> 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="signType !=null and signType != ''">
-   and t.sign_type= #{signType}
-</if> 
-<if test="inspectionPlanId !=null and inspectionPlanId != ''">
-   and t.inspection_plan_id= #{inspectionPlanId}
-</if> 
-<if test="planUserName !=null and planUserName != ''">
-   and t.plan_user_name= #{planUserName}
-</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> 
-<if test="actUserId !=null and actUserId != ''">
-   and t.act_user_id= #{actUserId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-   and t.task_id= #{taskId}
-</if> 
-
-       </select>
+    <insert id="saveBusinessInspectionTaskInfo" parameterType="Map">
+        insert into business_inspection_task(
+        plan_user_id,act_ins_time,plan_ins_time,act_user_name,operate,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,act_user_id,task_id
+        ) values (
+        #{planUserId},#{actInsTime},#{planInsTime},#{actUserName},#{operate},#{signType},#{inspectionPlanId},#{planUserName},#{communityId},#{bId},#{actUserId},#{taskId}
+        )
+    </insert>
 
 
+    <!-- 查询活动信息（Business） add by wuxw 2018-07-03 -->
+    <select id="getBusinessInspectionTaskInfo" parameterType="Map" resultType="Map">
+        select t.plan_user_id,t.plan_user_id planUserId,t.act_ins_time,t.act_ins_time
+        actInsTime,t.plan_ins_time,t.plan_ins_time planInsTime,t.act_user_name,t.act_user_name
+        actUserName,t.operate,t.sign_type,t.sign_type signType,t.inspection_plan_id,t.inspection_plan_id
+        inspectionPlanId,t.plan_user_name,t.plan_user_name planUserName,t.community_id,t.community_id
+        communityId,t.b_id,t.b_id bId,t.act_user_id,t.act_user_id actUserId,t.task_id,t.task_id taskId
+        from business_inspection_task t
+        where 1 =1
+        <if test="planUserId !=null and planUserId != ''">
+            and t.plan_user_id= #{planUserId}
+        </if>
+        <if test="actInsTime !=null and actInsTime != ''">
+            and t.act_ins_time= #{actInsTime}
+        </if>
+        <if test="planInsTime !=null and planInsTime != ''">
+            and t.plan_ins_time= #{planInsTime}
+        </if>
+        <if test="actUserName !=null and actUserName != ''">
+            and t.act_user_name= #{actUserName}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="signType !=null and signType != ''">
+            and t.sign_type= #{signType}
+        </if>
+        <if test="inspectionPlanId !=null and inspectionPlanId != ''">
+            and t.inspection_plan_id= #{inspectionPlanId}
+        </if>
+        <if test="planUserName !=null and planUserName != ''">
+            and t.plan_user_name= #{planUserName}
+        </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>
+        <if test="actUserId !=null and actUserId != ''">
+            and t.act_user_id= #{actUserId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            and t.task_id= #{taskId}
+        </if>
 
+    </select>
 
 
     <!-- 保存活动信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveInspectionTaskInfoInstance" parameterType="Map">
         insert into inspection_task(
-plan_user_id,act_ins_time,plan_ins_time,status_cd,act_user_name,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,act_user_id,task_id
-) select t.plan_user_id,t.act_ins_time,t.plan_ins_time,'0',t.act_user_name,t.sign_type,t.inspection_plan_id,t.plan_user_name,t.community_id,t.b_id,t.act_user_id,t.task_id from business_inspection_task t where 1=1
-<if test="planUserId !=null and planUserId != ''">
-   and t.plan_user_id= #{planUserId}
-</if> 
-<if test="actInsTime !=null and actInsTime != ''">
-   and t.act_ins_time= #{actInsTime}
-</if> 
-<if test="planInsTime !=null and planInsTime != ''">
-   and t.plan_ins_time= #{planInsTime}
-</if> 
-<if test="actUserName !=null and actUserName != ''">
-   and t.act_user_name= #{actUserName}
-</if> 
-   and t.operate= 'ADD'
-<if test="signType !=null and signType != ''">
-   and t.sign_type= #{signType}
-</if> 
-<if test="inspectionPlanId !=null and inspectionPlanId != ''">
-   and t.inspection_plan_id= #{inspectionPlanId}
-</if> 
-<if test="planUserName !=null and planUserName != ''">
-   and t.plan_user_name= #{planUserName}
-</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> 
-<if test="actUserId !=null and actUserId != ''">
-   and t.act_user_id= #{actUserId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-   and t.task_id= #{taskId}
-</if> 
+        plan_user_id,act_ins_time,plan_ins_time,status_cd,act_user_name,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,act_user_id,task_id
+        ) select
+        t.plan_user_id,t.act_ins_time,t.plan_ins_time,'0',t.act_user_name,t.sign_type,t.inspection_plan_id,t.plan_user_name,t.community_id,t.b_id,t.act_user_id,t.task_id
+        from business_inspection_task t where 1=1
+        <if test="planUserId !=null and planUserId != ''">
+            and t.plan_user_id= #{planUserId}
+        </if>
+        <if test="actInsTime !=null and actInsTime != ''">
+            and t.act_ins_time= #{actInsTime}
+        </if>
+        <if test="planInsTime !=null and planInsTime != ''">
+            and t.plan_ins_time= #{planInsTime}
+        </if>
+        <if test="actUserName !=null and actUserName != ''">
+            and t.act_user_name= #{actUserName}
+        </if>
+        and t.operate= 'ADD'
+        <if test="signType !=null and signType != ''">
+            and t.sign_type= #{signType}
+        </if>
+        <if test="inspectionPlanId !=null and inspectionPlanId != ''">
+            and t.inspection_plan_id= #{inspectionPlanId}
+        </if>
+        <if test="planUserName !=null and planUserName != ''">
+            and t.plan_user_name= #{planUserName}
+        </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>
+        <if test="actUserId !=null and actUserId != ''">
+            and t.act_user_id= #{actUserId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            and t.task_id= #{taskId}
+        </if>
 
     </insert>
 
 
-
     <!-- 查询活动信息 add by wuxw 2018-07-03 -->
     <select id="getInspectionTaskInfo" parameterType="Map" resultType="Map">
-        select  t.plan_user_id,t.plan_user_id planUserId,t.act_ins_time,t.act_ins_time actInsTime,t.plan_ins_time,t.plan_ins_time planInsTime,t.status_cd,t.status_cd statusCd,t.act_user_name,t.act_user_name actUserName,t.sign_type,t.sign_type signType,t.inspection_plan_id,t.inspection_plan_id inspectionPlanId,t.plan_user_name,t.plan_user_name planUserName,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.act_user_id,t.act_user_id actUserId,t.task_id,t.task_id taskId 
-from inspection_task t 
-where 1 =1 
-<if test="planUserId !=null and planUserId != ''">
-   and t.plan_user_id= #{planUserId}
-</if> 
-<if test="actInsTime !=null and actInsTime != ''">
-   and t.act_ins_time= #{actInsTime}
-</if> 
-<if test="planInsTime !=null and planInsTime != ''">
-   and t.plan_ins_time= #{planInsTime}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="actUserName !=null and actUserName != ''">
-   and t.act_user_name= #{actUserName}
-</if> 
-<if test="signType !=null and signType != ''">
-   and t.sign_type= #{signType}
-</if> 
-<if test="inspectionPlanId !=null and inspectionPlanId != ''">
-   and t.inspection_plan_id= #{inspectionPlanId}
-</if> 
-<if test="planUserName !=null and planUserName != ''">
-   and t.plan_user_name= #{planUserName}
-</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> 
-<if test="actUserId !=null and actUserId != ''">
-   and t.act_user_id= #{actUserId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-   and t.task_id= #{taskId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.plan_user_id,t.plan_user_id planUserId,t.act_ins_time,t.act_ins_time
+        actInsTime,t.plan_ins_time,t.plan_ins_time planInsTime,t.status_cd,t.status_cd
+        statusCd,t.act_user_name,t.act_user_name actUserName,t.sign_type,t.sign_type
+        signType,t.inspection_plan_id,t.inspection_plan_id inspectionPlanId,t.plan_user_name,t.plan_user_name
+        planUserName,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.act_user_id,t.act_user_id
+        actUserId,t.task_id,t.task_id taskId
+        from inspection_task t
+        where 1 =1
+        <if test="planUserId !=null and planUserId != ''">
+            and t.plan_user_id= #{planUserId}
+        </if>
+        <if test="actInsTime !=null and actInsTime != ''">
+            and t.act_ins_time= #{actInsTime}
+        </if>
+        <if test="planInsTime !=null and planInsTime != ''">
+            and t.plan_ins_time= #{planInsTime}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="actUserName !=null and actUserName != ''">
+            and t.act_user_name= #{actUserName}
+        </if>
+        <if test="signType !=null and signType != ''">
+            and t.sign_type= #{signType}
+        </if>
+        <if test="inspectionPlanId !=null and inspectionPlanId != ''">
+            and t.inspection_plan_id= #{inspectionPlanId}
+        </if>
+        <if test="planUserName !=null and planUserName != ''">
+            and t.plan_user_name= #{planUserName}
+        </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>
+        <if test="actUserId !=null and actUserId != ''">
+            and t.act_user_id= #{actUserId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            and t.task_id= #{taskId}
+        </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="updateInspectionTaskInfoInstance" parameterType="Map">
-        update  inspection_task t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="planUserId !=null and planUserId != ''">
-, t.plan_user_id= #{planUserId}
-</if> 
-<if test="actInsTime !=null and actInsTime != ''">
-, t.act_ins_time= #{actInsTime}
-</if> 
-<if test="planInsTime !=null and planInsTime != ''">
-, t.plan_ins_time= #{planInsTime}
-</if> 
-<if test="actUserName !=null and actUserName != ''">
-, t.act_user_name= #{actUserName}
-</if> 
-<if test="signType !=null and signType != ''">
-, t.sign_type= #{signType}
-</if> 
-<if test="inspectionPlanId !=null and inspectionPlanId != ''">
-, t.inspection_plan_id= #{inspectionPlanId}
-</if> 
-<if test="planUserName !=null and planUserName != ''">
-, t.plan_user_name= #{planUserName}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="actUserId !=null and actUserId != ''">
-, t.act_user_id= #{actUserId}
-</if> 
- where 1=1 <if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-and t.task_id= #{taskId}
-</if> 
+        update inspection_task t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="planUserId !=null and planUserId != ''">
+            , t.plan_user_id= #{planUserId}
+        </if>
+        <if test="actInsTime !=null and actInsTime != ''">
+            , t.act_ins_time= #{actInsTime}
+        </if>
+        <if test="planInsTime !=null and planInsTime != ''">
+            , t.plan_ins_time= #{planInsTime}
+        </if>
+        <if test="actUserName !=null and actUserName != ''">
+            , t.act_user_name= #{actUserName}
+        </if>
+        <if test="signType !=null and signType != ''">
+            , t.sign_type= #{signType}
+        </if>
+        <if test="inspectionPlanId !=null and inspectionPlanId != ''">
+            , t.inspection_plan_id= #{inspectionPlanId}
+        </if>
+        <if test="planUserName !=null and planUserName != ''">
+            , t.plan_user_name= #{planUserName}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="actUserId !=null and actUserId != ''">
+            , t.act_user_id= #{actUserId}
+        </if>
+        where 1=1
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            and t.task_id= #{taskId}
+        </if>
 
     </update>
 
     <!-- 查询活动数量 add by wuxw 2018-07-03 -->
-     <select id="queryInspectionTasksCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from inspection_task t 
-where 1 =1 
-<if test="planUserId !=null and planUserId != ''">
-   and t.plan_user_id= #{planUserId}
-</if> 
-<if test="actInsTime !=null and actInsTime != ''">
-   and t.act_ins_time= #{actInsTime}
-</if> 
-<if test="planInsTime !=null and planInsTime != ''">
-   and t.plan_ins_time= #{planInsTime}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="actUserName !=null and actUserName != ''">
-   and t.act_user_name= #{actUserName}
-</if> 
-<if test="signType !=null and signType != ''">
-   and t.sign_type= #{signType}
-</if> 
-<if test="inspectionPlanId !=null and inspectionPlanId != ''">
-   and t.inspection_plan_id= #{inspectionPlanId}
-</if> 
-<if test="planUserName !=null and planUserName != ''">
-   and t.plan_user_name= #{planUserName}
-</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> 
-<if test="actUserId !=null and actUserId != ''">
-   and t.act_user_id= #{actUserId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-   and t.task_id= #{taskId}
-</if> 
-
-
-     </select>
+    <select id="queryInspectionTasksCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from inspection_task t
+        where 1 =1
+        <if test="planUserId !=null and planUserId != ''">
+            and t.plan_user_id= #{planUserId}
+        </if>
+        <if test="actInsTime !=null and actInsTime != ''">
+            and t.act_ins_time= #{actInsTime}
+        </if>
+        <if test="planInsTime !=null and planInsTime != ''">
+            and t.plan_ins_time= #{planInsTime}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="actUserName !=null and actUserName != ''">
+            and t.act_user_name= #{actUserName}
+        </if>
+        <if test="signType !=null and signType != ''">
+            and t.sign_type= #{signType}
+        </if>
+        <if test="inspectionPlanId !=null and inspectionPlanId != ''">
+            and t.inspection_plan_id= #{inspectionPlanId}
+        </if>
+        <if test="planUserName !=null and planUserName != ''">
+            and t.plan_user_name= #{planUserName}
+        </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>
+        <if test="actUserId !=null and actUserId != ''">
+            and t.act_user_id= #{actUserId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            and t.task_id= #{taskId}
+        </if>
+
+
+    </select>
+
+    <!-- 查询未安排的巡检计划 -->
+    <select id="queryTodayInspectionPlan" parameterType="Map" resultType="Map">
+        SELECT
+        ip.inspection_plan_id inspectionPlanId,
+        ip.inspection_plan_name inspectionPlanName,
+        ip.inspection_plan_period inspectionPlanPeriod,
+        ip.sign_type signType,
+        ip.community_id communityId,
+        ip.end_time endTime,
+        ip.staff_id planUserId,
+        ip.staff_name planUserName
+        FROM
+        inspection_plan ip
+        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'
+        AND ip.community_id = it.community_id
+        WHERE
+        ip.status_cd = '0'
+        and ip.end_time &gt; now()
+        and ip.start_time &lt; now()
+        and ip.state = '2020025'
+        AND it.inspection_plan_id IS NOT NULL
+        and ip.community_id = #{communityId}
+        <if test="inspectionPlanPeriod !=null and inspectionPlanPeriod != ''">
+            and ip.inspection_plan_period= #{inspectionPlanPeriod}
+        </if>
+        limit 1000
+    </select>
+
+    <!-- 保存活动信息 add by wuxw 2018-07-03 -->
+    <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
+        )
+        <foreach collection="tasks" item="task" separator=",">
+            (#{task.planUserId},#{task.planInsTime},#{task.signType},#{task.inspectionPlanId},#{task.planUserName},#{task.communityId},'-1',#{task.taskId})
+        </foreach>
+    </insert>
 
 </mapper>