wzy 1 day ago
parent
commit
519aa8a6fe

+ 0 - 12
mjava-huagao/src/main/java/com/malk/huagao/controller/HuaGaoController.java

@@ -26,19 +26,7 @@ import java.util.Map;
 public class HuaGaoController {
     @Autowired
     private HuaGaoService huaGaoService;
-    @Autowired
-
-    private YDClient ydClient;
-
-
-    @Autowired
-
-    private DDClient dd;
-
-
-    @Autowired
 
-    private McDelegate mcDelegate;
     @GetMapping("/test")
     public McR test() {
         return McR.success();

+ 14 - 0
mjava-huagao/src/test/java/com/malk/huagao/YyYdTest.java

@@ -3,6 +3,9 @@ package com.malk.huagao;
 import cn.hutool.core.util.NumberUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.malk.huagao.entity.YdUserInput;
+import com.malk.huagao.mapper.YdUserInputMapper;
 import com.malk.huagao.service.HuaGaoService;
 import com.malk.server.aliwork.YDConf;
 import com.malk.server.aliwork.YDParam;
@@ -43,6 +46,9 @@ public class YyYdTest {
     @Autowired
     private HuaGaoService huaGaoService;
 
+    @Autowired
+    private YdUserInputMapper ydUserInputMapper;
+
     @Test
     public void test() {
         List<Map> list=(List<Map>) ydClient.queryData(YDParam.builder().formUuid("FORM-0D560B9D8B64464C8C885FE20B7C7C95T4IA")                .pageSize(1)
@@ -98,4 +104,12 @@ public class YyYdTest {
 
         huaGaoService.syncKqData(startTime,endTime);
     }
+
+    @Test
+    public void test4() {
+        LambdaQueryWrapper<YdUserInput> ydUserInputLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        ydUserInputLambdaQueryWrapper.eq(YdUserInput::getUserId,"16992517127785448");
+        List<YdUserInput> ydUserInputs = ydUserInputMapper.selectList(ydUserInputLambdaQueryWrapper);
+
+    }
 }

+ 21 - 12
mjava-kabeiyi/src/test/java/com/malk/kabeiyi/DdTest.java

@@ -1,5 +1,6 @@
 package com.malk.kabeiyi;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.malk.kabeiyi.service.KabeiyiService;
 import com.malk.server.aliwork.YDConf;
@@ -131,7 +132,7 @@ public class DdTest {
 
         List<Map> dataList = (List<Map>) ydClient.queryData(YDParam.builder()
                 .formUuid("FORM-F4ED246EADD8427381BC13C4F0FEF7FDYMKJ")//审核任务
-                .pageNumber(1)
+                .pageNumber(3)
                 .pageSize(100)
                 .build(), YDConf.FORM_QUERY.retrieve_list).getData();
 
@@ -142,22 +143,29 @@ public class DdTest {
 
             String status = UtilMap.getString(formData, "selectField_m0dbmfxd");//审核状态
 
-            if (Strings.isNotBlank(status)){
-                Long deadLine = (Long) formData.get("dateField_m061zye7");
+            Long deadLine = (Long) formData.get("dateField_m061zye7");
+
+            Long date = (Long) formData.get("dateField_m1hod4tv");
 
-                Long date = (Long) formData.get("dateField_m1hod4tv");
+            long nowTime = new Date().getTime();
 
+            //当前时间大于审核截止日期
+            if (nowTime > deadLine){
                 Map updateFormDate = new HashMap();
 
-                if (Objects.isNull(date)){
-                    updateFormDate.put("selectField_m0dbmfxd","已超期");
-                }else {
-                    if (date <= deadLine && !"未超期".equals(status)){
-                        updateFormDate.put("selectField_m0dbmfxd","未超期");
-                    }
-                    if (date > deadLine && !"已超期".equals(status)){
+                if (Strings.isNotBlank(status)){
+                    if (Objects.isNull(date)){
                         updateFormDate.put("selectField_m0dbmfxd","已超期");
+                    }else {
+                        if (date <= deadLine && !"未超期".equals(status)){
+                            updateFormDate.put("selectField_m0dbmfxd","未超期");
+                        }
+                        if (date > deadLine && !"已超期".equals(status)){
+                            updateFormDate.put("selectField_m0dbmfxd","已超期");
+                        }
                     }
+                }else {
+                    updateFormDate.put("selectField_m0dbmfxd","已超期");
                 }
 
                 if (!updateFormDate.keySet().isEmpty()){
@@ -166,8 +174,9 @@ public class DdTest {
                             .updateFormDataJson(JSONObject.toJSONString(updateFormDate))
                             .build(), YDConf.FORM_OPERATION.update);
                 }
-
             }
+
+
         }
     }