xzType新增type类型字段

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

@@ -235,6 +235,7 @@ public class AssetCurrentController extends BaseController {
             AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo();
             BeanUtil.copyProperties(assetCurrent, assetCurrentCpPo);
             assetCurrentCpPo.setTaskId(i);
+            assetCurrentCpPo.setXzType(1);
             assetCurrentCpService.save(assetCurrentCpPo);
             //新增新监管业务形态
             //根据资产id查询新监管业务形态主表id

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

@@ -274,6 +274,8 @@ public class AssetOfficialAccountController {
     @PostMapping
     @Log(title = "新增公众号数据", businessType = BusinessType.INSERT)
     public AjaxResult add(@RequestBody AssetOfficialAccount assetOfficialAccount) {
+
+
         return success(assetOfficialAccountService.add(assetOfficialAccount));
     }
 

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

@@ -85,7 +85,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @ApiModelProperty("访问网址-协议类型")
 //    @TableField(exist = false)
     private String fwwzXylx;
-    /**
+    /**  0
      * 访问网址
      */
     @Excel(name = "访问网址", sort = 14)

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

@@ -164,4 +164,10 @@ public class AssetAppCpPo extends BaseClass implements Serializable {
 
     @ApiModelProperty("单位自己编辑的 不通过原因")
     private String auditYy;
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("类型0:管理端，1：单位端")
+    private Integer xzType=0;
 }

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

@@ -185,4 +185,10 @@ public class AssetAppJyPo extends BaseClass implements Serializable {
 
     @ApiModelProperty("单位自己编辑的 不通过原因")
     private String auditYy;
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("类型0:管理端，1：单位端")
+    private Integer xzType=0;
 }

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

@@ -1052,7 +1052,7 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
     /**
      * 审核
      */
-    @ApiModelProperty("类型1:管理端，2：单位端")
-    private Integer type;
+    @ApiModelProperty("类型0:管理端，1：单位端")
+    private Integer xzType=0;
 
 }

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

@@ -1080,7 +1080,7 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
     /**
      * 审核
      */
-    @ApiModelProperty("类型1:管理端，2：单位端")
-    private Integer type;
+    @ApiModelProperty("类型0:管理端，1：单位端")
+    private Integer xzType=0;
 
 }

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

@@ -169,4 +169,10 @@ public class AssetEmailCpPo extends BaseClass implements Serializable {
 
     @ApiModelProperty("单位自己编辑的 不通过原因")
     private String auditYy;
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("类型0:管理端，1：单位端")
+    private Integer xzType=0;
 }

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

@@ -182,4 +182,11 @@ public class AssetEmailJyPo extends BaseClass implements Serializable {
 
     @ApiModelProperty("单位自己编辑的 不通过原因")
     private String auditYy;
+
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("类型0:管理端，1：单位端")
+    private Integer xzType=0;
 }

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

@@ -222,4 +222,11 @@ public class AssetMiniProgramsCpPo extends BaseClass implements Serializable {
 
     @ApiModelProperty("单位自己编辑的 不通过原因")
     private String auditYy;
+
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("类型0:管理端，1：单位端")
+    private Integer xzType=0;
 }

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

@@ -239,4 +239,11 @@ public class AssetMiniProgramsJyPo extends BaseClass implements Serializable {
 
     @ApiModelProperty("单位自己编辑的 不通过原因")
     private String auditYy;
+
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("类型0:管理端，1：单位端")
+    private Integer xzType=0;
 }

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

@@ -216,4 +216,10 @@ public class AssetOfficialAccountCpPo extends BaseClass implements Serializable
 
     @ApiModelProperty("单位自己编辑的 不通过原因")
     private String auditYy;
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("类型0:管理端，1：单位端")
+    private Integer xzType=0;
 }

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

@@ -244,4 +244,11 @@ public class AssetOfficialAccountJyPo extends BaseClass implements Serializable
 
     @ApiModelProperty("单位自己编辑的 不通过原因")
     private String auditYy;
+
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("类型0:管理端，1：单位端")
+    private Integer xzType=0;
 }

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

@@ -111,6 +111,7 @@ public class AssetAppServiceImpl extends ServiceImpl<AssetAppMapper, AssetApp> i
         Integer i = unitService.selectTaskId(assetApp.getSsdw(), "4");
         if (i != null) {
             a.setTaskId(i);
+            a.setXzType(1);
             a.setAssetId(assetApp.getId());
             assetAppCpService.save(a);
         }

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

@@ -112,6 +112,7 @@ public class AssetEmailServiceImpl extends ServiceImpl<AssetEmailMapper, AssetEm
         Integer i = unitService.selectTaskId(assetEmail.getSsdw(), "3");
         if (i != null) {
             a.setTaskId(i);
+            a.setXzType(1);
             a.setAssetId(assetEmail.getId());
             assetEmailCpService.save(a);
         }

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

@@ -101,6 +101,7 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl<AssetMiniProgramsM
         Integer i = unitService.selectTaskId(assetMiniPrograms.getSsdw(), "1");
         if (i != null) {
             assetMiniProgramsCpPo.setTaskId(i);
+            assetMiniProgramsCpPo.setXzType(1);
             assetMiniProgramsCpPo.setAssetId(assetMiniPrograms.getId());
             assetMiniProgramsCpService.save(assetMiniProgramsCpPo);
         }

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

@@ -134,6 +134,7 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl<AssetOfficialAc
         if (i != null) {
             a.setTaskId(i);
             a.setAssetId(assetOfficialAccount.getId());
+            a.setXzType(1);
             assetOfficialAccountCpService.save(a);
         }
         return true;

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

@@ -4,7 +4,7 @@
     <select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetAppJyPo">
         select a.* from asset_app_cp a
         <where>
-            a.task_id is null
+            a.task_id is null  or xz_type=1
             <if test="req.name!=null and req.name!='' ">
                 and a.app_name like concat('%',#{req.name},'%')
             </if>

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

@@ -4,7 +4,7 @@
     <select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetCurrentJyPo">
         select a.* from asset_current_cp a
         <where>
-            a.task_id is null
+            a.task_id is null or xz_type=1
             <if test="req.name!=null and req.name!='' ">
                 and a.xtmc like concat('%',#{req.name},'%')
             </if>

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

@@ -4,7 +4,7 @@
     <select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetEmailJyPo">
         select a.* from asset_email_cp a
         <where>
-            a.task_id is null
+            a.task_id is null or xz_type=1
             <if test="req.name!=null and req.name!='' ">
                 and a.dzyxhz like concat('%',#{req.name},'%')
             </if>

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

@@ -4,7 +4,7 @@
     <select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo">
         select a.* from asset_mini_programs_cp a
         <where>
-            a.task_id is null
+            a.task_id is null or xz_type=1
             <if test="req.name!=null and req.name!='' ">
                 and a.xcxmc like concat('%',#{req.name},'%')
             </if>

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

@@ -4,7 +4,7 @@
     <select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo">
         select a.* from asset_official_account_cp a
         <where>
-            a.task_id is null
+            a.task_id is null or xz_type=1
             <if test="req.name!=null and req.name!='' ">
                 and a.gzhmc like concat('%',#{req.name},'%')
             </if>