优化巡检功能

java110-db/src/main/resources/mapper/community/InspectionPlanV1ServiceDaoImplMapper.xml

@@ -29,8 +29,10 @@
         t.inspection_workday inspectionWorkday,t.before_time beforeTime,t.create_time createTime,
         d.name stateName,
         c.name inspectionPlanPeriodName,
-        i.name signTypeName
+        i.name signTypeName,
+        ir.route_name inspectionRouteName
         from inspection_plan t
+        left join inspection_route ir on t.inspection_route_id = ir.inspection_route_id and ir.status_cd = '0'
         inner join t_dict d on t.state = d.status_cd and d.table_name = 'inspection_plan' and d.table_columns = 'state'
         inner join t_dict c on t.inspection_plan_period = c.status_cd and c.table_name = 'inspection_plan' and
         c.table_columns = 'inspection_plan_period'

service-community/src/main/java/com/java110/community/cmd/inspectionPlan/ListInspectionPlansCmd.java

@@ -52,57 +52,6 @@ public class ListInspectionPlansCmd extends Cmd {
 
         if (count > 0) {
             inspectionPlans = BeanConvertUtil.covertBeanList(inspectionPlanV1InnerServiceSMOImpl.queryInspectionPlans(inspectionPlanDto), ApiInspectionPlanDataVo.class);
-            List<Object> staffIds = new ArrayList<Object>();
-            List<Object> inspectionRouteIds = new ArrayList<Object>();
-            for (ApiInspectionPlanDataVo Plans : inspectionPlans) {
-                staffIds.add(Plans.getStaffId());
-                String[] ids = Plans.getInspectionRouteId().split(",");
-                for (String s : ids) {
-                    inspectionRouteIds.add(s);
-                }
-            }
-            if (staffIds.size() > 0) {
-                OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
-                String[] staffIdsArray = new String[staffIds.size()];
-                staffIds.toArray(staffIdsArray);
-                orgStaffRelDto.setStaffIds(staffIdsArray);
-                List<OrgStaffRelDto> orgStaffRelDtos = iOrgStaffRelInnerServiceSMO.queryOrgInfoByStaffIds(orgStaffRelDto);
-                for (ApiInspectionPlanDataVo planDataVo : inspectionPlans) {
-                    for (OrgStaffRelDto orgs : orgStaffRelDtos) {
-                        if (planDataVo.getStaffId().equals(orgs.getStaffId())) {
-                            planDataVo.setDepartmentId(orgs.getDepartmentId());
-                            planDataVo.setDepartmentName(orgs.getDepartmentName());
-                            planDataVo.setCompanyId(orgs.getCompanyId());
-                            planDataVo.setCompanyName(orgs.getCompanyName());
-                        }
-                    }
-                }
-            }
-            if (inspectionRouteIds.size() > 0) {
-                //去重
-                HashSet set = new HashSet(inspectionRouteIds);
-                inspectionRouteIds.clear();
-                inspectionRouteIds.addAll(set);
-                InspectionRouteDto inspectionRouteDto = new InspectionRouteDto();
-                String[] routeIds = (String[]) inspectionRouteIds.toArray(new String[inspectionRouteIds.size()]);
-                inspectionRouteDto.setInspectionRouteIds(routeIds);
-                List<InspectionRouteDto> inspectionRouteDtoList = inspectionRouteInnerServiceSMOImpl.queryInspectionRoutes(inspectionRouteDto);
-                for (ApiInspectionPlanDataVo planDataVo : inspectionPlans) {
-                    String[] routeIdArray = planDataVo.getInspectionRouteId().split(",");
-                    for (String s : routeIdArray) {
-                        for (InspectionRouteDto inspectionRouteDto1 : inspectionRouteDtoList) {
-                            if (inspectionRouteDto1.getInspectionRouteId().equals(s)) {
-                                if (planDataVo.getInspectionRouteName() == null) {
-                                    planDataVo.setInspectionRouteName(inspectionRouteDto1.getRouteName());
-                                } else {
-                                    planDataVo.setInspectionRouteName(planDataVo.getInspectionRouteName() + "," + inspectionRouteDto1.getRouteName());
-                                }
-                            }
-                        }
-
-                    }
-                }
-            }
         } else {
             inspectionPlans = new ArrayList<>();
         }

service-community/src/main/java/com/java110/community/dao/impl/InspectionPlanV1ServiceDaoImpl.java

@@ -71,9 +71,9 @@ public class InspectionPlanV1ServiceDaoImpl extends BaseServiceDao implements II
     public List<Map> getInspectionPlanInfo(Map info) throws DAOException {
         logger.debug("查询 getInspectionPlanInfo 入参 info : {}",info);
 
-        List<Map> businessInspectionPlanInfos = sqlSessionTemplate.selectList("inspectionPlanV1ServiceDaoImpl.getInspectionPlanInfo",info);
+        List<Map> infos = sqlSessionTemplate.selectList("inspectionPlanV1ServiceDaoImpl.getInspectionPlanInfo",info);
 
-        return businessInspectionPlanInfos;
+        return infos;
     }