修改

gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java

@@ -102,6 +102,7 @@ public class BusinessTripApprovalController extends BaseController {
         String uuids = uuid.toString();
 
         dto.setUuid(uuids);
+        BaseAddressInfo byId = baseAddressInfoService.getById(dto.getDestinationId());
         ApprovalProcess approvalProcess = new ApprovalProcess();
         approvalProcess.setApprovalNo(s);
         approvalProcess.setProcessTitle("出差呈请");
@@ -111,8 +112,9 @@ public class BusinessTripApprovalController extends BaseController {
         approvalProcess.setMatterType(2);
         approvalProcess.setApprovalStatus(0);
         approvalProcess.setReadStatus(0);
-        approvalProcess.setBusinessTripDestination(dto.getDestinationIdCn());
+        approvalProcess.setBusinessTripDestination(byId.getAddName());
-        approvalProcess.setStartTime(approvalProcess.getStartTime());
+        approvalProcess.setStartTime(dto.getStartDate());
+        approvalProcess.setEndTime(dto.getEndDate());
         approvalProcess.setCreateTime(new Date().getTime());
         approvalProcess.setUuid(uuids);
         approvalsProcessService.save(approvalProcess);

gather-app/src/main/java/com/ruoyi/business/controller/DetailsApiController.java

@@ -23,4 +23,8 @@ public class DetailsApiController extends BaseController {
     private final BusinessTripApprovalService businessTripApprovalService;
 
 
+    public void getUserPic(){
+
+    }
+
 }

gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java

@@ -132,6 +132,7 @@ public class PoliceLeaveApprovalController extends BaseController {
             approvalProcess.setMatterType(3);
             approvalProcess.setApprovalStatus(0);
             approvalProcess.setReadStatus(0);
+            approvalProcess.setLeaveType(policeLeaveApproval.getLeaveType());
             approvalProcess.setStartTime(policeLeaveApproval.getStartDate());
             approvalProcess.setEndTime(policeLeaveApproval.getEndDate());
             approvalProcess.setCreateTime(new Date().getTime());

gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java

@@ -122,4 +122,9 @@ public class ApprovalProcess {
     @ApiModelProperty("关联用uuid")
     private String uuid;
 
+    @ApiModelProperty("请假类别（1-公休假 2-事假 3-探亲假 4-婚假 5-产假 6-护理假 7-病假 8-育儿假 9-其他）")
+    private Integer leaveType;
+    @TableField(exist = false)
+    private String leaveTypeCn;
+
 }

gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java

@@ -37,8 +37,6 @@ public class BusinessTripApproval extends BaseEntityMini {
 
     @ApiModelProperty("出差目的地")
     private Integer destinationId;
-    @TableField(exist = false)
-    private String destinationIdCn;
 
     @ApiModelProperty("出差开始日期")
     private Long startDate;