出差提交调整

common/src/main/java/com/jpsoft/shinestar/modules/base/service/BusinessOutService.java

@@ -26,7 +26,7 @@ public interface BusinessOutService {
 
     List<BusinessOut> findByPersonIdAndDate(Long personId, Date attendanceDate);
 
-    String submitBusiness(PersonPopedom personPopedom, String type, String destination, String startTime, String estimatedTime, String content,String formId) throws Exception;
+    String submitBusiness(PersonPopedom personPopedom, String type, String destination, String startTime,String endTime,String days, String estimatedTime, String content,String formId) throws Exception;
 
     void logic(BusinessOut businessOut) throws Exception;
 

common/src/main/java/com/jpsoft/shinestar/modules/base/service/impl/BusinessOutServiceImpl.java

@@ -405,7 +405,7 @@ public class BusinessOutServiceImpl implements BusinessOutService {
     }
 
     @Override
-    public String submitBusiness(PersonPopedom personPopedom, String type, String destination, String startTime, String estimatedTime, String content,String formId) throws Exception {
+    public String submitBusiness(PersonPopedom personPopedom, String type, String destination, String startTime,String endTime,String days, String estimatedTime, String content,String formId) throws Exception {
 
 
         BusinessOut businessOut = new BusinessOut();
@@ -415,17 +415,20 @@ public class BusinessOutServiceImpl implements BusinessOutService {
         businessOut.setStatus("0");
         businessOut.setDestination(destination);
         businessOut.setStartTime(DateUtil.parse(startTime));
-        businessOut.setEstimatedTime(estimatedTime);
-        if (estimatedTime.contains(".")){
+      //  businessOut.setEstimatedTime(estimatedTime);
+        /*if (estimatedTime.contains(".")){
             Integer n  = estimatedTime.indexOf(".");
             String days = estimatedTime.substring(0,n);
             businessOut.setEstimatedDate(DateUtil.offsetDay(businessOut.getStartTime(),Integer.parseInt(days)));
             businessOut.setEstimatedDate(DateUtil.offsetHour(businessOut.getEstimatedDate(),12));
         }else {
             businessOut.setEstimatedDate(DateUtil.offsetDay(businessOut.getStartTime(),Integer.parseInt(estimatedTime)));
-        }
+        }*/
 
-        businessOut.setEndTime(businessOut.getEstimatedDate());
+    //    businessOut.setEndTime(businessOut.getEstimatedDate());
+        businessOut.setEndTime(DateUtil.parse(endTime));
+        businessOut.setEstimatedTime(days);
+        businessOut.setEstimatedDate(DateUtil.parse(endTime));
         businessOut.setCreateTime(new Date());
         businessOut.setContent(content);
 

web/src/main/java/com/jpsoft/shinestar/modules/mobile/controller/BusinessOutApiController.java

@@ -67,11 +67,13 @@ public class BusinessOutApiController {
             @ApiImplicitParam(name = "type", value = "类型（1：外出，3：出差）", required = true, paramType = "form"),
             @ApiImplicitParam(name = "destination", value = "目的地", required = true, paramType = "form"),
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "days", value = "天数", required = true, paramType = "form"),
             @ApiImplicitParam(name = "estimatedTime", value = "预估时间", required = true, paramType = "form"),
             @ApiImplicitParam(name = "content", value = "事由", required = true, paramType = "form"),
             @ApiImplicitParam(name = "formId", value = "页面路径", required = true, paramType = "form")
     })
-    public MessageResult<Map> submitBusiness(String type, String destination, String startTime, String estimatedTime, String content,String formId,@RequestAttribute String subject, String token) {
+    public MessageResult<Map> submitBusiness(String type, String destination, String startTime, String endTime,String days,String estimatedTime, String content,String formId,@RequestAttribute String subject, String token) {
         MessageResult<Map> msgResult = new MessageResult<>();
 
         try {
@@ -94,7 +96,7 @@ public class BusinessOutApiController {
                 throw new Exception("休假状态无法出差");
             }
 
-            String id = businessOutService.submitBusiness(personPopedom,type,destination,startTime,estimatedTime,content,formId);
+            String id = businessOutService.submitBusiness(personPopedom,type,destination,startTime,endTime,days,estimatedTime,content,formId);
 
 
             Map<String, Object> map = new HashMap<>();