花城E+防疫修改

101captain

2022-04-27 d93ff5e648792f82defc2204b5a3697436887161

花城E+防疫修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java

@@ -2,8 +2,10 @@

import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.net.URL;
import java.util.Date;

/**
@@ -102,4 +104,16 @@
     */
    @ExcelProperty(value = "48小时内核酸检测")
    private String acidTest;

    @ExcelProperty("健康码截图")
    private URL colorImage;

    @ExcelProperty("行程码截图")
    private URL travelImage;

    @ExcelProperty("48小时核酸截图")
    private URL acidImage;

    @ExcelProperty("疫苗接种截图")
    private URL vaccinationImage;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordVO.java

@@ -144,6 +144,18 @@
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createTime;

    @ApiModelProperty("健康码截图")
    private String colorImage;

    @ApiModelProperty("行程码截图")
    private String travelImage;

    @ApiModelProperty("48小时核酸截图")
    private String acidImage;

    @ApiModelProperty("疫苗接种截图")
    private String vaccinationImage;


    public interface type{
        int zj=1;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java

@@ -15,29 +15,19 @@
@Data
public class ComPbMemberExcelVO {

    @ExcelProperty(value = "账号", index = 0)
    @ExcelProperty(value = "联系电话", index = 1)
    private String phone;

    @ExcelProperty(value = "党员姓名", index = 1)
    @ExcelProperty(value = "党员姓名", index = 0)
    private String name;

    @ExcelProperty(value = "所属党组织", index = 2)
    @ExcelProperty(value = "所属党组织", index = 4)
    private String orgName;

    @ExcelProperty(value = "入党日期", index = 3)
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date joinTime;
    @ExcelProperty(value = "技能特长", index = 2)
    private String specialtyName;

    @ExcelProperty(value = "转正日期", index = 4)
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date employmentTime;

    @ExcelProperty(value = "报道单位", index = 5)
    @ExcelProperty(value = "报道单位", index = 3)
    private String checkUnitName;

    @ExcelProperty(value = "党龄", index = 6)
    private Integer partyAge;

    @ExcelProperty(value = "状态",index = 7)
    private String status;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidRecord.java

@@ -150,4 +150,16 @@

    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createTime;

    @ApiModelProperty("健康码截图")
    private String colorImage;

    @ApiModelProperty("行程码截图")
    private String travelImage;

    @ApiModelProperty("48小时核酸截图")
    private String acidImage;

    @ApiModelProperty("疫苗接种截图")
    private String vaccinationImage;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java

@@ -52,7 +52,7 @@
    public R insertRecord(ComActAcidRecordVO comActAcidRecordVO) {
        Integer count= this.baseMapper.selectCount(new QueryWrapper<ComActAcidRecord>().lambda().eq(ComActAcidRecord::getIdCard,comActAcidRecordVO.getIdCard()).ge(ComActAcidRecord::getCreateTime, DateUtils.getCurrentDate(DateUtils.yyyyMMdd_format)));
        if(count>0){
            return R.ok();
            return R.fail("请勿重复提交");
        }
        if(StringUtils.isEmpty(comActAcidRecordVO.getLocalCity())){
            rabbitTemplate.convertAndSend("huacheng.acid.exchange", "huacheng.acid.key", comActAcidRecordVO, message -> {

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -127,7 +127,7 @@
    public R listSavePartyBuildingMemberExcelVO(List<PartyBuildingMemberExcelVO> list) {
        // Boolean aBoolean = stringRedisTemplate.hasKey(REDIS_ORG_ALL);
        // ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        List<PartyOrganizationVO> partyOrganizationVOS = new ArrayList<>();
        //List<PartyOrganizationVO> partyOrganizationVOS = new ArrayList<>();
        // if (aBoolean) {
        // String orgs = valueOperations.get(REDIS_ORG_ALL);
        // if (!ObjectUtils.isEmpty(orgs)) {
@@ -148,16 +148,36 @@
        // }
        // valueOperations.set(REDIS_ORG_ALL,JSONArray.toJSONString(partyOrganizationVOS),24, TimeUnit.HOURS);
        // }
        list.forEach(partyBuildingMemberExcelVO -> {
        List<ComPbMemberDO> comPbMemberDOS = new ArrayList<>();
        if (!ObjectUtils.isEmpty(list)) {
            for (PartyBuildingMemberExcelVO partyBuildingMemberExcelVO : list) {
                if(StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getName())&&StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getPhone())&&StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getOrgName())){
            ComPbMemberDO comPbMemberDO=new ComPbMemberDO();
                    Date date = new Date();
                    comPbMemberDO.setUpdateAt(date);
                    comPbMemberDO.setCreateAt(date);
                    List<ComPbMemberDO> comPbMemberDOList = this.baseMapper.selectList(new QueryWrapper<ComPbMemberDO>()
                            .lambda().eq(ComPbMemberDO::getPhone, partyBuildingMemberExcelVO.getPhone())
                            .eq(ComPbMemberDO::getCommunityId, partyBuildingMemberExcelVO.getCommunityId()));
                    if (!comPbMemberDOList.isEmpty()) {
                        comPbMemberDOList.forEach(comPbMember -> {
                            BeanUtils.copyProperties(partyBuildingMemberExcelVO, comPbMember);
                            this.baseMapper.updateById(comPbMember);
                        });
                        continue;
                        // throw new PartyBuildingMemberException("导入失败，您导入的数据中有已存在的党员信息,已存在的数据:"+
                        // partyBuildingMemberExcelVO.getEmploymentTime() + "，已存在的人名：" +
                        // partyBuildingMemberExcelVO.getName());
                    }
            BeanUtils.copyProperties(partyBuildingMemberExcelVO,comPbMemberDO);
            boolean flag=this.save(comPbMemberDO);
            if(flag){
                //修改党员状态
                userService.updateUserIsPartymemberByPhone(comPbMemberDO.getPhone());
                    comPbMemberDOS.add(comPbMemberDO);
                }
                else {
                    throw new PartyBuildingMemberException("导入失败，你导入的内容有未填报项");
            }
                }
        );
            this.saveBatch(comPbMemberDOS);
        }
        return R.ok();
    }