add

src/main/java/com/zfire/jiasm/syncdata/base/WorkerCertificateInfo.java

@@ -3,6 +3,9 @@ package com.zfire.jiasm.syncdata.base;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author yaozx
  * @version 1.0
@@ -81,4 +84,30 @@ public class WorkerCertificateInfo {
     @ApiModelProperty(value = "复审日期")
     private String jszfsrq;
 
+
+    @ApiModelProperty(value = "电工证正面")
+    private String dgzz;
+    @ApiModelProperty(value = "电工证反面")
+    private String dgzf;
+    @ApiModelProperty(value = "电工证编号")
+    private String dgbh;
+    @ApiModelProperty(value = "有效期 必填")
+    private String dgyxq;
+    @ApiModelProperty(value = "复审日期")
+    private String dgfsrq;
+
+    @ApiModelProperty(value = "焊工证正面")
+    private String hgzz;
+    @ApiModelProperty(value = "焊工证反面")
+    private String hgzf;
+    @ApiModelProperty(value = "焊工证编号")
+    private String hgbh;
+    @ApiModelProperty(value = "有效期 必填")
+    private String hgyxq;
+    @ApiModelProperty(value = "复审日期")
+    private String hgfsrq;
+
+    // 其他证件
+    private List<WorkerCertificateOther> other = new ArrayList<>();
+
 }

src/main/java/com/zfire/jiasm/syncdata/base/WorkerCertificateOther.java

@@ -0,0 +1,27 @@
+package com.zfire.jiasm.syncdata.base;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yaozx
+ * @version 1.0
+ * @description 介绍
+ * @date 2023-09-08
+ */
+@Data
+public class WorkerCertificateOther {
+    @ApiModelProperty(value = "证件名称")
+    private String name;
+    @ApiModelProperty(value = "焊工证正面")
+    private String zz;
+    @ApiModelProperty(value = "焊工证反面")
+    private String zf;
+    @ApiModelProperty(value = "焊工证编号")
+    private String bh;
+    @ApiModelProperty(value = "有效期 必填")
+    private String yxq;
+    @ApiModelProperty(value = "复审日期")
+    private String fsrq;
+}

src/main/java/com/zfire/jiasm/syncdata/service/impl/PublicServiceImpl.java

@@ -1744,15 +1744,20 @@ public class PublicServiceImpl implements PublicService {
             awc.setCertFlag(1);
         } else if ("保险证".equals(certName)) {
             awc.setCertFlag(2);
-        } else if ("高空作业证".equals(certName) || "高空证".equals(certName)) {
+        } else if ("高空作业证".equals(certName)) {
             awc.setCertFlag(3);
             awc.setCertName("高空作业证");
-        } else if ("上岗证".equals(certName)) {
+        } else if ("上岗资格证".equals(certName)) {
             awc.setCertFlag(4);
-        } else if ("制冷证".equals(certName)) {
+        } else if ("制冷工证".equals(certName)) {
             awc.setCertFlag(5);
         } else if ("驾驶证".equals(certName)) {
             awc.setCertFlag(6);
+        } else if ("电工证".equals(certName)) {
+            awc.setCertFlag(7);
+        }
+        else if ("焊工证".equals(certName)) {
+            awc.setCertFlag(8);
         }
     }
 

src/main/java/com/zfire/jiasm/syncdata/service/impl/UploadWorkerTOGreeServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.base.WorkerCertificateInfo;
+import com.zfire.jiasm.syncdata.base.WorkerCertificateOther;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
 import com.zfire.jiasm.syncdata.gree.GreeLogic;
 import com.zfire.jiasm.syncdata.helper.GreeResponseHelper;
@@ -805,6 +806,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                 return Boolean.TRUE;
             }
         }
+
         if (StringUtils.isNotEmpty(workerCertificateInfo.getZlgbh())){
             if (StringUtils.isEmpty(workerCertificateInfo.getZlgfsrq())){
                 updateWorkerUploadLag(item,"师傅制冷证缺失证件复审时间:，不上传");
@@ -847,6 +849,17 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         // 驾驶证
         getjsz(workerCertificateInfo, workerId,wcgs);
 
+        // 电工证
+        getdgz(workerCertificateInfo, workerId,wcgs);
+
+        // 焊工证
+        gethgz(workerCertificateInfo, workerId,wcgs);
+
+
+        // 其他资格证
+        getotherz(workerCertificateInfo, workerId,wcgs);
+
+
         return Boolean.FALSE;
     }
 
@@ -885,12 +898,129 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         return Boolean.FALSE;
     }
 
+    private Boolean getdgz(WorkerCertificateInfo workerCertificateInfo, String workerId, List<WorkerCertGree> wcgs) throws ParseException {
+        WorkerCertGree wcg = null;
+
+        for (WorkerCertGree item :wcgs){
+            if ("电工证".equals(item.getCertName())){
+                wcg= item;
+                break;
+            }
+        }
+
+        // 无证件不处理
+        if (wcg == null){
+            return Boolean.TRUE;
+        }
+
+
+        if (StringUtils.isNotEmpty(wcg.getOutFileUrl())){
+            workerCertificateInfo.setDgzz(wcg.getOutFileUrl());
+        }
+        if (StringUtils.isNotEmpty(wcg.getOutFileUrl2())){
+            workerCertificateInfo.setDgzf(wcg.getOutFileUrl2());
+        }
+
+        workerCertificateInfo.setDgbh(wcg.getCertNo());
+
+        if (wcg.getExpireTime() !=null){
+            workerCertificateInfo.setDgyxq(datesub(wcg.getExpireTime()));
+        }
+        if (wcg.getReviewTime() !=null){
+            workerCertificateInfo.setDgfsrq(datesub(wcg.getReviewTime()));
+        }
+
+        return Boolean.FALSE;
+    }
+
+    private Boolean gethgz(WorkerCertificateInfo workerCertificateInfo, String workerId, List<WorkerCertGree> wcgs) throws ParseException {
+        WorkerCertGree wcg = null;
+
+        for (WorkerCertGree item :wcgs){
+            if ("焊工证".equals(item.getCertName())){
+                wcg= item;
+                break;
+            }
+        }
+
+        // 无证件不处理
+        if (wcg == null){
+            return Boolean.TRUE;
+        }
+
+
+        if (StringUtils.isNotEmpty(wcg.getOutFileUrl())){
+            workerCertificateInfo.setHgzz(wcg.getOutFileUrl());
+        }
+        if (StringUtils.isNotEmpty(wcg.getOutFileUrl2())){
+            workerCertificateInfo.setHgzf(wcg.getOutFileUrl2());
+        }
+
+        workerCertificateInfo.setHgbh(wcg.getCertNo());
+
+        if (wcg.getExpireTime() !=null){
+            workerCertificateInfo.setHgyxq(datesub(wcg.getExpireTime()));
+        }
+        if (wcg.getReviewTime() !=null){
+            workerCertificateInfo.setHgfsrq(datesub(wcg.getReviewTime()));
+        }
+
+        return Boolean.FALSE;
+    }
+
+    private Boolean getotherz(WorkerCertificateInfo workerCertificateInfo, String workerId, List<WorkerCertGree> wcgs) throws ParseException {
+        WorkerCertGree wcg = null;
+        List<WorkerCertificateOther> others = new ArrayList<>();
+
+        for (WorkerCertGree item :wcgs){
+            if (!("身份证".equals(item.getCertName())) &&
+                    !("保险证".equals(item.getCertName())) &&
+                    !("高空作业证".equals(item.getCertName())) &&
+                    !("上岗资格证".equals(item.getCertName())) &&
+                    !("制冷工证".equals(item.getCertName())) &&
+                    !("驾驶证".equals(item.getCertName())) &&
+                    !("电工证".equals(item.getCertName())) &&
+                    !("焊工证".equals(item.getCertName()))){
+                wcg= item;
+                WorkerCertificateOther other = new WorkerCertificateOther();
+
+                other.setName(wcg.getCertName());
+
+                if (StringUtils.isNotEmpty(wcg.getOutFileUrl())){
+                    other.setZz(wcg.getOutFileUrl());
+                }
+                if (StringUtils.isNotEmpty(wcg.getOutFileUrl2())){
+                    other.setZf(wcg.getOutFileUrl2());
+                }
+
+                if (StringUtils.isNotEmpty(wcg.getCertNo())){
+                    other.setBh(wcg.getCertNo());
+                }
+
+                if (wcg.getExpireTime() !=null){
+                    other.setYxq(datesub(wcg.getExpireTime()));
+                }
+                if (wcg.getReviewTime() !=null){
+                    other.setFsrq(datesub(wcg.getReviewTime()));
+                }
+
+                others.add(other);
+            }
+        }
+
+        if (others.size()>0){
+            workerCertificateInfo.getOther().addAll(others);
+        }
+
+        return Boolean.FALSE;
+    }
+
     // true为有信息
     private Boolean getzlz(WorkerCertificateInfo workerCertificateInfo, String workerId, List<WorkerCertGree> wcgs) throws ParseException {
         WorkerCertGree wcg = null;
 
         for (WorkerCertGree item :wcgs){
-            if ("制冷证".equals(item.getCertName())){
+            if ("制冷工证".equals(item.getCertName())){
                 wcg= item;
                 break;
             }
@@ -924,7 +1054,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         WorkerCertGree wcg = null;
 
         for (WorkerCertGree item :wcgs){
-            if ("上岗证".equals(item.getCertName())){
+            if ("上岗资格证".equals(item.getCertName())){
                 wcg= item;
                 break;
             }
@@ -1572,6 +1702,89 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
 
             zjInfoList.add(zjInfo);
         }
+
+        // 电工证
+        if (StringUtils.isNotEmpty(workerCertificateInfo.getDgbh())){
+            ZJInfo zjInfo = new ZJInfo();
+            zjInfo.setZjbh(workerCertificateInfo.getDgbh());
+            zjInfo.setZjmc("电工证");
+
+            // 证件路径 必填
+            if (StringUtils.isNotEmpty(workerCertificateInfo.getDgzz())) {
+                zjInfo.setZjlj(workerCertificateInfo.getDgzz());
+            }
+            if (StringUtils.isNotEmpty(workerCertificateInfo.getDgzf())) {
+                if (StringUtils.isNotEmpty(workerCertificateInfo.getDgzz())) {
+                    zjInfo.setZjlj(zjInfo.getZjlj() + "," + workerCertificateInfo.getDgzf());
+                } else {
+                    zjInfo.setZjlj(workerCertificateInfo.getDgzf());
+                }
+            }
+
+            zjInfo.setZjfssj(workerCertificateInfo.getDgfsrq());
+            zjInfo.setZjyxq(workerCertificateInfo.getDgyxq());
+
+            zjInfoList.add(zjInfo);
+        }
+
+        // 焊工证
+        if (StringUtils.isNotEmpty(workerCertificateInfo.getHgbh())){
+            ZJInfo zjInfo = new ZJInfo();
+            zjInfo.setZjbh(workerCertificateInfo.getHgbh());
+            zjInfo.setZjmc("焊工证");
+
+            // 证件路径 必填
+            if (StringUtils.isNotEmpty(workerCertificateInfo.getHgzz())) {
+                zjInfo.setZjlj(workerCertificateInfo.getHgzz());
+            }
+            if (StringUtils.isNotEmpty(workerCertificateInfo.getHgzf())) {
+                if (StringUtils.isNotEmpty(workerCertificateInfo.getHgzz())) {
+                    zjInfo.setZjlj(zjInfo.getZjlj() + "," + workerCertificateInfo.getHgzf());
+                } else {
+                    zjInfo.setZjlj(workerCertificateInfo.getHgzf());
+                }
+            }
+
+            zjInfo.setZjfssj(workerCertificateInfo.getHgfsrq());
+            zjInfo.setZjyxq(workerCertificateInfo.getHgyxq());
+
+            zjInfoList.add(zjInfo);
+        }
+
+        // 其他证件
+        for (WorkerCertificateOther item :workerCertificateInfo.getOther()){
+            if (StringUtils.isNotEmpty(item.getBh())){
+                ZJInfo zjInfo = new ZJInfo();
+                zjInfo.setZjbh(item.getBh());
+                zjInfo.setZjmc(item.getName());
+
+                // 证件路径 必填
+                if (StringUtils.isNotEmpty(item.getZz())) {
+                    zjInfo.setZjlj(item.getZz());
+                }
+                if (StringUtils.isNotEmpty(item.getZf())) {
+                    if (StringUtils.isNotEmpty(item.getZz())) {
+                        zjInfo.setZjlj(zjInfo.getZjlj() + "," + item.getZf());
+                    } else {
+                        zjInfo.setZjlj(item.getZf());
+                    }
+                }
+
+                zjInfo.setZjfssj(item.getFsrq());
+                zjInfo.setZjyxq(item.getYxq());
+
+                zjInfoList.add(zjInfo);
+            }
+        }
+
+
+
+
+
+
+
+
+
     }
 
     /**

src/main/resources/bootstrap-prd.properties

@@ -169,7 +169,7 @@ gdbaseurl=http://47.115.43.13:8112/
 
 ######################## 同步定时任务时间隔 ########################
 #师傅 证件、师傅、工单子表信息
-workercertificate=180000
+workercertificate=60000
 workercerupload=60000
 detaildown=2000
 workercertbx=60000