forked from integrated_whb/integrated_whb
Merge remote-tracking branch 'origin/dev' into dev
commit
ece06080fc
File diff suppressed because it is too large
Load Diff
|
@ -456,8 +456,8 @@ public class HiddenController extends BaseController {
|
|||
PageData checkUser = new PageData();
|
||||
checkUser.put("HIDDENCHECK_ID", this.get32UUID()); // 主键
|
||||
checkUser.put("HIDDEN_ID", pd.get("HIDDEN_ID"));
|
||||
checkUser.put("DEPARTMENT_ID", pd.get("CHECKDEPT"));
|
||||
checkUser.put("USER_ID", pd.get("CHECKOR"));
|
||||
checkUser.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID());
|
||||
checkUser.put("USER_ID", Jurisdiction.getUSER_ID());
|
||||
checkUser.put("STATUS", "0");
|
||||
hiddenCheckService.save(checkUser);
|
||||
if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) {
|
||||
|
@ -924,6 +924,8 @@ public class HiddenController extends BaseController {
|
|||
List<PageData> hImgs = imgFilesService.listAll(pd2);// 隐患图片
|
||||
pd2.put("TYPE", 4);
|
||||
List<PageData> rImgs = imgFilesService.listAll(pd2);// 整改图片
|
||||
pd2.put("TYPE", 50);
|
||||
List<PageData> yImgs = imgFilesService.listAll(pd2);// 整改图片
|
||||
/*
|
||||
* pd2.put("TYPE",5); List<PageData> cImgs = imgFilesService.listAll(pd2);//验收图片
|
||||
*/ // 查询整改方案
|
||||
|
@ -958,6 +960,7 @@ public class HiddenController extends BaseController {
|
|||
map.put("hs", hs);
|
||||
map.put("hImgs", hImgs);
|
||||
map.put("rImgs", rImgs);
|
||||
map.put("yImgs", yImgs);
|
||||
// map.put("cImgs", cImgs);
|
||||
map.put("sImgs", sImgs);
|
||||
map.put("pImgs", pImgs);
|
||||
|
|
|
@ -509,4 +509,29 @@ public class PositAlarmController extends BaseController {
|
|||
}
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/alarmRecordgoEdit")
|
||||
@ResponseBody
|
||||
public ReturnMap alarmRecordgoEdit(Page page) throws Exception {
|
||||
PageData pageData = this.getPageData();
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
JSONObject body = PLSUtil.GeneralList("/old/gatherAlarms/regAlarmGatherInfoList", pageData);
|
||||
if (body != null) {
|
||||
returnMap.putAll(body);
|
||||
page.setTotalResult(body.getIntValue("total"));
|
||||
returnMap.put("page", page);
|
||||
}
|
||||
return returnMap;
|
||||
}
|
||||
@RequestMapping(value = "/getAlarmGatherPsnInfo")
|
||||
@ResponseBody
|
||||
public ReturnMap getAlarmGatherPsnInfo() throws Exception {
|
||||
PageData pageData = this.getPageData();
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
JSONObject body = PLSUtil.GeneralGetById("/old/gatherAlarms/getAlarmGatherPsnInfo", pageData.getString("id"),Jurisdiction.getCORPINFO_ID());
|
||||
if (body != null) {
|
||||
returnMap.putAll(body);
|
||||
}
|
||||
return returnMap;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -121,6 +121,8 @@ public class NodeApp {
|
|||
buffer.append("\n");
|
||||
if (StringUtils.isNotBlank(inspector.getString("INSPECTION_USER_SIGN_TIME"))){
|
||||
buffer.append(inspector.getString("INSPECTION_USER_NAME"));
|
||||
buffer.append("\n");
|
||||
buffer.append(inspector.getString("INSPECTION_USER_SIGN_TIME"));
|
||||
// buffer.append("(");
|
||||
// buffer.append(")");
|
||||
}else {
|
||||
|
@ -132,11 +134,11 @@ public class NodeApp {
|
|||
this.title = buffer.toString();
|
||||
|
||||
buffer.setLength(0);
|
||||
for (PageData inspector : inspectors) {
|
||||
if (StringUtils.isNotBlank(inspector.getString("INSPECTION_USER_SIGN_TIME"))){
|
||||
buffer.append(inspector.getString("INSPECTION_USER_SIGN_TIME"));
|
||||
}
|
||||
}
|
||||
// for (PageData inspector : inspectors) {
|
||||
// if (StringUtils.isNotBlank(inspector.getString("INSPECTION_USER_SIGN_TIME"))){
|
||||
// buffer.append(inspector.getString("INSPECTION_USER_SIGN_TIME"));
|
||||
// }
|
||||
// }
|
||||
|
||||
if (buffer.length() > 0) {
|
||||
this.desc = buffer.toString();
|
||||
|
|
|
@ -433,6 +433,9 @@
|
|||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>,
|
||||
f.FINAL_CHECK,
|
||||
f.FINAL_CHECKTIME,
|
||||
f.FINAL_CHECKDESCR,
|
||||
f.POSITIONDESC,
|
||||
cr.NAME CREATORNAME,
|
||||
re.NAME RECTIFICATIONORNAME,
|
||||
|
@ -451,6 +454,7 @@
|
|||
hregion.HIDDENREGION as hregionName,
|
||||
od.DEPARTMENT_ID as confirmDept,
|
||||
fc.NAME FINAL_CHECKOR_NAME,
|
||||
fcd.NAME FINAL_CHECKOR_NDEPTNAME,
|
||||
isa.INSPECTION_ASSESS_ID,
|
||||
siu.NAME as acceptName,
|
||||
isa.ASSESS_SCORE,
|
||||
|
@ -473,6 +477,7 @@
|
|||
left join sys_user su on su.USER_ID = f.CONFIRM_USER
|
||||
left join oa_department od on od.DEPARTMENT_ID = su.DEPARTMENT_ID
|
||||
LEFT JOIN sys_user fc ON fc.USER_ID = f.FINAL_CHECKOR
|
||||
left join oa_department fcd on fcd.DEPARTMENT_ID = fc.DEPARTMENT_ID
|
||||
LEFT JOIN sys_user siu ON siu.USER_ID = f.CHECKOR
|
||||
LEFT JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL_ASSESS isa ON isa.HIDDEN_ID = f.HIDDEN_ID and isa.ISDELETE = '0'
|
||||
where
|
||||
|
@ -3852,7 +3857,7 @@
|
|||
<!-- 根据用户ID获取待验收隐患(app首页) -->
|
||||
<select id="getRiskStandardCountByCheckorId" parameterType="pd" resultType="pd">
|
||||
SELECT
|
||||
f.CREATOR,f.STATE,f.CREATOR
|
||||
f.CREATOR,f.STATE,f.HIDDEN_ID,'H' as TYPE
|
||||
FROM
|
||||
BUS_HIDDEN f
|
||||
WHERE f.ISDELETE = '0' and f.STATE != '0'
|
||||
|
@ -3866,7 +3871,7 @@
|
|||
union all
|
||||
|
||||
SELECT
|
||||
f.CREATOR,f.STATE,f.CREATOR
|
||||
f.CREATOR,f.STATE,f.HIDDEN_ID,'D' as TYPE
|
||||
FROM
|
||||
BUS_HIDDENDANGERCHECKSTANDARD_HIDDEN f
|
||||
WHERE f.ISDELETE = '0' and f.STATE != '0'
|
||||
|
@ -4170,9 +4175,12 @@
|
|||
<if test="pd.ENDTIME != null and pd.ENDTIME != ''">
|
||||
and f.CREATTIME <= #{pd.ENDTIME}
|
||||
</if>
|
||||
<if test="pd.STATE != null and pd.STATE !='' and pd.STATE != 0 and pd.STATE != 99" >
|
||||
<if test="pd.STATE != null and pd.STATE !='' and pd.STATE != 0 and pd.STATE != 99 and pd.STATE != 100" >
|
||||
and f.STATE = #{pd.STATE}
|
||||
</if>
|
||||
<if test="pd.STATE != null and pd.STATE !='' and pd.STATE == 100" >
|
||||
and f.STATE != '100'
|
||||
</if>
|
||||
<if test="pd.STATE != null and pd.STATE !='' and pd.STATE == 99" > <!-- BI页面未整改点进来之后 状态搜索框不搜索数据 数据显示未整改和已过期状态-->
|
||||
and f.STATE in ('1','-1')
|
||||
</if>
|
||||
|
@ -4360,7 +4368,7 @@
|
|||
</choose>
|
||||
</otherwise>
|
||||
</choose>
|
||||
<if test="pd.STATE != null and pd.STATE != '' and pd.STATE != 99"><!-- 关键词检索 -->
|
||||
<if test="pd.STATE != null and pd.STATE != '' and pd.STATE != 99 and pd.STATE != 100"><!-- 关键词检索 -->
|
||||
and
|
||||
f.STATE = #{pd.STATE}
|
||||
</if>
|
||||
|
|
|
@ -0,0 +1,652 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zcloud.mapper.datasource.hiddenApi.HiddenApiMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_HIDDEN
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.SOURCE,
|
||||
f.RISK_UNIT,
|
||||
f.IDENTIFICATION,
|
||||
f.RISK_DESCR,
|
||||
f.RISK_POSITION,
|
||||
f.LEVEL,
|
||||
f.CHECK_CONTENT,
|
||||
f.HIDDENDESCR,
|
||||
f.HIDDENPART,
|
||||
f.CREATOR,
|
||||
f.CREATTIME,
|
||||
f.RECTIFYDESCR,
|
||||
f.RECTIFICATIONTYPE,
|
||||
f.RECTIFICATIONOR,
|
||||
f.RECTIFICATIONTIME,
|
||||
f.HIDDENLEVEL,
|
||||
f.STATE,
|
||||
f.CHECKDEPT,
|
||||
f.CHECKOR,
|
||||
f.CHECKTIME,
|
||||
f.CHECKDESCR,
|
||||
f.ISQUALIFIED,
|
||||
f.ISDELETE,
|
||||
f.CORPINFO_ID,
|
||||
f.HIDDENFINDDEPT,
|
||||
f.RECTIFICATIONDEADLINE,
|
||||
f.RECTIFICATIONDEPT,
|
||||
f.HIDDEN_ID,
|
||||
f.CHECKRECORD_ID,
|
||||
f.RECORDITEM_ID,
|
||||
f.RISKITEM_ID,
|
||||
f.REVIEWOR,
|
||||
f.REVIEWTIME,
|
||||
f.REVIEWDEPT,
|
||||
f.LONGITUDE,
|
||||
f.LATITUDE,
|
||||
f.HAVESCHEME,
|
||||
f.HIDDENTYPE,
|
||||
f.ISCONFIRM,
|
||||
f.CONFIRM_USER,
|
||||
f.DISCOVERYTIME,
|
||||
f.CONFIRM_TIME,
|
||||
f.HIDDENTYPE2,
|
||||
f.INVESTMENT_FUNDS,
|
||||
f.LISTMANAGER_ID,
|
||||
f.FOREIGN_ID,
|
||||
f.FINAL_CHECK,
|
||||
f.FINAL_CHECKOR,
|
||||
f.FINAL_CHECKTIME,
|
||||
f.FINAL_CHECKDESCR,
|
||||
f.POSITIONDESC,
|
||||
f.ISRELEVANT
|
||||
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
SOURCE,
|
||||
RISK_UNIT,
|
||||
IDENTIFICATION,
|
||||
RISK_DESCR,
|
||||
RISK_POSITION,
|
||||
LEVEL,
|
||||
CHECK_CONTENT,
|
||||
HIDDENDESCR,
|
||||
HIDDENPART,
|
||||
CREATOR,
|
||||
CREATTIME,
|
||||
RECTIFYDESCR,
|
||||
RECTIFICATIONTYPE,
|
||||
RECTIFICATIONOR,
|
||||
RECTIFICATIONTIME,
|
||||
HIDDENLEVEL,
|
||||
STATE,
|
||||
CHECKDEPT,
|
||||
CHECKOR,
|
||||
CHECKTIME,
|
||||
CHECKDESCR,
|
||||
ISQUALIFIED,
|
||||
ISDELETE,
|
||||
CORPINFO_ID,
|
||||
HIDDENFINDDEPT,
|
||||
RECTIFICATIONDEADLINE,
|
||||
RECTIFICATIONDEPT,
|
||||
HIDDEN_ID,
|
||||
CHECKRECORD_ID,
|
||||
RECORDITEM_ID,
|
||||
RISKITEM_ID,
|
||||
REVIEWOR,
|
||||
REVIEWTIME,
|
||||
REVIEWDEPT,
|
||||
LONGITUDE,
|
||||
LATITUDE,
|
||||
HAVESCHEME,
|
||||
HIDDENTYPE,
|
||||
ISCONFIRM,
|
||||
CONFIRM_USER,
|
||||
DISCOVERYTIME,
|
||||
HIDDENTYPE2,
|
||||
INVESTMENT_FUNDS,
|
||||
LISTMANAGER_ID,
|
||||
FOREIGN_ID,
|
||||
FINAL_CHECK,
|
||||
FINAL_CHECKOR,
|
||||
FINAL_CHECKTIME,
|
||||
FINAL_CHECKDESCR,
|
||||
POSITIONDESC,
|
||||
ISRELEVANT
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{SOURCE},
|
||||
#{RISK_UNIT},
|
||||
#{IDENTIFICATION},
|
||||
#{RISK_DESCR},
|
||||
#{RISK_POSITION},
|
||||
#{LEVEL},
|
||||
#{CHECK_CONTENT},
|
||||
#{HIDDENDESCR},
|
||||
#{HIDDENPART},
|
||||
#{CREATOR},
|
||||
#{CREATTIME},
|
||||
#{RECTIFYDESCR},
|
||||
#{RECTIFICATIONTYPE},
|
||||
#{RECTIFICATIONOR},
|
||||
#{RECTIFICATIONTIME},
|
||||
#{HIDDENLEVEL},
|
||||
#{STATE},
|
||||
#{CHECKDEPT},
|
||||
#{CHECKOR},
|
||||
#{CHECKTIME},
|
||||
#{CHECKDESCR},
|
||||
#{ISQUALIFIED},
|
||||
#{ISDELETE},
|
||||
#{CORPINFO_ID},
|
||||
#{HIDDENFINDDEPT},
|
||||
#{RECTIFICATIONDEADLINE},
|
||||
#{RECTIFICATIONDEPT},
|
||||
#{HIDDEN_ID},
|
||||
#{CHECKRECORD_ID},
|
||||
#{RECORDITEM_ID},
|
||||
#{RISKITEM_ID},
|
||||
#{REVIEWOR},
|
||||
#{REVIEWTIME},
|
||||
#{REVIEWDEPT},
|
||||
#{LONGITUDE},
|
||||
#{LATITUDE},
|
||||
#{HAVESCHEME},
|
||||
#{HIDDENTYPE},
|
||||
#{ISCONFIRM},
|
||||
#{CONFIRM_USER},
|
||||
#{DISCOVERYTIME},
|
||||
getHiddenType(#{HIDDENTYPE}),
|
||||
#{INVESTMENT_FUNDS},
|
||||
#{LISTMANAGER_ID},
|
||||
#{FOREIGN_ID},
|
||||
#{FINAL_CHECK},
|
||||
#{FINAL_CHECKOR},
|
||||
#{FINAL_CHECKTIME},
|
||||
#{FINAL_CHECKDESCR},
|
||||
#{POSITIONDESC},
|
||||
#{ISRELEVANT}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="String">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
HIDDEN_ID = #{HIDDEN_ID}
|
||||
</delete>
|
||||
<!-- 修改 -->
|
||||
<update id="confirmHidden" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
STATE = #{STATE},
|
||||
CONFIRM_USER = #{CONFIRM_USER},
|
||||
CONFIRM_TIME = #{CONFIRM_TIME},
|
||||
RECTIFICATIONDEPT = #{RECTIFICATIONDEPT},
|
||||
RECTIFICATIONOR = #{RECTIFICATIONOR},
|
||||
RECTIFICATIONDEADLINE = #{RECTIFICATIONDEADLINE},
|
||||
HIDDENLEVEL = #{HIDDENLEVEL}
|
||||
where
|
||||
HIDDEN_ID = #{HIDDEN_ID}
|
||||
</update>
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>,
|
||||
cr.NAME CREATORNAME,
|
||||
re.NAME RECTIFICATIONORNAME,
|
||||
ch.NAME CHECKORNAME,
|
||||
crd.NAME HIDDENFINDDEPTNAME,
|
||||
red.NAME RECTIFICATIONDEPTNAME,
|
||||
chd.NAME CHECKDEPTNAME,
|
||||
lv.NAME HIDDENLEVELNAME,
|
||||
bc.LIST_NAME,
|
||||
lv.NAME HIDDENLEVELNAME,
|
||||
ht.NAME HIDDENTYPENAME,
|
||||
hiddenType2.NAME HIDDENTYPENAME2,
|
||||
conUser.NAME as conUserName,
|
||||
hregion.HIDDENREGION as hregionName,
|
||||
hregionDept.NAME as hregionDeptName,
|
||||
hregion.HIDDENREGION as hregionName,
|
||||
od.DEPARTMENT_ID as confirmDept,
|
||||
fc.NAME FINAL_CHECKOR_NAME,
|
||||
isa.INSPECTION_ASSESS_ID,
|
||||
siu.NAME as acceptName,
|
||||
isa.ASSESS_SCORE,
|
||||
isa.ASSESS_PENALTY_AMOUNT
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join vi_user_all cr on cr.USER_ID = f.CREATOR
|
||||
left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
|
||||
left join sys_user ch on ch.USER_ID = f.CHECKOR
|
||||
left join sys_user conUser on conUser.USER_ID = f.CONFIRM_USER
|
||||
left join vi_department_all crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
|
||||
left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT
|
||||
left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT
|
||||
left join bus_checkrecord bc on bc.CHECKRECORD_ID = f.CHECKRECORD_ID and bc.ISDELETE = 0
|
||||
left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
|
||||
left join <include refid="dicTableName"></include> ht on f.HIDDENTYPE = ht.BIANMA
|
||||
left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 = hiddenType2.BIANMA <!-- 隐患类型-->
|
||||
left join bus_hiddenregion hregion on hregion.HIDDENREGION_ID = f.HIDDENPART
|
||||
left join oa_department hregionDept on hregionDept.DEPARTMENT_ID = conUser.DEPARTMENT_ID
|
||||
left join sys_user su on su.USER_ID = f.CONFIRM_USER
|
||||
left join oa_department od on od.DEPARTMENT_ID = su.DEPARTMENT_ID
|
||||
LEFT JOIN vi_user_all fc ON fc.USER_ID = f.FINAL_CHECKOR
|
||||
LEFT JOIN vi_user_all siu ON siu.USER_ID = f.CHECKOR
|
||||
LEFT JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL_ASSESS isa ON isa.HIDDEN_ID = f.HIDDEN_ID and isa.ISDELETE = '0'
|
||||
where
|
||||
f.HIDDEN_ID = #{HIDDEN_ID}
|
||||
</select>
|
||||
<!-- 整改 -->
|
||||
<update id="rectify" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
RECTIFYDESCR = #{RECTIFYDESCR},
|
||||
RECTIFICATIONTIME = #{RECTIFICATIONTIME},
|
||||
HAVESCHEME = #{HAVESCHEME},
|
||||
INVESTMENT_FUNDS = #{INVESTMENT_FUNDS},
|
||||
STATE = #{STATE},
|
||||
ISEXPIREREPAIR = #{ISEXPIREREPAIR}
|
||||
where
|
||||
HIDDEN_ID = #{HIDDEN_ID}
|
||||
</update>
|
||||
<!-- 验收 -->
|
||||
<update id="check" parameterType="String">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
CHECKTIME = #{CHECKTIME},
|
||||
STATE = '4'
|
||||
where
|
||||
HIDDEN_ID = #{HIDDEN_ID}
|
||||
</update>
|
||||
<!-- 验收打回 -->
|
||||
<update id="repulseCheck" parameterType="String">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
STATE = '1'
|
||||
where
|
||||
HIDDEN_ID = #{HIDDEN_ID}
|
||||
</update>
|
||||
<insert id="saveForEmis" parameterType="pd">
|
||||
INSERT INTO bus_hidden_emis(
|
||||
HIDDEN_ID,SOURCE,RISK_UNIT,IDENTIFICATION,RISK_DESCR,RISK_POSITION,LEVEL,CHECK_CONTENT,HIDDENDESCR,HIDDENPART,CREATOR,
|
||||
CREATTIME,RECTIFYDESCR,RECTIFICATIONTYPE,RECTIFICATIONDEPT,RECTIFICATIONOR,RECTIFICATIONDEADLINE,
|
||||
RECTIFICATIONTIME,HIDDENLEVEL,STATE,CHECKDEPT,CHECKOR,CHECKTIME,CHECKDESCR,ISQUALIFIED,ISDELETE,CORPINFO_ID,
|
||||
HIDDENFINDDEPT,CHECKRECORD_ID,RECORDITEM_ID,RISKITEM_ID,REJECTREASON,REVIEWOR,REVIEWTIME,REVIEWDEPT,HAVESCHEME,
|
||||
LONGITUDE,LATITUDE,LISTMANAGER_ID,HIDDENTYPE,ISCONFIRM,CONFIRM_USER,CONFIRM_TIME,DISCOVERYTIME,INVESTMENT_FUNDS,
|
||||
HIDDENTYPE2,POSITIONDESC,ISRELEVANT,EMIS_RES
|
||||
) SELECT
|
||||
HIDDEN_ID,SOURCE,RISK_UNIT,IDENTIFICATION,RISK_DESCR,RISK_POSITION,LEVEL,CHECK_CONTENT,HIDDENDESCR,HIDDENPART,CREATOR,CREATTIME,RECTIFYDESCR,
|
||||
RECTIFICATIONTYPE,RECTIFICATIONDEPT,RECTIFICATIONOR,RECTIFICATIONDEADLINE,RECTIFICATIONTIME,HIDDENLEVEL,STATE,CHECKDEPT,CHECKOR,CHECKTIME,
|
||||
CHECKDESCR,ISQUALIFIED,ISDELETE,CORPINFO_ID,HIDDENFINDDEPT,CHECKRECORD_ID,RECORDITEM_ID,RISKITEM_ID,REJECTREASON,REVIEWOR,REVIEWTIME,REVIEWDEPT,
|
||||
HAVESCHEME,LONGITUDE,LATITUDE,LISTMANAGER_ID,HIDDENTYPE,ISCONFIRM,CONFIRM_USER,CONFIRM_TIME,DISCOVERYTIME,INVESTMENT_FUNDS,HIDDENTYPE2,
|
||||
POSITIONDESC,ISRELEVANT,#{resXML}
|
||||
FROM bus_hidden where
|
||||
HIDDEN_ID = #{HIDDEN_ID}
|
||||
</insert>
|
||||
<delete id="deleteForEmis" parameterType="pd">
|
||||
delete from
|
||||
<include refid="tableName"></include>
|
||||
where
|
||||
HIDDEN_ID = #{HIDDEN_ID}
|
||||
</delete>
|
||||
|
||||
<!-- 确认打回 -->
|
||||
<update id="repulseConfirm" parameterType="String">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
STATE = '16'
|
||||
where
|
||||
HIDDEN_ID = #{HIDDEN_ID}
|
||||
</update>
|
||||
<!-- 隐患无法整改 -->
|
||||
<update id="unableRectify" parameterType="String">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
STATE = '7'
|
||||
where
|
||||
HIDDEN_ID = #{HIDDEN_ID}
|
||||
</update>
|
||||
|
||||
<!-- 列表 发现人没有在这里 -->
|
||||
<select id="getListdatalistPage" parameterType="page" resultType="pd">
|
||||
SELECT
|
||||
f.HIDDEN_ID,
|
||||
f.SOURCE,
|
||||
f.HIDDENDESCR,
|
||||
f.RECTIFICATIONTYPE,
|
||||
f.HIDDENLEVEL, lv.NAME as HIDDENLEVELNAME,
|
||||
hreg.HIDDENREGION as HREGIONNAME,
|
||||
f.HIDDENPART,
|
||||
rect.NAME as RECTIFICATIONOR_NAME,
|
||||
f.DISCOVERYTIME,
|
||||
f.STATE,
|
||||
f.CONFIRM_USER, confirmUser.NAME as CONFIRM_USER_NAME ,
|
||||
f.RECTIFICATIONTIME,
|
||||
f.RECTIFICATIONOR,
|
||||
f.CREATOR,
|
||||
(select count(1) from BUS_HIDDENEXAMINE eax where eax.HIDDEN_ID = f.HIDDEN_ID and eax.STATE = '-1' and eax.type in ('1','2')) as exaCount
|
||||
FROM
|
||||
bus_hidden f
|
||||
left join SYS_DICTIONARIES lv on f.HIDDENLEVEL = lv.BIANMA
|
||||
LEFT JOIN sys_user confirmUser on confirmUser.USER_ID = f.CONFIRM_USER <!-- 隐患确认人 -->
|
||||
LEFT JOIN bus_hiddenregion hreg on hreg.HIDDENREGION_ID = f.HIDDENPART <!-- 隐患部位 -->
|
||||
LEFT JOIN sys_user rect on rect.USER_ID = f.RECTIFICATIONOR <!-- 整改人 -->
|
||||
left join bus_hidden_user bhu on bhu.HIDDEN_ID = f.HIDDEN_ID
|
||||
left join sys_user bhuUser on bhuUser.user_id = bhu.user_id
|
||||
LEFT JOIN bus_hiddencheck hch on hch.HIDDEN_ID = f.HIDDEN_ID
|
||||
WHERE f.ISDELETE = '0'
|
||||
and f.STATE not in ('0','7','8','100','101','102')
|
||||
AND f.HIDDENLEVEL != 'hiddenLevel2002'
|
||||
AND f.HIDDENLEVEL != 'hiddenLevel1001'
|
||||
AND f.HIDDENLEVEL != 'jdyh001'
|
||||
<if test="pd.roleLevel != null and pd.roleLevel != ''"><!-- 权限显示 -->
|
||||
<choose>
|
||||
<when test='pd.roleLevel == "0"'>
|
||||
</when>
|
||||
<when test='pd.roleLevel == "1"'>
|
||||
and (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhuUser.DEPARTMENT_ID in (${pd.supDeparIds}) or
|
||||
f.RECTIFICATIONDEPT in (${pd.supDeparIds}) or hch.DEPARTMENT_ID in (${pd.supDeparIds}))
|
||||
</when>
|
||||
<when test='pd.roleLevel == "2"'>
|
||||
and (f.CREATOR = #{pd.loginUserId} or f.RECTIFICATIONOR = #{pd.loginUserId} or
|
||||
f.CONFIRM_USER= #{pd.loginUserId} or bhu.USER_ID =#{pd.loginUserId} or hch.USER_ID = #{pd.loginUserId} )
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
<if test='pd.hiddenVueType != null and pd.hiddenVueType != "confirm"'><!-- -->
|
||||
AND f.HIDDENLEVEL NOT IN ( 'hiddenLevel2002','hiddenLevel1001','jdyh001' )
|
||||
</if>
|
||||
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 企业ID -->
|
||||
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
|
||||
</if>
|
||||
<if test="pd.hiddendescr != null and pd.hiddendescr != ''"><!-- 隐患描述 -->
|
||||
and (f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.hiddendescr}),'%'))
|
||||
</if>
|
||||
<if test="pd.source != null and pd.source != '' "><!-- 隐患来源 -->
|
||||
<if test='pd.source == "2"'>
|
||||
and f.SOURCE in ('2','3')
|
||||
</if>
|
||||
<if test='pd.source != "2"'>
|
||||
and f.SOURCE = #{pd.source}
|
||||
</if>
|
||||
</if>
|
||||
<if test="pd.creatorUserDept != null and pd.creatorUserDept != ''"><!-- 隐患发现人 部门-->
|
||||
and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER
|
||||
hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID
|
||||
where user.DEPARTMENT_ID = #{pd.creatorUserDept} )
|
||||
</if>
|
||||
<if test="pd.creatorName != null and pd.creatorName != ''"><!-- 隐患发现人 -->
|
||||
and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID
|
||||
where
|
||||
<!-- user.USERNAME LIKE CONCAT(CONCAT('%', #{pd.creatorName}),'%') or
|
||||
user.NUMBER LIKE CONCAT(CONCAT('%', #{pd.creatorName}),'%') or
|
||||
user.PHONE LIKE CONCAT(CONCAT('%', #{pd.creatorName}),'%')-->
|
||||
|
||||
user.NAME LIKE CONCAT(CONCAT('%', #{pd.creatorName}),'%')
|
||||
)
|
||||
</if>
|
||||
<if test="pd.STARTTIME != null and pd.STARTTIME != ''"><!-- 隐患发现时间 开始时间 -->
|
||||
and f.DISCOVERYTIME <![CDATA[ >= ]]> CONCAT_WS(' ', #{pd.STARTTIME}, '00:00')
|
||||
</if>
|
||||
<if test="pd.ENDTIME != null and pd.ENDTIME != ''"><!-- 隐患发现时间 结束时间 -->
|
||||
and f.DISCOVERYTIME <![CDATA[ <= ]]> CONCAT_WS(' ', #{pd.ENDTIME}, '23:59')
|
||||
</if>
|
||||
<if test="pd.hiddenlevel != null and pd.hiddenlevel != ''"> <!-- 隐患级别-->
|
||||
and f.HIDDENLEVEL = #{pd.hiddenlevel}
|
||||
</if>
|
||||
<if test="pd.state != null and pd.state != ''"> <!-- 隐患状态-->
|
||||
and f.STATE = #{pd.state}
|
||||
</if>
|
||||
<if test="pd.hiddenType != null and pd.hiddenType != ''"><!-- 隐患类型 -->
|
||||
and f.HIDDENTYPE = #{pd.hiddenType}
|
||||
</if>
|
||||
<if test="pd.confirmUserName != null and pd.confirmUserName != ''"><!-- 确认人 -->
|
||||
and (
|
||||
|
||||
<!-- confirmUser.USERNAME LIKE CONCAT(CONCAT('%', #{pd.confirmUserName}),'%') or}),'%') -->
|
||||
<!-- confirmUser.NUMBER LIKE CONCAT(CONCAT('%', #{pd.confirmUserName}),'%') or}),'%') -->
|
||||
confirmUser.NAME LIKE CONCAT(CONCAT('%', #{pd.confirmUserName}),'%')
|
||||
<!-- confirmUser.PHONE LIKE CONCAT(CONCAT('%', #{pd.confirmUserName}),'%'因为搜索框搜1或者2也能出来数据,但是不应该有数据,暂时注释) -->
|
||||
)
|
||||
</if>
|
||||
<if test="pd.rectificationorName != null and pd.rectificationorName != ''"><!-- 整改人 -->
|
||||
and (
|
||||
rect.NAME LIKE CONCAT(CONCAT('%', #{pd.rectificationorName}),'%')
|
||||
<!-- rect.PHONE LIKE CONCAT(CONCAT('%', #{pd.rectificationorName}),'%'
|
||||
rect.USERNAME LIKE CONCAT(CONCAT('%', #{pd.rectificationorName}),'%') or
|
||||
rect.NUMBER LIKE CONCAT(CONCAT('%', #{pd.rectificationorName}),'%') or因为搜索框搜1或者2也能出来数据,但是不应该有数据,暂时注释) -->
|
||||
)
|
||||
</if>
|
||||
<if test="pd.checkrecordName != null and pd.checkrecordName != ''"><!-- 验收人 -->
|
||||
and f.HIDDEN_ID in (
|
||||
SELECT
|
||||
yhc.HIDDEN_ID
|
||||
FROM
|
||||
bus_hiddencheck yhc
|
||||
LEFT JOIN sys_user yuser ON yuser.USER_ID = yhc.USER_ID AND yuser.CORPINFO_ID = #{pd.CORPINFO_ID}
|
||||
where (
|
||||
<!-- yuser.USERNAME LIKE CONCAT(CONCAT('%',#{pd.checkrecordName}),'%')
|
||||
or) or yuser.PHONE LIKE CONCAT(CONCAT('%', #{pd.checkrecordName}),'%') 因为搜索框搜1或者2也能出来数据,但是不应该有数据,暂时注释-->
|
||||
yuser.NAME LIKE CONCAT(CONCAT('%', #{pd.checkrecordName}),'%')
|
||||
)
|
||||
)
|
||||
</if>
|
||||
<if test="pd.checkrecordId != null and pd.checkrecordId != ''"><!-- 验收人 -->
|
||||
and f.STATE = '2'
|
||||
and (select count(1) from BUS_HIDDENCHECK bh where bh.HIDDEN_ID=f.HIDDEN_ID and bh.USER_ID=#{pd.SELFUSERID} )>0
|
||||
</if>
|
||||
|
||||
|
||||
<if test="pd.hiddenpart != null and pd.hiddenpart != ''"><!-- 隐患部位 -->
|
||||
and hreg.HIDDENREGION_ID LIKE CONCAT(CONCAT('%', #{pd.hiddenpart}),'%')
|
||||
</if>
|
||||
<if test='pd.CONFIRM_USER != null and pd.CONFIRM_USER != ""'><!-- 隐患确认人 -->
|
||||
and f.CONFIRM_USER = #{pd.CONFIRM_USER}
|
||||
</if>
|
||||
<if test='pd.hiddenVueType != null and pd.hiddenVueType == "rectify"'><!--整改隐患信息 -->
|
||||
and f.STATE in('1','-1','10')
|
||||
</if>
|
||||
<if test='pd.SELFUSERID != null and pd.SELFUSERID != ""'><!-- 整改隐患信息 -->
|
||||
and f.RECTIFICATIONOR = #{pd.SELFUSERID}
|
||||
</if>
|
||||
<if test='pd.hiddenVueType != null and pd.hiddenVueType == "check"'><!--验收隐患 -->
|
||||
and f.STATE ='2'
|
||||
</if>
|
||||
<if test='pd.checkUser != null and pd.checkUser != ""'><!-- 验收隐患 -->
|
||||
and f.STATE = '2'
|
||||
and (select count(1) from BUS_HIDDENCHECK bh where bh.HIDDEN_ID=f.HIDDEN_ID and bh.USER_ID=#{pd.checkUser} )>0
|
||||
</if>
|
||||
GROUP BY f.HIDDEN_ID
|
||||
order by FIELD ( f.STATE, '-2' ) desc,<!-- 因为这是隐患确认列表有确认按钮的排在前面 -->
|
||||
f.DISCOVERYTIME desc <!-- 剩下的按隐患发现时间排序 -->
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- 列表 发现人没有在这里 -->
|
||||
<select id="getListAll" parameterType="pd" resultType="pd">
|
||||
SELECT
|
||||
bhuUser.name as fxUserName,
|
||||
bhuUserDept.name as fxUserDeptName,
|
||||
type1.name as type1Name,
|
||||
confirmUser.name as conUsername,
|
||||
|
||||
zgUserDept.name as zgUserDeptName,
|
||||
zgUser.name as zgUserName,
|
||||
hreg.HIDDENREGION as HIDDENPARTNAME,
|
||||
f.*
|
||||
FROM
|
||||
bus_hidden f
|
||||
left join bus_hidden_user bhu on bhu.HIDDEN_ID = f.HIDDEN_ID
|
||||
|
||||
left join `qa-gwj-prevention`.vi_user_all zgUser on zgUser.user_id = f.RECTIFICATIONOR
|
||||
LEFT JOIN `qa-gwj-prevention`.vi_user_all confirmUser on confirmUser.USER_ID = f.CONFIRM_USER <!-- 隐患确认人 -->
|
||||
left join `qa-gwj-prevention`.vi_user_all bhuUser on bhuUser.user_id = bhu.user_id
|
||||
left join `qa-gwj-prevention`.vi_department_all bhuUserDept on bhuUser.DEPARTMENT_ID = bhuUserDept.DEPARTMENT_ID
|
||||
|
||||
LEFT JOIN bus_hiddencheck hch on hch.HIDDEN_ID = f.HIDDEN_ID
|
||||
left join sys_dictionaries type1 on type1.bianma = f.HIDDENTYPE
|
||||
left join oa_department zgUserDept on zgUserDept.DEPARTMENT_ID = f.RECTIFICATIONDEPT
|
||||
left join bus_hiddenregion hreg on hreg.HIDDENREGION_ID = f.HIDDENPART
|
||||
|
||||
|
||||
WHERE f.ISDELETE = '0'
|
||||
and f.STATE not in ('0','7','8','100','101','102')
|
||||
AND f.HIDDENLEVEL != 'hiddenLevel2002'
|
||||
AND f.HIDDENLEVEL != 'hiddenLevel1001'
|
||||
AND f.HIDDENLEVEL != 'jdyh001'
|
||||
<if test="roleLevel != null and roleLevel != ''"><!-- 权限显示 -->
|
||||
<choose>
|
||||
<when test='roleLevel == "0"'>
|
||||
</when>
|
||||
<when test='roleLevel == "1"'>
|
||||
and (confirmUser.DEPARTMENT_ID in (${supDeparIds}) or bhuUser.DEPARTMENT_ID in (${supDeparIds}) or
|
||||
f.RECTIFICATIONDEPT in (${supDeparIds}) or hch.DEPARTMENT_ID in (${supDeparIds}))
|
||||
</when>
|
||||
<when test='roleLevel == "2"'>
|
||||
and (f.CREATOR = #{loginUserId} or f.RECTIFICATIONOR = #{loginUserId} or
|
||||
f.CONFIRM_USER= #{loginUserId} or bhu.USER_ID =#{loginUserId} or hch.USER_ID = #{loginUserId} )
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
<if test='hiddenVueType != null and hiddenVueType != "confirm"'><!-- -->
|
||||
AND f.HIDDENLEVEL NOT IN ( 'hiddenLevel2002','hiddenLevel1001','jdyh001' )
|
||||
</if>
|
||||
<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 企业ID -->
|
||||
and f.CORPINFO_ID = #{CORPINFO_ID}
|
||||
</if>
|
||||
<if test="hiddendescr != null and hiddendescr != ''"><!-- 隐患描述 -->
|
||||
and (f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{hiddendescr}),'%'))
|
||||
</if>
|
||||
<if test="source != null and source != '' "><!-- 隐患来源 -->
|
||||
<if test='source == "2"'>
|
||||
and f.SOURCE in ('2','3')
|
||||
</if>
|
||||
<if test='source != "2"'>
|
||||
and f.SOURCE = #{source}
|
||||
</if>
|
||||
</if>
|
||||
<if test="creatorUserDept != null and creatorUserDept != ''"><!-- 隐患发现人 部门-->
|
||||
and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER
|
||||
hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID
|
||||
where user.DEPARTMENT_ID = #{creatorUserDept} )
|
||||
</if>
|
||||
<if test="creatorName != null and creatorName != ''"><!-- 隐患发现人 -->
|
||||
and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID
|
||||
where
|
||||
<!-- user.USERNAME LIKE CONCAT(CONCAT('%', #{creatorName}),'%') or
|
||||
user.NUMBER LIKE CONCAT(CONCAT('%', #{creatorName}),'%') or
|
||||
user.PHONE LIKE CONCAT(CONCAT('%', #{creatorName}),'%')-->
|
||||
|
||||
user.NAME LIKE CONCAT(CONCAT('%', #{creatorName}),'%')
|
||||
)
|
||||
</if>
|
||||
<if test='STARTTIME != null and STARTTIME != "" and STARTTIME != "undefined"'><!-- 隐患发现时间 开始时间 -->
|
||||
and f.DISCOVERYTIME <![CDATA[ >= ]]> CONCAT_WS(' ', #{STARTTIME}, '00:00')
|
||||
</if>
|
||||
<if test='ENDTIME != null and ENDTIME != "" and ENDTIME != "undefined" '><!-- 隐患发现时间 结束时间 -->
|
||||
and f.DISCOVERYTIME <![CDATA[ <= ]]> CONCAT_WS(' ', #{ENDTIME}, '23:59')
|
||||
</if>
|
||||
<if test="hiddenlevel != null and hiddenlevel != ''"> <!-- 隐患级别-->
|
||||
and f.HIDDENLEVEL = #{hiddenlevel}
|
||||
</if>
|
||||
<if test="state != null and state != ''"> <!-- 隐患状态-->
|
||||
and f.STATE = #{state}
|
||||
</if>
|
||||
<if test="hiddenType != null and hiddenType != ''"><!-- 隐患类型 -->
|
||||
and f.HIDDENTYPE = #{hiddenType}
|
||||
</if>
|
||||
<if test="confirmUserName != null and confirmUserName != ''"><!-- 确认人 -->
|
||||
and (
|
||||
|
||||
<!-- confirmUser.USERNAME LIKE CONCAT(CONCAT('%', #{confirmUserName}),'%') or}),'%') -->
|
||||
<!-- confirmUser.NUMBER LIKE CONCAT(CONCAT('%', #{confirmUserName}),'%') or}),'%') -->
|
||||
confirmUser.NAME LIKE CONCAT(CONCAT('%', #{confirmUserName}),'%')
|
||||
<!-- confirmUser.PHONE LIKE CONCAT(CONCAT('%', #{confirmUserName}),'%'因为搜索框搜1或者2也能出来数据,但是不应该有数据,暂时注释) -->
|
||||
)
|
||||
</if>
|
||||
<if test="rectificationorName != null and rectificationorName != ''"><!-- 整改人 -->
|
||||
and (
|
||||
rect.NAME LIKE CONCAT(CONCAT('%', #{rectificationorName}),'%')
|
||||
<!-- rect.PHONE LIKE CONCAT(CONCAT('%', #{rectificationorName}),'%'
|
||||
rect.USERNAME LIKE CONCAT(CONCAT('%', #{rectificationorName}),'%') or
|
||||
rect.NUMBER LIKE CONCAT(CONCAT('%', #{rectificationorName}),'%') or因为搜索框搜1或者2也能出来数据,但是不应该有数据,暂时注释) -->
|
||||
)
|
||||
</if>
|
||||
<if test="checkrecordName != null and checkrecordName != ''"><!-- 验收人 -->
|
||||
and f.HIDDEN_ID in (
|
||||
SELECT
|
||||
yhc.HIDDEN_ID
|
||||
FROM
|
||||
bus_hiddencheck yhc
|
||||
LEFT JOIN sys_user yuser ON yuser.USER_ID = yhc.USER_ID AND yuser.CORPINFO_ID = #{CORPINFO_ID}
|
||||
where (
|
||||
<!-- yuser.USERNAME LIKE CONCAT(CONCAT('%',#{checkrecordName}),'%')
|
||||
or) or yuser.PHONE LIKE CONCAT(CONCAT('%', #{checkrecordName}),'%') 因为搜索框搜1或者2也能出来数据,但是不应该有数据,暂时注释-->
|
||||
yuser.NAME LIKE CONCAT(CONCAT('%', #{checkrecordName}),'%')
|
||||
)
|
||||
)
|
||||
</if>
|
||||
<if test="checkrecordId != null and checkrecordId != ''"><!-- 验收人 -->
|
||||
and f.STATE = '2'
|
||||
and (select count(1) from BUS_HIDDENCHECK bh where bh.HIDDEN_ID=f.HIDDEN_ID and bh.USER_ID=#{SELFUSERID} )>0
|
||||
</if>
|
||||
|
||||
|
||||
<if test="hiddenpart != null and hiddenpart != ''"><!-- 隐患部位 -->
|
||||
and hreg.HIDDENREGION_ID LIKE CONCAT(CONCAT('%', #{hiddenpart}),'%')
|
||||
</if>
|
||||
<if test='CONFIRM_USER != null and CONFIRM_USER != ""'><!-- 隐患确认人 -->
|
||||
and f.CONFIRM_USER = #{CONFIRM_USER}
|
||||
</if>
|
||||
<if test='hiddenVueType != null and hiddenVueType == "rectify"'><!--整改隐患信息 -->
|
||||
and f.STATE in('1','-1','10')
|
||||
</if>
|
||||
<if test='SELFUSERID != null and SELFUSERID != ""'><!-- 整改隐患信息 -->
|
||||
and f.RECTIFICATIONOR = #{SELFUSERID}
|
||||
</if>
|
||||
<if test='hiddenVueType != null and hiddenVueType == "check"'><!--验收隐患 -->
|
||||
and f.STATE ='2'
|
||||
</if>
|
||||
<if test='checkUser != null and checkUser != ""'><!-- 验收隐患 -->
|
||||
and f.STATE = '2'
|
||||
and (select count(1) from BUS_HIDDENCHECK bh where bh.HIDDEN_ID=f.HIDDEN_ID and bh.USER_ID=#{checkUser} )>0
|
||||
</if>
|
||||
GROUP BY f.HIDDEN_ID
|
||||
order by FIELD ( f.STATE, '-2' ) desc,<!-- 因为这是隐患确认列表有确认按钮的排在前面 -->
|
||||
f.DISCOVERYTIME desc <!-- 剩下的按隐患发现时间排序 -->
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
|
|
@ -0,0 +1,191 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zcloud.mapper.datasource.hiddenApi.HiddenCheckApiMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_HIDDENCHECK
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.HIDDEN_ID,
|
||||
f.DEPARTMENT_ID,
|
||||
f.USER_ID,
|
||||
f.STATUS,
|
||||
f.CHECK_TIME,
|
||||
f.CHECKDESCR,
|
||||
f.HIDDENCHECK_ID
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
HIDDEN_ID,
|
||||
DEPARTMENT_ID,
|
||||
USER_ID,
|
||||
STATUS,
|
||||
CHECK_TIME,
|
||||
CHECKDESCR,
|
||||
HIDDENCHECK_ID
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{HIDDEN_ID},
|
||||
#{DEPARTMENT_ID},
|
||||
#{USER_ID},
|
||||
#{STATUS},
|
||||
#{CHECK_TIME},
|
||||
#{CHECKDESCR},
|
||||
#{HIDDENCHECK_ID}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="pd">
|
||||
delete from
|
||||
<include refid="tableName"></include>
|
||||
where
|
||||
HIDDEN_ID = #{HIDDEN_ID}
|
||||
</delete>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
HIDDEN_ID = #{HIDDEN_ID},
|
||||
DEPARTMENT_ID = #{DEPARTMENT_ID},
|
||||
USER_ID = #{USER_ID},
|
||||
STATUS = #{STATUS},
|
||||
CHECK_TIME = #{CHECK_TIME},
|
||||
CHECKDESCR = #{CHECKDESCR},
|
||||
HIDDENCHECK_ID = HIDDENCHECK_ID
|
||||
where
|
||||
HIDDENCHECK_ID = #{HIDDENCHECK_ID}
|
||||
</update>
|
||||
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.HIDDENCHECK_ID = #{HIDDENCHECK_ID}
|
||||
</select>
|
||||
|
||||
|
||||
<!-- 列表 -->
|
||||
<select id="datalistPage" parameterType="page" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.ISDELETE = '0'
|
||||
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
|
||||
and
|
||||
(
|
||||
<!-- 根据需求自己加检索条件
|
||||
字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
or
|
||||
字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
-->
|
||||
)
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listAll" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>,
|
||||
u.NAME CHECKORNAME,
|
||||
d.NAME CHECKDEPTNAME
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join vi_user_all u on u.USER_ID = f.USER_ID
|
||||
left join vi_department_all d on d.DEPARTMENT_ID = f.DEPARTMENT_ID
|
||||
where 1=1 and f.USER_ID is not null and f.USER_ID !=''
|
||||
<if test="HIDDEN_ID != null and HIDDEN_ID != ''"><!-- 关键词检索 -->
|
||||
and
|
||||
f.HIDDEN_ID=#{HIDDEN_ID}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<!-- 通过隐患ID查询验收信息列表 -->
|
||||
<select id="listAllByIds" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>,su.NAME,od.NAME DEPARTMENT_NAME
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join sys_user su on su.USER_ID = f.USER_ID
|
||||
left join oa_department od on od.DEPARTMENT_ID = f.DEPARTMENT_ID
|
||||
where 1=1
|
||||
<if test="ArrayDATA_IDS != null and ArrayDATA_IDS != ''"><!-- 关键词检索 -->
|
||||
and f.HIDDEN_ID in
|
||||
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
|
||||
</select>
|
||||
|
||||
<!-- 批量删除 -->
|
||||
<delete id="deleteAll" parameterType="String">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
HIDDENCHECK_ID in
|
||||
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<!-- ===================-->
|
||||
<!-- 通过id获取数据 -->
|
||||
<select id="findByHidden" parameterType="String" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.USER_ID !='' and f.USER_ID is not null and
|
||||
f.HIDDEN_ID = #{HIDDEN_ID}
|
||||
</select>
|
||||
<update id="checkHidden" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
DEPARTMENT_ID = #{DEPARTMENT_ID},
|
||||
USER_ID = #{USER_ID},
|
||||
STATUS = #{STATUS},
|
||||
CHECK_TIME = #{CHECK_TIME},
|
||||
CHECKDESCR = #{CHECKDESCR},
|
||||
HIDDENCHECK_ID = HIDDENCHECK_ID
|
||||
where
|
||||
HIDDENCHECK_ID = #{HIDDENCHECK_ID}
|
||||
</update>
|
||||
<!-- 删除-->
|
||||
<delete id="deleteByHiddenId" parameterType="String">
|
||||
delete from
|
||||
<include refid="tableName"></include>
|
||||
where
|
||||
HIDDEN_ID = #{HIDDEN_ID}
|
||||
</delete>
|
||||
</mapper>
|
|
@ -0,0 +1,421 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zcloud.mapper.datasource.hiddenApi.HiddenExamineApiMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_HIDDENEXAMINE
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.HIDDEN_ID,
|
||||
f.EXAMINE,
|
||||
f.CREATOR,
|
||||
f.CREATTIME,
|
||||
f.OPERATOR,
|
||||
f.OPERATTIME,
|
||||
f.STATE,
|
||||
f.TYPE,
|
||||
f.DISPOSAL_PLAN,
|
||||
f.DISPOSAL_FILE,
|
||||
f.DELAY_TIME,
|
||||
f.spare1,
|
||||
f.spare2,
|
||||
f.spare3,
|
||||
f.spare4,
|
||||
f.spare5,
|
||||
f.HIDDENEXAMINE_ID,
|
||||
f.REPULSE_CAUSE
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
HIDDEN_ID,
|
||||
EXAMINE,
|
||||
CREATOR,
|
||||
CREATTIME,
|
||||
OPERATOR,
|
||||
OPERATTIME,
|
||||
STATE,
|
||||
TYPE,
|
||||
DISPOSAL_PLAN,
|
||||
DISPOSAL_FILE,
|
||||
DELAY_TIME,
|
||||
spare1,
|
||||
spare2,
|
||||
spare3,
|
||||
spare4,
|
||||
spare5,
|
||||
HIDDENEXAMINE_ID,
|
||||
REPULSE_CAUSE
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{HIDDEN_ID},
|
||||
#{EXAMINE},
|
||||
#{CREATOR},
|
||||
#{CREATTIME},
|
||||
#{OPERATOR},
|
||||
#{OPERATTIME},
|
||||
#{STATE},
|
||||
#{TYPE},
|
||||
#{DISPOSAL_PLAN},
|
||||
#{DISPOSAL_FILE},
|
||||
#{DELAY_TIME},
|
||||
#{spare1},
|
||||
#{spare2},
|
||||
#{spare3},
|
||||
#{spare4},
|
||||
#{spare5},
|
||||
#{HIDDENEXAMINE_ID},
|
||||
#{REPULSE_CAUSE}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteByHiddenId" parameterType="pd">
|
||||
delete from
|
||||
<include refid="tableName"></include>
|
||||
where
|
||||
HIDDEN_ID = #{HIDDEN_ID}
|
||||
</delete>
|
||||
<delete id="deleteByHiddenIdAndType" parameterType="pd">
|
||||
delete from
|
||||
<include refid="tableName"></include>
|
||||
where
|
||||
HIDDEN_ID = #{HIDDEN_ID}
|
||||
and TYPE = '4'
|
||||
and STATE = '2'
|
||||
</delete>
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
OPERATOR = #{OPERATOR},
|
||||
OPERATTIME = #{OPERATTIME},
|
||||
STATE = #{STATE}
|
||||
where
|
||||
HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID}
|
||||
</update>
|
||||
|
||||
<!-- 修改确认打回的信息 -->
|
||||
<update id="editrepulse" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include> f
|
||||
set
|
||||
f.spare5 = 1
|
||||
where
|
||||
HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID}
|
||||
</update>
|
||||
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID}
|
||||
</select>
|
||||
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="findByHiddenId" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.HIDDEN_ID = #{HIDDEN_ID}
|
||||
and f.TYPE = '6'
|
||||
and f.STATE = '16'
|
||||
</select>
|
||||
|
||||
<!-- 列表 -->
|
||||
<select id="datalistPage" parameterType="page" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.ISDELETE = '0'
|
||||
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
|
||||
and
|
||||
(
|
||||
<!-- 根据需求自己加检索条件
|
||||
字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
or
|
||||
字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
-->
|
||||
)
|
||||
</if>
|
||||
order by f.STATE desc , CREATTIME desc
|
||||
</select>
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listAll" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
, user.name as editUserName
|
||||
, dept.name as editDeptName
|
||||
, LEVEL.name as editLevelName
|
||||
, users.NAME as NEWRECTIFICATIONOR
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
LEFT JOIN sys_user user on user.USER_ID = f.spare2
|
||||
LEFT JOIN sys_user users on users.USER_ID = f.NEW_RECTIFICATIONOR
|
||||
LEFT JOIN oa_department dept on dept.DEPARTMENT_ID = f.spare4
|
||||
LEFT JOIN sys_dictionaries LEVEL on LEVEL.BIANMA = f.spare1
|
||||
where 1=1
|
||||
<if test="HIDDEN_ID != null and HIDDEN_ID != ''">
|
||||
and f.HIDDEN_ID = #{HIDDEN_ID}
|
||||
</if>
|
||||
<if test="TYPE != null and TYPE != ''">
|
||||
and f.TYPE = #{TYPE}
|
||||
</if>
|
||||
<if test="STATE != null and STATE != ''">
|
||||
and f.STATE = #{STATE}
|
||||
</if>
|
||||
order by field (f.TYPE ,'0','4') desc ,CREATTIME
|
||||
</select>
|
||||
|
||||
<!-- 批量删除 -->
|
||||
<delete id="deleteAll" parameterType="String">
|
||||
update
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
HIDDENEXAMINE_ID in
|
||||
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</delete>
|
||||
<update id="updateBySpecial" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
OPERATOR = #{OPERATOR},
|
||||
OPERATTIME = #{OPERATTIME},
|
||||
STATE = #{STATE},
|
||||
DISPOSAL_PLAN = #{DISPOSAL_PLAN},
|
||||
DISPOSAL_FILE = #{DISPOSAL_FILE}
|
||||
<if test="spare1 != null and spare1 != ''">
|
||||
, spare1 = #{spare1}
|
||||
</if>
|
||||
<if test="spare2 != null and spare2 != ''">
|
||||
, spare2 = #{spare2}
|
||||
</if>
|
||||
<if test="spare3 != null and spare3 != ''">
|
||||
, spare3 = #{spare3}
|
||||
</if>
|
||||
<if test="spare4 != null and spare4 != ''">
|
||||
, spare4 = #{spare4}
|
||||
</if>
|
||||
<if test="NEW_RECTIFICATIONOR != null and NEW_RECTIFICATIONOR != ''">
|
||||
, NEW_RECTIFICATIONOR = #{NEW_RECTIFICATIONOR}
|
||||
</if>
|
||||
where
|
||||
HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID}
|
||||
</update>
|
||||
<select id="listAndHiddendatalistPage" parameterType="page" resultType="pd">
|
||||
select
|
||||
f.*
|
||||
,exa.DISPOSAL_PLAN
|
||||
,exa.HIDDENEXAMINE_ID
|
||||
,re.NAME as RECTIFICATIONORNAME
|
||||
,confirmUser.NAME as confirmUserName
|
||||
,hiddenType.NAME as hiddenTypeName
|
||||
,hregion.HIDDENREGION as hregionName
|
||||
,lv.NAME as HIDDENLEVELNAME
|
||||
,exa.STATE as exaSTATE
|
||||
from
|
||||
BUS_HIDDENEXAMINE exa
|
||||
left join BUS_HIDDEN f on exa.HIDDEN_ID =f.HIDDEN_ID
|
||||
LEFT JOIN sys_user confirmUser on confirmUser.USER_ID = f.CONFIRM_USER <!-- 隐患确认人 -->
|
||||
left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
|
||||
left join <include refid="dicTableName"></include> hiddenType on f.HIDDENTYPE = hiddenType.BIANMA <!-- 隐患类型-->
|
||||
left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
|
||||
left join bus_hiddenregion hregion on hregion.HIDDENREGION_ID = f.HIDDENPART
|
||||
LEFT JOIN bus_hiddencheck hch on hch.HIDDEN_ID = f.HIDDEN_ID
|
||||
left join bus_hidden_user bhu on bhu.HIDDEN_ID = f.HIDDEN_ID
|
||||
where f.ISDELETE = '0'
|
||||
<if test='pd.roleLevel != null and pd.roleLevel != "" and pd.keyType !="2" and pd.keyIsSpecial !="2" '><!-- 权限显示 -->
|
||||
<choose>
|
||||
<when test='pd.roleLevel == "0" '>
|
||||
</when>
|
||||
<when test='pd.roleLevel == "1"'>
|
||||
and (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhu.DEPARTMENT_ID in (${pd.supDeparIds}) or f.RECTIFICATIONDEPT in (${pd.supDeparIds}) or hch.DEPARTMENT_ID in (${pd.supDeparIds}))
|
||||
</when>
|
||||
<when test='pd.roleLevel == "2"'>
|
||||
and (bhu.USER_ID =#{pd.loginUserId} or f.CONFIRM_USER = #{pd.loginUserId} or f.RECTIFICATIONOR = #{pd.loginUserId} or f.CHECKOR = #{pd.loginUserId} )
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
and f.state != '0'
|
||||
and f.state not in ('100','101','102')
|
||||
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
|
||||
<if test='pd.stateConfirm != null and pd.stateConfirm != "" and pd.stateConfirm == "1"'><!-- 未确认确认隐患 -->
|
||||
and f.state = '-2'
|
||||
</if>
|
||||
<if test="pd.stateConfirm != null and pd.stateConfirm != '' and pd.stateConfirm == '2'"><!-- 确认确认隐患 -->
|
||||
and f.state != '-2'
|
||||
</if>
|
||||
<if test="pd.keySource != null and pd.keySource != '' "><!-- 隐患来源 -->
|
||||
<choose>
|
||||
<when test="pd.keySource == 1">
|
||||
AND f.SOURCE = '1'
|
||||
</when>
|
||||
<when test="pd.keySource == 2">
|
||||
AND f.SOURCE = '2'
|
||||
</when>
|
||||
<when test="pd.keySource == 4">
|
||||
AND f.SOURCE = '4'
|
||||
</when>
|
||||
<when test="pd.keySource == 5">
|
||||
AND f.SOURCE = '5'
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
<!-- <if test="pd.SOURCE != null and pd.SOURCE != '' "><!– 隐患来源 –>-->
|
||||
<!-- and f.SOURCE in('2','3')-->
|
||||
<!-- </if>-->
|
||||
<if test="pd.keyHiddenDescr != null and pd.keyHiddenDescr != ''"><!-- 隐患描述 -->
|
||||
and (f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.keyHiddenDescr}),'%'))
|
||||
</if>
|
||||
<if test="pd.keyFindUserName != null and pd.keyFindUserName != ''"><!-- 隐患发现人 -->
|
||||
and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.NAME LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
|
||||
</if>
|
||||
<if test="pd.keyFindUserDept != null and pd.keyFindUserDept != ''"><!-- 隐患发现部门 -->
|
||||
and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.DEPARTMENT_ID = #{pd.keyFindUserDept} )
|
||||
</if>
|
||||
<if test="pd.keyHiddenType != null and pd.keyHiddenType != ''"><!-- 隐患类型 -->
|
||||
and f.HIDDENTYPE = #{pd.keyHiddenType}
|
||||
</if>
|
||||
<if test="pd.keyHiddenPart != null and pd.keyHiddenPart != ''"><!-- 隐患部位 -->
|
||||
and f.HIDDENPART = #{pd.keyHiddenPart}
|
||||
</if>
|
||||
<if test="pd.keyHiddenlevel != null and pd.keyHiddenlevel != ''"><!-- 隐患级别 -->
|
||||
and f.HIDDENLEVEL = #{pd.keyHiddenlevel}
|
||||
</if>
|
||||
<if test='pd.CONFIRM_USER != null and pd.CONFIRM_USER != ""'><!-- 隐患确认人 -->
|
||||
and f.CONFIRM_USER = #{pd.CONFIRM_USER}
|
||||
</if>
|
||||
<!-- <if test="pd.keyFindEndTime != null and pd.keyFindEndTime != ''"><!– 隐患发现时间 –>-->
|
||||
<!-- and f.DISCOVERYTIME <= #{pd.keyFindEndTime}-->
|
||||
<!-- </if>-->
|
||||
<if test="pd.STARTTIME != null and pd.STARTTIME != ''"><!-- 隐患发现时间 -->
|
||||
and f.DISCOVERYTIME >= #{pd.STARTTIME}
|
||||
</if>
|
||||
<if test="pd.ENDTIME != null and pd.ENDTIME != ''">
|
||||
and f.DISCOVERYTIME <= #{pd.ENDTIME}
|
||||
</if>
|
||||
<if test="pd.keyConfirmUser != null and pd.keyConfirmUser != ''"><!-- 确认人 -->
|
||||
and (confirmUser.NAME LIKE CONCAT(CONCAT('%', #{pd.keyConfirmUser}),'%'))
|
||||
</if>
|
||||
<if test="pd.keyPrincipal != null and pd.keyPrincipal != ''"><!-- 确认人 -->
|
||||
and (re.NAME LIKE CONCAT(CONCAT('%', #{pd.keyPrincipal}),'%'))
|
||||
</if>
|
||||
<if test="pd.keyMajor != null and pd.keyMajor != ''"><!-- 重大隐患 -->
|
||||
and (lv.PARENT_ID = '5ff9daf78e9a4fb1b40d77980656799d' or lv.DICTIONARIES_ID='5ff9daf78e9a4fb1b40d77980656799d' )
|
||||
</if>
|
||||
<if test="pd.keyHiddenSpecialType != null and pd.keyHiddenSpecialType != ''">
|
||||
and f.HIDDEN_ID in (select hex.HIDDEN_ID from bus_hiddenexamine hex
|
||||
where hex.TYPE = #{pd.keyHiddenSpecialType} and hex.STATE ='1' )
|
||||
</if>
|
||||
<if test='pd.keyType != null and pd.keyType != "" '><!-- 是否是特殊处理隐患 -->
|
||||
and exa.TYPE = #{pd.keyType}
|
||||
</if>
|
||||
<if test='pd.keyIsSpecial != null and pd.keyIsSpecial != "" '><!-- 是否是特殊处理隐患 -->
|
||||
and exa.TYPE = #{pd.keyIsSpecial}
|
||||
</if>
|
||||
<if test='pd.keyHiddenStatus != null and pd.keyHiddenStatus != "" '><!-- 是否是特殊处理隐患 -->
|
||||
and f.STATE = #{pd.keyHiddenStatus}
|
||||
</if>
|
||||
GROUP BY exa.HIDDENEXAMINE_ID
|
||||
<!--order by exa.STATE , exa.CREATTIME desc -->
|
||||
order by exa.STATE, FIELD (f.STATE , '1','-2','7','11','12','13','14','15','101','102') desc,
|
||||
f.STATE + 0 asc,
|
||||
f.CREATTIME desc
|
||||
</select>
|
||||
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="findByIdAndHidden" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.*,
|
||||
cr.NAME CREATORNAME,
|
||||
re.NAME RECTIFICATIONORNAME,
|
||||
ch.NAME CHECKORNAME,
|
||||
crd.NAME HIDDENFINDDEPTNAME,
|
||||
red.NAME RECTIFICATIONDEPTNAME,
|
||||
chd.NAME CHECKDEPTNAME,
|
||||
lv.NAME HIDDENLEVELNAME,
|
||||
bc.LIST_NAME,
|
||||
lv.NAME HIDDENLEVELNAME,
|
||||
ht.NAME HIDDENTYPENAME,
|
||||
ht2.NAME HIDDENTYPENAME2,
|
||||
conUser.NAME as conUserName,
|
||||
hregion.HIDDENREGION as hregionName,
|
||||
exa.EXAMINE,
|
||||
exa.STATE AS exaState,
|
||||
exa.TYPE as exaType,
|
||||
exa.DISPOSAL_PLAN,
|
||||
exa.DISPOSAL_FILE,
|
||||
exa.DELAY_TIME,
|
||||
exa.HIDDENEXAMINE_ID
|
||||
from
|
||||
BUS_HIDDENEXAMINE exa
|
||||
left join BUS_HIDDEN f on exa.HIDDEN_ID =f.HIDDEN_ID
|
||||
left join sys_user cr on cr.USER_ID = f.CREATOR
|
||||
left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
|
||||
left join sys_user ch on ch.USER_ID = f.CHECKOR
|
||||
left join sys_user conUser on conUser.USER_ID = f.CONFIRM_USER
|
||||
left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
|
||||
left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT
|
||||
left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT
|
||||
left join bus_checkrecord bc on bc.CHECKRECORD_ID = f.CHECKRECORD_ID and bc.ISDELETE = 0
|
||||
left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
|
||||
left join <include refid="dicTableName"></include> ht on f.HIDDENTYPE = ht.BIANMA
|
||||
left join <include refid="dicTableName"></include> ht2 on f.HIDDENTYPE2 = ht2.BIANMA
|
||||
left join bus_hiddenregion hregion on hregion.HIDDENREGION_ID = f.HIDDENPART
|
||||
where
|
||||
exa.HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID}
|
||||
</select>
|
||||
|
||||
<!-- -->
|
||||
<update id="adoptExamine" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
OPERATOR = #{OPERATOR},
|
||||
OPERATTIME = #{OPERATTIME},
|
||||
STATE = #{STATE}
|
||||
where
|
||||
HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID}
|
||||
</update>
|
||||
|
||||
</mapper>
|
|
@ -0,0 +1,193 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zcloud.mapper.datasource.hiddenApi.HiddenSchemeApiMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_HIDDENSCHEME
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.HIDDEN_ID,
|
||||
f.SCREENINGDATE,
|
||||
f.LISTNAME,
|
||||
f.GOVERNSTANDARDS,
|
||||
f.GOVERNMETHOD,
|
||||
f.EXPENDITURE,
|
||||
f.PRINCIPAL,
|
||||
f.PROGRAMMING,
|
||||
f.TIMELIMITFOR,
|
||||
f.FILEPATH,
|
||||
f.JOBREQUIREMENT,
|
||||
f.OTHERBUSINESS,
|
||||
f.CORPINFO_ID,
|
||||
f.CREATOR,
|
||||
f.CREATTIME,
|
||||
f.OPERATOR,
|
||||
f.OPERATTIME,
|
||||
f.ISDELETE,
|
||||
f.HIDDENSCHEME_ID
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
HIDDEN_ID,
|
||||
SCREENINGDATE,
|
||||
LISTNAME,
|
||||
GOVERNSTANDARDS,
|
||||
GOVERNMETHOD,
|
||||
EXPENDITURE,
|
||||
PRINCIPAL,
|
||||
PROGRAMMING,
|
||||
TIMELIMITFOR,
|
||||
FILEPATH,
|
||||
JOBREQUIREMENT,
|
||||
OTHERBUSINESS,
|
||||
CORPINFO_ID,
|
||||
CREATOR,
|
||||
CREATTIME,
|
||||
OPERATOR,
|
||||
OPERATTIME,
|
||||
ISDELETE,
|
||||
HIDDENSCHEME_ID
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{HIDDEN_ID},
|
||||
#{SCREENINGDATE},
|
||||
#{LISTNAME},
|
||||
#{GOVERNSTANDARDS},
|
||||
#{GOVERNMETHOD},
|
||||
#{EXPENDITURE},
|
||||
#{PRINCIPAL},
|
||||
#{PROGRAMMING},
|
||||
#{TIMELIMITFOR},
|
||||
#{FILEPATH},
|
||||
#{JOBREQUIREMENT},
|
||||
#{OTHERBUSINESS},
|
||||
#{CORPINFO_ID},
|
||||
#{CREATOR},
|
||||
#{CREATTIME},
|
||||
#{OPERATOR},
|
||||
#{OPERATTIME},
|
||||
#{ISDELETE},
|
||||
#{HIDDENSCHEME_ID}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
HIDDENSCHEME_ID = #{HIDDENSCHEME_ID}
|
||||
</delete>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="deleteHd" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
HIDDEN_ID = #{HIDDEN_ID}
|
||||
and ISDELETE = '0'
|
||||
</delete>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
FILEPATH = #{FILEPATH},
|
||||
ISDELETE = #{ISDELETE},
|
||||
HIDDENSCHEME_ID = HIDDENSCHEME_ID
|
||||
where
|
||||
HIDDENSCHEME_ID = #{HIDDENSCHEME_ID}
|
||||
</update>
|
||||
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.HIDDENSCHEME_ID = #{HIDDENSCHEME_ID}
|
||||
</select>
|
||||
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="findByHdId" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.HIDDEN_ID = #{HIDDEN_ID}
|
||||
and f.ISDELETE = '0'
|
||||
</select>
|
||||
|
||||
<!-- 列表 -->
|
||||
<select id="datalistPage" parameterType="page" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.ISDELETE = '0'
|
||||
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
|
||||
and
|
||||
(
|
||||
<!-- 根据需求自己加检索条件
|
||||
字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
or
|
||||
字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
-->
|
||||
)
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listAll" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where 1=1
|
||||
<if test="CORPINFO_ID !=null and CORPINFO_ID !=''">
|
||||
and CORPINFO_ID = #{CORPINFO_ID}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<!-- 批量删除 -->
|
||||
<delete id="deleteAll" parameterType="String">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
HIDDENSCHEME_ID in
|
||||
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
|
@ -0,0 +1,184 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zcloud.mapper.datasource.hiddenApi.HiddenUserApiMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_HIDDEN_USER
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.HIDDEN_ID,
|
||||
f.USER_ID,
|
||||
f.TYPE,
|
||||
f.IS_MAIN,
|
||||
f.HIDDENUSER_ID
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
HIDDEN_ID,
|
||||
USER_ID,
|
||||
TYPE,
|
||||
IS_MAIN,
|
||||
HIDDENUSER_ID
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{HIDDEN_ID},
|
||||
#{USER_ID},
|
||||
#{TYPE},
|
||||
#{IS_MAIN},
|
||||
#{HIDDENUSER_ID}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="pd">
|
||||
delete from <include refid="tableName"></include> where HIDDEN_ID = #{HIDDEN_ID}
|
||||
</delete>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
HIDDEN_ID = #{HIDDEN_ID},
|
||||
USER_ID = #{USER_ID},
|
||||
TYPE = #{TYPE},
|
||||
IS_MAIN = #{IS_MAIN},
|
||||
HIDDENUSER_ID = HIDDENUSER_ID
|
||||
where
|
||||
HIDDENUSER_ID = #{HIDDENUSER_ID}
|
||||
</update>
|
||||
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.HIDDENUSER_ID = #{HIDDENUSER_ID}
|
||||
</select>
|
||||
|
||||
<!-- 列表 -->
|
||||
<select id="datalistPage" parameterType="page" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.ISDELETE = '0'
|
||||
</select>
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listAll" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>, u.* ,dept.NAME as deptName
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join vi_user_all u on u.USER_ID = f.USER_ID
|
||||
left join vi_department_all dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID
|
||||
where 1=1
|
||||
<if test="TYPE != null and TYPE != ''"><!-- 关键词检索 -->
|
||||
and TYPE = #{TYPE}
|
||||
</if>
|
||||
<if test="hiddenIds != null and hiddenIds != ''">
|
||||
and HIDDEN_ID in
|
||||
<foreach item="item" index="index" collection="hiddenIds" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="HIDDEN_ID != null and HIDDEN_ID != ''">
|
||||
and HIDDEN_ID = #{HIDDEN_ID}
|
||||
</if>
|
||||
</select>
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listAllUser" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>, u.* ,dept.NAME as deptName
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join vi_user_all u on u.USER_ID = f.USER_ID
|
||||
left join vi_department_all dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID
|
||||
where 1=1
|
||||
<if test="TYPE != null and TYPE != ''"><!-- 关键词检索 -->
|
||||
and TYPE = #{TYPE}
|
||||
</if>
|
||||
<if test="hiddenIds != null and hiddenIds != ''">
|
||||
and HIDDEN_ID in
|
||||
<foreach item="item" index="index" collection="hiddenIds" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="HIDDEN_ID != null and HIDDEN_ID != ''">
|
||||
and HIDDEN_ID = #{HIDDEN_ID}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<!-- 批量删除 -->
|
||||
<delete id="deleteAll" parameterType="String">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
HIDDENUSER_ID in
|
||||
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</delete>
|
||||
<!-- 根据隐患id删除数据 -->
|
||||
<delete id="deleteByHidden" parameterType="String">
|
||||
delete
|
||||
from
|
||||
<include refid="tableName"></include>
|
||||
where HIDDEN_ID = #{HIDDEN_ID}
|
||||
</delete>
|
||||
<!-- 列表(全部) -->
|
||||
<select id="getListByHidden" parameterType="String" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>, u.* ,dept.NAME as deptName
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join vi_user_all u on u.USER_ID = f.USER_ID
|
||||
left join vi_department_all dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID
|
||||
where 1=1
|
||||
and HIDDEN_ID = #{HIDDEN_ID}
|
||||
</select>
|
||||
<select id="getListByHiddenIds" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>, u.* ,dept.NAME as deptName
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join vi_user_all u on u.USER_ID = f.USER_ID
|
||||
left join vi_department_all dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID
|
||||
where 1=1
|
||||
<if test="TYPE != null and TYPE != ''"><!-- 关键词检索 -->
|
||||
and TYPE = #{TYPE}
|
||||
</if>
|
||||
<if test="hiddenIds != null and hiddenIds != ''">
|
||||
and HIDDEN_ID in
|
||||
<foreach item="item" index="index" collection="hiddenIds" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
</select>
|
||||
</mapper>
|
Loading…
Reference in New Issue