xyh
2021-06-28 054320f046e09d96cb50bf6b7c11dc94690a9855
走访修改
3个文件已修改
33 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java
@@ -22,6 +22,12 @@
    @ApiModelProperty("id")
    private Long id;
    @ApiModelProperty("需走访人id")
    private Long visiterId;
    @ApiModelProperty("需走访人姓名")
    private String visiterName;
    @ApiModelProperty("网格员id")
    private Long gridMember;
@@ -41,6 +47,15 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date submitDate;
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;
    @ApiModelProperty("撤销时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date cancelTime;
    private Integer eventStatus;
    @ApiModelProperty("状态")
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -259,9 +259,7 @@
        visitingTasksDO.setVisiterId(Long.valueOf(map.get("id").toString()));
        visitingTasksDO.setVisiterName(map.get("name").toString());
        visitingTasksDO.setVisiterSex(Integer.valueOf(map.get("sex").toString()));
        if(map.get("phone") != null){
            visitingTasksDO.setVisiterTele(AESUtil.decrypt128(map.get("phone").toString(),aesKey));
        }
        visitingTasksDO.setVisiterTele(map.get("phone") == null ?null:map.get("phone").toString());
        StringBuilder sb = new StringBuilder();
        sb.append(map.get("address")).append(map.get("road")).append(map.get("door_no")).append(map.get("floor")).append("栋").append(map.get("unit_no")).append("单元").append(map.get("house_no")).append("号");
        visitingTasksDO.setVisiterAddress(sb.toString());
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml
@@ -113,13 +113,13 @@
    </select>
    <select id="list" parameterType="com.panzhihua.common.model.query.visit.EventTasksQuery" resultType="com.panzhihua.common.model.vos.visit.AppVisitTasksVO">
        SELECT vt.id,vt.visiter_name,vt.grid_member,vt.grid_member_name,vt.visiter_name,vt.visiter_tele,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.event_status,vt.visiter_address,vt.happent_lat_lng,
        SELECT vt.id,vt.visiter_name,vt.grid_member,vt.grid_member_name,vt.visiter_id,vt.visiter_name,vt.visiter_tele,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.cancel_time,vt.create_at,vt.event_status,vt.visiter_address,vt.happent_lat_lng,
        p.card_no_str,p.name,REPLACE(p.label,',','#')
        FROM event_visiting_tasks vt LEFT JOIN com_mng_population p ON vt.visiter_id = p.id WHERE 1=1
        <if test = "query.visiterId !=null">
            and vt.visiter_id = #{query.visiterId}
        </if>
        <if test = "query.status != null">
        <if test = "query.status != null">
            and vt.event_status = #{eventStatus}
        </if>
@@ -131,19 +131,19 @@
        FROM  com_mng_population p LEFT JOIN com_mng_population_house_user phu ON p.id = phu.popul_id
        left join event_visiting_tasks vt ON p.id = vt.visiter_id
        where 1=1
        <if test="sex != null">
        <if test="query.sex != null">
            and p.sex = #{query.sex}
        </if>
        <if test="political != null">
        <if test="query.political != null">
            and p.political_outlook = #{query.political}
        </if>
        <if test="houseHolder != null">
        <if test="query.houseHolder != null">
            and phu.relation = #{query.houseHolder}
        </if>
        <if test="tag != null">
        <if test="query.tag != null">
            and p.label like concat('%',#{query.tag},'%')
        </if>
        <if test="keyWord != null">
        <if test="query.keyWord != null">
            and (p.card_no_str like concat(#{query.keyWord},'%') or
            p.name like concat(#{query.keyWord},'%'))
        </if>