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

清单排查、隐患流程对接代码

pull/14/head
songwenxuan 2023-12-21 10:04:48 +08:00
parent 46d4a3a623
commit a34a946c0a
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java
View File

@ -399,6 +399,7 @@ public class SafetyEnvironmentalController extends BaseController {
@RequestMapping(value = "/explain") @RequestMapping(value = "/explain")
@RequiresPermissions("safetyenvironmental:edit") @RequiresPermissions("safetyenvironmental:edit")
@ResponseBody @ResponseBody
@DockAnnotation(isAdd = true)
public Object explain() throws Exception { public Object explain() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; 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); 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()); pd.put("inspector", Jurisdiction.getUSER_ID());
noticeCorpUtil.FailPleadind(pd); noticeCorpUtil.FailPleadind(pd);
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;
} }

4
src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalService.java
View File

@ -90,10 +90,12 @@ public interface SafetyEnvironmentalService{
/** /**
* 申辩不成立时归档 * 申辩不成立时归档
*
* @param pd * @param pd
* @return
* @throws Exception * @throws Exception
*/ */
void explain(PageData pd)throws Exception; PageData explain(PageData pd)throws Exception;
/** /**
* 分公司安全环保检查考核分数统计 * 分公司安全环保检查考核分数统计

3
src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java
View File

@ -582,7 +582,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
} }
@Override @Override
public void explain(PageData pd) throws Exception { public PageData explain(PageData pd) throws Exception {
PageData data = safetyenvironmentalMapper.findById(pd); PageData data = safetyenvironmentalMapper.findById(pd);
pd.put("STATE", "101"); // 101.检查已归档，待指派 pd.put("STATE", "101"); // 101.检查已归档，待指派
pd.put("INSPECTION_SOURCE",data.getString("INSPECTION_SOURCE")); pd.put("INSPECTION_SOURCE",data.getString("INSPECTION_SOURCE"));
@ -616,6 +616,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
explain.put("OPERATTIME",DateUtil.date2Str(new Date())); explain.put("OPERATTIME",DateUtil.date2Str(new Date()));
safetyEnvironmentalExplainService.edit(explain); safetyEnvironmentalExplainService.edit(explain);
} }
return log;
} }
@Override @Override