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

src/main/java/com/zcloud/controller/app/AppHiddenExamineController.java

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