对接代码新加

pull/14/head
songwenxuan 2023-12-28 13:45:43 +08:00
parent e86570bb8d
commit 26dbfb49ce
2 changed files with 8 additions and 0 deletions

View File

@ -2615,6 +2615,7 @@ public class HiddenController extends BaseController {
*/ */
@RequestMapping(value = "/applycheck") @RequestMapping(value = "/applycheck")
@ResponseBody @ResponseBody
@DockAnnotation
public Object applycheck(@RequestParam(value = "FFILE", required = false) MultipartFile file, public Object applycheck(@RequestParam(value = "FFILE", required = false) MultipartFile file,
@RequestParam(value = "FFILEPDF", required = false) MultipartFile filepdf @RequestParam(value = "FFILEPDF", required = false) MultipartFile filepdf
) throws Exception { ) throws Exception {
@ -2663,6 +2664,7 @@ public class HiddenController extends BaseController {
saftList.put("STATE", '0'); saftList.put("STATE", '0');
List<PageData> saftlist = departmentService.saftpersonlist(saftList); //查询股份公司安监部负责人 List<PageData> saftlist = departmentService.saftpersonlist(saftList); //查询股份公司安监部负责人
if (saftlist.size() > 0) { if (saftlist.size() > 0) {
ArrayList<PageData> mesList = new ArrayList<>();
for (PageData arr : saftlist) { for (PageData arr : saftlist) {
PageData userpd = new PageData(); PageData userpd = new PageData();
userpd.put("USER_ID", arr.getString("IN_CHARGE")); userpd.put("USER_ID", arr.getString("IN_CHARGE"));
@ -2675,12 +2677,15 @@ public class HiddenController extends BaseController {
mes.put("SYNOPSIS", "友情提示:有一条较大隐患需要验收"); // 站内信标题 mes.put("SYNOPSIS", "友情提示:有一条较大隐患需要验收"); // 站内信标题
mes.put("RECEIVER_ID", user.getString("USER_ID")); // 接收人员ID mes.put("RECEIVER_ID", user.getString("USER_ID")); // 接收人员ID
mes.put("CONTENT", "有一条较大隐患数据在“安委会办公室验收”,等您验收");// 站内信内容 mes.put("CONTENT", "有一条较大隐患数据在“安委会办公室验收”,等您验收");// 站内信内容
mesList.add(mes);
noticeRegulatoryService.sendMessage(mes); noticeRegulatoryService.sendMessage(mes);
} }
} }
pd.put("mesList",JSON.toJSONString(mesList));
} }
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map; return map;
} }
@ -2868,6 +2873,7 @@ public class HiddenController extends BaseController {
} }
map.put("result", errInfo); map.put("result", errInfo);
map.put("pd", pd); map.put("pd", pd);
map.put("dockData","对接接口");
return map; return map;
} }
@ -2965,6 +2971,7 @@ public class HiddenController extends BaseController {
} }
map.put("check", pd); map.put("check", pd);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map; return map;
} }

View File

@ -232,6 +232,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
public void edieditsttust(PageData pd)throws Exception{ public void edieditsttust(PageData pd)throws Exception{
safetyenvironmentalMapper.edieditsttust(pd); //执行考评方法时将检查状态改成已归档因为bug6535提出要是隐患考评完毕状态应该是8已归档 safetyenvironmentalMapper.edieditsttust(pd); //执行考评方法时将检查状态改成已归档因为bug6535提出要是隐患考评完毕状态应该是8已归档
} }
/** /**
* @param pd * @param pd
* @throws Exception * @throws Exception