Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-06-16 755262ba9a1a3c0573a0e910bbd0a353e9e2a2c5

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

old mode 100644
new mode 100755
@@ -26,10 +26,10 @@
        <if test="planUserId !=null and planUserId != ''">
            and t.plan_user_id= #{planUserId}
        </if>
        <if test="actInsTime !=null and actInsTime != ''">
        <if test="actInsTime !=null ">
            and t.act_ins_time= #{actInsTime}
        </if>
        <if test="planInsTime !=null and planInsTime != ''">
        <if test="planInsTime !=null ">
            and t.plan_ins_time= #{planInsTime}
        </if>
        <if test="actUserName !=null and actUserName != ''">
@@ -76,10 +76,10 @@
        <if test="planUserId !=null and planUserId != ''">
            and t.plan_user_id= #{planUserId}
        </if>
        <if test="actInsTime !=null and actInsTime != ''">
        <if test="actInsTime !=null">
            and t.act_ins_time= #{actInsTime}
        </if>
        <if test="planInsTime !=null and planInsTime != ''">
        <if test="planInsTime !=null ">
            and t.plan_ins_time= #{planInsTime}
        </if>
        <if test="actUserName !=null and actUserName != ''">
@@ -121,8 +121,9 @@
        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,t.state,td1.name signTypeName,td2.name stateName
        from inspection_task t,t_dict td1,t_dict td2
        actUserId,t.task_id,t.task_id taskId,t.state,td1.name signTypeName,td2.name stateName,ip.inspection_plan_name
        inspectionPlanName
        from inspection_task t,inspection_plan ip,t_dict td1,t_dict td2
        where 1 =1
        and t.sign_type = td1.status_cd
        and td1.table_name = 'inspection_task'
@@ -130,14 +131,22 @@
        and t.state = td2.status_cd
        and td2.table_name = 'inspection_task'
        and td2.table_columns = 'state'
        and ip.inspection_plan_id = t.inspection_plan_id
        and ip.status_cd = '0'
        <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 test="startTime != null">
            and t.act_ins_time &gt;= #{startTime}
        </if>
        <if test="planInsTime !=null and planInsTime != ''">
        <if test="endTime != null">
            and t.act_ins_time &lt;= #{endTime}
        </if>
        <if test="planInsTime !=null ">
            and t.plan_ins_time= #{planInsTime}
        </if>
        <if test="todayPlanInsTime !=null ">
            and t.plan_ins_time &gt; #{todayPlanInsTime}
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
@@ -151,8 +160,11 @@
        <if test="inspectionPlanId !=null and inspectionPlanId != ''">
            and t.inspection_plan_id= #{inspectionPlanId}
        </if>
        <if test="inspectionPlanName != null and inspectionPlanName != ''">
            and ip.inspection_plan_name = #{inspectionPlanName}
        </if>
        <if test="planUserName !=null and planUserName != ''">
            and t.plan_user_name= #{planUserName}
            and t.plan_user_name like '%${planUserName}%'
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
@@ -169,11 +181,20 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="states !=null ">
            and t.state in
            <foreach collection="states" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="scopeTime !=null ">
            and t.create_time &lt; #{scopeTime}
            and t.create_time &gt; #{createTime}
        </if>
        order by t.create_time desc
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
        </if>

    </select>


@@ -189,10 +210,10 @@
        <if test="state !=null and state != ''">
            , t.state= #{state}
        </if>
        <if test="actInsTime !=null and actInsTime != ''">
        <if test="actInsTime !=null ">
            , t.act_ins_time= #{actInsTime}
        </if>
        <if test="planInsTime !=null and planInsTime != ''">
        <if test="planInsTime !=null ">
            , t.plan_ins_time= #{planInsTime}
        </if>
        <if test="actUserName !=null and actUserName != ''">
@@ -220,13 +241,12 @@
        <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,t_dict td1,t_dict td2
        from inspection_task t,inspection_plan ip,t_dict td1,t_dict td2
        where 1 =1
        and t.sign_type = td1.status_cd
        and td1.table_name = 'inspection_task'
@@ -234,13 +254,18 @@
        and t.state = td2.status_cd
        and td2.table_name = 'inspection_task'
        and td2.table_columns = 'state'
        and ip.inspection_plan_id = t.inspection_plan_id
        and ip.status_cd = '0'
        <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 test="startTime != null">
            and t.act_ins_time &gt;= #{startTime}
        </if>
        <if test="planInsTime !=null and planInsTime != ''">
        <if test="endTime != null">
            and t.act_ins_time &lt;= #{endTime}
        </if>
        <if test="planInsTime !=null ">
            and t.plan_ins_time= #{planInsTime}
        </if>
        <if test="statusCd !=null and statusCd != ''">
@@ -255,8 +280,11 @@
        <if test="inspectionPlanId !=null and inspectionPlanId != ''">
            and t.inspection_plan_id= #{inspectionPlanId}
        </if>
        <if test="inspectionPlanName != null and inspectionPlanName != ''">
            and ip.inspection_plan_name = #{inspectionPlanName}
        </if>
        <if test="planUserName !=null and planUserName != ''">
            and t.plan_user_name= #{planUserName}
            and t.plan_user_name like '%${planUserName}%'
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
@@ -270,8 +298,15 @@
        <if test="taskId !=null and taskId != ''">
            and t.task_id= #{taskId}
        </if>


        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="states !=null ">
            and t.state in
            <foreach collection="states" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
    </select>

    <!-- 查询未安排的巡检计划 -->
@@ -287,12 +322,13 @@
        ip.staff_name planUserName
        FROM
        inspection_plan ip
        inner join
        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
        <if test="inspectionPlanPeriod !=null and inspectionPlanPeriod == '2020023'">
        and it.plan_ins_time &gt; DATE_SUB(curdate(),INTERVAL 7 DAY)
            and it.plan_ins_time &gt; DATE_SUB(curdate(),INTERVAL 7 DAY)
        </if>
        <if test="inspectionPlanPeriod !=null and inspectionPlanPeriod == '2020024'">
            and it.plan_ins_time &gt; DATE_SUB(curdate(),INTERVAL 30 DAY)
@@ -313,11 +349,20 @@
    <!-- 保存活动信息 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,state
        )
        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.planUserId},#{task.planInsTime},#{task.signType},#{task.inspectionPlanId},#{task.planUserName},#{task.communityId},'-1',#{task.taskId},'20200405',#{task.ipStaffId})
        </foreach>
    </insert>

    <!-- 保存活动信息 add by wuxw 2018-07-03 -->
    <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>
    </insert>
</mapper>