add

src/main/java/com/zfire/jiasm/syncdata/service/PublicService.java

@@ -131,5 +131,7 @@ public interface PublicService {
 
     void creatMkdir();
 
+    Date subOneYear(Date dt);
+
 
 }

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

@@ -129,7 +129,10 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
             iwcs.clear();
         }
 
-
+        Insure insure = publicService.getWebsitWorkerByWorkerAndWebsit("意外险");
+        if (insure == null){
+            return;
+        }
 
         List<WebsitWorker> wws = publicService.getWebsitWorkerByWorkerAndWebsit();
         if (CollectionUtils.isNotEmpty(wws)){
@@ -196,7 +199,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                     log.info("总部获取的工程师证件照信息wvos:{}", JSONObject.toJSONString(wvos));
                     // 同步-新增证件信息
                     getCertInfo(wvos, addList, workerId, WorkerCertWorkerIdMaps,wxg.getWdno(),workerIdandNames,
-                            workerWorkeridMap,insurecs,insurefiles, insureworkeridandWebsitids,websitWorderwidwdidMap);
+                            workerWorkeridMap,insurecs,insurefiles, insureworkeridandWebsitids,websitWorderwidwdidMap, insure);
                     // 新增或修改(证件)
                     addDataCert(addList);
                     // 修改保险信息
@@ -939,13 +942,13 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                              List<InsureWorkerCommercial> insurecs,
                              List<InsureWorkerCommercialFile> insurefiles,
                              List<String> insureworkeridandWebsitids,
-                             Map<String,List<WebsitWorker>> websitWorderwidwdidMap) throws ParseException {
+                             Map<String,List<WebsitWorker>> websitWorderwidwdidMap, Insure insure) throws ParseException {
         // 同步-新增证件信息
         for (ZJInfo zj: wvos.getZjInfoList()){
             // 保除证
             if (zj.getZjmc().trim().equals("保险证")){
                 if (produceBXInfo(workerId, wdno, workerWorkeridMap, insurecs, insurefiles,
-                        insureworkeridandWebsitids, zj,websitWorderwidwdidMap)){
+                        insureworkeridandWebsitids, zj,websitWorderwidwdidMap, insure)){
                     continue;
                 }
             }
@@ -994,7 +997,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
     private boolean produceBXInfo(String workerId, String wdno, Map<String, List<Worker>> workerWorkeridMap,
                                   List<InsureWorkerCommercial> insurecs, List<InsureWorkerCommercialFile> insurefiles,
                                   List<String> insureworkeridandWebsitids, ZJInfo zj,
-                                  Map<String, List<WebsitWorker>> websitWorderwidwdidMap) throws ParseException {
+                                  Map<String, List<WebsitWorker>> websitWorderwidwdidMap, Insure insure) throws ParseException {
         // 提取商户售后网点对应的平台售后网点信息 存在一对多的关系 无对应关系退出不处理
         List<WebsitOrderSign> wos = publicService.shShwdToptshwdByBrandWebsitNo(wdno);
         if (CollectionUtils.isEmpty(wos)){
@@ -1015,7 +1018,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
             }
 
             // 生成商用保险对像
-            InsureWorkerCommercial a = getInsureWorkerCommercial(workerId, workerWorkeridMap, insurecs, zj, item,websitWorkerId);
+            InsureWorkerCommercial a = getInsureWorkerCommercial(workerId, workerWorkeridMap, insurecs, zj, item,websitWorkerId, insure);
 
             // 生成附件对像
             getInsureWorkerCommercialFile(insurefiles, zj, a);
@@ -1047,7 +1050,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
     @NotNull
     private InsureWorkerCommercial getInsureWorkerCommercial(String workerId, Map<String, List<Worker>> workerWorkeridMap,
                                                              List<InsureWorkerCommercial> insurecs, ZJInfo zj,
-                                                             WebsitOrderSign item, String websitWorkerId) throws ParseException {
+                                                             WebsitOrderSign item, String websitWorkerId, Insure insure) throws ParseException {
         InsureWorkerCommercial a = new InsureWorkerCommercial();
         a.setId(IdWorker.getIdStr());
         a.setWorkerId(workerId);
@@ -1057,11 +1060,10 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         a.setWebsitWorkerId(websitWorkerId);
         a.setIdcard(workerWorkeridMap.get(workerId).get(0).getIdcard());
         if (StringUtils.isNotEmpty(zj.getZjyxq())){
-            a.setStartTime(baseService.utcToDateStr(zj.getZjyxq()));
+            a.setStartTime(publicService.subOneYear(baseService.utcToDateStr(zj.getZjyxq())));
             a.setEndTime(baseService.utcToDateStr(zj.getZjyxq()));
         }
         a.setExamineStatus("OK");
-        Insure insure = publicService.getWebsitWorkerByWorkerAndWebsit("意外险");
 
         if (insure !=null){
             a.setInsureBill(insure.getId());
@@ -1117,6 +1119,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
             add.setCertNo(zj.getZjbh());
         }
         if (StringUtils.isNotEmpty(zj.getZjyxq())){
+            add.setStartTime(publicService.subOneYear(baseService.utcToDateStr(zj.getZjyxq())));
             add.setExpireTime(baseService.utcToDateStr(zj.getZjyxq()));
         }
         if (StringUtils.isNotEmpty(zj.getZjfssj())){

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

@@ -1449,6 +1449,18 @@ public class PublicServiceImpl implements PublicService {
         }
     }
 
+    @Override
+    public Date subOneYear(Date dt){
+        // 创建一个Calendar对象
+        Calendar calendar = Calendar.getInstance();
+        // 设置日期
+        calendar.setTime(dt);
+        // 减去一年
+        calendar.add(Calendar.YEAR, -1);
+        // 获取减去一年后的日期
+        return calendar.getTime();
+    }
+
     private void setLocationByAddress(OrderBase orderBase) {
         if (StringUtils.isEmpty(orderBase.getLng()) || StringUtils.isEmpty(orderBase.getLat())) {
             String add = "";

src/main/java/com/zfire/jiasm/syncdata/test.java

@@ -147,6 +147,20 @@ public class test {
 
         System.out.println(roleIds);
 
+        Date ssDate = new Date();
+        System.out.println(ssDate);
+        ssDate.setTime(ssDate.getTime() - 24 * 60 * 60 * 1000);
+        System.out.println(ssDate);
+
+        // 创建一个Calendar对象
+        Calendar calendar = Calendar.getInstance();
+        // 设置日期为当前日期
+        calendar.setTime(new Date());
+        // 减去一年
+        calendar.add(Calendar.YEAR, -1);
+        // 获取减去一年后的日期
+        Date newDate = calendar.getTime();
+        System.out.println("减去一年后的日期: " + newDate);
 
     }
 

src/main/java/com/zfire/jiasm/syncdata/utils/HttpUtils.java

@@ -286,7 +286,7 @@ public class HttpUtils {
 
         InputStream is = null;
         FileOutputStream fos = null;
-        SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
+        SimpleDateFormat df = new SimpleDateFormat("yyyyMM");
         String dateString = df.format(new Date());
         String newFilePath = path + "/upload/miniqrcode/" + dateString + "/";
         String newFileName = new Date().getTime() + ".png";