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

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

@@ -8,6 +8,7 @@ import com.ruoyi.tc.entity.request.UnitRequest;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.tc.service.ExamineInfoService;
 import com.ruoyi.tc.service.UnitOtherConcatService;
 import com.ruoyi.tc.service.UnitService;
 import io.swagger.annotations.Api;
@@ -40,6 +41,9 @@ public class UnitController {
     @Resource
     private UnitOtherConcatService unitOtherConcatService;
 
+    @Resource
+    private ExamineInfoService examineInfoService;
+
     /**
      * 获取单位列表
      */
@@ -103,7 +107,7 @@ public class UnitController {
     @Log(title = "新增单位", businessType = BusinessType.INSERT)
     @PostMapping
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult add(@Valid @RequestBody Unit unit) {
+    public AjaxResult add( @RequestBody Unit unit) {
         if (!unitService.lambdaQuery().eq(Unit::getUserName, unit.getUserName()).eq(Unit::getDelFlag, "0").list().isEmpty()) {
             throw new ServiceException(unit.getUserName() + "'已存在单位!");
         }
@@ -111,6 +115,8 @@ public class UnitController {
         unitService.save(unit);
         //新增其他联系人
         unitOtherConcatService.saveBatch(unit.getOtherConcat());
+        //新增检查信息
+        examineInfoService.saveBatch(unit.getJcxxList());
         //查询用户表是否存在该用户
         unitService.validUser(unit);
         return AjaxResult.success();
@@ -135,6 +141,12 @@ public class UnitController {
             });
         }
         unitOtherConcatService.saveOrUpdateBatch(x.getOtherConcat());
+        if(!x.getJcxxList().isEmpty()){
+            x.getJcxxList().forEach(y->{
+                y.setUnitId(x.getId());
+            });
+        }
+        examineInfoService.saveOrUpdateBatch(x.getJcxxList());
         return AjaxResult.success();
     }
 
@@ -150,6 +162,7 @@ public class UnitController {
         unitService.deleteUsers(userNames);
         unitService.deleteUnits(ids);
         unitOtherConcatService.deleteByUnitIds(ids);
+        examineInfoService.deleteByUnitIds(ids);
         return AjaxResult.success();
     }
 }

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

@@ -21,7 +21,7 @@ import java.io.Serializable;
 public class AssetBasicNetwork extends BaseClass implements Serializable {
 
     @TableId(type = IdType.AUTO,value = "id")
-    private Integer id;
+    private Long id;
 
     /**
     * 资源id
@@ -52,7 +52,7 @@ public class AssetBasicNetwork extends BaseClass implements Serializable {
     * 操作系统
     */
     @ApiModelProperty("操作系统")
-    private Integer czxt;
+    private String czxt;
     /**
     * 操作系统版本
     */

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

@@ -23,7 +23,7 @@ import java.io.Serializable;
 public class AssetBusinessForm extends BaseClass implements Serializable {
 
     @TableId(type = IdType.AUTO,value = "id")
-    private Integer id;
+    private Long id;
     /**
     * 资源id
     */
@@ -39,7 +39,7 @@ public class AssetBusinessForm extends BaseClass implements Serializable {
     * 云平台-是否租户级安全
     */
     @ApiModelProperty("云平台-是否租户级安全")
-    private Integer yptSfzh;
+    private String yptSfzh;
     /**
     * 云平台-云平台类型
     */
@@ -122,7 +122,7 @@ public class AssetBusinessForm extends BaseClass implements Serializable {
     * 大数据平台-是否数据审计
     */
     @ApiModelProperty("大数据平台-是否数据审计")
-    private Integer dsjSfsjsj;
+    private String dsjSfsjsj;
     /**
     * 一般物联网设备-系统集成商名称
     */
@@ -139,7 +139,7 @@ public class AssetBusinessForm extends BaseClass implements Serializable {
     * 一般物联网设备-服务对象
     */
     @ApiModelProperty("一般物联网设备-服务对象")
-    private Integer wlwsbFwdx;
+    private String wlwsbFwdx;
     /**
     * 一般物联网设备-终端数量
     */
@@ -150,7 +150,7 @@ public class AssetBusinessForm extends BaseClass implements Serializable {
     * 一般物联网设备-网络互联情况
     */
     @ApiModelProperty("一般物联网设备-网络互联情况")
-    private Integer wlwsbWlhlqk;
+    private String wlwsbWlhlqk;
     /**
     * 一般物联网设备-联系人
     */
@@ -161,7 +161,7 @@ public class AssetBusinessForm extends BaseClass implements Serializable {
     * 一般物联网设备-服务范围
     */
     @ApiModelProperty("一般物联网设备-服务范围")
-    private Integer wlwsbFwfw;
+    private String wlwsbFwfw;
     /**
     * 一般物联网设备-联系人电话
     */
@@ -262,7 +262,7 @@ public class AssetBusinessForm extends BaseClass implements Serializable {
     * 移动APP-APP是否有身份认证
     */
     @ApiModelProperty("移动APP-APP是否有身份认证")
-    private Integer appSfysfrz;
+    private String appSfysfrz;
     /**
     * 工业控制-系统集成商名称
     */
@@ -279,7 +279,7 @@ public class AssetBusinessForm extends BaseClass implements Serializable {
     * 工业控制-服务对象
     */
     @ApiModelProperty("工业控制-服务对象")
-    private Integer gykzFwdx;
+    private String gykzFwdx;
     /**
     * 工业控制-集成商国内外情况
     */
@@ -290,7 +290,7 @@ public class AssetBusinessForm extends BaseClass implements Serializable {
     * 工业控制-网络互联情况
     */
     @ApiModelProperty("工业控制-网络互联情况")
-    private Integer gykzWlhxqk;
+    private String gykzWlhxqk;
     /**
     * 工业控制-联系人
     */
@@ -301,7 +301,7 @@ public class AssetBusinessForm extends BaseClass implements Serializable {
     * 工业控制-服务范围
     */
     @ApiModelProperty("工业控制-服务范围")
-    private Integer gykzFwfw;
+    private String gykzFwfw;
     /**
     * 工业控制-联系人电话
     */
@@ -366,7 +366,7 @@ public class AssetBusinessForm extends BaseClass implements Serializable {
     * CDN信息-CDN是否使用
     */
     @ApiModelProperty("CDN信息-CDN是否使用")
-    private Integer cdnSfsy;
+    private String cdnSfsy;
     /**
     * CDN信息-CDN类型
     */

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

@@ -119,20 +119,20 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @Excel(name = "*系统类型",dictType="zc_xtlx",comboReadDict = true,sort =8)
     @NotNull
     @ApiModelProperty("系统类型（字典）")
-    private Integer xtlx;
+    private String xtlx;
     /**
     * 系统重要性（字典）
     */
     @Excel(name = "系统重要性",dictType = "zc_xtzyx",comboReadDict = true,sort = 9)
     @ApiModelProperty("系统重要性（字典）")
-    private Integer xtzyx;
+    private String xtzyx;
     /**
     * 是否关基系统（字典）
     */
     @NotNull
     @Excel(name = "*是否关基系统",dictType = "is_no",comboReadDict = true,sort = 10)
     @ApiModelProperty("是否关基系统（字典）")
-    private Integer gjxt;
+    private String gjxt;
     /**
     * 系统标签
     */
@@ -162,7 +162,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @NotNull
     @Excel(name = "*是否是互联网系统",dictType = "is_no",comboReadDict = true,sort = 117 )
     @ApiModelProperty("是否是互联网系统（字典）")
-    private Integer hlwxt;
+    private String hlwxt;
     /**
     * 系统编号
     */
@@ -176,13 +176,13 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @Excel(name = "*系统状态",dictType = "zc_xtzt",comboReadDict = true,sort = 36)
     @NotNull
     @ApiModelProperty("系统状态（字典）")
-    private Integer xtzt;
+    private String xtzt;
     /**
     * 在线状态（字典）
     */
     @Excel(name = "在线状态",dictType = "zc_zxzt",comboReadDict = true,sort = 37)
     @ApiModelProperty("在线状态（字典）")
-    private Integer zxzt;
+    private String zxzt;
 
     @Excel(name = "使用人",sort = 38)
     @TableField(exist = false)
@@ -193,24 +193,24 @@ public class AssetCurrent extends BaseClass implements Serializable {
     */
     @Excel(name = "机密性",dictType = "zc_c_i_a",comboReadDict = true,sort = 39)
     @ApiModelProperty("C-机密性（字典）")
-    private Integer cJmx;
+    private String cJmx;
     /**
     * I-完整性（字典）
     */
     @Excel(name = "完整性",dictType = "zc_c_i_a",comboReadDict = true,sort = 40)
     @ApiModelProperty("I-完整性（字典）")
-    private Integer iWzx;
+    private String iWzx;
     /**
     * A-可用性(字典）
     */
     @Excel(name = "可用性",dictType = "zc_c_i_a",comboReadDict = true,sort = 41)
     @ApiModelProperty("A-可用性(字典）")
-    private Integer aKyx;
+    private String aKyx;
     /**
     * 存活率（字典）
     */
     @ApiModelProperty("存活率（字典）")
-    private Integer chl;
+    private String chl;
     /**
     * 地理位置
     */
@@ -241,7 +241,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @Excel(name = "*用户规模",dictType ="zc_yhgm",comboReadDict = true,sort = 53)
     @NotNull
     @ApiModelProperty("用户规模")
-    private Integer yhgm;
+    private String yhgm;
     /**
     * 互联网接入运营商
     */
@@ -270,7 +270,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @NotNull
     @Excel(name = "*是否部署云平台",sort = 56,dictType = "is_no",comboReadDict = true)
     @ApiModelProperty("是否部署云平台（字典）")
-    private Integer bsypt;
+    private String bsypt;
     /**
     * 云服务商名称
     */
@@ -291,7 +291,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @Excel(name = "*系统部署方式",dictType = "zc_xtbsfs",comboReadDict = true,sort = 59)
     @NotNull
     @ApiModelProperty("系统部署方式")
-    private Integer xtbsfs;
+    private String xtbsfs;
     /**
     * 托管单位
     */
@@ -312,14 +312,14 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @Excel(name = "*是否对公众开放",dictType = "is_no",comboReadDict = true,sort = 62,width = 22)
     @NotNull
     @ApiModelProperty("是否对公众开放（字典）")
-    private Integer dgzkf;
+    private String dgzkf;
     /**
     * 互联网开放用途（字典）
     */
     @NotNull
     @Excel(name = "*互联网开放用途",dictType = "zc_hlwkfyt",comboReadDict = true,sort = 63,width = 22)
     @ApiModelProperty("互联网开放用途（字典）")
-    private Integer hlwkfyt;
+    private String hlwkfyt;
     /**
     * 系统防护情况-防篡改(多选字典）
     */
@@ -344,32 +344,32 @@ public class AssetCurrent extends BaseClass implements Serializable {
     * 相关业务-覆盖范围
     */
     @ApiModelProperty("相关业务-覆盖范围")
-    private Integer xgywFgfw;
+    private String xgywFgfw;
     /**
     * 相关业务-网络性质
     */
     @ApiModelProperty("相关业务-网络性质")
-    private Integer xgywWlxz;
+    private String xgywWlxz;
     /**
     * 相关业务-业务类型
     */
     @ApiModelProperty("相关业务-业务类型")
-    private Integer xgywYwlx;
+    private String xgywYwlx;
     /**
     * 相关业务-互联情况
     */
     @ApiModelProperty("相关业务-互联情况")
-    private Integer xgywHlqk;
+    private String xgywHlqk;
     /**
     * 相关业务-服务对象
     */
     @ApiModelProperty("相关业务-服务对象")
-    private Integer xgywFwdx;
+    private String xgywFwdx;
     /**
     * 相关业务-服务范围
     */
     @ApiModelProperty("相关业务-服务范围")
-    private Integer xgywFwfw;
+    private String xgywFwfw;
     /**
     * 相关业务-业务描述
     */
@@ -462,12 +462,12 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @Excel(name = "*ICP备案状态",dictType = "is_no",comboReadDict = true,sort = 24)
     @NotNull
     @ApiModelProperty("ICP备案信息-是否备案")
-    private Integer ipcSfba;
+    private String ipcSfba;
     /**
     * ICP备案信息-备案有效性
     */
     @ApiModelProperty("ICP备案信息-备案有效性")
-    private Integer ipcBayxx;
+    private String ipcBayxx;
     /**
     * ICP备案信息-备案网站名称
     */
@@ -506,7 +506,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     * ICP备案信息-备案单位性质
     */
     @ApiModelProperty("ICP备案信息-备案单位性质")
-    private Integer ipcBadwxz;
+    private String ipcBadwxz;
     /**
     * ICP备案信息-备案联系人
     */
@@ -531,7 +531,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @NotNull
     @Excel(name = "*公安机关备案状态",dictType = "is_no",comboReadDict = true,sort = 27,width = 24)
     @ApiModelProperty("公安机关备案信息-是否备案")
-    private Integer gajgSfba;
+    private String gajgSfba;
     /**
     * 公安机关备案信息-备案机关
     */
@@ -606,14 +606,14 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @Excel(name = "*是否国产化系统",dictType = "is_no",comboReadDict = true,sort = 35,width = 22)
     @NotNull
     @ApiModelProperty("系统架构-是否国产化系统")
-    private Integer xtjgGcxt;
+    private String xtjgGcxt;
     /**
     * 系统架构-是否有国产设备
     */
     @Excel(name = "*是否有国产设备",dictType = "is_no",comboReadDict = true,sort = 35,width = 22)
     @NotNull
     @ApiModelProperty("系统架构-是否有国产设备")
-    private Integer xtjgGcsb;
+    private String xtjgGcsb;
     /**
     * 系统架构-系统设备国产化率
     */
@@ -626,7 +626,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @Excel(name = "*是否是等保系统",dictType = "is_no",comboReadDict = true,sort = 42)
     @NotNull
     @ApiModelProperty("等保信息-是否等保系统")
-    private Integer dbxxSfdbxt;
+    private String dbxxSfdbxt;
     /**
     * 等保信息-等保测评备案号
     */
@@ -641,7 +641,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @NotNull
     @Excel(name = "*等保等级",dictType = "dbxx_dbdj",comboReadDict = true,sort = 44)
     @ApiModelProperty("等保信息-等保等级")
-    private Integer dbxxDbdj;
+    private String dbxxDbdj;
     /**
     * 等保信息-主管部门
     */
@@ -652,12 +652,12 @@ public class AssetCurrent extends BaseClass implements Serializable {
     * 等保信息-专家评审
     */
     @ApiModelProperty("等保信息-专家评审")
-    private Integer dbxxZjps;
+    private String dbxxZjps;
     /**
     * 等保信息-主管部门评审
     */
     @ApiModelProperty("等保信息-主管部门评审")
-    private Integer dbxxZgbmps;
+    private String dbxxZgbmps;
     /**
     * 等保信息-定级时间
     */
@@ -672,7 +672,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @ApiModelProperty("等保信息-是否有第三方测评")
     @NotNull
     @Excel(name = "是否有第三方测评（是否是等保系统选择是则必填）",width = 45,dictType = "is_no",comboReadDict = true,sort = 45)
-    private Integer dbxxSfydsfcp;
+    private String dbxxSfydsfcp;
 
     @ApiModelProperty("地理位置-省")
     @Excel(name = "地理位置-省",sort = 46)
@@ -754,12 +754,12 @@ public class AssetCurrent extends BaseClass implements Serializable {
     * 第三方测评-测评师证书等级
     */
     @ApiModelProperty("第三方测评-测评师证书等级")
-    private Integer sfCpszsdj;
+    private String sfCpszsdj;
     /**
     * 第三方测评-测评等级
     */
     @ApiModelProperty("第三方测评-测评等级")
-    private Integer sfCpdj;
+    private String sfCpdj;
     /**
     * 第三方测评-推荐日期
     */
@@ -828,7 +828,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     * Whois信息-有效性
     */
     @ApiModelProperty("Whois信息-有效性")
-    private Integer whoisYxx;
+    private String whoisYxx;
     /**
     * Whois信息-注册名
     */
@@ -933,28 +933,28 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @NotNull
     @Excel(name = "*共享属性",dictType = "sjzc_gxsx",comboReadDict = true,sort = 103)
     @ApiModelProperty("数据资产-共享属性")
-    private Integer sjzcGxsx;
+    private String sjzcGxsx;
     /**
     * 数据资产-开放属性
     */
     @Excel(name = "*开放属性",dictType = "sjzc_kfsx",comboReadDict = true,sort = 104)
     @NotNull
     @ApiModelProperty("数据资产-开放属性")
-    private Integer sjzcKfsx;
+    private String sjzcKfsx;
     /**
     * 数据资产-数据领域
     */
     @NotNull
     @Excel(name = "*数据领域",dictType = "sjzc_sjly",comboReadDict = true,sort = 105)
     @ApiModelProperty("数据资产-数据领域")
-    private Integer sjzcSjly;
+    private String sjzcSjly;
     /**
     * 数据资产-更新周期
     */
     @NotNull
     @Excel(name = "*更新周期",dictType = "sjzc_gxzq",comboReadDict = true,sort = 106)
     @ApiModelProperty("数据资产-更新周期")
-    private Integer sjzcGxzq;
+    private String sjzcGxzq;
     /**
     * 数据资产-数据类型
     */
@@ -982,28 +982,28 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @NotNull
     @Excel(name = "*是否为涉密数据",dictType = "is_no",comboReadDict = true,sort = 110)
     @ApiModelProperty("数据资产-是否为涉密数据")
-    private Integer sjzcSmsj;
+    private String sjzcSmsj;
     /**
     * 数据资产-数据是否出境
     */
     @NotNull
     @Excel(name = "*数据是否出境",dictType = "is_no",comboReadDict = true,sort = 111)
     @ApiModelProperty("数据资产-数据是否出境")
-    private Integer sjzcCj;
+    private String sjzcCj;
     /**
     * 数据资产-数据分级分类
     */
     @NotNull
     @Excel(name = "*数据分级分类",dictType = "sjzc_sjfjfl",comboReadDict = true,sort = 112)
     @ApiModelProperty("数据资产-数据分级分类")
-    private Integer sjzcSjfjfl;
+    private String sjzcSjfjfl;
     /**
     * 数据资产-数据重要程度
     */
     @NotNull
     @Excel(name = "数据重要程度",dictType = "zc_xtzyx",comboReadDict = true,sort = 113)
     @ApiModelProperty("数据资产-数据重要程度")
-    private Integer sjzcSjzycd;
+    private String sjzcSjzycd;
     /**
     * 数据资产-数据描述
     */
@@ -1025,4 +1025,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
 
     @ApiModelProperty("删除标志（0代表存在 2代表删除）")
     private String delFlag;
+
+    @ApiModelProperty("是否报废（默认0不报废 2代表报废）")
+    private String isbf;
 }

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

@@ -41,7 +41,7 @@ public class AssetExport extends AssetCurrent{
      * 注册地是否为太仓
      */
     @Excel(name = "*系统建设单位注册地址是否为太仓",width=26,sort = 70,dictType = "is_no",comboReadDict = true)
-    private Integer sfwtc;
+    private String sfwtc;
 
     /**
      * 设备类型
@@ -62,7 +62,7 @@ public class AssetExport extends AssetCurrent{
      * 操作系统
      */
     @Excel(name = "*服务器信息-操作系统",width=26,sort = 80,dictType = "fwq_czxt",comboReadDict = true)
-    private Integer czxt;
+    private String czxt;
     /**
      * 操作系统版本
      */

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

@@ -25,7 +25,7 @@ import java.util.Date;
 public class AssetSupplyChain extends BaseClass implements Serializable {
 
     @TableId(value = "id",type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
     * 资产id
     */
@@ -70,7 +70,7 @@ public class AssetSupplyChain extends BaseClass implements Serializable {
     * 注册地是否为太仓
     */
     @ApiModelProperty("注册地是否为太仓")
-    private Integer sfwtc;
+    private String sfwtc;
 
     @ApiModelProperty("删除标志（0代表存在 2代表删除）")
     private String delFlag;

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

@@ -0,0 +1,72 @@
+package com.ruoyi.tc.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.tc.baseClass.BaseClass;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 单位对应的检查信息(unit_examine_info)实体类
+ * @author du
+ * @since 2024/11/19 11:10
+ */
+@Data
+@ApiModel("单位对应的检查信息字段")
+@TableName(value = "unit_examine_info")
+public class ExamineInfo extends BaseClass {
+
+    @TableId(value = "jcid",type = IdType.AUTO)
+    private Long jcid;
+    /**
+     * 单位id
+     */
+    @ApiModelProperty("单位id")
+    private Long unitId;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty("时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date sj;
+
+
+    /**
+     * 系统域名
+     */
+    @ApiModelProperty("系统域名")
+    private String xtym;
+    /**
+     * 系统名称
+     */
+    @ApiModelProperty("系统名称")
+    private String xthc;
+    /**
+     * 等保级别
+     */
+    @ApiModelProperty("等保级别")
+    private String dbjb;
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty("单位名称")
+    private String dwmc;
+    /**
+     * 检查结果
+     */
+    @ApiModelProperty("检查结果")
+    private String jcjg;
+
+
+    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+}

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

@@ -61,11 +61,11 @@ public class Unit implements Serializable {
 
     @ApiModelProperty("所属行业")
     @Excel(name = "所属行业",dictType="sshy",comboReadDict = true)
-    private Integer sshy;
+    private String sshy;
 
     @ApiModelProperty("单位类型")
     @Excel(name = "单位类型",dictType="dwlx",comboReadDict = true )
-    private Integer dwlx;
+    private String dwlx;
 
     @ApiModelProperty("单位标签（多个标签逗号隔开）")
     @Excel(name = "单位标签（多个标签逗号隔开）")
@@ -73,7 +73,7 @@ public class Unit implements Serializable {
 
     @ApiModelProperty("单位角色")
     @Excel(name = "单位角色",dictType="dwjs",comboReadDict = true)
-    private Integer dwjs;
+    private String dwjs;
 
     @ApiModelProperty("统一社会信用代码/用户账号")
     @Excel(name = "统一社会信用代码",required = true)
@@ -81,7 +81,7 @@ public class Unit implements Serializable {
 
     @ApiModelProperty("是否关基单位")
     @Excel(name="是否关基单位",dictType="gjdw",comboReadDict = true)
-    private Integer gjdw;
+    private String gjdw;
 
     @ApiModelProperty("日常运营负责部门")
     private String rcyyfzbm;
@@ -150,13 +150,14 @@ public class Unit implements Serializable {
     @Excel(name="第一联系人职务职称")
     private String dylxrzwzc;
 
-    @ApiModelProperty("第一联系人职务职称")
+    @ApiModelProperty("单位其他联系人")
     @TableField(exist = false)
     private List<UnitOtherConcat> otherConcat;
 
 
-    @ApiModelProperty("检查信息")
-    private String jcxx;
+    @ApiModelProperty("检查信息列表")
+    @TableField(exist = false)
+    private List<ExamineInfo> jcxxList;
 
     @ApiModelProperty("官网")
     @Excel(name = "官网")
@@ -172,7 +173,7 @@ public class Unit implements Serializable {
 
     @ApiModelProperty("单位直属性质")
     @Excel(name = "单位直属性质", dictType="dwzsxz",comboReadDict = true)
-    private Integer dwzsxz;
+    private String dwzsxz;
 
     /**
      * 创建者

ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/ExamineInfoMapper.java

@@ -0,0 +1,23 @@
+package com.ruoyi.tc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.tc.entity.AssetBasicNetwork;
+import com.ruoyi.tc.entity.ExamineInfo;
+
+import java.util.List;
+
+/**
+ * 单位对应的检查信息(unit_examine_info)表数据库访问层
+ * @author makejava
+ * @since 2024-11-15 10:03:56
+ */
+public interface ExamineInfoMapper extends BaseMapper<ExamineInfo> {
+
+
+    /**
+     * 逻辑删除
+     */
+    void deleteByUnitIds(List<Long> idList);
+
+}
+

ruoyi-admin/src/main/java/com/ruoyi/tc/service/ExamineInfoService.java

@@ -0,0 +1,20 @@
+package com.ruoyi.tc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.tc.entity.AssetBasicNetwork;
+import com.ruoyi.tc.entity.ExamineInfo;
+
+import java.util.List;
+
+/**
+ * 单位对应的检查信息(unit_examine_info)表服务接口
+ *
+ * @author makejava
+ * @since 2024-11-15 16:05:26
+ */
+public interface ExamineInfoService extends IService<ExamineInfo> {
+    /**
+     * 逻辑删除
+     */
+    void deleteByUnitIds(List<Long> idList);
+}

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/ExamineInfoServiceImpl.java

@@ -0,0 +1,30 @@
+package com.ruoyi.tc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.tc.entity.AssetBasicNetwork;
+import com.ruoyi.tc.entity.ExamineInfo;
+import com.ruoyi.tc.mapper.AssetBasicNetWorkMapper;
+import com.ruoyi.tc.mapper.ExamineInfoMapper;
+import com.ruoyi.tc.service.AssetBasicNetworkService;
+import com.ruoyi.tc.service.ExamineInfoService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 单位对应的检查信息(unit_examine_info)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-11-15 16:05:26
+ */
+@Service("examineInfoServiceImpl")
+public class ExamineInfoServiceImpl extends ServiceImpl<ExamineInfoMapper, ExamineInfo> implements ExamineInfoService {
+
+    /**
+     * 逻辑删除
+     */
+    @Override
+    public void deleteByUnitIds(List<Long> idList) {
+        baseMapper.deleteByUnitIds(idList);
+    }
+}

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

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="page" resultType="com.ruoyi.tc.entity.AssetCurrent">
         select * from asset_current
         <where>
-            del_flag = '0'
+            del_flag = '0' and isbf = '0'
             <if test="req.xtmc!=null and req.xtmc!='' ">
                  and xtmc like concat('%',#{req.xtmc},'%')
             </if>

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.tc.mapper.ExamineInfoMapper">
+    <update id="deleteByUnitIds">
+        update asset_examine_info set del_flag = '2' where unit_id in
+        <foreach collection="idList" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>
+

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

@@ -37,7 +37,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dylxrlxfs" column="dylxrlxfs"/>
         <result property="dylxryx" column="dylxryx"/>
         <result property="dylxrzwzc" column="dylxrzwzc"/>
-        <result property="jcxx" column="jcxx"/>
         <result property="gw" column="gw"/>
         <result property="dtjd" column="dtjd"/>
         <result property="dtwd" column="dtwd"/>
@@ -64,6 +63,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="updateTime" column="update_time"/>
             <result property="remark" column="remark"/>
         </collection>
+        <collection  property="jcxxList"   javaType="java.util.List" ofType="com.ruoyi.tc.entity.ExamineInfo" >
+            <id     property="jcid"    column="jcid"     />
+            <result property="unitId"  column="unit_id"   />
+            <result property="sj"  column="sj"   />
+            <result property="xtym" column="xtym"   />
+            <result property="xthc"  column="xthc"   />
+            <result property="dbjb"  column="dbjb"   />
+            <result property="dwmc"  column="dwmc"   />
+            <result property="jcjg"  column="jcjg"   />
+            <result property="delFlag"  column="del_flag"   />
+            <result property="createBy" column="create_by"/>
+            <result property="createId" column="create_id"/>
+            <result property="createTime" column="create_time"/>
+            <result property="updateBy" column="update_by"/>
+            <result property="updateId" column="update_id"/>
+            <result property="updateTime" column="update_time"/>
+            <result property="remark" column="remark"/>
+        </collection>
     </resultMap>
 
     <select id="selectUnitList" parameterType="unit" resultMap="unitResult">
@@ -82,8 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     <select id="getById" parameterType="unit" resultMap="unitResult">
-        select a.*,c.* from unit_info a
+        select a.*,c.*,e.* from unit_info a
         left join unit_other_contact c on a.id = c.unit_id
+        left join unit_examine_info e on a.id = e.unit_id
         where id = #{id}
     </select>