Merge branch 'duhanyu' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into dongdingding

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java

@@ -408,6 +408,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     */
     //@NotNull
     @Size(max= 500,message="相关业务-业务描述长度不能超过255")
+    @Excel(name = "*业务描述",sort = 122)
     @ApiModelProperty("相关业务-业务描述")
     private String xgywYwms;
 
@@ -988,9 +989,8 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @ApiModelProperty("数据资产-数据量")
     private String sjzcSjl;
 
-    @Excel(name = "*数据量单位",sort = 116)
+    @Excel(name = "*数据量单位",sort = 116,readConverterExp = "1=Gb,2=条")
     @ApiModelProperty("数据资产-数据量单位")
-    @TableField(exist = false)
     private String sjzcSjldw;
     /**
     * 数据资产-是否为涉密数据
@@ -1029,7 +1029,6 @@ public class AssetCurrent extends BaseClass implements Serializable {
     private String sjzcSjms;
 
     @ApiModelProperty("*业务描述")
-    @Excel(name = "*业务描述",sort = 122)
     @TableField(exist = false)
     private String ywms;
     /**

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.tc.baseClass.BaseClass;
 import com.ruoyi.tc.entity.request.Acomma;
 import io.swagger.annotations.ApiModel;
@@ -944,7 +945,6 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
 
 
     @ApiModelProperty("数据资产-数据量单位")
-    @TableField(exist = false)
     private String sjzcSjldw;
     /**
      * 数据资产-是否为涉密数据

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java

@@ -981,9 +981,8 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
     @ApiModelProperty("数据资产-数据量")
     private String sjzcSjl;
 
-    @Excel(name = "*数据量单位", sort = 109)
+    @Excel(name = "*数据量单位",sort = 116,readConverterExp = "1=Gb,2=条")
     @ApiModelProperty("数据资产-数据量单位")
-    @TableField(exist = false)
     private String sjzcSjldw;
     /**
      * 数据资产-是否为涉密数据

ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml

@@ -296,6 +296,7 @@
         <result property="sjzcKfsx" column="sjzc_kfsx"/>
         <result property="sjzcSjly" column="sjzc_sjly"/>
         <result property="sjzcGxzq" column="sjzc_gxzq"/>
+        <result property="sjzcSjldw" column="sjzc_sjldw"/>
         <result property="sjzcSjlx" column="sjzc_sjlx"/>
         <result property="sjzcSjl" column="sjzc_sjl"/>
         <result property="sjzcSmsj" column="sjzc_smsj"/>

ruoyi-admin/src/main/resources/mapper/UnitMapper.xml

@@ -64,7 +64,7 @@
 
         <collection property="otherConcat" javaType="java.util.List" ofType="com.ruoyi.tc.entity.UnitOtherConcat">
             <id property="concatId" column="concat_id"/>
-            <result property="qtlxrxm" column="qtlxrlxfs"/>
+            <result property="qtlxrxm" column="qtlxrxm"/>
             <result property="qtlxrlxfs" column="qtlxrlxfs"/>
             <result property="qtlxryx" column="qtlxryx"/>
             <result property="qtlxrzwzc" column="qtlxrzwzc"/>