소스 검색

返回值修改

fllmoyu 5 년 전
부모
커밋
6b5bf17674

+ 13 - 8
picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/StudentInsuranceController.java

@@ -133,13 +133,13 @@ public class StudentInsuranceController {
             @ApiImplicitParam(name = "startTime",value = "生效时间", required = false, paramType = "form"),
             @ApiImplicitParam(name = "endTime",value = "失效时间", required = false, paramType = "form")
     })
-    public MessageResult<StudentApplication> save(
+    public MessageResult<String> save(
             String insuredId,String insuredName,String insuredSex,String insuredSchoolId,String insuredSchoolName,String companyId,String companyName,String insuredCard,Boolean haveMedicare,
             String attachId,String attachName,String relationship,String attachTel,
             String definitionId,String definitionName,
-            Date startTime,Date endTime,
+            String startTime,String endTime,
             @RequestAttribute String subject){
-        MessageResult<StudentApplication> msgResult = new MessageResult<>();
+        MessageResult<String> msgResult = new MessageResult<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
 
         try {
@@ -167,8 +167,8 @@ public class StudentInsuranceController {
             }else{
                 studentApplication.setHaveAttach(false);
             }
-            studentApplication.setStartTime(startTime);
-            studentApplication.setEndTime(endTime);
+            studentApplication.setStartTime(sdf.parse(startTime));
+            studentApplication.setEndTime(sdf.parse(endTime));
             studentApplication.setDelFlag(false);
             studentApplication.setCreateBy(subject);
             studentApplication.setCreateTime(new Date());
@@ -187,16 +187,21 @@ public class StudentInsuranceController {
                 studentApplicationRecord.setCreateTime(new Date());
                 studentApplicationRecordService.insert(studentApplicationRecord);
 
+
+                msgResult.setCode(200);
                 msgResult.setResult(true);
-                msgResult.setData(studentApplication);
-            } else {
+                msgResult.setData(studentApplication.getId());
+                msgResult.setMessage("成功");
+            } /*else {
+                msgResult.setCode(400);
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库添加失败");
-            }
+            }*/
         }
         catch(Exception ex){
             logger.error(ex.getMessage(),ex);
 
+            msgResult.setCode(500);
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
         }

+ 16 - 0
picc-common/src/main/java/com/jpsoft/picc/modules/common/dto/MessageResult.java

@@ -12,6 +12,22 @@ public class MessageResult<T> {
     private T data;
     private int code = 200;
 
+    public MessageResult(boolean result, String message, T data, int code) {
+        this.result = result;
+        this.message = message;
+        this.data = data;
+        this.code = code;
+    }
+
+    public MessageResult(boolean result, String message, int code) {
+        this.result = result;
+        this.message = message;
+        this.code = code;
+    }
+
+    public MessageResult() {
+    }
+
     @ApiModelProperty(value = "返回调用结果")
     public boolean isResult() {
         return result;