更新

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/constant/InspectionFileEnum.java

@@ -18,6 +18,7 @@ public enum InspectionFileEnum {
     JY_EQUIPMENT("jy_equipment","救援设备文件夹"),
     WX_STAFF("wxstaff", "维修员工文件夹"),
     INSPECTION_CUSTOMER("small_inspection_member_folder", "检测客户资料夹"),
+    REPAIR_CUSTOMER("small_repair_customer_member_folder", "维修客户文件夹"),
     ;
 
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java

@@ -676,7 +676,8 @@ public class InspectionFileServiceImpl extends ServiceImpl<InspectionFileMapper,
     @Override
     public void warnReminder() {
         // 查询出检测小程序的资料文件夹
-        InspectionFile inspectionFile = baseMapper.selectOne(new LambdaQueryWrapper<InspectionFile>().eq(InspectionFile::getDefaultKey, InspectionFileEnum.INSPECTION_CUSTOMER.getType()));
+        // TODO 优化 暂未适配其他系统
+        InspectionFile inspectionFile = baseMapper.selectOne(new LambdaQueryWrapper<InspectionFile>().in(InspectionFile::getDefaultKey, InspectionFileEnum.INSPECTION_CUSTOMER.getType()));
         if (inspectionFile != null) {
             // 查询出code中所有带这个文件夹id的文件
             List<InspectionFile> inspectionFiles = baseMapper.selectList(Wrappers.<InspectionFile>lambdaQuery().like(InspectionFile::getFileCode, inspectionFile.getId()).eq(InspectionFile::getType, InspectionConstants.INSPECTION_FILE));

dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml

@@ -273,30 +273,6 @@
 
         </where>
         GROUP BY staff.user_id ,ip.id
-
-        <!--SELECT
-        ip.id AS project_id,
-        ip.project_name,
-        is2.user_id,
-        su.nickname,
-        iwn.inspection_info_id,
-        COUNT(iwn.id) AS count,
-        SUM(iwn.node_count) AS nodeCount
-        FROM inspection_staff is2
-        CROSS JOIN inspection_project ip
-        LEFT JOIN system_users su ON su.id = is2.user_id
-        left join system_user_role sr on su.id = sr.user_id
-        left join system_role sr2 on sr.role_id = sr2.id
-        INNER JOIN inspection_work_node iwn ON
-        iwn.deal_user_id = is2.user_id
-        AND iwn.project_id = ip.id
-        <if test="datetimeRange != null">
-            AND iwn.create_time BETWEEN #{datetimeRange[0]} AND #{datetimeRange[1]}
-        </if>
-        WHERE
-        is2.deleted = 0
-        AND su.deleted = 0 and sr2.service_package_id = 'jiance' and sr2.code != 'jcyh' and sr2.code != 'jcywjl'
-        GROUP BY is2.user_id, ip.id-->
     </select>
 
     <select id="selectExceptionNodesByInspectionIds" resultType="java.util.Map">