交接班补充班组信息

@@ -34,6 +34,7 @@ public class BusinessServiceImpl implements IBusinessService {
         put("sys_depart", new String[]{"id", "depart_name"});
         put("sys_depart", new String[]{"id", "depart_name"});
         put("equipment_sparepart_type", new String[]{"id", "item_text"});
         put("equipment_sparepart_type", new String[]{"id", "item_text"});
         put("supplies_warehouse", new String[]{"id", "warehouse_name"});
         put("supplies_warehouse", new String[]{"id", "warehouse_name"});
+        put("inspection_working_group", new String[]{"id", "group_name"});
     }};
     }};
 
 
     @Override
     @Override

@@ -90,6 +90,7 @@ public class JoinClassInfoController {
         Map<String, String> classTypeDictMap = businessService.dictMap("JoinClassInfo_class_type", null);
         Map<String, String> classTypeDictMap = businessService.dictMap("JoinClassInfo_class_type", null);
         Map<String, String> sysUserDictMap = businessService.dictMap("sys_user", null);
         Map<String, String> sysUserDictMap = businessService.dictMap("sys_user", null);
         Map<String, String> sysDepartDictMap = businessService.dictMap("sys_depart", null);
         Map<String, String> sysDepartDictMap = businessService.dictMap("sys_depart", null);
+        Map<String, String> inspectionWorkingGroupDictMap = businessService.dictMap("inspection_working_group", null);
         // 封装结果集
         // 封装结果集
         IPage<Map<String, Object>> mapIPage = new Page<>(pageNo, pageSize);
         IPage<Map<String, Object>> mapIPage = new Page<>(pageNo, pageSize);
         mapIPage.setTotal(pageList.getTotal());
         mapIPage.setTotal(pageList.getTotal());
@@ -99,11 +100,17 @@ public class JoinClassInfoController {
             if (StringUtils.isNotEmpty(item.getOnDutyUser())) {
             if (StringUtils.isNotEmpty(item.getOnDutyUser())) {
                 onDutyUserStr = Arrays.stream(item.getOnDutyUser().split(",")).map(it -> sysUserDictMap.get(it)).collect(Collectors.joining(","));
                 onDutyUserStr = Arrays.stream(item.getOnDutyUser().split(",")).map(it -> sysUserDictMap.get(it)).collect(Collectors.joining(","));
             }
             }
+            String inspectionWorkingGroupUserIdStr = "";
+            if(StringUtils.isNotEmpty(item.getInspectionWorkingGroupUserId())) {
+                inspectionWorkingGroupUserIdStr = Arrays.stream(item.getInspectionWorkingGroupUserId().split(",")).map(it -> sysUserDictMap.get(it)).collect(Collectors.joining(","));
+            }
             entityMap.put("classType" + BusinessConstant.dictText, classTypeDictMap.get(item.getClassType()));
             entityMap.put("classType" + BusinessConstant.dictText, classTypeDictMap.get(item.getClassType()));
             entityMap.put("onDutyUser" + BusinessConstant.dictText, onDutyUserStr);
             entityMap.put("onDutyUser" + BusinessConstant.dictText, onDutyUserStr);
             entityMap.put("handOverUser" + BusinessConstant.dictText, sysUserDictMap.get(item.getHandOverUser()));
             entityMap.put("handOverUser" + BusinessConstant.dictText, sysUserDictMap.get(item.getHandOverUser()));
             entityMap.put("takeOverUser" + BusinessConstant.dictText, sysUserDictMap.get(item.getTakeOverUser()));
             entityMap.put("takeOverUser" + BusinessConstant.dictText, sysUserDictMap.get(item.getTakeOverUser()));
             entityMap.put("departName", sysDepartDictMap.get(item.getDepartId()));
             entityMap.put("departName", sysDepartDictMap.get(item.getDepartId()));
+            entityMap.put("inspectionWorkingGroupUserId" + BusinessConstant.dictText, inspectionWorkingGroupUserIdStr);
+            entityMap.put("inspectionWorkingGroupId" + BusinessConstant.dictText, inspectionWorkingGroupDictMap.get(item.getInspectionWorkingGroupId()));
             return entityMap;
             return entityMap;
         }).collect(Collectors.toList()));
         }).collect(Collectors.toList()));
         result.setSuccess(true);
         result.setSuccess(true);

@@ -127,4 +127,8 @@ public class JoinClassInfo {
 
 
     private String departId;
     private String departId;
 
 
+    private String inspectionWorkingGroupId;
+
+    private String inspectionWorkingGroupUserId;
+
 }
 }