化学品导入修改，字段扩充

release/sql/db_sql_v2.4.sql

@@ -167,3 +167,18 @@ CREATE TABLE `xxp_user_auth` (
      `finger_key` varchar(50) DEFAULT NULL COMMENT '指纹位置',
      PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='信息牌人员权限表';
+
+
+/************************************************/
+/*     表： hxp_chemical       ****/
+/*     新增字段： is_control  ****/
+/*     修改字段： chemical_name、another_name、
+                 another_name_char、chemical_name_char   ****/
+/*     添加人：xxf                    ****/
+/*     添加时间：2023-9-27                 ****/
+/************************************************/
+ALTER TABLE hxp_chemical MODIFY COLUMN chemical_name VARCHAR(255)  COMMENT '化学品名称';
+ALTER TABLE hxp_chemical MODIFY COLUMN another_name VARCHAR(255)  COMMENT '别名';
+ALTER TABLE hxp_chemical MODIFY COLUMN another_name_char VARCHAR(255)  COMMENT '别名拼音首字母';
+ALTER TABLE hxp_chemical MODIFY COLUMN chemical_name_char VARCHAR(255)  COMMENT '化学品名字拼音首字母';
+ALTER TABLE hxp_chemical ADD is_control tinyint(1) DEFAULT 0 COMMENT '是否管控 0否 1是';

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpChemical.java

@@ -70,9 +70,9 @@ public class HxpChemical extends BaseEntity {
     @ApiModelProperty(value = "计量方式")
     private Integer measuringMethod;
     /**
-     * 单位（mg,g,kg,t）
+     * 单位（mg,g,KG,t）
      */
-    @Excel(name = "单位", readConverterExp = "m=g,g,kg,t")
+    @Excel(name = "单位", readConverterExp = "m=g,g,KG,t")
     @Length(message = "单位长度不能超过2")
     @ApiModelProperty(value = "单位")
     private String chemicalUnit;
@@ -145,6 +145,9 @@ public class HxpChemical extends BaseEntity {
     @ApiModelProperty(value = "临界量")
     private BigDecimal criticality;
 
+    @ApiModelProperty(value = "是否管控")
+    private int isControl;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -320,4 +323,12 @@ public class HxpChemical extends BaseEntity {
     public void setCriticality(BigDecimal criticality) {
         this.criticality = criticality;
     }
+
+    public int getIsControl() {
+        return isControl;
+    }
+
+    public void setIsControl(int isControl) {
+        this.isControl = isControl;
+    }
 }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpChemicalByExcel.java

@@ -65,12 +65,17 @@ public class HxpChemicalByExcel {
     @ApiModelProperty(value = "生产厂家")
     private String factory;
 
+    @Excel(name = "是否管控",sort = 11)
+    @ApiModelProperty(value = "是否管控")
+    private String isControl;
+
     /**
      * 备注，用于记录错误的原因
      */
     @Excel(name = "备注" ,type = Excel.Type.EXPORT)
     private StringBuffer failRemark = new StringBuffer();
 
+
     /**
      * 是否更新数据
      */
@@ -176,4 +181,12 @@ public class HxpChemicalByExcel {
     public String getMeasuringMethod() {        return measuringMethod;    }
 
     public void setMeasuringMethod(String measuringMethod) {        this.measuringMethod = measuringMethod;    }
+
+    public String getIsControl() {
+        return isControl;
+    }
+
+    public void setIsControl(String isControl) {
+        this.isControl = isControl;
+    }
 }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpChemicalServiceImpl.java

@@ -118,13 +118,13 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
             }
             chemical.getFailRemark().append("化学品名称不能为空、");
         }else{
-            if(chemical.getChemicalName().length()>30){
+            if(chemical.getChemicalName().length()>150){
                 if(checkBox){
                     chemical.getFailRemark().append("失败：");
                     failChemicalList.add(chemical);
                     checkBox = false;
                 }
-                chemical.getFailRemark().append("化学品名称最多三十个字符、");
+                chemical.getFailRemark().append("化学品名称最多一百五十个字符、");
             }
         }
         hxpChemical.setChemicalName(chemical.getChemicalName());
@@ -343,6 +343,10 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
         }
         hxpChemical.setFactory(chemical.getFactory());
 
+        //是否管控
+        if(StringUtils.isNotEmpty(chemical.getIsControl())){
+            hxpChemical.setIsControl(1);
+        }
 
         if(StringUtils.isNotEmpty(chemical.getFailRemark())){
             chemical.getFailRemark().deleteCharAt(chemical.getFailRemark().length()-1);

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpChemicalMapper.xml

@@ -29,6 +29,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
         <result property="criticality" column="criticality"/>
+        <result property="isControl" column="is_control"/>
     </resultMap>
 
     <sql id="selectHxpChemicalVo">
@@ -54,7 +55,8 @@
                update_by,
                update_time,
                remark,
-               criticality
+               criticality,
+               is_control
         from hxp_chemical
     </sql>
     <sql id="selectHxpChemicalListVo">
@@ -80,7 +82,8 @@
                t.update_by,
                t.update_time,
                t.remark,
-               t.criticality
+               t.criticality,
+               t.is_control
         from hxp_chemical as t
     </sql>
     <select id="selectHxpChemicalList" parameterType="com.zd.chemical.domain.vo.HxpChemicalSearch"
@@ -163,6 +166,7 @@
             <if test="anotherNamePinyin != null">another_name_pinyin,</if>
             <if test="anotherNameChar != null">another_name_char,</if>
             <if test="criticality != null">criticality,</if>
+            <if test="isControl != null">is_control,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="chemicalNum != null">#{chemicalNum},</if>
@@ -191,6 +195,7 @@
             <if test="anotherNamePinyin != null">#{anotherNamePinyin},</if>
             <if test="anotherNameChar != null">#{anotherNameChar},</if>
             <if test="criticality != null">#{criticality},</if>
+            <if test="isControl != null">#{isControl},</if>
         </trim>
     </insert>
 
@@ -224,7 +229,7 @@
             <if test="anotherNamePinyin != null">another_name_pinyin = #{anotherNamePinyin},</if>
             <if test="anotherNameChar != null">another_name_char = #{anotherNameChar},</if>
             <if test="criticality != null">criticality = #{criticality},</if>
-
+            <if test="isControl != null">is_control = #{isControl},</if>
         </trim>
         where id = #{id}
     </update>