diff --git a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java index 6a717af3..fd4a41aa 100644 --- a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java +++ b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java @@ -399,6 +399,7 @@ public class SafetyEnvironmentalController extends BaseController { @RequestMapping(value = "/explain") @RequiresPermissions("safetyenvironmental:edit") @ResponseBody + @DockAnnotation(isAdd = true) public Object explain() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -421,12 +422,13 @@ public class SafetyEnvironmentalController extends BaseController { pd.put("INSPECTION_ORIGINATOR_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); } - safetyenvironmentalService.explain(pd); - + PageData log = safetyenvironmentalService.explain(pd); + pd.put("log",JSON.toJSONString(log)); pd.put("inspector", Jurisdiction.getUSER_ID()); noticeCorpUtil.FailPleadind(pd); map.put("pd", pd); map.put("result", errInfo); + map.put("dockData",JSON.toJSONString(pd)); return map; } diff --git a/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalService.java b/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalService.java index 5e8e1921..bd07c0d4 100644 --- a/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalService.java +++ b/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalService.java @@ -90,10 +90,12 @@ public interface SafetyEnvironmentalService{ /** * 申辩不成立时归档 + * * @param pd + * @return * @throws Exception */ - void explain(PageData pd)throws Exception; + PageData explain(PageData pd)throws Exception; /** * 分公司安全环保检查考核分数统计 diff --git a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java index 17173da1..331426bd 100644 --- a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java +++ b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java @@ -582,7 +582,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic } @Override - public void explain(PageData pd) throws Exception { + public PageData explain(PageData pd) throws Exception { PageData data = safetyenvironmentalMapper.findById(pd); pd.put("STATE", "101"); // 101.检查已归档,待指派 pd.put("INSPECTION_SOURCE",data.getString("INSPECTION_SOURCE")); @@ -616,6 +616,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic explain.put("OPERATTIME",DateUtil.date2Str(new Date())); safetyEnvironmentalExplainService.edit(explain); } + return log; } @Override