springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java
@@ -78,53 +78,53 @@ @ApiModelProperty(value = "需走访人ID") private Long visiterId; // @ApiModelProperty(value = "网格员所处的街道") // private Long gridMemberStreet; // // @ApiModelProperty(value = "网格员所处社区") // private Long gridMemberCommunity; // // @ApiModelProperty(value = "网格员") // private Long gridMember; // // @ApiModelProperty(value = "网格员名字") // private String gridMemberName; // // @ApiModelProperty(value = "网格员联系方式") // private String gridMenberTele; // // // @ApiModelProperty(value = "需走访人员性别") // private Integer visiterSex; // // @ApiModelProperty(value = "需走访人电话") // private String visiterTele; // // @ApiModelProperty(value = "网格员所处的街道") private Long gridMemberStreet; @ApiModelProperty(value = "网格员所处社区") private Long gridMemberCommunity; @ApiModelProperty(value = "网格员") private Long gridMember; @ApiModelProperty(value = "网格员名字") private String gridMemberName; @ApiModelProperty(value = "网格员联系方式") private String gridMenberTele; @ApiModelProperty(value = "需走访人员性别") private Integer visiterSex; @ApiModelProperty(value = "需走访人电话") private String visiterTele; @ExcelIgnore private Integer visiterType; // // @ApiModelProperty(value = "事件标题") // private String eventTitle; // // @ApiModelProperty(value = "事件类型") // private Integer eventType; // // @ApiModelProperty(value = "事件描述") // private String eventDes; // // @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)") // private Integer actOpara; // // @ApiModelProperty(value = "发生时间") // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // private Date happenTime; // // @ApiModelProperty(value = "发生地点") // private String happentAddress; // // @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）") // private String happentLatLng; @ApiModelProperty(value = "事件标题") private String eventTitle; @ApiModelProperty(value = "事件类型") private Integer eventType; @ApiModelProperty(value = "事件描述") private String eventDes; @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)") private Integer actOpara; @ApiModelProperty(value = "发生时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date happenTime; @ApiModelProperty(value = "发生地点") private String happentAddress; @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）") private String happentLatLng; // @ExcelIgnore private Integer eventStatus; @@ -142,59 +142,66 @@ } return EventTasksVisitorTypeEnum.getName(visiterType); } // // @ApiModelProperty(value = "上报状态") // private Integer reporting; // // @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）") // private Integer dellType; // // @ApiModelProperty(value = "处理人ID") // private Long dellUserId; // // // // @ApiModelProperty(value = "处理时间") // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // private Date dellDate; // // // @ApiModelProperty(value = "解决人针对解决事件的处理描述") // private String dellDesc; // // @ApiModelProperty(value = "是否有效") // private Boolean invalid; // // @ApiModelProperty(value = "是否紧急") // private Boolean urgent; // // @ApiModelProperty(value = "是否催办") // private Boolean urgentDell; // // @ApiModelProperty(value = "上报提交时间") // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // private Date submitDate; // // @ApiModelProperty(value = "是否异常行为") // private Boolean exception; // // @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据") // private String tableContentJson; // // @ApiModelProperty(value = "创建人id") // private Long createBy; // // // @ApiModelProperty(value = "修改人") // private Long updateBy; // // @ApiModelProperty(value = "修改时间") // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // private Date updateAt; // // @ApiModelProperty(value = "标签") // private String label; @ApiModelProperty(value = "上报状态") private Integer reporting; @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）") private Integer dellType; @ApiModelProperty(value = "处理人ID") private Long dellUserId; @ApiModelProperty(value = "处理时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date dellDate; @ApiModelProperty(value = "解决人针对解决事件的处理描述") private String dellDesc; @ApiModelProperty(value = "是否有效") private Boolean invalid; @ApiModelProperty(value = "是否紧急") private Boolean urgent; @ApiModelProperty(value = "是否催办") private Boolean urgentDell; @ApiModelProperty(value = "是否异常行为") private Boolean exception; @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据") private String tableContentJson; @ApiModelProperty(value = "创建人id") private Long createBy; @ApiModelProperty(value = "修改人") private Long updateBy; @ApiModelProperty(value = "修改时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt; @ApiModelProperty(value = "标签") private String label; @ApiModelProperty(value = "年龄") private Integer age; @ApiModelProperty(value = "电话") private String phone; private Integer nationCode; @ApiModelProperty(value = "民族") private String nation; } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java
@@ -102,7 +102,7 @@ * @return */ @PostMapping("/add") R add(@RequestParam("ids") String ids,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId){ R add(@RequestParam("ids") String ids,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId) throws Exception { return eventVisitingTasksService.add(ids,communityId,userId); } @@ -123,7 +123,7 @@ * @return */ @PostMapping("/taskList") R taskList(@RequestBody EventTasksQuery query){ R taskList(@RequestBody EventTasksQuery query) throws Exception { return eventVisitingTasksService.taskList(query); } @@ -134,7 +134,7 @@ * @return */ @PostMapping("/exportTaskList") List<EventVisitingTasksVO> exportTaskList(@RequestBody EventTasksQuery query){ List<EventVisitingTasksVO> exportTaskList(@RequestBody EventTasksQuery query) throws Exception { return eventVisitingTasksService.exportTaskList(query); }
@@ -80,7 +80,7 @@ * @param query * @return */ R taskList(EventTasksQuery query); R taskList(EventTasksQuery query) throws Exception; /** * 删除走访任务 @@ -118,9 +118,9 @@ * @param userId * @return */ R add(String ids, Long communityId, Long userId); R add(String ids, Long communityId, Long userId) throws Exception; List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query); List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query) throws Exception; /** * 撤销 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.enums.EventTasksStatusEnum; import com.panzhihua.common.enums.PopulPoliticalOutlookEnum; import com.panzhihua.common.model.dtos.grid.EventVisitingTasksAddDTO; import com.panzhihua.common.model.dtos.grid.EventVisitingTasksDeleteDTO; import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO; @@ -27,6 +28,11 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import javax.crypto.BadPaddingException; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.util.*; /** @@ -131,10 +137,21 @@ } @Override public R taskList(EventTasksQuery query) { public R taskList(EventTasksQuery query) throws Exception{ IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(),query.getPageSize()),query); 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)); } page.getRecords().forEach(e->{ }); return R.ok(page); } @@ -182,7 +199,7 @@ @Transactional(rollbackFor = Exception.class) @Override public R add(String ids, Long communityId, Long userId) { public R add(String ids, Long communityId, Long userId) throws Exception { Map<String,Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId,6); if(CollectionUtils.isEmpty(map)){ return R.fail("网格员不存在"); @@ -199,15 +216,14 @@ } @Override public List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query) { public List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query) throws Exception { IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(),query.getPageSize()),query); return page.getRecords(); } private void addVisitingTask(Long id, Map<String, Object> gridMap,Long communityId,Long userId) { private void addVisitingTask(Long id, Map<String, Object> gridMap,Long communityId,Long userId) throws Exception{ Integer count = eventVisitingTasksMapper.countNoneComplete(id); if(count > 0){ @@ -226,7 +242,9 @@ visitingTasksDO.setVisiterId(Long.valueOf(map.get("id").toString())); visitingTasksDO.setVisiterName(map.get("name").toString()); visitingTasksDO.setVisiterSex(Integer.valueOf(map.get("sex").toString())); visitingTasksDO.setVisiterTele(map.get("phone") == null?"":map.get("phone").toString()); if(map.get("phone") != null){ visitingTasksDO.setVisiterTele(AESUtil.decrypt128(map.get("phone").toString(),aesKey)); } 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
@@ -57,13 +57,16 @@ </select> <select id="findListByPage" parameterType="com.panzhihua.common.model.query.visit.EventTasksQuery" resultType="com.panzhihua.common.model.vos.visit.EventVisitingTasksVO"> select vt.id,vt.create_at,vt.create_by,vt.visiter_id,vt.visiter_name,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.cancel_time,vt.event_status, vt.event_status,p.card_no_str,p.label,u.name as creator select vt.id,vt.create_at,vt.create_by,vt.visiter_id,vt.visiter_name,vt.visiter_tele,vt.visiter_sex,vt.visiter_address,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.cancel_time,vt.event_status, TIMESTAMPDIFF(YEAR, p.birthday, CURDATE()) AS age,p.card_no_str,p.label,u.name as creator,p.nation_code 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 vt.grid_member_community = #{query.communityId} <if test="query.status != null and query.status != ''"> and vt.event_status = #{query.status} where p.act_id = #{query.communityId} <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) </if> <if test="query.tag != null and query.tag != ''"> p.label like concat('%',#{query.tag},'%') @@ -90,10 +93,10 @@ <if test = "query.communityId !=null"> and vt.grid_member_community = #{query.communityId} </if> <if test = "query.status != null and query.status == 1"> <if test = "query.status == 1"> and (vt.event_status = 3 or vt.event_status = 7) </if> <if test = "query.status != null and query.status == 2"> <if test = "query.status == 2"> and (vt.event_status = 1 or vt.event_status = 2) </if>
