Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/WorkerNumberCheckVO.java

@@ -54,6 +54,6 @@ public class WorkerNumberCheckVO     {
     private String workerNumberYun;
 
     @ApiModelProperty(value = "广佛家用系统师傅编号")
-    @ZfireField(tbName = "c",colName = "worker_number")
+    @ZfireField(tbName = "d",colName = "worker_number")
     private String workerNumber;
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -55,6 +55,10 @@ public class AgreementLogic {
     private String active;
 
 
+    @Value("${web.upload-path}")
+    private String uploadUrl;
+
+
     @Autowired
     CommonLogic commonLogic;
 
@@ -355,7 +359,7 @@ public class AgreementLogic {
             rows.add(row);
         }
         // 获取资源文件存放路径，用于临时存放生成的excel文件
-        String path = "/tmp";
+        String path = uploadUrl;
         if (active.equals("dev")) {
             path = Objects.requireNonNull(this.getClass().getClassLoader().getResource("")).getPath();
         }

mall-server-api/src/main/java/com/gree/mall/manager/schedule/InsureEmailSchedule.java

@@ -34,14 +34,14 @@ public class InsureEmailSchedule {
 
 
     //监测今天是否有回执邮件，如果有则表示今天买保险的回执成功
-    @Scheduled(fixedDelay = 60* 1000)
+    @Scheduled(fixedDelay = 600* 1000)
     public void task2() throws IOException, MessagingException {
         agreementLogic.receEmail();
     }
 
 
     //保险过期
-    @Scheduled(fixedDelay = 60* 1000)
+    @Scheduled(fixedDelay = 600* 1000)
     public void task3(){
         agreementLogic.offInsure();
     }
@@ -55,7 +55,7 @@ public class InsureEmailSchedule {
 
 
     //扫表身份证，高空证过期备注
-    @Scheduled(fixedDelay = 60* 1000)
+    @Scheduled(fixedDelay = 600* 1000)
     public void task5(){
         agreementLogic.task5();
     }
@@ -63,20 +63,20 @@ public class InsureEmailSchedule {
 
 
     //工伤提前三天续保
-    @Scheduled(fixedDelay = 60* 1000)
+    @Scheduled(fixedDelay = 600* 1000)
     public void task6(){
         agreementLogic.task6();
     }
 
     //雇主提前设置天数续保
-    @Scheduled(fixedDelay = 60* 1000)
+    @Scheduled(fixedDelay = 600* 1000)
     public void task7(){
         agreementLogic.task7();
     }
 
 
     //将联络涵设置对应状态
-    @Scheduled(fixedDelay = 60* 1000)
+    @Scheduled(fixedDelay = 600* 1000)
     public void task8(){
         agreementLogic.task8();
     }

mall-server-api/src/main/java/com/gree/mall/manager/utils/excel/ExcelUtils.java

@@ -3,6 +3,7 @@ package com.gree.mall.manager.utils.excel;
 
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcelFactory;
 import com.alibaba.excel.ExcelWriter;
@@ -188,6 +189,15 @@ public class ExcelUtils {
     public static void createExcel(String filePath,ExcelData excelData) throws IOException {
         OutputStream out = null;
         try {
+            File file = new File(filePath);
+
+            // 确保文件路径存在
+            if (!file.getParentFile().exists()) {
+                // 尝试创建父目录
+                if (!file.getParentFile().mkdirs()) {
+                   log.info("无法创建文件夹");
+                }
+            }
             //标题
             List<List<String>> titles = new ArrayList<>();
             for(String title : excelData.getTitles()){

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1620,7 +1620,7 @@
         </if>
         HAVING a.worker_number_yun != d.worker_number
         <if test="ex.orderBy == null or ex.orderBy ==''">
-            ORDER BY a.websit_id,a.worker_number DESC
+            ORDER BY a.websit_id,a.worker_number_yun DESC
         </if>
         ${ex.orderBy}
     </select>
@@ -1631,7 +1631,7 @@
         (
         SELECT
         a.worker_number_yun,
-        c.worker_number
+        d.worker_number
         FROM
         worker_number_check a
         JOIN `user` c on c.nick_name = a.worker_name and RIGHT(c.mobile,4) = RIGHT(a.worker_phone_yun,4)
@@ -1644,7 +1644,7 @@
                 #{item}
             </foreach>
         </if>
-        HAVING a.worker_number_yun != c.worker_number or c.worker_number is null
+        HAVING a.worker_number_yun != d.worker_number
         ) s