赋码问题处理

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

@@ -161,4 +161,10 @@ public class PersonBasic extends BaseEntity {
      */
     @TableField("qrcode_desc")
     private String qrcodeDesc;
+
+    /**
+     * 赋码颜色描述
+     */
+    @TableField("qrcode_date")
+    private Date qrcodeDate;
 }

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

@@ -221,7 +221,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) {
             personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode());
             personBasic.setQrcodeDesc("证书齐全");
-        } else if (CollectionUtils.isEmpty(list) && isOver == 1) {
+            personBasic.setQrcodeDate(new Date());
+        } else if ((CollectionUtils.isEmpty(list) && isOver == 1) || (CollectionUtils.isNotEmpty(list))) {
 //            personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
             personBasic.setQrcodeDesc("证书不全");
         } else if (CollectionUtils.isEmpty(list) && isOver == 0 && isInMonth == 1) {
@@ -419,11 +420,12 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) {
             personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode());
             personBasic.setQrcodeDesc("证书齐全");
-        } else if (CollectionUtils.isEmpty(list) && isOver == 1) {
-            personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
+            personBasic.setQrcodeDate(new Date());
+        } else if ((CollectionUtils.isEmpty(list) && isOver == 1) || (CollectionUtils.isNotEmpty(list))) {
+//            personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
             personBasic.setQrcodeDesc("证书不全");
         } else if (CollectionUtils.isEmpty(list) && isOver == 0 && isInMonth == 1) {
-            personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
+//            personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
             personBasic.setQrcodeDesc("证书临期");
         }
         personBasic.setProjectOrgCode(companyModel.getOrgCode());