jiangjiazhi / regional-platform

Authored by wangbo about 6 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 1 additions and 37 deletions

1		-package com.lyms.platform.permission.dao.master;
2		-
3		-import com.lyms.platform.common.result.BaseObjectResponse;
4		-
5		-public interface OrgCouponMapper {
6		-
7		- BaseObjectResponse orgCouponInfo();
8		-
9		-}

1		-<?xml version="1.0" encoding="UTF-8" ?>
2		-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3		-<mapper namespace="com.lyms.platform.permission.dao.master.OrgCouponMapper">
4		-
5		- <resultMap type="com.lyms.platform.permission.model.CouponInfo" id="couponInfoMap">
6		- <result column="id" property="id"/>
7		- <result column="sequence_id" property="sequenceId"/>
8		- <result column="create_date" property="createDate"/>
9		- <result column="use_date" property="useDate"/>
10		- <result column="user_id" property="userId"/>
11		- <result column="create_user_Id" property="createUserId"/>
12		- <result column="coupon_template_id" property="couponTemplateId"/>
13		- <result column="create_hospital_id" property="createHospitalId"/>
14		- <result column="used_hospital_id" property="usedHospitalId"/>
15		- <result column="status" property="status"/>
16		- <result column="operator_use_id" property="operatorUseId"/>
17		- <result column="used_id" property="usedId"/>
18		- <result column="temp_hospital_id" property="tempHospitalId"/>
19		- <result column="temp_status" property="tempStatus"/>
20		- </resultMap>
21		-
22		-
23		-
24		-
25		-</mapper>

...	...	@@ -33,9 +33,7 @@
33	33	public BaseObjectResponse orgCouponInfo(HttpServletRequest request, Date startDate, Date endDate, Integer type,
34	34	String couponType, String doctor,
35	35	Integer page, Integer limit, String key) {
36		- System.out.println(getUserId(request));
37	36	String hospitalId = autoMatchFacade.getHospitalId(getUserId(request));
38		- System.out.println(hospitalId);
39	37	Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate,
40	38	"endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "type", type,
41	39	"couponType", couponType, "currentPage", page, "pageSize", limit, "doctor", doctor, "key", key);

...	...	@@ -366,7 +366,7 @@
366	366	map.put("week", week);
367	367	map.put("number", number);
368	368	map.put("doctorName", doctorName);
369		- map.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(phone));
	369	+ map.put("phone", phone);
370	370	}
371	371
372	372	private String findUserNameByPid(String pid) {