jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 506a901b03f73cef0000fabd327cf1e9c41f2a37

Authored by liquanyu
1 parent b90f1c719d
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

code update

Showing 3 changed files with 4 additions and 3 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 506a901
... ... @@ -742,8 +742,8 @@
742 742 // System.out.println(s);
743 743 // Date s = addDay(parseYMD("2016-02-26"), 168);
744 744  
745   - Date startDate = DateUtil.getNewDate(-0,"月",0);
746   - Date endDate = DateUtil.getNewDate(-1,"月",0);
  745 + Date startDate = DateUtil.getNewDate(-0,"周",0);
  746 + Date endDate = DateUtil.getNewDate(-1-1,"周",0);
747 747  
748 748 System.out.println(startDate + "==="+ endDate);
749 749 } catch (Exception e)
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ 506a901
... ... @@ -1117,7 +1117,7 @@
1117 1117 if (start != null && end != null)
1118 1118 {
1119 1119 Date startDate = DateUtil.getNewDate(-end, "月", sendTimeType);
1120   - Date endDate = DateUtil.getNewDate(-start,"月",sendTimeType);
  1120 + Date endDate = DateUtil.getNewDate(-start-1,"月",sendTimeType);
1121 1121 babyModelQuery.setBirthStart(startDate);
1122 1122 babyModelQuery.setBirthEnd(endDate);
1123 1123  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 506a901
... ... @@ -1788,6 +1788,7 @@
1788 1788 cnames.put("monthAge","月龄");
1789 1789 cnames.put("diagnose","高危诊断");
1790 1790 httpServletResponse.setContentType("application/octet-stream");
  1791 + httpServletResponse.setCharacterEncoding("UTF-8");
1791 1792 httpServletResponse.setHeader("Content-Disposition", "attachment;fileName="+"childDatas.xls");
1792 1793 ExcelUtil.toExcel(out,datas,cnames);
1793 1794 } catch (IOException e) {