Commit 260d26a607cc9bf62dcd4c0d99de7a94500e6b25
1 parent
98c23ac791
Exists in
master
and in
1 other branch
update
Showing 2 changed files with 3 additions and 30 deletions
platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
View file @
260d26a
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > |
| 3 | 3 | <mapper namespace="com.lyms.platform.permission.dao.master.FolviteReceiveMapper"> |
| 4 | 4 | |
| 5 | - <resultMap id="folviteReceiveResultMap" type="com.lyms.platform.pojo.FolviteRecordModel"> | |
| 5 | + <resultMap id="folviteReceiveResultMap" type="com.lyms.platform.pojo.FolviteReceiveRecordModel"> | |
| 6 | 6 | <result column="id" property="id"/> |
| 7 | 7 | <result column="folvite_id" property="folviteId"/> |
| 8 | 8 | <result column="receive_number" property="receiveNumber"/> |
| ... | ... | @@ -49,20 +49,7 @@ |
| 49 | 49 | |
| 50 | 50 | <select id="queryFolviteReceiveList" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" |
| 51 | 51 | resultMap="folviteReceiveResultMap"> |
| 52 | - SELECT | |
| 53 | - id AS id, | |
| 54 | - folvite_id AS folviteId, | |
| 55 | - receive_number AS receiveNumber, | |
| 56 | - receive_week AS receiveWeek, | |
| 57 | - highrisk AS highrisk, | |
| 58 | - provide_unit AS provideUnit, | |
| 59 | - ISSUER AS ISSUER, | |
| 60 | - receive_date AS receiveDate, | |
| 61 | - creation_date AS creationDate, | |
| 62 | - modified AS modified, | |
| 63 | - isconceive as isconceive | |
| 64 | - FROM | |
| 65 | - lyms_folvite_provide | |
| 52 | + SELECT * FROM lyms_folvite_provide | |
| 66 | 53 | <include refid="whereSql"/> |
| 67 | 54 | <include refid="orderAndLimit"/> |
| 68 | 55 | </select> |
| ... | ... | @@ -133,20 +120,7 @@ |
| 133 | 120 | |
| 134 | 121 | <select id="queryOneReceive" parameterType="java.lang.String" |
| 135 | 122 | resultType="com.lyms.platform.pojo.FolviteReceiveRecordModel"> |
| 136 | -SELECT | |
| 137 | - id AS id, | |
| 138 | - folvite_id AS folviteId, | |
| 139 | - receive_number AS receiveNumber, | |
| 140 | - receive_week AS receiveWeek, | |
| 141 | - highrisk AS highrisk, | |
| 142 | - provide_unit AS provideUnit, | |
| 143 | - ISSUER AS ISSUER, | |
| 144 | - receive_date AS receiveDate, | |
| 145 | - creation_date AS creationDate, | |
| 146 | - modified AS modified, | |
| 147 | - isconceive as isconceive | |
| 148 | -FROM | |
| 149 | - lyms_folvite_provide | |
| 123 | +SELECT * FROM lyms_folvite_provide | |
| 150 | 124 | where id=#{id,jdbcType=VARCHAR} |
| 151 | 125 | |
| 152 | 126 | </select> |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
View file @
260d26a
| ... | ... | @@ -95,7 +95,6 @@ |
| 95 | 95 | FolviteRecordQuery recordQuery = new FolviteRecordQuery(); |
| 96 | 96 | recordQuery.setFolviteId(folviteId); |
| 97 | 97 | List<Map<String, Object>> listMap = new ArrayList<>(); |
| 98 | - | |
| 99 | 98 | List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery); |
| 100 | 99 | if (CollectionUtils.isNotEmpty(folviteRecordModels)) { |
| 101 | 100 | for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) { |