优化代码3

src/main/java/com/diagbot/entity/SysPlan.java

@@ -15,8 +15,8 @@ import java.util.Date;
  * @author wangfeng
  * @since 2020-07-27
  */
-@TableName("tran_sys_plan")
-public class SysPlan implements Serializable {
+@TableName("tran_plan")
+public class Plan implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/diagbot/entity/SysSet.java

@@ -16,8 +16,8 @@ import java.util.Date;
  * @author wangfeng
  * @since 2020-07-27
  */
-@TableName("tran_sys_set")
-public class SysSet implements Serializable {
+@TableName("tran_plan_detail")
+public class PlanDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -67,10 +67,7 @@ public class SysSet implements Serializable {
      */
     private String name;
 
-    /**
-     * 配置编码
-     */
-    private String code;
+
 
     private String value;
 
@@ -88,7 +85,10 @@ public class SysSet implements Serializable {
      * 显示顺序
      */
     private Integer orderNo;
-
+    /**
+     * 配置编码
+     */
+    private String code;
     /**
      * 备注
      */

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

@@ -3,11 +3,9 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.SysPlanInfoDTO;
 import com.diagbot.dto.SysSetInfoDTO;
-import com.diagbot.entity.SysPlan;
-import com.diagbot.entity.SysSet;
+import com.diagbot.entity.Plan;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
-import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.service.impl.SysPlanServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.StringUtil;
@@ -32,24 +30,24 @@ public class SysPlanFacade extends SysPlanServiceImpl {
     public SysPlanInfoDTO getSysPlanInfoData(HospitalPlanVO hospitalPlanVO) {
         //查询该医院有没有相关方案配置， 要是没有取默认的
         SysPlanInfoDTO sysPlanInfoDTO = new SysPlanInfoDTO();
-        QueryWrapper<SysPlan> sysPlanInfo = new QueryWrapper<>();
+        QueryWrapper<Plan> sysPlanInfo = new QueryWrapper<>();
         sysPlanInfo.eq("is_deleted", IsDeleteEnum.N.getKey());
         sysPlanInfo.eq("hospital_id", hospitalPlanVO.getHospitalId());
         sysPlanInfo.eq(StringUtil.isNotBlank(hospitalPlanVO.getPlanCode()), "plan_code", hospitalPlanVO.getPlanCode());
         sysPlanInfo.eq("plan_status", StatusEnum.Enable.getKey());
-        SysPlan sysPlanInfoData = getOne(sysPlanInfo, false);
+        Plan sysPlanInfoData = getOne(sysPlanInfo, false);
         Long planId = -1L;
         Long hospitalId = hospitalPlanVO.getHospitalId();
         if (sysPlanInfoData != null) {
             BeanUtil.copyProperties(sysPlanInfoData, sysPlanInfoDTO);
             planId = sysPlanInfoDTO.getId();
         } else {
-            QueryWrapper<SysPlan> sysPlandefault = new QueryWrapper<>();
+            QueryWrapper<Plan> sysPlandefault = new QueryWrapper<>();
             sysPlandefault.eq("is_deleted", IsDeleteEnum.N.getKey());
             sysPlandefault.eq("hospital_id", -1);
             sysPlandefault.eq(StringUtil.isNotBlank(hospitalPlanVO.getPlanCode()), "plan_code", hospitalPlanVO.getPlanCode());
             sysPlandefault.eq("plan_status", StatusEnum.Enable.getKey());
-            SysPlan sysPlandefaultData = getOne(sysPlandefault, false);
+            Plan sysPlandefaultData = getOne(sysPlandefault, false);
             if (sysPlandefaultData != null) {
                 planId = sysPlandefaultData.getId();
                 hospitalId = sysPlandefaultData.getHospitalId();

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

@@ -2,11 +2,8 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.SysSetInfoDTO;
-import com.diagbot.entity.SysPlan;
-import com.diagbot.entity.SysSet;
+import com.diagbot.entity.PlanDetail;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.StatusEnum;
-import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.service.impl.SysSetServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.StringUtil;
@@ -25,12 +22,12 @@ public class SysSetFacade extends SysSetServiceImpl {
 
 
     public List<SysSetInfoDTO> getSysSetInfoData(HospitalSetVO hospitalSetVO) {
-        QueryWrapper<SysSet> sysSetInfo = new QueryWrapper<>();
+        QueryWrapper<PlanDetail> sysSetInfo = new QueryWrapper<>();
         sysSetInfo.eq("is_deleted", IsDeleteEnum.N.getKey());
         sysSetInfo.eq("hospital_id", hospitalSetVO.getHospitalId());
         sysSetInfo.eq("plan_id", hospitalSetVO.getPlanId());
         sysSetInfo.eq(StringUtil.isNotBlank(hospitalSetVO.getCode()),"code",hospitalSetVO.getCode());
-        List<SysSet> sysSetData = list(sysSetInfo);
+        List<PlanDetail> sysSetData = list(sysSetInfo);
         List<SysSetInfoDTO> data = BeanUtil.listCopyTo(sysSetData, SysSetInfoDTO.class);
         return data;
     }

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

@@ -1,6 +1,6 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.SysPlan;
+import com.diagbot.entity.Plan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author wangfeng
  * @since 2020-07-27
  */
-public interface SysPlanMapper extends BaseMapper<SysPlan> {
+public interface SysPlanMapper extends BaseMapper<Plan> {
 
 }

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

@@ -1,6 +1,6 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.SysSet;
+import com.diagbot.entity.PlanDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author wangfeng
  * @since 2020-07-27
  */
-public interface SysSetMapper extends BaseMapper<SysSet> {
+public interface SysSetMapper extends BaseMapper<PlanDetail> {
 
 }

src/main/java/com/diagbot/service/SysPlanService.java

@@ -1,6 +1,6 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.SysPlan;
+import com.diagbot.entity.Plan;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author wangfeng
  * @since 2020-07-27
  */
-public interface SysPlanService extends IService<SysPlan> {
+public interface SysPlanService extends IService<Plan> {
 
 }

src/main/java/com/diagbot/service/SysSetService.java

@@ -1,6 +1,6 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.SysSet;
+import com.diagbot.entity.PlanDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author wangfeng
  * @since 2020-07-27
  */
-public interface SysSetService extends IService<SysSet> {
+public interface SysSetService extends IService<PlanDetail> {
 
 }

src/main/java/com/diagbot/service/impl/SysPlanServiceImpl.java

@@ -1,6 +1,6 @@
 package com.diagbot.service.impl;
 
-import com.diagbot.entity.SysPlan;
+import com.diagbot.entity.Plan;
 import com.diagbot.mapper.SysPlanMapper;
 import com.diagbot.service.SysPlanService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2020-07-27
  */
 @Service
-public class SysPlanServiceImpl extends ServiceImpl<SysPlanMapper, SysPlan> implements SysPlanService {
+public class SysPlanServiceImpl extends ServiceImpl<SysPlanMapper, Plan> implements SysPlanService {
 
 }

src/main/java/com/diagbot/service/impl/SysSetServiceImpl.java

@@ -1,6 +1,6 @@
 package com.diagbot.service.impl;
 
-import com.diagbot.entity.SysSet;
+import com.diagbot.entity.PlanDetail;
 import com.diagbot.mapper.SysSetMapper;
 import com.diagbot.service.SysSetService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2020-07-27
  */
 @Service
-public class SysSetServiceImpl extends ServiceImpl<SysSetMapper, SysSet> implements SysSetService {
+public class SysSetServiceImpl extends ServiceImpl<SysSetMapper, PlanDetail> implements SysSetService {
 
 }

src/main/resources/mapper/SysPlanMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.diagbot.mapper.SysPlanMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.SysPlan">
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.Plan">
         <id column="id" property="id" />
         <result column="is_deleted" property="isDeleted" />
         <result column="gmt_create" property="gmtCreate" />

src/main/resources/mapper/SysSetMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.diagbot.mapper.SysSetMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.SysSet">
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.PlanDetail">
         <id column="id" property="id" />
         <result column="is_deleted" property="isDeleted" />
         <result column="gmt_create" property="gmtCreate" />