guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

地图代码

pull/15/head
songwenxuan 2024-01-21 09:27:25 +08:00
parent a9a3026875
commit ebad7908ff
10 changed files with 2815 additions and 2179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zcloud/controller/map/CmtMapController.java
View File

@ -390,6 +390,7 @@ public class CmtMapController extends BaseController {
returnMap.put("varList",dataList);
return returnMap;
}
/**
* @Description: 设备在线情况
* @Author: dearLin

40
src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java
View File

@ -364,5 +364,45 @@ public interface CzksMapEightMapper {
List<String> getListDongHuo(List<String> shuzu);
PageData getAllWorkUserIds(PageData pd);
/**有限空间作业查询
* @param pd
* @throws Exception
*/
PageData findByIdCONFINEDSPACEOrder(PageData pd);
/**有限空间作业措施查询
* @param pd
* @throws Exception
*/
List<PageData> listAllMeasuresCONFINEDSPACEOrder(PageData pd);
/**
* 有限空间
* @param pd
* @return
*/
List<PageData> listAllCONFINEDSPACEOrder(PageData pd);
/**
* 有限空间
* @param pd
* @return
*/
List<PageData> findByIdCONFINEDSPACEAcceptuser(PageData pd);
/**
* 有限空间
* @param pd
* @return
*/
List<PageData> findByIdCONFINEDSPACEAcceptusers(PageData pd);
/**
* 有限空间气体检测
* @param pd
* @return
*/
PageData findByIdCONFINEDSPACEGasWH(PageData pd);
}

75
src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java
View File

@ -287,6 +287,9 @@ public interface MapEightMapper {
*/
List<PageData> listAllMeasuresELECTRICITYOrder(PageData pd);
List<PageData> listAllGasELECTRICTITYOrder(PageData pd);
/**盲板查询数据
* @param pd
* @throws Exception
@ -363,6 +366,76 @@ public interface MapEightMapper {
*/
List<String> getListDongHuo(List<String> shuzu);
PageData getAllWorkUserIds(PageData pd);
/**
* 获取cfd动火作业高危作业坐标统计
* @param pd
* @return
*/
List<PageData> getHOTWORKHighRiskWorkLocationCfd(PageData pd);
List<PageData> findByELECTRICTITYAcceptuserId(PageData pd);
List<PageData> findByELECTRICTITYAcceptuserIds(PageData pd);
List<PageData> findByBLINDBOARDAcceptuserId(PageData pd);
List<PageData> findByBLINDBOARDAcceptuserIds(PageData pd);
List<PageData> findByCUTROADAcceptuserId(PageData pd);
List<PageData> findByCUTROADAcceptuserIds(PageData pd);
List<PageData> findByBREAKGROUNDAcceptuserId(PageData pd);
List<PageData> findByBREAKGROUNDAcceptuserIds(PageData pd);
List<PageData> findByHIGHWORKAcceptuserId(PageData pd);
List<PageData> findByHIGHWORKAcceptuserIds(PageData pd);
List<PageData> findByHOISTINGAcceptuserId(PageData pd);
List<PageData> findByHOISTINGAcceptuserIds(PageData pd);
/**有限空间作业查询
* @param pd
* @throws Exception
*/
PageData findByIdCONFINEDSPACEOrder(PageData pd);
/**有限空间作业措施查询
* @param pd
* @throws Exception
*/
List<PageData> listAllMeasuresCONFINEDSPACEOrder(PageData pd);
/**
* 有限空间
* @param pd
* @return
*/
List<PageData> listAllCONFINEDSPACEOrder(PageData pd);
/**
* 有限空间
* @param pd
* @return
*/
List<PageData> findByIdCONFINEDSPACEAcceptuser(PageData pd);
/**
* 有限空间
* @param pd
* @return
*/
List<PageData> findByIdCONFINEDSPACEAcceptusers(PageData pd);
/**
* 有限空间气体检测
* @param pd
* @return
*/
PageData findByIdCONFINEDSPACEGasWH(PageData pd);
}

13
src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java
View File

@ -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);

2
src/main/java/com/zcloud/service/map/MapEightService.java
View File

@ -95,7 +95,5 @@ public interface MapEightService {
* @return
*/
Map<String, Object> getByIdOrder(PageData pd);
Object getAllWorkUserCards(PageData pd);
}

83
src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java
View File

@ -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<PageData> 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<String,Object> map = new HashMap<String,Object>();
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<String> 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<PageData> list){
List<PageData> specialUserList = new ArrayList<>();
for (PageData userPageData : list){

3
src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml
View File

@ -91,6 +91,9 @@
from
<include refid="tableName"></include> f
where 1=1
<if test="pd.FNAME != null and pd.FNAME != ''"><!-- 关键词检索 -->
and f.FNAME LIKE CONCAT(CONCAT('%', #{pd.FNAME}),'%')
</if>
</select>
<select id="getDetailById" parameterType="pd" resultType="pd">

3915
src/main/resources/mybatis/datasource/bus/MapEightMapper.xml
View File

File diff suppressed because it is too large Load Diff

858
src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml
View File

@ -1948,29 +1948,10 @@
</if>
UNION ALL
SELECT
(SELECT
count(1)
FROM
bus_confinedspace f
WHERE
<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
f.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="ids!= null and ids.size()>0">
f.CORPINFO_ID IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
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'
<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
and f.CORPINFO_ID = #{CORPINFO_ID}
</if>
@ -2031,47 +2012,49 @@
<select id="realTimeHighRiskWorklistPageOrder" parameterType="page" resultType="pd">
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-cmt-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.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,
IF(f.STATE = 10,IFNULL(od.`NAME`,IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))),IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))) USER_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 oa_department od ON od.DEPARTMENT_ID = hu.USER_ID
LEFT JOIN `qa-gwj-regulatory`.sys_user qu on qu.USER_ID = hu.USER_ID
WHERE f.ISDELETE = '0' AND f.STATE >= 0 and f.STATE != 11
<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
@ -2082,165 +2065,118 @@
</foreach>
</if>
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 '-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 gf_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '5'
<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.ids!= null and pd.ids.size()>0">
AND f.CORPINFO_ID IN
<foreach item="item" index="index" collection="pd.ids" open="(" separator="," close=")">
#{pd.ids[${index}]}
</foreach>
</if>
) 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 gf_blindboard f
WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6'
<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.ids!= null and pd.ids.size()>0">
AND f.CORPINFO_ID IN
<foreach item="item" index="index" collection="pd.ids" open="(" separator="," close=")">
#{pd.ids[${index}]}
</foreach>
</if>
) 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 gf_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6'
<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.ids!= null and pd.ids.size()>0">
AND f.CORPINFO_ID IN
<foreach item="item" index="index" collection="pd.ids" open="(" separator="," close=")">
#{pd.ids[${index}]}
</foreach>
</if>
) f
LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID
UNION ALL
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.confinedspace_ID ID,
f.WORK_PERMIT_NUMBER WORK_NUMBER,
'有限空间作业' WORK_TYPE,
f.electricity_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 '管理单位责任人审批'
when '5' then '作业单位责任人验收'
when '6' then '管理单位责任人验收'
when '-2' then '作业单位责任人确认打回'
when '-3' then '作业现场责任人审核打回'
when '-4' then '管理单位责任人审批打回'
when '-5' then '作业单位责任人验收打回'
when '-6' then '管理单位责任人验收打回'
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 '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 '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 gf_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '5'
<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.ids!= null and pd.ids.size()>0">
AND f.CORPINFO_ID IN
<foreach item="item" index="index" collection="pd.ids" open="(" separator="," close=")">
#{pd.ids[${index}]}
</foreach>
</if>
) 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 gf_blindboard f
WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6'
<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.ids!= null and pd.ids.size()>0">
AND f.CORPINFO_ID IN
<foreach item="item" index="index" collection="pd.ids" open="(" separator="," close=")">
#{pd.ids[${index}]}
</foreach>
</if>
) 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
@ -2248,8 +2184,44 @@
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_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6'
<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.ids!= null and pd.ids.size()>0">
AND f.CORPINFO_ID IN
<foreach item="item" index="index" collection="pd.ids" open="(" separator="," close=")">
#{pd.ids[${index}]}
</foreach>
</if>
) 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 gf_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6'
<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
@ -2261,42 +2233,42 @@
</if>
) 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,
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 gf_hoisting f
WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6'
FROM gf_hoisting f
WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6'
<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
@ -2307,45 +2279,45 @@
</foreach>
</if>
) 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
UNION ALL
SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME
FROM
(SELECT
f.BREAKGROUND_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.PRODUCTION_USER_ID
when '3' then f.SAFETY_USER_ID
when '4' then f.LEADER_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,
UNION ALL
SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME
FROM
(SELECT
f.BREAKGROUND_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.PRODUCTION_USER_ID
when '3' then f.SAFETY_USER_ID
when '4' then f.LEADER_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 gf_breakground f
WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6'
FROM gf_breakground f
WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6'
<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
@ -2356,45 +2328,45 @@
</foreach>
</if>
) 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
UNION ALL
SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME
FROM
(SELECT
f.CUTROAD_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.PRODUCTION_USER_ID
when '3' then f.SAFETY_USER_ID
when '4' then f.LEADER_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,
UNION ALL
SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME
FROM
(SELECT
f.CUTROAD_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.PRODUCTION_USER_ID
when '3' then f.SAFETY_USER_ID
when '4' then f.LEADER_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 gf_cutroad f
WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6'
FROM gf_cutroad f
WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6'
<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
@ -2405,9 +2377,9 @@
</foreach>
</if>
) 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
</select>
@ -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
)
</select>
<select id="findByIdCONFINEDSPACEOrder" parameterType="pd" resultType="pd">
select
f.CORPINFO_ID,
f.ISDELETE,
f.CREATTIME,
f.CREATOR,
f.OPERATTIME,
f.OPERATOR,
f.CHECK_NO,
f.WORK_CONTENT,
replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE,
replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE,
f.CONFIRM_DEPARTMENT_ID,
f.CONFIRM_USER_ID,
f.CONFIRM_USER_SIGNER_PATH,
f.CONFIRM_USER_SIGNER_TIME,
f.AUDIT_DEPARTMENT_ID,
f.AUDIT_USER_ID,
f.AUDIT_USER_SIGNER_PATH,
f.AUDIT_USER_SIGNER_TIME,
f.APPROVE_DEPARTMENT_ID,
f.APPROVE_USER_ID,
f.APPROVE_USER_SIGNER_PATH,
f.APPROVE_USER_SIGNER_TIME,
f.APPLY_STATUS,
IFNULL(f.CONFIRM_CONTENT,'无') as CONFIRM_CONTENT,
IFNULL(f.AUDIT_CONTENT,'无') as AUDIT_CONTENT,
IFNULL(f.APPROVE_CONTENT,'无') as APPROVE_CONTENT,
f.OTHER_PROTECTIVE_MEASURES,
f.ACCEPT_DEPARTMENT_ID,
f.ACCEPT_USER_ID,
f.ACCEPT_USER_SIGNER_PATH,
f.ACCEPT_USER_SIGNER_TIME,
IFNULL(f.ACCEPT_CONTENT,'无') as ACCEPT_CONTENT,
f.APPLY_DEPARTMENT_ID,
f.APPLY_USER_ID,
f.BELONG_CORP,
f.LIMITSPACE_ID,
f.WORK_USER,
IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK,
f.RISK_IDENTIFICATION,
f.MEDIUM_NAME,
f.EDUCATE_USER,
f.ANALYZE_DEPARTMENT_ID,
f.ANALYZE_USER_ID,
f.GUARDIAN_DEPARTMENT_ID,
f.GUARDIAN_USER_ID,
f.GUARDIAN_USER_SIGNER_PATH,
f.GUARDIAN_USER_SIGNER_TIME,
IFNULL(f.GUARDIAN_CONTENT,'无') as GUARDIAN_CONTENT,
f.CONFESS_USER,
f.ACCEPT_CONFESS_USER,
f.GUARDIAN_USER,
f.CONFINEDSPACE_ID,
f.CONFESS_DEPARTMENT_ID,
f.CONFESS_USER_ID,
f.CONFESS_USER_SIGNER_PATH,
f.CONFESS_USER_SIGNER_TIME,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
f.ACCEPT_CONFESS_USER_SIGNER_PATH,
f.ACCEPT_CONFESS_USER_SIGNER_TIME,
f.WORK_LATITUDE,
f.WORK_LONGITUDE,
(SELECT replace(a.ANALYZE_TIME,'-','/') from GF_CONFINEDSPACEGAS a where a.ISDELETE = '0'
AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID
ORDER BY
a.ANALYZE_TIME DESC LIMIT 1) as ANALYZE_TIME,
sp.NAME as LIMITSPACE_NAME,
ad.NAME as APPLY_DEPARTMENT_NAME,
au.NAME as APPLY_USER_NAME,
cd.NAME as CONFIRM_DEPARTMENT_NAME,
cu.NAME as CONFIRM_USER_NAME,
gd.NAME as GUARDIAN_DEPARTMENT_NAME,
gu.NAME as GUARDIAN_USER_NAME,
aud.NAME as AUDIT_DEPARTMENT_NAME,
auu.NAME as AUDIT_USER_NAME,
apd.NAME as APPROVE_DEPARTMENT_NAME,
apu.NAME as APPROVE_USER_NAME,
acd.NAME as ACCEPT_DEPARTMENT_NAME,
acu.NAME as ACCEPT_USER_NAME,
anad.NAME as ANALYZE_DEPARTMENT_NAME,
anau.NAME as ANALYZE_USER_NAME,
ac.NAME as CONFESS_DEPARTMENT_NAME,
accu.NAME as CONFESS_USER_NAME,
aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
aacu.NAME as ACCEPT_CONFESS_USER_NAME
from
GF_CONFINEDSPACE f
left join GF_confinedspacegaswh b on b.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID
left join GF_LIMITSPACE sp on sp.LIMITSPACE_ID=f.LIMITSPACE_ID
left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
left join SYS_USER au on au.USER_ID = f.APPLY_USER_ID
left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONFIRM_DEPARTMENT_ID
left join SYS_USER cu on cu.USER_ID = f.CONFIRM_USER_ID
left join OA_DEPARTMENT gd on gd.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
left join SYS_USER gu on gu.USER_ID = f.GUARDIAN_USER_ID
left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID
left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID
where
f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
</select>
<select id="listAllMeasuresCONFINEDSPACEOrder" parameterType="pd" resultType="pd">
select
f.*
,eo.CONFIRM_NAME as CONFIRM_NAME
,eo.STATUS,eo.ANSWER1,eo.ANSWER2,eo.ANSWER3
from
GF_CONFINEDSPACE_MEASURES f
left join GF_CONFINEDSPACETOMEASURES eo on eo.BUS_CONFINEDSPACE_MEASURES_ID = f.BUS_CONFINEDSPACE_MEASURES_ID
where f.ISDELETE = '0'
and eo.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
ORDER BY f.ORDER
</select>
<select id="listAllCONFINEDSPACEOrder" parameterType="pd" resultType="pd">
select
f.CONFINEDSPACE_ID,
f.ANALYZE_TIME,
f.ANALYZE_PLACE,
f.ANALYZE_USER,
f.HARMFUL_MATERIALS,
f.COMBUSTIBLE_GAS,
f.OXYGEN_CONTENT,
f.ISDELETE,
f.DATA1,
f.DATA2,
f.DATA3,
f.DATA4,
f.CONFINEDSPACEGAS_ID
from
GF_CONFINEDSPACEGAS f
where f.ISDELETE = '0' and f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
ORDER BY f.ANALYZE_TIME desc
</select>
<!-- 通过ID获取数据 -->
<select id="findByIdCONFINEDSPACEAcceptuser" parameterType="pd" resultType="pd">
select
f.ACCEPT_CONFESS_ID,
f.CONFINEDSPACE_ID,
f.CORPINFO_ID,
f.ISDELETE,
f.OPERATTIME,
f.OPERATOR,
f.ACCEPT_USER_ID,
f.ACCEPT_USER_SIGNER_PATH,
f.ACCEPT_USER_SIGNER_TIME,
f.ACCEPT_DEPARTMENT_ID
from
GF_CONFINEDSPACE_ACCEPTUSER f
where
f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_USER_ID = #{ACCEPT_USER_ID}
order by f.ACCEPT_USER_SIGNER_TIME ASC
</select>
<select id="findByIdCONFINEDSPACEAcceptusers" parameterType="pd" resultType="pd">
select
f.ACCEPT_CONFESS_ID,
f.CONFINEDSPACE_ID,
f.CORPINFO_ID,
f.ISDELETE,
f.OPERATTIME,
f.OPERATOR,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
f.ACCEPT_CONFESS_USER_SIGNER_PATH,
f.ACCEPT_CONFESS_USER_SIGNER_TIME
from
GF_CONFINEDSPACE_ACCEPTUSER f
where
f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}
order by f.ACCEPT_CONFESS_USER_SIGNER_TIME ASC
</select>
<!-- 通过ID获取气体检测数据 -->
<select id="findByIdCONFINEDSPACEGasWH" parameterType="pd" resultType="pd">
select
f.CONFINEDSPACE_ID,
f.GAS_NAME1,
f.GAS_STANDARD1,
f.GAS_NAME2,
f.GAS_STANDARD2,
f.GAS_NAME3,
f.GAS_STANDARD3,
f.GAS_NAME4,
f.GAS_STANDARD4,
f.CONFINEDSPACEGASWH_ID,
f.OPERATTIME
from
GF_CONFINEDSPACEGASWH f
where
f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
</select>
</mapper>

4
src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml
View File

@ -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 != ''
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
AND f.CORPINFO_ID = #{CORPINFO_ID}
</if>