Merge branch 'developer' of http://36.40.66.175:5000/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonBasic.java

@@ -167,4 +167,10 @@ public class PersonBasic extends BaseEntity {
      */
     @TableField("qrcode_date")
     private Date qrcodeDate;
+
+    /**
+     * 缺少/过期的证书
+     */
+    @TableField("missing_certificate")
+    private String missingCertificate;
 }

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

@@ -243,7 +243,11 @@ 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);
 
         if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) {
             personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode());
@@ -468,6 +472,11 @@ 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);
 
         CompanyModel companyModel = new CompanyModel();
         //单位