jiangjiazhi / regional-platform | GitLab

Commit feac35153a6a9644f28660b2c80edff236e8fa8c

Authored by shiyang almost 3 years ago

1 parent 2b8c4ea6dc

Exists in master and in 6 other branches

C201增加-建档地址的区划代码

Showing 3 changed files with 13 additions and 0 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java

...	...	@@ -51,6 +51,8 @@
51	51
52	52	String findCityId(String hospitalId);
53	53
	54	+ String findAreaId(String hospitalId);
	55	+
54	56	/**
55	57	* 查询报表详情（发放人数、发放券数、使用人数、使用券数）
56	58	* @param param

...	...	@@ -217,6 +217,10 @@
217	217	select city_id from organization where id = #{hospitalId}
218	218	</select>
219	219
	220	+ <select id="findAreaId" parameterType="string" resultType="string">
	221	+ select area_id from organization where id = #{hospitalId}
	222	+ </select>
	223	+
220	224	<select id="queryCouponItemsByType" parameterType="java.util.Map" resultType="java.util.Map">
221	225	SELECT t.name,t.title,t.coupon_order from hospital_coupon_template_group h
222	226	left join coupon_type ct on h.coupon_template_group_id=ct.template_group_id

...	...	@@ -1004,6 +1004,13 @@
1004	1004	//删除时间
1005	1005	map.put("deleted_time", null);
1006	1006
	1007	+ //建档地址的区划代码
	1008	+ String jddqhdm="";
	1009	+ String cityId = couponMapper.findCityId(patients.getHospitalId());
	1010	+ if(StringUtils.isNotEmpty(cityId)){
	1011	+ jddqhdm=CommonsHelper.getName1(cityId, basicConfigService);
	1012	+ }
	1013	+ map.put("jddqhdm", organizationService.getAreaCode(jddqhdm));
1007	1014	data.add(map);
1008	1015	} catch (Exception e) {
1009	1016	e.printStackTrace();