服务分配模块第一次提交

apply/apply-service/src/main/java/com/hungraim/ism/controller/DisableController.java

@@ -185,4 +185,5 @@ public class DisableController {
         return Result.success();
     }
 
+
 }

apply/apply-service/src/main/java/com/hungraim/ism/dao/SrvOrganMapper.java

@@ -3,6 +3,7 @@ package com.hungraim.ism.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -13,4 +14,5 @@ import org.springframework.stereotype.Repository;
 @Mapper
 @Repository
 public interface SrvOrganMapper extends BaseMapper<ChSrvOrgan> {
+
 }

apply/apply-service/src/main/java/com/hungraim/ism/service/DisableService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
 import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.entity.disable.*;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

apply/apply-service/src/main/java/com/hungraim/ism/service/impl/DisableServiceImpl.java

@@ -9,6 +9,7 @@ import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ism.pojo.vo.disable.ExamineRecord;
 import com.hungraim.ism.service.DisableService;
 import com.hungraim.ltc.pojo.entity.disable.*;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -67,7 +68,7 @@ public class DisableServiceImpl implements DisableService {
             organIds = new ArrayList<>();
             // 先把最顶层id添加到集合
             organIds.add(organId);
-            // 获取子孙机构集合
+            // 获取子孙机构集合`
             if ("0".equals(isIncludeSubsidiaries)) {
                 this.getOrganList(organId, organIds);
             }

apply/apply-service/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     nacos:
       discovery:
         server-addr: qw.hungraim.com:31158
-        namespace: 353e9334-5b6c-4d44-9f5c-daf26e414898
+        namespace: 3b93a812-d992-482e-a891-fcb3e455dc36
       config:
         namespace: 87d6f6f1-6583-46ea-ad02-7e8125f03c90
         server-addr: qw.hungraim.com:31158

apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml

@@ -113,6 +113,7 @@
         from CH_DISABLE_APPLY a
                  LEFT JOIN CH_SRV_ORGAN o ON a.SRV_ORGAN_ID = o.organ_code
         where a.APPLY_ID = #{applyId}
+        order by APPLY_ID desc
     </select>
 
     <select id="listExamineRecordByApplyId" resultType="com.hungraim.ism.pojo.vo.disable.ExamineRecord">

assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/DisableEvaluateController.java

@@ -78,4 +78,6 @@ public class DisableEvaluateController {
         return Result.success();
     }
 
+
+
 }

assessment/assessment-service/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     nacos:
       discovery:
         server-addr: qw.hungraim.com:31158
-        namespace: 353e9334-5b6c-4d44-9f5c-daf26e414898
+        namespace: 3b93a812-d992-482e-a891-fcb3e455dc36
       config:
         namespace: 87d6f6f1-6583-46ea-ad02-7e8125f03c90
         server-addr: qw.hungraim.com:31158

auth-service/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     nacos:
       discovery:
         server-addr: qw.hungraim.com:31158
-        namespace: 353e9334-5b6c-4d44-9f5c-daf26e414898
+        namespace: 3b93a812-d992-482e-a891-fcb3e455dc36
       config:
         namespace: 87d6f6f1-6583-46ea-ad02-7e8125f03c90
         server-addr: qw.hungraim.com:31158

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableEvaluateInfoVO.java

 package com.hungraim.ism.pojo.vo.disable;
 
+import lombok.Data;
+
 import java.util.Date;
 
 /**
  * 失能审核信息详情VO
  */
+@Data
 public class DisableEvaluateInfoVO {
     //***失能人员个人信息
     //机构

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableEvaluateVO.java

 package com.hungraim.ism.pojo.vo.disable;
 
+import com.hungraim.ltc.pojo.entity.PageInfo;
+
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 失能评定列表VO
  */
-public class DisableEvaluateVO {
+public class DisableEvaluateVO extends PageInfo implements Serializable {
     //id
     private String evaluateId;
     //适用机构

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableVO.java

 package com.hungraim.ism.pojo.vo.disable;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 失能人员信息列表VO
  */
 @Data
-public class DisableVO {
+@TableName("")
+public class DisableVO implements Serializable {
     //id
     private String applyId;
     //适用机构
     private String organName;
     //机构代码
-    private String organId;
+    private String organiId;
     //所在省市
     private String provincial;
     private String city;
@@ -27,27 +30,27 @@ public class DisableVO {
     //待遇类型
     private String treatmentTyte;
     //联系人姓名
-    private String operName;
+    private String opername;
     //年龄
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
     //性别
     private String gender;
     //失能人员身份证号码
-    private String operCertiCode;
+    private String opercertiCode;
     //失能人员手机号
     private String tel;
     //失能人员固话
-    private String fixedTel;
+    private String fixedtel;
     //申请服务方式
-    private String srvModeName;
+    private String srvmodeName;
     //诊断疾病
     private String disease;
     //申请时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date effTime;
+    private Date efftime;
     //申请来源 网厅：0，核心：1，手机端:2,待遇申请:3
-    private String dataFrom;
+    private String datafrom;
     //审核状态
     private String applyStatus;
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableApply.java

 package com.hungraim.ltc.pojo.entity.disable;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.hungraim.ltc.constant.AssignStatus;
+import com.hungraim.ltc.pojo.entity.PageInfo;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -13,12 +16,15 @@ import java.util.Date;
  */
 @Data
 @TableName("CH_DISABLE_APPLY")
-public class ChDisableApply implements Serializable {
+public class ChDisableApply extends PageInfo implements Serializable {
+
     /**
      * 失能申请id
      */
+    @TableId("apply_id")
     private Long applyId;
 
+
     /**
      * 机构代码
      */
@@ -579,12 +585,12 @@ public class ChDisableApply implements Serializable {
     /**
      * 历史操作时间
      */
-    private Date hisTime;
+    //private Date hisTime;
 
     /**
      * 历史操作人
      */
-    private Long hisEmp;
+   // private Long hisEmp;
 
     /**
      * 代办人固话

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableEvaluate.java

 package com.hungraim.ltc.pojo.entity.disable;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 失能评定
@@ -25,14 +27,14 @@ public class ChDisableEvaluate implements Serializable {
     private String bankNo;
     private Integer operRelation;
     private Integer sTATUS;
-    private java.util.Date allotTime;
+    private Date allotTime;
     private Integer webEndEmp;
     private Integer srvOrgenId;
     private Integer webDefineEmp;
     private String districtArea;
     private String bankRemark;
     private Integer modeId;
-    private java.util.Date evaluateTime;
+    private Date evaluateTime;
     private String addressResidential;
     private String contactName;
     private String bankDistrictWebsite;
@@ -40,10 +42,10 @@ public class ChDisableEvaluate implements Serializable {
     private Integer checkStatus;
     private String districtProvince;
     private String addressDetail;
-    private java.util.Date fCD;
+    private Date fCD;
     private Integer srvModeId;
     private String contactTel;
-    private java.util.Date lCD;
+    private Date lCD;
     private String realName;
     private Integer treatmentType;
     private String streetCode;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableInfo.java

+package com.hungraim.ltc.pojo.entity.disable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hungraim.ltc.pojo.entity.PageInfo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("CH_DISABLE_INFO")
+public class ChDisableInfo extends PageInfo implements Serializable {
+    //失能人员id
+    private Integer disabInfoId;
+    //机构代码
+    private String  organId;
+    //所在省份
+    private String  districtProvincial;
+    //所在城市
+    private String  districtCity;
+    //所在区域
+    private String  districtArea;
+    //姓名
+    private String  realName;
+    //身份证号
+    private String  certiCode;
+    //出生年月
+    private Date    birthday;
+    //性别   男：M；女：F；不确定 N
+    private String  gender;
+    //电话
+    private String  tel;
+    //住址区域
+    private String  addressDistrictCode;
+    //住址详情
+    private String  addressDetail;
+    //户籍   本市：0；非本市：1
+    private Integer regist;
+    //疾病
+    private String  disease;
+    //服务方案配置ID
+    private Integer srvModeId;
+    //疾病描述
+    private String  diseaseDesc;
+    //医保类别     城镇：1；非城镇：0
+    private Integer medicalType;
+    //社保卡号
+    private String  medicalCard;
+    //意向护理机构
+    private Integer srvOrganIntent;
+    //代办人姓名
+    private String  operName;
+    //代办人身份证
+    private String  operCertiCode;
+    //代办人电话
+    private String  operTel;
+    //与失能人员关系   子女:0;父母:1配偶:2其他:3
+    private Integer operRelation;
+//    // 代办人住址区域
+//    private String  OPER_DISTRICT_CODE;
+//    // 代办人住址详情
+//    private String  OPER_ADDRESS;
+//    // 鉴定评估id
+//    private Integer APR_CONF_Y;
+    // 申请状态   未提交:0;待审核:1;审核通过:2；不通过：3
+    private Integer applyStatus;
+//    //审核人姓名
+//    private String  CHECK_NAME;
+//    //审核备注
+//    private String  CHECK_REMARK;
+//    //审核时间
+//    private Date    CHECK_TIME;
+//    //原因
+//    private String  REASON;
+//    //  创建人
+//    private Integer DEFINE_EMG;
+//    //创建时间
+//    private Date    EFF_TIME;
+//    //终止人
+//    private Integer END_EMG;
+//    // 终止时间
+//    private Date    END_TIME;
+//    //首次操作时间
+//    private Date    FCD;
+//    //首次操作人
+//    private Integer FCU;
+//    //末次操作时间
+//    private Date    LCD;
+//    //末次操作人
+//    private Integer LCU;
+//    //申请机构
+//    private Integer aplorganid;
+//    //现住地址省份
+//    private String  ADRESS_DISTRICT_PROVINCIAL;
+//    //现在地址城市
+//    private String  ADRESS_DISTRICT_CITY;
+//    //代办人住址省份
+//    private String  OPER_DISTRICT_PROVINCIAL;
+//    //代办人住址城市
+//    private String  OPER_DISTRICT_CITY;
+//    //最新鉴定ID
+//    private Integer LAST_TASK_ID;
+//    //街道
+//    //private String  STREET;
+//    //
+//    private String  APR_TOTAL_SCORE;
+//    // 失能申请id
+//    private Integer APPLY_ID;
+//    // 服务配置id
+//    private Integer CFG_MODE_ID;
+//    //接受评定省
+//    private String  ACPT_PROVINCIAL;
+//    //接受评定市
+//    private String  ACPT_CITY;
+//    //接受评定区
+//    private String  ACPT_AREA;
+//    //接受评定街道
+//    private String  ACPT_STREET;
+//    //接受评定详细地址
+//    private String  ACPT_ADDRESS;
+//    //接受评定类型 现在址：0,机构地址：1,其他：2
+//    private Integer ACPT_TYPE;
+//    //疾病大类
+//    private Integer DISE_TYPE_F;
+//    //疾病小类
+//    private Integer DISE_TYPE_S;
+//    //现住址经度
+//    private String  ADDRESS_LONGITUDE;
+//    //现住址纬度
+//    private String  ADDRESS_LATITUDE;
+//    //接受评定地址经度
+//    private String  ACPT_LONGITUDE;
+//    //接受评定地址纬度
+//    private String  ACPT_LATITUDE;
+//    //代办人街道
+//    private String  OPER_STREET;
+//    //代办人地址经度
+//    private String  AGENT_LONGITUDE;
+//    // 代办人地址纬度
+//    private String  AGENT_LATITUDE;
+//    //现住地址路街
+//    private String  ADDRESS_ROAD_DETAIL;
+//    // 现住地址路/街（0路，1街，2村）
+//    private Integer ADDRESS_ROAD_TYPE;
+//    //现住地址号弄
+//    private String  ADDRESS_NUMBER_DETAIL;
+//    //现住地址号/弄（0弄，1号）
+//    private Integer ADDRESS_NUMBER_TYPE;
+//    //接受评定地址路街
+//    private String  ACPT_ROAD_DETAIL;
+//    //接受评定地址路/街（0路，1街，2村）
+//    private Integer ACPT_ROAD_TYPE;
+//    //接受评定地址号弄
+//    private String  ACPT_NUMBER_DETAIL;
+//    //接受评定地址号/弄（0弄，1号）
+//    private Integer ACPT_NUMBER_TYPE;
+//    //代办人现住止路街
+//    private String  OPER_ROAD_DETAIL;
+//    //代办人现住止路/街（0路，1街，2村）
+//    private Integer OPER_ROAD_TYPE;
+//    //代办人现住止号弄
+//    private String  OPER_NUMBER_DETAIL;
+//    //代办人现住止号/弄（0弄，1号）
+//    private Integer OPER_NUMBER_TYPE;
+//    //接受服务地址省
+//    private String  ACPT_SRV_PROVINCIAL;
+//    //接受服务地址市
+//    private String  ACPT_SRV_CITY;
+//    //接受服务地址区
+//    private String  ACPT_SRV_AREA;
+//    //接受服务地址街道
+//    private String  ACPT_SRV_STREET;
+//    //接受服务地址路街
+//    private String  ACPT_SRV_ROAD_DETAIL;
+//    //接受服务地址路/街（0路，1街，2村）
+//    private Integer ACPT_SRV_ROAD_TYPE;
+//    //接受服务地址号弄
+//    private String  ACPT_SRV_NUMBER_DETAIL;
+//    //接受服务地址号/弄（0弄，1号）
+//    private Integer ACPT_SRV_NUMBER_TYPE;
+//    //接受服务地址详细地址
+//    private String  ACPT_SRV_ADDRESS;
+//    //接受服务地址类型(现在址：0,护理机构地址：1,其他：2,接受评定地址：3)
+//    private Integer ACPT_SRV_TYPE;
+//    //接受服务地址经度
+//    private String  ACPT_SRV_LONGITUDE;
+//    //接受服务地址纬度
+//    private String  ACPT_SRV_LATITUDE;
+//    //数据来源（申请：0，信息变更：1）
+//    private Integer DATA_FROM;
+//    //失能人员固话
+//    private String  FIXED_TEL;
+//    //代办人固话
+//    private String  OPER_FIXED_TEL;
+//    //所在户籍地址省
+//    private String  REGIST_PROVINCIAL;
+//    //所在户籍地址市
+//    private String  REGIST_CITY;
+//    //所在户籍地址区
+//    private String  REGIST_AREA;
+//    //所在户籍地址街道
+//    private String  REGIST_STREET;
+//    //所在户籍地址详细地址
+//    private String  REGIST_ADDRESS;
+//    //所在户籍地址经度
+//    private String  REGIST_LONGITUDE;
+//    //所在户籍地址纬度
+//    private String  REGIST_LATITUDE;
+//    //1病史简述1   . 曾患的重大疾病、外伤史、传染病史
+//    private String  MEDICAL_HISTORY1;
+//    //病史简述2   2. 现有的疾病和病症
+//    private String  MEDICAL_HISTORY2;
+//    //病史简述3   3. 目前正在治疗的疾病和病症
+//    private String  MEDICAL_HISTORY3;
+//    //身高
+//    //private Integer HEIGHT;
+//    //体重
+//    //private Integer WEIGHT;
+//    //左手握力
+//    private Integer LEFT_HAND_GRIP;
+//    //右手握力
+//    private Integer RIGHT_HAND_GRIP;
+//    //肢体残缺  0有，1无
+//    private Integer BODY_INCOMPLETE;
+//    //视力障碍   0有，1无
+//    private Integer VISION_OBSTACLE;
+//    //听力障碍   0有，1无
+//    private Integer HEARING_OBSTACLE;
+//    //病史简述
+//    private String  MEDICAL_HISTORY;
+//    //医师姓名
+//    private String  DOCTOR_NAME;
+//    //医师证件号码
+//    private String  DOCTOR_NUMBER;
+//    //是否跨区，0不跨区，1跨区
+//    private Integer CROSS_DISTRICT;
+//    //现住址类型(0：接受评定地址；1：接受服务地址；2：其他)
+//    private Integer ADDRESS_TYPE;
+//    //待遇类型（1失能、0失智）
+//    private Integer TREATMENT_TYPE;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChSrvOrgan.java

 package com.hungraim.ltc.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.hungraim.ltc.pojo.entity.PageInfo;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 护理机构表
  */
 @Data
 @TableName("CH_SRV_ORGAN")
-public class ChSrvOrgan {
+public class ChSrvOrgan extends PageInfo implements Serializable {
     private Integer srvOrganId;
     private String acptRoadDetail;
     private String acptLongitude;

gateway-service/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     nacos:
       discovery:
         server-addr: qw.hungraim.com:31158
-        namespace: 353e9334-5b6c-4d44-9f5c-daf26e414898
+        namespace: 3b93a812-d992-482e-a891-fcb3e455dc36
       config:
         namespace: 87d6f6f1-6583-46ea-ad02-7e8125f03c90
         server-addr: qw.hungraim.com:31158

governance/src/main/java/com/hungraim/ltc/governance/controller/BuildBedController.java

 package com.hungraim.ltc.governance.controller;
 
-import com.hungraim.ltc.governance.service.IBuildBedService;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
+import com.hungraim.ltc.governance.service.*;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author jiaguokai
@@ -18,6 +30,14 @@ import javax.annotation.Resource;
 public class BuildBedController {
     @Resource
     private IBuildBedService buildBedService;
+    @Resource
+    private ApplyService applyService;
+    @Resource
+    private CrvService crvService;
+    @Resource
+    private DisableEvaluateService disableEvaluateService;
+
+
 
     @PostMapping("/searchOrgBed")
     public Result searchOrgBed(@RequestBody BuildBedSearchReq req) {
@@ -25,8 +45,172 @@ public class BuildBedController {
     }
 
     @PostMapping("/addBuild")
-    public Result buildBed(ChSrvBuildBed buildBed) {
+    public Result<Boolean> buildBed(ChSrvBuildBed buildBed) {
         boolean b = buildBedService.save(buildBed);
         return Result.success(b);
     }
+
+    /**
+     * 功能描述: 服务分配信息检索条件查询
+     */
+    @GetMapping("/pageFuwuCondition")
+    public Result pageFuwuCondition(HttpServletRequest request,
+                                    @RequestBody(required = false) ChDisableApply disableApply) {
+
+        // 创建一个page对象
+        Page<ChDisableApply> disableApplyPage = new Page<ChDisableApply>(disableApply.getCurrent(), disableApply.getLimit());
+        // 构建条件
+        QueryWrapper<ChDisableApply> queryWrapper = new QueryWrapper<>();
+        // 多条件组合查询
+        // 机构id
+        String organid = disableApply.getOrganId();
+        // 失能人员姓名
+        String name = disableApply.getRealName();
+        // 失能人员手机号码
+        String tel = disableApply.getTel();
+        // 省
+        String provincial = disableApply.getDistrictProvincial();
+        //　市
+        String city = disableApply.getDistrictCity();
+        //　县
+        String area = disableApply.getDistrictArea();
+        // 失能人员身份证号码
+        String certiCode = disableApply.getCertiCode();
+        // 意向护理机构
+        Long srvOrganId = disableApply.getSrvOrganId();
+        // 服务方式
+        Long srvModeId = disableApply.getSrvModeId();
+        // 状态
+        Short applyStatus = disableApply.getApplyStatus();
+
+        if (!StrUtil.isEmpty(organid)) {
+            queryWrapper.like("organ_id", organid);
+        }
+        if (!StrUtil.isEmpty(name)) {
+            queryWrapper.like("real_name", name);
+        }
+        if (!StrUtil.isEmpty(tel)) {
+            queryWrapper.like("tel", tel);
+        }
+        if (!StrUtil.isEmpty(city)) {
+            queryWrapper.like("district_City", city);
+        }
+        if (!StrUtil.isEmpty(provincial)) {
+            queryWrapper.like("district_Provincial", provincial);
+        }
+        if (!StrUtil.isEmpty(area)) {
+            queryWrapper.like("district_Area", area);
+        }
+        if (!StrUtil.isEmpty(certiCode)) {
+            queryWrapper.like("certi_Code", certiCode);
+        }
+        if (srvOrganId != null) {
+            queryWrapper.like("srv_Organ_Id", srvOrganId);
+        }
+        if (srvModeId != null) {
+            queryWrapper.like("srv_Mode_Id", srvModeId);
+        }
+        if (applyStatus != null) {
+            queryWrapper.like("apply_Status", applyStatus);
+        }
+        // 调用方法实现分页查询
+        Page<ChDisableApply> page = applyService.seletPage(disableApplyPage, queryWrapper);
+        //buildBedService.
+        // 总记录数
+        long total = disableApplyPage.getTotal();
+        List<ChDisableApply> records = disableApplyPage.getRecords();
+        Map map = new HashMap<>();
+        map.put("total", total);
+        map.put("recors", records);
+        return Result.success(map);
+    }
+
+    /**
+     * 根据id查询失能人员的评定信息
+     */
+    @GetMapping("/queryEvaluateById")
+    public Result queryEvaluateById (@ModelAttribute ChDisableApply chDisableApply){
+
+        String organId = chDisableApply.getOrganId();
+        Long srvOrganId = chDisableApply.getSrvOrganId();
+        String realName = chDisableApply.getRealName();
+        String certiCode = chDisableApply.getCertiCode();
+
+        IPage<DisableEvaluateVO> disableEvaluateVOIPage = disableEvaluateService.disableEvaluateList(organId, srvOrganId, realName, certiCode, chDisableApply.getCurrent(), chDisableApply.getLimit());
+
+        ChDisableApply page = applyService.selectById(chDisableApply.getApplyId());
+        // 查询是能人员最新评定信息
+
+        Map map = new HashMap<>();
+        map.put("disableEvaluate", disableEvaluateVOIPage.getRecords());
+        map.put("chDisableApply", page);
+        return Result.success(map);
+    }
+    /**
+     *护理机构及服务方式檢索
+     */
+    @GetMapping("/PageCrv")
+    public Result PageCrv(HttpServletRequest request,
+                          @RequestBody(required = false) ChSrvOrgan chSrvOrgan){
+
+        // 创建一个page对象
+        Page<ChSrvOrgan> chSrvOrganPage = new Page<ChSrvOrgan>(chSrvOrgan.getCurrent(), chSrvOrgan.getLimit());
+        // 构建条件
+        QueryWrapper<ChSrvOrgan> queryWrapper = new QueryWrapper<>();
+        // 多条件组合查询
+        // 机构id
+        String srvid = chSrvOrgan.getOrganId();
+        // 机构名称
+        String srvOrganName = chSrvOrgan.getSrvOrganName();
+        // 社会信用代码
+        String code = chSrvOrgan.getUnifiedSocialCreditCode();
+
+        if (!StrUtil.isEmpty(srvid)) {
+            queryWrapper.like("organ_id", srvid);
+        }
+        if (!StrUtil.isEmpty(srvOrganName)) {
+            queryWrapper.like("srv_Organ_Name", srvOrganName);
+        }
+        if (!StrUtil.isEmpty(code)) {
+            queryWrapper.like("unified_social_credit_code", code);
+        }
+        // 调用方法实现分页查询
+        Page<ChSrvOrgan> page = crvService.seletPage(chSrvOrganPage, queryWrapper);
+        //buildBedService.
+        // 总记录数
+        long total = chSrvOrganPage.getTotal();
+        List<ChSrvOrgan> records = chSrvOrganPage.getRecords();
+        Map map = new HashMap<>();
+        map.put("total", total);
+        map.put("recors", records);
+        return Result.success(map);
+    }
+
+    /**
+     *提交分配机构
+     */
+    @PostMapping("/submit")
+    public Result submit(@RequestBody(required = false)ChSrvOrgan chSrvOrgan){
+        // 判斷參數是否存在
+           if (chSrvOrgan.getPermitId()==null){
+               return Result.failed("失能人员id無效");
+           }
+       //  查出失能人員相關信息
+        ChSrvOrgan apply = crvService.selectById(chSrvOrgan.getPermitId());
+        apply.setOrganId(chSrvOrgan.getOrganId());
+        apply.setDistrictProvincial(chSrvOrgan.getDistrictProvincial());
+        apply.setDistrictCity(chSrvOrgan.getDistrictCity());
+        apply.setDistrictArea(chSrvOrgan.getDistrictArea());
+        apply.setSrvOrganName(chSrvOrgan.getSrvOrganName());
+        apply.setOrganTypeId(chSrvOrgan.getOrganTypeId());
+        apply.setUnifiedSocialCreditCode(chSrvOrgan.getUnifiedSocialCreditCode());
+        apply.setSrvType(chSrvOrgan.getSrvType());
+        apply.setEndTime(chSrvOrgan.getEndTime());
+        apply.setAcptRoadDetail(chSrvOrgan.getAcptRoadDetail());
+        apply.setAcptRoadType(chSrvOrgan.getAcptRoadType());
+        crvService.updateById(apply);
+        return Result.success(apply);
+    }
+
 }
+

governance/src/main/java/com/hungraim/ltc/governance/controller/RemoveBedController.java

@@ -32,4 +32,6 @@ public class RemoveBedController {
 
         return Result.success(removeBedService.removeOne(removeBed));
     }
+
+
 }

governance/src/main/java/com/hungraim/ltc/governance/dao/ApplyMapper.java

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ApplyMapper extends BaseMapper<ChDisableApply> {
+
+}

governance/src/main/java/com/hungraim/ltc/governance/dao/BuildBedMapper.java

 package com.hungraim.ltc.governance.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchRsp;
@@ -18,4 +20,9 @@ import org.springframework.stereotype.Repository;
 public interface BuildBedMapper extends BaseMapper<ChSrvBuildBed> {
 
     Page<BuildBedSearchRsp> searchOrgBed(Page<BuildBedSearchRsp> page, @Param("req") BuildBedSearchReq req);
+
+    IPage<DisableVO> disableList(String organId, String organname, String tel,
+                                 String srvmodename, String area, String city,
+                                 String certicode, String applystatus, int pageNum, int pageSize);
+
 }

governance/src/main/java/com/hungraim/ltc/governance/dao/CrvMapper.java

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;
+import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface CrvMapper extends BaseMapper<ChSrvOrgan> {
+
+}

governance/src/main/java/com/hungraim/ltc/governance/dao/DisableEvaluateMapper.java

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 失能人员申请历史Mapper
+ *
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface DisableEvaluateMapper extends BaseMapper<ChDisableEvaluate> {
+    /**
+     * 查询失能评定列表
+     *
+     * @param organId    适用机构代码
+     * @param srvOrganId 护理机构
+     * @param realName   失能人员姓名
+     * @param certiCode  失能人员身份证号码
+     */
+    Page<DisableEvaluateVO> disableEvaluateList(Page<DisableVO> page, String organId, Long srvOrganId, String realName, String certiCode);
+
+
+    DisableEvaluateInfoVO selectDisableEvaluateInfoByEvaluateId(String evaluateId);
+
+}

governance/src/main/java/com/hungraim/ltc/governance/service/ApplyService.java

+package com.hungraim.ltc.governance.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+public interface ApplyService extends IService<ChDisableApply> {
+
+
+    Page<ChDisableApply> seletPage(Page<ChDisableApply> disableApplyPage, QueryWrapper<ChDisableApply> queryWrapper);
+
+    ChDisableApply selectById(Long applyId);
+}

governance/src/main/java/com/hungraim/ltc/governance/service/CrvService.java

+package com.hungraim.ltc.governance.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
+
+public interface CrvService extends IService<ChSrvOrgan> {
+
+
+    Page<ChSrvOrgan> seletPage(Page<ChSrvOrgan> chSrvOrganPage, QueryWrapper<ChSrvOrgan> queryWrapper);
+
+    ChSrvOrgan selectById(String permitId);
+
+}

governance/src/main/java/com/hungraim/ltc/governance/service/DisableEvaluateService.java

+package com.hungraim.ltc.governance.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;
+import org.springframework.stereotype.Service;
+
+/**
+ * 失能申请Service
+ *
+ * @author czz
+ */
+@Service
+public interface DisableEvaluateService {
+
+    /**
+     * 失能评定列表
+     *
+     * @param organId    适用机构代码
+     * @param srvOrganId 护理机构
+     * @param realName   失能人员姓名
+     * @param certiCode  失能人员身份证号码
+     * @param pageNum    当前页
+     * @param pageSize   每页几条数据
+     * @return
+     */
+    IPage<DisableEvaluateVO> disableEvaluateList(String organId, Long srvOrganId, String realName, String certiCode, int pageNum, int pageSize);
+
+    /**
+     * 失能评定详情
+     *
+     * @param evaluateId 评定id
+     * @return 失能评定详情
+     */
+    DisableEvaluateInfoVO disableEvaluateInfo(String evaluateId);
+
+    void addEvaluate(ChDisableEvaluate disableEvaluate);
+
+    void disableEvaluate(String applyId, String checkName, Short applyStatus, String checkRemark);
+}

governance/src/main/java/com/hungraim/ltc/governance/service/IBuildBedService.java

 package com.hungraim.ltc.governance.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
+import com.hungraim.ltc.governance.dao.BuildBedMapper;
+import com.hungraim.ltc.pojo.entity.disable.ChDepositAcct;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.util.Result;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author jiaguokai
  */
 public interface IBuildBedService extends IService<ChSrvBuildBed> {
     Result searchOrgBed(BuildBedSearchReq req);
+
+
+
+
+
+
 }

governance/src/main/java/com/hungraim/ltc/governance/service/impl/ApplyServiceImpl.java

+package com.hungraim.ltc.governance.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hungraim.ltc.governance.dao.ApplyMapper;
+import com.hungraim.ltc.governance.service.ApplyService;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+@Service
+public class ApplyServiceImpl extends ServiceImpl<ApplyMapper, ChDisableApply> implements ApplyService {
+
+    @Resource
+    private ApplyMapper applyMapper;
+
+    @Override
+    public Page<ChDisableApply> seletPage(Page<ChDisableApply> disableApplyPage, QueryWrapper<ChDisableApply> queryWrapper) {
+        return applyMapper.selectPage(disableApplyPage, queryWrapper);
+    }
+
+    @Override
+    public ChDisableApply selectById(Long applyId) {
+        return applyMapper.selectById(applyId);
+    }
+}

governance/src/main/java/com/hungraim/ltc/governance/service/impl/BuildBedServiceImpl.java

@@ -2,8 +2,11 @@ package com.hungraim.ltc.governance.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.governance.dao.BuildBedMapper;
 import com.hungraim.ltc.governance.service.IBuildBedService;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
@@ -15,6 +18,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author jiaguokai
@@ -46,4 +53,6 @@ public class BuildBedServiceImpl extends ServiceImpl<BuildBedMapper, ChSrvBuildB
         Page page = buildBedMapper.searchOrgBed(new Page<>(req.getPageNum(), req.getPageSize()), req);
         return Result.success(page);
     }
+
+
 }

governance/src/main/java/com/hungraim/ltc/governance/service/impl/CrvServiceImpl.java

+package com.hungraim.ltc.governance.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hungraim.ltc.governance.dao.CrvMapper;
+import com.hungraim.ltc.governance.service.CrvService;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+@Service
+public class CrvServiceImpl extends ServiceImpl<CrvMapper, ChSrvOrgan> implements CrvService {
+
+    @Resource
+    private CrvMapper crvMapper;
+
+    @Override
+    public Page<ChSrvOrgan> seletPage(Page<ChSrvOrgan> chSrvOrganPage, QueryWrapper<ChSrvOrgan> queryWrapper) {
+        return crvMapper.selectPage(chSrvOrganPage,queryWrapper);
+    }
+
+    @Override
+    public ChSrvOrgan selectById(String permitId) {
+        return crvMapper.selectById(permitId);
+    }
+}

governance/src/main/java/com/hungraim/ltc/governance/service/impl/DisableEvaluateServiceImpl.java

+package com.hungraim.ltc.governance.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
+import com.hungraim.ltc.governance.dao.DisableEvaluateMapper;
+import com.hungraim.ltc.governance.service.DisableEvaluateService;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DisableEvaluateServiceImpl implements DisableEvaluateService {
+
+    @Autowired
+    private DisableEvaluateMapper disableEvaluateList;
+
+    @Override
+    public IPage<DisableEvaluateVO> disableEvaluateList(String organId, Long srvOrganId, String realName, String certiCode, int pageNum, int pageSize) {
+        return disableEvaluateList.disableEvaluateList(new Page(pageNum, pageSize), organId, srvOrganId,realName, certiCode );
+    }
+
+    @Override
+    public DisableEvaluateInfoVO disableEvaluateInfo(String evaluateId) {
+        return disableEvaluateList.selectDisableEvaluateInfoByEvaluateId(evaluateId);
+    }
+
+    @Override
+    public void addEvaluate(ChDisableEvaluate disableEvaluate) {
+        disableEvaluateList.insert(disableEvaluate);
+    }
+
+    @Override
+    public void disableEvaluate(String applyId, String checkName, Short applyStatus, String checkRemark) {
+        /*ChDisableApply chDisableApply = disableEvaluateList.selectById(applyId);
+        chDisableApply.setCheckName(checkName);
+        chDisableApply.setApplyStatus(applyStatus);
+        chDisableApply.setCheckRemark(checkRemark);*/
+    }
+
+}
\ No newline at end of file

governance/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     nacos:
       discovery:
         server-addr: qw.hungraim.com:31158
-        namespace: 353e9334-5b6c-4d44-9f5c-daf26e414898
+        namespace: 3b93a812-d992-482e-a891-fcb3e455dc36
       config:
         namespace: 87d6f6f1-6583-46ea-ad02-7e8125f03c90
         server-addr: qw.hungraim.com:31158

governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChDisableEvaluateMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hungraim.ltc.governance.dao.DisableEvaluateMapper">
+
+    <select id="disableEvaluateList" resultType="com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO">
+        select e.evaluate_id evaluateId,
+        o.ORGAN_NAME organName,
+        e.organ_id organId,
+        e.PROVINCE_CODE provincial,
+        e.CITY_CODE city,
+        e.AREA_CODE area,
+        e.REAL_NAME realName,
+        e.CERTI_CODE certiCode,
+        e.DISEASE_DESC diseaseDesc,
+        e.TEL tel,
+        e.SRV_ORGEN_ID srvOrgenId,
+        e.MODE_ID modeId,
+        e.EVALUATE_TIME evaluateTime
+        from CH_DISABLE_EVALUATE e,CH_FND_ORGAN o
+        where e.organ_id = o.ORGAN_ID
+        <if test="organId != null">
+            and e.organ_Id = #{organId}
+        </if>
+        <if test="srvOrganId != null">
+            and e.srv_Organ_Id = #{srvOrganId}
+        </if>
+        <if test="realName != null">
+            and e.real_Name like '%'#{realName}'%'
+        </if>
+        <if test="certiCode != null">
+            and e.certi_Code = #{certiCode}
+        </if>
+    </select>
+
+    <select id="selectDisableEvaluateInfoByEvaluateId" resultType="com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO">
+        select a.organ_id                                                                 organId,
+               (select o1.organ_name from CH_FND_ORGAN o1 where a.organ_id = o1.organ_id) organName,
+               a.DISTRICT_PROVINCIAL                                                      provincial,
+               a.DISTRICT_CITY                                                            city,
+               a.DISTRICT_AREA                                                            area,
+               a.REAL_NAME                                                                name,
+               a.CERTI_CODE                                                               certiCode,
+               a.BIRTHDAY                                                                 birthday,
+               a.GENDER                                                                   gender,
+               a.TEL                                                                      tel,
+               a.REGIST                                                                   regist,
+               a.FIXED_TEL                                                                fixedTel,
+               a.TREATMENT_TYPE                                                           treatmentType,
+               a.ACPT_PROVINCIAL                                                          acptProvincial,
+               a.ACPT_CITY                                                                acptCity,
+               a.ACPT_AREA                                                                acptArea,
+               a.ACPT_STREET                                                              acptStreet,
+               a.ACPT_ADDRESS                                                             acptAddress,
+               a.ACPT_SRV_PROVINCIAL                                                      acptSrvProvincial,
+               a.ACPT_SRV_CITY                                                            acptSrvCity,
+               a.ACPT_SRV_AREA                                                            acptSrvArea,
+               a.ACPT_SRV_STREET                                                          acptSrvStreet,
+               a.ACPT_SRV_ROAD_DETAIL                                                       acptSrvRoadDetail,
+               a.ADRESS_DISTRICT_PROVINCIAL                                                 adressDistrictProvincial,
+               a.ADRESS_DISTRICT_CITY                                                       adressDistrictCity,
+               a.ADRESS_DISTRICT_CODE                                                       adressDistrictCode,
+               a.ADDRESS_ROAD_DETAIL                                                        addressRoadDetail,
+               a.ADDRESS_NUMBER_DETAIL                                                      addressNumberDetail,
+
+               a.DISEASE                                                                    disease,
+               a.APPLY_METHOD                                                               applyMethod,
+               a.DISEASE_DESC                                                             diseaseDesc,
+               a.MEDICAL_CARD                                                             medicalCard,
+               a.MEDICAL_TYPE                                                             medicalType,
+               a.SRV_ORGAN_ID                                                             srvOrganId,
+               o.PERMIT_ID                                                                permitId,
+
+               a.OPER_NAME                                                                operName,
+               a.OPER_CERTI_CODE                                                          operCertiCode,
+               a.OPER_TEL                                                                 operTel,
+               a.OPER_RELATION                                                            operRelation,
+               a.OPER_FIXED_TEL                                                           operFixedTel,
+               a.OPER_DISTRICT_PROVINCE                                                   operDistrictProvince,
+               a.OPER_DISTRICT_CITY                                                       operDistrictCity,
+               a.OPER_DISTRICT_CODE                                                       operDistrictCode,
+               a.OPER_STREET                                                              operStreet,
+               a.OPER_ADDRESS                                                             operAddress,
+
+               a.CHECK_NAME                                                               checkName,
+               a.APPLY_STATUS                                                             applyStatus,
+               a.CHECK_REMARK                                                             checkRemark
+        from ch_disable_evaluate a,
+             CH_SRV_ORGAN o
+        where a.EVALUATE_ID = #{evaluateId}
+          and a.SRV_ORGAN_ID = o.organ_code
+    </select>
+
+</mapper>
\ No newline at end of file

system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/UserController.java

@@ -197,7 +197,7 @@ public class UserController {
 
 
     /**
-     * 新增用户
+     * 修改用户
      */ @PostMapping("/updateUser")
     public Result updateUser(ReqUserInfo reqUserInfo) {
         if (reqUserInfo.getId() == null || reqUserInfo.getId() == 0) {
@@ -216,10 +216,6 @@ public class UserController {
             systemUser.setAccount(reqUserInfo.getAccount());
             flag = true;
         }
-//        if (!reqUserInfo.getAvatar().equals(systemUser.getAvatar())) {
-//            systemUser.setAvatar(reqUserInfo.getAvatar());
-//            flag = true;
-//        }
         if (!reqUserInfo.getGender().equals(systemUser.getGender())) {
             systemUser.setGender(reqUserInfo.getGender());
             flag = true;
@@ -228,12 +224,10 @@ public class UserController {
             systemUser.setUserId(reqUserInfo.getId());
             flag = true;
         }
-
         if (flag) {
             systemUser.setUpdatedTime(new Date());
             userInfoService.save(systemUser);
         }
-
         //查询该角色下所有的资源数据
         List<SystemUserRole> roleResources = userRoleService.list(new LambdaQueryWrapper<SystemUserRole>().eq(SystemUserRole::getUserId, reqUserInfo.getId()));
 
@@ -255,7 +249,6 @@ public class UserController {
                 return systemRoleResource;
             }).collect(Collectors.toList());
         userRoleService.saveBatch(newRoleResources);
-
         List<Long> deleteRoleResources = roleResources.stream()
             .map(SystemUserRole::getRoleId).filter(id -> !reqUserInfo.getRoleIds().contains(id))
             .collect(Collectors.toList());

system/system-admin-service/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     nacos:
       discovery:
         server-addr: qw.hungraim.com:31158
-        namespace: 353e9334-5b6c-4d44-9f5c-daf26e414898
+        namespace: 3b93a812-d992-482e-a891-fcb3e455dc36
       config:
         namespace: 87d6f6f1-6583-46ea-ad02-7e8125f03c90
         server-addr: qw.hungraim.com:31158