医健宝改动

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreScrm.java

@@ -225,4 +225,9 @@ public class FsStoreScrm extends BaseEntity
 
     /** 其它特殊资质有效期结束 */
     private LocalDate otherSpecialQualificationEnd;
+
+    /**
+     * 用于兼容查询店铺id
+     */
+    private Long queryStoreId;
 }

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductScrmMapper.java

@@ -96,7 +96,7 @@ public interface FsStoreProductScrmMapper
             "and p.store_id = #{maps.storeId} " +
             "</if>"+
             "<if test = 'maps.storeIds != null '>" +
-            "and store_id in " +
+            "and p.store_id in " +
             "<foreach collection='maps.storeIds'  item='item' index='index'  open='(' separator=',' close=')'> #{item} </foreach>" +
             "</if>" +
             "<if test = 'maps.isAudit != null '> " +
@@ -199,7 +199,7 @@ public interface FsStoreProductScrmMapper
             "<if test = 'maps.cateId != null    '> " +
             "and p.cate_id =#{maps.cateId}  " +
             "</if>" +
-            "<if test = 'maps.storeId != null'> " +
+            "<if test = 'maps.storeId != null and maps.storeId != \"\"' > " +
             "and p.store_id = #{maps.storeId}" +
             "</if>" +
             "<if test = 'maps.defaultOrder != null and maps.defaultOrder==\"desc\"  '> " +

fs-service/src/main/resources/mapper/hisStore/FsStoreScrmMapper.xml

@@ -69,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="otherSpecialQualification"	column="other_special_qualification" />
         <result property="otherSpecialQualificationStart"	column="other_special_qualification_start" />
         <result property="otherSpecialQualificationEnd"	column="other_special_qualification_end" />
+        <result property="isBusinessLicensePermanent"	column="is_business_license_permanent" />
+
     </resultMap>
 
     <sql id="selectFsStoreVo">
@@ -82,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                medical_device3_expiry_end,food_license,food_license_expiry_start,food_license_expiry_end,medical_license,
                medical_license_expiry_start,medical_license_expiry_end,settlement_agreement,settlement_agreement_start,settlement_agreement_end,
                quality_assurance_agreement,quality_assurance_agreement_start,quality_assurance_agreement_end,other_special_qualification,
-               other_special_qualification_start,other_special_qualification_end
+               other_special_qualification_start,other_special_qualification_end,is_business_license_permanent
         from fs_store_scrm
     </sql>
 
@@ -95,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null "> and status = #{status}</if>
             <if test="isAudit != null "> and is_audit = #{isAudit}</if>
             <if test="account != null  and account != ''"> and account like concat('%', #{account}, '%')</if>
+            <if test="queryStoreId != null "> or store_id = #{queryStoreId}</if>
         </where>
         order by store_id desc
     </select>
@@ -160,6 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="medicalLicense !=null">medical_license , </if>
             <if test="medicalLicenseExpiryStart !=null ">medical_license_expiry_start , </if>
             <if test="medicalLicenseExpiryEnd !=null ">medical_license_expiry_end , </if>
+            <if test="isBusinessLicensePermanent !=null ">is_business_license_permanent, </if>
             <if test="settlementAgreement !=null ">settlement_agreement , </if>
             <if test="settlementAgreementStart !=null ">settlement_agreement_start , </if>
             <if test="settlementAgreementEnd !=null ">settlement_agreement_end , </if>