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

相关方人员审批可指定打回至特殊节点。

liujun0703-新项目开发^2^2
liujun 2024-06-11 14:27:19 +08:00
parent a6f36e8b43
commit 6d152e28ee
13 changed files with 29 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ public class GuFenCharge extends NodeSwitchComponent {
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows, info);
xgfUserService.repulse(flows);
return "";
} else {
xgfFlowsMapper.edit(flows);

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

@ -70,7 +70,7 @@ public class GuFenSupervise extends NodeComponent {
flows.put("OPINION",info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");

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

@ -93,7 +93,7 @@ public class GuFenWeiTuoCharge extends NodeComponent {
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows);
} else {
xgfFlowsMapper.edit(flows);
condition.clear();

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

@ -73,7 +73,7 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {

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

@ -84,7 +84,7 @@ public class JiTuanCharge extends NodeSwitchComponent {
flows.put("OPINION",info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows);
return "";
} else {
xgfFlowsMapper.edit(flows);

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

@ -70,7 +70,7 @@ public class JiTuanSupervise extends NodeComponent {
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");

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

@ -75,7 +75,7 @@ public class JiTuanWeiTuoCharge extends NodeComponent {
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows);
} else {
xgfFlowsMapper.edit(flows);
condition.clear();

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

@ -72,7 +72,7 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {

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

@ -71,7 +71,7 @@ public class YiBanCharge extends NodeComponent {
flows.put("OPINION",info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows);
} else {
xgfFlowsMapper.edit(flows);
condition.clear();

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

@ -105,7 +105,7 @@ public class YiBanSupervise extends NodeComponent {
flows.put("OPINION",info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {

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

@ -46,7 +46,4 @@ public class XgfFlowDto {
// 获取节点需要填写的信息
private Map<String,String> map;
// 打回节点游标
private String BACK_STEP;
}

2
src/main/java/com/zcloud/service/xgf/XgfUserService.java
View File

@ -39,7 +39,7 @@ public interface XgfUserService {
void saveLog(PageData info, String status, String endFlag) throws Exception;
void saveLog(XgfFlowDto info, String status, String endFlag) throws Exception;
void repulse(PageData flows, XgfFlowDto info) throws Exception;
void repulse(PageData flows) throws Exception;
void approveMax(PageData request, MultipartFile[] chengNuoShu) throws Exception;

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

@ -991,38 +991,25 @@ public class XgfUserServiceImpl implements XgfUserService {
}
@Override
public void repulse(PageData flows, XgfFlowDto info) throws Exception {
// 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.getString("FLOWS_STEP").equals(info.getBACK_STEP())){
throw new RuntimeException("不能自己打回到自己");
}
flowEntity.put("FLOWS_STEP", info.getBACK_STEP());
xgfFlowsMapper.edit(flowEntity);
public void repulse(PageData flows) 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("请求失败");
}
xgfUserMapper.edit(entity);
this.clearInfo(flows);
xgfFlowsMapper.edit(flows);
}
@Override