3月25 bug修改

修改界面银行开户行名称修改之后点击保存还是原数据护理类型和状态下拉框右侧应该添加删除按钮监管机构列表页人员类型前面缺少“监管”两个字监管人员姓名输入框只能输入两个字审核界面所有栏位必填点击审核按钮报错提交机构列表页没有数据审核状态下拉框没有审核中的数据勾选之后点击查询查询结果出现待审核数据，但其他环境没有类似情况点击查看/修改按钮进入编辑界面之后点击保存报500错误点击评定任务分组管理按钮正常跳转但报500错误任务状态下拉框内选项查询没有做校验任务状态下拉框右侧应该添加删除按钮护理机构下拉框只有无锡锡山护理一个选项，导致其他数据无法查询护理服务机构下拉框只有一条查询条件，但实际是五条新建用户点击保存还是报错

3月25 bug修改
7eb5c1b8 · hubin · 96bacd38 · 7eb5c1b8 · 7eb5c1b8 · 7eb5c1b8
Commit 7eb5c1b8 authored Mar 25, 2022 by hubin
4 changed files
--- a/assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java
+++ b/assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java
@@ -9,6 +9,7 @@ import com.hungraim.ltc.pojo.entity.assessment.ChAprReport;
 import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
 import com.hungraim.ltc.pojo.entity.assessment.ChRefuseReason;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
+import com.hungraim.ltc.pojo.vo.ReportUpdateVO;
 import com.hungraim.ltc.pojo.vo.assessment.*;
 import com.hungraim.ltc.service.TaskService;
 import com.hungraim.ltc.service.TppesApiException;
@@ -195,24 +196,24 @@ public class TaskController {
     * @param fileDataList   附件
     */
    @RequestMapping("/updateReport")
-    public Result updateReport(Integer reportId, Integer person1, Integer person2, Integer person3, String evaluateTime, Integer disableLevelId, String polNo, String remark, List<ChFndAttach> fileDataList) {
-        if (disableLevelId == null) {
+    public Result updateReport(ReportUpdateVO vo) {
+        if (vo.getDisableLevelId() == null) {
            return Result.failed("失能等级不能为空!");
        }
-        if (polNo == null) {
-            polNo = "";
+        if (vo.getPolNo() == null) {
+            vo.setPolNo("");
        }
-        if (remark == null) {
-            remark = "";
+        if (vo.getRemark() == null) {
+            vo.setRemark("");
        }
        Date evaluateDate;
        try {
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            evaluateDate = sdf.parse(evaluateTime);
+            evaluateDate = sdf.parse(vo.getEvaluateTime());
        } catch (ParseException e) {
            return Result.failed("评估时间格式不正确!");
        }
-        taskService.updateReport(reportId, person1, person2, person3, evaluateDate, disableLevelId, polNo, remark, fileDataList);
+        taskService.updateReport(vo.getReportId(), vo.getPerson1(), vo.getPerson2(), vo.getPerson3(), evaluateDate, vo.getDisableLevelId(), vo.getPolNo(), vo.getRemark(), vo.getFileDataList());
        return Result.success();
    }


--- a/common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/ReportUpdateVO.java
+++ b/common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/ReportUpdateVO.java
+package com.hungraim.ltc.pojo.vo;
+
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author hubin
+ * @date 2022/3/25
+ * @desc
+ */
+@Data
+public class ReportUpdateVO {
+    Integer reportId;
+    Integer person1;
+    Integer person2;
+    Integer person3;
+    String evaluateTime;
+    Integer disableLevelId;
+    String polNo;
+    String remark;
+    List<ChFndAttach> fileDataList;
+}
--- a/governance/src/main/java/com/hungraim/ltc/governance/service/impl/AprOrganServiceImpl.java
+++ b/governance/src/main/java/com/hungraim/ltc/governance/service/impl/AprOrganServiceImpl.java
@@ -80,6 +80,7 @@ public class AprOrganServiceImpl extends ServiceImpl<AprOrganMapper, ChAprOrgan>
            ChAprOrgan aprOrgan = aprOrganMapper.selectById(chAprOrgan.getAprOrganId());
            aprOrgan.setAccName(chAprOrgan.getAccName());
            aprOrgan.setBankAccName(chAprOrgan.getBankAccName());
+            aprOrgan.setBankAccCode(chAprOrgan.getBankAccCode());
            aprOrgan.setBankNo(chAprOrgan.getBankNo());
            aprOrgan.setOrganId(chAprOrgan.getOrganId());
            aprOrgan.setBankAccName(chAprOrgan.getBankAccName());

--- a/system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/UserController.java
+++ b/system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/UserController.java
@@ -99,13 +99,11 @@ public class UserController {
            return Result.failed("密码太简单，请设置复杂密码！");
        }
        SystemUser systemUser = userInfoService.getOne(new LambdaQueryWrapper<SystemUser>()
-            .eq(SystemUser::getAccount, reqUserInfo.getAccount()).or()
-            .eq(SystemUser::getUserId, reqUserInfo.getId()));
+            .eq(SystemUser::getAccount, reqUserInfo.getAccount()));
        if (systemUser != null) {
            return Result.failed("账号已存在！");
        }
        SystemUser user = new SystemUser();
-        user.setUserId(reqUserInfo.getId());
        user.setAccount(reqUserInfo.getAccount());
        user.setPassword(new BCryptPasswordEncoder().encode(reqUserInfo.getPassword()));
        user.setGender(reqUserInfo.getGender());
@@ -117,7 +115,7 @@ public class UserController {
        //初始化权限
        List<Long> roles = reqUserInfo.getRoleIds();
        roles.add(1L);
-        List<SystemUserRole> roleList = roles.stream().map(roleId -> {
+        List<SystemUserRole> roleList = roles.stream().distinct().map(roleId -> {
            SystemUserRole systemUserRole = new SystemUserRole();
            systemUserRole.setUserId(userId);
            systemUserRole.setRoleId(roleId);