wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

清单检查情况完善隐患排查清单

pull/4/head
dearlin 2024-02-04 08:51:48 +08:00
parent 05927c3048
commit c886521b5b
5 changed files with 1384 additions and 1202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
src/main/java/com/zcloud/controller/check/CheckRecordController.java
View File

@ -9,6 +9,7 @@ import com.zcloud.logs.LogAnno;
import com.zcloud.service.check.*; import com.zcloud.service.check.*;
import com.zcloud.service.corp.CorpInfoService; import com.zcloud.service.corp.CorpInfoService;
import com.zcloud.service.hidden.HiddenService; import com.zcloud.service.hidden.HiddenService;
import com.zcloud.service.hiddenDangerCheckStandard.CustomCheckRecordService;
import com.zcloud.service.offduty.OffDutyService; import com.zcloud.service.offduty.OffDutyService;
import com.zcloud.service.sms.SMSLogService; import com.zcloud.service.sms.SMSLogService;
import com.zcloud.service.sms.SMSManagementService; import com.zcloud.service.sms.SMSManagementService;
@ -69,6 +70,7 @@ public class CheckRecordController extends BaseController {
private ListDisableTimeService listDisableTimeService; private ListDisableTimeService listDisableTimeService;
@Autowired @Autowired
private SendMessageUtil sendMessageUtil; private SendMessageUtil sendMessageUtil;
/** /**
* 新增 * 新增
* *
@ -79,7 +81,7 @@ public class CheckRecordController extends BaseController {
// @RequiresPermissions("checkrecord:add") // @RequiresPermissions("checkrecord:add")
@ResponseBody @ResponseBody
@Transactional @Transactional
@LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单排查",instructionsType = "新增记录") @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单排查", instructionsType = "新增记录")
public Object add() throws Exception { public Object add() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -101,7 +103,7 @@ public class CheckRecordController extends BaseController {
PageData list = listmanagerService.findById(pd); PageData list = listmanagerService.findById(pd);
String periodstart = ""; String periodstart = "";
String periodend = ""; String periodend = "";
if(!list.get("TYPE").toString().equals("listType0005")) { if (!list.get("TYPE").toString().equals("listType0005")) {
switch (list.get("PERIOD").toString()) { switch (list.get("PERIOD").toString()) {
case "checkPeriod0001": case "checkPeriod0001":
periodstart = sysdate.getString("DAY_START"); periodstart = sysdate.getString("DAY_START");
@ -243,7 +245,7 @@ public class CheckRecordController extends BaseController {
// @RequiresPermissions("checkrecord:del") // @RequiresPermissions("checkrecord:del")
@ResponseBody @ResponseBody
@Transactional @Transactional
@LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "删除检查记录") @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单检查情况", instructionsType = "删除检查记录")
public Object delete() throws Exception { public Object delete() throws Exception {
Map<String, String> map = new HashMap<String, String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
@ -264,7 +266,7 @@ public class CheckRecordController extends BaseController {
@RequestMapping(value = "/edit") @RequestMapping(value = "/edit")
// @RequiresPermissions("checkrecord:edit") // @RequiresPermissions("checkrecord:edit")
@ResponseBody @ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "修改") @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单检查情况", instructionsType = "修改")
public Object edit() throws Exception { public Object edit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -277,6 +279,7 @@ public class CheckRecordController extends BaseController {
/** /**
* 获取隐患数据 * 获取隐患数据
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -287,7 +290,7 @@ public class CheckRecordController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
map.put("pd",listcheckitemService.findHidden(pd)); map.put("pd", listcheckitemService.findHidden(pd));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -301,7 +304,7 @@ public class CheckRecordController extends BaseController {
@RequestMapping(value = "/list") @RequestMapping(value = "/list")
// @RequiresPermissions("checkrecord:list") // @RequiresPermissions("checkrecord:list")
@ResponseBody @ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "检查记录列表") @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单检查情况", instructionsType = "检查记录列表")
public Object list(Page page) throws Exception { public Object list(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -443,11 +446,10 @@ public class CheckRecordController extends BaseController {
varList = checkrecordService.list(page); // 列出CheckRecord列表 varList = checkrecordService.list(page); // 列出CheckRecord列表
}*/ }*/
page.setPd(pd); page.setPd(pd);
List<PageData> varList = checkrecordService.list(page); // 风险管控清单
PageData ls = listmanagerService.findById(pd); map.put("ls", listmanagerService.findById(pd));
map.put("varList", varList); map.put("varList", checkrecordService.list(page));
map.put("page", page); map.put("page", page);
map.put("ls", ls);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -479,7 +481,7 @@ public class CheckRecordController extends BaseController {
*/ */
@RequestMapping(value = "/goEdit") @RequestMapping(value = "/goEdit")
@ResponseBody @ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "去修改页面获取数据") @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单检查情况", instructionsType = "去修改页面获取数据")
public Object goEdit() throws Exception { public Object goEdit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -487,17 +489,17 @@ public class CheckRecordController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd = checkrecordService.findById(pd); // 根据ID读取 pd = checkrecordService.findById(pd); // 根据ID读取
PageData condition = new PageData(); PageData condition = new PageData();
condition.put("LISTMANAGER_ID",pd.getString("LISTMANAGER_ID")); condition.put("LISTMANAGER_ID", pd.getString("LISTMANAGER_ID"));
PageData listManager = listmanagerService.findById(condition); PageData listManager = listmanagerService.findById(condition);
pd.put("BAO_BAO_TYPE",listManager.getString("BAO_BAO_TYPE")); pd.put("BAO_BAO_TYPE", listManager.getString("BAO_BAO_TYPE"));
PageData users = checkuserService.getCheckUser(pd); PageData users = checkuserService.getCheckUser(pd);
List<PageData> varList = recordItemService.listAll(pd); List<PageData> varList = recordItemService.listAll(pd);
if(users != null) { if (users != null) {
pd.put("USERS", users.get("USERS")); pd.put("USERS", users.get("USERS"));
} }
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2.put("FOREIGN_KEY",pd.get("CHECKRECORD_ID")); pd2.put("FOREIGN_KEY", pd.get("CHECKRECORD_ID"));
pd2.put("TYPE","13"); pd2.put("TYPE", "13");
List<PageData> qianming = imgFilesService.listAll(pd2); List<PageData> qianming = imgFilesService.listAll(pd2);
@ -510,7 +512,7 @@ public class CheckRecordController extends BaseController {
@RequestMapping(value = "/goMap") @RequestMapping(value = "/goMap")
@ResponseBody @ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "获取地图信息") @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单检查情况", instructionsType = "获取地图信息")
public Object goMap() throws Exception { public Object goMap() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -889,7 +891,7 @@ public class CheckRecordController extends BaseController {
*/ */
@RequestMapping(value = "/goIndexCount") @RequestMapping(value = "/goIndexCount")
@ResponseBody @ResponseBody
@LogAnno(menuType= "首页",menuServer= "首页",instructionsOperate = "首页",instructionsType = "去修改页面获取数据") @LogAnno(menuType = "首页", menuServer = "首页", instructionsOperate = "首页", instructionsType = "去修改页面获取数据")
public Object goIndexCount() throws Exception { public Object goIndexCount() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -1219,7 +1221,7 @@ public class CheckRecordController extends BaseController {
@RequestMapping(value = "/allList") @RequestMapping(value = "/allList")
// @RequiresPermissions("checkrecord:list") // @RequiresPermissions("checkrecord:list")
@ResponseBody @ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "检查记录管理",instructionsType = "检查记录列表") @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "检查记录管理", instructionsType = "检查记录列表")
public Object allList(Page page) throws Exception { public Object allList(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -1232,31 +1234,31 @@ public class CheckRecordController extends BaseController {
npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE());
npd.put("SELF_DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); npd.put("SELF_DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID());
npd.put("ISMAIN",Jurisdiction.getIS_MAIN()); npd.put("ISMAIN", Jurisdiction.getIS_MAIN());
pd.put("USER_ID",Jurisdiction.getUSER_ID()); pd.put("USER_ID", Jurisdiction.getUSER_ID());
PageData cpd = new PageData(); PageData cpd = new PageData();
cpd = usersService.findById(pd); cpd = usersService.findById(pd);
npd.put("ISLEADER", cpd.getString("ISLEADER")); npd.put("ISLEADER", cpd.getString("ISLEADER"));
if(cpd.getString("ISLEADER") != null && cpd.getString("ISLEADER").equals("1")){ if (cpd.getString("ISLEADER") != null && cpd.getString("ISLEADER").equals("1")) {
String DEPARTMENT_ID = npd.getString("SELF_DEPARTMENT_ID"); String DEPARTMENT_ID = npd.getString("SELF_DEPARTMENT_ID");
String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID);
ids=npd.getString("SELF_DEPARTMENT_ID")+","+ids; //把自己部门插入进去 ids = npd.getString("SELF_DEPARTMENT_ID") + "," + ids; //把自己部门插入进去
if(ids!=null && Tools.notEmpty(ids)&& ids.lastIndexOf(",")>-1) { if (ids != null && Tools.notEmpty(ids) && ids.lastIndexOf(",") > -1) {
ids = ids.substring(0,ids.lastIndexOf(",")); ids = ids.substring(0, ids.lastIndexOf(","));
npd.put("DEPARTMENT_IDS", ids.split(",")); npd.put("DEPARTMENT_IDS", ids.split(","));
}else { } else {
npd.put("DEPARTMENT_IDS", DEPARTMENT_ID); npd.put("DEPARTMENT_IDS", DEPARTMENT_ID);
} }
}else { } else {
if(npd.getString("ISMAIN").equals("0")){ if (npd.getString("ISMAIN").equals("0")) {
npd.put("USER_ID",Jurisdiction.getUSER_ID()); npd.put("USER_ID", Jurisdiction.getUSER_ID());
} }
} }
npd.put("LISTMANAGER_ID",pd.getString("LISTMANAGER_ID")); npd.put("LISTMANAGER_ID", pd.getString("LISTMANAGER_ID"));
npd.put("DEPARTMENT_ID",pd.getString("DEPARTMENT_ID")); npd.put("DEPARTMENT_ID", pd.getString("DEPARTMENT_ID"));
npd.put("TYPE",pd.getString("TYPE")); npd.put("TYPE", pd.getString("TYPE"));
npd.put("STARTTIME",pd.getString("STARTTIME")); npd.put("STARTTIME", pd.getString("STARTTIME"));
npd.put("ENDTIME",pd.getString("ENDTIME")); npd.put("ENDTIME", pd.getString("ENDTIME"));
page.setPd(npd); page.setPd(npd);
List<PageData> varList = checkrecordService.list(page); List<PageData> varList = checkrecordService.list(page);
map.put("varList", varList); map.put("varList", varList);
@ -1268,6 +1270,7 @@ public class CheckRecordController extends BaseController {
/** /**
* 补录 * 补录
* TODO * TODO
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -1275,7 +1278,7 @@ public class CheckRecordController extends BaseController {
// @RequiresPermissions("checkrecord:add") // @RequiresPermissions("checkrecord:add")
@ResponseBody @ResponseBody
@Transactional @Transactional
@LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "补录") @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单检查情况", instructionsType = "补录")
public Object recording() throws Exception { public Object recording() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -1434,7 +1437,7 @@ public class CheckRecordController extends BaseController {
*/ */
@RequestMapping(value = "/monthStatistics") @RequestMapping(value = "/monthStatistics")
@ResponseBody @ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "员工清单检查情况",instructionsType = "员工清单检查情况（月）") @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "员工清单检查情况", instructionsType = "员工清单检查情况（月）")
public Object monthStatistics(Page page) throws Exception { public Object monthStatistics(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -1442,50 +1445,50 @@ public class CheckRecordController extends BaseController {
PageData npd = new PageData(); PageData npd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String month = pd.getString("MONTH"); String month = pd.getString("MONTH");
npd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
String DEPTIDS = pd.getString("DEPTIDS"); String DEPTIDS = pd.getString("DEPTIDS");
if(Tools.notEmpty(DEPTIDS)) { if (Tools.notEmpty(DEPTIDS)) {
String DEPT_IDS[] = DEPTIDS.split(","); String DEPT_IDS[] = DEPTIDS.split(",");
npd.put("DEPT_IDS", DEPT_IDS); npd.put("DEPT_IDS", DEPT_IDS);
} }
npd.put("ISMAIN", Jurisdiction.getIS_MAIN()); npd.put("ISMAIN", Jurisdiction.getIS_MAIN());
npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE());
npd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); npd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID());
pd.put("USER_ID",Jurisdiction.getUSER_ID()); pd.put("USER_ID", Jurisdiction.getUSER_ID());
PageData cpd = new PageData(); PageData cpd = new PageData();
cpd = usersService.findById(pd); cpd = usersService.findById(pd);
npd.put("ISLEADER", cpd.getString("ISLEADER")); npd.put("ISLEADER", cpd.getString("ISLEADER"));
if(cpd.getString("ISLEADER") != null && cpd.getString("ISLEADER").equals("1")){ if (cpd.getString("ISLEADER") != null && cpd.getString("ISLEADER").equals("1")) {
String DEPARTMENT_ID = npd.getString("DEPARTMENT_ID"); String DEPARTMENT_ID = npd.getString("DEPARTMENT_ID");
String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID);
ids=npd.getString("DEPARTMENT_ID")+","+ids; //把自己部门插入进去 ids = npd.getString("DEPARTMENT_ID") + "," + ids; //把自己部门插入进去
if(ids!=null && Tools.notEmpty(ids)&& ids.lastIndexOf(",")>-1) { if (ids != null && Tools.notEmpty(ids) && ids.lastIndexOf(",") > -1) {
ids = ids.substring(0,ids.lastIndexOf(",")); ids = ids.substring(0, ids.lastIndexOf(","));
npd.put("DEPARTMENT_IDS", ids.split(",")); npd.put("DEPARTMENT_IDS", ids.split(","));
}else { } else {
npd.put("DEPARTMENT_IDS", DEPARTMENT_ID); npd.put("DEPARTMENT_IDS", DEPARTMENT_ID);
} }
}else { } else {
if(npd.getString("ISMAIN").equals("0")){ if (npd.getString("ISMAIN").equals("0")) {
npd.put("USER_ID",Jurisdiction.getUSER_ID()); npd.put("USER_ID", Jurisdiction.getUSER_ID());
} }
} }
String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件
if (Tools.notEmpty(KEYWORDS)) if (Tools.notEmpty(KEYWORDS))
npd.put("KEYWORDS", KEYWORDS.trim()); npd.put("KEYWORDS", KEYWORDS.trim());
npd.put("USERNAME",pd.getString("USERNAME")); npd.put("USERNAME", pd.getString("USERNAME"));
page.setPd(npd); page.setPd(npd);
List<PageData> lists = listmanagerService.getListByCorplistPage(page); List<PageData> lists = listmanagerService.getListByCorplistPage(page);
if(lists!=null && lists.size()>0){ if (lists != null && lists.size() > 0) {
Map<String,Map> resmap = new HashMap<>(); Map<String, Map> resmap = new HashMap<>();
List<String> listIds = new ArrayList<>(); List<String> listIds = new ArrayList<>();
lists.forEach(list -> { lists.forEach(list -> {
resmap.put(list.getString("LISTMANAGER_ID"),new HashMap<String,Map>()); resmap.put(list.getString("LISTMANAGER_ID"), new HashMap<String, Map>());
listIds.add(list.getString("LISTMANAGER_ID")); listIds.add(list.getString("LISTMANAGER_ID"));
if(DateSysUtil.isSameMonth(list.getString("CREATTIME"),month)){//如果清单创建时间是查询月 if (DateSysUtil.isSameMonth(list.getString("CREATTIME"), month)) {//如果清单创建时间是查询月
List<String> datesInRange = DateSysUtil.getDatesInRange(month+"-01 00:00:00",list.getString("CREATTIME")); List<String> datesInRange = DateSysUtil.getDatesInRange(month + "-01 00:00:00", list.getString("CREATTIME"));
for (int i = 0; i < datesInRange.size()-1; i++) { for (int i = 0; i < datesInRange.size() - 1; i++) {
Map<String, String> data = new HashMap<String, String>(); Map<String, String> data = new HashMap<String, String>();
data.put("TYPE", "3"); data.put("TYPE", "3");
data.put("HIDDEN_COUNT", "-"); data.put("HIDDEN_COUNT", "-");
@ -1494,11 +1497,11 @@ public class CheckRecordController extends BaseController {
} }
}); });
if(listIds.size() > 0){ if (listIds.size() > 0) {
pd.put("LIST_IDS",listIds); pd.put("LIST_IDS", listIds);
List<PageData> recordList = checkrecordService.listForIdsAndMonth(pd);//获取查询月在检查周期内的检查记录 List<PageData> recordList = checkrecordService.listForIdsAndMonth(pd);//获取查询月在检查周期内的检查记录
recordList.forEach(record -> { recordList.forEach(record -> {
List<String> datesInRange = DateSysUtil.getDatesInRange(record.getString("PERIODSTART"),record.getString("PERIODEND")); List<String> datesInRange = DateSysUtil.getDatesInRange(record.getString("PERIODSTART"), record.getString("PERIODEND"));
for (int i = 0; i < datesInRange.size(); i++) { for (int i = 0; i < datesInRange.size(); i++) {
Map<String, String> data = new HashMap<String, String>(); Map<String, String> data = new HashMap<String, String>();
data.put("TYPE", record.getString("TYPE")); data.put("TYPE", record.getString("TYPE"));
@ -1514,10 +1517,10 @@ public class CheckRecordController extends BaseController {
}); });
} }
map.put("list",lists); map.put("list", lists);
map.put("resmap",resmap); map.put("resmap", resmap);
} }
map.put("page",page); map.put("page", page);
map.put("result", "success"); map.put("result", "success");
return map; return map;
} }

2
src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomCheckRecordController.java
View File

@ -491,7 +491,7 @@ public class CustomCheckRecordController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd = customCheckRecordService.findById(pd); // 根据ID读取 pd = customCheckRecordService.findById(pd); // 根据ID读取
PageData condition = new PageData(); PageData condition = new PageData();
condition.put("LISTMANAGER_ID",pd.getString("LISTMANAGER_ID")); condition.put("CUSTOM_ID",pd.getString("CUSTOM_ID"));
PageData listManager = customService.findById(condition); PageData listManager = customService.findById(condition);
pd.put("BAO_BAO_TYPE",listManager.getString("BAO_BAO_TYPE")); pd.put("BAO_BAO_TYPE",listManager.getString("BAO_BAO_TYPE"));
PageData users = checkuserService.getCheckUser(pd); PageData users = checkuserService.getCheckUser(pd);

185
src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml
View File

@ -212,7 +212,8 @@
<select id="datalistPage" parameterType="page" resultType="pd"> <select id="datalistPage" parameterType="page" resultType="pd">
select select
f.LISTMANAGER_ID, '1' LIST_TYPE,
f.LISTMANAGER_ID LIST_ID,
f.LIST_NAME, f.LIST_NAME,
f.CORPINFO_ID, f.CORPINFO_ID,
f.CREATOR, f.CREATOR,
@ -251,6 +252,12 @@
f.LISTMANAGER_ID = #{pd.LISTMANAGER_ID} f.LISTMANAGER_ID = #{pd.LISTMANAGER_ID}
) )
</if> </if>
<if test="pd.CUSTOM_ID != null and pd.CUSTOM_ID != ''">
and
(
f.LISTMANAGER_ID = #{pd.CUSTOM_ID}
)
</if>
<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''"> <if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
and and
( (
@ -366,8 +373,182 @@
</choose> </choose>
</otherwise> </otherwise>
</choose> </choose>
order by IFNULL( f.CHECK_TIME, f.PERIODEND ) desc
UNION
SELECT
'2' LIST_TYPE,
f.CUSTOM_ID LIST_ID,
l.NAME LIST_NAME,
f.CORPINFO_ID,
f.CREATOR,
f.CREATTIME,
f.OPERATOR,
f.OPERATTIME,
f.ISDELETE,
f.LONGITUDE,
f.LATITUDE,
f.CHECKRECORD_ID,
f.CHECK_TIME,
f.DESCR,
f.FINISHED,
f.TYPE,
f.PERIODSTART DATESTART,
f.PERIODEND DATEEND,
u.NAME AS USER_NAME,
su.NAME AS PRINCIPALNAME,
(
SELECT
group_concat(
IFNULL( bh.USER_NAME, chr.NAME ))
FROM
BUS_CHECKUSER bh
LEFT JOIN sys_user chr ON chr.USER_ID = bh.USER_ID
WHERE
bh.CHECKRECORD_ID = f.CHECKRECORD_ID
) CHECK_USERS
FROM
bus_hiddendangercheckstandard_checkrecord f
LEFT JOIN SYS_USER u ON u.USERNAME = f.CREATOR
LEFT JOIN bus_hiddendangercheckstandard_custom l ON l.CUSTOM_ID = f.CUSTOM_ID
LEFT JOIN SYS_USER su ON su.USER_ID = l.USER_ID
WHERE
f.ISDELETE = '0'
and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.FINISHED='1'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''">
and
(
f.LIST_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
</if>
<if test="pd.CUSTOM_ID != null and pd.CUSTOM_ID != ''">
and
(
f.CUSTOM_ID = #{pd.CUSTOM_ID}
)
</if>
<if test="pd.LISTMANAGER_ID != null and pd.LISTMANAGER_ID != ''">
and
(
f.CUSTOM_ID = #{pd.LISTMANAGER_ID}
)
</if>
<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
and
(
l.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
)
</if>
<!-- <if test="pd.STARTTIME != null and pd.STARTTIME != ''">
and DATE_FORMAT(f.CHECK_TIME,'%Y-%m-%d %H:%i:%s') &gt;= CONCAT(#{pd.STARTTIME},':00')
</if>
<if test="pd.ENDTIME != null and pd.ENDTIME != ''">
and DATE_FORMAT(f.CHECK_TIME,'%Y-%m-%d %H:%i:%s') &lt;= CONCAT(#{pd.ENDTIME},':59')
</if> -->
<choose>
<when test="pd.STARTTIME != null and pd.STARTTIME != '' and pd.ENDTIME != null and pd.ENDTIME != ''">
and DATE_FORMAT(CONCAT(#{pd.STARTTIME},' 00:00:00'),'%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(f.CREATTIME,'%Y-%m-%d %H:%i:%s')
and DATE_FORMAT(CONCAT(#{pd.ENDTIME},' 23:59:59'),'%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(f.CREATTIME,'%Y-%m-%d %H:%i:%s')
</when>
<otherwise>
<if test="pd.STARTINSPECTTIME != null and pd.STARTINSPECTTIME != ''">
and DATE_FORMAT(CONCAT(#{pd.STARTINSPECTTIME},' 00:00:00'),'%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(f.PERIODEND,'%Y-%m-%d %H:%i:%s')
</if>
<if test="pd.ENDINSPECTTIME != null and pd.ENDINSPECTTIME != ''">
and DATE_FORMAT(CONCAT(#{pd.ENDINSPECTTIME},' 23:59:59'),'%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(f.PERIODSTART,'%Y-%m-%d %H:%i:%s')
</if>
</otherwise>
</choose>
<if test="pd.TYPE != null and pd.TYPE != ''">
and f.TYPE= #{pd.TYPE}
<!-- <choose>
<when test='pd.TYPE=="1"'>
order by IFNULL( f.CHECK_TIME, f.PERIODEND ) desc
</when>
<when test='pd.TYPE=="2"'>
order by IFNULL( f.CHECK_TIME, f.PERIODEND ) desc
</when>
</choose> -->
</if>
<choose>
<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
and
u.DEPARTMENT_ID in
<foreach item="item" index="index"
collection="pd.DEPT_IDS" open="(" separator="," close=")">
'${item}'
</foreach>
</if>
</when>
<otherwise>
<choose>
<when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
<choose>
<when test='pd.ISLEADER != null and pd.ISLEADER != "" and pd.ISLEADER == "1"'>
and
EXISTS (
SELECT
1
FROM
BUS_CHECKUSER bh
LEFT JOIN SYS_USER chr ON chr.USER_ID = bh.USER_ID
WHERE
bh.CHECKRECORD_ID = f.CHECKRECORD_ID
AND ((chr.DEPARTMENT_ID IN ( SELECT SUB_DEPARTMENT_ID FROM oa_supervision_department
osd WHERE osd.SUP_DEPARTMENT_ID = #{pd.SELF_DEPARTMENT_ID} AND osd.ISDELETE = '0' AND
osd.CORPINFO_ID = #{pd.CORPINFO_ID} ) )
or (chr.DEPARTMENT_ID IN
<foreach item="item" index="index"
collection="pd.DEPARTMENT_IDS" open="(" separator="," close=")">
'${item}'
</foreach>) )
)
</when>
<otherwise>
and
EXISTS (
SELECT
1
FROM
BUS_CHECKUSER bh
LEFT JOIN SYS_USER chr ON chr.USER_ID = bh.USER_ID
WHERE
(bh.CHECKRECORD_ID = f.CHECKRECORD_ID
or chr.USER_ID = #{pd.USER_ID})
AND chr.DEPARTMENT_ID IN ( SELECT SUB_DEPARTMENT_ID FROM oa_supervision_department osd WHERE osd.SUP_DEPARTMENT_ID = #{pd.SELF_DEPARTMENT_ID} AND osd.ISDELETE = '0' AND osd.CORPINFO_ID = #{pd.CORPINFO_ID} ) )
</otherwise>
</choose>
</when>
<when test='pd.ISLEADER != null and pd.ISLEADER != "" and pd.ISLEADER == "1"'>
and
EXISTS (
SELECT
1
FROM
BUS_CHECKUSER bh
LEFT JOIN SYS_USER chr ON chr.USER_ID = bh.USER_ID
WHERE
bh.CHECKRECORD_ID = f.CHECKRECORD_ID
AND chr.DEPARTMENT_ID IN
<foreach item="item" index="index"
collection="pd.DEPARTMENT_IDS" open="(" separator="," close=")">
'${item}'
</foreach> )
</when>
<when test="pd.SELF_DEPARTMENT_ID != null and pd.SELF_DEPARTMENT_ID != ''">
and l.DEPARTMENT_ID=#{pd.SELF_DEPARTMENT_ID}
and l.USER_ID = #{pd.USER_ID}
</when>
<otherwise>
</otherwise>
</choose>
</otherwise>
</choose>
ORDER BY IFNULL( CHECK_TIME,DATEEND) desc
</select> </select>

3
src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.xml
View File

@ -157,8 +157,7 @@
select select
<include refid="Field"></include>, <include refid="Field"></include>,
(select h.HIDDEN_ID from BUS_HIDDENDANGERCHECKSTANDARD_HIDDEN h where h.RECORDITEM_ID=f.RECORDITEM_ID and h.CHECKRECORD_ID=f.CHECKRECORD_ID and h.ISDELETE= '0') as HIDDEN_ID, (select h.HIDDEN_ID from BUS_HIDDENDANGERCHECKSTANDARD_HIDDEN h where h.RECORDITEM_ID=f.RECORDITEM_ID and h.CHECKRECORD_ID=f.CHECKRECORD_ID and h.ISDELETE= '0') as HIDDEN_ID,
( select count(1) from bus_imgfiles i where i.FOREIGN_KEY = f.RECORDITEM_ID and i.TYPE = '14' ) AS IMGCOUNT, ( select count(1) from bus_imgfiles i where i.FOREIGN_KEY = f.RECORDITEM_ID and i.TYPE = '14' ) AS IMGCOUNT
r.IDENTIFICATION_ID
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
where f.CHECKRECORD_ID=#{CHECKRECORD_ID} where f.CHECKRECORD_ID=#{CHECKRECORD_ID}

3
src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml
View File

@ -210,7 +210,6 @@
order by IFNULL( f.CHECK_TIME, f.PERIODEND ) desc order by IFNULL( f.CHECK_TIME, f.PERIODEND ) desc
</select> </select>
<select id="datalistPage" parameterType="page" resultType="pd"> <select id="datalistPage" parameterType="page" resultType="pd">
select select
f.CUSTOM_ID, f.CUSTOM_ID,
f.CORPINFO_ID, f.CORPINFO_ID,
@ -247,7 +246,7 @@
<if test="pd.CUSTOM_ID != null and pd.CUSTOM_ID != ''"> <if test="pd.CUSTOM_ID != null and pd.CUSTOM_ID != ''">
and and
( (
f.CUSTOM_ID = #{CUSTOM_ID} f.CUSTOM_ID = #{pd.CUSTOM_ID}
) )
</if> </if>
<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''"> <if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">