jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a350b2155cb7ebf436984931cc04712d9123318a

Authored by Administrator
1 parent 4972e92f2b
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 5 changed files with 76 additions and 16 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteReceiveMapper.java View file @ a350b21
... ... @@ -25,6 +25,6 @@
25 25  
26 26 List<Map<String, Object>> list(FolviteRecordQuery query);
27 27  
28   - int listCount(FolviteRecordQuery query);
  28 + Integer listCount(FolviteRecordQuery query);
29 29 }
platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteRecordQuery.java View file @ a350b21
... ... @@ -15,7 +15,7 @@
15 15 private String folviteId;
16 16  
17 17 //查询号（姓名、联系方式、证件号、就诊卡）
18   - private String queyNo;
  18 + private String queryNo;
19 19  
20 20 // 孕前/孕后 0 孕前 1 孕后
21 21 private Integer isconceive;
22 22  
... ... @@ -32,12 +32,12 @@
32 32 //结束建档日期
33 33 private Date endDrawTime;
34 34  
35   - public String getQueyNo() {
36   - return queyNo;
  35 + public String getQueryNo() {
  36 + return queryNo;
37 37 }
38 38  
39   - public void setQueyNo(String queyNo) {
40   - this.queyNo = queyNo;
  39 + public void setQueryNo(String queryNo) {
  40 + this.queryNo = queryNo;
41 41 }
42 42  
43 43 public Integer getIsconceive() {
platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml View file @ a350b21
... ... @@ -56,32 +56,68 @@
56 56  
57 57 <select id="list" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" resultType="map">
58 58 SELECT
59   - f.`name`,f.birthday,f.card_no,f.vc_card,p.isconceive,f.receivesum,
60   - SUM(p.receive_number),f.drawTime,f.domicile_address,f.domicile_area,
61   - f.domicile_city,f.domicile_country,f.domicile_province
  59 + f.`name` as name,f.birthday,f.card_no,f.vc_card,p.isconceive,f.receivesum,
  60 + SUM(p.receive_number) as sumNumber,f.drawTime,f.domicile_address,f.domicile_area,
  61 + f.domicile_city,f.domicile_country,f.domicile_province,p.folvite_id,p.issuer
62 62 FROM
63 63 lyms_folvite_provide AS p
64 64 LEFT JOIN
65 65 lyms_folvite_Info f ON p.folvite_id = f.id
66 66 <where>
67 67 1=1
68   - <if test="queyNo != null and queyNo != ''">
  68 + <if test="queryNo != null and queryNo != ''">
69 69 and f.`name` =#{queryNo}
70 70 </if>
  71 + <if test="isconceive !=null">
  72 + and p.isconceive=#{isconceive}
  73 + </if>
  74 + <if test="startReceiveDate != null ">
  75 + AND <![CDATA[ p.receive_date > date_format(#{startReceiveDate},'%Y-%m-%d') ]]>
  76 + </if>
  77 + <if test="endReceiveDate != null">
  78 + AND <![CDATA[ p.receive_date < date_format(#{endReceiveDate},'%Y-%m-%d') ]]>
  79 + </if>
  80 + <if test="startDrawTime != null">
  81 + AND <![CDATA[ f.drawTime > date_format(#{startDrawTime},'%Y-%m-%d') ]]>
  82 + </if>
  83 + <if test="endDrawTime != null">
  84 + AND <![CDATA[ f.drawTime < date_format(#{endDrawTime},'%Y-%m-%d') ]]>
  85 + </if>
71 86  
72 87 </where>
73 88 GROUP BY p.folvite_id
74 89 <include refid="orderAndLimit"/>
75 90 </select>
76 91  
77   - <select id="listCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" resultType="int">
  92 + <select id="listCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" resultType="java.lang.Integer">
78 93 SELECT
79 94 count(1)
80 95 FROM
81 96 lyms_folvite_provide AS p
82 97 LEFT JOIN
83 98 lyms_folvite_Info f ON p.folvite_id = f.id
84   - <include refid="whereSql"/>
  99 + <where>
  100 + 1=1
  101 + <if test="queryNo != null and queryNo != ''">
  102 + and f.`name` =#{queryNo}
  103 + </if>
  104 + <if test="isconceive !=null">
  105 + and p.isconceive=#{isconceive}
  106 + </if>
  107 + <if test="startReceiveDate != null ">
  108 + AND <![CDATA[ p.receive_date > date_format(#{startReceiveDate},'%Y-%m-%d') ]]>
  109 + </if>
  110 + <if test="endReceiveDate != null">
  111 + AND <![CDATA[ p.receive_date < date_format(#{endReceiveDate},'%Y-%m-%d') ]]>
  112 + </if>
  113 + <if test="startDrawTime != null">
  114 + AND <![CDATA[ f.drawTime > date_format(#{startDrawTime},'%Y-%m-%d') ]]>
  115 + </if>
  116 + <if test="endDrawTime != null">
  117 + AND <![CDATA[ f.drawTime < date_format(#{endDrawTime},'%Y-%m-%d') ]]>
  118 + </if>
  119 +
  120 + </where>
85 121 GROUP BY p.folvite_id
86 122 </select>
87 123 <select id="queyFolviteReceiveCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java View file @ a350b21
... ... @@ -114,9 +114,10 @@
114 114 query.setEndReceiveDate(DateUtil.getYmdhmDate(endReceiveDate));
115 115 query.setStartReceiveDate(DateUtil.getYmdhmDate(startDrawTime));
116 116 query.setEndDrawTime(DateUtil.getYmdhmDate(endDrawTime));
  117 + query.setQueryNo(queryNo);
117 118 query.setSort("created asc");
118   - query.setQueyNo(queryNo);
119 119 query.setNeed("true");
  120 +
120 121  
121 122 List<Map<String, Object>> list = folviteService.list(query);
122 123 BaseListResponse baseResponse = new BaseListResponse();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java View file @ a350b21
... ... @@ -222,12 +222,35 @@
222 222  
223 223 @Override
224 224 public List<Map<String, Object>> list(FolviteRecordQuery folviteQuery) {
  225 + List<Map<String, Object>> datas = new ArrayList<>();
225 226 if (folviteQuery.getNeed() != null) {
226   - folviteQuery.mysqlBuild(receiveMapper.listCount(folviteQuery));
  227 + folviteQuery.mysqlBuild(receiveMapper.listCount(folviteQuery) == null ? 0 : receiveMapper.listCount(folviteQuery));
227 228 }
228   - return receiveMapper.list(folviteQuery);
  229 + List<Map<String, Object>> maps = receiveMapper.list(folviteQuery);
  230 + for (Map<String, Object> map : maps) {
  231 + Map<String, Object> m = new HashMap<>();
  232 + m.put("folviteId", map.get("folvite_id"));
  233 + m.put("name", map.get("name"));
  234 + m.put("cardNo", map.get("card_no"));
  235 + m.put("vcCard", map.get("vc_card"));
  236 + m.put("birthday", DateUtil.getyyyy_MM_dd((Date) map.get("birthday")));
  237 + m.put("isconceive", (int) map.get("isconceive") != 0 ? "孕后" : "孕前");
  238 + m.put("receivesum", map.get("receivesum"));
  239 + m.put("drawTime", DateUtil.getyyyy_MM_dd((Date) map.get("drawTime")));
  240 + m.put("sumNumber", map.get("sumNumber"));
  241 + m.put("domicileAddress", map.get("domicile_address"));
  242 + m.put("domicileArea", map.get("domicile_area"));
  243 + m.put("domicileCity", map.get("domicile_city"));
  244 + m.put("domicileCountry", map.get("domicile_country"));
  245 + m.put("domicileProvince", map.get("domicile_province"));
  246 + m.put("Address", CommonsHelper.getResidence(map.get("domicile_province").toString(), map.get("domicile_city").toString(),
  247 + map.get("domicile_area").toString(), map.get("domicile_country").toString(), map.get("domicile_address").toString(), basicConfigService));
  248 + m.put("issuer", map.get("issuer"));
  249 + m.put("issuerName", usersService.getUsers(Integer.valueOf(map.get("issuer").toString())).getName());
  250 + datas.add(m);
  251 + }
  252 + return datas;
229 253 }
230   -
231 254  
232 255 FolviteResult result(ResidentsArchiveModel archiveModel) {
233 256 FolviteResult folviteResult = new FolviteResult();