Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-06-29 7088afc56b7e08d69b5b470b123e95e2b49d5d17

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.visit;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.enums.EventTasksStatusEnum;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
@@ -22,21 +24,25 @@
    private static final long serialVersionUID = -5758072851661612412L;

    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("需走访人id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long visiterId;

    @ApiModelProperty("需走访人姓名")
    private String visiterName;

    @ApiModelProperty("网格员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMember;

    @ApiModelProperty("网格员")
    private String gridMemberName;

    @ApiModelProperty("处理人id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long dellUserId;

    @ApiModelProperty("处理人")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitListVO.java

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.visit;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.enums.EventTasksStatusEnum;
import com.panzhihua.common.enums.EventTasksVisitorTypeEnum;
import io.swagger.annotations.ApiModel;
@@ -18,6 +20,7 @@
public class EventVisitListVO {

    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("真实姓名")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java

@@ -2,6 +2,8 @@

import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.dtos.EventResourceDTO;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
@@ -26,15 +28,19 @@
public class EventVisitingTasksDetailsVO {

    @ApiModelProperty(value = "id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty(value = "网格员所处的街道")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMemberStreet;

    @ApiModelProperty(value = "网格员所处社区")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMemberCommunity;

    @ApiModelProperty(value = "网格员")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMember;

    @ApiModelProperty(value = "网格员名字")
@@ -44,6 +50,7 @@
    private String gridMenberTele;

    @ApiModelProperty(value = "需走访人ID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long visiterId;

    @ApiModelProperty(value = "需走访人名字")
@@ -94,6 +101,7 @@
    private Integer dellType;

    @ApiModelProperty(value = "处理人ID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long dellUserId;

    @ApiModelProperty(value = "处理人名称")
@@ -126,6 +134,7 @@
    private JSONObject tableContentJson;

    @ApiModelProperty(value = "创建人")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long createBy;

    @ApiModelProperty(value = "创建事件")
@@ -133,6 +142,7 @@
    private Date createAt;

    @ApiModelProperty(value = "修改人")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long updateBy;

    @ApiModelProperty(value = "修改时间")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java

@@ -1,7 +1,10 @@
package com.panzhihua.common.model.vos.visit;

import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.enums.EventTasksStatusEnum;
import com.panzhihua.common.enums.EventTasksVisitorTypeEnum;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
@@ -21,71 +24,77 @@
 * */
@Data
@ApiModel("重点人群走访记录返回参数")
@ExcelIgnoreUnannotated
@EncryptDecryptClass
public class EventVisitingTasksVO {

    @ApiModelProperty(value = "id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ExcelProperty(value = "序号",index = 0)
    private Integer rowNum;
//    @ExcelProperty(value = "序号",index = 0)
//    private Integer rowNum;

    @ExcelProperty(value = "创建时间",index = 1)
    @ExcelProperty(value = "创建时间",index = 0)
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ExcelProperty(value = "创建人",index = 2)
    @ExcelProperty(value = "创建人",index = 1)
    @ApiModelProperty(value = "创建人")
    private String creator;

    @ExcelProperty(value = "走访对象",index = 3)
    @ExcelProperty(value = "走访对象",index = 2)
    @ApiModelProperty(value = "需走访人名字")
    private String visiterName;


    @ExcelProperty(value = "身份证号码",index = 4)
    @ExcelProperty(value = "身份证号码",index = 3)
    @ApiModelProperty(value = "身份证号码")
    private String cardNoStr;

    @ExcelProperty(value = "走访地址",index = 5)
    @ExcelProperty(value = "走访地址",index = 4)
    @ApiModelProperty(value = "走访地址")
    private String visiterAddress;

    @ExcelProperty(value = "人员标签",index = 6)
    @ExcelProperty(value = "人员标签",index = 5)
    @ApiModelProperty(value = "人员标签")
    private String visiterTypeName;

    @ExcelProperty(value = "走访人",index = 7)
    @ExcelProperty(value = "走访人",index = 6)
    @ApiModelProperty(value = "走访人")
    private String dellUserName;

    @ExcelProperty(value = "完成走访时间",index = 8)
    @ExcelProperty(value = "完成走访时间",index = 7)
    @ApiModelProperty(value = "完成走访时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date submitDate;

    @ExcelProperty(value = "撤销时间",index = 9)
    @ExcelProperty(value = "撤销时间",index = 8)
    @ApiModelProperty(value = "撤销时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date cancelTime;

    @ExcelProperty(value = "状态",index = 10)
    @ExcelProperty(value = "状态",index = 9)
    @ApiModelProperty(value = "状态")
    private String eventStatusName;



    @ApiModelProperty(value = "需走访人ID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long visiterId;

    @ApiModelProperty(value = "网格员所处的街道")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMemberStreet;

    @ApiModelProperty(value = "网格员所处社区")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMemberCommunity;

    @ApiModelProperty(value = "网格员")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMember;

    @ApiModelProperty(value = "网格员名字")
@@ -149,6 +158,7 @@
    private Integer dellType;

    @ApiModelProperty(value = "处理人ID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long dellUserId;


@@ -178,10 +188,12 @@
    private String tableContentJson;

    @ApiModelProperty(value = "创建人id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long createBy;


    @ApiModelProperty(value = "修改人")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long updateBy;

    @ApiModelProperty(value = "修改时间")

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventVisitingTasksApi.java

@@ -98,10 +98,10 @@
            List<EventVisitingTasksVO> list = gridService.exportTaskList(query);
            response.setContentType("application/vnd.ms-excel");
            response.setCharacterEncoding("utf-8");
            String fileName = "走访任务-"+ DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss");
            String fileName = "走访任务-"+ DateUtil.format(new Date(),"yyyyMMddHHmmss");
            response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20") + ".xlsx");
            // 如果不用模板的方式导出的话，是doWrite
            EasyExcel.write(response.getOutputStream(), EventVisitingTasksVO.class).sheet(fileName).doWrite(list);
            EasyExcel.write(os, EventVisitingTasksVO.class).sheet(fileName).doWrite(list);
            os.flush();
        } catch (IOException e) {
            e.printStackTrace();
        }finally {

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java

@@ -229,18 +229,26 @@
    @Transactional(rollbackFor = Exception.class)
    @Override
    public R add(IdDTO idDTO, Long communityId, Long userId) throws Exception {
        Map<String,Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId,6);
        if(CollectionUtils.isEmpty(map)){
            return R.fail("网格员不存在");
        }

//        Map<String,Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId,6);
//        if(CollectionUtils.isEmpty(map)){
//            return R.fail("网格员不存在");
//        }

        StringBuilder rt = new StringBuilder();
        String[] id = idDTO.getId().split(",");
        for(String idstr:id){
            if(StringUtils.isEmpty(idstr)){
                continue;
            }
            addVisitingTask(Long.valueOf(idstr),map,communityId,userId);
            String error = addVisitingTask(Long.valueOf(idstr),communityId,userId);
            if(!StringUtils.isEmpty(error)){
                rt.append(error);
        }

        }
        if(!StringUtils.isEmpty(rt)){
            return R.fail("部分新增失败"+rt.toString());
        }
        return R.ok();
    }

@@ -250,15 +258,16 @@
        return page.getRecords();
    }

    private void addVisitingTask(Long id, Map<String, Object> gridMap,Long communityId,Long userId) throws Exception{
    private String addVisitingTask(Long id, Long communityId,Long userId) throws Exception{

        Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
        if(CollectionUtils.isEmpty(map)){
            return "被访问人ID["+id+"]不存在;";
        }

        Integer count = eventVisitingTasksMapper.countNoneComplete(id);
        if(count > 0){
            return;
        }
        Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
        if(CollectionUtils.isEmpty(map)){
            return ;
            return "被访问人["+map.get("name")+"]只能同时存在一条待走访任务;";
        }
        EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
//        visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
@@ -296,6 +305,7 @@
        }

        eventVisitingTasksMapper.insert(visitingTasksDO);
        return null;
    }

    private List<String> getOption(String label) {