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

1、审批历史数据未清理 

2、地图测试环境图片地址更改
3、消防统计页面点击详情后，返回刷新页面bug修复
2024年2月1日V1.0.53
liujun 2024-01-31 10:51:53 +08:00
parent 55dfd28234
commit c63da69e51
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,34 +455,50 @@ public class XgfUserServiceImpl implements XgfUserService {
case 0:
if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_ZERO_USER_ID"))) {
return "1";
} else {
return "0";
}
case 1:
if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_ONE_USER_ID"))) {
return "1";
} else {
return "0";
}
case 2:
if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_TWO_USER_ID"))) {
return "1";
} else {
return "0";
}
case 3:
if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_THREE_USER_ID"))) {
return "1";
} else {
return "0";
}
case 4:
if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_FOUR_USER_ID"))) {
return "1";
} else {
return "0";
}
case 5:
if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_FIVE_USER_ID"))) {
return "1";
} else {
return "0";
}
case 6:
if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_SIX_USER_ID"))) {
return "1";
} else {
return "0";
}
case 7:
if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_SEVEN_USER_ID"))) {
return "1";
} else {
return "0";
}
default:
return "0";
@ -514,6 +530,7 @@ public class XgfUserServiceImpl implements XgfUserService {
throw new RuntimeException("请求失败");
}
xgfUserMapper.edit(entity);
this.clearInfo(flows);
xgfFlowsMapper.edit(flows);
return "0";
} else {
@ -555,6 +572,7 @@ public class XgfUserServiceImpl implements XgfUserService {
throw new RuntimeException("请求失败");
}
xgfUserMapper.edit(entity);
this.clearInfo(flows);
xgfFlowsMapper.edit(flows);
return "0";
} else {
@ -600,6 +618,7 @@ public class XgfUserServiceImpl implements XgfUserService {
entity.put("VALID_FLAG", "0");
entity.put("CHECK_STATUS", "-2");
PageData key = new PageData();
xgfUserMapper.edit(entity);
key.putAll(entity);
key.put("USER_ID", condition.get("XGF_USER_ID"));
key.put("STATUS", "1");
@ -607,7 +626,7 @@ public class XgfUserServiceImpl implements XgfUserService {
if (result == null || !"succeed".equals(result.get("result"))) {
throw new RuntimeException("请求失败");
}
xgfUserMapper.edit(entity);
this.clearInfo(flows);
xgfFlowsMapper.edit(flows);
return "0";
} else {
@ -656,6 +675,7 @@ public class XgfUserServiceImpl implements XgfUserService {
entity.put("STATUS", "0");
entity.put("VALID_FLAG", "0");
entity.put("CHECK_STATUS", "-2");
xgfUserMapper.edit(entity);
PageData key = new PageData();
key.putAll(entity);
key.put("USER_ID", condition.get("XGF_USER_ID"));
@ -664,7 +684,7 @@ public class XgfUserServiceImpl implements XgfUserService {
if (result == null || !"succeed".equals(result.get("result"))) {
throw new RuntimeException("请求失败");
}
xgfUserMapper.edit(entity);
this.clearInfo(flows);
xgfFlowsMapper.edit(flows);
return "0";
} else {
@ -711,6 +731,7 @@ public class XgfUserServiceImpl implements XgfUserService {
entity.put("STATUS", "0");
entity.put("VALID_FLAG", "0");
entity.put("CHECK_STATUS", "-2");
xgfUserMapper.edit(entity);
PageData key = new PageData();
key.putAll(entity);
key.put("USER_ID", condition.get("XGF_USER_ID"));
@ -719,7 +740,7 @@ public class XgfUserServiceImpl implements XgfUserService {
if (result == null || !"succeed".equals(result.get("result"))) {
throw new RuntimeException("请求失败");
}
xgfUserMapper.edit(entity);
this.clearInfo(flows);
xgfFlowsMapper.edit(flows);
return "0";
} else {
@ -752,6 +773,11 @@ public class XgfUserServiceImpl implements XgfUserService {
case 5: {
condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
flows.put("APPOINT_FIVE_CORP_ID", "1");
flows.put("APPOINT_FIVE_CORP_NAME", "秦港股份有限公司");
flows.put("APPOINT_FIVE_TIME", DateUtil.getTime());
flows.put("APPOINT_FIVE_STATUS", info.getString("STATUS"));
flows.put("APPOINT_FIVE_OPINION", info.getString("OPINION"));
PageData entity = xgfUserMapper.findById(condition);
// 1、判断是否通过审核
if ("0".equals(info.getString("STATUS"))) {
@ -815,6 +841,15 @@ public class XgfUserServiceImpl implements XgfUserService {
}
}
private void clearInfo(PageData flow){
flow.put("APPOINT_ONE_USER_ID", "");
flow.put("APPOINT_TWO_USER_ID", "");
flow.put("APPOINT_THREE_USER_ID", "");
flow.put("APPOINT_FOUR_USER_ID", "");
flow.put("APPOINT_FIVE_USER_ID", "");
flow.put("APPOINT_SIX_USER_ID", "");
flow.put("APPOINT_SEVEN_USER_ID", "");
}
private void saveLog(PageData info, String status, String endFlag) throws Exception {
/* 保存审批记录 */
PageData condition = new PageData();
@ -822,6 +857,7 @@ public class XgfUserServiceImpl implements XgfUserService {
condition.put("FOREIGN_KEY", info.getString("FLOWS_ID"));
condition.put("TYPE", "1");
condition.put("VALID_FLAG", "1");
condition.put("END_FLAG", "0");
PageData flow = flowMapper.findByCondition(condition);
if (flow == null || flow.size() == 0) {
throw new RuntimeException("流程已被暂停，请联系管理员");