修改申诉对外接口

src/main/java/com/diagbot/facade/SysUserFacade.java

@@ -143,8 +143,9 @@ public class SysUserFacade extends SysUserServiceImpl {
 
     /**
      * 获取jwt
-     *
+     * <p>
      * userLoginVO
+     *
      * @return jwt
      */
     public JwtDTO getJwt(HttpServletRequest request, UserLoginVO userLoginVO) {
@@ -158,9 +159,9 @@ public class SysUserFacade extends SysUserServiceImpl {
                     "请输入密码");
         }
         //非湘雅医院执行
-        String captchaId ="";
-        if(0L == getHospitalMark()) {
-            if ( StringUtils.isEmpty(userLoginVO.getCaptcha())) {
+        String captchaId = "";
+        if (0L == getHospitalMark()) {
+            if (StringUtils.isEmpty(userLoginVO.getCaptcha())) {
                 throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                         "请输入验证码");
             }
@@ -191,7 +192,7 @@ public class SysUserFacade extends SysUserServiceImpl {
         if (null == jwt) {
             throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL);
         }
-        if(0L == getHospitalMark()) {
+        if (0L == getHospitalMark()) {
             redisUtils.del("user:captchaIds:" + captchaId);
         }
         data.setAccessToken(jwt.getAccess_token());
@@ -779,6 +780,14 @@ public class SysUserFacade extends SysUserServiceImpl {
             throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "该医院下无该用户");
         }
     }
+
+    public Long getUserId(String claimantId, Long hospitalId) {
+        SysUser user = this.getBaseMapper().getUser(claimantId, hospitalId);
+        if (user != null && user.getId() != null) {
+            return user.getId();
+        }
+        return null;
+    }
     //-------------用户维护END---------------------------
 
 }

src/main/java/com/diagbot/mapper/SysUserMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.SysUserQueryDTO;
 import com.diagbot.entity.SysUser;
 import com.diagbot.vo.SysUserQueryVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,4 +17,6 @@ import com.diagbot.vo.SysUserQueryVO;
  */
 public interface SysUserMapper extends BaseMapper<SysUser> {
     IPage<SysUserQueryDTO> userPage(SysUserQueryVO sysUserQueryVO);
+
+    SysUser getUser(@Param("claimantId") String claimantId, @Param("hospitalId") Long hospitalId);
 }

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

@@ -8,6 +8,7 @@ import com.diagbot.dto.*;
 import com.diagbot.entity.SysUserRole;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.SysHospitalSetFacade;
+import com.diagbot.facade.SysUserFacade;
 import com.diagbot.facade.SysUserRoleFacade;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
@@ -52,6 +53,9 @@ public class MedAppealInfoController {
     @Autowired
     SysUserRoleFacade sysUserRoleFacade;
 
+    @Autowired
+    SysUserFacade sysUserFacade;
+
     @ApiOperation(value = "申诉[by:songxl]",
             notes = "申诉")
     @PostMapping("/addAppealInfo")
@@ -77,6 +81,11 @@ public class MedAppealInfoController {
         String mapping = sysHospitalSetFacade.getValue(addAppealInfoApiVO.getHospitalId(), "work_flow_node_mapping");
         AddAppealInfoVO addAppealInfoVO = new AddAppealInfoVO();
         BeanUtils.copyProperties(addAppealInfoApiVO, addAppealInfoVO);
+        //通过医生id获取医生的用户id
+        Long userId = sysUserFacade.getUserId(addAppealInfoApiVO.getClaimantId(), addAppealInfoApiVO.getHospitalId());
+        if (userId != null) {
+            addAppealInfoApiVO.setClaimantId(userId+"");
+        }
         if (StringUtil.isNotEmpty(mapping)) {
             JSONObject mapJSON = JSONObject.parseObject(mapping);
             addAppealInfoVO.setWorkFlowNodeId(mapJSON.getLong("addAppealInfo"));
@@ -124,10 +133,10 @@ public class MedAppealInfoController {
     @Transactional
     public RespDTO<Boolean> cancelAppealInfoApi(@RequestBody @Valid CancelAppealInfoApiVO cancelAppealInfoApiVO) {
         //获取操作流节点
-        String mapping = sysHospitalSetFacade.getValue(cancelAppealInfoApiVO.getHospitalId(),"work_flow_node_mapping");
+        String mapping = sysHospitalSetFacade.getValue(cancelAppealInfoApiVO.getHospitalId(), "work_flow_node_mapping");
         CancelAppealInfoVO cancelAppealInfoVO = new CancelAppealInfoVO();
-        BeanUtils.copyProperties(cancelAppealInfoApiVO,cancelAppealInfoVO);
-        if(StringUtil.isNotEmpty(mapping)){
+        BeanUtils.copyProperties(cancelAppealInfoApiVO, cancelAppealInfoVO);
+        if (StringUtil.isNotEmpty(mapping)) {
             JSONObject mapJSON = JSONObject.parseObject(mapping);
             cancelAppealInfoVO.setWorkFlowNodeId(mapJSON.getLong("cancelAppealInfo"));
         }
@@ -162,10 +171,10 @@ public class MedAppealInfoController {
         String currentPrincipleID = SysUserUtils.getCurrentPrincipleID();
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         getAppealDeptVo.setHospitalId(Long.valueOf(hospitalId));
-        if(Long.valueOf(getAppealDeptVo.getPageType())==1){
+        if (Long.valueOf(getAppealDeptVo.getPageType()) == 1) {
             //申诉人
             getAppealDeptVo.setClaimantId(Long.valueOf(currentPrincipleID));
-        }else {
+        } else {
             //审核人
             getAppealDeptVo.setCheckId(Long.valueOf(currentPrincipleID));
         }
@@ -179,10 +188,10 @@ public class MedAppealInfoController {
         String currentPrincipleID = SysUserUtils.getCurrentPrincipleID();
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         getAppealModeVo.setHospitalId(Long.valueOf(hospitalId));
-        if(Long.valueOf(getAppealModeVo.getPageType())==1){
+        if (Long.valueOf(getAppealModeVo.getPageType()) == 1) {
             //申诉人
             getAppealModeVo.setClaimantId(Long.valueOf(currentPrincipleID));
-        }else {
+        } else {
             //审核人
             getAppealModeVo.setCheckId(Long.valueOf(currentPrincipleID));
         }

src/main/resources/mapper/SysUserMapper.xml

@@ -126,4 +126,18 @@
             and t3.linkman like CONCAT('%',#{linkman},'%')
         </if>
     </select>
+
+    <select id="getUser" resultType="com.diagbot.entity.SysUser">
+        SELECT
+        *
+    FROM
+        sys_user u,
+        sys_user_hospital uh
+    WHERE
+        u.is_deleted = "N"
+    AND uh.is_deleted = "N"
+    AND u.id = uh.user_id
+    AND u.username = #{claimantId}
+    AND uh.hospital_id = #{hospitalId}
+    </select>
 </mapper>