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

Merge remote-tracking branch 'origin/pet' into dev

xuyifeng-0724-人员中台对接-dev
liujun 2024-07-02 15:15:11 +08:00
parent 064b6bdc33 eba8aec968
commit 98d303bc66
44 changed files with 1598 additions and 749 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zcloud/FHmainApplication.java
View File

@ -7,6 +7,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Conditional;
import org.springframework.scheduling.annotation.EnableScheduling;

29
src/main/java/com/zcloud/aspect/DockingAspect.java
View File

@ -32,6 +32,13 @@ import java.util.Map;
public class DockingAspect {
@Autowired
private DockSendMessageService sendMessageService;
@Value("${mq.csy.data.topic}")
private String csyDataDocking;
@Value("${mq.cmt.data.topic}")
private String cmtDataDocking;
@Value("${mq.czks.data.topic}")
private String czksDataDocking;
@Value("${baseimgpath}")
public String baseimgpath;
@Pointcut("@annotation(com.zcloud.aspect.DockAnnotation)")
@ -104,9 +111,27 @@ public class DockingAspect {
tenCorpDto.setProducer_name("qa-prevention-czks");
// 有dockData
if (Tools.notEmpty(proceed.get("dockData"))) {
sendData.put("dockData", proceed.get("dockData"));
String dockData = proceed.get("dockData");
PageData dockDataMap = JSON.parseObject(dockData, PageData.class);
sendData.put("dockData",dockData);
// 操作企业
if ("f8da1790b1034058ae2efefd69af3284".contains(dockDataMap.getString("operatingCorpId"))
|| "016d19225e9d4ece863cce8a256a3e72".contains(dockDataMap.getString("operatingCorpId"))
|| "1".equals(dockDataMap.getString("sendAllCorp"))
){
tenCorpDto.setTopic(czksDataDocking);
sendMessageService.sendMessage(tenCorpDto);
}
// todo先不给其他两家发送消息，上线前打开
if ("8854edee3aa94be496cee676b6d4845a".equals(dockDataMap.getString("operatingCorpId")) || "1".equals(dockDataMap.getString("sendAllCorp"))){
tenCorpDto.setTopic(csyDataDocking);
sendMessageService.sendMessage(tenCorpDto);
}
if ("6aa255d41602497fa0f934a822820df4".equals(dockDataMap.getString("operatingCorpId")) || "1".equals(dockDataMap.getString("sendAllCorp"))){
tenCorpDto.setTopic(cmtDataDocking);
sendMessageService.sendMessage(tenCorpDto);
}
proceed.remove("dockData");
sendMessageService.sendMessage(tenCorpDto);
} else {
System.out.println("------------------------无dockData不发消息------------------------");
}

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

@ -38,7 +38,7 @@ import java.util.*;
* 官网：www.zcloudchina.com
*/
@Controller
@RequestMapping("/app/electricity")
@RequestMapping("c")
public class AppElectricityController extends BaseController {
@Autowired

630
src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java
View File

@ -23,6 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartRequest;
import javax.annotation.Resource;
import java.io.File;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@ -650,33 +651,33 @@ public class AppHotworkCfdController extends BaseController {
* @param
* @throws Exception
*/
@RequestMapping(value = "/editAcceptconfess")
@ResponseBody
@Transactional
@LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "修改")
public Object editAcceptconfess(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData pd2 = new PageData();
pd2 = hotworkCfdService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file" + i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_CONFESS_USER_ID"), pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"));
fileList.clear();
}
map.put("result", errInfo);
return map;
}
// @RequestMapping(value = "/editAcceptconfess")
// @ResponseBody
// @Transactional
// @LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "修改")
// public Object editAcceptconfess(MultipartRequest request) throws Exception {
// Map<String, Object> map = new HashMap<String, Object>();
// String errInfo = "success";
// PageData pd = new PageData();
// pd = this.getPageData();
// PageData pd2 = new PageData();
// pd2 = hotworkCfdService.findById(pd);
// pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
// pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
// List<MultipartFile> fileList = new ArrayList<MultipartFile>();
// String signertime = "";
// String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
//
// for (int i = 0; i < SIGNTIME.length; i++) {
// signertime = SIGNTIME[i];
// fileList.add(request.getFile("file" + i));
// MultipartFile[] fileArr = new MultipartFile[fileList.size()];
// saveImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_CONFESS_USER_ID"), pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"));
// fileList.clear();
// }
// map.put("result", errInfo);
// return map;
// }
private void saveImg(MultipartFile[] files, String signertime, String HOTWORK_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception {
if (files != null && files.length > 0) {
@ -721,6 +722,7 @@ public class AppHotworkCfdController extends BaseController {
pd = this.getPageData();
PageData pd2 = new PageData();
pd2 = hotworkCfdService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
PageData log = new PageData();
@ -739,13 +741,49 @@ public class AppHotworkCfdController extends BaseController {
pd2.put("OTHER_PROTECTIVE_MEASURES", "");
}
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String signertime = "";
String[] SIGNTIME = pd.getString("SIGNTIME").split(",");
switch (status) {
case "8": // 验收人
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file" + i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveAcceptImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_USER_ID"), pd.getString("ACCEPT_DEPARTMENT_ID"));
fileList.clear();
}
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("FIRE_COMPLETED", pd.get("FIRE_COMPLETED")); // 动火是否完成
pd2.put("SITE_CLEANED", pd.get("SITE_CLEANED")); // 作业现场是否清理
pd2.put("NO_REMAINING_EMBERS", pd.get("NO_REMAINING_EMBERS")); // 是否存在遗留火种
hotworkCfdService.edit(pd2);
log.put("ACTION", "验收通过");
case "8"://验收人
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
// 发短信
PageData mes = new PageData();
mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID")); // 收信人userid
mes.put("templateCode", "DH_Y08"); // 短信模板编码
mes.put("SMSCode", "SMS_227250920"); // 短信模板编码
mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID")); // 企业id
// 参数集合
List<PageData> paramsList = new ArrayList<PageData>();
// 第1个参数
PageData params1 = new PageData();
params1.put("name", "number"); // 存入短信模板中的参数名称
params1.put("value", pd2.get("CHECK_NO")); // 存入上面参数名称所传递的值
paramsList.add(params1);
// 第2个参数
PageData params2 = new PageData();
params2.put("name", "type"); // 存入短信模板中的参数名称
params2.put("value", "动火作业"); // 存入上面参数名称所传递的值
paramsList.add(params2);
// sendMessageUtil.sendMessages(mes, paramsList);
break;
case "-8": // 审批打回
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file" + i));
@ -756,59 +794,32 @@ public class AppHotworkCfdController extends BaseController {
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
hotworkCfdService.edit(pd2);
log.put("ACTION", "验收通过");
// 发短信
PageData mes = new PageData();
mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
mes.put("templateCode", "DH_Y08");// 短信模板编码
mes.put("SMSCode", "SMS_227250920");// 短信模板编码
mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList = new ArrayList<PageData>();
// 第1个参数
PageData params1 = new PageData();
params1.put("name", "number");// 存入短信模板中的参数名称
params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList.add(params1);
// 第2个参数
PageData params2 = new PageData();
params2.put("name", "type");// 存入短信模板中的参数名称
params2.put("value", "动火作业");// 存入上面参数名称所传递的值
paramsList.add(params2);
//sendMessageUtil.sendMessages(mes, paramsList);
break;
case "-8"://审批打回
log.put("ACTION", "验收人打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
hotworkCfdService.edit(pd2);
// 发短信
PageData mes6 = new PageData();
mes6.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
mes6.put("templateCode", "DH_N08");// 短信模板编码
mes6.put("SMSCode", "SMS_223580715");// 短信模板编码
mes6.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
mes6.put("RECEIVER_ID", pd2.get("APPLY_USER_ID")); // 收信人userid
mes6.put("templateCode", "DH_N08"); // 短信模板编码
mes6.put("SMSCode", "SMS_223580715"); // 短信模板编码
mes6.put("CORPINFO_ID", pd2.get("CORPINFO_ID")); // 企业id
// 参数集合
List<PageData> paramsList6 = new ArrayList<PageData>();
// 第1个参数
PageData params19 = new PageData();
params19.put("name", "params1");// 存入短信模板中的参数名称
params19.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值
params19.put("name", "params1"); // 存入短信模板中的参数名称
params19.put("value", pd2.get("CHECK_NO")); // 存入上面参数名称所传递的值
paramsList6.add(params19);
// 第2个参数
PageData params20 = new PageData();
params20.put("name", "params2");// 存入短信模板中的参数名称
params20.put("value", "动火作业");// 存入上面参数名称所传递的值
params20.put("name", "params2"); // 存入短信模板中的参数名称
params20.put("value", "动火作业"); // 存入上面参数名称所传递的值
paramsList6.add(params20);
// 第3个参数
PageData params21 = new PageData();
params21.put("name", "params3");// 存入短信模板中的参数名称
params21.put("value", "验收归档");// 存入上面参数名称所传递的值
params21.put("name", "params3"); // 存入短信模板中的参数名称
params21.put("value", "验收归档"); // 存入上面参数名称所传递的值
paramsList6.add(params21);
//sendMessageUtil.sendMessages(mes6, paramsList6);
// sendMessageUtil.sendMessages(mes6, paramsList6);
break;
default:
break;
@ -921,12 +932,12 @@ public class AppHotworkCfdController extends BaseController {
// 保存审批信息
PageData condition = new PageData();
condition.put("HOTWORK_ID", pd2.get("HOTWORK_ID"));
condition.put("TYPE","1");
condition.put("APPROVAL_OPINIONS",pd.get("CONTENT"));
condition.put("APPROVAL_SIGNATURE",Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
condition.put("APPROVAL_SIGNATURE_TIME",pd.get("SIGNER_TIME"));
condition.put("APPROVAL_STATUS",pd.getString("APPROVAL_STATUS"));
condition.put("APPROVAL_CONTENT",pd.getString("APPROVAL_CONTENT"));
condition.put("TYPE", "1");
condition.put("APPROVAL_OPINIONS", pd.get("CONTENT"));
condition.put("APPROVAL_SIGNATURE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
condition.put("APPROVAL_SIGNATURE_TIME", pd.get("SIGNER_TIME"));
condition.put("APPROVAL_STATUS", pd.getString("APPROVAL_STATUS"));
condition.put("APPROVAL_CONTENT", pd.getString("APPROVAL_CONTENT"));
hotworkCfdService.approval(condition);
}
break;
@ -1098,11 +1109,14 @@ public class AppHotworkCfdController extends BaseController {
case "7"://班长
if (files != null && files.length > 0) {
PageData condition = new PageData();
condition.put("HOTWORK_ID",pd2.getString("HOTWORK_ID"));
List<PageData> acceptUsers = hotworkAcceptUserCfdService.listAll(condition);
if (acceptUsers.size() <= 0){
map.put("code","9999");
map.put("errorMessage","接受交底人未签字");
pd.put("HOTWORK_ID", pd2.getString("HOTWORK_ID"));
// condition.put("HOTWORK_ID",pd2.getString("HOTWORK_ID"));
hotworkCfdService.addInfo(pd);
//List<PageData> acceptUsers = hotworkAcceptUserCfdService.listAll(condition);
List<PageData> acceptConfessList = (List<PageData>) pd.get("acceptConfessList");
if (acceptConfessList == null || acceptConfessList.size() <= 0 || "0".equals(pd.getString("acceptConfessStatus"))) {
map.put("code", "9999");
map.put("errorMessage", "接受交底人未签字");
return map;
}
MultipartFile file = files[0];
@ -1208,17 +1222,50 @@ public class AppHotworkCfdController extends BaseController {
}
break;
case "-1.5": {//确认
log.put("ACTION", "作业负责人打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("AUDIT_CONTENT", pd.get("CONTENT"));
hotworkCfdService.edit(pd2);
// log.put("ACTION", "作业负责人打回");
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
// pd2.put("AUDIT_CONTENT", pd.get("CONTENT"));
// hotworkCfdService.edit(pd2);
// break;
if (files != null && files.length > 0) {
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONFIRM_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("CONFIRM_CONTENT", pd.get("CONTENT"));
pd2.put("CONFIRM_OTHER_CONTENT", pd.get("APPROVAL_CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
hotworkCfdService.edit(pd2);
log.put("ACTION", "作业负责人打回");
}
break;
}
case "-2": {//确认打回
log.put("ACTION", "作业单位打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("CONFIRM_CONTENT", pd.get("CONTENT"));
hotworkCfdService.edit(pd2);
// log.put("ACTION", "作业单位打回");
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
// pd2.put("CONFIRM_CONTENT", pd.get("CONTENT"));
// hotworkCfdService.edit(pd2);
if (files != null && files.length > 0) {
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
hotworkCfdService.edit(pd2);
// 保存审批信息
PageData condition = new PageData();
condition.put("HOTWORK_ID", pd2.get("HOTWORK_ID"));
condition.put("TYPE", "1");
condition.put("APPROVAL_OPINIONS", pd.get("CONTENT"));
condition.put("APPROVAL_SIGNATURE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
condition.put("APPROVAL_SIGNATURE_TIME", pd.get("SIGNER_TIME"));
condition.put("APPROVAL_STATUS", pd.getString("APPROVAL_STATUS"));
condition.put("APPROVAL_CONTENT", pd.getString("APPROVAL_CONTENT"));
hotworkCfdService.approval(condition);
}
// 发短信
PageData mes = new PageData();
@ -1248,9 +1295,24 @@ public class AppHotworkCfdController extends BaseController {
}
case "-4"://单位负责人打回
log.put("ACTION", "单位负责人打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("AUDIT_CONTENT", pd.get("CONTENT"));
hotworkCfdService.edit(pd2);
if (files != null && files.length > 0) {
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("LEADER_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
hotworkCfdService.edit(pd2);
log.put("ACTION", "单位负责人打回");
}
// log.put("ACTION", "单位负责人打回");
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
// pd2.put("AUDIT_CONTENT", pd.get("CONTENT"));
// hotworkCfdService.edit(pd2);
// 发短信
PageData mes2 = new PageData();
@ -1278,126 +1340,184 @@ public class AppHotworkCfdController extends BaseController {
//sendMessageUtil.sendMessages(mes2, paramsList2);
break;
case "-5"://审批部门打回
log.put("ACTION", "安全部门打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("APPROVE_CONTENT", pd.get("CONTENT"));
hotworkCfdService.edit(pd2);
if (files != null && files.length > 0) {
MultipartFile file = files[0];
// 发短信
PageData mes3 = new PageData();
mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
mes3.put("templateCode", "DH_N05");// 短信模板编码
mes3.put("SMSCode", "SMS_223580715");// 短信模板编码
mes3.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList3 = new ArrayList<PageData>();
// 第1个参数
PageData params10 = new PageData();
params10.put("name", "params1");// 存入短信模板中的参数名称
params10.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList3.add(params10);
// 第2个参数
PageData params11 = new PageData();
params11.put("name", "params2");// 存入短信模板中的参数名称
params11.put("value", "动火作业");// 存入上面参数名称所传递的值
paramsList3.add(params11);
// 第3个参数
PageData params12 = new PageData();
params12.put("name", "params3");// 存入短信模板中的参数名称
params12.put("value", "安全部门");// 存入上面参数名称所传递的值
paramsList3.add(params12);
//sendMessageUtil.sendMessages(mes3, paramsList3);
break;
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("AUDIT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("AUDIT_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
hotworkCfdService.edit(pd2);
log.put("ACTION", "安全部门打回");
// log.put("ACTION", "安全部门打回");
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
// pd2.put("APPROVE_CONTENT", pd.get("CONTENT"));
// hotworkCfdService.edit(pd2);
// 发短信
PageData mes3 = new PageData();
mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
mes3.put("templateCode", "DH_N05");// 短信模板编码
mes3.put("SMSCode", "SMS_223580715");// 短信模板编码
mes3.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList3 = new ArrayList<PageData>();
// 第1个参数
PageData params10 = new PageData();
params10.put("name", "params1");// 存入短信模板中的参数名称
params10.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList3.add(params10);
// 第2个参数
PageData params11 = new PageData();
params11.put("name", "params2");// 存入短信模板中的参数名称
params11.put("value", "动火作业");// 存入上面参数名称所传递的值
paramsList3.add(params11);
// 第3个参数
PageData params12 = new PageData();
params12.put("name", "params3");// 存入短信模板中的参数名称
params12.put("value", "安全部门");// 存入上面参数名称所传递的值
paramsList3.add(params12);
//sendMessageUtil.sendMessages(mes3, paramsList3);
break;
}
case "-6"://审批打回
log.put("ACTION", "审批部门打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
hotworkCfdService.edit(pd2);
// 发短信
PageData mes4 = new PageData();
mes4.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
mes4.put("templateCode", "DH_N06");// 短信模板编码
mes4.put("SMSCode", "SMS_223580715");// 短信模板编码
mes4.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList4 = new ArrayList<PageData>();
// 第1个参数
PageData params13 = new PageData();
params13.put("name", "params1");// 存入短信模板中的参数名称
params13.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList4.add(params13);
// 第2个参数
PageData params14 = new PageData();
params14.put("name", "params2");// 存入短信模板中的参数名称
params14.put("value", "动火作业");// 存入上面参数名称所传递的值
paramsList4.add(params14);
// 第3个参数
PageData params15 = new PageData();
params15.put("name", "params3");// 存入短信模板中的参数名称
params15.put("value", "审批人审核");// 存入上面参数名称所传递的值
paramsList4.add(params15);
//sendMessageUtil.sendMessages(mes4, paramsList4);
break;
case "-7"://审批打回
log.put("ACTION", "动火前验票打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
hotworkCfdService.edit(pd2);
// 发短信
PageData mes5 = new PageData();
mes5.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
mes5.put("templateCode", "DH_N07");// 短信模板编码
mes5.put("SMSCode", "SMS_223580715");// 短信模板编码
mes5.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList5 = new ArrayList<PageData>();
// 第1个参数
PageData params16 = new PageData();
params16.put("name", "params1");// 存入短信模板中的参数名称
params16.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList5.add(params16);
// 第2个参数
PageData params17 = new PageData();
params17.put("name", "params2");// 存入短信模板中的参数名称
params17.put("value", "动火作业");// 存入上面参数名称所传递的值
paramsList5.add(params17);
// 第3个参数
PageData params18 = new PageData();
params18.put("name", "params3");// 存入短信模板中的参数名称
params18.put("value", "动火前验票");// 存入上面参数名称所传递的值
paramsList5.add(params18);
//sendMessageUtil.sendMessages(mes5, paramsList5);
break;
case "-8"://审批打回
log.put("ACTION", "验收人打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
hotworkCfdService.edit(pd2);
if (files != null && files.length > 0) {
MultipartFile file = files[0];
// 发短信
PageData mes6 = new PageData();
mes6.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
mes6.put("templateCode", "DH_N08");// 短信模板编码
mes6.put("SMSCode", "SMS_223580715");// 短信模板编码
mes6.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList6 = new ArrayList<PageData>();
// 第1个参数
PageData params19 = new PageData();
params19.put("name", "params1");// 存入短信模板中的参数名称
params19.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList6.add(params19);
// 第2个参数
PageData params20 = new PageData();
params20.put("name", "params2");// 存入短信模板中的参数名称
params20.put("value", "动火作业");// 存入上面参数名称所传递的值
paramsList6.add(params20);
// 第3个参数
PageData params21 = new PageData();
params21.put("name", "params3");// 存入短信模板中的参数名称
params21.put("value", "验收归档");// 存入上面参数名称所传递的值
paramsList6.add(params21);
//sendMessageUtil.sendMessages(mes6, paramsList6);
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("APPROVE_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("APPROVE_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
hotworkCfdService.edit(pd2);
log.put("ACTION", "审批部门打回");
// log.put("ACTION", "审批部门打回");
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
// pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
// hotworkCfdService.edit(pd2);
// 发短信
PageData mes4 = new PageData();
mes4.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
mes4.put("templateCode", "DH_N06");// 短信模板编码
mes4.put("SMSCode", "SMS_223580715");// 短信模板编码
mes4.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList4 = new ArrayList<PageData>();
// 第1个参数
PageData params13 = new PageData();
params13.put("name", "params1");// 存入短信模板中的参数名称
params13.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList4.add(params13);
// 第2个参数
PageData params14 = new PageData();
params14.put("name", "params2");// 存入短信模板中的参数名称
params14.put("value", "动火作业");// 存入上面参数名称所传递的值
paramsList4.add(params14);
// 第3个参数
PageData params15 = new PageData();
params15.put("name", "params3");// 存入短信模板中的参数名称
params15.put("value", "审批人审核");// 存入上面参数名称所传递的值
paramsList4.add(params15);
//sendMessageUtil.sendMessages(mes4, paramsList4);
break;
}
case "-7"://审批打回
if (files != null && files.length > 0) {
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("MONITOR_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("MONITOR_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("MONITOR_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("WORK_START_DATE", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
hotworkCfdService.edit(pd2);
log.put("ACTION", "动火前验票打回");
// log.put("ACTION", "动火前验票打回");
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
// pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
// hotworkCfdService.edit(pd2);
// 发短信
PageData mes5 = new PageData();
mes5.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
mes5.put("templateCode", "DH_N07");// 短信模板编码
mes5.put("SMSCode", "SMS_223580715");// 短信模板编码
mes5.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList5 = new ArrayList<PageData>();
// 第1个参数
PageData params16 = new PageData();
params16.put("name", "params1");// 存入短信模板中的参数名称
params16.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList5.add(params16);
// 第2个参数
PageData params17 = new PageData();
params17.put("name", "params2");// 存入短信模板中的参数名称
params17.put("value", "动火作业");// 存入上面参数名称所传递的值
paramsList5.add(params17);
// 第3个参数
PageData params18 = new PageData();
params18.put("name", "params3");// 存入短信模板中的参数名称
params18.put("value", "动火前验票");// 存入上面参数名称所传递的值
paramsList5.add(params18);
//sendMessageUtil.sendMessages(mes5, paramsList5);
break;
}
case "-8"://审批打回
if (files != null && files.length > 0) {
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
hotworkCfdService.edit(pd2);
log.put("ACTION", "验收人打回");
// log.put("ACTION", "验收人打回");
// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
// pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
// hotworkCfdService.edit(pd2);
// 发短信
PageData mes6 = new PageData();
mes6.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid
mes6.put("templateCode", "DH_N08");// 短信模板编码
mes6.put("SMSCode", "SMS_223580715");// 短信模板编码
mes6.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id
// 参数集合
List<PageData> paramsList6 = new ArrayList<PageData>();
// 第1个参数
PageData params19 = new PageData();
params19.put("name", "params1");// 存入短信模板中的参数名称
params19.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值
paramsList6.add(params19);
// 第2个参数
PageData params20 = new PageData();
params20.put("name", "params2");// 存入短信模板中的参数名称
params20.put("value", "动火作业");// 存入上面参数名称所传递的值
paramsList6.add(params20);
// 第3个参数
PageData params21 = new PageData();
params21.put("name", "params3");// 存入短信模板中的参数名称
params21.put("value", "验收归档");// 存入上面参数名称所传递的值
paramsList6.add(params21);
//sendMessageUtil.sendMessages(mes6, paramsList6);
}
break;
default:
break;
@ -1656,16 +1776,52 @@ public class AppHotworkCfdController extends BaseController {
PageData condition = new PageData();
condition.put("showInfo",pd.getString("showInfo"));
condition.put("HOTWORK_ID",pd.getString("HOTWORK_ID"));
map.put("measuresList", hotworkCfdService.listAllMeasures(condition));
// map.put("measuresList", hotworkCfdService.listAllMeasures(condition));
List<PageData> measuresList = hotworkCfdService.listAllMeasures(condition);
for (PageData measure : measuresList) {
String order = measure.getString("ORDER");
String protectiveMeasures = measure.getString("PROTECTIVE_MEASURES");
if ("2".equals(order)) {
String answer1 = measure.getString("ANSWER1");
int startIndex = protectiveMeasures.indexOf('(');
int endIndex = protectiveMeasures.indexOf(')');
if (startIndex != -1 && endIndex != -1 && startIndex < endIndex) {
protectiveMeasures = protectiveMeasures.substring(0, endIndex) + answer1 + protectiveMeasures.substring(endIndex);
}
measure.put("PROTECTIVE_MEASURES", protectiveMeasures);
} else if ("8".equals(order)) {
String[] answers = {measure.getString("ANSWER1"), measure.getString("ANSWER2"), measure.getString("ANSWER3")};
for (String answer : answers) {
int index = protectiveMeasures.indexOf("()");
if (index != -1) {
protectiveMeasures = protectiveMeasures.substring(0, index + 1) + answer + protectiveMeasures.substring(index + 1);
}
}
measure.put("PROTECTIVE_MEASURES", protectiveMeasures);
}
}
map.put("measuresList", measuresList);
pd = hotworkCfdService.findById(pd); //根据ID读取
// created by liu jun 添加（交底人、项目主管部门负责人、安全措施确认人）
hotworkCfdService.addInfo(pd);
//气体检测数据
map.put("gasList", hotworkGasCfdService.listAll(pd));
// imgList是接受交底人签字
map.put("imgList", hotworkAcceptUserCfdService.findByIds(pd));
map.put("imgList1", hotworkAcceptUserCfdService.findById(pd));
List<PageData> acceptConfessList = (List<PageData>) pd.get("acceptConfessList");
List<String> imgList = new ArrayList<>();
if (acceptConfessList != null) {
for (PageData acceptConfess : acceptConfessList) {
String signerPath = acceptConfess.getString("ACCEPT_CONFESS_USER_SIGNER_PATH");
if (signerPath != null && !signerPath.isEmpty()) {
imgList.add(signerPath);
}
}
}
map.put("imgList", imgList);
// map.put("imgList", hotworkAcceptUserCfdService.findByIds(pd));
// map.put("imgList1", hotworkAcceptUserCfdService.findById(pd));
condition.clear();
condition.put("TYPE","115");
condition.put("FOREIGN_KEY",pd.getString("HOTWORK_ID"));
@ -1675,6 +1831,26 @@ public class AppHotworkCfdController extends BaseController {
return map;
}
/**删除动火操作人图片
* @param
* @throws Exception
*/
@RequestMapping(value="/delImg")
@ResponseBody
@LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "删除动火操作人图片")
public Object delImg() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = imgFilesService.findById(pd); //根据ID读取
File file = new File(PathUtil.getProjectpath()+pd.getString("FILEPATH"));
file.delete();
imgFilesService.delete(pd);
map.put("result", errInfo); //返回结果
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
@ -1846,6 +2022,36 @@ public class AppHotworkCfdController extends BaseController {
}
}
/**
* 接受交底人审批
* @param files
* @return
* @throws Exception
*/
@RequestMapping(value = "/editAcceptconfess")
@ResponseBody
public Object editAcceptconfess(@RequestParam(value = "FFILE", required = false) MultipartFile[] files) throws Exception {
PageData response = new PageData();
try {
PageData request = this.getPageData();
PageData condition = new PageData();
condition.put("HOTWORK_ID",request.get("HOTWORK_ID"));
condition.put("USER_ID",request.get("USER_ID"));
condition.put("CORPINFO_ID",request.get("CORPINFO_ID"));
condition.put("TYPE","3");
condition.put("APPROVAL_STATUS","1");
hotworkCfdService.confessApproval(condition, files);
response.put("result", "success");
return response;
} catch (Exception e) {
e.printStackTrace();
response.put("result", "error");
response.put("message", e.getMessage());
return response;
}
}
/**
* 安全交底人审批
* created by liu jun

29
src/main/java/com/zcloud/controller/highriskwork/HotworkCfdController.java
View File

@ -141,13 +141,36 @@ public class HotworkCfdController extends BaseController {
PageData condition = new PageData();
condition.put("showInfo",pd.getString("showInfo"));
condition.put("HOTWORK_ID",pd.getString("HOTWORK_ID"));
map.put("measuresList", hotworkCfdService.listAllMeasures(condition));
// map.put("measuresList", hotworkCfdService.listAllMeasures(condition));
List<PageData> measuresList = hotworkCfdService.listAllMeasures(condition);
for (PageData measure : measuresList) {
String order = measure.getString("ORDER");
String protectiveMeasures = measure.getString("PROTECTIVE_MEASURES");
if ("2".equals(order)) {
String answer1 = measure.getString("ANSWER1");
int startIndex = protectiveMeasures.indexOf('(');
int endIndex = protectiveMeasures.indexOf(')');
if (startIndex != -1 && endIndex != -1 && startIndex < endIndex) {
protectiveMeasures = protectiveMeasures.substring(0, endIndex) + answer1 + protectiveMeasures.substring(endIndex);
}
measure.put("PROTECTIVE_MEASURES", protectiveMeasures);
} else if ("8".equals(order)) {
String[] answers = {measure.getString("ANSWER1"), measure.getString("ANSWER2"), measure.getString("ANSWER3")};
for (String answer : answers) {
int index = protectiveMeasures.indexOf("()");
if (index != -1) {
protectiveMeasures = protectiveMeasures.substring(0, index + 1) + answer + protectiveMeasures.substring(index + 1);
}
}
measure.put("PROTECTIVE_MEASURES", protectiveMeasures);
}
}
map.put("measuresList", measuresList);
pd = hotworkCfdService.findById(pd); //根据ID读取
// created by liu jun 添加（交底人、项目主管部门负责人、安全措施确认人）
hotworkCfdService.addInfo(pd);
map.put("measuresList", hotworkCfdService.listAllMeasures(pd));
// map.put("measuresList", hotworkCfdService.listAllMeasures(pd));
map.put("gasList", hotworkGasCfdService.listAll(pd));
// imgList是接受交底人签字
map.put("imgList", hotworkAcceptUserCfdService.findByIds(pd));

5
src/main/java/com/zcloud/controller/map/MapController.java
View File

@ -939,8 +939,9 @@ public class MapController extends BaseController {
AlarmGet alarmGet = new AlarmGet();
alarmGet.setPage(new com.zcloud.service.dw.dto.Page());
alarmGet.getPage().setCurrent("1");
alarmGet.getPage().setSize("12");
alarmGet.getPage().setSize("5");
alarmGet.setCorpId(pd.getString("corpId"));
alarmGet.setSourceNum(pd.getString("source"));
map.put("result", "success");
map.put("alarmList", dwService.getAlarmList(alarmGet));
TraceGet get = new TraceGet();
@ -952,7 +953,7 @@ public class MapController extends BaseController {
AlarmGet alarmGet = new AlarmGet();
alarmGet.setPage(new com.zcloud.service.dw.dto.Page());
alarmGet.getPage().setCurrent("1");
alarmGet.getPage().setSize("12");
alarmGet.getPage().setSize("9");
alarmGet.setCorpId(pd.getString("corpId"));
map.put("result", "success");
map.put("alarmList", new ArrayList<>());

56
src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java
View File

@ -2,13 +2,17 @@ package com.zcloud.controller.map;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.PageData;
import com.zcloud.service.keyProjects.PlatformvideomanagementService;
import com.zcloud.service.map.util.HKPostUtil;
import com.zcloud.service.system.DictionariesService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.zcloud.service.map.PlatformelectronicService;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -19,6 +23,9 @@ public class MapPlatFormElectronicController extends BaseController {
@Autowired
private PlatformelectronicService platformelectronicService;
@Autowired
private PlatformvideomanagementService platformvideomanagementService;
/**总摄像头数
* @throws Exception
*/
@ -27,8 +34,7 @@ public class MapPlatFormElectronicController extends BaseController {
public Object listAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData pd = this.getPageData();
Integer allForMap = platformelectronicService.countAllForMap(pd); //列出Platformelectronic列表
map.put("allForMap", allForMap);
map.put("result", errInfo);
@ -52,6 +58,8 @@ public class MapPlatFormElectronicController extends BaseController {
return map;
}
@Resource
private DictionariesService dictionariesService;
/**地图插点
* @throws Exception
@ -61,8 +69,48 @@ public class MapPlatFormElectronicController extends BaseController {
public Object listAllLocation() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData pd = this.getPageData();
if ("bianjieruqin".equals(pd.getString("TYPE"))){
// 注意：这里不加企业id
// if (StringUtils.isEmpty(pd.getString("CORPINFO_ID"))){
// pd.put("CORPINFO_ID",pd.get("corpId"));
// }
pd.put("forMap","1");
//列出Platformvideomanagement列表
PageData condition = new PageData();
List<PageData> varList = platformelectronicService.listAll(pd);
for (PageData data : varList) {
data.put("MAP_POINT_NAME", data.getString("NAME"));
condition.clear();
condition.put("INDEXCODE",data.getString("INDEXCODE"));
//增加容错
List<PageData> list = platformelectronicService.listAll(condition);
if (list.size() > 0){
data.put("FANGQU_IDS",list.get(0).getString("FANGQU_IDS"));
}
}
condition.clear();
condition.put("PARENT_ID","f0bae7becdee4d779a2cb82037948ab4");
Map<String,List<PageData>> tongJi = new HashMap<>();
List<PageData> dic = dictionariesService.findByCondition(condition);
// 找出要统计的图标信息
for (PageData _dic : dic){
condition.clear();
condition.put("PARENT_ID",_dic.getString("DICTIONARIES_ID"));
List<PageData> dic2 = dictionariesService.findByCondition(condition);
for (PageData _dic2 : dic2){
_dic2.put("NAME",_dic.getString("NAME") + _dic2.getString("NAME"));
// 统计不同防区中的不同的
_dic2.put("num",varList.stream().filter(n -> n.getString("FANGQU_IDS").contains(_dic2.getString("DICTIONARIES_ID"))).count());
}
tongJi.put(_dic.getString("NAME"),dic2);
}
map.put("iconData",tongJi);
// 根据统计的数据
map.put("varList", varList);
map.put("result", errInfo);
return map;
}
pd.put("forMap","1");
List<PageData> varList = platformelectronicService.listAll(pd); //列出Platformelectronic列表
for (PageData data : varList) {

2
src/main/java/com/zcloud/controller/system/LoginController.java
View File

@ -187,7 +187,7 @@ public class LoginController extends BaseController {
PageData pathData = corpPathService.getCorpPathByCorpId(pd);
map.put("baseImgPath",pathData.getString("PIC_PATH"));
map.put("USER_IDENTITY",pathData.getString("USER_IDENTITY"));
map.put("BACKENDADDR", pathData.getString("BACK_END_PATH"));
map.put("BACKENDADDR", "http://192.168.0.49:8091/");
} else {
PageData pathData = corpPathService.getCorpPathByPersonInfo(pd);
map.put("baseImgPath",pathData.getString("PIC_PATH"));

31
src/main/java/com/zcloud/controller/xgf/XgfUserController.java
View File

@ -65,13 +65,14 @@ public class XgfUserController extends BaseController {
*/
@RequestMapping(value = "/approvePlus")
@ResponseBody
public Object approvePlus(@RequestParam(value="chengNuoShu",required=false) MultipartFile[] chengNuoShu) throws Exception {
PageData request = this.getPageData();
xgfUserService.approvePlus(request,chengNuoShu);
public Object approvePlus(@RequestParam(value = "chengNuoShu", required = false) MultipartFile[] chengNuoShu) throws Exception {
PageData response = new PageData();
response.put("result", "success");
PageData request = this.getPageData();
xgfUserService.approvePlus(request, chengNuoShu);
response.put("data", request);
return response;
}
/**
@ -79,18 +80,26 @@ public class XgfUserController extends BaseController {
*/
@RequestMapping(value = "/approveMax")
@ResponseBody
public Object approveMax(@RequestParam(value="chengNuoShu",required=false) MultipartFile[] chengNuoShu) throws Exception {
public Object approveMax(@RequestParam(value = "chengNuoShu", required = false) MultipartFile[] chengNuoShu) throws Exception {
PageData request = this.getPageData();
xgfUserService.approveMax(request,chengNuoShu);
PageData response = new PageData();
response.put("result", "success");
response.put("code","0");
response.put("data", request);
try {
xgfUserService.approveMax(request, chengNuoShu);
} catch (Exception e) {
e.printStackTrace();
response.put("code", "9999");
response.put("errorMessage", e.getMessage());
return response;
}
return response;
}
@RequestMapping(value = "/regulatoryUserList")
@ResponseBody
public Object regulatoryUserList() throws Exception{
public Object regulatoryUserList() throws Exception {
PageData request = this.getPageData();
PageData response = new PageData();
response.put("result", "success");
@ -132,7 +141,7 @@ public class XgfUserController extends BaseController {
@RequestMapping(value = "/getAppointApproveList")
@ResponseBody
public Object getAppointApproveList(Page page) throws Exception{
public Object getAppointApproveList(Page page) throws Exception {
PageData request = this.getPageData();
request.put("USER_ID", Jurisdiction.getUSER_ID());
page.setPd(request);
@ -145,11 +154,11 @@ public class XgfUserController extends BaseController {
@RequestMapping(value = "/getWorkTask")
@ResponseBody
public Object getWorkTask() throws Exception{
public Object getWorkTask() throws Exception {
PageData request = this.getPageData();
PageData response = new PageData();
response.put("result", "success");
response.put("list",xgfUserService.getWorkTask(request));
response.put("list", xgfUserService.getWorkTask(request));
return response;
}
@ -159,7 +168,7 @@ public class XgfUserController extends BaseController {
*/
@RequestMapping(value = "/appointApprove")
@ResponseBody
public Object appointApprove() throws Exception{
public Object appointApprove() throws Exception {
PageData request = this.getPageData();
PageData response = new PageData();
response.put("result", "success");
@ -172,7 +181,7 @@ public class XgfUserController extends BaseController {
*/
@RequestMapping(value = "/getApproveInfo")
@ResponseBody
public Object getApproveInfo() throws Exception{
public Object getApproveInfo() throws Exception {
PageData request = this.getPageData();
PageData response = new PageData();
response.put("list", xgfUserService.getApproveInfo(request));

8
src/main/java/com/zcloud/dto/TenCorpDto.java
View File

@ -2,6 +2,7 @@ package com.zcloud.dto;
import com.alibaba.fastjson.JSON;
import com.zcloud.entity.PageData;
import com.zcloud.util.Warden;
import lombok.Data;
@Data
@ -23,6 +24,10 @@ public class TenCorpDto {
// 消息体
private PageData data;
private String messageLogId;
private String CREATE_TIME;
public TenCorpDto() {
this.id = Warden.get32UUID();
}
@ -40,6 +45,9 @@ public class TenCorpDto {
info.put("MARK_NAME", this.mark_name);
info.put("MESSAGE", this.message);
info.put("TOPIC",this.topic);
info.put("DATA", JSON.toJSONString(this.data));
info.put("CREATE_TIME", this.CREATE_TIME);
info.put("MESSAGE_LOG_ID", this.messageLogId);
return info;
}
}

109
src/main/java/com/zcloud/flow/xgf/GuFen/GuFenCharge.java
View File

@ -54,70 +54,79 @@ public class GuFenCharge extends NodeSwitchComponent {
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
PageData condition = new PageData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
condition.clear();
condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID"));
PageData userInfo = xgfUserDetailsMapper.findById(condition);
condition.clear();
condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID"));
PageData userInfo = xgfUserDetailsMapper.findById(condition);
// 如果不是当前流程，进入下一流程判断
if (!"0".equals(info.getIterator())) {
// 根据是否有委托书判断是否走委托流程
if (userInfo.get("ATTORNEY") != null && StringUtils.isNotBlank(userInfo.getString("ATTORNEY"))) {
// 如果不是当前流程，进入下一流程判断
if (!"0".equals(info.getIterator())) {
// 根据是否有委托书判断是否走委托流程
if (userInfo.get("ATTORNEY") != null && StringUtils.isNotBlank(userInfo.getString("ATTORNEY"))) {
return "GuFenWeiTuo";
}
return "GuFenSupervise";
}
flows.put("APPOINT_ZERO_CORP_ID", "1");
flows.put("APPOINT_ZERO_CORP_NAME", "秦港股份有限公司");
flows.put("APPOINT_ZERO_TIME", DateUtil.getTime());
flows.put("APPOINT_ZERO_STATUS", info.getSTATUS());
flows.put("APPOINT_ZERO_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows, info);
return "";
} else {
xgfFlowsMapper.edit(flows);
entity.put("CHECK_STATUS", 1);
entity.put("VALID_FLAG", "2");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
// created by liu jun 2024-03-01 港务局开会后，将入场告知培训的有效期设置权限给发包单位
if (StringUtils.isNotBlank(info.getLIMIT_END_TIME())) {
entity.put("LIMIT_END_TIME", info.getLIMIT_END_TIME());
}
// created by liu jun 2024-02-04 如果有委托书则保存委托书
if (StringUtils.isNotBlank(info.getATTORNEY())) {
userInfo.put("ATTORNEY", info.getAPPOINT_ANNEX());
xgfUserDetailsMapper.edit(userInfo);
}
xgfUserMapper.edit(entity);
// 将指针清空
info.setIterator("");
}
if (StringUtils.isNotBlank(info.getATTORNEY())) {
xgfUserService.saveLog(info, "1", "0");
return "GuFenWeiTuo";
} else {
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
}
return "GuFenSupervise";
}
flows.put("APPOINT_ZERO_CORP_ID", "1");
flows.put("APPOINT_ZERO_CORP_NAME", "秦港股份有限公司");
flows.put("APPOINT_ZERO_TIME", DateUtil.getTime());
flows.put("APPOINT_ZERO_STATUS", info.getSTATUS());
flows.put("APPOINT_ZERO_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows, info);
} catch (Exception e) {
e.printStackTrace();
info.setErrorMsg(e.getMessage());
return "";
} else {
xgfFlowsMapper.edit(flows);
entity.put("CHECK_STATUS", 1);
entity.put("VALID_FLAG", "2");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
// created by liu jun 2024-03-01 港务局开会后，将入场告知培训的有效期设置权限给发包单位
if (StringUtils.isNotBlank(info.getLIMIT_END_TIME())) {
entity.put("LIMIT_END_TIME", info.getLIMIT_END_TIME());
}
// created by liu jun 2024-02-04 如果有委托书则保存委托书
if (StringUtils.isNotBlank(info.getATTORNEY())) {
userInfo.put("ATTORNEY", info.getAPPOINT_ANNEX());
xgfUserDetailsMapper.edit(userInfo);
}
xgfUserMapper.edit(entity);
// 将指针清空
info.setIterator("");
}
if (StringUtils.isNotBlank(info.getATTORNEY())) {
xgfUserService.saveLog(info, "1", "0");
return "GuFenWeiTuo";
}else {
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
}
return "GuFenSupervise";
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS()) && "0".equals(info.getIterator())) {
return true;
}

68
src/main/java/com/zcloud/flow/xgf/GuFen/GuFenSupervise.java
View File

@ -50,49 +50,55 @@ public class GuFenSupervise extends NodeComponent {
@Override
public void process() throws Exception {
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
PageData condition = new PageData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
if (flows == null || flows.size() == 0) {
throw new RuntimeException("系统异常");
}
if (flows == null || flows.size() == 0) {
throw new RuntimeException("系统异常");
}
flows.put("APPOINT_ONE_CORP_ID", "1");
flows.put("APPOINT_ONE_CORP_NAME", "秦港股份有限公司");
flows.put("APPOINT_ONE_TIME", DateUtil.getTime());
flows.put("APPOINT_ONE_STATUS", info.getSTATUS());
flows.put("APPOINT_ONE_OPINION", info.getOPINION());
flows.put("OPINION",info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
flows.put("APPOINT_ONE_CORP_ID", "1");
flows.put("APPOINT_ONE_CORP_NAME", "秦港股份有限公司");
flows.put("APPOINT_ONE_TIME", DateUtil.getTime());
flows.put("APPOINT_ONE_STATUS", info.getSTATUS());
flows.put("APPOINT_ONE_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows, info);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STATUS", 2);
entity.put("VALID_FLAG", "1");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
entity.put("STATUS", "2");
xgfUserMapper.edit(entity);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STATUS", 2);
entity.put("VALID_FLAG", "1");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
entity.put("STATUS", "2");
xgfUserMapper.edit(entity);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "1");
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "1");
}
} catch (Exception e) {
info.setErrorMsg(e.getMessage());
e.printStackTrace();
}
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS())) {
return true;
}

105
src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoCharge.java
View File

@ -53,69 +53,72 @@ public class GuFenWeiTuoCharge extends NodeComponent {
@Override
public void process() throws Exception {
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
PageData condition = new PageData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
// 如果指针没有数据，赋值后自动结束
if (StringUtils.isBlank(info.getIterator())) {
info.setIterator("1");
flows.put("APPOINT_ONE_CORP_TYPE", "0");
flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getAPPOINT_DEPARTMENT_NAME());
flows.put("APPOINT_ONE_USER_ID", info.getAPPOINT_USER_ID());
flows.put("APPOINT_ONE_USER_NAME", info.getAPPOINT_USER_NAME());
flows.put("FLOWS_STEP", 1);
xgfFlowsMapper.edit(flows);
return;
}
// 如果不是当前流程，进入下一流程判断
if (!"1".equals(info.getIterator())) {
return;
}
// 如果指针没有数据，赋值后自动结束
if (StringUtils.isBlank(info.getIterator())) {
info.setIterator("1");
flows.put("APPOINT_ONE_CORP_TYPE", "0");
flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getAPPOINT_DEPARTMENT_NAME());
flows.put("APPOINT_ONE_USER_ID", info.getAPPOINT_USER_ID());
flows.put("APPOINT_ONE_USER_NAME", info.getAPPOINT_USER_NAME());
flows.put("FLOWS_STEP", 1);
xgfFlowsMapper.edit(flows);
return;
}
// 如果不是当前流程，进入下一流程判断
if (!"1".equals(info.getIterator())) {
return;
}
condition.clear();
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData corpEntity = corpInfoMapper.findById(condition);
flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_ONE_CORP_NAME", corpEntity.getString("CORP_NAME"));
flows.put("APPOINT_ONE_TIME", DateUtil.getTime());
flows.put("APPOINT_ONE_STATUS", info.getSTATUS());
flows.put("APPOINT_ONE_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STATUS", 1);
entity.put("VALID_FLAG", "2");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
entity.put("LIMIT_END_TIME", info.getLIMIT_END_TIME());
xgfUserMapper.edit(entity);
// 清空指针
info.setIterator("");
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData corpEntity = corpInfoMapper.findById(condition);
flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_ONE_CORP_NAME", corpEntity.getString("CORP_NAME"));
flows.put("APPOINT_ONE_TIME", DateUtil.getTime());
flows.put("APPOINT_ONE_STATUS", info.getSTATUS());
flows.put("APPOINT_ONE_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows, info);
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STATUS", 1);
entity.put("VALID_FLAG", "2");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
entity.put("LIMIT_END_TIME", info.getLIMIT_END_TIME());
xgfUserMapper.edit(entity);
// 清空指针
info.setIterator("");
}
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} catch (Exception e) {
e.printStackTrace();
info.setErrorMsg(e.getMessage());
}
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS()) && "1".equals(info.getIterator())) {
return true;
}

68
src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java
View File

@ -56,46 +56,54 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
public void process() throws Exception {
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
PageData condition = new PageData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
condition.clear();
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData corpEntity = corpInfoMapper.findById(condition);
flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_TWO_CORP_NAME", corpEntity.getString("CORP_NAME"));
flows.put("APPOINT_TWO_TIME", DateUtil.getTime());
flows.put("APPOINT_TWO_STATUS", info.getSTATUS());
flows.put("APPOINT_TWO_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STATUS", 2);
entity.put("VALID_FLAG", "1");
entity.put("STATUS", "2");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
xgfUserMapper.edit(entity);
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData corpEntity = corpInfoMapper.findById(condition);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "1");
info.setIterator("");
flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_TWO_CORP_NAME", corpEntity.getString("CORP_NAME"));
flows.put("APPOINT_TWO_TIME", DateUtil.getTime());
flows.put("APPOINT_TWO_STATUS", info.getSTATUS());
flows.put("APPOINT_TWO_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows, info);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STATUS", 2);
entity.put("VALID_FLAG", "1");
entity.put("STATUS", "2");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
xgfUserMapper.edit(entity);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "1");
info.setIterator("");
}
} catch (Exception e) {
info.setErrorMsg(e.getMessage());
e.printStackTrace();
}
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS()) && "2".equals(info.getIterator())) {
return true;
}

109
src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanCharge.java
View File

@ -52,72 +52,81 @@ public class JiTuanCharge extends NodeSwitchComponent {
@Override
@SuppressWarnings("all")
public String processSwitch() throws Exception {
System.out.println(getName()+ "节点");
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
PageData condition = new PageData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
condition.clear();
condition.put("XGF_USER_DETAILS_ID",flows.getString("FLOWS_ID"));
PageData userInfo = xgfUserDetailsMapper.findById(condition);
condition.clear();
condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID"));
PageData userInfo = xgfUserDetailsMapper.findById(condition);
// 如果不是当前流程，进入下一流程判断
if (!"1".equals(info.getIterator())) {
if (userInfo.get("ATTORNEY") != null && StringUtils.isNotBlank(userInfo.getString("ATTORNEY"))){
// 如果不是当前流程，进入下一流程判断
if (!"1".equals(info.getIterator())) {
if (userInfo.get("ATTORNEY") != null && StringUtils.isNotBlank(userInfo.getString("ATTORNEY"))) {
return "WeiTuo";
}
return "JiTuanSupervise";
}
flows.put("APPOINT_ONE_CORP_ID", "1");
flows.put("APPOINT_ONE_CORP_NAME", "秦港股份有限公司");
flows.put("APPOINT_ONE_TIME", DateUtil.getTime());
flows.put("APPOINT_ONE_STATUS", info.getSTATUS());
flows.put("APPOINT_ONE_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows, info);
return "";
} else {
xgfFlowsMapper.edit(flows);
entity.put("CHECK_STATUS", 1);
entity.put("VALID_FLAG", "2");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
// created by liu jun 2024-03-01 港务局开会后，将入场告知培训的有效期设置权限给发包单位
if (StringUtils.isNotBlank(info.getLIMIT_END_TIME())) {
entity.put("LIMIT_END_TIME", info.getLIMIT_END_TIME());
}
// created by liu jun 2024-02-04 如果有委托书则保存委托书
if (StringUtils.isNotBlank(info.getATTORNEY())) {
userInfo.put("ATTORNEY", info.getATTORNEY());
xgfUserDetailsMapper.edit(userInfo);
}
xgfUserMapper.edit(entity);
// 将指针清空
info.setIterator("");
}
// 保存操作记录
if (StringUtils.isNotBlank(info.getATTORNEY())) {
xgfUserService.saveLog(info, "1", "0");
return "WeiTuo";
} else {
xgfUserService.saveLog(info, info.getSTATUS(), "0");
}
return "JiTuanSupervise";
}
flows.put("APPOINT_ONE_CORP_ID", "1");
flows.put("APPOINT_ONE_CORP_NAME", "秦港股份有限公司");
flows.put("APPOINT_ONE_TIME", DateUtil.getTime());
flows.put("APPOINT_ONE_STATUS", info.getSTATUS());
flows.put("APPOINT_ONE_OPINION", info.getOPINION());
flows.put("OPINION",info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
} catch (Exception e) {
e.printStackTrace();
info.setErrorMsg(e.getMessage());
return "";
} else {
xgfFlowsMapper.edit(flows);
entity.put("CHECK_STATUS", 1);
entity.put("VALID_FLAG", "2");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
// created by liu jun 2024-03-01 港务局开会后，将入场告知培训的有效期设置权限给发包单位
if (StringUtils.isNotBlank(info.getLIMIT_END_TIME())) {
entity.put("LIMIT_END_TIME", info.getLIMIT_END_TIME());
}
// created by liu jun 2024-02-04 如果有委托书则保存委托书
if (StringUtils.isNotBlank(info.getATTORNEY())) {
userInfo.put("ATTORNEY", info.getATTORNEY());
xgfUserDetailsMapper.edit(userInfo);
}
xgfUserMapper.edit(entity);
// 将指针清空
info.setIterator("");
}
// 保存操作记录
if (StringUtils.isNotBlank(info.getATTORNEY())){
xgfUserService.saveLog(info, "1", "0");
return "WeiTuo";
}else {
xgfUserService.saveLog(info, info.getSTATUS(), "0");
}
return "JiTuanSupervise";
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS()) && "1".equals(info.getIterator())) {
return true;
}

66
src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanSupervise.java
View File

@ -54,45 +54,53 @@ public class JiTuanSupervise extends NodeComponent {
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
PageData condition = new PageData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
if (flows == null || flows.size() == 0) {
throw new RuntimeException("系统异常");
}
flows.put("APPOINT_TWO_CORP_ID", "1");
flows.put("APPOINT_TWO_CORP_NAME", "秦港股份有限公司");
flows.put("APPOINT_TWO_TIME", DateUtil.getTime());
flows.put("APPOINT_TWO_STATUS", info.getSTATUS());
flows.put("APPOINT_TWO_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
if (flows == null || flows.size() == 0) {
throw new RuntimeException("系统异常");
}
flows.put("APPOINT_TWO_CORP_ID", "1");
flows.put("APPOINT_TWO_CORP_NAME", "秦港股份有限公司");
flows.put("APPOINT_TWO_TIME", DateUtil.getTime());
flows.put("APPOINT_TWO_STATUS", info.getSTATUS());
flows.put("APPOINT_TWO_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows, info);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STATUS", 2);
entity.put("VALID_FLAG", "1");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
entity.put("STATUS", "2");
xgfUserMapper.edit(entity);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STATUS", 2);
entity.put("VALID_FLAG", "1");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
entity.put("STATUS", "2");
xgfUserMapper.edit(entity);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "1");
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "1");
}
} catch (Exception e) {
e.printStackTrace();
info.setErrorMsg(e.getMessage());
}
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS())) {
return true;
}

72
src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoCharge.java
View File

@ -55,49 +55,55 @@ public class JiTuanWeiTuoCharge extends NodeComponent {
@Override
public void process() throws Exception {
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
PageData condition = new PageData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
condition.clear();
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData corpEntity = corpInfoMapper.findById(condition);
flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_TWO_CORP_NAME", corpEntity.getString("CORP_NAME"));
flows.put("APPOINT_TWO_TIME", DateUtil.getTime());
flows.put("APPOINT_TWO_STATUS", info.getSTATUS());
flows.put("APPOINT_TWO_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STATUS", 1);
entity.put("VALID_FLAG", "2");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
entity.put("LIMIT_END_TIME", info.getLIMIT_END_TIME());
xgfUserMapper.edit(entity);
// 清空指针
info.setIterator("");
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData corpEntity = corpInfoMapper.findById(condition);
flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_TWO_CORP_NAME", corpEntity.getString("CORP_NAME"));
flows.put("APPOINT_TWO_TIME", DateUtil.getTime());
flows.put("APPOINT_TWO_STATUS", info.getSTATUS());
flows.put("APPOINT_TWO_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows, info);
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STATUS", 1);
entity.put("VALID_FLAG", "2");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
entity.put("LIMIT_END_TIME", info.getLIMIT_END_TIME());
xgfUserMapper.edit(entity);
// 清空指针
info.setIterator("");
}
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} catch (Exception e) {
e.printStackTrace();
info.setErrorMsg(e.getMessage());
}
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS()) && "2".equals(info.getIterator())) {
return true;
}

66
src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java
View File

@ -55,39 +55,44 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
PageData condition = new PageData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
condition.clear();
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData corpEntity = corpInfoMapper.findById(condition);
flows.put("APPOINT_THREE_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_THREE_CORP_NAME", corpEntity.getString("CORP_NAME"));
flows.put("APPOINT_THREE_TIME", DateUtil.getTime());
flows.put("APPOINT_THREE_STATUS", info.getSTATUS());
flows.put("APPOINT_THREE_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STATUS", 2);
entity.put("VALID_FLAG", "1");
entity.put("STATUS", "2");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
xgfUserMapper.edit(entity);
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData corpEntity = corpInfoMapper.findById(condition);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "1");
flows.put("APPOINT_THREE_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_THREE_CORP_NAME", corpEntity.getString("CORP_NAME"));
flows.put("APPOINT_THREE_TIME", DateUtil.getTime());
flows.put("APPOINT_THREE_STATUS", info.getSTATUS());
flows.put("APPOINT_THREE_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows, info);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STATUS", 2);
entity.put("VALID_FLAG", "1");
entity.put("STATUS", "2");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
xgfUserMapper.edit(entity);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "1");
}
} catch (Exception e) {
e.printStackTrace();
info.setErrorMsg(e.getMessage());
}
}
@ -95,6 +100,9 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS()) && "3".equals(info.getIterator())) {
return true;
}

74
src/main/java/com/zcloud/flow/xgf/YiBan/YiBanCharge.java
View File

@ -57,47 +57,55 @@ public class YiBanCharge extends NodeComponent {
public void process() throws Exception {
System.out.println("YiBanCharge节点");
XgfFlowDto info = this.getRequestData();
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
if (flows == null || flows.size() == 0) {
throw new RuntimeException("系统异常");
}
flows.put("APPOINT_ZERO_TIME", DateUtil.getTime());
flows.put("APPOINT_ZERO_STATUS", info.getSTATUS());
flows.put("APPOINT_ZERO_OPINION", info.getOPINION());
flows.put("OPINION",info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData user = xgfUserMapper.findById(condition);
user.put("CHECK_STEP", 1);
user.put("LIMIT_END_TIME", info.getLIMIT_END_TIME());
// created by liu jun 2024-02-26 如果有委托书则保存委托书
if (StringUtils.isNotBlank(info.getAPPOINT_ANNEX())) {
condition.clear();
condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID"));
PageData userInfo = xgfUserDetailsMapper.findById(condition);
userInfo.put("COMMITMENT_LETTER", info.getAPPOINT_ANNEX());
xgfUserDetailsMapper.edit(userInfo);
if (flows == null || flows.size() == 0) {
throw new RuntimeException("系统异常");
}
xgfUserMapper.edit(user);
// 将指针清空
info.setIterator("");
flows.put("APPOINT_ZERO_TIME", DateUtil.getTime());
flows.put("APPOINT_ZERO_STATUS", info.getSTATUS());
flows.put("APPOINT_ZERO_OPINION", info.getOPINION());
flows.put("OPINION",info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData user = xgfUserMapper.findById(condition);
user.put("CHECK_STEP", 1);
user.put("LIMIT_END_TIME", info.getLIMIT_END_TIME());
// created by liu jun 2024-02-26 如果有委托书则保存委托书
if (StringUtils.isNotBlank(info.getAPPOINT_ANNEX())) {
condition.clear();
condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID"));
PageData userInfo = xgfUserDetailsMapper.findById(condition);
userInfo.put("COMMITMENT_LETTER", info.getAPPOINT_ANNEX());
xgfUserDetailsMapper.edit(userInfo);
}
xgfUserMapper.edit(user);
// 将指针清空
info.setIterator("");
}
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
}catch (Exception e){
e.printStackTrace();
info.setErrorMsg(e.getMessage());
}
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())){
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS()) && "0".equals(info.getIterator())) {
return true;
}

125
src/main/java/com/zcloud/flow/xgf/YiBan/YiBanSupervise.java
View File

@ -57,76 +57,83 @@ public class YiBanSupervise extends NodeComponent {
public void process() throws Exception {
System.out.println(getName());
XgfFlowDto info = this.getRequestData();
try {
PageData condition = new PageData();
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
// 如果指针没有数据，赋值后自动结束
if (StringUtils.isBlank(info.getIterator())) {
info.setIterator("1");
flows.put("APPOINT_ONE_CORP_TYPE", "0");
flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getAPPOINT_DEPARTMENT_NAME());
flows.put("APPOINT_ONE_USER_ID", info.getAPPOINT_USER_ID());
flows.put("APPOINT_ONE_USER_NAME", info.getAPPOINT_USER_NAME());
flows.put("FLOWS_STEP", 1);
xgfFlowsMapper.edit(flows);
return;
}
// 如果不是当前流程，进入下一流程判断
if (!"1".equals(info.getIterator())) {
return;
}
// 如果指针没有数据，赋值后自动结束
if (StringUtils.isBlank(info.getIterator())) {
info.setIterator("1");
flows.put("APPOINT_ONE_CORP_TYPE", "0");
flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getAPPOINT_DEPARTMENT_NAME());
flows.put("APPOINT_ONE_USER_ID", info.getAPPOINT_USER_ID());
flows.put("APPOINT_ONE_USER_NAME", info.getAPPOINT_USER_NAME());
flows.put("FLOWS_STEP", 1);
xgfFlowsMapper.edit(flows);
return;
}
// 如果不是当前流程，进入下一流程判断
if (!"1".equals(info.getIterator())) {
return;
}
condition.clear();
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData corpEntity = corpInfoMapper.findById(condition);
// 如果指针没有数据，赋值后自动结束
if (StringUtils.isBlank(info.getIterator())) {
info.setIterator("1");
flows.put("APPOINT_ONE_CORP_TYPE", "0");
flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getAPPOINT_DEPARTMENT_NAME());
flows.put("APPOINT_ONE_USER_ID", info.getAPPOINT_USER_ID());
flows.put("APPOINT_ONE_USER_NAME", info.getAPPOINT_USER_NAME());
flows.put("FLOWS_STEP", 1);
xgfFlowsMapper.edit(flows);
return;
}
flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_ONE_CORP_NAME", corpEntity.getString("CORP_NAME"));
flows.put("APPOINT_ONE_TIME", DateUtil.getTime());
flows.put("APPOINT_ONE_STATUS", info.getSTATUS());
flows.put("APPOINT_ONE_OPINION", info.getOPINION());
flows.put("OPINION",info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STATUS", 2);
entity.put("VALID_FLAG", "1");
entity.put("STATUS", "2");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
xgfUserMapper.edit(entity);
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData corpEntity = corpInfoMapper.findById(condition);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "1");
// 如果指针没有数据，赋值后自动结束
if (StringUtils.isBlank(info.getIterator())) {
info.setIterator("1");
flows.put("APPOINT_ONE_CORP_TYPE", "0");
flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getAPPOINT_DEPARTMENT_NAME());
flows.put("APPOINT_ONE_USER_ID", info.getAPPOINT_USER_ID());
flows.put("APPOINT_ONE_USER_NAME", info.getAPPOINT_USER_NAME());
flows.put("FLOWS_STEP", 1);
xgfFlowsMapper.edit(flows);
return;
}
flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_ONE_CORP_NAME", corpEntity.getString("CORP_NAME"));
flows.put("APPOINT_ONE_TIME", DateUtil.getTime());
flows.put("APPOINT_ONE_STATUS", info.getSTATUS());
flows.put("APPOINT_ONE_OPINION", info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows, info);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STATUS", 2);
entity.put("VALID_FLAG", "1");
entity.put("STATUS", "2");
entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1);
xgfUserMapper.edit(entity);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "1");
}
} catch (Exception e) {
e.printStackTrace();
info.setErrorMsg(e.getMessage());
}
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())){
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS())) {
return true;
}

1
src/main/java/com/zcloud/flow/xgf/util/XgfFlowDto.java
View File

@ -49,4 +49,5 @@ public class XgfFlowDto {
// 打回节点游标
private String BACK_STEP;
private String errorMsg;
}

3
src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkCfdMapper.java
View File

@ -85,5 +85,8 @@ public interface HotworkCfdMapper {
PageData countCheck(PageData pd);
PageData getCode(PageData pd);
List<PageData> datalistPageHistory(Page page);
}

2
src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java
View File

@ -106,4 +106,6 @@ public interface DictionariesMapper {
*/
List<PageData> getIdsByRecuByParentId(String parentId);
List<PageData> getIdsByParentIds(List<String> parentIds);
List<PageData> findByCondition(PageData condition);
}

2
src/main/java/com/zcloud/service/dw/dto/AlarmGet.java
View File

@ -10,5 +10,7 @@ public class AlarmGet {
private String status;
private String corpId;
private Page page;
// 告警来源
private String sourceNum;
}

123
src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.zcloud.service.highriskwork.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.flow.xgf.GuFen.GuFenCharge;
import com.zcloud.mapper.datasource.highriskwork.BusHotworkCfdExamineMapper;
import com.zcloud.mapper.datasource.highriskwork.HotworkAcceptUserCfdMapper;
import com.zcloud.mapper.datasource.highriskwork.HotworkCfdMapper;
@ -65,6 +66,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
@Transactional
public void saveConfess(PageData info) throws Exception{
List<PageData> list = Warden.getList(info.getString("confessList"));
List<PageData> listAccept = Warden.getList(info.getString("acceptconfessList"));
String flowsId = Warden.get32UUID();
String time = DateUtil.getTime();
PageData condition = new PageData();
@ -80,7 +82,27 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
entity.put("DEPARTMENT_NAME", x.get("CONFESS_DEPARTMENT_NAME"));
this.getCorpInfo(entity);
entity.put("TYPE", "0");
entity.put("TYPE_NAME", "动火交底人");
entity.put("TYPE_NAME", "安全交底人");
entity.put("APPROVAL_OPINIONS",info.getString("CONFESS_DEPARTMENT_OPINIONS"));
entity.put("APPROVAL_STATUS", "0");
entity.put("STATUS", "0");
entity.put("CREATE_TIME", time);
entity.put("VALID_FLAG", "1");
entity.put("IS_DELETE", "0");
busHotworkCfdExamineMapper.save(entity);
}
for (PageData x : listAccept) {
PageData entity = new PageData();
entity.put("HOTWORK_EXAMINE_ID", Warden.get32UUID());
entity.put("HOTWORK_ID", info.getString("HOTWORK_ID"));
entity.put("FLOW_ID", flowsId);// 流程id
entity.put("USER_ID", x.get("ACCEPT_CONFESS_USER_ID"));
entity.put("USER_NAME", x.get("ACCEPT_CONFESS_USER_NAME"));
entity.put("DEPARTMENT_ID", x.get("ACCEPT_CONFESS_DEPARTMENT_ID"));
entity.put("DEPARTMENT_NAME", x.get("ACCEPT_CONFESS_DEPARTMENT_NAME"));
this.getCorpInfo(entity);
entity.put("TYPE", "3");
entity.put("TYPE_NAME", "接受交底人");
entity.put("APPROVAL_OPINIONS",info.getString("CONFESS_DEPARTMENT_OPINIONS"));
entity.put("APPROVAL_STATUS", "0");
entity.put("STATUS", "0");
@ -228,16 +250,32 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
conditon.put("VALID_FLAG", "1");
conditon.put("TYPE", request.getString("TYPE"));
conditon.put("USER_ID", request.get("USER_ID"));
String userId = Jurisdiction.getUSER_ID();
List<PageData> approvalInfos = busHotworkCfdExamineMapper.findByCondition(conditon);
if(approvalInfos.size() == 0) throw new RuntimeException("未找到审批信息,请联系管理员");
if (approvalInfos.size() > 1) throw new RuntimeException("审批信息异常,请联系管理员");
// if (approvalInfos.size() > 1) throw new RuntimeException("审批信息异常,请联系管理员");
PageData entity = approvalInfos.get(0);
String newFilePath = Warden.saveFile(files, request.getString("CORPINFO_ID"));
// 判断条件
if (entity.getString("APPROVAL_SIGNATURE") != null && !entity.getString("APPROVAL_SIGNATURE").isEmpty()
&& userId.equals(entity.getString("USER_ID"))
&& "3".equals(entity.getString("TYPE"))) {
// 拼接新的文件路径
String existingFilePaths = entity.getString("APPROVAL_SIGNATURE");
entity.put("APPROVAL_SIGNATURE", existingFilePaths + ";" + newFilePath);
} else {
// 走原有逻辑
entity.put("APPROVAL_SIGNATURE", newFilePath);
}
entity.put("APPROVAL_STATUS", request.getString("APPROVAL_STATUS"));
entity.put("APPROVAL_SIGNATURE", Warden.saveFile(files,request.getString("CORPINFO_ID")));
// entity.put("APPROVAL_SIGNATURE", Warden.saveFile(files,request.getString("CORPINFO_ID")));
// List<String> filePaths = Warden.saveFiles(files, request.getString("CORPINFO_ID"));
// entity.put("APPROVAL_SIGNATURE", String.join(";", filePaths));
entity.put("APPROVAL_SIGNATURE_TIME", DateUtil.getTime());
entity.put("APPROVAL_CONTENT",request.getString("APPROVAL_CONTENT"));
busHotworkCfdExamineMapper.edit(entity);
}
@Override
@ -309,13 +347,32 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception{
public List<PageData> list(Page page) throws Exception {
List<PageData> list = hotworkCfdMapper.datalistPage(page);
// created by liu jun 2024/02/03 description: 拼接动火交底人、项目主管部门、安全项检查人
for(PageData dto: list){
String applyStatus = page.getPd().getString("APPLY_STATUS");
for (PageData dto : list) {
page.getPd().put("HOTWORK_ID", dto.getString("HOTWORK_ID"));
if ("1".equals(applyStatus) || "1.5".equals(applyStatus) || "2".equals(applyStatus)) {
List<PageData> historyList = hotworkCfdMapper.datalistPageHistory(page);
if (historyList != null && !historyList.isEmpty()) {
for (PageData historyPd : historyList) {
if (historyPd.getString("HOTWORK_ID").equals(dto.getString("HOTWORK_ID"))) {
dto.put("historyPd", historyPd);
break;
}
}
}
}
this.addInfo(dto);
}
return list;
return list.stream()
.sorted((o1, o2) -> o2.getString("CREATTIME").compareTo(o1.getString("CREATTIME")))
.collect(Collectors.toList());
}
public List<PageData> jhlist(Page page)throws Exception{
return hotworkCfdMapper.jhdatalistPage(page);
@ -413,6 +470,9 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
condition.put("isValid","1");
//动火交底人需处理数
info.put("confessNum", busHotworkCfdExamineMapper.findByCondition(condition).size());
//接受交底人需处理数
condition.put("TYPE", "3");
info.put("acceptConfessNum", busHotworkCfdExamineMapper.findByCondition(condition).size());
condition.put("TYPE", "1");
// 项目主管部门需处理数
List<PageData> _belongingList = busHotworkCfdExamineMapper.findByCondition(condition);
@ -431,6 +491,24 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
condition.put("TYPE", "2");
// 安全项检查人需处理数
info.put("safetyNum", busHotworkCfdExamineMapper.findByCondition(condition).size());
int sumCount = 0;
sumCount += Integer.parseInt(info.getString("COUNTBACK", "0"));
sumCount += Integer.parseInt(info.getString("COUNTLEADER", "0"));
sumCount += Integer.parseInt(info.getString("COUNTMONITOR", "0"));
sumCount += Integer.parseInt(info.getString("COUNTACCEPT", "0"));
sumCount += Integer.parseInt(info.getString("COUNTAPPROVE", "0"));
sumCount += Integer.parseInt(info.getString("COUNTANALYZE", "0"));
sumCount += Integer.parseInt(info.getString("safetyNum", "0"));
sumCount += Integer.parseInt(info.getString("belongingNum", "0"));
sumCount += Integer.parseInt(info.getString("COUNTGUARDIAN", "0"));
sumCount += Integer.parseInt(info.getString("confessNum", "0"));
// sumCount += Integer.parseInt(info.getString("COUNTACCEPTCONFESS", "0"));
sumCount += Integer.parseInt(info.getString("COUNTCONFIRM", "0"));
sumCount += Integer.parseInt(info.getString("COUNTCONFESS", "0"));
sumCount += Integer.parseInt(info.getString("COUNTAUDIT", "0"));
sumCount += Integer.parseInt(info.getString("acceptConfessNum", "0"));
info.put("SUMCOUNT", sumCount);
// 气体分析人需处理数
return info;
}
@ -457,6 +535,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
x.put("CONFESS_USER_NAME", x.get("USER_NAME"));
x.put("CONFESS_DEPARTMENT_ID", x.get("DEPARTMENT_ID"));
x.put("CONFESS_DEPARTMENT_NAME", x.get("DEPARTMENT_NAME"));
x.put("CONFESS_USER_SIGNER_PATH", x.get("APPROVAL_SIGNATURE"));
}
pd.put("confessUserNames", confess.stream().map(x -> x.getString("USER_NAME")).collect(Collectors.joining(",")));
pd.put("confessList", confess);
@ -465,7 +544,33 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
}else {
pd.put("confessStatus", "1");
}
//接受交底人
List<PageData> acceptConfess = approvalInfos.stream()
.filter(x -> "3".equals(x.getString("TYPE")))
.collect(Collectors.toList());
for (PageData x : acceptConfess) {
x.put("ACCEPT_CONFESS_USER_ID", x.get("USER_ID"));
x.put("ACCEPT_CONFESS_USER_NAME", x.get("USER_NAME"));
x.put("ACCEPT_CONFESS_DEPARTMENT_ID", x.get("DEPARTMENT_ID"));
x.put("ACCEPT_CONFESS_DEPARTMENT_NAME", x.get("DEPARTMENT_NAME"));
x.put("ACCEPT_CONFESS_USER_SIGNER_PATH", x.get("APPROVAL_SIGNATURE"));
}
pd.put("acceptConfessUserNames", acceptConfess.stream().map(x -> x.getString("USER_NAME")).collect(Collectors.joining(",")));
pd.put("acceptConfessList", acceptConfess);
if (acceptConfess.stream().anyMatch(x -> "0".equals(x.getString("APPROVAL_STATUS")))){
pd.put("acceptConfessStatus", "0");
}else {
pd.put("acceptConfessStatus", "1");
}
//安全措施数据
List<PageData> safetyList = approvalInfos.stream()
.filter(x -> "2".equals(x.getString("TYPE")))
.collect(Collectors.toList());
for (PageData x : safetyList) {
x.put("APPROVAL_STATUS", x.get("APPROVAL_STATUS"));
x.put("APPROVAL_SIGNATURE", x.get("APPROVAL_SIGNATURE"));
}
pd.put("safetyList", safetyList);
// 项目责任负责人
PageData belong = approvalInfos.stream().filter(x -> "1".equals(x.getString("TYPE"))).findFirst().orElse(null);
pd.put("BELONGING_USER_ID", belong.getString("USER_ID"));

26
src/main/java/com/zcloud/service/map/impl/MapEightCfdServiceImpl.java
View File

@ -62,7 +62,31 @@ public class MapEightCfdServiceImpl implements MapEightCfdService {
PageData condition = new PageData();
condition.put("showInfo",pd.getString("showInfo"));
condition.put("HOTWORK_ID",pd.getString("HOTWORK_ID"));
map.put("measuresList", hotworkCfdService.listAllMeasures(condition));
// map.put("measuresList", hotworkCfdService.listAllMeasures(condition));
List<PageData> measuresList = hotworkCfdService.listAllMeasures(condition);
for (PageData measure : measuresList) {
String order = measure.getString("ORDER");
String protectiveMeasures = measure.getString("PROTECTIVE_MEASURES");
if ("2".equals(order)) {
String answer1 = measure.getString("ANSWER1");
int startIndex = protectiveMeasures.indexOf('(');
int endIndex = protectiveMeasures.indexOf(')');
if (startIndex != -1 && endIndex != -1 && startIndex < endIndex) {
protectiveMeasures = protectiveMeasures.substring(0, endIndex) + answer1 + protectiveMeasures.substring(endIndex);
}
measure.put("PROTECTIVE_MEASURES", protectiveMeasures);
} else if ("8".equals(order)) {
String[] answers = {measure.getString("ANSWER1"), measure.getString("ANSWER2"), measure.getString("ANSWER3")};
for (String answer : answers) {
int index = protectiveMeasures.indexOf("()");
if (index != -1) {
protectiveMeasures = protectiveMeasures.substring(0, index + 1) + answer + protectiveMeasures.substring(index + 1);
}
}
measure.put("PROTECTIVE_MEASURES", protectiveMeasures);
}
}
map.put("measuresList", measuresList);
map.put("gasList", hotworkGasCfdService.listAll(pd));
map.put("imgList", hotworkacceptuserCfdService.findByIds(pd));
map.put("imgList1", hotworkacceptuserCfdService.findById(pd));

29
src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java
View File

@ -26,6 +26,13 @@ public class DockSendMessageServiceImpl implements DockSendMessageService {
private String gwjDataTopic;
@Value("${mq.gwj.file.topic}")
private String gwjFileTopic;
@Value("${mq.csy.data.topic}")
private String csyDataDocking;
@Value("${mq.cmt.data.topic}")
private String cmtDataDocking;
@Value("${mq.czks.data.topic}")
private String czksDataDocking;
@Resource
private RocketMQTemplate rocketMQTemplate;
@ -40,14 +47,32 @@ public class DockSendMessageServiceImpl implements DockSendMessageService {
@Override
public void sendMessage(TenCorpDto tenCorpDto) throws Exception {
PageData productionPD = new PageData();
productionPD.put("PRODUCTION_ID", Warden.get32UUID());
productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId() == null ? "" : tenCorpDto.getMessageLogId());
productionPD.put("PRODUCTION_TYPE", "gwj-DockSendMessageServiceImpl.sendMessage(TenCorpDto tenCorpDto)");
productionPD.put("PRODUCTION_TIME", DateUtil.getTime());
productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME() == null ? "" : tenCorpDto.getCREATE_TIME());
productionPD.put("MARK", tenCorpDto.getMark() == null ? "" : tenCorpDto.getMark());
productionPD.put("DATA", tenCorpDto.getData() == null ? "" : tenCorpDto.getData().toString());
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.gwjDataTopic, tenCorpDto.toString());
if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) {
SendResult sendResult = null;
// 曹煤炭 后期是 三家
if (tenCorpDto.getTopic().equals(czksDataDocking)) {
sendResult = rocketMQTemplate.syncSend(this.czksDataDocking, tenCorpDto.toString());
}
if (tenCorpDto.getTopic().equals(cmtDataDocking)) {
sendResult = rocketMQTemplate.syncSend(this.cmtDataDocking, tenCorpDto.toString());
}
if (tenCorpDto.getTopic().equals(csyDataDocking)) {
sendResult = rocketMQTemplate.syncSend(this.csyDataDocking, tenCorpDto.toString());
}
if (sendResult != null && !sendResult.getSendStatus().equals(SendStatus.SEND_OK)) {
throw new RuntimeException("产品入栈失败");
}
} catch (Exception e) {

1
src/main/java/com/zcloud/service/system/DictionariesService.java
View File

@ -151,4 +151,5 @@ public interface DictionariesService {
*/
public List<PageData> getIdsByParentIds(List<String> parentIds) throws Exception;
List<PageData> findByCondition(PageData condition) throws Exception;
}

5
src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java
View File

@ -256,4 +256,9 @@ public class DictionariesServiceImpl implements DictionariesService {
return dictionariesMapper.getIdsByParentIds(parentIds);
}
@Override
public List<PageData> findByCondition(PageData condition) throws Exception {
return dictionariesMapper.findByCondition(condition);
}
}

144
src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
View File

@ -19,11 +19,9 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.net.PasswordAuthentication;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
@Service
@ -383,7 +381,9 @@ public class XgfUserServiceImpl implements XgfUserService {
for (PageData x : list) {
condition.clear();
condition.put("FLOW_ID", x.getString("FLOW_ID"));
x.put("flow", flowDetailMapper.getList(condition));
List<PageData> flow = flowDetailMapper.getList(condition);
flow = flow.stream().sorted(Comparator.comparing(o -> new BigDecimal(String.valueOf(o.get("SORT"))))).collect(Collectors.toList());
x.put("flow",flow);
}
return list;
}
@ -992,27 +992,117 @@ public class XgfUserServiceImpl implements XgfUserService {
@Override
public void repulse(PageData flows, XgfFlowDto info) throws Exception {
PageData condition = new PageData();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("STATUS", "0");
entity.put("VALID_FLAG", "0");
entity.put("CHECK_STATUS", "-2");
PageData key = new PageData();
key.putAll(entity);
key.put("USER_ID", condition.get("XGF_USER_ID"));
key.put("STATUS", "1");
key.put("OPINION", flows.get("OPINION"));
Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key);
if (result == null || !"succeed".equals(result.get("result"))) {
throw new RuntimeException("请求失败");
// add by liu jun 相关方可指定打回至指定节点 -1 为默认打回至相关方端
if ("-1".equals(info.getBACK_STEP())){
PageData condition = new PageData();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("STATUS", "0");
entity.put("VALID_FLAG", "0");
entity.put("CHECK_STATUS", "-2");
PageData key = new PageData();
key.putAll(entity);
key.put("USER_ID", condition.get("XGF_USER_ID"));
key.put("STATUS", "1");
key.put("OPINION", flows.get("OPINION"));
Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key);
if (result == null || !"succeed".equals(result.get("result"))) {
throw new RuntimeException("请求失败");
}
xgfUserMapper.edit(entity);
this.clearInfo(flows);
xgfFlowsMapper.edit(flows);
} else {
// 1、判断不能自己打回到自己
PageData condition = new PageData();
condition.put("FLOWS_ID",flows.getString("FLOWS_ID"));
PageData flowEntity = xgfFlowsMapper.findById(condition);
if (flowEntity != null && flowEntity.size() > 0 && (flowEntity.get("FLOWS_STEP").toString()).equals(info.getBACK_STEP())){
info.setErrorMsg("不能自己打回到自己");
}
flowEntity.put("FLOWS_STEP", info.getBACK_STEP());
xgfFlowsMapper.edit(flowEntity);
// 清理数据
clearsInfo(flowEntity,info.getBACK_STEP());
xgfFlowsMapper.edit(flowEntity);
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition);
entity.put("CHECK_STEP",info.getBACK_STEP());
xgfUserMapper.edit(entity);
// 判断要不要清理委托书
if (clearWeiTuo(flowEntity, info.getBACK_STEP())) {
condition.clear();
condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID"));
PageData infoEntity = xgfUserDetailsMapper.findById(condition);
infoEntity.put("ATTORNEY", null);
xgfUserDetailsMapper.edit(infoEntity);
}
}
}
private boolean clearWeiTuo(PageData flowEntity,String backStep) throws Exception{
if ("1".equals(flowEntity.getString("FLOWS_TYPE"))){
return 1 <= Integer.parseInt(backStep);
}
if ("2".equals(flowEntity.getString("FLOWS_TYPE"))){
return 0 <= Integer.parseInt(backStep);
}
return false;
}
private void clearsInfo(PageData entity,String step) throws Exception {
if ("0".equals(step)){
entity.put("APPOINT_ONE_USER_ID", "");
entity.put("APPOINT_TWO_USER_ID", "");
entity.put("APPOINT_THREE_USER_ID", "");
entity.put("APPOINT_FOUR_USER_ID", "");
entity.put("APPOINT_FIVE_USER_ID", "");
entity.put("APPOINT_SIX_USER_ID", "");
entity.put("APPOINT_SEVEN_USER_ID", "");
}
if ("1".equals(step)){
entity.put("APPOINT_TWO_USER_ID", "");
entity.put("APPOINT_THREE_USER_ID", "");
entity.put("APPOINT_FOUR_USER_ID", "");
entity.put("APPOINT_FIVE_USER_ID", "");
entity.put("APPOINT_SIX_USER_ID", "");
entity.put("APPOINT_SEVEN_USER_ID", "");
}
if ("2".equals(step)){
entity.put("APPOINT_THREE_USER_ID", "");
entity.put("APPOINT_FOUR_USER_ID", "");
entity.put("APPOINT_FIVE_USER_ID", "");
entity.put("APPOINT_SIX_USER_ID", "");
entity.put("APPOINT_SEVEN_USER_ID", "");
}
if ("3".equals(step)){
entity.put("APPOINT_FOUR_USER_ID", "");
entity.put("APPOINT_FIVE_USER_ID", "");
entity.put("APPOINT_SIX_USER_ID", "");
entity.put("APPOINT_SEVEN_USER_ID", "");
}
if ("4".equals(step)){
entity.put("APPOINT_FIVE_USER_ID", "");
entity.put("APPOINT_SIX_USER_ID", "");
entity.put("APPOINT_SEVEN_USER_ID", "");
}
if ("5".equals(step)){
entity.put("APPOINT_SIX_USER_ID", "");
entity.put("APPOINT_SEVEN_USER_ID", "");
}
if ("6".equals(step)){
entity.put("APPOINT_SEVEN_USER_ID", "");
}
xgfUserMapper.edit(entity);
this.clearInfo(flows);
xgfFlowsMapper.edit(flows);
}
@Override
@Transactional
public void approveMax(PageData request, MultipartFile[] chengNuoShu) throws Exception {
if (chengNuoShu != null && chengNuoShu.length > 0) {
request.put("APPOINT_ANNEX", Warden.saveFile(Warden.createZip(chengNuoShu), Jurisdiction.getCORPINFO_ID()));
@ -1057,16 +1147,16 @@ public class XgfUserServiceImpl implements XgfUserService {
if (request.get("APPOINT_ANNEX") != null) {
info.setAPPOINT_ANNEX(request.getString("APPOINT_ANNEX"));
}
info.setBACK_STEP(request.getString("BACK_STEP"));
// 进行数据审核
LiteflowResponse response = flowExecutor.execute2Resp("chain1", info);
if (!response.isSuccess()) {
if (response.isSuccess()) {
System.out.println("流程信息:" + response.getExecuteStepStrWithTime());
} else {
Exception e = response.getCause();
e.printStackTrace();
System.out.println(response.getMessage());
throw new RuntimeException("系统异常");
} else {
System.out.println("流程信息:" + response.getExecuteStepStrWithTime());
throw new RuntimeException(e.getMessage());
}
}

14
src/main/java/com/zcloud/util/Warden.java
View File

@ -381,6 +381,19 @@ public class Warden {
return saveFile(files, CORPINFO_ID);
}
//保存多图片
public static List<String> saveFiles(MultipartFile[] files, String number) throws Exception {
if (files.length == 0) throw new RuntimeException("文件为空");
List<String> filePaths = new ArrayList<>();
for (MultipartFile file : files) {
String ffile = DateUtil.getDays();
String fileName = get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + number + "/" + ffile);
filePaths.add(Const.FILEPATHFILE + number + "/" + ffile + "/" + fileName);
}
return filePaths;
}
/**
* 压缩文件
*/
@ -479,5 +492,6 @@ public class Warden {
}
throw new IOException("压缩文件失败");
}
}

46
src/main/resources/application-local.properties
View File

@ -2,12 +2,12 @@
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no1.username=root
datasource.no1.password=Mysql@zcloud88888
datasource.no1.username=dev
datasource.no1.password=Zykj@dev123456
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no2.username=root
datasource.no2.password=Mysql@zcloud88888
datasource.no2.username=dev
datasource.no2.password=Zykj@dev123456
#druid???
@ -62,19 +62,25 @@ spring.main.banner-mode=off
#qa-regulatory-gwj.api.url=http://192.168.0.79:8008
preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/
qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/
baseimgpath =http://192.168.192.201:8991/file/
heBeiQinAnFile=https://file.zcloudchina.com/YTHFile
dw.url=http://192.168.192.201:8888/qa-dingWei-gwj/
#?????
smb.host=192.168.192.201
smb.host=39.101.130.96
smb.port=22
smb.user=root
smb.password=SJSKAQHBGLXT@20220311
smb.basePath=/mnt/qask/file/
smb.password=Zcloud@zcloud88888
smb.basePath=/mnt/wwag/file/
#Mq\u914D\u7F6E
rocketmq.consumer.group2=edu-admin-edit
rocketmq.consumer.group1=edu-admin-add
#rocketmq.name-server=10.0.140.141:9876
#rocketmq.name-server=192.168.0.70:9876
rocketmq.name-server=192.168.151.57:9876
rocketmq.name-server=39.100.115.58:8899
rocketmq.producer.group=libmiddle
rocketmq.producer.send-message-timeout=3000
rocketmq.producer.compress-message-body-threshold=4096
@ -88,6 +94,8 @@ mq.topic.info=info
mq.topic.eightWork=eightWork
mq.group.info=scheduled_tasks
mq.group.eightWork=scheduled_tasks_eightWork
mq.gwj.data.topic=czks_docking
mq.gwj.file.topic=czks_dockingPicture
corp.default.pic-path=https://qgqy.qhdsafety.com/
@ -95,6 +103,28 @@ corp.default.pic-path=https://qgqy.qhdsafety.com/
corp.default.back-end-path=https://qgqy.qhdsafety.com/file/
http.file.url=https://qgqy.qhdsafety.com/file/
mq.csy.data.topic=csy_docking
mq.csy.data.group=scheduled_tasks_csy_docking
mq.csy.file.topic=csy_dockingPicture
mq.csy.file.group=scheduled_tasks_csy_dockingPicture
mq.cmt.data.topic=cmt_docking
mq.cmt.data.group=scheduled_tasks_cmt_docking
mq.cmt.file.topic=cmt_dockingPicture
mq.cmt.file.group=scheduled_tasks_cmt_dockingPicture
mq.czks.data.topic=czks_docking
mq.czks.data.group=scheduled_tasks_czks_docking
mq.czks.file.topic=czks_dockingPicture
mq.czks.file.group=scheduled_tasks_czks_dockingPicture
mq.gwj.data.topic=czks_docking
mq.gwj.file.topic=czks_dockingPicture
baseimgpath =http://192.168.192.201:8991/file/
heBeiQinAnFile=https://file.zcloudchina.com/YTHFile
biaoZhunShuJuKu=https://file.zcloudchina.com/
dw.url=http://192.168.192.201:8888/qa-dingWei-gwj/
#<23>û<EFBFBD><C3BB><EFBFBD>ʶ
# <20><><EFBFBD>ݿ<EFBFBD>ʯ

8
src/main/resources/application-master.properties
View File

@ -1,12 +1,12 @@
# ??????
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
datasource.no1.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no1.username=root
datasource.no1.password=gwjsjkzcloud888888
datasource.no1.password=Mysql@zcloud88888
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
datasource.no2.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no2.username=root
datasource.no2.password=gwjsjkzcloud888888
datasource.no2.password=Mysql@zcloud88888
#druid连接池
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource

4
src/main/resources/application.properties
View File

@ -2,11 +2,11 @@ spring.application.name=qa-prevention-gwj
server.port=8091
#??
#spring.profiles.active=local
spring.profiles.active=local
#<23><><EFBFBD><EFBFBD>31ʱʹ<CAB1><CAB9>
#spring.profiles.active=dev
#??
spring.profiles.active=master
#spring.profiles.active=master

21
src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml
View File

@ -1350,20 +1350,29 @@
<!-- 待办作业数 -->
<select id="countCheck" parameterType="pd" resultType="pd">
SELECT
COUNT(CASE WHEN (f.APPLY_STATUS+0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.BLINDBOARD_ID END) COUNTBACK,
COUNT(CASE WHEN (f.APPLY_STATUS + 0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.BLINDBOARD_ID END) COUNTBACK,
COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) COUNTCONSTRUCTION,
COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.PRODUCTION_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) COUNTPRODUCTION,
COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.SAFETY_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) COUNTSAFETY,
COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.LEADER_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) COUNTLEADER,
COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) COUNTACCEPT,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.BLINDBOARD_ID END) COUNTGUARDIAN,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.BLINDBOARD_ID END) COUNTCONFESS,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_BLINDBOARD_ACCEPTUSER m where m.BLINDBOARD_ID = f.BLINDBOARD_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.BLINDBOARD_ID END) COUNTACCEPTCONFESS
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN f.BLINDBOARD_ID END) COUNTGUARDIAN,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN f.BLINDBOARD_ID END) COUNTCONFESS,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} AND NOT EXISTS (SELECT 1 FROM GF_BLINDBOARD_ACCEPTUSER m WHERE m.BLINDBOARD_ID = f.BLINDBOARD_ID AND m.CORPINFO_ID = f.CORPINFO_ID AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.BLINDBOARD_ID END) COUNTACCEPTCONFESS,
(
COUNT(CASE WHEN (f.APPLY_STATUS + 0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.BLINDBOARD_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.PRODUCTION_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.SAFETY_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.LEADER_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt;'6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN f.BLINDBOARD_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt;'6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN f.BLINDBOARD_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt;'6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} AND NOT EXISTS (SELECT 1 FROM GF_BLINDBOARD_ACCEPTUSER m WHERE m.BLINDBOARD_ID = f.BLINDBOARD_ID AND m.CORPINFO_ID = f.CORPINFO_ID AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.BLINDBOARD_ID END)
) AS SUMCOUNT
FROM <include refid="tableName"></include> f
WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
</select>
<!-- 获取编码 -->
<select id="getCode" parameterType="pd" resultType="pd">
SELECT

19
src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml
View File

@ -1453,9 +1453,22 @@
COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) COUNTAUDIT,
COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) COUNTAPPROVE,
COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) COUNTACCEPT,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) COUNTANALYZE,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.CONFINEDSPACE_ID END) COUNTCONFESS,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_CONFINEDSPACE_ACCEPTUSER m where m.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.CONFINEDSPACE_ID END) COUNTACCEPTCONFESS
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) COUNTANALYZE,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.CONFINEDSPACE_ID END) COUNTCONFESS,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_CONFINEDSPACE_ACCEPTUSER m where m.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.CONFINEDSPACE_ID END) COUNTACCEPTCONFESS,
(
COUNT(CASE WHEN (f.APPLY_STATUS+0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.CONFINEDSPACE_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONFIRM_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.CONFINEDSPACE_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.CONFINEDSPACE_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_CONFINEDSPACE_ACCEPTUSER m where m.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.CONFINEDSPACE_ID END)
) AS SUMCOUNT
FROM <include refid="tableName"></include> f
WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
</select>

21
src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml
View File

@ -1517,16 +1517,25 @@
COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) COUNTAPPROVE,
COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) COUNTACCEPT,
COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) COUNTANALYZE,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '5' AND f.APPLY_STATUS &gt; 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) COUNTGUARDIAN,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '5' AND f.APPLY_STATUS &gt; 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) COUNTCONFESS,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '5' AND f.APPLY_STATUS &gt; 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and
not exists(select 1 from GF_ELECTRICITY_ACCEPTUSER m where m.ELECTRICITY_ID = f.ELECTRICITY_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)
THEN f.ELECTRICITY_ID END) COUNTACCEPTCONFESS
COUNT(CASE WHEN f.APPLY_STATUS &lt; '5' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) COUNTGUARDIAN,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '5' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) COUNTCONFESS,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '5' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_ELECTRICITY_ACCEPTUSER m where m.ELECTRICITY_ID = f.ELECTRICITY_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.ELECTRICITY_ID END) COUNTACCEPTCONFESS,
(
COUNT(CASE WHEN (f.APPLY_STATUS+0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.ELECTRICITY_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONFIRM_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt; '5' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt; '5' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt; '5' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_ELECTRICITY_ACCEPTUSER m where m.ELECTRICITY_ID = f.ELECTRICITY_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.ELECTRICITY_ID END)
) AS SUMCOUNT
FROM <include refid="tableName"></include> f
WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
</select>
<!-- 获取编码 -->
<select id="getCode" parameterType="pd" resultType="pd">
SELECT

21
src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml
View File

@ -1354,19 +1354,30 @@
<!-- 待办作业数 -->
<select id="countCheck" parameterType="pd" resultType="pd">
SELECT
COUNT(CASE WHEN (f.APPLY_STATUS+0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTBACK,
COUNT(CASE WHEN (f.APPLY_STATUS + 0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTBACK,
COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTCONSTRUCTION,
COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.LEADER_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTLEADER,
COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTAUDIT,
COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTAPPROVE,
COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTACCEPT,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.HIGHWORK_ID END) COUNTGUARDIAN,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.HIGHWORK_ID END) COUNTCONFESS,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_HIGHWORK_ACCEPTUSER m where m.HIGHWORK_ID = f.HIGHWORK_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HIGHWORK_ID END) COUNTACCEPTCONFESS
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN f.HIGHWORK_ID END) COUNTGUARDIAN,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN f.HIGHWORK_ID END) COUNTCONFESS,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} AND NOT EXISTS (SELECT 1 FROM GF_HIGHWORK_ACCEPTUSER m WHERE m.HIGHWORK_ID = f.HIGHWORK_ID AND m.CORPINFO_ID = f.CORPINFO_ID AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HIGHWORK_ID END) COUNTACCEPTCONFESS,
-- 求和所有计数项
(
COUNT(CASE WHEN (f.APPLY_STATUS + 0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.HIGHWORK_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.LEADER_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN f.HIGHWORK_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN f.HIGHWORK_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} AND NOT EXISTS (SELECT 1 FROM GF_HIGHWORK_ACCEPTUSER m WHERE m.HIGHWORK_ID = f.HIGHWORK_ID AND m.CORPINFO_ID = f.CORPINFO_ID AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HIGHWORK_ID END)
) AS SUMCOUNT
FROM <include refid="tableName"></include> f
WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
</select>
<!-- 获取编码 -->
<select id="getCode" parameterType="pd" resultType="pd">
SELECT

20
src/main/resources/mybatis/datasource/gf/HoistingMapper.xml
View File

@ -1361,13 +1361,25 @@
COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) COUNTAUDIT,
COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) COUNTAPPROVE,
COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) COUNTACCEPT,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.HOISTING_ID END) COUNTGUARDIAN,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.HOISTING_ID END) COUNTCONFESS,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_HOISTING_ACCEPTUSER m where m.HOISTING_ID = f.HOISTING_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HOISTING_ID END) COUNTACCEPTCONFESS
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.HOISTING_ID END) COUNTGUARDIAN,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.HOISTING_ID END) COUNTCONFESS,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_HOISTING_ACCEPTUSER m where m.HOISTING_ID = f.HOISTING_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HOISTING_ID END) COUNTACCEPTCONFESS,
(
COUNT(CASE WHEN (f.APPLY_STATUS+0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.HOISTING_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.LEADER_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.HOISTING_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.HOISTING_ID END) +
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_HOISTING_ACCEPTUSER m where m.HOISTING_ID = f.HOISTING_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HOISTING_ID END)
) AS SUMCOUNT
FROM <include refid="tableName"></include> f
WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
</select>
<!-- 获取编码 -->
<select id="getCode" parameterType="pd" resultType="pd">
SELECT

48
src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
View File

@ -134,8 +134,40 @@
select * from bus_hotwork_cfd_examine f
where f.IS_DELETE = '0' and f.HOTWORK_ID = #{HOTWORK_ID}
</select>
<!-- <select id="findByCondition" resultType="com.zcloud.entity.PageData">-->
<!-- select * from bus_hotwork_cfd_examine f where f.IS_DELETE = '0'-->
<!-- <if test="HOTWORK_ID != null and HOTWORK_ID != ''">-->
<!-- and f.HOTWORK_ID = #{HOTWORK_ID}-->
<!-- </if>-->
<!-- <if test="CORP_ID != null and CORP_ID != ''">-->
<!-- and f.CORP_ID = #{CORP_ID}-->
<!-- </if>-->
<!-- <if test="USER_ID != null and USER_ID != ''">-->
<!-- and f.USER_ID = #{USER_ID}-->
<!-- </if>-->
<!-- <if test="TYPE != null and TYPE != ''">-->
<!-- and f.TYPE = #{TYPE}-->
<!-- </if>-->
<!-- <if test="APPROVAL_STATUS != null and APPROVAL_STATUS != ''">-->
<!-- and f.APPROVAL_STATUS = #{APPROVAL_STATUS}-->
<!-- </if>-->
<!-- <if test="isValid != '' and isValid != null">-->
<!-- and not exists(select 1 from bus_hotwork_cfd a where a.HOTWORK_ID = f.HOTWORK_ID and (a.APPLY_STATUS = '-98' or a.APPLY_STATUS = '-99') )-->
<!-- </if>-->
<!-- </select>-->
<select id="findByCondition" resultType="com.zcloud.entity.PageData">
select * from bus_hotwork_cfd_examine f where f.IS_DELETE = '0'
select
f.*,
c.APPLY_STATUS
from
bus_hotwork_cfd_examine f
left join
bus_hotwork_cfd c
on
f.HOTWORK_ID = c.HOTWORK_ID
where
f.IS_DELETE = '0'
and (c.APPLY_STATUS != '0' or c.APPLY_STATUS IS NULL)
<if test="HOTWORK_ID != null and HOTWORK_ID != ''">
and f.HOTWORK_ID = #{HOTWORK_ID}
</if>
@ -152,7 +184,11 @@
and f.APPROVAL_STATUS = #{APPROVAL_STATUS}
</if>
<if test="isValid != '' and isValid != null">
and not exists(select 1 from bus_hotwork_cfd a where a.HOTWORK_ID = f.HOTWORK_ID and (a.APPLY_STATUS = '-98' or a.APPLY_STATUS = '-99') )
and not exists(
select 1 from bus_hotwork_cfd a
where a.HOTWORK_ID = f.HOTWORK_ID
and (a.APPLY_STATUS = '-98' or a.APPLY_STATUS = '-99')
)
</if>
</select>
<select id="safetylistPage" resultType="com.zcloud.entity.PageData">
@ -301,15 +337,17 @@
left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID
left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID
where f.ISDELETE = '0'
and f.APPLY_STATUS &lt; 8 and f.CONFESS_USER_SIGNER_TIME is null and f.APPLY_STATUS &gt; 0
and f.APPLY_STATUS &lt;= 8 and f.CONFESS_USER_SIGNER_TIME is null and f.APPLY_STATUS &gt; 0
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.USER_ID != null and pd.USER_ID != ''">
and exists (select 1 from bus_hotwork_cfd_examine bhce where bhce.USER_ID = #{pd.USER_ID} and bhce.IS_DELETE =
'0' and bhce.VALID_FLAG = '1' and bhce.APPROVAL_STATUS = '0' and bhce.TYPE = #{pd.TYPE} and bhce.HOTWORK_ID = f.HOTWORK_ID)
'0' and bhce.VALID_FLAG = '1' and bhce.APPROVAL_STATUS = '0' or bhce.APPROVAL_STATUS = '1' and bhce.TYPE = #{pd.TYPE} and bhce.HOTWORK_ID = f.HOTWORK_ID)
</if>
ORDER BY f.APPLY_STATUS,f.CREATTIME DESC
ORDER BY
-- f.APPLY_STATUS,
f.CREATTIME DESC
</select>

89
src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml
View File

@ -359,6 +359,9 @@
ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH},
ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME},
CONFIRM_OTHER_CONTENT = #{CONFIRM_OTHER_CONTENT},
FIRE_COMPLETED = #{FIRE_COMPLETED},
SITE_CLEANED = #{SITE_CLEANED},
NO_REMAINING_EMBERS = #{NO_REMAINING_EMBERS},
HOTWORK_ID = HOTWORK_ID
where
HOTWORK_ID = #{HOTWORK_ID}
@ -474,6 +477,9 @@
f.OPERATTIME,
f.OPERATOR,
f.CHECK_NO,
f.FIRE_COMPLETED,
f.SITE_CLEANED,
f.NO_REMAINING_EMBERS,
f.WORK_CONTENT,
f.WORK_START_DATE,
f.WORK_END_DATE,
@ -490,7 +496,6 @@
f.APPROVE_USER_SIGNER_PATH,
f.APPROVE_USER_SIGNER_TIME,
f.APPLY_STATUS,
<!--(SELECT a.ANALYZE_TIME from bus_hotworkgas a where a.ISDELETE = '0'-->
(SELECT a.ANALYZE_TIME from bus_hotworkgas_cfd a where a.ISDELETE = '0'
AND a.HOTWORK_ID = #{HOTWORK_ID}
ORDER BY
@ -501,9 +506,9 @@
f.OTHER_PROTECTIVE_MEASURES,
f.ACCEPT_DEPARTMENT_ID,
f.ACCEPT_USER_ID,
f.ACCEPT_USER_SIGNER_PATH,
f.ACCEPT_USER_SIGNER_TIME,
IFNULL(f.ACCEPT_CONTENT,'无') as ACCEPT_CONTENT,
bhac.ACCEPT_USER_SIGNER_PATH,
bhac.ACCEPT_USER_SIGNER_TIME,
IFNULL(f.ACCEPT_CONTENT,'同意') as ACCEPT_CONTENT,
f.APPLY_DEPARTMENT_ID,
f.APPLY_USER_ID,
f.WORK_PLACE,
@ -549,75 +554,72 @@
f.CONFIRM_OTHER_CONTENT,
ad.NAME as APPLY_DEPARTMENT_NAME,
au.NAME as APPLY_USER_NAME,
cd.NAME as CONFIRM_DEPARTMENT_NAME,
cu.NAME as CONFIRM_USER_NAME,
gd.NAME as GUARDIAN_DEPARTMENT_NAME,
gu.NAME as GUARDIAN_USER_NAME,
ld.NAME as LEADER_DEPARTMENT_NAME,
lu.NAME as LEADER_USER_NAME,
aud.NAME as AUDIT_DEPARTMENT_NAME,
auu.NAME as AUDIT_USER_NAME,
apd.NAME as APPROVE_DEPARTMENT_NAME,
apu.NAME as APPROVE_USER_NAME,
md.NAME as MONITOR_DEPARTMENT_NAME,
mu.NAME as MONITOR_USER_NAME,
acd.NAME as ACCEPT_DEPARTMENT_NAME,
acu.NAME as ACCEPT_USER_NAME,
ac.NAME as CONFESS_DEPARTMENT_NAME,
accu.NAME as CONFESS_USER_NAME,
aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
aacu.NAME as ACCEPT_CONFESS_USER_NAME,
anad.NAME as ANALYZE_DEPARTMENT_NAME,
anau.NAME as ANALYZE_USER_NAME
anau.NAME as ANALYZE_USER_NAME,
bhe.USER_NAME as EXAMINE_USER_NAME,
bhe.APPROVAL_OPINIONS as EXAMINE_APPROVAL_OPINIONS,
bhe.APPROVAL_SIGNATURE as EXAMINE_APPROVAL_SIGNATURE,
bhe.CREATE_TIME as EXAMINE_APPROVAL_CREATE_TIME
from
<include refid="tableName"></include> f
left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
left join SYS_USER au on au.USER_ID = f.APPLY_USER_ID
left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONFIRM_DEPARTMENT_ID
left join SYS_USER cu on cu.USER_ID = f.CONFIRM_USER_ID
left join OA_DEPARTMENT gd on gd.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
left join SYS_USER gu on gu.USER_ID = f.GUARDIAN_USER_ID
left join OA_DEPARTMENT ld on ld.DEPARTMENT_ID = f.LEADER_DEPARTMENT_ID
left join SYS_USER lu on lu.USER_ID = f.LEADER_USER_ID
left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
left join OA_DEPARTMENT md on md.DEPARTMENT_ID = f.MONITOR_DEPARTMENT_ID
left join SYS_USER mu on mu.USER_ID = f.MONITOR_USER_ID
left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID
left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID
left join bus_hotwork_cfd_examine bhe on
bhe.HOTWORK_ID = f.HOTWORK_ID
and bhe.TYPE = 1
and bhe.IS_DELETE = '0'
-- left join bus_hotwork_acceptuser_cfd bhac on bhac.HOTWORK_ID = f.HOTWORK_ID
left join (
select
HOTWORK_ID,
GROUP_CONCAT(ACCEPT_USER_SIGNER_PATH SEPARATOR ',') as ACCEPT_USER_SIGNER_PATH,
GROUP_CONCAT(ACCEPT_USER_SIGNER_TIME SEPARATOR ',') as ACCEPT_USER_SIGNER_TIME
from bus_hotwork_acceptuser_cfd
group by HOTWORK_ID
) bhac on bhac.HOTWORK_ID = f.HOTWORK_ID
where
f.HOTWORK_ID = #{HOTWORK_ID}
f.HOTWORK_ID = #{HOTWORK_ID}
</select>
<!-- 列表 -->
<select id="datalistPage" parameterType="page" resultType="pd">
select
@ -780,9 +782,9 @@
and bhac.ACCEPT_USER_ID = f.ACCEPT_USER_ID and bhac.CORPINFO_ID = f.CORPINFO_ID
and bhac.ISDELETE = '0' and bhac.ACCEPT_USER_ID is not null and trim(bhac.ACCEPT_USER_ID) != ''
where f.ISDELETE = '0'
<if test="pd.APPLY_STATUS != null and pd.APPLY_STATUS != ''">
and f.APPLY_STATUS = #{pd.APPLY_STATUS}
</if>
<!-- <if test="pd.APPLY_STATUS != null and pd.APPLY_STATUS != ''">-->
<!-- and f.APPLY_STATUS = #{pd.APPLY_STATUS}-->
<!-- </if>-->
<if test="pd.IS_GAS != null and pd.IS_GAS != ''">
and f.APPLY_STATUS in ('1','2','4','5','6','0.9','2.5','1.5')
</if>
@ -888,7 +890,9 @@
</choose>
GROUP BY
f.HOTWORK_ID
ORDER BY f.APPLY_STATUS,f.CREATTIME DESC
ORDER BY
-- f.APPLY_STATUS,
f.CREATTIME DESC
</select>
<select id="aqdatalistPage" parameterType="page" resultType="pd">
select
@ -1290,7 +1294,9 @@
left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID
left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID
where f.ISDELETE = '0'
and f.APPLY_STATUS &lt; 8 and f.GUARDIAN_USER_SIGNER_TIME is null and f.APPLY_STATUS &gt; 0
and f.APPLY_STATUS &lt;= 8
-- and f.GUARDIAN_USER_SIGNER_TIME is null
and f.APPLY_STATUS &gt; 0
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
@ -1725,4 +1731,23 @@
and f.CREATTIME LIKE CONCAT(#{CREATDATE},'%')
</select>
<select id="datalistPageHistory" resultType="com.zcloud.entity.PageData"
parameterType="com.zcloud.entity.Page">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
WHERE f.ISDELETE = '0'
<if test="pd.CONFIRM_USER_ID != null">
and f.CONFIRM_USER_ID = #{pd.CONFIRM_USER_ID}
</if>
<if test="pd.BELONGING_USER_ID != null">
and f.CONFIRM_USER_ID = #{pd.BELONGING_USER_ID}
</if>
<if test="pd.LEADER_USER_ID != null">
and f.CONFIRM_USER_ID = #{pd.LEADER_USER_ID}
</if>
and f.HOTWORK_ID = #{pd.HOTWORK_ID}
</select>
</mapper>

19
src/main/resources/mybatis/datasource/system/DictionariesMapper.xml
View File

@ -266,4 +266,23 @@
#{PARENT_ID}
</foreach>
</select>
<select id="findByCondition" resultType="com.zcloud.entity.PageData">
select
<include refid="Field"></include>
from
<include refid="tableName"></include>
where ISDELETE = 0
<if test="BIANMA != null and BIANMA != ''">
and BIANMA = #{BIANMA}
</if>
<if test="NAME != null and NAME != ''">
and NAME = #{NAME}
</if>
<if test="PARENT_ID != null and PARENT_ID != ''">
and PARENT_ID = #{PARENT_ID}
</if>
<if test="DICTIONARIES_ID != null and DICTIONARIES_ID != ''">
and DICTIONARIES_ID = #{DICTIONARIES_ID}
</if>
</select>
</mapper>

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

@ -304,7 +304,7 @@
vua.NAME OUTSOURCED_CREATOR_NAME,
ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
p.`NAME` as UNITS_PIC_NAME,
ifnull(h.HIDDEN_COUNT,0) HIDDEN_COUNT
ifnull(h.HIDDEN_COUNT,0) + ifnull(hai.AI_COUNT ,0) HIDDEN_COUNT
from
<include refid="tableName"></include> f
left join bus_units b using (UNITS_ID)
@ -335,9 +335,24 @@
) t group by t.OUTSOURCED_ID,t.CREATOR
) uncheck on uncheck.OUTSOURCED_ID = f.OUTSOURCED_ID and uncheck.CREATOR = #{pd.UserId}
</if>
left join ( SELECT t.OUTSOURCED_ID, COUNT( t.HIDDEN_ID ) HIDDEN_COUNT, t.SOURCE SOURCE, t.CREATOR CREATOR
FROM
( SELECT IFNULL( k.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID, h.* FROM `qa-gwj-prevention`.bus_keyproject_hidden h LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON h.FOREIGN_ID = k.KEYPROJECTCHECK_ID and h.ISDELETE = '0') t GROUP BY t.OUTSOURCED_ID,t.CREATOR ) h on h.OUTSOURCED_ID = f.OUTSOURCED_ID
left join (
SELECT t.OUTSOURCED_ID, COUNT( t.HIDDEN_ID ) HIDDEN_COUNT, t.SOURCE SOURCE, t.CREATOR CREATOR
FROM
(
SELECT IFNULL( k.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID, h.*
FROM `qa-gwj-prevention`.bus_keyproject_hidden h
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON h.FOREIGN_ID = k.KEYPROJECTCHECK_ID and h.ISDELETE = '0'
) t
GROUP BY t.OUTSOURCED_ID,t.CREATOR
) h on h.OUTSOURCED_ID = f.OUTSOURCED_ID
left join (
select vm.OUTSOURCED_ID ,COUNT(1) AI_COUNT
from `qa-gwj-regulatory`.bus_videomanager vm
left join `qa-gwj-regulatory`.bus_aiwarning ai on ai.VIDEOMANAGER_ID = vm.VIDEOMANAGER_ID and vm.ISDELETE = '0'
left join `qa-gwj-regulatory`.bus_aiwarning_hiddens ah on ai.AIWARNING_ID = ah.AIWARNING_ID
left join `qa-gwj-prevention`.bus_keyproject_hidden h on ah.HIDDEN_ID = h.HIDDEN_ID
where h.ISDELETE = '0' and h.SOURCE = '1'
) hai on hai.OUTSOURCED_ID = f.OUTSOURCED_ID
where f.ISDELETE = '0'
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
and

3
src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml
View File

@ -191,6 +191,9 @@
<if test="forMap != null and forMap != ''">
-- and f.REGIONINDEXCODE in ('3152c0150e93491fb37f5c015fbb943e','1b0f290142534d62957bf0b6f852c589')
</if>
<if test="INDEXCODE !=null and INDEXCODE != ''">
and f.INDEXCODE = #{INDEXCODE}
</if>
</select>
<!-- 批量删除 -->