Merge remote-tracking branch 'origin/uat_ch_master' into dev_nursing_records_20230214

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

@@ -119,6 +119,20 @@ public class DisableController {
     }
 
     /**
+     * 查询意向服务机构
+     *
+     * @param  organId
+     */
+    @RequestMapping("/srvOrganList2")
+    public Result<List<ChSrvOrgan>> srvOrganList2(String organId) {
+        if (StringUtils.isBlank(organId)) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        List<ChSrvOrgan> chFndSrvModes = disableService.srvOrganList2(organId, false);
+        return Result.success(chFndSrvModes);
+    }
+
+    /**
      * 查询机构下或者包含子机构下的所有护理机构
      *
      * @param  机构id

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

@@ -419,7 +419,7 @@ public class DisableServiceImpl implements DisableService {
     }
 
     @Override
-
+    @Transactional(rollbackFor = Exception.class)
     public Result addOrUpdateDisInfoChange(DisableUpdateDetailVO disableUpdateDetailVO) {
         // 添加或修改记录
         Integer changeId = disableUpdateDetailVO.getChangeId();

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

 package com.hungraim.ltc.pojo.entity.disable;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -10,10 +13,12 @@ import java.util.Date;
  */
 @Data
 @TableName("CH_DISABLE_RISK_LEVEL")
+@KeySequence("SEQ_CH_DISABLE_RISK_LEVEL")
 public class ChDisableRiskLevel {
     /**
      * 主键ID
      */
+    @TableId(value = "DISA_RISK_LEVEL_ID", type = IdType.INPUT)
     private Integer disaRiskLevelId;
 
     /**

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/riskLevel/ChSrvempRiskLevel.java

 package com.hungraim.ltc.pojo.entity.riskLevel;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -21,6 +18,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("CH_SRVEMP_RISK_LEVEL")
+@KeySequence("SEQ_CH_SRVEMP_RISK_LEVEL")
 public class ChSrvempRiskLevel implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -28,7 +26,7 @@ public class ChSrvempRiskLevel implements Serializable {
     /**
      * 主键ID
      */
-    @TableId(value = "SRVEMP_RISK_LEVEL_ID", type = IdType.AUTO)
+    @TableId(value = "SRVEMP_RISK_LEVEL_ID", type = IdType.INPUT)
     private Long srvempRiskLevelId;
 
     /**

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/riskLevel/ChSrvorganRiskLevel.java

 package com.hungraim.ltc.pojo.entity.riskLevel;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -21,6 +18,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("CH_SRVORGAN_RISK_LEVEL")
+@KeySequence("SEQ_CH_SRVORGAN_RISK_LEVEL")
 public class ChSrvorganRiskLevel implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -28,7 +26,7 @@ public class ChSrvorganRiskLevel implements Serializable {
     /**
      * 主键ID
      */
-    @TableId(value = "SRVORGAN_RISK_LEVEL_ID", type = IdType.AUTO)
+    @TableId(value = "SRVORGAN_RISK_LEVEL_ID", type = IdType.INPUT)
     private Long srvorganRiskLevelId;
 
     /**

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/system/SystemResource.java

 package com.hungraim.ltc.pojo.entity.system;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -15,9 +13,10 @@ import java.util.List;
  */
 @Data
 @TableName("LTC_RESOURCE")
+@KeySequence("SEQUENCE_RESOURCE_ID")
 public class SystemResource {
 
-    @TableId
+    @TableId(value = "RESOURCE_ID", type = IdType.INPUT)
     private Long resourceId;
     private String resourceName;
     private String resourceUrl;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/system/SystemRole.java

 package com.hungraim.ltc.pojo.entity.system;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -15,9 +12,11 @@ import java.util.Date;
  */
 @Data
 @TableName("LTC_ROLE")
+@KeySequence("SEQUENCE_ROLE_ID")
 public class SystemRole {
 
-    @TableId( type = IdType.AUTO)
+   // @TableId( type = IdType.AUTO)
+   @TableId(value = "ROLE_ID", type = IdType.INPUT)
     private Long roleId;
     private String roleName;
     private String status;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/system/SystemUser.java

 package com.hungraim.ltc.pojo.entity.system;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -15,9 +12,11 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @TableName("LTC_USER")
+@KeySequence("SEQUENCE_USER_ID")
 public class SystemUser {
 
-    @TableId( type = IdType.AUTO)
+   // @TableId( type = IdType.AUTO)
+   @TableId(value = "USER_ID", type = IdType.INPUT)
     private Long userId;
     private String account;
     private String password;