Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -144,8 +144,10 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         List<String> list2 = new ArrayList<>();
         if (StringUtils.isNotEmpty(personUser.getPostName())) {
             String certificates = postNameMap.get(personUser.getPostName());
+            if (!StringUtils.isEmpty(certificates)) {
                 list2 = Arrays.asList(certificates.split(","));
             }
+        }
         List<String> list = new ArrayList(list2);
         //人员资质信息
         Integer isInMonth = 0;
@@ -154,7 +156,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
 
         if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
             for (PersonCertificate item : personCertificate.getCertificationInfo()) {
-                Date date = DateUtils.dateAddYears(item.getCertificateTime(), Integer.parseInt(item.getValidPeriod()));
+                int validPeriod = StringUtils.isEmpty(item.getValidPeriod()) ? 3 : Integer.parseInt(item.getValidPeriod());
+                Date date = DateUtils.dateAddYears(item.getCertificateTime(), validPeriod);
                 if (list.contains(item.getCertificateName()) &&
                         DateUtils.dateCompare(date, new Date()) == -1) {
                     isOver = 1;
@@ -175,13 +178,12 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
             personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
         }
         this.baseMapper.insert(personBasic);
-
+        if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
             personCertificate.getCertificationInfo().forEach(item -> {
                 item.setPersonId(personBasic.getSequenceNbr());
                 personCertificateService.save(item);
             });
-
-
+        }
         //人员技能学历信息
         PersonSkillEducation personSkillEducation = new PersonSkillEducation();
         BeanUtils.copyProperties(personUser, personSkillEducation);
@@ -309,15 +311,18 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         List<String> list2 = new ArrayList<>();
         if (StringUtils.isNotEmpty(personUser.getPostName())) {
             String certificates = String.valueOf(postNameMap.get(personUser.getPostName()));
+            if (!StringUtils.isEmpty(certificates)) {
                 list2 = Arrays.asList(certificates.split(","));
             }
+        }
         List<String> list = new ArrayList(list2);
         //人员资质信息
         Integer isInMonth = 0;
         Integer isOver = 0;
         if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
             for (PersonCertificate item : personCertificate.getCertificationInfo()) {
-                Date date = DateUtils.dateAddYears(item.getCertificateTime(), Integer.parseInt(item.getValidPeriod()));
+                int validPeriod = StringUtils.isEmpty(item.getValidPeriod()) ? 3 : Integer.parseInt(item.getValidPeriod());
+                Date date = DateUtils.dateAddYears(item.getCertificateTime(), validPeriod);
                 if (list.contains(item.getCertificateName()) &&
                         DateUtils.dateCompare(date, new Date()) == -1) {
                     isOver = 1;

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

@@ -61,14 +61,17 @@ public class PersonYardTimeTask {
         personBasicList.forEach(personBasic -> {
             List<PersonCertificate> personCertificateList = perCertificateMap.get(personBasic.getSequenceNbr());
 
+            String yuanShiQrcodeColor = personBasic.getQrcodeColor();
             //默认红码
             personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
             // 该岗位应获得的证书
             List<String> list2 = new ArrayList<>();
             if (StringUtils.isNotEmpty(personBasic.getPostName())) {
                 String certificates = String.valueOf(postNameMap.get(personBasic.getPostName()));
+                if (!StringUtils.isEmpty(certificates)) {
                     list2 = Arrays.asList(certificates.split(","));
                 }
+            }
             List<String> list = new ArrayList(list2);
             //人员资质信息
             Integer isInMonth = 0;
@@ -76,7 +79,8 @@ public class PersonYardTimeTask {
 
             if (CollectionUtils.isNotEmpty(personCertificateList)) {
                 for (PersonCertificate item : personCertificateList) {
-                    Date date = DateUtils.dateAddYears(item.getCertificateTime(), Integer.parseInt(item.getValidPeriod()));
+                    int validPeriod = StringUtils.isEmpty(item.getValidPeriod()) ? 3 : Integer.parseInt(item.getValidPeriod());
+                    Date date = DateUtils.dateAddYears(item.getCertificateTime(), validPeriod);
                     if (list.contains(item.getCertificateName()) &&
                             DateUtils.dateCompare(date, new Date()) == -1) {
                         isOver = 1;
@@ -100,7 +104,10 @@ public class PersonYardTimeTask {
             } else if (CollectionUtils.isEmpty(list) && isOver == 0 && isInMonth == 1) {
                 personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
             }
+            if (!yuanShiQrcodeColor.equals(personBasic.getQrcodeColor())) {
+                personBasic.setRecDate(new Date());
                 personBasics.add(personBasic);
+            }
         });
         personBasicService.updateBatchById(personBasics);
     }