wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

14132 这几种隐患来源的显示不正确 需要统一

pull/5/head
dearlin 2024-02-28 14:26:41 +08:00
parent 2c3cc96696
commit c70b1d6bf1
2 changed files with 1700 additions and 1696 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomHiddenController.java
View File

@ -292,6 +292,7 @@ public class AppCustomHiddenController extends BaseController {
pd.put("RISK_POSITION", item.get("POSITIONNAME")); pd.put("RISK_POSITION", item.get("POSITIONNAME"));
pd.put("LEVEL", item.get("DNAME5")); pd.put("LEVEL", item.get("DNAME5"));
} }
pd.put("SOURCE", "3");
customHiddenService.save(pd); customHiddenService.save(pd);
// 清除同检查记录合格图片 // 清除同检查记录合格图片
if(pd.get("CLEARIMG") != null && Tools.notEmpty(pd.get("CLEARIMG").toString()) && "1".equals(pd.get("CLEARIMG").toString())) { if(pd.get("CLEARIMG") != null && Tools.notEmpty(pd.get("CLEARIMG").toString()) && "1".equals(pd.get("CLEARIMG").toString())) {
@ -453,6 +454,7 @@ public class AppCustomHiddenController extends BaseController {
} }
} }
} }
pd.put("SOURCE", "3");
customHiddenService.save(pd); customHiddenService.save(pd);
// 发送短信 // 发送短信
if(Tools.notEmpty(pd.getString("CONFIRM_USER")) && !pd.getString("STATE").equals("0")){ if(Tools.notEmpty(pd.getString("CONFIRM_USER")) && !pd.getString("STATE").equals("0")){

8
src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomHiddenController.java
View File

@ -73,6 +73,7 @@ public class CustomHiddenController extends BaseController {
private Smb smb; private Smb smb;
@Autowired @Autowired
private SafetyEnvironmentalService safetyenvironmentalService; private SafetyEnvironmentalService safetyenvironmentalService;
/** /**
* 新增 * 新增
* *
@ -106,9 +107,8 @@ public class CustomHiddenController extends BaseController {
} }
} }
if (pd.get("SOURCE").equals("2")) {
pd.put("STATE", "0"); pd.put("STATE", "0");
} pd.put("SOURCE", "3");
customHiddenService.save(pd); customHiddenService.save(pd);
// 立即整改保存检查数据 // 立即整改保存检查数据
if ("4".equals(pd.get("STATE").toString())) { if ("4".equals(pd.get("STATE").toString())) {
@ -203,6 +203,7 @@ public class CustomHiddenController extends BaseController {
} }
} }
pd.put("ISCONFIRM", "0"); pd.put("ISCONFIRM", "0");
pd.put("SOURCE", "3");
customHiddenService.save(pd); customHiddenService.save(pd);
map.put("result", errInfo); map.put("result", errInfo);
map.put("pd", pd); map.put("pd", pd);
@ -311,7 +312,6 @@ public class CustomHiddenController extends BaseController {
} }
@RequestMapping(value = "/editHIDDENLEVEL") @RequestMapping(value = "/editHIDDENLEVEL")
@ResponseBody @ResponseBody
public Object editHIDDENLEVEL() throws Exception { public Object editHIDDENLEVEL() throws Exception {
@ -324,6 +324,7 @@ public class CustomHiddenController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@RequestMapping(value = "/editISCONFIRM") @RequestMapping(value = "/editISCONFIRM")
@ResponseBody @ResponseBody
@LogAnno(menuType = "双重预防", menuServer = "隐患治理", instructionsOperate = "重大隐患", instructionsType = "确认为重大隐患") @LogAnno(menuType = "双重预防", menuServer = "隐患治理", instructionsOperate = "重大隐患", instructionsType = "确认为重大隐患")
@ -1783,6 +1784,7 @@ public class CustomHiddenController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/** /**
* app首页获取数量 * app首页获取数量
* *