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

Merge remote-tracking branch 'origin/czks1.0' into czks1.0

pull/14/head
z 2023-12-19 17:27:26 +08:00
parent e74db7d77c 9843400cb3
commit 3aa8b0d9af
58 changed files with 887 additions and 971 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/main/java/com/zcloud/controller/app/highriskwork/AppConfinedSpaceController.java
View File

@ -6,6 +6,7 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.logs.LogAnno;
import com.zcloud.service.bus.CorpInfoService;
import com.zcloud.service.bus.MSMLoginService;
import com.zcloud.service.bus.NoticeCorpService;
@ -21,9 +22,7 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
@ -58,6 +57,9 @@ public class AppConfinedSpaceController extends BaseController {
@Autowired
private NoticeCorpService noticeCorpService;
@Autowired
private SendMessageUtil sendMessageUtil;
/**新增
* @param
* @throws Exception
@ -551,4 +553,93 @@ public class AppConfinedSpaceController extends BaseController {
map.put("count", count);
return map;
}
/**作废
* @param out
* @throws Exception
*/
@PostMapping(value="/cancel")
@ResponseBody
@LogAnno(menuType= "手机",menuServer= "受限空间",instructionsOperate = "受限空间",instructionsType = "作废")
public void cancel(@RequestBody PageData pd) throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
System.out.println(JSONObject.toJSONString(pd));
PageData cpd = new PageData();
cpd = confinedspaceService.findById(pd);
if(cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_USER_SIGNER_TIME") != null){
return;
}else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") == null){
pd.put("APPLY_STATUS",-98);
confinedspaceService.cancel(pd);
PageData pd2 = new PageData();
pd2 = confinedspaceService.checkno(pd);
PageData pd3 = new PageData();
pd3.put("CHECK_NO",pd2.getString("CHECK_NO"));
pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID"));
confinedspaceService.editSpecialwork(pd3);
confinedspaceService.editSpecialwork1(pd3);
confinedspaceService.editSpecialwork2(pd3);
confinedspaceService.editSpecialwork3(pd3);
confinedspaceService.editSpecialwork4(pd3);
confinedspaceService.editSpecialwork5(pd3);
confinedspaceService.editSpecialwork6(pd3);
confinedspaceService.editSpecialwork7(pd3);
PageData mes = new PageData();
mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid
mes.put("templateCode", "YX_ZF1");// 短信模板编码
mes.put("SMSCode", "SMS_462060039");// 短信模板编码
mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList = new ArrayList<PageData>();
// 第1个参数
PageData params1 = new PageData();
params1.put("name", "number");// 存入短信模板中的参数名称
params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList.add(params1);
// 第2个参数
PageData params2 = new PageData();
params2.put("name", "params1");// 存入短信模板中的参数名称
params2.put("value", "受限空间作业");// 存入上面参数名称所传递的值
paramsList.add(params2);
sendMessageUtil.sendMessages(mes, paramsList);
}else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_USER_SIGNER_TIME") == null){
pd.put("APPLY_STATUS",-99);
confinedspaceService.cancel(pd);
PageData pd2 = new PageData();
pd2 = confinedspaceService.checkno(pd);
PageData pd3 = new PageData();
pd3.put("CHECK_NO",pd2.getString("CHECK_NO"));
pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID"));
confinedspaceService.editSpecialwork(pd3);
confinedspaceService.editSpecialwork1(pd3);
confinedspaceService.editSpecialwork2(pd3);
confinedspaceService.editSpecialwork3(pd3);
confinedspaceService.editSpecialwork4(pd3);
confinedspaceService.editSpecialwork5(pd3);
confinedspaceService.editSpecialwork6(pd3);
confinedspaceService.editSpecialwork7(pd3);
PageData mes = new PageData();
mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid
mes.put("templateCode", "YX_ZF2");// 短信模板编码
mes.put("SMSCode", "SMS_462060039");// 短信模板编码
mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList = new ArrayList<PageData>();
// 第1个参数
PageData params1 = new PageData();
params1.put("name", "number");// 存入短信模板中的参数名称
params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList.add(params1);
// 第2个参数
PageData params2 = new PageData();
params2.put("name", "params1");// 存入短信模板中的参数名称
params2.put("value", "受限空间作业");// 存入上面参数名称所传递的值
paramsList.add(params2);
sendMessageUtil.sendMessages(mes, paramsList);
}
map.put("result", errInfo); //返回结果
return ;
}
}

101
src/main/java/com/zcloud/controller/app/highriskwork/AppElectricityController.java
View File

@ -6,6 +6,7 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.logs.LogAnno;
import com.zcloud.service.bus.CorpInfoService;
import com.zcloud.service.bus.MSMLoginService;
import com.zcloud.service.bus.NoticeCorpService;
@ -22,12 +23,12 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@ -60,6 +61,9 @@ public class AppElectricityController extends BaseController {
private NoticeCorpService noticeCorpService;
@Autowired
private DepartmentService departmentService;
@Autowired
private SendMessageUtil sendMessageUtil;
/**新增
* @param
* @throws Exception
@ -1160,4 +1164,95 @@ public class AppElectricityController extends BaseController {
map.put("count", count);
return map;
}
/**作废
* @param out
* @throws Exception
*/
@PostMapping(value="/cancel")
@ResponseBody
@LogAnno(menuType= "手机",menuServer= "受限空间",instructionsOperate = "受限空间",instructionsType = "作废")
public void cancel(@RequestBody PageData pd) throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
System.out.println(JSONObject.toJSONString(pd));
PageData cpd = new PageData();
cpd = electricityService.findById(pd);
if(cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null){
String WORK_START_DATE = pd.getString("WORK_START_DATE");
String ANALYZE_TIME = cpd.getString("ANALYZE_TIME");
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
System.out.println(WORK_START_DATE);
System.out.println(ANALYZE_TIME);
System.out.println("-------------123----------");
try {
Date date1 = format.parse(WORK_START_DATE);
Date date2 = format.parse(ANALYZE_TIME);
long workTime = date1.getTime();
long analyzeTime = date2.getTime();
System.out.println(workTime - analyzeTime);
System.out.println(analyzeTime - workTime);
if (workTime - analyzeTime >= 0) {
return;
} else {
electricityService.cancel(pd);
PageData mes = new PageData();
mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid
mes.put("templateCode", "YD_ZF");// 短信模板编码
mes.put("SMSCode", "SMS_462060039");// 短信模板编码
mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList = new ArrayList<PageData>();
// 第1个参数
PageData params1 = new PageData();
params1.put("name", "number");// 存入短信模板中的参数名称
params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList.add(params1);
// 第2个参数
PageData params2 = new PageData();
params2.put("name", "params1");// 存入短信模板中的参数名称
params2.put("value", "临时用电安全作业");// 存入上面参数名称所传递的值
paramsList.add(params2);
sendMessageUtil.sendMessages(mes, paramsList);
}
} catch (ParseException e) {
e.printStackTrace();
}
}else{
electricityService.cancel(pd);
PageData pd2 = new PageData();
pd2 = electricityService.checkno(pd);
PageData pd3 = new PageData();
pd3.put("CHECK_NO",pd2.getString("CHECK_NO"));
pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID"));
electricityService.editSpecialwork(pd3);
electricityService.editSpecialwork1(pd3);
electricityService.editSpecialwork2(pd3);
electricityService.editSpecialwork3(pd3);
electricityService.editSpecialwork4(pd3);
electricityService.editSpecialwork5(pd3);
electricityService.editSpecialwork6(pd3);
electricityService.editSpecialwork7(pd3);
PageData mes = new PageData();
mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid
mes.put("templateCode", "YD_ZF");// 短信模板编码
mes.put("SMSCode", "SMS_462060039");// 短信模板编码
mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList = new ArrayList<PageData>();
// 第1个参数
PageData params1 = new PageData();
params1.put("name", "number");// 存入短信模板中的参数名称
params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList.add(params1);
// 第2个参数
PageData params2 = new PageData();
params2.put("name", "params1");// 存入短信模板中的参数名称
params2.put("value", "临时用电安全作业");// 存入上面参数名称所传递的值
paramsList.add(params2);
sendMessageUtil.sendMessages(mes, paramsList);
}
map.put("result", errInfo); //返回结果
return ;
}
}

48
src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java
View File

@ -88,22 +88,24 @@ public class AppHomeController extends BaseController {
if(!Tools.isEmpty(pd.get("USER_ID"))){
varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID"));
PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID"));
if (varList.size() > 0) {
boolean isDelayedExist = false;
for (PageData data : varList) {
if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true;
}
if (isDelayedExist) {
for (PageData pageData : varList){
if (StringUtils.equals(pageData.getString("STATE"),"10")) {
pageData.put("count",delayedCount.getString("count"));
if (Integer.parseInt(delayedCount.getString("count")) != 0) {
if (varList.size() > 0) {
boolean isDelayedExist = false;
for (PageData data : varList) {
if (StringUtils.equals(data.getString("STATE"), "10")) isDelayedExist = true;
}
if (isDelayedExist) {
for (PageData pageData : varList) {
if (StringUtils.equals(pageData.getString("STATE"), "10")) {
pageData.put("count", delayedCount.getString("count"));
}
}
} else {
varList.add(delayedCount);
}
} else {
varList.add(delayedCount);
}
} else {
varList.add(delayedCount);
}
myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID"));
}
@ -146,22 +148,24 @@ public class AppHomeController extends BaseController {
if(!Tools.isEmpty(pd.get("USER_ID"))){
varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID"));
PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID"));
if (varList.size() > 0) {
boolean isDelayedExist = false;
for (PageData data : varList) {
if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true;
}
if (isDelayedExist) {
for (PageData pageData : varList){
if (StringUtils.equals(pageData.getString("STATE"),"10")) {
pageData.put("count",delayedCount.getString("count"));
if (Integer.parseInt(delayedCount.getString("count")) != 0) {
if (varList.size() > 0) {
boolean isDelayedExist = false;
for (PageData data : varList) {
if (StringUtils.equals(data.getString("STATE"), "10")) isDelayedExist = true;
}
if (isDelayedExist) {
for (PageData pageData : varList) {
if (StringUtils.equals(pageData.getString("STATE"), "10")) {
pageData.put("count", delayedCount.getString("count"));
}
}
} else {
varList.add(delayedCount);
}
} else {
varList.add(delayedCount);
}
} else {
varList.add(delayedCount);
}
myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID"));
}

98
src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java
View File

@ -746,42 +746,44 @@ public class AppHotWorkApplicationController extends BaseController {
}
}
PageData hotUser = new PageData();
hotUser.put("hotIds", hotIds);
List<PageData> hotUserAllList = hotWorkApplicationUserService.listAll(hotUser);
for (PageData userPageData : hotUserAllList){
String hotAndType = userPageData.getString("FOREIGN_KEY");
if(hotIdKeyMap.containsKey(hotAndType)){
PageData hot = varList.get(hotIdKeyMap.get(hotAndType));
String type = userPageData.get("STATE").toString();
if("0".equals(type)){ // 申请办理人
hot.put("APPLY_DEPARTMENT_NAME",userPageData.getString("deptName"));
hot.put("APPLY_USER_NAME",userPageData.getString("userName"));
hot.put("APPLY_USER_ID",userPageData.getString("USER_ID"));
}else if("1".equals(type)){ //动火单位负责人
hot.put("HOT_WORK_UNIT_LEADER_NAME",userPageData.getString("userName"));
hot.put("HOT_WORK_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
}else if("2".equals(type)){ // 项目发包单位负责人
hot.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName"));
hot.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
}else if("3".equals(type)){ // 现场管辖单位负责人
hot.put("UNIT_LEADER_NAME",userPageData.getString("userName"));
hot.put("UNIT_LEADER_ID",userPageData.getString("USER_ID"));
}else if("5".equals(type)){ // 动火前 负责人
hot.put("HOT_WORK_BEFORE_UNIT_LEADER",userPageData.getString("userName"));
}else if("6".equals(type)){ // 现场负责人
hot.put("SITE_LEADER_NAME",userPageData.getString("userName"));
hot.put("SITE_LEADER_PHONE",userPageData.getString("userPhone"));
}else if("7".equals(type)){ // 动火后 负责人
hot.put("HOT_WORK_AFTER_UNIT_LEADER",userPageData.getString("userName"));
} else if("11".equals(type)){ // 特级动火 申请人
hot.put("DEPARTMENT_PERSONNEL_NAME",userPageData.getString("userName"));
hot.put("DEPARTMENT_PERSONNEL_ID",userPageData.getString("USER_ID"));
}else if("20".equals(type)){ // 特级动火 申请人
hot.put("SUPERVISOR_OF_HOT_WORK_UNIT",userPageData.getString("USER_ID"));
}else if("21".equals(type)){ // 动火后 负责人
String userName = userPageData.getString("userName2") +",";
String oldName = Tools.isEmpty(pd.get("HOT_WORK_OPERATOR_NAME"))?"":pd.get("HOT_WORK_OPERATOR_NAME").toString();
hot.put("HOT_WORK_OPERATOR_NAME",oldName + userName);
if (hotIds.size() > 0) {
hotUser.put("hotIds", hotIds);
List<PageData> hotUserAllList = hotWorkApplicationUserService.listAll(hotUser);
for (PageData userPageData : hotUserAllList){
String hotAndType = userPageData.getString("FOREIGN_KEY");
if(hotIdKeyMap.containsKey(hotAndType)){
PageData hot = varList.get(hotIdKeyMap.get(hotAndType));
String type = userPageData.get("STATE").toString();
if("0".equals(type)){ // 申请办理人
hot.put("APPLY_DEPARTMENT_NAME",userPageData.getString("deptName"));
hot.put("APPLY_USER_NAME",userPageData.getString("userName"));
hot.put("APPLY_USER_ID",userPageData.getString("USER_ID"));
}else if("1".equals(type)){ //动火单位负责人
hot.put("HOT_WORK_UNIT_LEADER_NAME",userPageData.getString("userName"));
hot.put("HOT_WORK_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
}else if("2".equals(type)){ // 项目发包单位负责人
hot.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName"));
hot.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
}else if("3".equals(type)){ // 现场管辖单位负责人
hot.put("UNIT_LEADER_NAME",userPageData.getString("userName"));
hot.put("UNIT_LEADER_ID",userPageData.getString("USER_ID"));
}else if("5".equals(type)){ // 动火前 负责人
hot.put("HOT_WORK_BEFORE_UNIT_LEADER",userPageData.getString("userName"));
}else if("6".equals(type)){ // 现场负责人
hot.put("SITE_LEADER_NAME",userPageData.getString("userName"));
hot.put("SITE_LEADER_PHONE",userPageData.getString("userPhone"));
}else if("7".equals(type)){ // 动火后 负责人
hot.put("HOT_WORK_AFTER_UNIT_LEADER",userPageData.getString("userName"));
} else if("11".equals(type)){ // 特级动火 申请人
hot.put("DEPARTMENT_PERSONNEL_NAME",userPageData.getString("userName"));
hot.put("DEPARTMENT_PERSONNEL_ID",userPageData.getString("USER_ID"));
}else if("20".equals(type)){ // 特级动火 申请人
hot.put("SUPERVISOR_OF_HOT_WORK_UNIT",userPageData.getString("USER_ID"));
}else if("21".equals(type)){ // 动火后 负责人
String userName = userPageData.getString("userName2") +",";
String oldName = Tools.isEmpty(pd.get("HOT_WORK_OPERATOR_NAME"))?"":pd.get("HOT_WORK_OPERATOR_NAME").toString();
hot.put("HOT_WORK_OPERATOR_NAME",oldName + userName);
}
}
}
}
@ -1361,22 +1363,24 @@ public class AppHotWorkApplicationController extends BaseController {
if(!Tools.isEmpty(pd.get("USER_ID"))){
varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID"));
PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID"));
if (varList.size() > 0) {
boolean isDelayedExist = false;
for (PageData data : varList) {
if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true;
}
if (isDelayedExist) {
for (PageData pageData : varList){
if (StringUtils.equals(pageData.getString("STATE"),"10")) {
pageData.put("count",delayedCount.getString("count"));
if (Integer.parseInt(delayedCount.getString("count")) != 0) {
if (varList.size() > 0) {
boolean isDelayedExist = false;
for (PageData data : varList) {
if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true;
}
if (isDelayedExist) {
for (PageData pageData : varList){
if (StringUtils.equals(pageData.getString("STATE"),"10")) {
pageData.put("count",delayedCount.getString("count"));
}
}
} else {
varList.add(delayedCount);
}
} else {
varList.add(delayedCount);
}
} else {
varList.add(delayedCount);
}
myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID"));
}

6
src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java
View File

@ -3,11 +3,12 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.dto.mq.TenCorpDto;
import com.zcloud.dto.TenCorpConst;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mq.util.TenCorpConst;
import com.zcloud.service.gf.*;
import com.zcloud.service.mq.SendMessageService;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -16,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartRequest;
import com.zcloud.mq.service.SendMessageService;
import javax.annotation.Resource;
import java.text.DecimalFormat;

9
src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java
View File

@ -3,12 +3,12 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.dto.mq.Response;
import com.zcloud.dto.mq.TenCorpDto;
import com.zcloud.dto.TenCorpConst;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mq.util.TenCorpConst;
import com.zcloud.service.gf.*;
import com.zcloud.service.mq.SendMessageService;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartRequest;
import com.zcloud.mq.service.SendMessageService;
import javax.annotation.Resource;
import java.text.DecimalFormat;
@ -182,8 +181,6 @@ public class AppGFElectricityController extends BaseController {
}
/**删除
* @param out
* @throws Exception
*/
@RequestMapping(value="/delete")
@ResponseBody

9
src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java
View File

@ -3,13 +3,12 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.dto.mq.Response;
import com.zcloud.dto.mq.TenCorpDto;
import com.zcloud.dto.TenCorpConst;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mq.service.SendMessageService;
import com.zcloud.mq.util.TenCorpConst;
import com.zcloud.service.gf.*;
import com.zcloud.service.mq.SendMessageService;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -195,8 +194,6 @@ public class AppGFHotworkController extends BaseController {
}
/**修改
* @param
* @throws Exception
*/
@RequestMapping(value="/edit")
@ResponseBody

14
src/main/java/com/zcloud/controller/mq/EightWorkListener.java
View File

@ -1,6 +1,8 @@
package com.zcloud.controller.mq;
import com.alibaba.fastjson.JSON;
import com.zcloud.controller.app.highriskwork.AppConfinedSpaceController;
import com.zcloud.controller.app.highriskwork.AppElectricityController;
import com.zcloud.controller.app.highriskwork.AppHotworkCfdController;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.entity.PageData;
@ -30,10 +32,10 @@ import java.util.Date;
public class EightWorkListener implements RocketMQListener<String> {
// @Resource
// private AppConfinedSpaceController appConfinedSpaceController;
// @Resource
// private AppElectricityController appElectricityController;
@Resource
private AppConfinedSpaceController appConfinedSpaceController;
@Resource
private AppElectricityController appElectricityController;
@Resource
private AppHotworkCfdController appHotworkCfdController;
@ -64,11 +66,11 @@ public class EightWorkListener implements RocketMQListener<String> {
switch (data.getMessage()){
case "confined-space":
System.out.println("受限空间模块消费");
// appConfinedSpaceController.cancel(data.getData());
appConfinedSpaceController.cancel(data.getData());
break;
case "electricity":
System.out.println("临时用电模块消费");
// appElectricityController.cancel(data.getData());
appElectricityController.cancel(data.getData());
break;
case "hot-work":
System.out.println("动火模块消费");

68
src/main/java/com/zcloud/dto/mq/Response.java
View File

@ -1,68 +0,0 @@
package com.zcloud.dto.mq;
import com.alibaba.fastjson.JSON;
import lombok.Data;
@Data
public class Response {
private String result;
private String exception;
private String code;
private String message;
public Response Ok() {
this.result = "succeed";
this.code = "0";
return this;
}
public static Response OK() {
Response response = new Response();
response.result = "succeed";
response.code = "0";
return response;
}
public Response Error() {
this.result = "succeed";
this.code = "9999";
this.exception = "系统异常";
return this;
}
public Response Error(String errorMessage) {
this.result = "succeed";
this.code = "9999";
this.exception = errorMessage;
return this;
}
public Response Error(String code, String errorMessage) {
this.result = "succeed";
this.code = code;
this.exception = errorMessage;
return this;
}
public static Response ERROR() {
Response response = new Response();
response.result = "succeed";
response.code = "0";
return response;
}
public static Response ERROR(String errorMessage) {
Response response = new Response();
response.result = "succeed";
response.code = "9999";
response.exception = errorMessage;
return response;
}
public void setMessage(Object obj) {
this.message = JSON.toJSONString(obj);
}
}

46
src/main/java/com/zcloud/dto/mq/TenCorpDto.java
View File

@ -1,46 +0,0 @@
package com.zcloud.dto.mq;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.entity.PageData;
import com.zcloud.util.Warden;
import lombok.Data;
@Data
public class TenCorpDto {
// 请秋id
private String id;
// 消息来源名称
private String producer_name;
private String topic;
//印记(方便寻找该条请求)
private String mark;
// 标记名称
private String mark_name;
// 消息发送时间(yyyy-MM-dd HH:mm:ss:SSS)
private String time_stamp;
// 消息体
private String message;
private PageData data;
public TenCorpDto() {
this.id = Warden.get32UUID();
}
@Override
public String toString() {
return JSON.toJSONString(this);
}
public PageData getPd() {
PageData info = new PageData();
info.put("ID", this.id);
info.put("PRODUCER_NAME", this.producer_name);
info.put("MARK", this.mark);
info.put("MARK_NAME", this.mark_name);
info.put("MESSAGE", JSONObject.toJSONString(this.data));
info.put("TOPIC",this.topic);
return info;
}
}

10
src/main/java/com/zcloud/mapper/datasource/highriskwork/ConfinedSpaceMapper.java
View File

@ -63,5 +63,15 @@ public interface ConfinedSpaceMapper {
* @return
*/
PageData countCheck(PageData pd);
void cancel(PageData pd);
PageData checkno(PageData pd);
void editSpecialwork(PageData pd);
void editSpecialwork1(PageData pd);
void editSpecialwork2(PageData pd);
void editSpecialwork3(PageData pd);
void editSpecialwork4(PageData pd);
void editSpecialwork5(PageData pd);
void editSpecialwork6(PageData pd);
void editSpecialwork7(PageData pd);
}

11
src/main/java/com/zcloud/mapper/datasource/highriskwork/ElectricityMapper.java
View File

@ -77,5 +77,16 @@ public interface ElectricityMapper{
*/
int numberCheck(PageData pd);
PageData getCode(PageData pd);
void cancel(PageData pd);
PageData checkno(PageData pd);
void editSpecialwork(PageData pd);
void editSpecialwork1(PageData pd);
void editSpecialwork2(PageData pd);
void editSpecialwork3(PageData pd);
void editSpecialwork4(PageData pd);
void editSpecialwork5(PageData pd);
void editSpecialwork6(PageData pd);
void editSpecialwork7(PageData pd);
}

87
src/main/java/com/zcloud/mq/controller/EightWorkListener.java
View File

@ -1,87 +0,0 @@
package com.zcloud.mq.controller;
import com.alibaba.fastjson.JSON;
import com.zcloud.controller.gf.GFEightWorkController;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.mq.MqMessageLogMapper;
import com.zcloud.dto.mq.TenCorpDto;
import com.zcloud.mq.service.LogService;
import com.zcloud.mq.service.SendMessageService;
import com.zcloud.mq.util.MqUtil;
import com.zcloud.util.DateUtil;
import com.zcloud.util.Warden;
import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
import org.apache.rocketmq.spring.annotation.SelectorType;
import org.apache.rocketmq.spring.core.RocketMQListener;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Date;
/**
* 说明：消费某个 topic 下指定 tag 的消息 对接课件DEMO
* 作者：wangxuan
* 官网：www.zcloudchina.com
*/
@Component
@RocketMQMessageListener(consumerGroup = "${mq.group.eightWork}",
topic = "${mq.topic.eightWork}",
selectorType = SelectorType.TAG)
public class EightWorkListener implements RocketMQListener<String> {
@Resource
private GFEightWorkController eightWorkClient;
@Resource
private SendMessageService sendMessageService;
@Resource
private LogService logService;
@Resource
private MqMessageLogMapper mqMessageLogMapper;
@Override
public void onMessage(String message) {
TenCorpDto data = JSON.parseObject(message, TenCorpDto.class);
PageData log = data.getPd();
log.put("MESSAGE_LOG_ID", Warden.get32UUID());
log.put("CREATE_TIME", DateUtil.getTime());
log.put("PRODUCER_NAME",data.getProducer_name());
log.put("TYPE","1");
try {
System.out.println("消费者:" + data.toString());
Date limit_date = MqUtil.dateFormat(data.getTime_stamp());
if (limit_date.getTime() - new Date().getTime() > 1000) {
sendMessageService.SendDelayQueue(data);
log.put("DIGESTION_FLAG","0");
} else {
switch (data.getMessage()){
case "confined-space":
System.out.println("受限空间模块消费");
// eightWorkClient.confinedSpaceCancel(data.getData());
break;
case "electricity":
System.out.println("临时用电模块消费");
// eightWorkClient.electricityCancel(data.getData());
break;
case "hot-work":
System.out.println("动火模块消费");
// eightWorkClient.hotWorkCancel(data.getData());
break;
default:
System.out.println("异常模块不消费");
throw new RuntimeException("未找到对应的消费者");
}
log.put("DIGESTION_FLAG","1");
}
mqMessageLogMapper.save(log);
} catch (Exception e) {
e.printStackTrace();
logService.saveErrorMessage(log,e.getMessage());
throw new RuntimeException(e);
}
}
}

32
src/main/java/com/zcloud/mq/controller/MqListener.java
View File

@ -1,32 +0,0 @@
package com.zcloud.mq.controller;
import com.alibaba.fastjson.JSON;
import com.zcloud.dto.mq.TenCorpDto;
import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
import org.apache.rocketmq.spring.annotation.SelectorType;
import org.apache.rocketmq.spring.core.RocketMQListener;
import org.springframework.stereotype.Component;
/**
* 说明：消费某个 topic 下指定 tag 的消息 对接课件DEMO
* 作者：wangxuan
* 官网：www.zcloudchina.com
*/
@Component
@RocketMQMessageListener(consumerGroup = "${mq.group.info}",
topic = "${mq.topic.info}",
selectorType = SelectorType.TAG)
public class MqListener implements RocketMQListener<String> {
@Override
public void onMessage(String message) {
TenCorpDto data = JSON.parseObject(message, TenCorpDto.class);
try {
System.out.println("2消费者:" + data.toString());
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
}
}
}

54
src/main/java/com/zcloud/mq/controller/SendController.java
View File

@ -1,54 +0,0 @@
package com.zcloud.mq.controller;
import com.zcloud.controller.base.BaseController;
import com.zcloud.dto.mq.Response;
import com.zcloud.dto.mq.TenCorpDto;
import com.zcloud.mq.service.SendMessageService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 说明：TODO
* 作者：wangxuan
* 官网：www.zcloudchina.com
*/
@RestController
@RequestMapping("/messageQueue")
public class SendController extends BaseController {
@Resource
private SendMessageService sendMessageService;
@RequestMapping("/sendMessage")
public Response sendMessage(@RequestParam("tenCorpDto") TenCorpDto tenCorpDto) throws Exception {
try {
sendMessageService.sendMessage(tenCorpDto);
} catch (Exception e) {
e.printStackTrace();
}
return Response.OK();
}
@PostMapping("SendTimelyQueue")
public Response timelyQueue(@RequestBody TenCorpDto tenCorpDto) throws Exception {
try {
sendMessageService.sendMessage(tenCorpDto);
} catch (Exception e) {
e.printStackTrace();
}
return Response.OK();
}
@PostMapping("/SendDelayQueue")
public Response SendDelayQueue(@RequestBody TenCorpDto tenCorpDto) throws Exception {
try {
sendMessageService.SendDelayQueue(tenCorpDto);
return Response.OK();
} catch (Exception e) {
e.printStackTrace();
return Response.ERROR(e.getMessage());
}
}
}

11
src/main/java/com/zcloud/mq/service/LogService.java
View File

@ -1,11 +0,0 @@
package com.zcloud.mq.service;
import com.zcloud.entity.PageData;
public interface LogService {
void saveLog(PageData pageData);
void saveLog(PageData pageData,String type);
void saveErrorMessage(PageData pageData,String errorMessage);
}

11
src/main/java/com/zcloud/mq/service/SendMessageService.java
View File

@ -1,11 +0,0 @@
package com.zcloud.mq.service;
import com.zcloud.dto.mq.TenCorpDto;
public interface SendMessageService {
void sendMessage(TenCorpDto tenCorpDto) throws Exception;
void SendDelayQueue(TenCorpDto tenCorpDto);
void SendDelayQueue(String message);
}

43
src/main/java/com/zcloud/mq/service/impl/LogServiceImpl.java
View File

@ -1,43 +0,0 @@
package com.zcloud.mq.service.impl;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.mq.MqErrorMessageLogMapper;
import com.zcloud.mapper.datasource.mq.MqMessageLogMapper;
import com.zcloud.mq.service.LogService;
import com.zcloud.util.DateUtil;
import com.zcloud.util.Warden;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class LogServiceImpl implements LogService {
@Resource
private MqErrorMessageLogMapper mqErrorMessageLogMapper;
@Resource
private MqMessageLogMapper mqMessageLogMapper;
@Override
@Async
public void saveLog(PageData pageData) {
this.saveLog(pageData,"0");
}
@Override
public void saveLog(PageData pageData, String type) {
}
@Override
@Async
public void saveErrorMessage(PageData log,String errorMessage) {
log.put("ERROR_MESSAGE", errorMessage);
log.put("MESSAGE_ERROR_LOG_ID", Warden.get32UUID());
log.put("TYPE", "0");
log.put("TIME", DateUtil.getTime());
mqErrorMessageLogMapper.save(log);
}
}

129
src/main/java/com/zcloud/mq/service/impl/SendMessageServiceImpl.java
View File

@ -1,129 +0,0 @@
package com.zcloud.mq.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.dto.mq.TenCorpDto;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.mq.MqErrorMessageLogMapper;
import com.zcloud.mapper.datasource.mq.MqMessageLogMapper;
import com.zcloud.mq.service.LogService;
import com.zcloud.mq.service.SendMessageService;
import com.zcloud.mq.util.MqUtil;
import com.zcloud.util.DateUtil;
import com.zcloud.util.Warden;
import org.apache.rocketmq.client.producer.SendResult;
import org.apache.rocketmq.client.producer.SendStatus;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class SendMessageServiceImpl implements SendMessageService {
@Value("${mq.topic.info}")
private String info;
@Resource
private RocketMQTemplate rocketMQTemplate;
@Resource
private MqErrorMessageLogMapper mqErrorMessageLogMapper;
@Resource
private LogService logService;
@Resource
private MqMessageLogMapper mqMessageLogMapper;
public void sendMessage(TenCorpDto tenCorpDto) throws Exception {
try {
PageData log = tenCorpDto.getPd();
log.put("MESSAGE_LOG_ID", Warden.get32UUID());
log.put("CREATE_TIME", DateUtil.getTime());
mqMessageLogMapper.save(log);
System.out.println("生产者:" + tenCorpDto.toString());
SendResult sendResult = rocketMQTemplate.syncSend(this.info, tenCorpDto.toString());
if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) {
throw new RuntimeException("产品入栈失败");
}
} catch (Exception e) {
e.printStackTrace();
PageData log = tenCorpDto.getPd();
log.put("MESSAGE_ERROR_LOG_ID", Warden.get32UUID());
log.put("ERROR_MESSAGE", e.getMessage());
log.put("TYPE", "0");
log.put("TIME", DateUtil.getTime());
mqErrorMessageLogMapper.save(log);
}
}
@Override
public void SendDelayQueue(TenCorpDto tenCorpDto) {
PageData log = tenCorpDto.getPd();
log.put("MESSAGE_LOG_ID", Warden.get32UUID());
try {
log.put("CREATE_TIME", DateUtil.getTime());
log.put("PRODUCER_NAME",tenCorpDto.getProducer_name());
log.put("TYPE","0");
log.put("PLAN_TIME",tenCorpDto.getTime_stamp());
mqMessageLogMapper.save(log);
System.out.println("生产者:" + tenCorpDto.toString());
// 推送消息
SendResult sendResult = rocketMQTemplate.syncSend(
MqUtil.analysistopic(tenCorpDto.getTopic()),
new GenericMessage<>(tenCorpDto.toString()),
3000,
MqUtil.analysisTime(tenCorpDto.getTime_stamp()));
if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) {
throw new RuntimeException("产品入栈失败");
}
} catch (Exception e) {
e.printStackTrace();
log.put("ERROR_MESSAGE", e.getMessage());
log.put("MESSAGE_ERROR_LOG_ID", Warden.get32UUID());
log.put("TYPE", "0");
log.put("TIME", DateUtil.getTime());
mqErrorMessageLogMapper.save(log);
}
}
@Override
public void SendDelayQueue(String message) {
TenCorpDto tenCorpDto = JSONObject.parseObject(message,TenCorpDto.class);
try {
PageData log = tenCorpDto.getPd();
log.put("CREATE_TIME", DateUtil.getTime());
log.put("PRODUCER_NAME",tenCorpDto.getProducer_name());
log.put("MESSAGE_LOG_ID", Warden.get32UUID());
mqMessageLogMapper.save(log);
System.out.println("生产者:" + tenCorpDto.toString());
// 推送消息
SendResult sendResult = rocketMQTemplate.syncSend(
MqUtil.analysistopic(tenCorpDto.getTopic()),
new GenericMessage<>(message),
3000,
MqUtil.analysisTime(tenCorpDto.getTime_stamp()));
if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) {
throw new RuntimeException("产品入栈失败");
}
} catch (Exception e) {
PageData log = tenCorpDto.getPd();
logService.saveErrorMessage(log,e.getMessage());
e.printStackTrace();
}
}
public static void main(String[] args) {
try {
System.out.println(MqUtil.analysisTime("2023-06-30 14:30:00:000"));
}catch (Exception e){
e.printStackTrace();
}
}
}

6
src/main/java/com/zcloud/mq/util/Const.java
View File

@ -1,6 +0,0 @@
package com.zcloud.mq.util;
public class Const {
public static final String topic_eightWork="eightWork";
public static final String topic_info="info";
}

84
src/main/java/com/zcloud/mq/util/MqUtil.java
View File

@ -1,84 +0,0 @@
package com.zcloud.mq.util;
import java.text.SimpleDateFormat;
import java.util.Date;
public class MqUtil {
private final static SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
public static Integer analysisTime(String time) throws Exception{
Date agreed_date = timeFormat.parse(time);
long time_difference = agreed_date.getTime() - new Date().getTime();
if (time_difference < 0){
return 0;
}
if (time_difference > 2*60*60*1000){
return 18;
}
if (time_difference > 60 * 60 * 1000){
return 17;
}
if (time_difference > 30 * 60 * 1000){
return 16;
}
if (time_difference > 20 * 60 * 1000){
return 15;
}
if (time_difference > 10 * 60 * 1000){
return 14;
}
if (time_difference > 9 * 60 * 1000){
return 13;
}
if (time_difference > 8 * 60 * 1000){
return 12;
}
if (time_difference > 7 * 60 * 1000){
return 11;
}
if (time_difference > 6 * 60 * 1000){
return 10;
}
if (time_difference > 5 * 60 * 1000){
return 9;
}
if (time_difference > 4 * 60 * 1000){
return 8;
}
if (time_difference > 3 * 60 * 1000){
return 7;
}
if (time_difference > 2 * 60 * 1000){
return 6;
}
if (time_difference > 60 * 1000){
return 5;
}
if (time_difference > 30 * 1000){
return 4;
}
if (time_difference > 10 * 1000){
return 3;
}
if (time_difference > 5 * 1000){
return 2;
}
if (time_difference > 1000){
return 1;
}
return 0;
}
public static String analysistopic(String producerName) {
switch (producerName){
case "eightWork" : return Const.topic_eightWork;
case "info" : return Const.topic_info;
default: return "";
}
}
public static Date dateFormat(String date) throws Exception{
return timeFormat.parse(date);
}
}

7
src/main/java/com/zcloud/mq/util/TenCorpConst.java
View File

@ -1,7 +0,0 @@
package com.zcloud.mq.util;
public class TenCorpConst {
public static final String confinedSpace = "confined-space";
public static final String electricity = "electricity";
public static final String hotWork = "hot-work";
}

10
src/main/java/com/zcloud/service/highriskwork/ConfinedSpaceService.java
View File

@ -64,5 +64,15 @@ public interface ConfinedSpaceService {
* @throws Exception
*/
PageData countCheck(PageData pd)throws Exception;
void editSpecialwork(PageData pd)throws Exception;
void editSpecialwork1(PageData pd)throws Exception;
void editSpecialwork2(PageData pd)throws Exception;
void editSpecialwork3(PageData pd)throws Exception;
void editSpecialwork4(PageData pd)throws Exception;
void editSpecialwork5(PageData pd)throws Exception;
void editSpecialwork6(PageData pd)throws Exception;
void editSpecialwork7(PageData pd)throws Exception;
void cancel(PageData pd)throws Exception;
PageData checkno(PageData pd)throws Exception;
}

11
src/main/java/com/zcloud/service/highriskwork/ElectricityService.java
View File

@ -78,5 +78,16 @@ public interface ElectricityService{
public int numberCheck(PageData pd)throws Exception;
PageData getCode(PageData pd)throws Exception;
void cancel(PageData pd)throws Exception;
PageData checkno(PageData pd)throws Exception;
void editSpecialwork(PageData pd)throws Exception;
void editSpecialwork1(PageData pd)throws Exception;
void editSpecialwork2(PageData pd)throws Exception;
void editSpecialwork3(PageData pd)throws Exception;
void editSpecialwork4(PageData pd)throws Exception;
void editSpecialwork5(PageData pd)throws Exception;
void editSpecialwork6(PageData pd)throws Exception;
void editSpecialwork7(PageData pd)throws Exception;
}

33
src/main/java/com/zcloud/service/highriskwork/impl/ConfinedSpaceServiceImpl.java
View File

@ -118,5 +118,38 @@ public class ConfinedSpaceServiceImpl implements ConfinedSpaceService {
public PageData countCheck(PageData pd) throws Exception {
return confinedspaceMapper.countCheck(pd);
}
public void cancel(PageData pd)throws Exception{
confinedspaceMapper.cancel(pd);
}
public PageData checkno(PageData pd)throws Exception{
return confinedspaceMapper.checkno(pd);
}
public void editSpecialwork(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork(pd);
}
public void editSpecialwork1(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork1(pd);
}
public void editSpecialwork2(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork2(pd);
}
public void editSpecialwork3(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork3(pd);
}
public void editSpecialwork4(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork4(pd);
}
public void editSpecialwork5(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork5(pd);
}
public void editSpecialwork6(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork6(pd);
}
public void editSpecialwork7(PageData pd)throws Exception{
confinedspaceMapper.editSpecialwork7(pd);
}
}

31
src/main/java/com/zcloud/service/highriskwork/impl/ElectricityServiceImpl.java
View File

@ -231,5 +231,36 @@ public class ElectricityServiceImpl implements ElectricityService {
public PageData getCode(PageData pd)throws Exception{
return electricityMapper.getCode(pd);
}
public void cancel(PageData pd)throws Exception{
electricityMapper.cancel(pd);
}
public PageData checkno(PageData pd)throws Exception{
return electricityMapper.checkno(pd);
}
public void editSpecialwork(PageData pd)throws Exception{
electricityMapper.editSpecialwork(pd);
}
public void editSpecialwork1(PageData pd)throws Exception{
electricityMapper.editSpecialwork1(pd);
}
public void editSpecialwork2(PageData pd)throws Exception{
electricityMapper.editSpecialwork2(pd);
}
public void editSpecialwork3(PageData pd)throws Exception{
electricityMapper.editSpecialwork3(pd);
}
public void editSpecialwork4(PageData pd)throws Exception{
electricityMapper.editSpecialwork4(pd);
}
public void editSpecialwork5(PageData pd)throws Exception{
electricityMapper.editSpecialwork5(pd);
}
public void editSpecialwork6(PageData pd)throws Exception{
electricityMapper.editSpecialwork6(pd);
}
public void editSpecialwork7(PageData pd)throws Exception{
electricityMapper.editSpecialwork7(pd);
}
}

4
src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml
View File

@ -439,14 +439,14 @@
<!--从公司端修改企业用户New-->
<update id="editCorpdeptNew" parameterType="pd">
update `qa-gwj-prevention`.oa_department
update `qa-czks-prevention`.oa_department
set NAME = #{NAME}
where DEPARTMENT_ID = #{DEPARTMENT_ID}
</update>
<!--从公司端修改企业用户New-->
<update id="editCorpUserNew" parameterType="pd">
update `qa-gwj-prevention`.SYS_USER
update `qa-czks-prevention`.SYS_USER
set USERNAME = #{USERNAME},
NAME = #{NAME},
PASSWORD = #{PASSWORD}

2
src/main/resources/mybatis/datasource/bus/CorpPromiseDetailsMapper.xml
View File

@ -9,7 +9,7 @@
<!--数据字典表名 -->
<sql id="dicTableName">
`qa-gwj-prevention`.sys_dictionaries
`qa-czks-prevention`.sys_dictionaries
</sql>
<!-- 字段 -->

6
src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml
View File

@ -9,7 +9,7 @@
<!--数据字典表名 -->
<sql id="dicTableName">
`qa-gwj-prevention`.sys_dictionaries
`qa-czks-prevention`.sys_dictionaries
</sql>
<!-- 字段 -->
@ -186,7 +186,7 @@
select
f.PROMISE_ID,f.PROMISE_NAME,f.TEXT,f.TYPE
from
`qa-gwj-regulatory`.BUS_PROMISE f
`qa-czks-regulatory`.BUS_PROMISE f
where 1=1 and f.ISDELETE = 0
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and f.PROMISE_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
@ -204,7 +204,7 @@
f.PROMISE_ID,
f.COLLATERAL
from
`qa-gwj-regulatory`.BUS_PROMISE_DETAILS f
`qa-czks-regulatory`.BUS_PROMISE_DETAILS f
<if test="PROMISE_ID != null and PROMISE_ID != ''"><!-- 关键词检索 -->
where f.PROMISE_ID = #{PROMISE_ID}
</if>

2
src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml
View File

@ -9,7 +9,7 @@
<!--数据字典表名 -->
<sql id="dicTableName">
`qa-gwj-prevention`.sys_dictionaries
`qa-czks-prevention`.sys_dictionaries
</sql>
<!-- 字段 -->

2
src/main/resources/mybatis/datasource/bus/ImgFilesMapper.xml
View File

@ -9,7 +9,7 @@
<!--数据字典表名 -->
<sql id="dicTableName">
`qa-gwj-prevention`.sys_dictionaries
`qa-czks-prevention`.sys_dictionaries
</sql>
<!-- 字段 -->

4
src/main/resources/mybatis/datasource/bus/PromiseDetailsMapper.xml
View File

@ -4,12 +4,12 @@
<!--表名 -->
<sql id="tableName">
`qa-gwj-regulatory`.BUS_PROMISE_DETAILS
`qa-czks-regulatory`.BUS_PROMISE_DETAILS
</sql>
<!--数据字典表名 -->
<sql id="dicTableName">
`qa-gwj-prevention`.sys_dictionaries
`qa-czks-prevention`.sys_dictionaries
</sql>
<!-- 字段 -->

4
src/main/resources/mybatis/datasource/bus/PromiseMapper.xml
View File

@ -4,12 +4,12 @@
<!--表名 -->
<sql id="tableName">
`qa-gwj-regulatory`.BUS_PROMISE
`qa-czks-regulatory`.BUS_PROMISE
</sql>
<!--数据字典表名 -->
<sql id="dicTableName">
`qa-gwj-prevention`.sys_dictionaries
`qa-czks-prevention`.sys_dictionaries
</sql>
<!-- 字段 -->

109
src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml
View File

@ -1,65 +1,65 @@
<?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.bus.ShiftWorkRulesMapper">
<!--表名 -->
<sql id="tableName">
BUS_SHIFTWORKRULES
</sql>
<!--数据字典表名 -->
<sql id="dicTableName">
SYS_DICTIONARIES
</sql>
<!-- 字段 -->
<sql id="Field">
f.NAME,
f.CORPINFO_ID,
f.CREATOR,
f.CREATTIME,
f.OPERATOR,
f.OPERATTIME,
f.ISDELETE,
f.NAME,
f.CORPINFO_ID,
f.CREATOR,
f.CREATTIME,
f.OPERATOR,
f.OPERATTIME,
f.ISDELETE,
f.PARENTID,
f.LEVEL,
f.ISCUSTOM,
f.SHIFTWORKRULES_ID
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
NAME,
CORPINFO_ID,
CREATOR,
CREATTIME,
OPERATOR,
OPERATTIME,
ISDELETE,
NAME,
CORPINFO_ID,
CREATOR,
CREATTIME,
OPERATOR,
OPERATTIME,
ISDELETE,
PARENTID,
LEVEL,
ISCUSTOM,
SHIFTWORKRULES_ID
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{NAME},
#{CORPINFO_ID},
#{CREATOR},
#{CREATTIME},
#{OPERATOR},
#{OPERATTIME},
#{ISDELETE},
#{NAME},
#{CORPINFO_ID},
#{CREATOR},
#{CREATTIME},
#{OPERATOR},
#{OPERATTIME},
#{ISDELETE},
#{PARENTID},
#{LEVEL},
#{ISCUSTOM},
#{SHIFTWORKRULES_ID}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
@ -67,7 +67,7 @@
<include refid="FieldValue"></include>
)
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
@ -76,10 +76,10 @@
ISDELETE = '1',
OPERATOR = #{OPERATOR},
OPERATTIME = #{OPERATTIME}
where
where
SHIFTWORKRULES_ID = #{SHIFTWORKRULES_ID}
</delete>
<!-- 删除-->
<delete id="deleteByPar" parameterType="pd">
update
@ -88,15 +88,15 @@
ISDELETE = '1',
OPERATOR = #{OPERATOR},
OPERATTIME = #{OPERATTIME}
where
where
PARENTID = #{PARENTID}
</delete>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
set
<if test="NAME != null and NAME != ''"><!-- 关键词检索 -->
NAME = #{NAME},
</if>
@ -109,56 +109,57 @@
<if test="OPERATTIME != null and OPERATTIME != ''"><!-- 关键词检索 -->
OPERATTIME = #{OPERATTIME},
</if>
SHIFTWORKRULES_ID = SHIFTWORKRULES_ID
where
where
SHIFTWORKRULES_ID = #{SHIFTWORKRULES_ID}
</update>
<!-- 通过ID获取数据 -->
<select id="findById" parameterType="pd" resultType="pd">
select
select
<include refid="Field"></include>
from
from
<include refid="tableName"></include> f
where
where
f.SHIFTWORKRULES_ID = #{SHIFTWORKRULES_ID}
</select>
<!-- 列表 -->
<select id="datalistPage" parameterType="page" resultType="pd">
select
<include refid="Field"></include>
from
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
<!-- 根据需求自己加检索条件
字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-->
)
</if>
</if>
<if test="pd.PARENTID != null and pd.PARENTID != ''"><!-- 关键词检索 -->
and f.PARENTID = #{pd.PARENTID}
and f.PARENTID = #{pd.PARENTID}
</if>
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.LEVEL != null and pd.LEVEL != ''"><!-- 关键词检索 -->
and f.LEVEL = #{pd.LEVEL}
and f.LEVEL = #{pd.LEVEL}
</if>
</select>
<!-- 列表(全部) -->
<select id="listAll" parameterType="pd" resultType="pd">
SELECT
<include refid="Field"></include>
FROM
FROM
<include refid="tableName"></include> f
WHERE f.ISDELETE = '0'
AND f.CORPINFO_ID = #{CORPINFO_ID}
@ -166,21 +167,21 @@
AND f.PARENTID = #{PARENTID}
</if>
</select>
<!-- 批量删除 -->
<delete id="deleteAll" parameterType="String">
update
<include refid="tableName"></include>
set
ISDELETE = '1'
where
where
SHIFTWORKRULES_ID in
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 排班类型1是否使用 -->
<select id="isUseOne" parameterType="pd" resultType="int">
SELECT COUNT(1) FROM SYS_USER WHERE SHIFTDUTYONE = #{SHIFTWORKRULES_ID}

2
src/main/resources/mybatis/datasource/corpsystem/CorpUsersMapper.xml
View File

@ -248,7 +248,7 @@
from <include refid="tableName"></include> u
left join SYS_ROLE r on u.ROLE_ID = r.ROLE_ID
left join SYS_DEPARTMENT d on d.DEPARTMENT_ID=u.DEPARTMENT_ID
left join `qa-gwj-prevention`.sys_dictionaries deptLeven on deptLeven.DICTIONARIES_ID=u.JOB_LEVEL
left join `qa-czks-prevention`.sys_dictionaries deptLeven on deptLeven.DICTIONARIES_ID=u.JOB_LEVEL
where
u.USERNAME != 'admin'
and r.PARENT_ID = '1'

8
src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
View File

@ -216,11 +216,11 @@
frp.FIRE_RECORD_ID,
frp.CREATTIME
FROM
`qa-gwj-prevention`.bus_fire_checklist cl
LEFT JOIN `qa-gwj-prevention`.bus_fire_record_point frp ON frp.fire_check_id = cl.fire_check_id
`qa-czks-prevention`.bus_fire_checklist cl
LEFT JOIN `qa-czks-prevention`.bus_fire_record_point frp ON frp.fire_check_id = cl.fire_check_id
AND cl.ISDELETE = 0
LEFT JOIN `qa-gwj-prevention`.bus_imgfiles img ON frp.EQUIPMENT_POINT_ID = img.FOREIGN_KEY
LEFT JOIN `qa-gwj-prevention`.sys_user u on frp.CREATOR = u.USER_ID
LEFT JOIN `qa-czks-prevention`.bus_imgfiles img ON frp.EQUIPMENT_POINT_ID = img.FOREIGN_KEY
LEFT JOIN `qa-czks-prevention`.sys_user u on frp.CREATOR = u.USER_ID
WHERE
frp.ISDELETE = 0
AND frp.FIRE_POINT_ID = #{FIRE_POINT_ID}

6
src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
View File

@ -52,7 +52,7 @@
</insert>
<insert id="additionRecord" parameterType="list">
INSERT INTO `qa-gwj-prevention`.`bus_fire_record`
INSERT INTO `qa-czks-prevention`.`bus_fire_record`
(`FIRE_RECORD_ID`, `FIRE_CHECK_ID`, `CORPINFO_ID`, `CREATOR`, `CREATTIME`,REPEATCHECK,
`OPERATOR`, `OPERATTIME`, `PERIODSTART`, `PERIODEND`) VALUES
<foreach item="item" index="index" collection="list" separator=",">
@ -344,14 +344,14 @@
</foreach>
</update>
<update id="doRemoveRecordDeviceHiddenByCidRidDid">
UPDATE `qa-gwj-prevention`.`bus_fire_record_device`
UPDATE `qa-czks-prevention`.`bus_fire_record_device`
SET `HIDDEN_ID` = null,
`ISCHECKED` = 1,
`ISNORMAL` = 2
WHERE FIRE_RECORD_ID = #{FIRE_RECORD_ID} and FIRE_DEVICE_ID = #{FIRE_DEVICE_ID} and FIRE_POINT_ID = #{FIRE_POINT_ID}
</update>
<update id="doRemoveRecordPointHiddenByCidRidDid">
UPDATE `qa-gwj-prevention`.`bus_fire_record_point`
UPDATE `qa-czks-prevention`.`bus_fire_record_point`
SET `P_ISCHECKED` = 1
WHERE FIRE_RECORD_ID = #{FIRE_RECORD_ID}
and FIRE_CHECK_ID = #{FIRE_CHECK_ID}

8
src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml
View File

@ -510,10 +510,10 @@
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 `qa-czks-prevention`.vi_user_all zgUser on zgUser.user_id = f.RECTIFICATIONOR
LEFT JOIN `qa-czks-prevention`.vi_user_all confirmUser on confirmUser.USER_ID = f.CONFIRM_USER <!-- 隐患确认人 -->
left join `qa-czks-prevention`.vi_user_all bhuUser on bhuUser.user_id = bhu.user_id
left join `qa-czks-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

99
src/main/resources/mybatis/datasource/highriskwork/ConfinedSpaceMapper.xml
View File

@ -622,4 +622,103 @@
WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
</select>
<update id="cancel" parameterType="pd">
update
<include refid="tableName"></include>
set
APPLY_STATUS = #{APPLY_STATUS}
where
CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
</update>
<select id="checkno" parameterType="pd" resultType="pd">
SELECT
CONCAT_WS( " ", "受限空间作业", f.CHECK_NO ) AS CHECK_NO,
f.CONFINEDSPACE_ID AS ID
FROM
bus_confinedspace f
WHERE
f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
AND f.ISDELETE = '0'
</select>
<update id="editSpecialwork" parameterType = "pd">
update
bus_confinedspace f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
<update id="editSpecialwork1" parameterType = "pd">
update
bus_blindboard f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
<update id="editSpecialwork2" parameterType = "pd">
update
bus_electricity f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
<update id="editSpecialwork3" parameterType = "pd">
update
bus_hoisting f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
<update id="editSpecialwork4" parameterType = "pd">
update
bus_breakground f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
<update id="editSpecialwork5" parameterType = "pd">
update
bus_cutroad f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
<update id="editSpecialwork6" parameterType = "pd">
update
bus_highwork f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
<update id="editSpecialwork7" parameterType = "pd">
update
bus_hotwork f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
</mapper>

98
src/main/resources/mybatis/datasource/highriskwork/ElectricityMapper.xml
View File

@ -675,4 +675,102 @@
WHERE f.CORPINFO_ID = #{CORPINFO_ID}
and f.CREATTIME LIKE CONCAT(#{CREATDATE},'%')
</select>
<update id="cancel" parameterType="pd">
update
<include refid="tableName"></include>
set
APPLY_STATUS = '-99'
where
ELECTRICITY_ID = #{ELECTRICITY_ID}
</update>
<select id="checkno" parameterType="pd" resultType="pd">
SELECT
CONCAT_WS( " ", "临时用电作业", f.CHECK_NO ) AS CHECK_NO
FROM
bus_electricity f
WHERE
f.ELECTRICITY_ID = #{ELECTRICITY_ID}
AND f.ISDELETE = '0'
</select>
<update id="editSpecialwork" parameterType = "pd">
update
bus_confinedspace f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
<update id="editSpecialwork1" parameterType = "pd">
update
bus_blindboard f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
<update id="editSpecialwork2" parameterType = "pd">
update
bus_electricity f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
<update id="editSpecialwork3" parameterType = "pd">
update
bus_hoisting f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
<update id="editSpecialwork4" parameterType = "pd">
update
bus_breakground f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
<update id="editSpecialwork5" parameterType = "pd">
update
bus_cutroad f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
<update id="editSpecialwork6" parameterType = "pd">
update
bus_highwork f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
<update id="editSpecialwork7" parameterType = "pd">
update
bus_hotwork f
set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS > 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
</update>
</mapper>

14
src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml
View File

@ -147,8 +147,8 @@
left join SYS_USER u on u.USER_ID = f.USER_ID
left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID
left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID
left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
left join `qa-czks-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
left join `qa-czks-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
where f.ISDELETE = '0'
<if test="hotIds != null and hotIds.size>0"> <!-- 关键词检索 -->
and(f.FOREIGN_KEY in
@ -185,8 +185,8 @@
left join SYS_USER u on u.USER_ID = f.USER_ID
left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID
left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID
left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
left join `qa-czks-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
left join `qa-czks-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
where f.ISDELETE = '0'
<if test="hotIds != null and hotIds.size>0"><!-- 关键词检索 -->
and(f.FOREIGN_KEY in
@ -224,7 +224,7 @@
left join bus_hotworkapplicationstate s on s.STATE = f.STATE
left join SYS_USER u on u.USER_ID = f.USER_ID
left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID
left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
left join `qa-czks-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
WHERE
f.FOREIGN_KEY = #{FOREIGN_KEY}
AND f.ISDELETE = '0'
@ -336,8 +336,8 @@
left join SYS_USER u on u.DEPARTMENT_ID = f.USER_ID
left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID
left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID
left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
left join `qa-czks-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
left join `qa-czks-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
where f.ISDELETE = '0'
<if test="hotIds != null and hotIds.size>0"> <!-- 关键词检索 -->
and(f.FOREIGN_KEY in

12
src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml
View File

@ -144,9 +144,9 @@
d.NAME as INSPECTION_TYPE_NAME
from
<include refid="tableName"></include> f
left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = f.OUTSOURCED_ID
left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = f.OUTSOURCED_ID
left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
LEFT JOIN SYS_DICTIONARIES d on d.BIANMA = f.INSPECTION_TYPE
where
f.KEYPROJECTCHECK_ID = #{KEYPROJECTCHECK_ID}
@ -163,9 +163,9 @@
(select count(1) from BUS_KEYPROJECT_HIDDEN h where h.FOREIGN_ID = f.KEYPROJECTCHECK_ID) as HIDDEN_COUNT
from
<include refid="tableName"></include> f
left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = f.OUTSOURCED_ID
left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = f.OUTSOURCED_ID
left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
left join SYS_DICTIONARIES d on d.BIANMA = f.INSPECTION_TYPE
where f.ISDELETE = '0'
<if test="pd.OUTSOURCED_ID != null and pd.OUTSOURCED_ID != ''">

122
src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
View File

@ -9,7 +9,7 @@
<!--数据字典表名 -->
<sql id="dicTableName">
`qa-gwj-prevention`.sys_dictionaries
`qa-czks-prevention`.sys_dictionaries
</sql>
<!-- 字段 -->
<sql id="Field">
@ -295,14 +295,14 @@
p.NAME as RECTIFICATIONOR_NAME
from
<include refid="tableName"></include> f
left join `qa-gwj-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
left join `qa-czks-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
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 and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86'
left join `qa-gwj-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
left join `qa-czks-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
where
f.HIDDEN_ID = #{HIDDEN_ID}
</select>
@ -326,28 +326,28 @@
from
<include refid="tableName"></include> f
LEFT JOIN BUS_KEYPROJECTCHECK ch ON ch.OUTSOURCED_ID = f.FOREIGN_ID or f.FOREIGN_ID = ch.KEYPROJECTCHECK_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON bo.OUTSOURCED_ID = ch.OUTSOURCED_ID <!-- 用于安全环保检查隐患的重点工程名称 -->
left join `qa-gwj-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON bo.OUTSOURCED_ID = ch.OUTSOURCED_ID <!-- 用于安全环保检查隐患的重点工程名称 -->
left join `qa-czks-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
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 and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86'
left join `qa-gwj-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bod ON bod.OUTSOURCED_ID = f.FOREIGN_ID <!-- 用于AI隐患的重点工程名称 -->
left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
left join `qa-czks-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID
LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bod ON bod.OUTSOURCED_ID = f.FOREIGN_ID <!-- 用于AI隐患的重点工程名称 -->
left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
left join BUS_KEYPROJECTPUNISH pu on pu.HIDDEN_ID = f.HIDDEN_ID
<if test="pd.CREATOR != null and pd.CREATOR !=''" >
left join (
SELECT
f.HIDDEN_ID
FROM
`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
LEFT JOIN `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
`qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
LEFT JOIN `qa-czks-prevention`.BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
@ -417,10 +417,10 @@
from
<include refid="tableName"></include> f
left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID
left join `qa-gwj-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
left join `qa-gwj-prevention`.sys_dictionaries city on city.BIANMA = c.CITY
left join `qa-gwj-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY
left join `qa-gwj-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE
left join `qa-czks-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
left join `qa-czks-prevention`.sys_dictionaries city on city.BIANMA = c.CITY
left join `qa-czks-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY
left join `qa-czks-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE
left join sys_user cr on cr.USER_ID = f.CREATOR
left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
@ -466,10 +466,10 @@
from
<include refid="tableName"></include> f
left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID
left join `qa-gwj-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
left join `qa-gwj-prevention`.sys_dictionaries city on city.BIANMA = c.CITY
left join `qa-gwj-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY
left join `qa-gwj-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE
left join `qa-czks-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
left join `qa-czks-prevention`.sys_dictionaries city on city.BIANMA = c.CITY
left join `qa-czks-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY
left join `qa-czks-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE
left join sys_user cr on cr.USER_ID = f.CREATOR
left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
@ -602,7 +602,7 @@
IFNULL( h.NUM1, 0 ) NUM1,
IFNULL( h.NUM2, 0 ) NUM2
FROM
`qa-gwj-prevention`.sys_dictionaries d
`qa-czks-prevention`.sys_dictionaries d
LEFT JOIN (
SELECT
COUNT( f.STATE = 4 OR NULL ) AS NUM1,
@ -646,10 +646,10 @@
from
<include refid="tableName"></include> f
left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID
left join `qa-gwj-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
left join `qa-gwj-prevention`.sys_dictionaries city on city.BIANMA = c.CITY
left join `qa-gwj-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY
left join `qa-gwj-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE
left join `qa-czks-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
left join `qa-czks-prevention`.sys_dictionaries city on city.BIANMA = c.CITY
left join `qa-czks-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY
left join `qa-czks-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE
left join sys_user cr on cr.USER_ID = f.CREATOR
left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
@ -967,11 +967,11 @@
count(CASE WHEN h.HIDDEN_ID != '' THEN 1 ELSE NULL END) as SBHD_NUM,
count(case when h.STATE=4 then 1 else null end) as ZGHD_NUM
<if test="DEPT_COUNTRY == null or DEPT_COUNTRY == ''">
from `qa-gwj-prevention`.sys_dictionaries country
from `qa-czks-prevention`.sys_dictionaries country
LEFT join bus_corp_info f on country.BIANMA = f.COUNTRY and f.ISDELETE='0'
</if>
<if test="DEPT_COUNTRY != null and DEPT_COUNTRY != ''">
from `qa-gwj-prevention`.sys_dictionaries village
from `qa-czks-prevention`.sys_dictionaries village
LEFT join bus_corp_info f on village.BIANMA = f.VILLAGE and f.ISDELETE='0'
</if>
<if test="DEPT_PROVINCE != null and DEPT_PROVINCE != ''">
@ -987,7 +987,7 @@
and f.VILLAGE = #{DEPT_VILLAGE}
</if>
<if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''">
and f.CORP_OF_TYPE in (select CORPTYPE_ID from `qa-gwj-regulatory`.BUS_CORPTYPETODEPT ctod where ctod.DEPARTMENT_ID=#{DEPARTMENT_ID})
and f.CORP_OF_TYPE in (select CORPTYPE_ID from `qa-czks-regulatory`.BUS_CORPTYPETODEPT ctod where ctod.DEPARTMENT_ID=#{DEPARTMENT_ID})
</if>
left join BUS_HIDDEN h on f.CORPINFO_ID=h.CORPINFO_ID and h.ISDELETE='0'
@ -997,7 +997,7 @@
and country.PARENT_ID = #{CITY_CODE}
</if>
<if test="DEPT_COUNTRY != null and DEPT_COUNTRY != ''">
and village.PARENT_ID in (select DICTIONARIES_ID from `qa-gwj-prevention`.sys_dictionaries dic where dic.BIANMA=#{DEPT_COUNTRY})
and village.PARENT_ID in (select DICTIONARIES_ID from `qa-czks-prevention`.sys_dictionaries dic where dic.BIANMA=#{DEPT_COUNTRY})
</if>
<if test="DEPT_COUNTRY == null or DEPT_COUNTRY == ''">
@ -1132,15 +1132,15 @@
p.NAME as RECTIFICATIONOR_NAME
from
<include refid="tableName"></include> f
left join `qa-gwj-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
left join `qa-czks-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
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 and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86'
left join `qa-gwj-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
left join `qa-gwj-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR
left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
left join `qa-czks-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
left join `qa-czks-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR
left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
where f.ISDELETE = '0'
<if test="FOREIGN_ID != null and FOREIGN_ID !=''" >
and f.FOREIGN_ID = #{FOREIGN_ID}
@ -1525,10 +1525,10 @@
SELECT
f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID
FROM
`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
`qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
@ -1544,9 +1544,9 @@
f.HIDDEN_ID
FROM
BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
LEFT JOIN BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
WHERE
f.ISDELETE = '0'
@ -1555,13 +1555,13 @@
AND f.CREATOR = #{loginUserId}
AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
) t)CF_COUNT
from `qa-gwj-regulatory`.bus_aiwarning f
from `qa-czks-regulatory`.bus_aiwarning f
where f.ISDELETE = '0'
and f.STATUS = 0
and VIDEOMANAGER_ID in (
select vi.VIDEOMANAGER_ID
from `qa-gwj-regulatory`.bus_aiwarning_people aip
left join `qa-gwj-regulatory`. bus_videomanager vi on vi.OUTSOURCED_ID = aip.OUTSOURCED_ID
from `qa-czks-regulatory`.bus_aiwarning_people aip
left join `qa-czks-regulatory`. bus_videomanager vi on vi.OUTSOURCED_ID = aip.OUTSOURCED_ID
where aip.AIWARNING_PEOPLE = #{loginUserId}
and aip.ISDELETE = 0
)
@ -1579,14 +1579,14 @@
vi.`NAME` as RECTIFICATIONOR_NAME,
h.*
FROM
`qa-gwj-prevention`.bus_keyproject_hidden h
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectpunish p ON p.HIDDEN_ID = h.HIDDEN_ID
LEFT JOIN `qa-gwj-regulatory`.bus_units u ON h.RECTIFICATIONDEPT = u.UNITS_ID
LEFT JOIN `qa-gwj-regulatory`.bus_personnelmanagement per on per.PERSONNELMANAGEMENT_ID = p.PERSONNELMANAGEMENT_ID
LEFT JOIN `qa-gwj-prevention`.vi_user_all v ON v.USER_ID = p.CREATOR
LEFT JOIN `qa-gwj-prevention`.vi_user_all vv ON vv.USER_ID = h.PUNISH_PERSON
LEFT JOIN `qa-gwj-regulatory`.bus_personnelmanagement vi ON vi.PERSONNELMANAGEMENT_ID = h.RECTIFICATIONOR
`qa-czks-prevention`.bus_keyproject_hidden h
LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
LEFT JOIN `qa-czks-prevention`.bus_keyprojectpunish p ON p.HIDDEN_ID = h.HIDDEN_ID
LEFT JOIN `qa-czks-regulatory`.bus_units u ON h.RECTIFICATIONDEPT = u.UNITS_ID
LEFT JOIN `qa-czks-regulatory`.bus_personnelmanagement per on per.PERSONNELMANAGEMENT_ID = p.PERSONNELMANAGEMENT_ID
LEFT JOIN `qa-czks-prevention`.vi_user_all v ON v.USER_ID = p.CREATOR
LEFT JOIN `qa-czks-prevention`.vi_user_all vv ON vv.USER_ID = h.PUNISH_PERSON
LEFT JOIN `qa-czks-regulatory`.bus_personnelmanagement vi ON vi.PERSONNELMANAGEMENT_ID = h.RECTIFICATIONOR
WHERE
h.ISDELETE = '0'
<if test="pd.HANDLED==1">
@ -1608,7 +1608,7 @@
</select>
<select id="getPUNISHTHEPERSON" parameterType="pd" resultType="string">
SELECT gc.PUNISH_THE_PERSON PUNISH_THE_PERSON FROM `qa-gwj-regulatory`.BUS_OUTSOURCED gc
SELECT gc.PUNISH_THE_PERSON PUNISH_THE_PERSON FROM `qa-czks-regulatory`.BUS_OUTSOURCED gc
WHERE gc.OUTSOURCED_ID=#{OUTSOURCED_ID}
AND gc.IS_SMS = '0'
</select>

22
src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml
View File

@ -142,11 +142,11 @@
p.NAME AS PERSON_NAME
from
<include refid="tableName"></include> f
left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
left join `qa-gwj-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR
left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID
left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
left join `qa-czks-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR
left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID
left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
where
<if test="KEYPROJECTPUNISH_ID != null and KEYPROJECTPUNISH_ID != ''"><!-- 关键词检索 -->
f.KEYPROJECTPUNISH_ID = #{KEYPROJECTPUNISH_ID}
@ -169,12 +169,12 @@
p.NAME AS PERSON_NAME
from
BUS_KEYPROJECTPUNISH f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON f.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID
left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
left join `qa-gwj-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR
left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = k.OUTSOURCED_ID
left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck k ON f.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID
left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
left join `qa-czks-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR
left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = k.OUTSOURCED_ID
left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and

2
src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml
View File

@ -4,7 +4,7 @@
<!--表名 -->
<sql id="tableName">
`qa-gwj-regulatory`.BUS_PLATFORMVIDEOMANAGEMENT
`qa-czks-regulatory`.BUS_PLATFORMVIDEOMANAGEMENT
</sql>
<!--数据字典表名 -->

10
src/main/resources/mybatis/datasource/mysql1.sql
View File

@ -59,17 +59,17 @@ CREATE TABLE `BUS_MAJORDANGERSOURCELOG` (
# wangpeng 2022-04-01
## 重大危险源增加重大危险源状态
ALTER TABLE `qa-gwj-prevention`.`bus_majordangersource`
ALTER TABLE `qa-czks-prevention`.`bus_majordangersource`
ADD COLUMN `MAJORDANGERSOURCE_STATUS` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '重大危险源状态（1.正常、2.停用、3.检修）' AFTER `MAJORDANGERSOURCE_NUMBER`;
## 重大危险源变更记录增加重大危险源状态
ALTER TABLE `qa-gwj-prevention`.`bus_majordangersourcelog`
ALTER TABLE `qa-czks-prevention`.`bus_majordangersourcelog`
ADD COLUMN `MAJORDANGERSOURCE_STATUS` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '重大危险源状态（1.正常、2.停用、3.检修）' AFTER `MAJORDANGERSOURCE_NUMBER`;
## 阈值设定增加重大危险源ID
ALTER TABLE `qa-gwj-prevention`.`bus_monitoringdevicesensor`
ALTER TABLE `qa-czks-prevention`.`bus_monitoringdevicesensor`
ADD COLUMN `MAJORDANGERSOURCE_ID` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '重大危险源ID' AFTER `MONITORINGDEVICESENSOR_ID`;
## 重大危险源停用记录增加重大危险源ID
ALTER TABLE `qa-gwj-prevention`.`bus_monitoringdevicedisable`
ADD COLUMN `MAJORDANGERSOURCE_ID` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '重大危险源ID' AFTER `MONITORINGDEVICEDISABLE_ID`;
ALTER TABLE `qa-czks-prevention`.`bus_monitoringdevicedisable`
ADD COLUMN `MAJORDANGERSOURCE_ID` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '重大危险源ID' AFTER `MONITORINGDEVICEDISABLE_ID`;

2
src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
View File

@ -158,7 +158,7 @@
<include refid="tableName"></include> f
left join sys_dictionaries a on a.DICTIONARIES_ID = f.JOB_TYPE
left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID
left join `qa-gwj-regulatory`.bus_units r on r.UNITS_ID = f.UNITS_ID
left join `qa-czks-regulatory`.bus_units r on r.UNITS_ID = f.UNITS_ID
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and

10
src/main/resources/mybatis/datasource/system/DepartmentMapper.xml
View File

@ -420,7 +420,7 @@
select
*
from
`qa-gwj-regulatory`.SYS_DEPARTMENT
`qa-czks-regulatory`.SYS_DEPARTMENT
where 1=1
and STATE = '0'
</select>
@ -523,8 +523,8 @@
DEPARTMENT_ID id,
NAME name,
PARENT_ID pId
FROM `qa-gwj-regulatory`.sys_department f
WHERE FIND_IN_SET(DEPARTMENT_ID,`qa-gwj-regulatory`.queryRecursiveDeptDown(#{DEPARTMENT_ID}))
FROM `qa-czks-regulatory`.sys_department f
WHERE FIND_IN_SET(DEPARTMENT_ID,`qa-czks-regulatory`.queryRecursiveDeptDown(#{DEPARTMENT_ID}))
</select>
@ -534,8 +534,8 @@
DEPARTMENT_ID id,
NAME name,
PARENT_ID pId
FROM `qa-gwj-regulatory`.sys_department f
WHERE FIND_IN_SET(DEPARTMENT_ID,`qa-gwj-regulatory`.queryRecursiveDeptDown(#{DEPARTMENT_ID}))
FROM `qa-czks-regulatory`.sys_department f
WHERE FIND_IN_SET(DEPARTMENT_ID,`qa-czks-regulatory`.queryRecursiveDeptDown(#{DEPARTMENT_ID}))
UNION ALL
SELECT
DEPARTMENT_ID id,

16
src/main/resources/mybatis/datasource/system/PoliceMapper.xml
View File

@ -4,12 +4,12 @@
<!--表名 -->
<sql id="tableName">
`qa-gwj-regulatory`.BUS_POLICE
`qa-czks-regulatory`.BUS_POLICE
</sql>
<!--数据字典表名 -->
<sql id="dicTableName">
`qa-gwj-prevention`.sys_dictionaries
`qa-czks-prevention`.sys_dictionaries
</sql>
<!-- 字段 -->
@ -120,9 +120,9 @@
select
f.*,a.name as names
from
`qa-gwj-regulatory`.bus_reporting f
left join`qa-gwj-regulatory`.bus_police p on p.police_id = f.police_id
LEFT JOIN `qa-gwj-regulatory`.sys_user a ON a.user_id = f.REPORTING_NAME
`qa-czks-regulatory`.bus_reporting f
left join`qa-czks-regulatory`.bus_police p on p.police_id = f.police_id
LEFT JOIN `qa-czks-regulatory`.sys_user a ON a.user_id = f.REPORTING_NAME
where
f.POLICE_ID = #{pd.POLICE_ID}
@ -152,8 +152,8 @@
f.*,
dept.NAME AS deptName
FROM
`qa-gwj-regulatory`.sys_user f
LEFT JOIN `qa-gwj-regulatory`.sys_department dept ON dept.DEPARTMENT_ID = f.DEPARTMENT_ID
`qa-czks-regulatory`.sys_user f
LEFT JOIN `qa-czks-regulatory`.sys_department dept ON dept.DEPARTMENT_ID = f.DEPARTMENT_ID
WHERE
f.USER_ID = '1'
</select>
@ -188,7 +188,7 @@
<!-- 新增-->
<insert id="editOpinion" parameterType="pd">
insert into
`qa-gwj-regulatory`.bus_reporting
`qa-czks-regulatory`.bus_reporting
(
REPORTING_NAME,ISDELETE,REPORTING_ID,POLICE_ID,CREATTIME,CREATOR,OPERATOR,OPERATTIME
) values (

22
src/main/resources/mybatis/datasource/system/UsersMapper.xml
View File

@ -346,8 +346,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
oa.NAME as DEPTNAME,f.NAME,f.CORPINFO_ID
from
`qa-gwj-prevention`.sys_user f
left join `qa-gwj-prevention`.oa_department oa on oa.DEPARTMENT_ID = f.DEPARTMENT_ID
`qa-czks-prevention`.sys_user f
left join `qa-czks-prevention`.oa_department oa on oa.DEPARTMENT_ID = f.DEPARTMENT_ID
where
USER_ID = #{USER_ID}
@ -1127,7 +1127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
*
from
`qa-gwj-regulatory`.SYS_USER
`qa-czks-regulatory`.SYS_USER
where USER_ID = #{USER_ID}
</select>
<select id="userlistAll" parameterType="pd" resultType="pd">
@ -1170,8 +1170,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
u.USER_ID,
u.USERNAME,
u.NAME
from `qa-gwj-regulatory`.sys_user u
left join `qa-gwj-regulatory`.SYS_ROLE r on u.ROLE_ID = r.ROLE_ID
from `qa-czks-regulatory`.sys_user u
left join `qa-czks-regulatory`.SYS_ROLE r on u.ROLE_ID = r.ROLE_ID
where u.USERNAME != 'admin' and u.ISDELETE = '0'
and r.PARENT_ID = '1'
<if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''"><!-- 用户部门 -->
@ -1182,7 +1182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
u.USER_ID,
u.USERNAME,
u.NAME
from `qa-gwj-prevention`.sys_user u, `qa-gwj-prevention`.sys_role r
from `qa-czks-prevention`.sys_user u, `qa-czks-prevention`.sys_role r
where u.ROLE_ID = r.ROLE_ID
and u.USERNAME != 'admin' and u.ISDELETE = '0'
<!-- and r.PARENT_ID = '1' -->
@ -1285,7 +1285,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
PASSWORD,
DEPARTMENT_ID,
NAME
from `qa-gwj-prevention`.SYS_USER
from `qa-czks-prevention`.SYS_USER
where CORPINFO_ID = #{CORPINFO_ID}
and ISMAIN = '1'
and ISDELETE = '0'
@ -1297,8 +1297,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
f.DEPARTMENT_ID,
f.USER_ID,
sd.name as punishname
from `qa-gwj-regulatory`.sys_user f
LEFT JOIN `qa-gwj-prevention`.vi_department_all sd ON sd.DEPARTMENT_ID = f.DEPARTMENT_ID
from `qa-czks-regulatory`.sys_user f
LEFT JOIN `qa-czks-prevention`.vi_department_all sd ON sd.DEPARTMENT_ID = f.DEPARTMENT_ID
<foreach item="item" index="index" collection="ids" open="WHERE" separator="or">
<if test=" item != null and item != ''">
USER_ID like CONCAT(CONCAT('%', #{item}),'%')
@ -1310,8 +1310,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
z.DEPARTMENT_ID,
z.USER_ID,
sd.name as punishname
from `qa-gwj-prevention`.sys_user z
LEFT JOIN `qa-gwj-prevention`.vi_department_all sd ON sd.DEPARTMENT_ID = z.DEPARTMENT_ID
from `qa-czks-prevention`.sys_user z
LEFT JOIN `qa-czks-prevention`.vi_department_all sd ON sd.DEPARTMENT_ID = z.DEPARTMENT_ID
<foreach item="item" index="index" collection="ids" open="WHERE" separator="or">
<if test=" item != null and item != ''">
USER_ID like CONCAT(CONCAT('%', #{item}),'%')

2
src/main/resources/mybatis/dsno2/bus/NoticeRegulatoryMapper.xml
View File

@ -4,7 +4,7 @@
<!--表名 -->
<sql id="tableName">
`qa-gwj-regulatory`.BUS_NOTICEREGULATORY
`qa-czks-regulatory`.BUS_NOTICEREGULATORY
</sql>
<!--数据字典表名 -->

28
src/main/resources/mybatis/dsno2/keyProjects/AIWarningMapper.xml
View File

@ -91,8 +91,8 @@
</insert>
<!-- 新增-->
<select id="getPeopleListByIds" parameterType="pd" resultType="pd">
select f.*,cr.NAME from `qa-gwj-regulatory`.bus_aiwarning_people f
left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.AIWARNING_PEOPLE
select f.*,cr.NAME from `qa-czks-regulatory`.bus_aiwarning_people f
left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.AIWARNING_PEOPLE
where 1=1 and ISDELETE = 0
<if test="outIds != null and outIds.size()>0"><!-- 关键词检索 -->
and f.OUTSOURCED_ID in
@ -161,10 +161,10 @@
vid.VIDEONAME,
o.OUTSOURCED_NAME
from
`qa-gwj-regulatory`.BUS_AIWARNING f
left join `qa-gwj-regulatory`.bus_device v on v.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID
left join `qa-gwj-regulatory`.bus_videomanager vid on vid.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID
left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = vid.OUTSOURCED_ID
`qa-czks-regulatory`.BUS_AIWARNING f
left join `qa-czks-regulatory`.bus_device v on v.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID
left join `qa-czks-regulatory`.bus_videomanager vid on vid.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID
left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = vid.OUTSOURCED_ID
where f.ISDELETE = '0' and vid.OUTSOURCED_ID = #{pd.OUTSOURCED_ID}
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
</if>
@ -175,7 +175,7 @@
and f.STATUS = 1
</if>
<if test="pd.loginUserId != null and pd.loginUserId !='' " >
and vid.OUTSOURCED_ID in (select aip.OUTSOURCED_ID from `qa-gwj-regulatory`.bus_aiwarning_people aip where aip.AIWARNING_PEOPLE = #{pd.loginUserId} and aip.ISDELETE = 0)
and vid.OUTSOURCED_ID in (select aip.OUTSOURCED_ID from `qa-czks-regulatory`.bus_aiwarning_people aip where aip.AIWARNING_PEOPLE = #{pd.loginUserId} and aip.ISDELETE = 0)
</if>
order by f.CREATTIME desc
</select>
@ -186,10 +186,10 @@
vid.VIDEONAME,
o.OUTSOURCED_NAME
from
`qa-gwj-regulatory`.BUS_AIWARNING f
left join `qa-gwj-regulatory`.bus_device v on v.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID
left join `qa-gwj-regulatory`.bus_videomanager vid on vid.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID
left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = vid.OUTSOURCED_ID
`qa-czks-regulatory`.BUS_AIWARNING f
left join `qa-czks-regulatory`.bus_device v on v.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID
left join `qa-czks-regulatory`.bus_videomanager vid on vid.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID
left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = vid.OUTSOURCED_ID
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
@ -203,7 +203,7 @@
and f.STATUS = 1
</if>
<if test="pd.loginUserId != null and pd.loginUserId !='' " >
and vid.OUTSOURCED_ID in (select aip.OUTSOURCED_ID from `qa-gwj-regulatory`.bus_aiwarning_people aip where aip.AIWARNING_PEOPLE = #{pd.loginUserId} and aip.ISDELETE = 0)
and vid.OUTSOURCED_ID in (select aip.OUTSOURCED_ID from `qa-czks-regulatory`.bus_aiwarning_people aip where aip.AIWARNING_PEOPLE = #{pd.loginUserId} and aip.ISDELETE = 0)
</if>
order by f.CREATTIME desc
</select>
@ -216,12 +216,12 @@
</select>
<select id="findByOperatorId" parameterType="pd" resultType="pd">
select name from `qa-gwj-prevention`.vi_user_all where USER_ID = #{OPERATOR}
select name from `qa-czks-prevention`.vi_user_all where USER_ID = #{OPERATOR}
</select>
<select id="getDisposerList" parameterType="pd" resultType="pd">
select f.CONTRACT_PIC_ID,u.NAME from bus_aiwarning_people f
LEFT JOIN `qa-gwj-prevention`.vi_user_all u on u.USER_ID = f.AIWARNING_PEOPLE
LEFT JOIN `qa-czks-prevention`.vi_user_all u on u.USER_ID = f.AIWARNING_PEOPLE
where OUTSOURCED_ID = #{OUTSOURCED_ID} and ISDELETE = 0
</select>

4
src/main/resources/mybatis/dsno2/keyProjects/DeviceMapper.xml
View File

@ -126,7 +126,7 @@
<include refid="Field"></include>, ot.OUTSOURCED_NAME
from
<include refid="tableName"></include> f
LEFT JOIN `qa-gwj-regulatory`.bus_outsourced ot on ot.OUTSOURCED_ID = f.OUTSOURCED_ID
LEFT JOIN `qa-czks-regulatory`.bus_outsourced ot on ot.OUTSOURCED_ID = f.OUTSOURCED_ID
where f.ISDELETE = '0'
<if test="pd.DEVICE != null and pd.DEVICE != ''"><!-- 检索 -->
and f.DEVICE LIKE CONCAT(CONCAT('%', #{pd.DEVICE}),'%')
@ -141,7 +141,7 @@
, o.OUTSOURCED_NAME
from
<include refid="tableName"></include> f
left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = f.OUTSOURCED_ID
left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = f.OUTSOURCED_ID
where f.ISDELETE = '0'
</select>

144
src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml
View File

@ -4,7 +4,7 @@
<!--表名 -->
<sql id="tableName">
`qa-gwj-regulatory`.BUS_OUTSOURCED
`qa-czks-regulatory`.BUS_OUTSOURCED
</sql>
<!--数据字典表名 -->
@ -237,17 +237,17 @@
<select id="findById" parameterType="pd" resultType="pd">
select
f.*,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
(select GROUP_CONCAT(t.NAME) from (
SELECT
CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID
FROM
`qa-gwj-prevention`.OA_DEPARTMENT t
LEFT JOIN `qa-gwj-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
`qa-czks-prevention`.OA_DEPARTMENT t
LEFT JOIN `qa-czks-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
-- isd.NAME DEPARTMENT_NAME,
isdd.NAME MANAGER_DEPARTMENT_NAME,
@ -260,14 +260,14 @@
p.`NAME` as UNITS_PIC_NAME
from
<include refid="tableName"></include> f
-- LEFT JOIN `qa-gwj-prevention`.vi_department_all isd ON isd.DEPARTMENT_ID = f.DEPARTMENT_ID
LEFT JOIN `qa-gwj-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
LEFT JOIN `qa-gwj-prevention`.vi_user_all isu ON isu.USER_ID = f.CONTRACT_PIC
LEFT JOIN `qa-gwj-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
LEFT JOIN `qa-gwj-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
LEFT JOIN `qa-gwj-prevention`.oa_department pcijd ON pcijd.DEPARTMENT_ID = f.INVOLVING_CORPS_DEPART_ID
-- LEFT JOIN `qa-czks-prevention`.vi_department_all isd ON isd.DEPARTMENT_ID = f.DEPARTMENT_ID
LEFT JOIN `qa-czks-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
LEFT JOIN `qa-czks-prevention`.vi_user_all isu ON isu.USER_ID = f.CONTRACT_PIC
LEFT JOIN `qa-czks-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
LEFT JOIN `qa-czks-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
LEFT JOIN `qa-czks-prevention`.oa_department pcijd ON pcijd.DEPARTMENT_ID = f.INVOLVING_CORPS_DEPART_ID
left join bus_units b using (UNITS_ID)
left join `qa-gwj-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
left join `qa-czks-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
where
f.OUTSOURCED_ID = #{OUTSOURCED_ID}
and f.ISDELETE = '0'
@ -277,28 +277,28 @@
<select id="datalistPage" parameterType="page" resultType="pd">
select
f.*,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
(select GROUP_CONCAT(t.NAME) from (
SELECT
CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID
FROM
`qa-gwj-prevention`.OA_DEPARTMENT t
LEFT JOIN `qa-gwj-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
`qa-czks-prevention`.OA_DEPARTMENT t
LEFT JOIN `qa-czks-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
isdd.NAME MANAGER_DEPARTMENT_NAME,
isu.NAME USER_NAME,
b.UNITS_NAME as UNITS_NAME,
isu.NAME as AIWARNING_PEOPLE,
pci.NAME Q_COMPETENT_DEPT_NAME,
(select count(1) from `qa-gwj-prevention`.BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT,
(select count(1) from `qa-gwj-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT,
(select count(1) from `qa-gwj-regulatory`.BUS_VIDEOMANAGER v where v.OUTSOURCED_ID = f.OUTSOURCED_ID and v.ISDELETE = '0') as VIDEO_COUNT,
(SELECT count( 1 ) FROM `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-gwj-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE kjc.OUTSOURCED_ID =f.OUTSOURCED_ID AND k.ISDELETE = '0' ) as KEY_COUNT,
(select count(1) from `qa-czks-prevention`.BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT,
(select count(1) from `qa-czks-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT,
(select count(1) from `qa-czks-regulatory`.BUS_VIDEOMANAGER v where v.OUTSOURCED_ID = f.OUTSOURCED_ID and v.ISDELETE = '0') as VIDEO_COUNT,
(SELECT count( 1 ) FROM `qa-czks-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-czks-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE kjc.OUTSOURCED_ID =f.OUTSOURCED_ID AND k.ISDELETE = '0' ) as KEY_COUNT,
vua.NAME OUTSOURCED_CREATOR_NAME,
ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
p.`NAME` as UNITS_PIC_NAME
@ -308,24 +308,24 @@
from
<include refid="tableName"></include> f
left join bus_units b using (UNITS_ID)
LEFT JOIN `qa-gwj-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
LEFT JOIN `qa-gwj-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
LEFT JOIN `qa-gwj-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
LEFT JOIN `qa-gwj-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
LEFT JOIN `qa-gwj-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID
LEFT JOIN `qa-gwj-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
left join `qa-gwj-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
LEFT JOIN `qa-czks-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
LEFT JOIN `qa-czks-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
LEFT JOIN `qa-czks-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
LEFT JOIN `qa-czks-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
LEFT JOIN `qa-czks-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID
LEFT JOIN `qa-czks-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
left join `qa-czks-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
-- 这个判断是隐患管理排序以及隐患管理的角标
<if test="pd.UserId != null and pd.UserId !=''">
left join (SELECT t.OUTSOURCED_ID,COUNT( distinct t.HIDDEN_ID) co FROM (
SELECT
f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID
FROM
`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
LEFT JOIN `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
`qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
LEFT JOIN `qa-czks-prevention`.BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
@ -406,7 +406,7 @@
SELECT
DEPARTMENT_ID
FROM
`qa-gwj-prevention`.`sys_user`
`qa-czks-prevention`.`sys_user`
WHERE
ISMAIN = '0' and
`USER_ID` =#{userId}
@ -487,24 +487,24 @@
<select id="getPUNISHlistPage" parameterType="page" resultType="pd">
select
f.*,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
(select GROUP_CONCAT(t.NAME) from (
SELECT
CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID
FROM
`qa-gwj-prevention`.OA_DEPARTMENT t
LEFT JOIN `qa-gwj-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
`qa-czks-prevention`.OA_DEPARTMENT t
LEFT JOIN `qa-czks-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
isdd.NAME MANAGER_DEPARTMENT_NAME,
isu.NAME USER_NAME,
b.UNITS_NAME as UNITS_NAME,
isu.NAME as AIWARNING_PEOPLE,
pci.NAME Q_COMPETENT_DEPT_NAME,
(select count(1) from `qa-gwj-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT,
(SELECT count( 1 ) FROM `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-gwj-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE kjc.OUTSOURCED_ID =f.OUTSOURCED_ID AND k.ISDELETE = '0' ) as KEY_COUNT,
(select count(1) from `qa-czks-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT,
(SELECT count( 1 ) FROM `qa-czks-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-czks-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE kjc.OUTSOURCED_ID =f.OUTSOURCED_ID AND k.ISDELETE = '0' ) as KEY_COUNT,
vua.NAME OUTSOURCED_CREATOR_NAME,
ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
p.`NAME` as UNITS_PIC_NAME
@ -512,21 +512,21 @@
from
<include refid="tableName"></include> f
left join bus_units b using (UNITS_ID)
LEFT JOIN `qa-gwj-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
LEFT JOIN `qa-gwj-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
LEFT JOIN `qa-gwj-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
LEFT JOIN `qa-gwj-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
LEFT JOIN `qa-gwj-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID
LEFT JOIN `qa-gwj-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
left join `qa-gwj-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
LEFT JOIN `qa-czks-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
LEFT JOIN `qa-czks-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
LEFT JOIN `qa-czks-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
LEFT JOIN `qa-czks-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
LEFT JOIN `qa-czks-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID
LEFT JOIN `qa-czks-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
left join `qa-czks-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
left join (SELECT PUN.OUTSOURCED_ID,COUNT( distinct PUN.HIDDEN_ID) co FROM (
SELECT
f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID
FROM
`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
`qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
@ -564,14 +564,14 @@
IFNULL( FK.fk, 0 ) fk,
IFNULL( AI.ai, 0 ) ai
FROM
`qa-gwj-regulatory`.bus_outsourced o
`qa-czks-regulatory`.bus_outsourced o
<!-- 检查待确认 -->
LEFT JOIN (
SELECT
COUNT( 1 ) qr,
c.OUTSOURCED_ID
FROM
`qa-gwj-prevention`.bus_keyprojectcheck c
`qa-czks-prevention`.bus_keyprojectcheck c
WHERE
c.INSPECTION_STATUS = 0
AND c.ISDELETE = 0
@ -589,8 +589,8 @@
h.HIDDEN_ID,
IFNULL( c.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID
FROM
`qa-gwj-prevention`.bus_keyproject_hidden h
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
`qa-czks-prevention`.bus_keyproject_hidden h
LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
WHERE
h.STATE = 1
AND h.ISDELETE = 0
@ -609,8 +609,8 @@
f.HIDDEN_ID,
IFNULL( c.OUTSOURCED_ID, f.FOREIGN_ID ) OUTSOURCED_ID
FROM
`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
`qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
@ -630,8 +630,8 @@
f.HIDDEN_ID,
IFNULL( c.OUTSOURCED_ID, f.FOREIGN_ID ) OUTSOURCED_ID
FROM
`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
`qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
@ -651,9 +651,9 @@
p.HIDDEN_ID,
IFNULL( c.OUTSOURCED_ID, f.FOREIGN_ID ) OUTSOURCED_ID
FROM
`qa-gwj-prevention`.bus_keyprojectpunish p
LEFT JOIN `qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f on p.HIDDEN_ID = f.HIDDEN_ID
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
`qa-czks-prevention`.bus_keyprojectpunish p
LEFT JOIN `qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f on p.HIDDEN_ID = f.HIDDEN_ID
LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
WHERE
p.ISDELETE = '0'
AND p.HANDLED = '0'
@ -666,14 +666,14 @@
SELECT
count( 1 ) AS ai ,t.OUTSOURCED_ID
FROM
`qa-gwj-regulatory`.bus_aiwarning f
`qa-czks-regulatory`.bus_aiwarning f
LEFT JOIN (
SELECT DISTINCT
vi.VIDEOMANAGER_ID,
aip.OUTSOURCED_ID
FROM
`qa-gwj-regulatory`.bus_aiwarning_people aip
LEFT JOIN `qa-gwj-regulatory`.bus_videomanager vi ON vi.OUTSOURCED_ID = aip.OUTSOURCED_ID
`qa-czks-regulatory`.bus_aiwarning_people aip
LEFT JOIN `qa-czks-regulatory`.bus_videomanager vi ON vi.OUTSOURCED_ID = aip.OUTSOURCED_ID
WHERE
aip.ISDELETE = 0
AND vi.VIDEOMANAGER_ID IS NOT NULL

8
src/main/resources/mybatis/dsno2/keyProjects/PersonnelManagementMapper.xml
View File

@ -4,7 +4,7 @@
<!--表名 -->
<sql id="tableName">
`qa-gwj-regulatory`.`BUS_PERSONNELMANAGEMENT`
`qa-czks-regulatory`.`BUS_PERSONNELMANAGEMENT`
</sql>
<!--数据字典表名 -->
@ -182,9 +182,9 @@
r.UNITS_NAME as UNITS_NAME
from
<include refid="tableName"></include> f
left join `qa-gwj-prevention`.sys_dictionaries a on a.DICTIONARIES_ID = f.JOB_TYPE
left join `qa-czks-prevention`.sys_dictionaries a on a.DICTIONARIES_ID = f.JOB_TYPE
left join bus_units r on r.UNITS_ID = f.UNITS_ID
left join `qa-gwj-prevention`.vi_user_all ua on ua.USER_ID = f.CREATOR
left join `qa-czks-prevention`.vi_user_all ua on ua.USER_ID = f.CREATOR
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
@ -242,7 +242,7 @@
f.*
from
<include refid="tableName"></include> f
left join `qa-gwj-regulatory`.BUS_OUTSOURCED t on t.UNITS_PIC = f.PERSONNELMANAGEMENT_ID
left join `qa-czks-regulatory`.BUS_OUTSOURCED t on t.UNITS_PIC = f.PERSONNELMANAGEMENT_ID
where
t.OUTSOURCED_ID = #{OUTSOURCED_ID}
and t.ISDELETE = '0'

8
src/main/resources/mybatis/dsno2/keyProjects/UnitsMapper.xml
View File

@ -4,7 +4,7 @@
<!--表名 -->
<sql id="tableName">
`qa-gwj-regulatory`.`BUS_UNITS`
`qa-czks-regulatory`.`BUS_UNITS`
</sql>
<!--数据字典表名 -->
@ -201,7 +201,7 @@
vua.CORP_NAME
from
<include refid="tableName"></include> f
LEFT JOIN `qa-gwj-prevention`.`vi_user_all` vua on f.CREATOR = vua.USER_ID
LEFT JOIN `qa-czks-prevention`.`vi_user_all` vua on f.CREATOR = vua.USER_ID
where
f.UNITS_ID = #{UNITS_ID}
and f.ISDELETE = 0
@ -215,7 +215,7 @@
vua.CORP_NAME
from
<include refid="tableName"></include> f
LEFT JOIN `qa-gwj-prevention`.`vi_user_all` vua on f.CREATOR = vua.USER_ID
LEFT JOIN `qa-czks-prevention`.`vi_user_all` vua on f.CREATOR = vua.USER_ID
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
@ -239,7 +239,7 @@
<include refid="Field"></include>
from
<include refid="tableName"></include> f
left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.UNITS_ID = f.UNITS_ID
left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.UNITS_ID = f.UNITS_ID
where f.ISDELETE = '0'
<if test="UNITS_TYPE != null and UNITS_TYPE !=''">
and o.OUTSOURCED_ID = #{OUTSOURCED_ID}

6
src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml
View File

@ -269,13 +269,13 @@
LATITUDE,
LONGITUDE
FROM
`qa-gwj-regulatory`.bus_videomanager v
LEFT JOIN `qa-gwj-regulatory`.bus_outsourced o on v.OUTSOURCED_ID = o.OUTSOURCED_ID
`qa-czks-regulatory`.bus_videomanager v
LEFT JOIN `qa-czks-regulatory`.bus_outsourced o on v.OUTSOURCED_ID = o.OUTSOURCED_ID
WHERE
v.ISDELETE = 0
and LATITUDE is not null and LONGITUDE is not null
<if test="AREA != null and AREA != ''">
and o.INVOLVING_CORPS in (select CORPINFO_ID from `qa-gwj-prevention`.bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
and o.INVOLVING_CORPS in (select CORPINFO_ID from `qa-czks-prevention`.bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
</if>
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
and o.INVOLVING_CORPS = #{CORPINFO_ID}

6
src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml
View File

@ -134,7 +134,7 @@
from
<include refid="tableName"></include> f
LEFT JOIN bus_videomanager v ON f.VIDEO_RESOURCES_ID = v.VIDEO_RESOURCES_ID and v.ISDELETE = '0'
LEFT JOIN `qa-gwj-prevention`.`vi_user_all` vua on f.CREATOR = vua.USER_ID
LEFT JOIN `qa-czks-prevention`.`vi_user_all` vua on f.CREATOR = vua.USER_ID
where f.ISDELETE = '0'
<!--企业端看自己的建的和监管端建的-->
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
@ -186,14 +186,14 @@
SELECT
GROUP_CONCAT( t.CORP_NAME )
FROM
`qa-gwj-prevention`.BUS_CORP_INFO t
`qa-czks-prevention`.BUS_CORP_INFO t
WHERE
FIND_IN_SET( t.CORPINFO_ID, f.INVOLVING_CORPS )) AS INVOLVING_CORPS_NAME,
(
SELECT
GROUP_CONCAT( t.CORP_NAME )
FROM
`qa-gwj-prevention`.BUS_CORP_INFO t
`qa-czks-prevention`.BUS_CORP_INFO t
WHERE
FIND_IN_SET( t.CORPINFO_ID, f.MANAGE_NAME )) AS MANAGE_CORPS_NAME,
b.UNITS_NAME AS UNITS_NAME,