Merge remote-tracking branch 'origin/dev_drug' into dev_drug

# Conflicts:
#	src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml

src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java

@@ -43,7 +43,7 @@ public class ThirdAliDrugService extends ServiceImpl<ThirdAliDrugMapper, ThirdAl
             }
             log.info(file.getSize() + "文件长度");
             if (file.getSize() > 100 * 1024 * 1024) {
-                throw new JsonException("上传文件超过10M");
+                throw new JsonException("上传文件超过100M");
             }
             List<ThirdAliDrug> thirdAliDrugs = new ArrayList<>();
             String customerId = customerService.getCustomerId();

src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml

@@ -38,9 +38,7 @@
     </sql>
 
     <select id="selectDrugsByNameCodes" resultType="int">
-        SELECT count(1)
+        SELECT count(1) FROM third_ali_drug WHERE nameCode =  #{nameCode}
-        FROM third_ali_drug
-        WHERE nameCode = #{nameCode}
     </select>
 
     <!-- 自定义saveOrUpdateBatch方法 -->
@@ -57,9 +55,10 @@
     </insert>
 
 
-    <select id="filterList" parameterType="com.glxp.api.req.thrsys.ThirdAliDrugRequest"
+
-            resultType="com.glxp.api.entity.thrsys.ThirdAliDrug">
+      <select id="filterList" parameterType="com.glxp.api.req.thrsys.ThirdAliDrugRequest" resultType="com.glxp.api.entity.thrsys.ThirdAliDrug">
-        select id,
+    select
+        id,
         `type`,
         manufacturer,
         cpmctymc,
@@ -72,7 +71,8 @@
         packLevel,
         createTime,
         erpId,
-               updateTime
+        updateTime,
+    approvalNum
     from third_ali_drug
     <where>
       <if test="cpmctymc != '' and cpmctymc != null">
@@ -83,4 +83,5 @@
       </if>
     </where>
   </select>
+
 </mapper>