完善

platform-dao/src/main/java/com/platform/dao/mapper/upms/SysDictMapper.java

@@ -1,6 +1,7 @@
 package com.platform.dao.mapper.upms;
 
 import com.platform.dao.config.MyMapper;
+import com.platform.dao.dto.upms.SysDictDTO;
 import com.platform.dao.entity.upms.SysDict;
 import org.springframework.stereotype.Component;
 
@@ -22,4 +23,5 @@ public interface SysDictMapper extends MyMapper<SysDict> {
      */
     List<String> selectType();
 
+    List<SysDict> selectTreeByDTO(SysDictDTO sysDictDTO);
 }

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

@@ -250,7 +250,7 @@ public class TreeUtil {
      * @param root
      * @return
      */
-    public List<CommonTree> buildDictTree(List<SysDict> dicts, String root) {
+    public List<CommonTree> buildDictTree(List<SysDict> dicts) {
         List<CommonTree> trees = new ArrayList<>();
         dicts.forEach(dict -> {
             CommonTree node = new CommonTree();
@@ -261,7 +261,7 @@ public class TreeUtil {
             node.setValue(dict.getId());
             trees.add(node);
         });
-        return TreeUtil.buildByLoop(trees, root);
+        return TreeUtil.buildByLoopWithoutRoot(trees);
     }
 
     /**

platform-dao/src/main/resources/mapper/sqarepartmanage/SparePartInfoMapper.xml

@@ -49,6 +49,8 @@
                      select="com.platform.dao.mapper.firm.FirmProducerMapper.selectNameById"/>
         <association column="supplier_id" javaType="string" property="supplierName"
                      select="com.platform.dao.mapper.purchase.SupplierMapper.selectNameById"/>
+        <association column="id" javaType="Integer" property="currentStock"
+                     select="com.platform.dao.mapper.store.SpareStoreMapper.selectTotalStock"/>
     </resultMap>
     <sql id="Base_Column_List">
         id, no, unite_no, gg_no, name_no, name, type_id, level, initial_value, producer_id,
@@ -76,11 +78,9 @@
     </sql>
     <select id="selectPageList" parameterType="com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO"
             resultType="com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO">
-        select info.*
+        select info.*, SUM(spareStore.num) as currentStock
         from t_spare_part_info info
-        <if test="storeId != null and storeId != ''">
-           LEFT JOIN t_spare_store spare on spare.spare_id = info.id
-        </if>
+        LEFT JOIN t_spare_store spareStore on spareStore.spare_id = info.id
         <if test="producerName != null and producerName != ''">
             LEFT JOIN t_firm_producer producer on producer.id = info.producer_id
         </if>
@@ -141,6 +141,7 @@
                 AND info.child_no=#{childNo}
             </if>
         </where>
+        group by info.id
     </select>
 
     <select id="selectById" parameterType="java.lang.Object" resultMap="BaseResultMap">

platform-dao/src/main/resources/mapper/store/SpareStoreMapper.xml

@@ -92,6 +92,7 @@
         </if>
 
     </sql>
+
     <select id="selectCurrentStock" resultType="java.lang.Integer">
         SELECT SUM(num) FROM t_spare_store
         <where>

platform-dao/src/main/resources/mapper/upms/SysDictMapper.xml

@@ -5,4 +5,10 @@
     <select id="selectType" resultType="java.lang.String">
        SELECT distinct(type) as type FROM t_sys_dict;
     </select>
+
+    <select id="selectTreeByDTO"
+            resultType="com.platform.dao.entity.upms.SysDict">
+        SELECT * from t_sys_dict
+        group by type
+    </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/upms/SysDictController.java

@@ -133,12 +133,9 @@ public class SysDictController {
     @GetMapping("/tree")
     @SysLog("获取树")
     public R tree(SysDictDTO sysDictDTO) {
-        sysDictDTO.setChildFlag("1");
-        List<SysDict> modelListByDTO = sysDictService.getModelListByDTO(sysDictDTO);
-        return new R<>(TreeUtil.buildDictTree((
-                modelListByDTO
-                        .stream()
-                        .collect(Collectors.toList())), "0"));
+        //sysDictDTO.setChildFlag("1");
+        List<SysDict> modelListByDTO = sysDictService.selectTreeByDTO(sysDictDTO);
+        return new R<>(TreeUtil.buildDictTree(modelListByDTO));
     }
 
     /**

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

@@ -173,10 +173,10 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
                 model.setCheckUserId(SecurityUtils.getUserInfo().getUserId());
             }
         }
-        /*List<Integer> statusList = new ArrayList<Integer>();
+        List<Integer> statusList = new ArrayList<Integer>();
         statusList.add(CheckJobStatusEnum.NOT_EXECUTE.getValue());
         statusList.add(CheckJobStatusEnum.EXECUTING.getValue());
-        model.setStatusList(statusList);*/
+        model.setStatusList(statusList);
         List<CheckJobVO> voList = mapper.selectList(model);
 
         tuiCalendar.setCalendarList(TuiCalendarUtil.getCalendarInfoList());
@@ -481,7 +481,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
                         }else if(standard.getCheckUserType().equals(CheckUserTypeEnum.REPAIR_USER.getValue())){
                             checkJob.setCheckUserId(sbInfo.getRepairUser());
                         }else if(standard.getCheckUserType().equals(CheckUserTypeEnum.ZHIDING.getValue())){
-                            checkJob.setCheckUserId(standard.getCheckUserId());
+                            checkJob.setCheckUserId(sbInfo.getRepairUser());
                         }
                     }
                     checkJob.setStandardHours(standard.getStandardHours());

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

@@ -348,6 +348,10 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         checkJob.setRemark(standard.getRemark());
         checkJob.setName(standard.getName());
         checkJobMapper.insert(checkJob);
+
+        // 更新标准的上次和下次时间
+        standard.setNextDate(checkJob.getStartTime());
+        mapper.updateByPrimaryKey(standard);
     }
 
     /**

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -768,12 +768,12 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         repairApplicationFormDTO.setSearchEndTime(searchEndTime);
         List<RepairApplicationFormVO> list = mapper.selectPageList(repairApplicationFormDTO);
         List<RepairReport24VO> result = new ArrayList<RepairReport24VO>();
+        int i = 0;
         for (Map<String, LocalDateTime> map : monthStartAndEndList) {
             RepairReport24VO vo = new RepairReport24VO();
             List<RepairApplicationFormVO> detailList = new ArrayList<RepairApplicationFormVO>();
             vo.setYear(map.get("searchStartTimeMonth").getYear());
             vo.setMonth(map.get("searchStartTimeMonth").getMonthValue());
-            int i = 0;
             for (RepairApplicationFormVO repairApplicationForm : list) {
                 if (repairApplicationForm.getDealMinutes() == null) {
                     continue;

platform-service/src/main/java/com/platform/service/upms/SysDictService.java

@@ -53,4 +53,6 @@ public interface SysDictService extends IBaseService<SysDict, SysDictDTO> {
      * @return ：
      */
     int deleteDicts(List<String> ids);
+
+    List<SysDict> selectTreeByDTO(SysDictDTO sysDictDTO);
 }

platform-service/src/main/java/com/platform/service/upms/impl/SysDictServiceImpl.java

@@ -86,6 +86,11 @@ public class SysDictServiceImpl extends BaseServiceImpl<SysDictMapper, SysDict,
         return 1;
     }
 
+    @Override
+    public List<SysDict> selectTreeByDTO(SysDictDTO sysDictDTO) {
+        return mapper.selectTreeByDTO( sysDictDTO);
+    }
+
     @PostConstruct
     @Override
     public void initDicts() {