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

Merge remote-tracking branch 'origin/czks1.0' into czks1.0

pull/14/head
dearlin 2024-01-09 16:01:30 +08:00
parent e27862fe53 a3579dd7c2
commit b774003e5e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zcloud/controller/app/AppHiddenExamineController.java
View File

@ -318,18 +318,19 @@ public class AppHiddenExamineController extends BaseController {
@RequestMapping(value = "/special") @RequestMapping(value = "/special")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation
public Object special() throws Exception { public Object special() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData examine = new PageData(); PageData examine = new PageData();
examine.put("TYPE","1"); examine.put("TYPE","1");
examine.put("STATE","-1"); examine.put("STATE","-1");
examine.put("EXAMINE",pd.getString("disposalPlan")); //临时措施 examine.put("EXAMINE",pd.getString("disposalPlan")); //临时措施
examine.put("HIDDEN_ID",pd.getString("HIDDEN_ID")); examine.put("HIDDEN_ID",pd.getString("HIDDEN_ID"));
examine = hiddenexamineService.saveApp(examine); examine = hiddenexamineService.saveApp(examine);
pd.put("examine",JSON.toJSONString(examine));
hiddenService.updateStateByHidden("7",pd.getString("HIDDEN_ID")); hiddenService.updateStateByHidden("7",pd.getString("HIDDEN_ID"));
PageData mes = new PageData(); PageData mes = new PageData();
PageData hiddenPd = hiddenService.findById(examine); PageData hiddenPd = hiddenService.findById(examine);
@ -339,6 +340,7 @@ public class AppHiddenExamineController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
map.put("msg", "隐患特殊处理申请成功。请通知隐患确认人进行特殊处理确认操作！"); map.put("msg", "隐患特殊处理申请成功。请通知隐患确认人进行特殊处理确认操作！");
map.put("dockData",JSON.toJSONString(pd));
return map; return map;
} }
@ -429,6 +431,7 @@ public class AppHiddenExamineController extends BaseController {
} }
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map; return map;
} }
} }