任务字段修改，三色任务修改，走访查询修改

zhongrj

2024-01-12 ee15dfb44e82ebd9b4c135820a08dc50ac0bb82d

 src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml

@@ -2,19 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.grid.mapper.GridWorkLogMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="gridWorkLogResultMap" type="org.springblade.modules.grid.entity.GridWorkLogEntity">
        <result column="id" property="id"/>
        <result column="house_code" property="houseCode"/>
        <result column="name" property="name"/>
        <result column="phone" property="phone"/>
        <result column="context" property="context"/>
        <result column="url" property="url"/>
        <result column="create_time" property="createTime"/>
        <result column="create_user" property="createUser"/>
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>

    <!--自定义分页查询-->
    <select id="selectGridWorkLogPage" resultType="org.springblade.modules.grid.vo.GridWorkLogVO">
        select
@@ -35,8 +22,17 @@
        <if test="gridWorkLog.type !=null">
            and jgwl.type = #{gridWorkLog.type}
        </if>
        <if test="gridWorkLog.source !=null">
            and jgwl.source = #{gridWorkLog.source}
        </if>
        <if test="gridWorkLog.status !=null">
            and jgwl.status = #{gridWorkLog.status}
        </if>
        <if test="gridWorkLog.personType !=null">
            and jgwl.person_type = #{gridWorkLog.personType}
        </if>
        <if test="gridWorkLog.gridId !=null">
            and jgr.grid_id = #{gridWorkLog.gridId}
        </if>
        <if test="gridWorkLog.name !=null and gridWorkLog.name!=''">
            and jh.name like concat('%',#{gridWorkLog.name},'%')
@@ -55,5 +51,18 @@
        </if>
    </select>

    <!--走访日志数量统计-->
    <select id="getGridWorkCountHandleCount" resultType="java.lang.Integer">
        select count(*) from jczz_grid_work_log jgwl
        left join jczz_household jh on jgwl.household_id = jh.id and jh.is_deleted = 0
        left join jczz_grid_range jgr on jgr.house_code=jh.house_code
        where jgwl.is_deleted = 0
        <if test="status!=null">
            and jgwl.status = #{status}
        </if>
        <if test="gridId!=null">
            and jgr.grid_id = #{gridId}
        </if>
    </select>

</mapper>