diff --git a/src/main/java/com/zcloud/controller/map/CmtMapController.java b/src/main/java/com/zcloud/controller/map/CmtMapController.java index a739ed04..d1a04577 100644 --- a/src/main/java/com/zcloud/controller/map/CmtMapController.java +++ b/src/main/java/com/zcloud/controller/map/CmtMapController.java @@ -390,6 +390,7 @@ public class CmtMapController extends BaseController { returnMap.put("varList",dataList); return returnMap; } + /** * @Description: 设备在线情况 * @Author: dearLin 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..72dc27dd 100644 --- a/src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java @@ -364,5 +364,45 @@ public interface CzksMapEightMapper { List getListDongHuo(List shuzu); PageData getAllWorkUserIds(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); } 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 3d00a62e..49fe8a4b 100644 --- a/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java @@ -287,6 +287,9 @@ public interface MapEightMapper { */ List listAllMeasuresELECTRICITYOrder(PageData pd); + + List listAllGasELECTRICTITYOrder(PageData pd); + /**盲板查询数据 * @param pd * @throws Exception @@ -363,6 +366,76 @@ public interface MapEightMapper { */ List getListDongHuo(List shuzu); - PageData getAllWorkUserIds(PageData pd); + /** + * 获取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); } 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..55433f3b 100644 --- a/src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java +++ b/src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java @@ -342,12 +342,13 @@ public class CzksMapEightServiceImpl implements CzksMapEightService { pd = mapEightMapper.findByIdHIGHWORKOrder(pd); map.put("measuresList", mapEightMapper.listAllMeasuresHIGHWORKOrder(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); diff --git a/src/main/java/com/zcloud/service/map/MapEightService.java b/src/main/java/com/zcloud/service/map/MapEightService.java index 692eabb0..079e284a 100644 --- a/src/main/java/com/zcloud/service/map/MapEightService.java +++ b/src/main/java/com/zcloud/service/map/MapEightService.java @@ -95,7 +95,5 @@ public interface MapEightService { * @return */ Map getByIdOrder(PageData pd); - - Object getAllWorkUserCards(PageData pd); } diff --git a/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java index e56718fb..981ed9fc 100644 --- a/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java +++ b/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java @@ -326,98 +326,59 @@ public class MapEightServiceImpl implements MapEightService { 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(); - String errInfo = "success"; - PageData allWorkUserIds = mapEightMapper.getAllWorkUserIds(pd); - /*String userCards = "";*/ - if (allWorkUserIds!=null){ - //临时用电 - String electricity_work_user_ids = allWorkUserIds.getString("ELECTRICITY_WORK_USER_IDS"); - //受限空间作业 - String confinedspace_work_user_ids = allWorkUserIds.getString("CONFINEDSPACE_WORK_USER_IDS"); - //高处作业 - String hiwork_work_user_ids = allWorkUserIds.getString("HIGHWORK_WORK_USER_IDS"); - //吊装作业 - String hoisting_work_user_ids = allWorkUserIds.getString("HOISTING_WORK_USER_IDS"); - //盲板作业 - String blindboard_work_user_ids = allWorkUserIds.getString("BLINDBOARD_WORK_USER_IDS"); - //拼接ids - String ids = ""; - if (Tools.notEmpty(electricity_work_user_ids)){ - ids += electricity_work_user_ids + ","; - } - if (Tools.notEmpty(confinedspace_work_user_ids)){ - ids += confinedspace_work_user_ids + ","; - } - if (Tools.notEmpty(hiwork_work_user_ids)){ - ids += hiwork_work_user_ids + ","; - } - if (Tools.notEmpty(hoisting_work_user_ids)){ - ids += hoisting_work_user_ids + ","; - } - if (Tools.notEmpty(blindboard_work_user_ids)){ - ids += blindboard_work_user_ids + ","; - } - String[] split = ids.split(","); - //查询作业人员卡号 -// List userCardsByIds = usersMapper.getUserCardsByIds(split); - /* for (String usercard : userCardsByIds){ - if (Tools.notEmpty(usercard) && !userCards.contains(usercard)){ - userCards += usercard + ","; - } - }*/ -// map.put("userCardsList", userCardsByIds); - } - map.put("result", errInfo); - return map; - } + private PageData shenpi(PageData pd,List list){ List specialUserList = new ArrayList<>(); for (PageData userPageData : list){ diff --git a/src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml b/src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml index da4aae49..5bc0d2ed 100644 --- a/src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml +++ b/src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml @@ -91,6 +91,9 @@ from f where 1=1 + + and f.FNAME LIKE CONCAT(CONCAT('%', #{pd.FNAME}),'%') + + SELECT * FROM - (SELECT - f.HOTWORKAPPLICATION_ID ID, - f.JOB_NUMBER WORK_NUMBER, + (SELECT + f.HOTWORK_ID ID, + f.CHECK_NO 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 '安全总监审批' + 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, - 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 + 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-gwj-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-gwj-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-gwj-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-gwj-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-gwj-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-gwj-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,8 +408,8 @@ #{pd.ids[${index}]} - GROUP BY f.HOTWORKAPPLICATION_ID - UNION ALL + 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 @@ -471,22 +418,29 @@ '临时用电作业' WORK_TYPE, case f.APPLY_STATUS when '0' then '待提交' - when '1' then '待确认' - when '2' then '待审批' - when '3' then '已归档' - when '4' then '已验收' - when '-1' 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.ASSURE_USER_ID - when '2' then f.APPROVE_USER_ID - when '3' then f.ACCEPT_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,6 +450,7 @@ #{pd.ids[${index}]} + ) f LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID UNION ALL @@ -506,22 +461,26 @@ f.CHECK_NO WORK_NUMBER, '盲板作业' WORK_TYPE, case f.APPLY_STATUS - when '1' then '待确认' - when '2' then '待审批' - when '3' then '已归档' - when '4' then '已打回' + 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 '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 + 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,6 +490,7 @@ #{pd.ids[${index}]} + ) f LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID UNION ALL @@ -542,28 +502,32 @@ '高处作业' 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 '待验收' + 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.AUDIT_USER_ID - when '3' then f.APPROVE_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 '55' then f.ACCEPT_USER_ID + 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,6 +537,7 @@ #{pd.ids[${index}]} + ) f LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID UNION ALL @@ -580,37 +545,26 @@ FROM (SELECT f.confinedspace_ID ID, - f.WORK_PERMIT_NUMBER WORK_NUMBER, + f.CHECK_NO 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 '管理单位责任人验收打回' + 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.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 '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} @@ -627,33 +581,37 @@ FROM (SELECT f.hoisting_ID ID, - f.NUMBERING WORK_NUMBER, + 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 '待验收' + 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 '1' then f.CONSTRUCTION_JOB_MANAGER_ID - when '2' then f.WORK_UNIT_MANAGER_ID - when '3' then f.BRANCH_APPROVER_ID + 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 '55' then f.ACCEPTOR_ID + 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} @@ -664,8 +622,8 @@ ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - ) 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,131 +730,80 @@ - - - - - - - @@ -910,14 +817,14 @@ from BUS_HOISTING_MEASURES f - left join BUS_HOISTINGTOMEASURES eo on eo.BUS_HOISTING_MEASURES_ID = f.BUS_HOISTING_MEASURES_ID + left join BUS_HOISTINGTOMEASURES eo on eo.HOISTING_MEASURES_ID = f.HOISTING_MEASURES_ID where f.ISDELETE = '0' and eo.HOISTING_ID = #{HOISTING_ID} - GROUP BY f.BUS_HOISTING_MEASURES_ID - ORDER BY f.ORDER ASC + GROUP BY f.HOISTING_MEASURES_ID + ORDER BY f.SORT ASC @@ -944,25 +851,25 @@ @@ -971,19 +878,19 @@ f.BUS_HOTWORK_MEASURES_ID, f.PROTECTIVE_MEASURES, f.QUESTION1, - f.QUESTION2, - f.QUESTION3, - f.QUESTION4, - f.ISDELETE, - f.ORDERBY, + f.QUESTION2, + f.QUESTION3, + f.QUESTION4, + f.ISDELETE, + f.ORDERBY, hwtm.ANSWER1, hwtm.ANSWER2, hwtm.ANSWER3, hwtm.ANSWER4 FROM - BUS_HOTWORK_MEASURES f - LEFT JOIN BUS_HOTWORKTOMEASURES hwtm on f.BUS_HOTWORK_MEASURES_ID = hwtm.BUS_HOTWORK_MEASURES_ID and hwtm.HOTWORKAPPLICATION_ID = #{HOTWORKAPPLICATION_ID} + BUS_HOTWORK_MEASURES f + LEFT JOIN BUS_HOTWORKTOMEASURES hwtm on f.BUS_HOTWORK_MEASURES_ID = hwtm.BUS_HOTWORK_MEASURES_ID and hwtm.HOTWORKAPPLICATION_ID = #{HOTWORKAPPLICATION_ID} WHERE f.ISDELETE = '0' oRDER BY f.ORDERBY @@ -991,89 +898,89 @@ @@ -1098,108 +1005,108 @@ @@ -1225,93 +1132,93 @@ @@ -1335,106 +1242,106 @@ @@ -1459,17 +1366,17 @@ @@ -1477,107 +1384,107 @@ @@ -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 @@ @@ -2417,14 +2296,13 @@ 'ELECTRICITY' TYPE, f.ELECTRICITY_ID id, CONCAT_WS("", '临时用电作业 编号：', f.CHECK_NO) NAME, - f.CHECK_NO as MAP_POINT_NAME, 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} @@ -2435,22 +2313,22 @@ - + + - + - + + + + + @@ -2948,124 +2838,125 @@ @@ -3091,128 +2982,128 @@ @@ -3238,127 +3129,127 @@ @@ -3382,25 +3273,493 @@ - SELECT - * - FROM - ( - ( SELECT DISTINCT GROUP_CONCAT( `WORK_USER_IDS` SEPARATOR ',' ) AS ELECTRICITY_WORK_USER_IDS FROM bus_electricity where APPLY_STATUS > 0 ) a, - ( SELECT DISTINCT GROUP_CONCAT( `PROJECT_MANAGER_IDS` SEPARATOR ',' ) AS HIGHWORK_WORK_USER_IDS FROM bus_highwork where APPLY_STATUS > 0 ) b, - ( SELECT DISTINCT GROUP_CONCAT( `WORK_USER_IDS` SEPARATOR ',' ) AS CONFINEDSPACE_WORK_USER_IDS FROM bus_confinedspace where APPLY_STATUS > 0 ) c, - ( SELECT DISTINCT GROUP_CONCAT( `WORK_USER_IDS` SEPARATOR ',' ) AS HOISTING_WORK_USER_IDS FROM bus_hoisting where APPLY_STATUS > 0 ) d, - ( SELECT DISTINCT GROUP_CONCAT( `WORK_USER_IDS` SEPARATOR ',' ) AS BLINDBOARD_WORK_USER_IDS FROM bus_blindboard where APPLY_STATUS > 0 ) e - ) + 'HOTWORK' TYPE, + f.HOTWORK_ID id, + CONCAT_WS("", '动火作业 编号：', f.CHECK_NO ) NAME, + f.WORK_LONGITUDE LONGITUDE, + f.WORK_LATITUDE LATITUDE, + './bi/images/map/hotwork.png' IMAGE_FILE, + f.CORPINFO_ID, + f.CHECK_NO, + f.CHECK_NO AS MAP_POINT_NAME + FROM bus_hotwork_cfd 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 ('-99','8','-98','-2','-4','-5','-6','-7','-8') + + and f.CORPINFO_ID = #{CORPINFO_ID} + + + AND f.CORPINFO_ID IN + + #{item} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml b/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml index 5f0a0e07..780579ea 100644 --- a/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml +++ b/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml @@ -1948,29 +1948,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 +2012,49 @@ @@ -3396,4 +3368,228 @@ ( SELECT DISTINCT GROUP_CONCAT( `WORK_USER_IDS` SEPARATOR ',' ) AS BLINDBOARD_WORK_USER_IDS FROM bus_blindboard where APPLY_STATUS > 0 ) e ) + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml b/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml index 906e4665..037857a1 100644 --- a/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml +++ b/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml @@ -228,6 +228,10 @@ `qa-cmt-prevention`.bus_fire_point f WHERE f.ISDELETE = 0 + and LONGITUDE is not null + and LATITUDE is not null + and LONGITUDE != '' + and LATITUDE != '' AND f.CORPINFO_ID = #{CORPINFO_ID}