From 90c3f56b2c51abed9b61887b2b358495eb8f6077 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 19 Sep 2016 11:51:55 +0800 Subject: [PATCH] code update --- .../main/java/com/lyms/platform/common/utils/DateUtil.java | 14 +++++++------- .../lyms/platform/data/service/impl/SmsServiceImpl.java | 2 +- .../platform/operate/web/controller/SieveController.java | 2 +- .../com/lyms/platform/operate/web/facade/SieveFacade.java | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index fe0aa2c..c134894 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -742,25 +742,25 @@ public class DateUtil { // System.out.println(s); // Date s = addDay(parseYMD("2016-02-26"), 168); -// int start = 37; -// int end = 37; + int start = 3; + int end = 3; // // // Date startDate = DateUtil.getNewDate(-end-1,"周",1+1); // Date endDate = DateUtil.getNewDate(-start,"周",0+1); -// Date startDate = DateUtil.getNewDate(-end,"天",1); -// Date endDate = DateUtil.getNewDate(-start,"天",1); + Date startDate = DateUtil.getNewDate(-end-1,"月",1); + Date endDate = DateUtil.getNewDate(-start,"月",1); -// System.out.println(startDate + "==="+ endDate); + System.out.println(startDate + "==="+ endDate); // Date startDate = getRangeDate(parseYMD("2016-09-07"),2,"周",-1); // System.out.println(getyyyy_MM_dd(startDate)); - int a = daysBetween(parseYMD("2013-09-13"),new Date())/7; - System.out.println(a); +// int a = daysBetween(parseYMD("2013-09-13"),new Date())/7; +// System.out.println(a); } catch (Exception e) { diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index 64a9e8c..a2ac1aa 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -237,7 +237,7 @@ public class SmsServiceImpl implements SmsService{ } } boolean isRisk = false; - if (weekNum < WeekEnums.getIdByName(week)) + if (weekNum > WeekEnums.getIdByName(week)) { /** * 高危短信 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index 9cf7b42..a94ed55 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -177,7 +177,7 @@ public class SieveController extends BaseController { @TokenRequired public BaseResponse queryChanQianSieve(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return sieveFacade.queryList(cqSieveQueryRequest,loginState.getId()); + return sieveFacade.queryList(cqSieveQueryRequest,loginState.getId(),"true"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index acf4cb1..b3393b2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -169,7 +169,7 @@ public class SieveFacade { * @param cqSieveQueryRequest * @return */ - public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest,Integer userId) { + public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest,Integer userId,String needPage) { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(YnEnums.YES.getId()); sieveQuery.setPhone(cqSieveQueryRequest.getPhone()); @@ -188,7 +188,7 @@ public class SieveFacade { sieveQuery.setStatus(cqSieveQueryRequest.getIsNotify()); sieveQuery.setPage(cqSieveQueryRequest.getPage()); sieveQuery.setLimit(cqSieveQueryRequest.getLimit()); - sieveQuery.setNeed("1"); + sieveQuery.setNeed(needPage); String hospitalId=autoMatchFacade.getHospitalId(userId); sieveQuery.setHospitalId(hospitalId); //查询产筛list @@ -238,7 +238,7 @@ public class SieveFacade { public void exportCqsieves(CqSieveQueryRequest cqSieveQueryRequest, Integer id, HttpServletResponse response) { try { - BaseListResponse listResponse = (BaseListResponse)queryList(cqSieveQueryRequest, id); + BaseListResponse listResponse = (BaseListResponse)queryList(cqSieveQueryRequest, id,null); List list = listResponse.getData(); List> datas = new ArrayList<>(); @@ -263,7 +263,7 @@ public class SieveFacade { OutputStream out = response.getOutputStream(); Map cnames = new HashMap<>(); cnames.put("name", "姓名"); - cnames.put("sex","当前孕周"); + cnames.put("cDueWeek","当前孕周"); cnames.put("tireNumber","胎数"); cnames.put("dueWeek", "申请孕周"); cnames.put("ztfxText", "整体风险"); -- 1.8.3.1