diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java b/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java index a4faa589..c3d434a1 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java @@ -17,7 +17,7 @@ public interface CameraOrgenizationMapper extends BaseDao { @Select("select * from t_camera_organization where parent_id = #{parentId}") List selectSubOrganization(@Param("parentId") String parentId); - @Select("select *,0 AS channelCount from t_camera_organization02 where parent_id = #{parentId}") + @Select("select * channelCount from t_camera_organization02 where parent_id = #{parentId}") List selectSubOrganizationMap(@Param("parentId") String parentId); void batchSaveOrgenization(List list); diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java b/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java index 0dcb2e68..7526ea48 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java @@ -1097,16 +1097,8 @@ public class MonitorService { if (parentId == null){ parentId = ""; } - List organs = cameraOrgenMapper.selectSubOrganizationMap(parentId);//查询某个区域下的所有地区 - if(organs.size() > 0){ - for(int i=0;i< organs.size();i++){ - String path = organs.get(i).get("path").toString(); + List organs = cameraOrgenMapper.selectSubOrganizationMap(parentId); - Integer count = cameraChannelMapper.selectChannelCounts(path); - organs.get(i).put("channelCount",count); - - }; - } return organs; } diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java index 9503b0ae..4995273f 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java @@ -96,8 +96,13 @@ public class TAbilityApplicationController { PageData page = tAbilityApplicationService.page(params); List list = page.getList().stream().map(index -> { + Integer inStanceId = + jdbcTemplate.queryForObject(String.format("SELECT DISTINCT instance_id FROM t_ability_application WHERE apply_flag = '%s' LIMIT 1", index.getApplyFlag()), Integer.class); + if (inStanceId == null) { + return index; + } List dtos = - tAbilityApplicationService.getByInstanceId(index.getInstanceId()); + tAbilityApplicationService.getByInstanceId(inStanceId + ""); if (!dtos.isEmpty()) { dtos.stream() .limit(1l) diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java index 83827539..e8ae898f 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java @@ -32,12 +32,10 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl null != params.get(index)).forEach(index -> { switch (index) { // case "abilityprocess_v2": - wrapper.select("DISTINCT apply_flag,instance_id,apply_number"); + wrapper.select("DISTINCT apply_flag,apply_number"); wrapper.isNotNull(Boolean.valueOf(params.get("abilityprocess_v2").toString()), "apply_flag") - .isNotNull(Boolean.valueOf(params.get("abilityprocess_v2").toString()), "instance_id") .isNotNull(Boolean.valueOf(params.get("abilityprocess_v2").toString()), "apply_number"); wrapper.groupBy(Boolean.valueOf(params.get("abilityprocess_v2").toString()), "apply_flag") - .groupBy(Boolean.valueOf(params.get("abilityprocess_v2").toString()), "instance_id") .groupBy(Boolean.valueOf(params.get("abilityprocess_v2").toString()), "apply_number"); wrapper.orderByDesc("apply_number"); // 流程排序 break; diff --git a/renren-admin/src/main/resources/mapper/monitor/CameraOrganizationMapper.xml b/renren-admin/src/main/resources/mapper/monitor/CameraOrganizationMapper.xml index 2310fee6..3897a759 100644 --- a/renren-admin/src/main/resources/mapper/monitor/CameraOrganizationMapper.xml +++ b/renren-admin/src/main/resources/mapper/monitor/CameraOrganizationMapper.xml @@ -4,11 +4,11 @@ INSERT INTO t_camera_organization02 ( - id,name,parent_id,sort,subCount,is_parent,path + id,name,parent_id,sort,subCount,path ) VALUES ( - #{item.id},#{item.name},#{item.parentId},#{item.sort},#{item.subCount},case when #{item.isParent} = true then 1 else 0 end,#{item.name} + #{item.id},#{item.name},#{item.parentId},#{item.sort},#{item.subCount},#{item.name} )