From 260d26a607cc9bf62dcd4c0d99de7a94500e6b25 Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Thu, 31 Oct 2019 15:27:40 +0800
Subject: [PATCH] update

---
 .../mainOrm/master/FolviteReceiveMapper.xml        | 32 ++--------------------
 .../web/service/impl/FolviteServiceImpl.java       |  1 -
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
index af8df49..01a8757 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.lyms.platform.permission.dao.master.FolviteReceiveMapper">
 
-    <resultMap id="folviteReceiveResultMap" type="com.lyms.platform.pojo.FolviteRecordModel">
+    <resultMap id="folviteReceiveResultMap" type="com.lyms.platform.pojo.FolviteReceiveRecordModel">
         <result column="id" property="id"/>
         <result column="folvite_id" property="folviteId"/>
         <result column="receive_number" property="receiveNumber"/>
@@ -49,20 +49,7 @@ hospitalid
 
     <select id="queryFolviteReceiveList" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
             resultMap="folviteReceiveResultMap">
-        SELECT
-        id AS id,
-        folvite_id AS folviteId,
-        receive_number AS receiveNumber,
-        receive_week AS receiveWeek,
-        highrisk AS highrisk,
-        provide_unit AS provideUnit,
-        ISSUER AS ISSUER,
-        receive_date AS receiveDate,
-        creation_date AS creationDate,
-        modified AS modified,
-        isconceive as isconceive
-        FROM
-        lyms_folvite_provide
+        SELECT * FROM lyms_folvite_provide
         <include refid="whereSql"/>
         <include refid="orderAndLimit"/>
     </select>
@@ -133,20 +120,7 @@ hospitalid
 
     <select id="queryOneReceive" parameterType="java.lang.String"
             resultType="com.lyms.platform.pojo.FolviteReceiveRecordModel">
-SELECT
-	id AS id,
-	folvite_id AS folviteId,
-	receive_number AS receiveNumber,
-	receive_week AS receiveWeek,
-	highrisk AS highrisk,
-	provide_unit AS provideUnit,
-	ISSUER AS ISSUER,
-	receive_date AS receiveDate,
-	creation_date AS creationDate,
-	modified AS modified,
-	isconceive as  isconceive
-FROM
-	lyms_folvite_provide
+SELECT * FROM lyms_folvite_provide
 where id=#{id,jdbcType=VARCHAR}
 
     </select>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
index d03d6dd..1fd96c9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
@@ -95,7 +95,6 @@ public class FolviteServiceImpl implements FolviteService {
         FolviteRecordQuery recordQuery = new FolviteRecordQuery();
         recordQuery.setFolviteId(folviteId);
         List<Map<String, Object>> listMap = new ArrayList<>();
-
         List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
         if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
             for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
-- 
1.8.3.1