Merge remote-tracking branch 'origin/master'

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/MessageController.java

@@ -239,4 +239,35 @@ public class MessageController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="消息设为已读")
+    @PostMapping("read/{id}")
+    public MessageResult<Integer> read(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            Message message = messageService.get(id);
+            message.setStatus(true);
+            message.setUpdateBy(subject);
+            message.setUpdateTime(new Date());
+
+            int affectCount = messageService.update(message);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("设为已读失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/InsurancePolicyController.java

@@ -107,8 +107,8 @@ public class InsurancePolicyController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "policyId",value = "每月投保单ID", required = true, paramType = "form",dataType = "String")
     })
-    public MessageResult<List<InsurancePolicyRecord>> backReason(@RequestParam(value="policyId",defaultValue="") String policyId){
-        MessageResult<List<InsurancePolicyRecord>> msgResult = new MessageResult<>();
+    public MessageResult<InsurancePolicyRecord> backReason(@RequestParam(value="policyId",defaultValue="") String policyId){
+        MessageResult<InsurancePolicyRecord> msgResult = new MessageResult<>();
 
         Map<String,Object> searchParams = new HashMap<>();
         searchParams.put("policyId",policyId);
@@ -117,9 +117,13 @@ public class InsurancePolicyController {
         sortList.add(new Sort("create_time","desc"));
 
         Page<InsurancePolicyRecord> page = insurancePolicyRecordService.pageSearch(searchParams,1,100,sortList);
-
-        msgResult.setResult(true);
-        msgResult.setData(page.getResult());
+        if(page.size() > 0){
+            msgResult.setResult(true);
+            msgResult.setData(page.getResult().get(0));
+        }else {
+            msgResult.setResult(false);
+            msgResult.setMessage("没有相关退回理由。");
+        }
 
         return msgResult;
     }