diff --git a/src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java b/src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java index 986161e6..c16c282a 100644 --- a/src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java @@ -15,7 +15,7 @@ import java.util.Map; public interface CzksMapEightMapper { - List getCorpinfoIds(String[] ArrayDATA_IDS); + List getCorpinfoIds(String[] ArrayDATA_IDS); /** * 获取柱状图 @@ -287,6 +287,9 @@ public interface CzksMapEightMapper { */ List listAllMeasuresELECTRICITYOrder(PageData pd); + + List listAllGasELECTRICTITYOrder(PageData pd); + /**盲板查询数据 * @param pd * @throws Exception @@ -356,13 +359,86 @@ public interface CzksMapEightMapper { */ List listAllMeasuresCUTROADOrder(PageData pd); - /** - * 动火获取字典展示 - * @param shuzu - * @return - */ + /** + * 动火获取字典展示 + * @param shuzu + * @return + */ List getListDongHuo(List shuzu); + /** + * 获取cfd动火作业高危作业坐标统计 + * @param pd + * @return + */ + List getHOTWORKHighRiskWorkLocationCfd(PageData pd); + + + List findByELECTRICTITYAcceptuserId(PageData pd); + + List findByELECTRICTITYAcceptuserIds(PageData pd); + + List findByBLINDBOARDAcceptuserId(PageData pd); + + List findByBLINDBOARDAcceptuserIds(PageData pd); + + List findByCUTROADAcceptuserId(PageData pd); + + List findByCUTROADAcceptuserIds(PageData pd); + + List findByBREAKGROUNDAcceptuserId(PageData pd); + + List findByBREAKGROUNDAcceptuserIds(PageData pd); + + List findByHIGHWORKAcceptuserId(PageData pd); + + List findByHIGHWORKAcceptuserIds(PageData pd); + + List findByHOISTINGAcceptuserId(PageData pd); + + List findByHOISTINGAcceptuserIds(PageData pd); + + /**有限空间作业查询 + * @param pd + * @throws Exception + */ + PageData findByIdCONFINEDSPACEOrder(PageData pd); + + /**有限空间作业措施查询 + * @param pd + * @throws Exception + */ + List listAllMeasuresCONFINEDSPACEOrder(PageData pd); + + /** + * 有限空间 + * @param pd + * @return + */ + List listAllCONFINEDSPACEOrder(PageData pd); + + /** + * 有限空间 + * @param pd + * @return + */ + List findByIdCONFINEDSPACEAcceptuser(PageData pd); + + /** + * 有限空间 + * @param pd + * @return + */ + List findByIdCONFINEDSPACEAcceptusers(PageData pd); + + /** + * 有限空间气体检测 + * @param pd + * @return + */ + PageData findByIdCONFINEDSPACEGasWH(PageData pd); + + PageData getAllWorkUserIds(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java index 5ecc79ab..b4fc09d5 100644 --- a/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java @@ -15,7 +15,7 @@ import java.util.Map; public interface MapEightMapper { - List getCorpinfoIds(String[] ArrayDATA_IDS); + List getCorpinfoIds(String[] ArrayDATA_IDS); /** * 获取柱状图 @@ -359,11 +359,11 @@ public interface MapEightMapper { */ List listAllMeasuresCUTROADOrder(PageData pd); - /** - * 动火获取字典展示 - * @param shuzu - * @return - */ + /** + * 动火获取字典展示 + * @param shuzu + * @return + */ List getListDongHuo(List shuzu); /** @@ -430,5 +430,12 @@ public interface MapEightMapper { * @return */ List findByIdCONFINEDSPACEAcceptusers(PageData pd); + + /** + * 有限空间气体检测 + * @param pd + * @return + */ + PageData findByIdCONFINEDSPACEGasWH(PageData pd); } diff --git a/src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java b/src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java index 59982661..00afeeb3 100644 --- a/src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java +++ b/src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java @@ -96,6 +96,6 @@ public interface CzksMapEightService { */ Map getByIdOrder(PageData pd); - Object getAllWorkUserCards(PageData pd); + public Object getAllWorkUserCards(PageData pd); } diff --git a/src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java b/src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java index 3910705e..4642b429 100644 --- a/src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java +++ b/src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java @@ -3,9 +3,10 @@ package com.zcloud.service.czksbimap.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.czksbimap.CzksMapEightMapper; -import com.zcloud.mapper.datasource.system.UsersMapper; - +import com.zcloud.mapper.datasource.map.MapEightMapper; +import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.czksbimap.CzksMapEightService; +import com.zcloud.service.map.MapEightService; import com.zcloud.util.Tools; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -14,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * 说明：实时地图八项工作 @@ -27,11 +29,9 @@ public class CzksMapEightServiceImpl implements CzksMapEightService { @Autowired private CzksMapEightMapper mapEightMapper; - @Autowired - private UsersMapper usersMapper; - @Override - public List getCorpinfoIds(PageData pd) { + @Override + public List getCorpinfoIds(PageData pd) { String area = pd.getString("AREA"); if(StringUtils.isNotBlank(area)){ String[] ArrayDATA_IDS = area.split(","); @@ -43,12 +43,12 @@ public class CzksMapEightServiceImpl implements CzksMapEightService { return mapEightMapper.getCorpinfoIds(ArrayDATA_IDS); } return new ArrayList<>(); - } + } - @Override + @Override public Object getEcharts(PageData pd) { Map returnMap = new HashMap<>(); - String errInfo = "success"; + String errInfo = "success"; Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); @@ -112,27 +112,28 @@ public class CzksMapEightServiceImpl implements CzksMapEightService { @Override public List listAllHighRiskWorkLocation(PageData pd) throws Exception { - List r = new ArrayList<>(); - String typeStr = pd.getString("TYPE"); - //动火 - if(StringUtils.equals(typeStr,"HOTWORK")){ - r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd); - //临时用电 - }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ - r = mapEightMapper.getELECTRICITYHighRiskWorkLocation(pd); - //盲板 - }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ - r = mapEightMapper.getBLINDBOARDHighRiskWorkLocation(pd); - // 高处 - }else if(StringUtils.equals(typeStr,"HIGHWORK")){ - r = mapEightMapper.getHIGHWORKHighRiskWorkLocation(pd); - //有限空间 - }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ - r = mapEightMapper.getCONFINEDSPACEHighRiskWorkLocation(pd); - //吊装 - }else if(StringUtils.equals(typeStr,"HOISTING")){ - r = mapEightMapper.getHOISTINGHighRiskWorkLocation(pd); - } + List r = new ArrayList<>(); + String typeStr = pd.getString("TYPE"); + //动火 + if(StringUtils.equals(typeStr,"HOTWORK")){ +// r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd); + r = mapEightMapper.getHOTWORKHighRiskWorkLocationCfd(pd); + //临时用电 + }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ + r = mapEightMapper.getELECTRICITYHighRiskWorkLocationOrder(pd); + //盲板 + }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ + r = mapEightMapper.getBLINDBOARDHighRiskWorkLocationOrder(pd); + // 高处 + }else if(StringUtils.equals(typeStr,"HIGHWORK")){ + r = mapEightMapper.getHIGHWORKHighRiskWorkLocationOrder(pd); + //有限空间 + }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ + r = mapEightMapper.getCONFINEDSPACEHighRiskWorkLocationOrder(pd); + //吊装 + }else if(StringUtils.equals(typeStr,"HOISTING")){ + r = mapEightMapper.getHOISTINGHighRiskWorkLocationOrder(pd); + } return r; } @@ -206,6 +207,19 @@ public class CzksMapEightServiceImpl implements CzksMapEightService { public Object getEchartsOrder(PageData pd) { Map returnMap = new HashMap<>(); String errInfo = "success"; + + //根据条件增加参数或减少参数 都没有 直接返回空 + if(StringUtils.isBlank(pd.getString("CORPINFO_ID"))){ + List ArrayDATA_IDS = getCorpinfoIds(pd); + if(ArrayDATA_IDS.size()==0){ + returnMap.put("result", errInfo); + return returnMap; + }else { + pd.put("ids",ArrayDATA_IDS); + pd.remove("CORPINFO_ID"); + } + } + Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); @@ -267,6 +281,15 @@ public class CzksMapEightServiceImpl implements CzksMapEightService { @Override public PageData statisticsHighRiskWorkByStateOrder(PageData pd) throws Exception { //根据条件增加参数或减少参数 都没有 直接返回空 + if(StringUtils.isBlank(pd.getString("CORPINFO_ID"))){ + List ArrayDATA_IDS = getCorpinfoIds(pd); + if(ArrayDATA_IDS.size()==0){ + return new PageData(); + }else { + pd.put("ids",ArrayDATA_IDS); + pd.remove("CORPINFO_ID"); + } + } return mapEightMapper.statisticsHighRiskWorkByStateOrder(pd); } @@ -327,51 +350,59 @@ public class CzksMapEightServiceImpl implements CzksMapEightService { pd.put("ELECTRICITY_ID",idStr); pd = mapEightMapper.findByIdELECTRICITYOrder(pd); map.put("measuresList", mapEightMapper.listAllMeasuresELECTRICITYOrder(pd)); + map.put("gasList", mapEightMapper.listAllGasELECTRICTITYOrder(pd)); + map.put("imgList1",mapEightMapper.findByELECTRICTITYAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByELECTRICTITYAcceptuserIds(pd)); }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ pd.put("BLINDBOARD_ID",idStr); pd = mapEightMapper.findByIdBLINDBOARDOrder(pd); - map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd)); + map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd)); PageData Info = mapEightMapper.findByIdJWDOrder(pd); pd.put("TYPE",105);//盲板位置图 pd.put("FOREIGN_KEY",pd.getString("BLINDBOARD_ID")); List ImgList = mapEightMapper.listAllBLINDBOARD(pd); map.put("Info",Info);//获取经纬度 map.put("ImgList",ImgList); + map.put("imgList1",mapEightMapper.findByBLINDBOARDAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByBLINDBOARDAcceptuserIds(pd)); }else if(StringUtils.equals(typeStr,"HIGHWORK")){ pd.put("HIGHWORK_ID",idStr); pd = mapEightMapper.findByIdHIGHWORKOrder(pd); map.put("measuresList", mapEightMapper.listAllMeasuresHIGHWORKOrder(pd)); + map.put("imgList1",mapEightMapper.findByHIGHWORKAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByHIGHWORKAcceptuserIds(pd)); }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ - //没有有限空间作业 - //pd.put("CONFINEDSPACE_ID",idStr); - //pd = mapEightMapper.findByIdCONFINEDSPACE(pd); - pd = new PageData(); - map.put("measuresList", null); - map.put("gasList", null); + pd.put("CONFINEDSPACE_ID",idStr); + pd = mapEightMapper.findByIdCONFINEDSPACEOrder(pd); //根据ID读取 + map.put("measuresList", mapEightMapper.listAllMeasuresCONFINEDSPACEOrder(pd)); + map.put("gasList", mapEightMapper.listAllCONFINEDSPACEOrder(pd)); + map.put("gas", mapEightMapper.findByIdCONFINEDSPACEGasWH(pd)); + map.put("imgList",mapEightMapper.findByIdCONFINEDSPACEAcceptusers(pd)); + map.put("imgList1",mapEightMapper.findByIdCONFINEDSPACEAcceptuser(pd)); }else if(StringUtils.equals(typeStr,"HOISTING")){ pd.put("HOISTING_ID",idStr); pd = mapEightMapper.findByIdHOISTINGOrder(pd); map.put("measuresList", mapEightMapper.listAllMeasuresHOISTINGOrder(pd)); + map.put("imgList1",mapEightMapper.findByHOISTINGAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByHOISTINGAcceptuserIds(pd)); }else if(StringUtils.equals(typeStr,"BREAKGROUND")){ pd.put("BREAKGROUND_ID",idStr); pd = mapEightMapper.findByIdBREAKGROUNDOrder(pd); map.put("measuresList", mapEightMapper.listAllMeasuresBREAKGROUNDOrder(pd)); + map.put("imgList1",mapEightMapper.findByBREAKGROUNDAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByBREAKGROUNDAcceptuserIds(pd)); }else if(StringUtils.equals(typeStr,"CUTROAD")){ pd.put("CUTROAD_ID",idStr); pd = mapEightMapper.findByIdCUTROADOrder(pd); map.put("measuresList", mapEightMapper.listAllMeasuresCUTROADOrder(pd)); + map.put("imgList1",mapEightMapper.findByCUTROADAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByCUTROADAcceptuserIds(pd)); } map.put("pd", pd); map.put("result", errInfo); return map; } - /** - * @Description: 曹妃甸项目 暂时未用 - * @Author: dearLin - * @Date: 2023/12/13/013 16:45 - * @Param: [com.zcloud.entity.PageData] [pd] - * @Return: java.lang.Object - */ + @Override public Object getAllWorkUserCards(PageData pd) { Map map = new HashMap(); @@ -419,6 +450,7 @@ public class CzksMapEightServiceImpl implements CzksMapEightService { map.put("result", errInfo); return map; } + private PageData shenpi(PageData pd,List list){ List specialUserList = new ArrayList<>(); for (PageData userPageData : list){ @@ -590,18 +622,18 @@ public class CzksMapEightServiceImpl implements CzksMapEightService { } } pd.put("specialUserList", specialUserList); - return pd; + return pd; } - private PageData dianhuo(PageData pd){ - if(StringUtils.isBlank(pd.getString("HOT_WORK_METHOD_NAME"))){ - String zidian = pd.getString("HOT_WORK_METHOD_ID"); - List shuzu = Arrays.asList(zidian.split(",")); + private PageData dianhuo(PageData pd){ + if(StringUtils.isBlank(pd.getString("HOT_WORK_METHOD_NAME"))){ + String zidian = pd.getString("HOT_WORK_METHOD_ID"); + List shuzu = Arrays.asList(zidian.split(",")); List wenzi = mapEightMapper.getListDongHuo(shuzu); String pinjie = String.join(",",wenzi); pd.put("HOT_WORK_METHOD_NAME",pinjie); } - return pd; - } + return pd; + } } diff --git a/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml b/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml index ff526cc1..fa7b745b 100644 --- a/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml +++ b/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml @@ -57,7 +57,7 @@ '0' hoistingCount, '0' electricityCount FROM - bus_hotworkapplication + bus_hotwork_cfd WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' @@ -67,24 +67,26 @@ AND CORPINFO_ID IN - #{item} + #{item} GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' AS cutroadCount, + '0' AS hotworkapplicationCount, count( 1 ) blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, '0' highworkCount, '0' hoistingCount, '0' electricityCount FROM - bus_blindboard + gf_blindboard WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -96,19 +98,21 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, '0' cutroadCount, '0' blindboardCount, - count( 1 ) breakgroundCount, + count( 1 ) confinedspaceCount, '0' highworkCount, '0' hoistingCount, '0' electricityCount FROM - bus_confinedspace + gf_confinedspace WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -120,19 +124,21 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' cutroadCount, + '0' hotworkapplicationCount, '0' blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, count( 1 ) highworkCount, '0' hoistingCount, '0' electricityCount FROM - bus_highwork + gf_highwork WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -144,19 +150,22 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' cutroadCount, + '0' hotworkapplicationCount, '0' blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, '0' highworkCount, count( 1 ) hoistingCount, '0' electricityCount FROM - bus_hoisting + gf_hoisting WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -168,49 +177,53 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' cutroadCount, + '0' hotworkapplicationCount, '0' blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, '0' highworkCount, '0' hoistingCount, count( 1 ) electricityCount FROM - bus_electricity + gf_electricity WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} - + AND CORPINFO_ID IN - + #{item} GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) + ) s GROUP BY s.CREATTIME ) h ON h.CREATTIME = t.click_date order by t.click_date - + SELECT * FROM - (SELECT - f.HOTWORKAPPLICATION_ID ID, - f.JOB_NUMBER WORK_NUMBER, - '动火作业' WORK_TYPE, - case f.STATE - when 1 then '动火单位负责人确认' - when 2 then '项目发包单位签发' - when 3 then '现场管辖单位负责人' - when 4 then '动火许可签发单位' - when 5 then '安全总监审批' - when 6 then '现场负责人' - when 7 then '动火前' - when 8 then '现场负责人确认' - when 9 then '动火后' - when 10 then '延时监火' - when 11 then '归档' - when 21 then '动火操作人' - when 22 then '监护人' - when 24 then '气体检测人' - when -1 then '审核不通过' - when -2 then '特级动火不通过' - when -3 then '未完成 关闭归档' - when -4 then '延期' - when -5 then '已打回' - when -6 then '超期' - when 30 then '动火负责人确认' - when 31 then '项目主管初审' - when 32 then '项目监管部门负责人' - when 33 then '分公司安全总监审批' - when 34 then '分公司主要负责人' - when 35 then '安全监督部初审' - when 36 then '安委会办公室' - when 37 then '安全总监审批' - END STATUS_NAME, - IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')), IFNULL(qu.`NAME`,'')) USER_NAME, - DATE_FORMAT(ifnull(f.OPERATTIME,f.CREATTIME),'%Y-%m-%d %H:%i:%s') OPERATTIME - FROM bus_hotworkapplication f - LEFT JOIN bus_hotworkapplicationuser hu ON hu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID AND hu.STATE = f.STATE - LEFT JOIN sys_user u ON u.USER_ID = hu.USER_ID - LEFT JOIN `qa-czks-regulatory`.sys_user qu on qu.USER_ID = hu.USER_ID - WHERE f.ISDELETE = '0' AND f.STATE >= 0 and f.STATE != 11 + (SELECT + f.HOTWORK_ID ID, + f.CHECK_NO WORK_NUMBER, + '动火作业' WORK_TYPE, + CASE + f.APPLY_STATUS + WHEN 0 THEN + '动火作业待提交' + WHEN 1 THEN + '作业负责人待审核' + WHEN 2 THEN + '所在单位待审核' + WHEN 4 THEN + '安全管理部门待审核' + WHEN 5 THEN + '动火审批人待审核' + WHEN 6 THEN + '班长待验票' + WHEN 7 THEN + '待验收' + END STATUS_NAME, + CASE WHEN f.APPLY_STATUS = 0 THEN + IFNULL( + GROUP_CONCAT( + REPLACE ( u1.NAME, '/', ',' )), + IFNULL( qu1.`NAME`, '' )) + WHEN f.APPLY_STATUS = 1 THEN + IFNULL( + GROUP_CONCAT( + REPLACE ( u1.NAME, '/', ',' )), + IFNULL( qu1.`NAME`, '' )) + WHEN f.APPLY_STATUS = 2 THEN + IFNULL( + GROUP_CONCAT( + REPLACE ( u2.NAME, '/', ',' )), + IFNULL( qu2.`NAME`, '' )) + + WHEN f.APPLY_STATUS = 4 THEN + IFNULL( + GROUP_CONCAT( + REPLACE ( u3.NAME, '/', ',' )), + IFNULL( qu3.`NAME`, '' )) + + WHEN f.APPLY_STATUS = 5 THEN + IFNULL( + GROUP_CONCAT( + REPLACE ( u4.NAME, '/', ',' )), + IFNULL( qu4.`NAME`, '' )) + WHEN f.APPLY_STATUS = 6 THEN + IFNULL( + GROUP_CONCAT( + REPLACE ( u5.NAME, '/', ',' )), + IFNULL( qu5.`NAME`, '' )) + WHEN f.APPLY_STATUS = 7 THEN + IFNULL( + GROUP_CONCAT( + REPLACE ( u6.NAME, '/', ',' )), + IFNULL( qu6.`NAME`, '' )) + ELSE + IFNULL( + GROUP_CONCAT( + REPLACE ( u6.NAME, '/', ',' )), + IFNULL( qu6.`NAME`, '' )) + END USER_NAME, + DATE_FORMAT( ifnull( f.OPERATTIME, f.CREATTIME ), '%Y-%m-%d %H:%i:%s' ) OPERATTIME + FROM + bus_hotwork_cfd f + LEFT JOIN sys_user u1 ON u1.USER_ID = f.CONFIRM_USER_ID + LEFT JOIN `qa-czks-regulatory`.sys_user qu1 ON qu1.USER_ID = f.CONFIRM_USER_ID + LEFT JOIN sys_user u2 ON u2.USER_ID = f.LEADER_USER_ID + LEFT JOIN `qa-czks-regulatory`.sys_user qu2 ON qu2.USER_ID = f.LEADER_USER_ID + LEFT JOIN sys_user u3 ON u3.USER_ID = f.AUDIT_USER_ID + LEFT JOIN `qa-czks-regulatory`.sys_user qu3 ON qu3.USER_ID = f.AUDIT_USER_ID + LEFT JOIN sys_user u4 ON u4.USER_ID = f.APPROVE_USER_ID + LEFT JOIN `qa-czks-regulatory`.sys_user qu4 ON qu4.USER_ID = f.APPROVE_USER_ID + LEFT JOIN sys_user u5 ON u5.USER_ID = f.MONITOR_USER_ID + LEFT JOIN `qa-czks-regulatory`.sys_user qu5 ON qu5.USER_ID = f.MONITOR_USER_ID + LEFT JOIN sys_user u6 ON u6.USER_ID = f.ACCEPT_USER_ID + LEFT JOIN `qa-czks-regulatory`.sys_user qu6 ON qu6.USER_ID = f.ACCEPT_USER_ID + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS >= 0 + AND f.APPLY_STATUS != 8 and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -461,32 +408,39 @@ #{pd.ids[${index}]} - GROUP BY f.HOTWORKAPPLICATION_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.electricity_ID ID, - f.CHECK_NO WORK_NUMBER, - '临时用电作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '待确认' - when '2' then '待审批' - when '3' then '已归档' - when '4' then '已验收' - when '-1' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.APPLY_USER_ID - when '1' then f.ASSURE_USER_ID - when '2' then f.APPROVE_USER_ID - when '3' then f.ACCEPT_USER_ID - when '-1' then f.APPLY_USER_ID - END NEXT_USER_ID, + GROUP BY f.HOTWORK_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.electricity_ID ID, + f.CHECK_NO WORK_NUMBER, + '临时用电作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '用电单位待审核' + when '3' then '配送电单位待审核' + when '4' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.APPLY_USER_ID + when '1' then f.CONFIRM_USER_ID + when '2' then f.AUDIT_USER_ID + when '3' then f.APPROVE_USER_ID + when '4' then f.ACCEPT_USER_ID + when '-1' then f.APPLY_USER_ID + when '-2' then f.APPLY_USER_ID + when '-3' then f.APPLY_USER_ID + when '-4' then f.APPLY_USER_ID + when '-5' then f.APPLY_USER_ID + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('3','4') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '5' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -496,32 +450,37 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.blindboard_ID ID, - f.CHECK_NO WORK_NUMBER, - '盲板作业' WORK_TYPE, - case f.APPLY_STATUS - when '1' then '待确认' - when '2' then '待审批' - when '3' then '已归档' - when '4' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then bb.OPERATION_UNIT_PERSONCHARGE - when '2' then bb.CORPINFO_APPROVER - when '3' then f.APPLY_USER_ID - when '4' then f.APPLY_USER_ID - END NEXT_USER_ID, + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.blindboard_ID ID, + f.CHECK_NO WORK_NUMBER, + '盲板作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '4' then '所在单位待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.APPLY_USER_ID + when '1' then f.CONSTRUCTION_USER_ID + when '4' then f.LEADER_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then APPLY_USER_ID + when '-5' then APPLY_USER_ID + when '-6' then APPLY_USER_ID + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_blindboard f - LEFT JOIN bus_blindboardinfo bb ON bb.BLINDBOARD_ID = f.BLINDBOARD_ID - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('3','4') - AND date_format(now(),'%Y-%m-%d %H:%i') >= bb.BOARD_INSTALL_TIME AND bb.BOARD_DISASSEMBLE_TIME >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_blindboard f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -531,39 +490,44 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.HIGHWORK_ID ID, - f.CHECK_NO WORK_NUMBER, - '高处作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '待确认' - when '2' then '待审核' - when '3' then '待审批' - when '4' then '已归档' - when '5' then '已验收' - when '-2' then '确认打回' - when '-3' then '审核打回' - when '-4' then '审批打回' - when '55' then '待验收' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then f.CONSTRUCTION_USER_ID - when '2' then f.AUDIT_USER_ID - when '3' then f.APPROVE_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '55' then f.ACCEPT_USER_ID - END NEXT_USER_ID, + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.HIGHWORK_ID ID, + f.CHECK_NO WORK_NUMBER, + '高处作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '所在单位待审核' + when '3' then '审核部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.CONSTRUCTION_USER_ID + when '2' then f.LEADER_USER_ID + when '3' then f.AUDIT_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('4','5','55','-5') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -573,44 +537,34 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.confinedspace_ID ID, - f.WORK_PERMIT_NUMBER WORK_NUMBER, - '有限空间作业' WORK_TYPE, - case f.APPLY_STATUS - when '1' then '待采样' - when '2' then '作业单位责任人确认' - when '3' then '作业现场责任人审核' - when '4' then '管理单位责任人审批' - when '5' then '作业单位责任人验收' - when '6' then '管理单位责任人验收' - when '-2' then '作业单位责任人确认打回' - when '-3' then '作业现场责任人审核打回' - when '-4' then '管理单位责任人审批打回' - when '-5' then '作业单位责任人验收打回' - when '-6' then '管理单位责任人验收打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then f.SAMPLING_ANALYST_ID - when '2' then f.WORK_UNIT_MANAGER_ID - when '3' then f.JOB_SITE_MANAGER_ID - when '4' then f.MANAGEMENT_UNIT_ID - when '5' then f.WORK_UNIT_MANAGER_ID - when '6' then f.MANAGEMENT_UNIT_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.confinedspace_ID ID, + f.CHECK_NO WORK_NUMBER, + '有限空间作业' WORK_TYPE, + case f.APPLY_STATUS + when '1' then '作业负责人待审核' + when '4' then '所在单位待审核' + when '5' then '待验收' + when '-4' then '作业负责人审核打回' + when '-5' then '所在单位审核打回' + when '-6' then '验收打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '1' then f.CONFIRM_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '7' - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -620,40 +574,44 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.hoisting_ID ID, - f.NUMBERING WORK_NUMBER, - '吊装作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '待确认' - when '2' then '待审核' - when '3' then '待审批' - when '4' then '已归档' - when '5' then '已验收' - when '-2' then '确认打回' - when '-3' then '审核打回' - when '-4' then '审批打回' - when '55' then '待验收' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then f.CONSTRUCTION_JOB_MANAGER_ID - when '2' then f.WORK_UNIT_MANAGER_ID - when '3' then f.BRANCH_APPROVER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '55' then f.ACCEPTOR_ID - END NEXT_USER_ID, + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.hoisting_ID ID, + f.CHECK_NO WORK_NUMBER, + '吊装作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业指挥待审核' + when '2' then '所在单位待审核' + when '3' then '审核部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.LEADER_USER_ID + when '2' then f.CONSTRUCTION_USER_ID + when '3' then f.AUDIT_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_hoisting f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('4','5','55','-5') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.JOB_START_TIME AND f.JOB_END_TIME >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_hoisting f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -663,9 +621,9 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - ) f + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + ) f ORDER BY f.OPERATTIME DESC @@ -673,17 +631,17 @@ SELECT - 'ELECTRICITY' TYPE, - f.ELECTRICITY_ID id, - CONCAT_WS("", '临时用电作业 编号：', f.CHECK_NO) NAME, - f.WORK_LONGITUDE LONGITUDE, - f.WORK_LATITUDE LATITUDE, - './bi/images/map/electricity.png' IMAGE_FILE, + 'ELECTRICITY' TYPE, + f.ELECTRICITY_ID id, + CONCAT_WS("", '临时用电作业 编号：', f.CHECK_NO) NAME, + f.WORK_LONGITUDE LONGITUDE, + f.WORK_LATITUDE LATITUDE, + './bi/images/map/electricity.png' IMAGE_FILE, f.CORPINFO_ID, f.CHECK_NO as MAP_POINT_NAME FROM bus_electricity f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL - AND f.APPLY_STATUS NOT IN ('3','4') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + AND f.APPLY_STATUS NOT IN ('3','4') + AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') and f.CORPINFO_ID = #{CORPINFO_ID} @@ -722,7 +680,7 @@ SELECT - 'HIGHWORK' TYPE, - f.HIGHWORK_ID id, - CONCAT_WS("", '高处作业 编号：', f.CHECK_NO) NAME, - f.WORK_LONGITUDE LONGITUDE, - f.WORK_LATITUDE LATITUDE, - './bi/images/map/highwork.png' IMAGE_FILE, - f.CORPINFO_ID, - f.CHECK_NO as MAP_POINT_NAME - FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL - AND f.APPLY_STATUS NOT IN ('4','5','55','-5') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + 'HIGHWORK' TYPE, + f.HIGHWORK_ID id, + CONCAT_WS("", '高处作业 编号：', f.CHECK_NO) NAME, + f.WORK_LONGITUDE LONGITUDE, + f.WORK_LATITUDE LATITUDE, + './bi/images/map/highwork.png' IMAGE_FILE, + f.CORPINFO_ID, + f.CHECK_NO as MAP_POINT_NAME + FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + AND f.APPLY_STATUS NOT IN ('4','5','55','-5') + AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') and f.CORPINFO_ID = #{CORPINFO_ID} @@ -772,57 +730,6 @@ - - - - - - - @@ -1705,14 +1612,14 @@ STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, '0' cutroadCount, '0' blindboardCount, - count( 1 ) breakgroundCount, + count( 1 ) confinedspaceCount, '0' highworkCount, '0' hoistingCount, '0' electricityCount, '0' breakgroundCount, '0' cutroadCount FROM - bus_confinedspace + gf_confinedspace WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' @@ -1948,29 +1855,10 @@ UNION ALL SELECT - (SELECT - count(1) - FROM - bus_confinedspace f - WHERE - - f.CORPINFO_ID = #{CORPINFO_ID} - - - f.CORPINFO_ID IN - - #{item} - - - AND ( - f.APPLY_STATUS != '0' - AND date_format( now(), '%Y-%m-%d %H:%i' ) >= f.WORK_START_DATE - AND f.WORK_END_DATE >= date_format( now(), '%Y-%m-%d %H:%i' ) - OR f.APPLY_STATUS = '7' - )) COUNTAPPLY, - COUNT(case when f.APPLY_STATUS not in ('0','7') AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') then f.CONFINEDSPACE_ID end) COUNTAPPROVE, - COUNT(case when f.APPLY_STATUS = '7' then f.CONFINEDSPACE_ID end) COUNTARCHIVE - FROM bus_confinedspace f WHERE f.ISDELETE = '0' + COUNT(case when f.APPLY_STATUS != '0' then f.CONFINEDSPACE_ID end) COUNTAPPLY, + COUNT(case when f.APPLY_STATUS not in ('0','6') then f.CONFINEDSPACE_ID end) COUNTAPPROVE, + COUNT(case when f.APPLY_STATUS = '6' then f.CONFINEDSPACE_ID end) COUNTARCHIVE + FROM gf_confinedspace f WHERE f.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID} @@ -2031,47 +1919,49 @@ @@ -2420,10 +2299,10 @@ f.WORK_LONGITUDE LONGITUDE, f.WORK_LATITUDE LATITUDE, './bi/images/map/electricity.png' IMAGE_FILE, - f.CORPINFO_ID + f.CORPINFO_ID, + f.CHECK_NO as MAP_POINT_NAME FROM gf_electricity f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS != '5' - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') and f.CORPINFO_ID = #{CORPINFO_ID} @@ -2434,6 +2313,7 @@ + - + - + + + + + select - `NAME` + `NAME` from - sys_dictionaries + sys_dictionaries where - DICTIONARIES_ID in + DICTIONARIES_ID in #{item} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +