add

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

@@ -156,6 +156,7 @@ public interface PublicService {
     String getUUID();
 
     Date getYearFirstDay(Date date) throws ParseException;
+    Date getYearFirstDayT(Date date) throws ParseException;
     Date getYearLastDay(Date date) throws ParseException;
     void setWorkerCertGreeId(WorkerCertGree awc, Map<String,String> wcgids);
     void setCertFlag(String certName, WorkerCertGree awc);

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

@@ -1537,7 +1537,6 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 }
             }*/
 
-            ///////////////////////////////////////////////////
             // 保险数据无变化时不处理
             WebsitWorker ww = getWebsitWorker(workerId, zj, websitWorderwidwdidMap, item);
             if (ww == null) {
@@ -1549,7 +1548,6 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
             // 获取师傅保险信息
             getWebsitWorkerInfo(zj, upWebsitWorkers, ww, websitWorderwidwdidMap);
-            //////////////////////////////////////////////////////
         }
     }
 
@@ -1626,7 +1624,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
             upwwinfo.setGmbxyxq(baseService.utcToDateStr(zj.getZjyxq()));
             //因总部没开始时间，直接以1年前set进去
             if(upwwinfo.getGmbxyxq() != null){
-                upwwinfo.setInsureStartTime(DateUtil.offsetMonth(upwwinfo.getGmbxyxq(),-12));
+                upwwinfo.setInsureStartTime(publicService.getYearFirstDayT(DateUtil.offsetMonth(upwwinfo.getGmbxyxq(),-12)));
             }
             Date n = new Date();
             if ((upwwinfo.getInsureStartTime().compareTo(n)<=0) &&
@@ -1791,7 +1789,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
             add.setCertNo(zj.getZjbh());
         }
         if (StringUtils.isNotEmpty(zj.getZjyxq())){
-            add.setStartTime(publicService.subOneYear(baseService.utcToDateStr(zj.getZjyxq())));
+            add.setStartTime(publicService.getYearFirstDayT(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

@@ -1772,6 +1772,21 @@ public class PublicServiceImpl implements PublicService {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         return sdf.parse(sdf.format(calendar.getTime()));
     }
+
+    // 大于今年取今年的第一天
+    @Override
+    public Date getYearFirstDayT(Date date) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+        SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        String insureStartTimes = sdf.format(date);
+        String curDates = sdf.format(new Date());
+        if (insureStartTimes.compareTo(curDates)>0){
+            date=getYearFirstDay(new Date());
+        }
+        return sdft.parse(sdft.format(date));
+    }
+
     @Override
     public Date getYearLastDay(Date date) throws ParseException {
         Calendar calendar = Calendar.getInstance();

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

@@ -1061,7 +1061,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         // 生成待同步的工单主表数据
         getItfTblAssignUpload(brand, sysDictRefXLMapXq, taskId, sourceData, newDykh, orderBase);
         // 生成短信评价发送数据
-        generateMessage(brand, sourceData, newDykh, orderBase);
+        // generateMessage(brand, sourceData, newDykh, orderBase);
         // 检查附件完整性 未同步图片不处理本记录数据同步
         if (checkFile(sourceData.getOrderNo(),row.getSynReqId())){
             return Boolean.TRUE;
@@ -1937,6 +1937,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         faGreeSmsWorkerService.update(up,upWrapper);
     }
 
+    // 不再做此操作
     public void generateMessage(Brand brand, OutJiasmToGreeUploadTaskList sourceData, String newDykh, OrderBase orderBase) {
         WebsitSH websitSH = new WebsitSH();
 

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

@@ -1,5 +1,6 @@
 package com.zfire.jiasm.syncdata;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.zfire.jiasm.syncdata.utils.MyBeanUtils;
 import lombok.Data;
@@ -33,148 +34,7 @@ public class test {
     }
 
     public static void main(String[] args) throws ParseException {
-       /* A a = new A();
-        B b = new B();
 
-        B c = new B();
-
-        a.setWebsitId(a.getOrderBaseId());
-
-        a.setId(1);
-        a.setWebsitId("A");
-        a.setOrderBaseId("A");
-
-        BeanUtils.copyProperties(a, b);
-
-        BeanUtils.copyProperties(a, c,new String[] {"websitId"});
-
-        System.out.println(IdWorker.getIdStr());
-        System.out.println(UUID.randomUUID().toString());
-
-
-        Date date = new Date();
-        System.out.println("写代码的当前时间是"+date);
-        long time = date.getTime();
-//        System.out.println(time);
-        Date newDate = new Date();
-        newDate.setTime(time + 1000);
-        System.out.println("加一秒"+ newDate);
-        newDate.setTime(time + 1000*60);
-        System.out.println("加一分"+ newDate);
-        newDate.setTime(time + 1000*60*60);
-        System.out.println("加一时"+ newDate);
-        newDate.setTime(time + 1000*60*60*24);*/
-
-/*
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-        Date date = new Timestamp(1689651148);
-
-        System.out.println(sdf.format(date));
-        System.out.println(format.parse(sdf.format(date)));
-
-*/
-
-
-
-/* A a = new A();
-        A b = new A();
-        List<A> list = new ArrayList<>();
-
-
-        a.setId(1);
-        a.setWebsitId("A");
-        a.setOrderBaseId("A");
-
-        MyBeanUtils.copyProperties(a,b);
-        b.setId(2);
-
-        list.add(a);
-        list.add(b);
-
-        for (A i:list){
-            i.setId(0);
-        }
-
-        System.out.println(a);
-        System.out.println(b);
-
-
-        System.out.println("uploadfile/");
-
-        long timeStamp = 1691132713 * 1000L; // 时间戳，单位：毫秒
-        Date date = new Date(timeStamp);
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String formatTime = sdf.format(date);
-        System.out.println(formatTime);
-
-
-
-        String s = "1_p_230720_S9219801_cAwTQeZ4rP-Np3f-2RFN76.png";
-        if (s.contains(",")){
-            System.out.println("有");
-            System.out.println(s);
-        }
-        System.out.println("无");
-
-
-        List<String> roleIds = new ArrayList<>();
-        List<String> tt = new ArrayList<>();
-
-        List<String> xx = new ArrayList<>();
-
-        roleIds.add("1");
-        roleIds.add("3");
-        roleIds.add("2");
-
-        tt.add("3");
-        tt.add("4");
-
-        xx.addAll(roleIds);
-
-        System.out.println("交");
-        roleIds.retainAll(tt);
-
-        tt.removeAll(roleIds);
-
-        xx.addAll(tt);
-
-        System.out.println(xx);
-
-
-
-
-        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);*/
-/*
-
-        String s="1_p_230913_nobody01_FpNaEGLBtpw5XaYjRgfH59.jpg||1_p_230913_nobody01_4ajNwJC8sS46aWHeScpd97.jpg||1_p_230913_nobody01_w0NQb8gut0KH3tytSOEx95.jpg";
-        String x=s.replace("||",",");
-        System.out.println(x);
-
-
-        System.out.println(UUID.randomUUID().toString());
-
-        String uuId = UUID.randomUUID().toString().replace("-","").toUpperCase();
-        System.out.println(uuId);
-
-*/
         System.out.println(IdWorker.getId());
 
         // 获取该日期所在年的第一天
@@ -185,44 +45,37 @@ public class test {
         String lastDay = getYearLastDay(new Date());
         System.out.println("指定日期所在年的最后一天为：" + lastDay);
 
-String s="725737 或 854545 或 141251#141251 或 681045 或 471525";
-String po="";
-String pt="";
-List<String> result = new ArrayList<>();
 
-        if (s.contains("#")){
-    result = Arrays.asList(s.split("#"));
-    po=result.get(0);
-    pt=result.get(1);
-}
-        if (po.length()>22){
-            po=po.substring(0,22);
-        }
-        if (pt.length()>22){
-            pt=pt.substring(0,22);
-        }
-        System.out.println(s);
-        System.out.println(po);
-        System.out.println(pt);
-
-
-        Integer t = 1;
-        switch (t) {
-            case 1:
-            case 37:
-                t = 0;
-                break;
-            default:
-                t = 1;
-                break;
+        Date insureStartTime = DateUtil.offsetMonth(new Date(),-24);
+        System.out.println(insureStartTime);
+        // 大于今年取今年的第一天
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+        SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String insureStartTimes = sdf.format(insureStartTime);
+        String curDates = sdf.format(new Date());
+        System.out.println(insureStartTimes);
+        System.out.println(curDates);
+        if (insureStartTimes.compareTo(curDates)>0){
+            insureStartTime=getYearFirstDayt(new Date());
         }
 
-        System.out.println(t);
+        System.out.println(sdft.format(insureStartTime));
+
+
 
 
     }
 
 
+    public static Date getYearFirstDayt(Date date) throws ParseException {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.MONTH, 0);
+        calendar.set(Calendar.DATE, 1);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.parse(sdf.format(calendar.getTime()));
+    }
+
     /**
      * 获取指定日期所在年的第一天
      * @param date 指定日期