请假H5支持相关API修改

zjugis-business/src/main/java/com/zjugis/business/converter/leave/LeaveTimeConvert.java

@@ -23,4 +23,7 @@ public interface LeaveTimeConvert {
     List<LeaveTimeDO> convertList(List<LeaveTimeCreateReqVO> list);
 
     List<LeaveTimeDO> convertList01(List<LeaveTimeUpdateReqVO> list);
+
+    List<LeaveTimeCreateReqVO> convertList02(List<LeaveTimeDO> list);
+
 }

zjugis-business/src/main/java/com/zjugis/business/flow/leave/controller/LeaveController.java

@@ -54,7 +54,7 @@ public class LeaveController extends BaseController {
 
     @GetMapping("/mobileAdd")
     public CommonResult<LeaveRespVO> mobileAdd(String activityTemplateId, String flowInstanceId, String userId){
-        return CommonResult.success(LeaveConvert.INSTANCE.convert01(leaveService.flowAdd(flowInstanceId, userId)));
+        return CommonResult.success(leaveService.flowAdd(flowInstanceId, userId));
     }
 
     @PostMapping("/getLeaveDays")

zjugis-business/src/main/java/com/zjugis/business/flow/leave/controller/vo/LeaveRespVO.java

@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.util.List;
+
 /**
  * @Author 陈俊
  * @Date 2024/4/29 9:48
@@ -18,4 +20,7 @@ public class LeaveRespVO extends LeaveBaseVO{
 
     @Schema(description = "主键ID")
     private String id;
+
+    @Schema(description = "明细数据请假时间")
+    private List<LeaveTimeCreateReqVO> leaveTimeCreateList;
 }

zjugis-business/src/main/java/com/zjugis/business/flow/leave/controller/vo/LeaveTimeBaseVO.java

@@ -1,5 +1,6 @@
 package com.zjugis.business.flow.leave.controller.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -21,10 +22,12 @@ public class LeaveTimeBaseVO {
 
     @Schema(description = "起始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime startTime;
 
     @Schema(description = "结束时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime endTime;
 
     @Schema(description = "哺乳假类型(1:早上一小时;2:下午一小时)")

zjugis-business/src/main/java/com/zjugis/business/flow/leave/service/LeaveService.java

@@ -2,6 +2,7 @@ package com.zjugis.business.flow.leave.service;
 
 import com.zjugis.business.flow.leave.controller.vo.LeaveCreateReqVO;
 import com.zjugis.business.flow.leave.controller.vo.LeaveDaysReqVO;
+import com.zjugis.business.flow.leave.controller.vo.LeaveRespVO;
 import com.zjugis.business.flow.leave.controller.vo.LeaveUpdateReqVO;
 import com.zjugis.business.flow.leave.entity.LeaveDO;
 
@@ -59,5 +60,5 @@ public interface LeaveService {
      * @param flowInstanceId
      * @param userId
      */
-    LeaveDO flowAdd(String flowInstanceId, String userId);
+    LeaveRespVO flowAdd(String flowInstanceId, String userId);
 }

zjugis-business/src/main/java/com/zjugis/business/flow/leave/service/LeaveServiceImpl.java

@@ -10,6 +10,7 @@ import com.zjugis.business.converter.leave.LeaveConvert;
 import com.zjugis.business.converter.leave.LeaveTimeConvert;
 import com.zjugis.business.flow.leave.controller.vo.LeaveCreateReqVO;
 import com.zjugis.business.flow.leave.controller.vo.LeaveDaysReqVO;
+import com.zjugis.business.flow.leave.controller.vo.LeaveRespVO;
 import com.zjugis.business.flow.leave.controller.vo.LeaveUpdateReqVO;
 import com.zjugis.business.flow.leave.dao.LeaveDao;
 import com.zjugis.business.flow.leave.dao.LeaveTimeDao;
@@ -223,7 +224,7 @@ public class LeaveServiceImpl implements LeaveService {
     }
 
     @Override
-    public LeaveDO flowAdd(String flowInstanceId, String userId) {
+    public LeaveRespVO flowAdd(String flowInstanceId, String userId) {
         if (StringUtils.isNotBlank(SecurityFrameworkUtils.getLoginUserId())) {
             userId = SecurityFrameworkUtils.getLoginUserId();
         }
@@ -246,7 +247,10 @@ public class LeaveServiceImpl implements LeaveService {
                 }
                 leaveDao.insert(entity);
             }
-            return entity;
+            LeaveRespVO respVO = LeaveConvert.INSTANCE.convert01(entity);
+            List<LeaveTimeDO> detailList = leaveTimeService.getListByLeaveId(entity.getId());
+            respVO.setLeaveTimeCreateList(LeaveTimeConvert.INSTANCE.convertList02(detailList));
+            return respVO;
         }
         return null;
     }