2 Commits 97e5083655 ... 25077b66ce

Autor SHA1 Nachricht Datum
  wzy 25077b66ce 中车 vor 2 Wochen
  wzy 9fac1b1905 思库 vor 2 Wochen

+ 11 - 1
mjava-siku/src/main/java/com/malk/siku/service/impl/SikuServiceImpl.java

@@ -1854,6 +1854,7 @@ public class SikuServiceImpl implements SikuService {
         }
     }
 
+    @Async
     @Override
     public void invoiceWriteBack6(Map map) {
         String formCode = UtilMap.getString(map, "formCode");//单据号
@@ -1950,6 +1951,7 @@ public class SikuServiceImpl implements SikuService {
 
     }
 
+    @Async
     @Override
     public void invoiceWriteBack7(Map map) {
         String formDataCode = UtilMap.getString(map, "formDataCode");//单据类型
@@ -2019,6 +2021,7 @@ public class SikuServiceImpl implements SikuService {
 
     }
 
+    @Async
     @Override
     public void invoiceWriteBack8(Map map) {
         String formCode = UtilMap.getString(map, "formCode");//单据号
@@ -2522,8 +2525,15 @@ public class SikuServiceImpl implements SikuService {
     private static Long getMkDateValue(Map formData, String entityName) {
         Map title = UtilMap.getMap(formData, entityName);
         Map value = UtilMap.getMap(title, "value");
+        String type = UtilMap.getString(title, "type");
 
-        long currentTime = UtilMap.getLong(value, "currentTime");
+        long currentTime = new Date().getTime();
+
+        if ("DateTimeInput".equals(type)){
+            currentTime = UtilMap.getLong(value, "currentTime");
+        }else if ("DateRangeInput".equals(type)){
+            currentTime = UtilMap.getLong(value, "startTime");
+        }
 
         return currentTime;
     }

+ 1 - 1
mjava-siku/src/test/java/com.malk.siku/SkTest.java

@@ -80,7 +80,7 @@ public class SkTest {
     //批量触发供应商推送每刻
     @Test
     public void test2() throws ParseException {
-        String createTime = "2026-05-21 00:00:00";
+        String createTime = "2026-06-8 00:00:00";
         //createTime转换为时间戳
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date date = sdf.parse(createTime);

+ 6 - 0
mjava-zhongche/src/main/java/com/malk/zhongche/controller/ZhongcheController.java

@@ -21,6 +21,12 @@ public class ZhongcheController {
         return zhongcheService.getTaskInfo(taskId,projectId);
     }
 
+    //获取项目信息
+    @GetMapping("/getProjectInfo")
+    public McR getProjectInfo(String projectId){
+        return zhongcheService.getProjectInfo(projectId);
+    }
+
     //更新任务延期信息
     @PostMapping("/updateTaskDelayInfo")
     public McR updateTaskDelayInfo(@RequestBody Map map){

+ 3 - 0
mjava-zhongche/src/main/java/com/malk/zhongche/service/ZhongcheService.java

@@ -14,4 +14,7 @@ public interface ZhongcheService {
     void updateLastTaskSfc();
 
     McR finishTask(Map map);
+
+    McR getProjectInfo(String projectId);
+
 }

+ 28 - 0
mjava-zhongche/src/main/java/com/malk/zhongche/service/impl/ZhongcheServiceImpl.java

@@ -393,6 +393,34 @@ public class ZhongcheServiceImpl implements ZhongcheService {
         return McR.success();
     }
 
+    @Override
+    public McR getProjectInfo(String projectId) {
+        List<Map> results = tbClient.projectDetail(projectId, null, null);
+
+        Map result = (Map) results.get(0);
+
+        Map map = new HashMap();
+
+        List<Map> customfields = UtilMap.getList(result, "customfields");
+
+        for (Map customfield : customfields) {
+            String customfieldId = UtilMap.getString(customfield, "customfieldId");
+
+            //项目号
+            if ("6805ecf00763b2e708d760bc".equals(customfieldId)){
+                List<Map> values = UtilMap.getList(customfield, "value");
+
+                Map value = values.get(0);
+
+                String title = UtilMap.getString(value, "title");
+
+                map.put("projectNo",title);
+            }
+        }
+
+        return McR.success(map);
+    }
+
     /**
      * 上传文件(核心方法)
      * @param filePath 本地文件路径(如"2.png")