相关方人员审批可指定打回至特殊节点。
parent
a6f36e8b43
commit
6d152e28ee
|
@ -84,7 +84,7 @@ public class GuFenCharge extends NodeSwitchComponent {
|
||||||
flows.put("OPINION", info.getOPINION());
|
flows.put("OPINION", info.getOPINION());
|
||||||
if ("0".equals(info.getSTATUS())) {
|
if ("0".equals(info.getSTATUS())) {
|
||||||
// 打回至相关方端
|
// 打回至相关方端
|
||||||
xgfUserService.repulse(flows, info);
|
xgfUserService.repulse(flows);
|
||||||
return "";
|
return "";
|
||||||
} else {
|
} else {
|
||||||
xgfFlowsMapper.edit(flows);
|
xgfFlowsMapper.edit(flows);
|
||||||
|
|
|
@ -70,7 +70,7 @@ public class GuFenSupervise extends NodeComponent {
|
||||||
flows.put("OPINION",info.getOPINION());
|
flows.put("OPINION",info.getOPINION());
|
||||||
if ("0".equals(info.getSTATUS())) {
|
if ("0".equals(info.getSTATUS())) {
|
||||||
// 打回至相关方端
|
// 打回至相关方端
|
||||||
xgfUserService.repulse(flows,info);
|
xgfUserService.repulse(flows);
|
||||||
|
|
||||||
// 保存操作记录
|
// 保存操作记录
|
||||||
xgfUserService.saveLog(info, info.getSTATUS(), "0");
|
xgfUserService.saveLog(info, info.getSTATUS(), "0");
|
||||||
|
|
|
@ -93,7 +93,7 @@ public class GuFenWeiTuoCharge extends NodeComponent {
|
||||||
|
|
||||||
if ("0".equals(info.getSTATUS())) {
|
if ("0".equals(info.getSTATUS())) {
|
||||||
// 打回至相关方端
|
// 打回至相关方端
|
||||||
xgfUserService.repulse(flows,info);
|
xgfUserService.repulse(flows);
|
||||||
} else {
|
} else {
|
||||||
xgfFlowsMapper.edit(flows);
|
xgfFlowsMapper.edit(flows);
|
||||||
condition.clear();
|
condition.clear();
|
||||||
|
|
|
@ -73,7 +73,7 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
|
||||||
flows.put("OPINION", info.getOPINION());
|
flows.put("OPINION", info.getOPINION());
|
||||||
if ("0".equals(info.getSTATUS())) {
|
if ("0".equals(info.getSTATUS())) {
|
||||||
// 打回至相关方端
|
// 打回至相关方端
|
||||||
xgfUserService.repulse(flows,info);
|
xgfUserService.repulse(flows);
|
||||||
// 保存操作记录
|
// 保存操作记录
|
||||||
xgfUserService.saveLog(info, info.getSTATUS(), "0");
|
xgfUserService.saveLog(info, info.getSTATUS(), "0");
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -84,7 +84,7 @@ public class JiTuanCharge extends NodeSwitchComponent {
|
||||||
flows.put("OPINION",info.getOPINION());
|
flows.put("OPINION",info.getOPINION());
|
||||||
if ("0".equals(info.getSTATUS())) {
|
if ("0".equals(info.getSTATUS())) {
|
||||||
// 打回至相关方端
|
// 打回至相关方端
|
||||||
xgfUserService.repulse(flows,info);
|
xgfUserService.repulse(flows);
|
||||||
return "";
|
return "";
|
||||||
} else {
|
} else {
|
||||||
xgfFlowsMapper.edit(flows);
|
xgfFlowsMapper.edit(flows);
|
||||||
|
|
|
@ -70,7 +70,7 @@ public class JiTuanSupervise extends NodeComponent {
|
||||||
flows.put("OPINION", info.getOPINION());
|
flows.put("OPINION", info.getOPINION());
|
||||||
if ("0".equals(info.getSTATUS())) {
|
if ("0".equals(info.getSTATUS())) {
|
||||||
// 打回至相关方端
|
// 打回至相关方端
|
||||||
xgfUserService.repulse(flows,info);
|
xgfUserService.repulse(flows);
|
||||||
|
|
||||||
// 保存操作记录
|
// 保存操作记录
|
||||||
xgfUserService.saveLog(info, info.getSTATUS(), "0");
|
xgfUserService.saveLog(info, info.getSTATUS(), "0");
|
||||||
|
|
|
@ -75,7 +75,7 @@ public class JiTuanWeiTuoCharge extends NodeComponent {
|
||||||
|
|
||||||
if ("0".equals(info.getSTATUS())) {
|
if ("0".equals(info.getSTATUS())) {
|
||||||
// 打回至相关方端
|
// 打回至相关方端
|
||||||
xgfUserService.repulse(flows,info);
|
xgfUserService.repulse(flows);
|
||||||
} else {
|
} else {
|
||||||
xgfFlowsMapper.edit(flows);
|
xgfFlowsMapper.edit(flows);
|
||||||
condition.clear();
|
condition.clear();
|
||||||
|
|
|
@ -72,7 +72,7 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
|
||||||
flows.put("OPINION", info.getOPINION());
|
flows.put("OPINION", info.getOPINION());
|
||||||
if ("0".equals(info.getSTATUS())) {
|
if ("0".equals(info.getSTATUS())) {
|
||||||
// 打回至相关方端
|
// 打回至相关方端
|
||||||
xgfUserService.repulse(flows,info);
|
xgfUserService.repulse(flows);
|
||||||
// 保存操作记录
|
// 保存操作记录
|
||||||
xgfUserService.saveLog(info, info.getSTATUS(), "0");
|
xgfUserService.saveLog(info, info.getSTATUS(), "0");
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -71,7 +71,7 @@ public class YiBanCharge extends NodeComponent {
|
||||||
flows.put("OPINION",info.getOPINION());
|
flows.put("OPINION",info.getOPINION());
|
||||||
if ("0".equals(info.getSTATUS())) {
|
if ("0".equals(info.getSTATUS())) {
|
||||||
// 打回至相关方端
|
// 打回至相关方端
|
||||||
xgfUserService.repulse(flows,info);
|
xgfUserService.repulse(flows);
|
||||||
} else {
|
} else {
|
||||||
xgfFlowsMapper.edit(flows);
|
xgfFlowsMapper.edit(flows);
|
||||||
condition.clear();
|
condition.clear();
|
||||||
|
|
|
@ -105,7 +105,7 @@ public class YiBanSupervise extends NodeComponent {
|
||||||
flows.put("OPINION",info.getOPINION());
|
flows.put("OPINION",info.getOPINION());
|
||||||
if ("0".equals(info.getSTATUS())) {
|
if ("0".equals(info.getSTATUS())) {
|
||||||
// 打回至相关方端
|
// 打回至相关方端
|
||||||
xgfUserService.repulse(flows,info);
|
xgfUserService.repulse(flows);
|
||||||
// 保存操作记录
|
// 保存操作记录
|
||||||
xgfUserService.saveLog(info, info.getSTATUS(), "0");
|
xgfUserService.saveLog(info, info.getSTATUS(), "0");
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -46,7 +46,4 @@ public class XgfFlowDto {
|
||||||
|
|
||||||
// 获取节点需要填写的信息
|
// 获取节点需要填写的信息
|
||||||
private Map<String,String> map;
|
private Map<String,String> map;
|
||||||
|
|
||||||
// 打回节点游标
|
|
||||||
private String BACK_STEP;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ public interface XgfUserService {
|
||||||
void saveLog(PageData info, String status, String endFlag) throws Exception;
|
void saveLog(PageData info, String status, String endFlag) throws Exception;
|
||||||
void saveLog(XgfFlowDto 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;
|
void approveMax(PageData request, MultipartFile[] chengNuoShu) throws Exception;
|
||||||
|
|
||||||
|
|
|
@ -991,9 +991,7 @@ public class XgfUserServiceImpl implements XgfUserService {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void repulse(PageData flows, XgfFlowDto info) throws Exception {
|
public void repulse(PageData flows) throws Exception {
|
||||||
// add by liu jun 相关方可指定打回至指定节点 -1 为默认打回至相关方端
|
|
||||||
if ("-1".equals(info.getBACK_STEP())){
|
|
||||||
PageData condition = new PageData();
|
PageData condition = new PageData();
|
||||||
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
|
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
|
||||||
PageData entity = xgfUserMapper.findById(condition);
|
PageData entity = xgfUserMapper.findById(condition);
|
||||||
|
@ -1012,17 +1010,6 @@ public class XgfUserServiceImpl implements XgfUserService {
|
||||||
xgfUserMapper.edit(entity);
|
xgfUserMapper.edit(entity);
|
||||||
this.clearInfo(flows);
|
this.clearInfo(flows);
|
||||||
xgfFlowsMapper.edit(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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue