模板修改

ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.tc.controller;
 
+import cn.hutool.core.util.CreditCodeUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -137,6 +138,9 @@ public class UnitController {
         }
         List<Unit> list1 = unitService.list();
         for (int i = 0; i < list.size(); i++) {
+            if(!CreditCodeUtil.isCreditCode(list.get(i).getUserName())){
+                throw new ServiceException("第" + i + "行,统一社会信用代码格式错误!");
+            }
             for (Unit unit : list1) {
                 if (unit.getNickName().equals(list.get(i).getNickName())
                         && unit.getUserName().equals(list.get(i).getUserName())

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

@@ -32,6 +32,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @TableId(value = "id",type = IdType.AUTO)
     private Long id;
 
+
     /**
     * 系统名称
     */
@@ -130,7 +131,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     /**
     * 系统类型（字典）
     */
-    @Excel(name = "*系统类型",dictType="zc_xtlx",comboReadDict = true,sort =8)
+    @Excel(name = "*系统类型",dictType="zc_xtlx",comboReadDict = true,sort =200)
     //@NotNull
     @ApiModelProperty("系统类型（字典）")
     private String xtlx;
@@ -169,13 +170,13 @@ public class AssetCurrent extends BaseClass implements Serializable {
     //@NotBlank
     @Size(max= 50,message="使用时间长度不能超过50")
     @ApiModelProperty("使用时间")
-    @Excel(name = "使用时间",sort = 116)
+//    @Excel(name = "使用时间",sort = 116)
     private String sysj;
     /**
     * 是否是互联网系统（字典）
     */
     //@NotNull
-    @Excel(name = "*是否是互联网系统",dictType = "is_no",comboReadDict = true,sort = 117 )
+//    @Excel(name = "*是否是互联网系统",dictType = "is_no",comboReadDict = true,sort = 117 )
     @ApiModelProperty("是否是互联网系统（字典）")
     private String hlwxt;
     /**
@@ -276,7 +277,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     /**
     * 资产物理接入地址
     */
-    @Excel(name = "*资产物理接入地址",sort = 118,width = 28)
+//    @Excel(name = "*资产物理接入地址",sort = 118,width = 28)
     //@NotBlank
     @Size(max= 50,message="资产物理接入地址长度不能超过50")
     @ApiModelProperty("资产物理接入地址")
@@ -680,7 +681,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     * 等保信息-定级时间
     */
     //@NotBlank
-    @Excel(name = "定级时间（是否是等保系统是则必填，样式如2024-11-02）",sort = 119,width = 40)
+//    @Excel(name = "定级时间（是否是等保系统是则必填，样式如2024-11-02）",sort = 119,width = 40)
     @Size(max= 50,message="等保信息-定级时间长度不能超过50")
     @ApiModelProperty("等保信息-定级时间")
     private String dbxxDjsj;

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

@@ -41,10 +41,7 @@ public class Unit implements Serializable {
     @ApiModelProperty("组织机构（部门id）")
     private Long deptId;
 
-    @ApiModelProperty("组织机构名称（部门名称）")
+
-    @Excel(name = "组织机构名称*",required = true)
-    @TableField(exist = false)
-    private String deptName;
 
     @ApiModelProperty("组织机构名称（加上父级deptId部门名称）,返回体")
     @TableField(exist = false)
@@ -68,22 +65,23 @@ public class Unit implements Serializable {
     private String ssqycounty;
 
     @ApiModelProperty("所属监管单位")
+    @Excel(name = "所属监管单位")
     private String ssjgdw;
 
     @ApiModelProperty("上级单位")
-    @Excel(name = "上级单位")
+    @Excel(name = "*上级单位")
     private String sjdw;
 
     @ApiModelProperty("单位详细地址")
-    @Excel(name = "单位详细地址")
+    @Excel(name = "*单位详细地址")
     private String dwxxdz;
 
     @ApiModelProperty("所属行业")
-    @Excel(name = "所属行业",dictType="sshy",comboReadDict = true)
+    @Excel(name = "*所属行业",dictType="sshy",comboReadDict = true)
     private String sshy;
 
     @ApiModelProperty("单位类型")
-    @Excel(name = "单位类型",dictType="dwlx",comboReadDict = true )
+    @Excel(name = "*单位类型",dictType="dwlx",comboReadDict = true )
     private String dwlx;
 
     @ApiModelProperty("单位标签（多个标签逗号隔开）")
@@ -96,7 +94,7 @@ public class Unit implements Serializable {
 
     @NotBlank
     @ApiModelProperty("统一社会信用代码/用户账号")
-    @Excel(name = "统一社会信用代码",required = true)
+    @Excel(name = "*统一社会信用代码",required = true)
     private String userName;
 
     @ApiModelProperty("是否关基单位")
@@ -104,14 +102,15 @@ public class Unit implements Serializable {
     private String gjdw;
 
     @ApiModelProperty("日常运营负责部门")
+    @Excel(name="*日常运营负责部门")
     private String rcyyfzbm;
 
     @ApiModelProperty("单位负责人姓名")
-    @Excel(name="单位负责人")
+    @Excel(name="*单位负责人")
     private String dwfzrxm;
 
     @ApiModelProperty("单位负责人联系方式")
-    @Excel(name="单位负责人联系方式")
+    @Excel(name="*单位负责人联系方式")
     private String dwfzrlxfs;
 
     @ApiModelProperty("单位负责人邮箱")
@@ -247,4 +246,9 @@ public class Unit implements Serializable {
 
     @ApiModelProperty("删除标志（0代表存在 2代表删除）")
     private String delFlag;
+
+    @ApiModelProperty("组织机构名称（部门名称）")
+    @Excel(name = "*组织机构",required = true)
+    @TableField(exist = false)
+    private String deptName;
 }