优化

platform-dao/src/main/java/com/platform/dao/dto/check/CheckStandardDTO.java

@@ -139,7 +139,7 @@ public class CheckStandardDTO extends BaseDTO implements Serializable {
     /**
      * 标准参数
      */
-    private List<CheckStandardParamDTO> paramList;
+    /*private List<CheckStandardParamDTO> paramList;*/
 
 
 }

platform-dao/src/main/java/com/platform/dao/dto/part/PartInfoDTO.java

@@ -48,71 +48,11 @@ public class PartInfoDTO extends BaseDTO implements Serializable {
      */
     private Integer level;
 
-    /**
-     * 生产商
-     */
-    private String producerId;
-
-    /**
-     * 设备来源方式
-     */
-    private Integer sourceType;
-
-    /**
-     * 来源设备id
-     */
-    private String sourceSbId;
-
     /**
      * 所属设备id
      */
     private String sbId;
 
-    /**
-     * 计量单位
-     */
-    private Integer unit;
-
-    /**
-     * 规格型号
-     */
-    private String guigeId;
-
-    /**
-     * 购置日期
-     */
-    private LocalDate buyDate;
-
-    /**
-     * 投用日期
-     */
-    private LocalDate startDate;
-
-    /**
-     * 下次检定日期
-     */
-    private LocalDate nextCheckDate;
-
-    /**
-     * 保修截至日期
-     */
-    private LocalDate guaranteeDate;
-
-    /**
-     * 预计工作年限
-     */
-    private Double workYear;
-
-    /**
-     * 预计报废日期
-     */
-    private LocalDate retirementDate;
-
-    /**
-     * 设备图片
-     */
-    private String sbImage;
-
     /**
      * 状态
      */

platform-dao/src/main/java/com/platform/dao/entity/part/PartInfo.java

@@ -41,62 +41,10 @@ public class PartInfo implements Serializable {
      * 设备等级
      */
     private Integer level;
-    /**
-     * 生产商
-     */
-    private String producerId;
-    /**
-     * 设备来源方式
-     */
-    private Integer sourceType;
-    /**
-     * 来源设备id
-     */
-    private String sourceSbId;
     /**
      * 所属设备id
      */
     private String sbId;
-    /**
-     * 计量单位
-     */
-    private Integer unit;
-    /**
-     * 规格型号
-     */
-    private String guigeId;
-    /**
-     * 购置日期
-     */
-    private LocalDate buyDate;
-    /**
-     * 投用日期
-     */
-    private LocalDate startDate;
-    /**
-     * 下次检定日期
-     */
-    private LocalDate nextCheckDate;
-    /**
-     * 保修截至日期
-     */
-    private LocalDate guaranteeDate;
-    /**
-     * 预计工作年限
-     */
-    private Double workYear;
-    /**
-     * 预计报废日期
-     */
-    private LocalDate retirementDate;
-    /**
-     * 设备图片
-     */
-    private String sbImage;
-    /**
-     * 状态
-     */
-    private Integer status;
     /**
      * 备注
      */
@@ -133,26 +81,11 @@ public class PartInfo implements Serializable {
      */
     @Transient
     private String sbName;
-    /**
-     * 来源设备
-     */
-    @Transient
-    private String sourceSbName;
     /**
      * 部件类型
      */
     @Transient
     private String typeName;
-    /**
-     * 规格
-     */
-    @Transient
-    private String guigeName;
-    /**
-     * 生产商名称
-     */
-    @Transient
-    private String producerName;
     /**
      * 数据权限
      */

platform-dao/src/main/java/com/platform/dao/mapper/check/CheckStandardMapper.java

@@ -22,7 +22,7 @@ public interface CheckStandardMapper extends MyMapper<CheckStandard> {
      * @param dto
      * @return
      */
-    List<CheckStandard> selectList(CheckStandardDTO dto);
+    List<CheckStandardVO> selectList(CheckStandardDTO dto);
 
     /**
      * 查询型号对应的点检标准
@@ -37,4 +37,5 @@ public interface CheckStandardMapper extends MyMapper<CheckStandard> {
      * @return
      */
     List<CheckStandardVO> selectProjectStandardList(String projectId);
+
 }

platform-dao/src/main/java/com/platform/dao/vo/query/check/CheckStandardVO.java

@@ -68,9 +68,14 @@ public class CheckStandardVO extends BaseVO implements Serializable{
      */
     private Integer enable;
     /**
-     * 设备部位
+     * 设备部位Id
      */
     private String part;
+
+    /**
+     * 设备部位名称
+     */
+    private String partName;
     /**
      * 要求
      */

platform-dao/src/main/resources/mapper/check/CheckStandardMapper.xml

@@ -110,10 +110,12 @@
             and checkstandard.name like concat('%',#{keyword},'%')
         </if>
     </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.check.CheckStandardDTO" resultType="com.platform.dao.vo.query.check.CheckStandardVO">
-        select checkstandard.*
-        from t_check_standard as checkstandard
+    <select id="selectList" parameterType="com.platform.dao.dto.check.CheckStandardDTO"
+            resultType="com.platform.dao.vo.query.check.CheckStandardVO">
+        select checkstandard.*, partInfo.name as partName
+        from t_check_standard as checkstandard, t_part_info partInfo
         <where>
+            checkstandard.part = partInfo.id
             <include refid="List_Condition"/>
         </where>
     </select>

platform-dao/src/main/resources/mapper/part/PartInfoMapper.xml

@@ -7,45 +7,21 @@
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="type_id" jdbcType="VARCHAR" property="typeId"/>
         <result column="level" jdbcType="SMALLINT" property="level"/>
-        <result column="producer_id" jdbcType="VARCHAR" property="producerId"/>
-        <result column="source_type" jdbcType="SMALLINT" property="sourceType"/>
-        <result column="source_sb_id" jdbcType="VARCHAR" property="sourceSbId"/>
         <result column="sb_id" jdbcType="VARCHAR" property="sbId"/>
-        <result column="unit" jdbcType="SMALLINT" property="unit"/>
-        <result column="guige_id" jdbcType="VARCHAR" property="guigeId"/>
-        <result column="buy_date" jdbcType="DATE" property="buyDate"/>
-        <result column="start_date" jdbcType="DATE" property="startDate"/>
-        <result column="next_check_date" jdbcType="DATE" property="nextCheckDate"/>
-        <result column="guarantee_date" jdbcType="DATE" property="guaranteeDate"/>
-        <result column="work_year" jdbcType="DOUBLE" property="workYear"/>
-        <result column="retirement_date" jdbcType="DATE" property="retirementDate"/>
-        <result column="sb_image" jdbcType="VARCHAR" property="sbImage"/>
         <result column="status" jdbcType="SMALLINT" property="status"/>
         <result column="remark" jdbcType="VARCHAR" property="remark"/>
         <result column="created_user_id" jdbcType="VARCHAR" property="createdUserId"/>
         <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId"/>
         <result column="created_time" jdbcType="TIMESTAMP" property="createdTime"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
-        <association column="created_user_id" javaType="string" property="createdUserName"
-                     select="com.platform.dao.mapper.upms.SysUserMapper.selectUserNameById"/>
-        <association column="update_user_id" javaType="string" property="updateUserName"
-                     select="com.platform.dao.mapper.upms.SysUserMapper.selectUserNameById"/>
         <association column="type_id" javaType="string" property="typeName"
                      select="com.platform.dao.mapper.part.PartTypeMapper.selectNameById"/>
-        <association column="producer_id" javaType="string" property="producerName"
-                     select="com.platform.dao.mapper.firm.FirmProducerMapper.selectNameById"/>
         <association column="sb_id" javaType="string" property="sbName"
                      select="com.platform.dao.mapper.sb.SbInfoMapper.selectNameById"/>
-        <association column="guige_id" javaType="string" property="guigeName"
-                     select="com.platform.dao.mapper.sb.SbGuigeMapper.selectNameById"/>
-        <association column="source_sb_id" javaType="string" property="sourceSbName"
-                     select="com.platform.dao.mapper.sb.SbInfoMapper.selectNameById"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, no, name, type_id, level, producer_id, source_type, source_sb_id, sb_id, unit,
-    guige_id, buy_date, start_date, next_check_date, guarantee_date, work_year, retirement_date,
-    sb_image, status, remark, created_user_id, update_user_id, created_time, update_time
+        id, no, name, type_id, level, sb_id, remark, created_time, update_time
     </sql>
 
     <select id="selectPageList" parameterType="com.platform.dao.dto.part.PartInfoDTO" resultMap="BaseResultMap">
@@ -54,8 +30,10 @@
         from t_part_info
         <where>
             <if test="keyword != null and keyword != ''">
-                ( name like concat('%',#{keyword},'%') or
+                (
+                name like concat('%',#{keyword},'%') or
                 no like concat('%',#{keyword},'%')
+            )
             </if>
             <if test="sbId != null and sbId != ''">
                 and sb_id = #{sbId}

platform-rest/src/main/java/com/platform/rest/controller/check/CheckStandardController.java

@@ -129,7 +129,7 @@ public class CheckStandardController {
    */
   @GetMapping("")
   public R query(CheckStandardDTO checkStandardDTO) {
-      return new R<>(checkStandardService.getModelListByDTO(checkStandardDTO));
+      return new R<>(checkStandardService.selectList(checkStandardDTO));
   }
 
   /**

platform-service/src/main/java/com/platform/service/check/CheckStandardService.java

@@ -30,6 +30,8 @@ public interface CheckStandardService extends IBaseService<CheckStandard, CheckS
     */
     int batchDelete(List<String> ids);
 
+    List<CheckStandardVO> selectList( CheckStandardDTO record);
+
     List<CheckStandardVO> selectCheckstandardListByModelId(String modelId);
 
     List<CheckStandardVO> selectProjectStandardList(String projectId);

platform-service/src/main/java/com/platform/service/check/impl/CheckStandardServiceImpl.java

@@ -74,6 +74,11 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         return mapper.selectProjectStandardList(projectId);
     }
 
+    @Override
+    public List<CheckStandardVO> selectList( CheckStandardDTO record) {
+        return mapper.selectList(record);
+    }
+
     @Override
     public AbstractPageResultBean<CheckStandard> selectPageInfo(CheckStandardDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
@@ -91,11 +96,11 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         model.setNo(IdGeneratorUtils.getCheckStandardNo(++count));
         CheckStandard checkStandard = super.saveModelByDTO(model);
         // 保存参数
-        List<CheckStandardParamDTO> paramList = model.getParamList();
+       /* List<CheckStandardParamDTO> paramList = model.getParamList();
         paramList.forEach(item -> {
             item.setStandardId(checkStandard.getId());
         });
-        paramService.saveModelListByDTO(paramList);
+        paramService.saveModelListByDTO(paramList);*/
         return checkStandard;
     }
 
@@ -108,11 +113,11 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         weekend.weekendCriteria().andEqualTo(CheckStandardParam::getStandardId, model.getId());
         paramMapper.deleteByExample(weekend);
         // 保存参数
-        List<CheckStandardParamDTO> paramList = model.getParamList();
+  /*      List<CheckStandardParamDTO> paramList = model.getParamList();
         paramList.forEach(item -> {
             item.setStandardId(model.getId());
         });
-        paramService.saveModelListByDTO(paramList);
+        paramService.saveModelListByDTO(paramList);*/
     }
 
     @Override

platform-service/src/main/java/com/platform/service/work/impl/WorkStandardServiceImpl.java

@@ -82,11 +82,11 @@ public class WorkStandardServiceImpl extends BaseServiceImpl<WorkStandardMapper,
         model.setNo(IdGeneratorUtils.getCheckStandardNo(++count));
         WorkStandard checkStandard = super.saveModelByDTO(model);
         // 保存参数
-        List<CheckStandardParamDTO> paramList = model.getParamList();
+        /*List<CheckStandardParamDTO> paramList = model.getParamList();
         paramList.forEach(item -> {
             item.setStandardId(checkStandard.getId());
         });
-        paramService.saveModelListByDTO(paramList);
+        paramService.saveModelListByDTO(paramList);*/
         return checkStandard;
     }
 
@@ -99,11 +99,11 @@ public class WorkStandardServiceImpl extends BaseServiceImpl<WorkStandardMapper,
         weekend.weekendCriteria().andEqualTo(WorkStandardParam::getStandardId, model.getId());
         paramMapper.deleteByExample(weekend);
         // 保存参数
-        List<CheckStandardParamDTO> paramList = model.getParamList();
+/*        List<CheckStandardParamDTO> paramList = model.getParamList();
         paramList.forEach(item -> {
             item.setStandardId(model.getId());
         });
-        paramService.saveModelListByDTO(paramList);
+        paramService.saveModelListByDTO(paramList);*/
     }
 
     @Override