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,49 +38,50 @@
     </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方法 -->
     <insert id="saveOrUpdateBatch" parameterType="com.glxp.api.entity.thrsys.ThirdAliDrug">
         replace INTO third_ali_drug (`type`, manufacturer, cpmctymc, form, formSpec, bzgg, spmc, nameCode, packRatio,
-                                     packLevel, createTime, updateTime, erpId, approvalNum)
+        packLevel, createTime, updateTime, erpId, approvalNum)
         VALUES
         <foreach collection="list" item="item" separator="," index="index">
             (#{item.type}, #{item.manufacturer}, #{item.cpmctymc}, #{item.form}, #{item.formSpec}, #{item.bzgg},
-             #{item.spmc}, #{item.nameCode},
+            #{item.spmc}, #{item.nameCode},
-             #{item.packRatio}, #{item.packLevel}, #{item.createTime}, #{item.updateTime}, #{item.erpId},
+            #{item.packRatio}, #{item.packLevel}, #{item.createTime}, #{item.updateTime}, #{item.erpId},
-             #{item.approvalNum})
+            #{item.approvalNum})
         </foreach>
     </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
-               `type`,
+        id,
-               manufacturer,
+        `type`,
-               cpmctymc,
+        manufacturer,
-               form,
+        cpmctymc,
-               formSpec,
+        form,
-               bzgg,
+        formSpec,
-               spmc,
+        bzgg,
-               nameCode,
+        spmc,
-               packRatio,
+        nameCode,
-               packLevel,
+        packRatio,
-               createTime,
+        packLevel,
-               erpId,
+        createTime,
-               updateTime
+        erpId,
-        from third_ali_drug
+        updateTime,
-        <where>
+    approvalNum
-            <if test="cpmctymc != '' and cpmctymc != null">
+    from third_ali_drug
-                AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+    <where>
-            </if>
+      <if test="cpmctymc != '' and cpmctymc != null">
-            <if test="nameCode != '' and nameCode != null">
+        AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
-                AND nameCode LIKE concat('%', #{nameCode}, '%')
+      </if>
-            </if>
+      <if test="nameCode != '' and nameCode != null">
-        </where>
+        AND nameCode LIKE concat('%', #{nameCode}, '%')
-    </select>
+      </if>
+    </where>
+  </select>
+
 </mapper>