springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventTasksStatusEnum.java
@@ -8,7 +8,7 @@ DZF(1,"待走访"), JXZ(2,"进行中"), ZJJJ(3,"自己解决"), ZJJJ(3,"正常"), DYZ(4,"待验证"), CG(5,"草稿"), YCX(6,"已撤销"), springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java
@@ -11,13 +11,16 @@ * @author xyh * @date 2021/6/21 15:44 */ @ApiModel("走访任务查询") @ApiModel("走访查询") @Data public class EventTasksQuery extends PageDTO implements Serializable { @ApiModelProperty("app状态:0全部，1已完成，2未完成,3正常，7异常| 后台任务状态：0全部，1待走访 2正常，5已撤销，6异常") @ApiModelProperty("走访任务状态，app：0全部，1待走访，2已完成 | 后台：0全部，1待走访 3正常，6已撤销，7异常") private Integer status; @ApiModelProperty("走访记录状态，app：0全部，3正常，7异常") private Integer eventStatus; @ApiModelProperty("人员标签") private Integer tag;
@@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.enums.EventTasksStatusEnum; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -16,6 +17,7 @@ */ @ApiModel("app走访任务VO") @Data @EncryptDecryptClass public class AppVisitTasksVO implements Serializable { private static final long serialVersionUID = -5758072851661612412L; @@ -41,6 +43,7 @@ private String dellUserName; @ApiModelProperty("需走访人电话") @EncryptDecryptField private String visiterTele; @ApiModelProperty("完成时间") @@ -52,6 +55,9 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("创建人") private String creator; @ApiModelProperty("撤销时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date cancelTime; springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java
@@ -40,8 +40,8 @@ @PostMapping("/taskList") public R taskList(@RequestBody EventTasksQuery query){ // query.setCommunityId(this.getCommunityId()); query.setUserId(this.getUserId()); return gridService.taskList(query); // query.setUserId(this.getUserId()); return gridService.appTaskList(query); } @ApiOperation(value = "走访详情-xyh", response = EventVisitingTasksDetailsVO.class) springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java
@@ -130,6 +130,18 @@ } /** * app走访任务列表 * @param query * @return * @throws Exception */ @PostMapping("/appTaskList") R appTaskList(@RequestBody EventTasksQuery query) throws Exception { return eventVisitingTasksService.appTaskList(query); } /** * 导出 * @param query * @return springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java
@@ -1,6 +1,8 @@ package com.panzhihua.service_grid.model.dos; import com.baomidou.mybatisplus.annotation.*; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField; import lombok.Data; import java.io.Serializable; @@ -18,6 +20,7 @@ * */ @Data @TableName("event_visiting_tasks") @EncryptDecryptClass public class EventVisitingTasksDO implements Serializable { private static final long serialVersionUID = 1L; @@ -62,6 +65,7 @@ /** * 需走访人电话 列: visiter_tele */ @EncryptDecryptField private String visiterTele; /** * 需走访人居住地址 列: visiter_address springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml
@@ -95,34 +95,36 @@ LEFT JOIN sys_user u ON u.user_id = gmr.grid_member_id where 1=1 <if test = "query.userId != null"> u.use_id = #{query.userId} and u.user_id = #{query.userId} </if> <if test = "query.status == 1"> and (vt.event_status = 3 or vt.event_status = 7) and (vt.event_status = 1 or vt.event_status = 6) </if> <if test = "query.status == 2"> and (vt.event_status = 1 or vt.event_status = 2 or vt.event_status = 4) and (vt.event_status = 3 or vt.event_status = 7) </if> <if test = "query.status == 3"> and vt.event_status = 6 </if> <if test = "query.status == 4"> and vt.event_status = 7 <if test = "query.status == 0"> and (vt.event_status = 1 or vt.event_status = 3 or vt.event_status = 6 or vt.event_status = 6) </if> order by vt.id desc </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_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, 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,u.name as creator,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 FROM event_visiting_tasks vt LEFT JOIN com_mng_population p ON vt.visiter_id = p.id left join sys_user u on vt.create_by = u.user_id WHERE 1=1 <if test = "query.visiterId !=null"> and vt.visiter_id = #{query.visiterId} and vt.visiter_id = #{query.visiterId} </if> <if test = "query.eventStatus == 0"> and (vt.event_status = 3 or vt.event_status = 7) </if> <if test = "query.eventStatus == 3 or query.eventStatus == 7"> and vt.event_status = #{query.eventStatus} </if> <if test = "query.status != null"> and vt.event_status = #{eventStatus} </if> order by vt.id desc </select> <select id="visitorList" parameterType="com.panzhihua.common.model.query.visit.EventVisitListQuery" resultType="com.panzhihua.common.model.vos.visit.EventVisitListVO">
