diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java index 0ba8c112..f4771814 100644 --- a/src/main/java/com/emr/controller/FontController.java +++ b/src/main/java/com/emr/controller/FontController.java @@ -103,6 +103,16 @@ public class FontController { return "font/error"; } + /** + * 返回按需采集页面 + * */ + @RequestMapping("collection") + private String retrunCollectionPage(Model model, String collectionID){ + // System.out.println(System.getProperty("file.encoding"));//当前文件的编码方式 + model.addAttribute("collectionID",collectionID); + return "font/collection"; + } + /** * 判断分类id是否存在 * */ @@ -363,4 +373,15 @@ public class FontController { ExceptionPrintUtil.printException(e); } } + + @ResponseBody + @RequestMapping(value = "getCollectionDetail") + public void getCollectionDetail(HttpServletResponse response,Archive_Detail_Vo ArchiveDetailVo){ + response.setCharacterEncoding("utf-8"); + try { + archiveDetailService.getCollectionDetail(ArchiveDetailVo); + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + } + } } diff --git a/src/main/java/com/emr/controller/signListController.java b/src/main/java/com/emr/controller/signListController.java index b61c8542..e855a84a 100644 --- a/src/main/java/com/emr/controller/signListController.java +++ b/src/main/java/com/emr/controller/signListController.java @@ -654,6 +654,56 @@ public class signListController { } return result; } + + @ResponseBody + @RequestMapping(value = "/collection") + public String collection(HttpServletRequest request, HttpServletResponse response, int flagNum,String id,String pid) throws Exception { + response.setCharacterEncoding("utf-8"); + request.setCharacterEncoding("utf-8"); + // 从session获取用户名 + Subject currentUser = SecurityUtils.getSubject(); + Session session = currentUser.getSession(); + String result = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Sign_List signList = new Sign_List(); + signList.setPid(pid); + signList.setMasterID(id); + int num=0; + switch (flagNum){ + case 1: + num=-401; + break; + case 2: + num=-402; + break; + case 3: + num=-403; + break; + case 4: + num=-404; + break; + case 5: + num=-405; + break; + case 6: + num=-406; + break; + } + signList.setSysFlag(num); + signList.setC5("0"); + List list=signListService.selectSignListWith(signList); + if(list!=null&&list.size()>0){ + return "当前采集计划已存在,请勿重复发起!"; + }else{ + signList.setId(IDHelper.NewID()); + signList.setCreatedtime(sdf.format(new Date())); + signList.setC1((String) session.getAttribute("userSession")); + signList.setIsFullText("0"); + signListService.insertSignList(signList); + return "采集计划已生成!"; + } + } } diff --git a/src/main/java/com/emr/dao/Archive_DetailMapper.java b/src/main/java/com/emr/dao/Archive_DetailMapper.java index 7ebfb510..148bad4e 100644 --- a/src/main/java/com/emr/dao/Archive_DetailMapper.java +++ b/src/main/java/com/emr/dao/Archive_DetailMapper.java @@ -105,6 +105,13 @@ public interface Archive_DetailMapper { */ List selectByClo(Archive_Detail_Vo record); + /** + * 根据可选字段查询记录 + * @param ArchiveDetailVo + * @return + */ + List getCollectionDetail(Archive_Detail_Vo ArchiveDetailVo); + /** * 根据可选字段查询记录详情 * @param record diff --git a/src/main/java/com/emr/service/Archive_DetailService.java b/src/main/java/com/emr/service/Archive_DetailService.java index 57acc5dd..8a22e0be 100644 --- a/src/main/java/com/emr/service/Archive_DetailService.java +++ b/src/main/java/com/emr/service/Archive_DetailService.java @@ -127,6 +127,8 @@ public interface Archive_DetailService { List mulFile2OneById(HttpServletResponse response,List arList); void showPdf(HttpServletResponse response, HttpSession session, String pdfWater); + + List getCollectionDetail(Archive_Detail_Vo ArchiveDetailVo); } diff --git a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java index eb4018b1..3bbca7bd 100644 --- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java @@ -38,6 +38,11 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { return archiveDetailMapper.selectByClo(record); } + @Override + public List getCollectionDetail(Archive_Detail_Vo ArchiveDetailVo) { + return archiveDetailMapper.getCollectionDetail(ArchiveDetailVo); + } + @Override public Integer selectChildByClo(Archive_Detail_Vo record) { return archiveDetailMapper.selectChildByClo(record); diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index da8a91b7..d0330f15 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -124,6 +124,20 @@ + + +
@@ -642,7 +644,7 @@ <%--
--%> -