From 75cfe7fb57b213f99c4b0b453655b738b72dcf15 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 28 Jun 2021 16:01:09 +0800 Subject: [PATCH] update --- .../lyms/platform/pojo/PreEugenicsBaseModel.java | 11 +++++ .../com/lyms/platform/pojo/PremaritalCheckup.java | 9 ---- .../web/controller/PreEugenicsBaseController.java | 8 ++++ .../web/facade/PremaritalCheckupFacade.java | 4 -- .../web/result/PremaritalCheckupResult.java | 9 ---- .../operate/web/service/IPreEugenicsService.java | 2 + .../web/service/impl/PreEugebicsServiceImpl.java | 52 ++++++++++++++++++++++ 7 files changed, 73 insertions(+), 22 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java index 62cc779..94a6975 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java @@ -380,6 +380,17 @@ public class PreEugenicsBaseModel extends BaseModel { private Integer isSync; + /** + * 妻子采血编号 + */ + private String wifeCxNum; + + /** + * 丈夫采血编号 + */ + private String husbandCxNum; + + public static long getSerialVersionUID() { return serialVersionUID; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java index 821d262..ab785cb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java @@ -460,16 +460,7 @@ public class PremaritalCheckup extends BaseModel { //1 未同步 2已经同步 private Integer isSync; - //采血编号 - private String cxNum; - public String getCxNum() { - return cxNum; - } - - public void setCxNum(String cxNum) { - this.cxNum = cxNum; - } public Integer getIsSync() { return isSync; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java index 68d8405..1af32f7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java @@ -126,6 +126,14 @@ public class PreEugenicsBaseController extends BaseController { return iPreEugenicsService.listPage(param, getUserId(request)); } + + @ResponseBody + @TokenRequired + @RequestMapping(value = "/exportYqys", method = RequestMethod.GET) + public void exportYqys(@JsonAlias PreEugenicsBaseListRequest param, HttpServletRequest request, HttpServletResponse response) { + iPreEugenicsService.exportYqys(param, getUserId(request), response); + } + /** * 单个查询 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index d4162ed..a521596 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -249,7 +249,6 @@ public class PremaritalCheckupFacade { //返回婚检信息 public PremaritalCheckupResult getResult(PremaritalCheckup result) { PremaritalCheckupResult checkupResult = new PremaritalCheckupResult(); - checkupResult.setCxNum(result.getCxNum()); checkupResult.setId(result.getId()); checkupResult.setParentId(result.getId()); checkupResult.setPremaritalUpTime(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime())); @@ -650,7 +649,6 @@ public class PremaritalCheckupFacade { } else { checkup.setSexType(2); } - checkup.setCxNum(addRequest.getCxNum()); /* 配偶信息 */ if (addRequest.getDeliverStatus() != null) { @@ -1174,7 +1172,6 @@ public class PremaritalCheckupFacade { map.put("username", username); //map.put("certificateNum", FunvCommonUtil.getId(certificateNum)); map.put("certificateNum", certificateNum); - map.put("cxNum", checkup.getCxNum()); map.put("phone", phone); if (null != checkup.getJianChaJieGuo()) { if (2 == checkup.getJianChaJieGuo()) { @@ -1218,7 +1215,6 @@ public class PremaritalCheckupFacade { cnames.put("premaritalUpTime", "婚检时间"); cnames.put("username", "姓名"); cnames.put("certificateNum", "证件号"); - cnames.put("cxNum", "采血编号"); cnames.put("phone", "联系方式"); cnames.put("jianChaJieGuo", "结果"); cnames.put("yiXueYiJian", "医学意见"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java index c83d860..bd11089 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java @@ -426,16 +426,7 @@ public class PremaritalCheckupResult { private String fkjjState; private String numCode; - //采血编号 - private String cxNum; - public String getCxNum() { - return cxNum; - } - - public void setCxNum(String cxNum) { - this.cxNum = cxNum; - } public String getNumCode() { return numCode; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java index bfe29d0..6883976 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java @@ -32,4 +32,6 @@ public interface IPreEugenicsService extends IFormReportService results = baseListResponse.getData(); + if (CollectionUtils.isNotEmpty(results)) + { + List> datas = new ArrayList<>(); + for(PreEugenicsBaseListResult result : results) + { + Map dataWife = new HashMap(); + dataWife.put("name",result.getWifeName()); + dataWife.put("cardNo",result.getWifeCardNo()); + dataWife.put("sex","女"); + dataWife.put("phone",result.getWifePhone()); + dataWife.put("cxNum",result.getWifeCxNum()); + dataWife.put("age",result.getWifeAge()); + dataWife.put("currentAddressStr",result.getWifeCurrentAddressStr()); + + Map dataHusband = new HashMap(); + dataHusband.put("name",result.getHusbandName()); + dataHusband.put("cardNo",result.getHusbandCardNo()); + dataHusband.put("sex","男"); + dataHusband.put("phone",result.getHusbandPhone()); + dataHusband.put("cxNum",result.getHusbandCxNum()); + dataHusband.put("age",result.getHusbandAge()); + dataHusband.put("currentAddressStr",result.getHusbandCurrentAddressStr()); + datas.add(dataWife); + datas.add(dataHusband); + + } + + + Map cnames = new LinkedHashMap <>(); + cnames.put("xz", "乡镇"); + cnames.put("username", "姓名"); + cnames.put("certificateNum", "证件号"); + cnames.put("age", "年龄"); + cnames.put("addressStr", "居住地"); + cnames.put("phone", "联系电话"); + cnames.put("spouseName", "配偶姓名"); + cnames.put("spousePhone", "联系方式"); + ResponseUtil.responseExcel(cnames, datas, response); + } + } + + } + public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url"); } -- 1.8.3.1