Browse Source

同步修改单数据配置

DLC 2 weeks ago
parent
commit
d8ff601bce

+ 12 - 5
qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/CommonServiceImpl.java

@@ -22,10 +22,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalTime;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -72,7 +70,16 @@ public class CommonServiceImpl implements CommonService {
         R r = new R();
         if (dtwhoapproveTime == null || dtwhoapproveTime.length() == 0) {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            dtwhoapproveTime = sdf.format(new Date());
+            LocalTime currentTime = LocalTime.now();
+            LocalTime sevenAM = LocalTime.of(7, 0); // 早上7点
+            if (currentTime.isBefore(sevenAM)) {
+                Calendar calendar = Calendar.getInstance();
+                calendar.add(Calendar.DATE, -1);
+                Date yesterday = calendar.getTime();
+                dtwhoapproveTime = sdf.format(yesterday);
+            } else {
+                dtwhoapproveTime = sdf.format(new Date());
+            }
         }
         Map<String, Object> mdfmap = mdfApi.apiCall(dtwhoapproveTime);
         if (mdfmap.get("code").equals("200")) {

+ 1 - 0
qcs-server/src/main/java/com/rongwei/controller/QcsMdfFormController.java

@@ -60,6 +60,7 @@ public class QcsMdfFormController {
         }
     }
 
+    //导出
     @PostMapping("/excelExport")
     public void excelExport(@RequestBody Map<String, String> params, HttpServletResponse response) throws IOException {
         qcsMdfFormService.excelExport(params, response);