springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java
@@ -15,7 +15,7 @@ @Data public class EventTasksQuery extends PageDTO implements Serializable { @ApiModelProperty("app状态:0全部，1已完成，2未完成,3正常，7异常| 后台任务状态：0全部，1已走访 2待走访，3已撤销，4异常") @ApiModelProperty("app状态:0全部，1已完成，2未完成,3正常，7异常| 后台任务状态：0全部，1待走访 2正常，5已撤销，6异常") private Integer status; @ApiModelProperty("人员标签") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java
@@ -3,6 +3,8 @@ import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.model.dtos.EventResourceDTO; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField; import com.panzhihua.common.model.vos.grid.EventResourceVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -20,6 +22,7 @@ * */ @Data @ApiModel("重点人群走访记录详细返回参数") @EncryptDecryptClass public class EventVisitingTasksDetailsVO { @ApiModelProperty(value = "id") @@ -50,6 +53,7 @@ private Integer visiterSex; @ApiModelProperty(value = "需走访人电话") @EncryptDecryptField private String visiterTele; @ApiModelProperty(value = "需走访人居住地址") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java
@@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.enums.EventTasksStatusEnum; import com.panzhihua.common.enums.EventTasksVisitorTypeEnum; 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; import lombok.Data; @@ -20,6 +22,7 @@ * */ @Data @ApiModel("重点人群走访记录返回参数") @EncryptDecryptClass public class EventVisitingTasksVO { @ApiModelProperty(value = "id") @@ -98,6 +101,7 @@ private Integer visiterSex; @ApiModelProperty(value = "需走访人电话") @EncryptDecryptField private String visiterTele;
@@ -47,7 +47,7 @@ @GetMapping("/count") @ApiOperation(value = "走访任务统计", response= EventVisitCountVO.class) public R count(){ return gridService.countVisit(this.getCommunityId()); return gridService.countVisit(null); } /** @@ -91,7 +91,7 @@ @GetMapping("/export") @ApiOperation(value = "导出走访任务") public void export(HttpServletResponse response,EventTasksQuery query){ query.setCommunityId(this.getCommunityId()); // query.setCommunityId(this.getCommunityId()); query.setPageNum(1L); query.setPageSize(2000L); ServletOutputStream os = null; springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -17,7 +17,6 @@ import com.panzhihua.common.model.query.visit.EventTasksQuery; import com.panzhihua.common.model.query.visit.EventVisitListQuery; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.EventDetailsVO; import com.panzhihua.common.model.vos.grid.EventResourceVO; import com.panzhihua.common.model.vos.visit.*; import com.panzhihua.common.utlis.CopyUtil; @@ -158,9 +157,6 @@ if(eventVisitingTasksVO.getNationCode() != null){ eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode())); } if(eventVisitingTasksVO.getVisiterTele() != null){ eventVisitingTasksVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksVO.getVisiterTele(), aesKey)); } } return R.ok(page); } @@ -172,9 +168,6 @@ for(EventVisitingTasksVO eventVisitingTasksVO:page.getRecords()){ if(eventVisitingTasksVO.getNationCode() != null){ eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode())); } if(eventVisitingTasksVO.getVisiterTele() != null){ eventVisitingTasksVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksVO.getVisiterTele(), aesKey)); } } return R.ok(page); @@ -215,7 +208,6 @@ if(eventVisitingTasksDO!=null) { EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO(); BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO); eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(), aesKey)); eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson())); return R.ok(eventVisitingTasksDetailsVO); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml
@@ -51,9 +51,9 @@ <select id="count" parameterType="java.lang.Long" resultType="java.util.Map"> select count(id) as visit, (select count(id) from event_visiting_tasks where grid_member_community = #{communityId} and event_status = 3) as visited, (select count(id) from event_visiting_tasks where grid_member_community = #{communityId} and event_status = 6) as canceled from event_visiting_tasks WHERE grid_member_community = #{communityId} and event_status = 1 (select count(id) from event_visiting_tasks where event_status = 3) as visited, (select count(id) from event_visiting_tasks where event_status = 6) as canceled from event_visiting_tasks WHERE event_status = 1 </select> <select id="findListByPage" parameterType="com.panzhihua.common.model.query.visit.EventTasksQuery" resultType="com.panzhihua.common.model.vos.visit.EventVisitingTasksVO"> @@ -65,17 +65,8 @@ <if test = "query.communityId != null"> and p.act_id = #{query.communityId} </if> <if test = "query.status == 1"> and (vt.event_status = 3 or vt.event_status = 7) </if> <if test = "query.status == 2"> and (vt.event_status = 1 or vt.event_status = 2 or vt.event_status = 4) </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 != null and query.status != 0"> and vt.event_status = #{query.status} </if> <if test="query.tag != null and query.tag != ''"> p.label like concat('%',#{query.tag},'%')
