人员赋码 预警内容调整

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -246,11 +246,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         if (CollectionUtils.isNotEmpty(strings)) {
             join = String.join("；", strings);
         }
-        List<String> missCerList = new ArrayList<>();
-        missCerList.addAll(noCertificateList);
-        missCerList.addAll(overCertificateList);
-        String missCerStrings = String.join(",", missCerList);
-        personBasic.setMissingCertificate(missCerStrings);
+        personBasic.setMissingCertificate(join);
 
         if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) {
             personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode());
@@ -474,16 +470,12 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         if (CollectionUtils.isNotEmpty(strings)) {
             join = String.join("；", strings);
         }
-        List<String> missCerList = new ArrayList<>();
-        missCerList.addAll(noCertificateList);
-        missCerList.addAll(overCertificateList);
-        String missCerStrings = String.join(",", missCerList);
-        personBasic.setMissingCertificate(missCerStrings);
-
+        String missingCertificateOld = personBasic.getMissingCertificate();
+        personBasic.setMissingCertificate(join);
         CompanyModel companyModel = new CompanyModel();
         //单位
         companyModel = this.getCompanyModel(personAccount.getProjectId());
-        String qrcodeDescOld = personBasic.getQrcodeDesc();
+
         String qrcodeColorOld = personBasic.getQrcodeColor();
         if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) {
             personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode());
@@ -562,7 +554,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         }
         personAccount.setProjectName(companyModel.getCompanyName());
 
-        if (!qrcodeDescOld.equals(personBasic.getQrcodeDesc())) {
+        if (StringUtils.isNotEmpty(join) && !join.equals(missingCertificateOld)) {
             personBasic.setRecDate(new Date());
             this.personBasicMapper.updateById(personBasic);
             if (("证书不全".equals(personBasic.getQrcodeDesc()) ||