修改撤回申诉接口不允许撤回他人提交的申诉记录

src/main/java/com/diagbot/dto/MsgApiDTO.java

@@ -42,6 +42,9 @@ public class MsgApiDTO {
     @ApiModelProperty(value = "操作类型")
     private String appealOperationType;
 
-    @ApiModelProperty(value = "备注")
+    @ApiModelProperty(value = "缺陷说明")
     private String explainInfo;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

src/main/java/com/diagbot/vo/CancelAppealInfoApiVO.java

@@ -3,6 +3,7 @@ package com.diagbot.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -17,6 +18,9 @@ public class CancelAppealInfoApiVO {
     @ApiModelProperty(value = "医院ID",required = true)
     @NotNull(message = "医院ID不能为空")
     private Long hospitalId;
+    @ApiModelProperty(value = "申述人工号",required = true)
+    @NotBlank(message = "申述人工号不能为空")
+    private String claimantId;
     @ApiModelProperty(value = "当前工作流节点id 1:申诉|2:撤回|3:审核", hidden = true)
     private Long workFlowNodeId;
 }

src/main/java/com/diagbot/vo/CancelAppealInfoVO.java

@@ -3,6 +3,7 @@ package com.diagbot.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -14,6 +15,8 @@ import javax.validation.constraints.NotNull;
 public class CancelAppealInfoVO {
     @ApiModelProperty(value = "申诉id", required = true)
     private Long id;
+    @ApiModelProperty(value = "申述人工号", hidden = true)
+    private String claimantId;
     @ApiModelProperty(value = "当前工作流节点id 1:申诉|2:撤回|3:审核", hidden = true)
     private Long workFlowNodeId;
 }

src/main/java/com/diagbot/web/MedAppealInfoController.java

@@ -115,6 +115,11 @@ public class MedAppealInfoController {
         if (StringUtils.isNotEmpty(flag)) {
             getReviewerVO.setSelfFlag(Boolean.parseBoolean(flag));
         }
+        //通过医生id获取医生的用户id
+        Long userId = sysUserFacade.getUserId(getReviewerApiVO.getClaimantId(), getReviewerApiVO.getHospitalId());
+        if (userId != null) {
+            getReviewerVO.setClaimantId(userId+"");
+        }
         return medAppealInfoServiceClientFacade.getReviewer(getReviewerVO);
     }
 
@@ -151,6 +156,11 @@ public class MedAppealInfoController {
             JSONObject mapJSON = JSONObject.parseObject(mapping);
             cancelAppealInfoVO.setWorkFlowNodeId(mapJSON.getLong("cancelAppealInfo"));
         }
+        //通过医生id获取医生的用户id
+        Long userId = sysUserFacade.getUserId(cancelAppealInfoApiVO.getClaimantId(), cancelAppealInfoApiVO.getHospitalId());
+        if (userId != null) {
+            cancelAppealInfoVO.setClaimantId(userId+"");
+        }
         return medAppealInfoServiceClientFacade.cancelAppealInfo(cancelAppealInfoVO);
     }
 
@@ -165,6 +175,7 @@ public class MedAppealInfoController {
             JSONObject mapJSON = JSONObject.parseObject(mapping);
             cancelAppealInfoVO.setWorkFlowNodeId(mapJSON.getLong("cancelAppealInfo"));
         }
+        cancelAppealInfoVO.setClaimantId(SysUserUtils.getCurrentPrincipleID());
         return medAppealInfoServiceClientFacade.cancelAppealInfo(cancelAppealInfoVO);
     }