优化

platform-dao/src/main/java/com/platform/dao/util/CustomExcelImportUtil.java

@@ -968,7 +968,7 @@ public class CustomExcelImportUtil {
                 record.setId(IdGeneratorUtils.getObjectId());
                 record.setType(CheckStandardTypeEnum.POLLING.getValue());
                 record.setSbId(sbNo);// 需要根据no来判断设备的id
-                record.setStandardHours("20");
+                record.setStandardHours("0");
                 record.setEnable(1);
                 setRemark(row, record);
             } catch (Exception e) {

platform-dao/src/main/java/com/platform/dao/util/TreeUtil.java

@@ -63,7 +63,6 @@ public class TreeUtil {
 
         List<T> trees = new ArrayList<>();
         Map<String, T> treeNodeMap = MapUtils.newHashMap(treeNodes.size());
-
         treeNodes.forEach(treeNode -> {
             treeNodeMap.put(treeNode.getId(), treeNode);
         });

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

@@ -66,6 +66,14 @@ public class CheckJobVO implements Serializable{
      * 标准id
      */
     private String standardId;
+    /**
+     * 计划周期
+     */
+    private Integer period;
+    /**
+     * 周期类型: 参考数据字典
+     */
+    private Integer periodType;
     /**
      * 要求
      */
@@ -146,6 +154,10 @@ public class CheckJobVO implements Serializable{
      * 设备名称
      */
     private String sbName;
+    /**
+     * 设备新号
+     */
+    private String sbNo;
     /**
      * 部件名称
      */

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

@@ -135,7 +135,9 @@
             and checkjob.update_time = #{updateTime}
         </if>
         <if test="keyword != null and keyword != ''">
-            and checkjob.id like concat('%',#{keyword},'%')
+            and (
+            sbinfo.name like concat('%',#{keyword},'%') or
+            sbinfo.no like concat('%',#{keyword},'%') )
         </if>
         <if test="checkUserId != null and checkUserId != ''">
             and checkjob.check_user_id = #{checkUserId}
@@ -150,8 +152,12 @@
             and checkjob.start_time <![CDATA[ <= ]]> #{searchEndTime}
         </if>
     </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.check.CheckJobDTO" resultType="com.platform.dao.vo.query.check.CheckJobVO">
-        select checkjob.*, u.real_name as checkUserName, plan.name planName, plan.no planNo,sbinfo.name sbName, partinfo.name partName,standard.name standardName
+    <select id="selectList" parameterType="com.platform.dao.dto.check.CheckJobDTO"
+            resultType="com.platform.dao.vo.query.check.CheckJobVO">
+        select checkjob.*, u.real_name as checkUserName, plan.name planName, plan.no planNo,
+               sbinfo.name sbName, sbinfo.no sbNo,
+               partinfo.name partName,standard.name standardName,
+               standard.period period, standard.period_type periodType
         from t_check_job as checkjob
         left join t_check_plan plan on checkjob.plan_id = plan.id
         left join t_sb_info sbinfo on sbinfo.id = checkjob.sb_id
@@ -167,7 +173,10 @@
     </select>
 
     <select id="selectDetail" resultType="com.platform.dao.vo.query.check.CheckJobVO">
-        select checkjob.*, u.real_name as checkUserName, plan.name planName, plan.no planNo,sbinfo.name sbName, partinfo.name partName,standard.name standardName
+        select checkjob.*, u.real_name as checkUserName, plan.name planName, plan.no planNo,
+               sbinfo.name sbName, sbinfo.no sbNo,
+               partinfo.name partName,standard.name standardName,
+               standard.period period, standard.period_type periodType
         from t_check_job as checkjob
         left join t_check_plan plan on checkjob.plan_id = plan.id
         left join t_sb_info sbinfo on sbinfo.id = checkjob.sb_id
@@ -178,7 +187,11 @@
     </select>
 
     <select id="selectJobList" resultType="com.platform.dao.vo.query.check.CheckJobVO">
-        select plan.id planId,plan.check_user_id,plan.check_user_name, standard.id standardId, standard.name standardName,standard.remark,standard.requirement,project.sb_id, project.part_id
+        select plan.id planId,plan.check_user_id,plan.check_user_name,
+               standard.id standardId, standard.name standardName,
+               standard.remark,standard.requirement,,
+               standard.period period, standard.period_type periodType
+               project.sb_id, project.part_id
         from t_check_plan plan
         left join t_check_project_plan_relation pprelation on pprelation.plan_id = plan.id
         left join t_check_project project on project.id = pprelation.project_id
@@ -207,6 +220,6 @@
           checkjob.sb_id = #{sbId}
           and checkjob.standard_id = #{standardId}
         order by checkjob.created_time desc
-            limit 1
+        limit 1
     </select>
 </mapper>

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

@@ -372,7 +372,7 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
                                 break;
                             }
                         }
-                    } else if(item.getCheckUserType() == 2){// 设备的维修员
+                    } else if(item.getCheckUserType() == 2 || item.getCheckUserType() == 3){// 设备的维修员
                         for (SbInfo info : sbInfoList) {
                             if(info.getNo().equals(item.getSbId())){
                                 item.setSbId(info.getId());
@@ -381,8 +381,6 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
                                 break;
                             }
                         }
-                    }else if(item.getCheckUserType() == 3){// 厂家：这个分配给谁？
-
                     }
                     if(!findSaveUser){
                         throw new BusinessException("找不到设备，请先添加,设备新号：" + item.getSbId());

platform-service/src/main/java/com/platform/service/sqarepartmanage/impl/SparePartInfoServiceImpl.java

@@ -334,7 +334,10 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
             SpareStore spareStore = new SpareStore();
             spareStore.setSpareId(model.getId());
             spareStore.setId(IdGeneratorUtils.getObjectId());
-            spareStore.setStoreId("9");
+            if(StringUtils.isBlank(model.getStoreId())){
+                throw new BusinessException("请设置库位信息");
+            }
+            spareStore.setStoreId(model.getStoreId());
             BigDecimal price = model.getInitialValue();
             spareStore.setPrice(model.getInitialValue());
             spareStore.setNum(model.getInitStock() );
@@ -396,20 +399,21 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
         }
         this.saveFile(model);
 
-        if(model.getInitStock() == null){
+       /* if(model.getInitStock() == null){
             model.setInitStock(new BigDecimal(0));
-        }
+        }*/
+        /**
+         * 1:已经存在库存，则判断数量是否一致，
+         *  1.1一致则不变，
+         *  1.2否则则要变更初始数量，并更新当前数量，当前数量=当前数量-旧初始数量+新初始数量
+         * 2:不存在库存，则新建
+         */
         // 如果初始化数量有了，就需要更新库存
-        if(model.getInitStock() != null){
+        /*if(model.getInitStock() != null){
             Weekend<SpareStore> weekendSpareStore = new Weekend<>(SpareStore.class);
-            weekendSpareStore.weekendCriteria().andEqualTo(SpareStore::getSpareId, model.getId());
+            weekendSpareStore.weekendCriteria().andEqualTo(SpareStore::getSpareId, model.getId())
+                    .andEqualTo(SpareStore::getStoreId, model.getStoreId());
             SpareStore spareStore = spareStoreMapper.selectOneByExample(weekendSpareStore);
-            /**
-             * 1:已经存在库存，则判断数量是否一致，
-             *  1.1一致则不变，
-             *  1.2否则则要变更初始数量，并更新当前数量，当前数量=当前数量-旧初始数量+新初始数量
-             * 2:不存在库存，则新建
-             */
              if(spareStore != null){
                 if(spareStore.getInitNum() != null){
                     if(spareStore.getInitNum().compareTo(model.getInitStock()) !=0){
@@ -443,7 +447,7 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
                  spareStore.setUpdateUserId(userInfo.getUserId());
                  spareStoreMapper.insert(spareStore);
             }
-        }
+        }*/
         super.modModelByDTO(model);
     }
     private void saveFile(SparePartInfoDTO model) {
@@ -782,9 +786,8 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
                     SpareStore spareStore = new SpareStore();
                     spareStore.setSpareId(item.getId());
                     spareStore.setId(IdGeneratorUtils.getObjectId());
-                    spareStore.setStoreId("9");
+                    spareStore.setStoreId(item.getStoreId());
                     BigDecimal price = new BigDecimal(item.getInitialValue());
-
                     spareStore.setPrice(new BigDecimal(item.getInitialValue()));
                     spareStore.setNum(new BigDecimal(0));
                     spareStore.setInitNum(new BigDecimal(0));

platform-service/src/main/java/com/platform/service/store/impl/StoreServiceImpl.java

@@ -61,6 +61,11 @@ public class StoreServiceImpl extends BaseServiceImpl<StoreMapper, Store, StoreD
     private SysDeptService sysDeptService;
     private SysDeptMapper deptMapper;
     private SpareStoreMapper spareStoreMapper;
+
+    private final String useArea = "5e64ac691c527828b2114da0";
+    private final String useCompany = "6063f905eb190003685af6d4";
+    private final String useProject = "6063f92ceb190003685af6d9";
+
     @Override
     public int batchDelete(List<String> ids) {
         Weekend<Store> weekend = new Weekend<>(Store.class);
@@ -204,6 +209,8 @@ public class StoreServiceImpl extends BaseServiceImpl<StoreMapper, Store, StoreD
                 throw new BusinessException("该项目部已经存在总仓，总仓只能有一个，请调整");
             }
         }
+        model.setUseCompany(useCompany);
+        model.setUseProject(useProject);
         return super.saveModelByDTO(model);
     }