修改手动同步申请单接口

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/task/TimingTask.java

@@ -1428,9 +1428,12 @@ public class TimingTask {
         filter2.put("key","sp_status");
         filter2.put("value","2");
         jsonArrayFilter.add(filter2);
+        log.info("参数==>"+jsonArrayFilter.toJSONString());
+        log.info("startDate==>"+startDate+",endDate==>"+endDate);
         List<String> approvalInfo = wxCorpInfoService.getApprovalInfo(7, startDate, endDate, "", jsonArrayFilter);
 
         if(approvalInfo!=null&& !approvalInfo.isEmpty()){
+            log.info("approvalInfo==>"+approvalInfo);
             for (int j = 0; j < approvalInfo.size(); j++) {
                 String codeNum = approvalInfo.get(j);
                 String approvalInfoDetailResp = wxCorpInfoService.getApprovalInfoDetail(7, codeNum);
@@ -1532,6 +1535,7 @@ public class TimingTask {
                     JSONObject apply_data = info.getJSONObject("apply_data");
                     JSONArray contents = apply_data.getJSONArray("contents");
 
+                    ArrayList<ApplyForm> applyForms = new ArrayList<>();
                     for (int i = 0; i < contents.size(); i++) {
                         JSONObject contentsJSONObject = contents.getJSONObject(i);
                         JSONArray title = contentsJSONObject.getJSONArray("title");
@@ -1565,6 +1569,7 @@ public class TimingTask {
                         if(title.getJSONObject(0).getString("text").equals("明细")){
                             if(control.equals("Table")){
                                 JSONArray childrens = value.getJSONArray("children");
+
                                 for (int i1 = 0; i1 < childrens.size(); i1++) {
                                     JSONArray list = childrens.getJSONObject(i1).getJSONArray("list");
                                     WorkVo workVo = new WorkVo();
@@ -1601,46 +1606,45 @@ public class TimingTask {
                                         }
                                     }
                                     workVoList.add(workVo);
-                                    overTimeVo.setWorkVoList(workVoList);
-
-                                    List<WorkVo> workVos = overTimeVo.getWorkVoList();
-                                    ArrayList<ApplyForm> applyForms = new ArrayList<>();
-                                    for (WorkVo vo : workVos) {
-                                        String workCotent = vo.getWorkCotent();
-                                        Long beginTime = vo.getBeginTime();
-                                        Long endTime = vo.getEndTime();
-                                        Long duration = vo.getDuration();
-                                        LocalDateTime startTime = Instant.ofEpochSecond(beginTime)
-                                                .atZone(ZoneId.systemDefault())
-                                                .toLocalDateTime();
-
-                                        LocalDateTime end = Instant.ofEpochSecond(endTime)
-                                                .atZone(ZoneId.systemDefault())
-                                                .toLocalDateTime();
-                                        // 1. 计算小时（秒 → 小时）
-                                        BigDecimal hours = BigDecimal.valueOf(duration)
-                                                .divide(BigDecimal.valueOf(3600), 1, RoundingMode.HALF_UP);
-
-                                        List<MemberVo> memberList = vo.getMemberList();
-                                        for (MemberVo memberVo : memberList) {
-                                            ApplyForm applyForm = new ApplyForm();
-                                            applyForm.setStartTime(startTime);
-                                            applyForm.setEndTime(end);
-                                            applyForm.setSumTime(hours);
-                                            applyForm.setApplyId(memberVo.getMemberUserId());
-                                            applyForm.setContent(workCotent);
-                                            applyForm.setApplyBillName(overTimeVo.getLeaveName());
-                                            applyForm.setTypeName(spName);
-                                            applyForm.setSpNo(spNo);
-                                            applyForm.setType(4);
-                                            applyForms.add(applyForm);
-                                        }
-                                    }
-                                    applyFormService.saveBatch(applyForms);
                                 }
                             }
                         }
                     }
+                    overTimeVo.setWorkVoList(workVoList);
+                    List<WorkVo> workVos = overTimeVo.getWorkVoList();
+
+                    for (WorkVo vo : workVos) {
+                        String workCotent = vo.getWorkCotent();
+                        Long beginTime = vo.getBeginTime();
+                        Long endTime = vo.getEndTime();
+                        Long duration = vo.getDuration();
+                        LocalDateTime startTime = Instant.ofEpochSecond(beginTime)
+                                .atZone(ZoneId.systemDefault())
+                                .toLocalDateTime();
+
+                        LocalDateTime end = Instant.ofEpochSecond(endTime)
+                                .atZone(ZoneId.systemDefault())
+                                .toLocalDateTime();
+                        // 1. 计算小时（秒 → 小时）
+                        BigDecimal hours = BigDecimal.valueOf(duration)
+                                .divide(BigDecimal.valueOf(3600), 1, RoundingMode.HALF_UP);
+
+                        List<MemberVo> memberList = vo.getMemberList();
+                        for (MemberVo memberVo : memberList) {
+                            ApplyForm applyForm = new ApplyForm();
+                            applyForm.setStartTime(startTime);
+                            applyForm.setEndTime(end);
+                            applyForm.setSumTime(hours);
+                            applyForm.setApplyId(memberVo.getMemberUserId());
+                            applyForm.setContent(workCotent);
+                            applyForm.setApplyBillName(overTimeVo.getLeaveName());
+                            applyForm.setTypeName(spName);
+                            applyForm.setSpNo(spNo);
+                            applyForm.setType(4);
+                            applyForms.add(applyForm);
+                        }
+                    }
+                    applyFormService.saveBatch(applyForms);
                 }
                 else if (templateType == 5) {
                     JSONObject info = jsonObject.getJSONObject("info");