jiangjiazhi / regional-platform

Commit 75cfe7fb57b213f99c4b0b453655b738b72dcf15

Authored by liquanyu almost 4 years ago

Exists in master and in 6 other branches

update

Showing 7 changed files with 73 additions and 22 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java

...	...	@@ -380,6 +380,17 @@
380	380
381	381	private Integer isSync;
382	382
	383	+ /**
	384	+ * 妻子采血编号
	385	+ */
	386	+ private String wifeCxNum;
	387	+
	388	+ /**
	389	+ * 丈夫采血编号
	390	+ */
	391	+ private String husbandCxNum;
	392	+
	393	+
383	394
384	395	public static long getSerialVersionUID() {
385	396	return serialVersionUID;

...	...	@@ -460,16 +460,7 @@
460	460
461	461	//1 未同步 2已经同步
462	462	private Integer isSync;
463		- //采血编号
464		- private String cxNum;
465	463
466		- public String getCxNum() {
467		- return cxNum;
468		- }
469		-
470		- public void setCxNum(String cxNum) {
471		- this.cxNum = cxNum;
472		- }
473	464
474	465	public Integer getIsSync() {
475	466	return isSync;

...	...	@@ -126,6 +126,14 @@
126	126	return iPreEugenicsService.listPage(param, getUserId(request));
127	127	}
128	128
	129	+
	130	+ @ResponseBody
	131	+ @TokenRequired
	132	+ @RequestMapping(value = "/exportYqys", method = RequestMethod.GET)
	133	+ public void exportYqys(@JsonAlias PreEugenicsBaseListRequest param, HttpServletRequest request, HttpServletResponse response) {
	134	+ iPreEugenicsService.exportYqys(param, getUserId(request), response);
	135	+ }
	136	+
129	137	/**
130	138	* 单个查询
131	139	*

...	...	@@ -249,7 +249,6 @@
249	249	//返回婚检信息
250	250	public PremaritalCheckupResult getResult(PremaritalCheckup result) {
251	251	PremaritalCheckupResult checkupResult = new PremaritalCheckupResult();
252		- checkupResult.setCxNum(result.getCxNum());
253	252	checkupResult.setId(result.getId());
254	253	checkupResult.setParentId(result.getId());
255	254	checkupResult.setPremaritalUpTime(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
...	...	@@ -650,7 +649,6 @@
650	649	} else {
651	650	checkup.setSexType(2);
652	651	}
653		- checkup.setCxNum(addRequest.getCxNum());
654	652
655	653	/* 配偶信息 */
656	654	if (addRequest.getDeliverStatus() != null) {
...	...	@@ -1174,7 +1172,6 @@
1174	1172	map.put("username", username);
1175	1173	//map.put("certificateNum", FunvCommonUtil.getId(certificateNum));
1176	1174	map.put("certificateNum", certificateNum);
1177		- map.put("cxNum", checkup.getCxNum());
1178	1175	map.put("phone", phone);
1179	1176	if (null != checkup.getJianChaJieGuo()) {
1180	1177	if (2 == checkup.getJianChaJieGuo()) {
...	...	@@ -1218,7 +1215,6 @@
1218	1215	cnames.put("premaritalUpTime", "婚检时间");
1219	1216	cnames.put("username", "姓名");
1220	1217	cnames.put("certificateNum", "证件号");
1221		- cnames.put("cxNum", "采血编号");
1222	1218	cnames.put("phone", "联系方式");
1223	1219	cnames.put("jianChaJieGuo", "结果");
1224	1220	cnames.put("yiXueYiJian", "医学意见");

...	...	@@ -426,16 +426,7 @@
426	426	private String fkjjState;
427	427
428	428	private String numCode;
429		- //采血编号
430		- private String cxNum;
431	429
432		- public String getCxNum() {
433		- return cxNum;
434		- }
435		-
436		- public void setCxNum(String cxNum) {
437		- this.cxNum = cxNum;
438		- }
439	430	public String getNumCode() {
440	431	return numCode;
441	432	}

...	...	@@ -32,5 +32,7 @@
32	32	BaseResponse syncPreEugenicsBase(PreEugenicsBaseModel p);
33	33
34	34	BaseResponse doSyncPreEugenicsBase();
	35	+
	36	+ void exportYqys(PreEugenicsBaseListRequest param, Integer userId, HttpServletResponse response);
35	37	}

...	...	@@ -1061,6 +1061,58 @@
1061	1061	}
1062	1062	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
1063	1063	}
	1064	+
	1065	+ @Override
	1066	+ public void exportYqys(PreEugenicsBaseListRequest param, Integer userId, HttpServletResponse response) {
	1067	+ param.setPage(1);
	1068	+ param.setLimit(90000);
	1069	+ BaseListResponse baseListResponse = listPage(param, userId);
	1070	+ if (baseListResponse.getErrorcode() == ErrorCodeConstants.SUCCESS)
	1071	+ {
	1072	+ List<PreEugenicsBaseListResult> results = baseListResponse.getData();
	1073	+ if (CollectionUtils.isNotEmpty(results))
	1074	+ {
	1075	+ List<Map<String,Object>> datas = new ArrayList<>();
	1076	+ for(PreEugenicsBaseListResult result : results)
	1077	+ {
	1078	+ Map dataWife = new HashMap();
	1079	+ dataWife.put("name",result.getWifeName());
	1080	+ dataWife.put("cardNo",result.getWifeCardNo());
	1081	+ dataWife.put("sex","女");
	1082	+ dataWife.put("phone",result.getWifePhone());
	1083	+ dataWife.put("cxNum",result.getWifeCxNum());
	1084	+ dataWife.put("age",result.getWifeAge());
	1085	+ dataWife.put("currentAddressStr",result.getWifeCurrentAddressStr());
	1086	+
	1087	+ Map dataHusband = new HashMap();
	1088	+ dataHusband.put("name",result.getHusbandName());
	1089	+ dataHusband.put("cardNo",result.getHusbandCardNo());
	1090	+ dataHusband.put("sex","男");
	1091	+ dataHusband.put("phone",result.getHusbandPhone());
	1092	+ dataHusband.put("cxNum",result.getHusbandCxNum());
	1093	+ dataHusband.put("age",result.getHusbandAge());
	1094	+ dataHusband.put("currentAddressStr",result.getHusbandCurrentAddressStr());
	1095	+ datas.add(dataWife);
	1096	+ datas.add(dataHusband);
	1097	+
	1098	+ }
	1099	+
	1100	+
	1101	+ Map <String, String> cnames = new LinkedHashMap <>();
	1102	+ cnames.put("xz", "乡镇");
	1103	+ cnames.put("username", "姓名");
	1104	+ cnames.put("certificateNum", "证件号");
	1105	+ cnames.put("age", "年龄");
	1106	+ cnames.put("addressStr", "居住地");
	1107	+ cnames.put("phone", "联系电话");
	1108	+ cnames.put("spouseName", "配偶姓名");
	1109	+ cnames.put("spousePhone", "联系方式");
	1110	+ ResponseUtil.responseExcel(cnames, datas, response);
	1111	+ }
	1112	+ }
	1113	+
	1114	+ }
	1115	+
1064	1116	public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url");
1065	1117	}
1066	1118