Forráskód Böngészése

增加药店经营范围填写,修复未插入成功时更新识别

Guos 6 napja
szülő
commit
9e87313a7f

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

@@ -495,5 +495,10 @@ public class FsStoreScrm extends BaseEntity {
      **/
     private String medicalDevice3BusinessScope;
 
+    /**
+     * 药店经营范围
+     **/
+    private String drugLicenseBusinessScope;
+
 
 }

+ 5 - 0
fs-service/src/main/java/com/fs/hisStore/param/FsStoreScrmInfoParam.java

@@ -276,6 +276,11 @@ public class FsStoreScrmInfoParam extends BaseEntity
      **/
     private String medicalDevice3BusinessScope;
 
+    /**
+     * 药店经营范围
+     **/
+    private String drugLicenseBusinessScope;
+
 
 
 }

+ 3 - 1
fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreScrmServiceImpl.java

@@ -242,7 +242,9 @@ public class FsStoreScrmServiceImpl implements IFsStoreScrmService {
         fsStore.setQualificationUpdateTime(LocalDate.now());
         int updateRowNum = fsStoreMapper.updateFsStore(fsStore);
         //信息发布
-        applicationEventPublisher.publishEvent(fsStore);
+        if(updateRowNum > 0){
+            applicationEventPublisher.publishEvent(fsStore);
+        }
         return updateRowNum;
     }
 

+ 4 - 0
fs-service/src/main/java/com/fs/hisStore/vo/FsStoreDetailsScrmVo.java

@@ -294,5 +294,9 @@ public class FsStoreDetailsScrmVo extends BaseEntity
      **/
     private String medicalDevice3BusinessScope;
 
+    /**
+     * 药店经营范围
+     **/
+    private String drugLicenseBusinessScope;
 
 }

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

@@ -88,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="otherSpecialQualificationFileName" column="other_special_qualification_fileName" />
         <result property="medicalDevice2BusinessScope" column="medical_device2_business_scope" />
         <result property="medicalDevice3BusinessScope" column="medical_device3_business_scope" />
+        <result property="drugLicenseBusinessScope" column="drug_license_business_scope" />
     </resultMap>
 
     <sql id="selectFsStoreVo">
@@ -106,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                quality_assurance_agreement_code,settlement_agreement_code,is_medical_device1_expiry_permanent,
                is_drug_license_permanent,is_medical_device2_expiry_permanent,is_medical_device3_expiry_permanent,is_food_license_expiry_permanent,is_medical_license_expiry_permanent,
                title_Name_one,title_Name_two,title_Name_three,settlement_agreement_file_name,quality_assurance_agreement_fileName,other_special_qualification_fileName,
-               is_effective_permanent1,is_effective_permanent2,is_effective_permanent3,medical_device2_business_scope,medical_device3_business_scope
+               is_effective_permanent1,is_effective_permanent2,is_effective_permanent3,medical_device2_business_scope,medical_device3_business_scope,drug_license_business_scope
         from fs_store_scrm
     </sql>
 
@@ -228,6 +229,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="otherSpecialQualificationFileName !=null ">other_special_qualification_fileName , </if>
             <if test="medicalDevice2BusinessScope !=null ">medical_device2_business_scope,</if>
             <if test="medicalDevice3BusinessScope !=null ">medical_device3_business_scope,</if>
+            <if test="drugLicenseBusinessScope !=null ">drug_license_business_scope, </if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="cityIds != null">#{cityIds},</if>
@@ -324,6 +326,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="otherSpecialQualificationFileName !=null ">#{otherSpecialQualificationFileName} , </if>
             <if test="medicalDevice2BusinessScope !=null ">#{medicalDevice2BusinessScope},</if>
             <if test="medicalDevice3BusinessScope !=null ">#{medicalDevice3BusinessScope},</if>
+            <if test="drugLicenseBusinessScope !=null ">#{drugLicenseBusinessScope}, </if>
         </trim>
     </insert>
 
@@ -422,6 +425,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="otherSpecialQualificationFileName !=null ">other_special_qualification_fileName = #{otherSpecialQualificationFileName} , </if>
             <if test="medicalDevice2BusinessScope !=null ">medical_device2_business_scope = #{medicalDevice2BusinessScope} , </if>
             <if test="medicalDevice3BusinessScope !=null ">medical_device3_business_scope = #{medicalDevice3BusinessScope} , </if>
+            <if test="drugLicenseBusinessScope !=null ">drug_license_business_scope = #{drugLicenseBusinessScope} , </if>
         </trim>
         where store_id = #{storeId}
     </update>