完善

platform-activiti/platform-activiti.iml

@@ -4,7 +4,9 @@
     <facet type="jpa" name="JPA">
       <configuration>
         <setting name="validation-enabled" value="true" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="platform-activiti" />
+        </datasource-mapping>
         <naming-strategy-map />
       </configuration>
     </facet>

platform-dao/src/main/java/com/platform/dao/dto/sb/SbInfoDTO.java

@@ -51,9 +51,13 @@ public class SbInfoDTO extends BaseDTO implements Serializable {
     private String id;
 
     /**
-     * 设备编号
+     * 设备编号/设备（新号）
      */
     private String no;
+    /**
+     * 自编号/设备（旧号）
+     */
+    private String zbh;
 
     /**
      * 财务编码

platform-dao/src/main/java/com/platform/dao/entity/check/CheckStandard.java

@@ -53,11 +53,11 @@ public class CheckStandard implements Serializable{
     /**
      * 上次实际执行日期
      */
-    private LocalDate lastDate;
+    //private LocalDate lastDate;
     /**
      * 下次预计执行日期
      */
-    private LocalDate nextDate;
+    //private LocalDate nextDate;
     /**
      * 周期类型: 参考数据字典
      */

platform-dao/src/main/resources/application-daoDev.yml

@@ -3,10 +3,11 @@ spring:
     druid:
       master:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://59.110.28.5:3306/qykh_sb_cqdw?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true
-        username: sbgl_dev
-        #password: mysql?123!@MYSQL
-        password: sbgld@QYKH@$_e^mysqlv
+        url: jdbc:mysql://59.110.28.5:3306/hitch-sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true
+        username: sbgl
+        # password: mysql?123!@MYSQL
+        password: sbgl@QYKH@$_^mysql
+        # password: sbgld@QYKH@$_e^mysqlv
         filters: wall,stat
         filter:
           stat:

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

@@ -110,7 +110,7 @@
             and checkstandard.name like concat('%',#{keyword},'%')
         </if>
     </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.check.CheckStandardDTO" resultType="com.platform.dao.entity.check.CheckStandard">
+    <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
         <where>

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -104,13 +104,13 @@
         sb.sbd_date,
         sb.bxgs,
         sb.sb_date,
-        sbModel.type_id as typeId,
-        sbModel.name_model as nameModel,
-        sbModel.model,
-        sbModel.producer_id as producerId,
-        sbModel.level,
-        sbModel.unit,
-        sbModel.use_type as useType,
+        sb.type_id as typeId,
+        sb.name_model as nameModel,
+        sb.model,
+        sb.producer_id as producerId,
+        sb.level,
+        sb.unit,
+        sb.use_type as useType,
         sbType.name as typeName,producer.name as producerName,
         position.name as positionName
     </sql>
@@ -126,9 +126,8 @@
         select
         <include refid="Left_Column"/>
         from t_sb_info sb
-        left join t_sb_model sbModel on sb.model_id = sbModel.id
-        left join t_sb_type sbType on sbModel.type_id = sbType.id
-        left join t_firm_producer producer on sbModel.producer_id = producer.id
+        left join t_sb_type sbType on sb.type_id = sbType.id
+        left join t_firm_producer producer on sb.producer_id = producer.id
         left join t_sb_position position on sb.position_id = position.id
         left join t_sys_dept sdDept on sb.save_dept = sdDept.dept_id
         where
@@ -175,10 +174,10 @@
             and sb.use_project = #{useProject}
         </if>
         <if test="typeId != null">
-            and sbModel.type_id = #{typeId}
+            and sb.type_id = #{typeId}
         </if>
         <if test="model != null">
-            and sbModel.model like concat('%',#{model},'%')
+            and sb.model like concat('%',#{model},'%')
         </if>
         <if test="useDept != null">
             and sb.use_dept = #{useDept}
@@ -225,7 +224,6 @@
         select
         <include refid="Left_Column"/>
         from t_sb_info sb
-        left join t_sb_model sbModel on sb.model_id = sbModel.id
         left join t_sb_type sbType on sb.type_id = sbType.id
         left join t_firm_producer producer on sb.producer_id = producer.id
         left join t_sb_position position on sb.position_id = position.id

platform-rest/platform-rest.iml

@@ -13,7 +13,9 @@
     <facet type="jpa" name="JPA">
       <configuration>
         <setting name="validation-enabled" value="true" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="platform-rest" />
+        </datasource-mapping>
         <naming-strategy-map />
       </configuration>
     </facet>

platform-service/platform-service.iml

@@ -4,7 +4,9 @@
     <facet type="jpa" name="JPA">
       <configuration>
         <setting name="validation-enabled" value="true" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="platform-service" />
+        </datasource-mapping>
         <naming-strategy-map />
       </configuration>
     </facet>

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -155,17 +155,17 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
             model.setNo(IdGeneratorUtils.getSbNo(++count));
         }
 
-        SbModelVO sbModelVO = sbModelMapper.getById(model.getModelId());
+       /* SbModelVO sbModelVO = sbModelMapper.getById(model.getModelId());
         if (sbModelVO == null) {
             throw new BusinessException("找不到型号，modelID: " + model.getModelId());
-        }
-        model.setUnit(sbModelVO.getUnit());
+        }*/
+        /*model.setUnit(sbModelVO.getUnit());
         model.setTypeId(sbModelVO.getTypeId());
         model.setLevel(sbModelVO.getLevel());
         model.setProducerId(sbModelVO.getProducerId());
         model.setName(sbModelVO.getName());
         model.setModel(sbModelVO.getModel());
-        model.setNameModel(sbModelVO.getNameModel());
+        model.setNameModel(sbModelVO.getNameModel());*/
         model.setId(IdGeneratorUtils.getObjectId());
         if (model.getIsChild()==null) {
             model.setIsChild(SbInfoChildEnum.IS_NORMAL.getValue());
@@ -189,7 +189,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
     @Override
     public void modModelByDTO(SbInfoDTO model) {
 
-        SbModelVO sbModelVO = sbModelMapper.getById(model.getModelId());
+       /* SbModelVO sbModelVO = sbModelMapper.getById(model.getModelId());
         if (sbModelVO == null) {
             throw new BusinessException("找不到型号，modelID: " + model.getModelId());
         }
@@ -199,7 +199,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         model.setProducerId(sbModelVO.getProducerId());
         model.setName(sbModelVO.getName());
         model.setModel(sbModelVO.getModel());
-        model.setNameModel(sbModelVO.getNameModel());
+        model.setNameModel(sbModelVO.getNameModel());*/
         if (model.getIsChild()==null) {
             model.setIsChild(SbInfoChildEnum.IS_NORMAL.getValue());
         }
@@ -420,7 +420,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         if (producer != null) {
             vo.setProducerName(producer.getName());
         }
-        vo.setUnit(modelVO.getUnit());
+        /*vo.setUnit(modelVO.getUnit());
         vo.setLevel(modelVO.getLevel());
         vo.setUseType(modelVO.getUseType());
         vo.setModel(modelVO.getModel());
@@ -428,7 +428,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         vo.setNameModel(modelVO.getNameModel());
         vo.setTypeId(modelVO.getTypeId());
         vo.setTypeName(modelVO.getTypeName());
-        vo.setProducerName(modelVO.getProducerName());
+        vo.setProducerName(modelVO.getProducerName());*/
         //vo.setInitialValue(modelVO.getValue());
         //vo.setModelVO(modelVO);
         Weekend<SysFile> weekend = new Weekend<>(SysFile.class);