单位自编辑资产

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

@@ -1,6 +1,8 @@
 package com.ruoyi.tc.controller;
 
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -9,17 +11,27 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.tc.entity.AssetApp;
+import com.ruoyi.tc.entity.*;
+import com.ruoyi.tc.entity.po.*;
+import com.ruoyi.tc.entity.request.Acomma;
 import com.ruoyi.tc.entity.request.AssetAppPageRequest;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
+import com.ruoyi.tc.entity.request.AssetAuditRequest;
+import com.ruoyi.tc.service.AssetAppCpService;
+import com.ruoyi.tc.service.AssetAppJyService;
 import com.ruoyi.tc.service.AssetAppService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import static com.ruoyi.common.core.domain.AjaxResult.success;
@@ -40,6 +52,9 @@ public class AssetAppController extends BaseController {
     @Resource
     private AssetAppService assetAppService;
 
+    @Resource
+    private AssetAppJyService assetAppJyService;
+
     /**
      * 分页查询
      *
@@ -61,6 +76,87 @@ public class AssetAppController extends BaseController {
         }
         return success(assetAppService.page(page, req));
     }
+    //=================================================
+    /**
+     * 单位自编辑进行校验
+     */
+    @ApiOperation(value = "单位自编辑进行校验")
+    @PreAuthorize("@ss.hasAnyRoles('unit')")
+    @PostMapping("/unitEdit")
+    public AjaxResult unitEdit(@RequestBody @Valid AssetAppJyPo assetAppJyPo) {
+        AssetAppJyPo one = assetAppJyService.lambdaQuery().eq(AssetAppJyPo::getAppName,assetAppJyPo.getAppName())
+                .eq(AssetAppJyPo::getSsdw,assetAppJyPo.getSsdw()).isNull(AssetAppJyPo::getTaskId).one();
+        assetAppJyPo.setAuditState("1");
+        assetAppJyPo.setAuditYy(null);
+        if (one != null) {
+            assetAppJyPo.setAppId(one.getAppId());
+            assetAppJyPo.setAssetId(one.getAssetId());
+            assetAppJyService.updateById(assetAppJyPo);
+        } else {
+            assetAppJyPo.setAssetId(assetAppService.lambdaQuery().eq(AssetApp::getAppName,assetAppJyPo.getAppName())
+                    .eq(AssetApp::getSsdw,assetAppJyPo.getSsdw()).one().getId());
+            assetAppJyService.save(assetAppJyPo);
+        }
+        return success();
+    }
+
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetAppJyPo.class)
+    @GetMapping("/getAuditList")
+    public AjaxResult getAuditList(AssetAuditPageRequest as) {
+        Page<AssetAppJyPo> page = new Page<>();
+        page.setSize(as.getSize());
+        page.setCurrent(as.getCurrent());
+        try {
+            if (!SecurityUtils.getLoginUser().getUser().isAdmin() && !SecurityUtils.hasRole("common")) {
+                as.setDwmc(SecurityUtils.getLoginUser().getUser().getNickName());
+            }
+        } catch (Exception e) {
+            throw new ServiceException("获取用户信息异常");
+        }
+        return success(assetAppJyService.getAuditList(page, as));
+    }
+
+    /**
+     * 查看中间数据详情
+     */
+    @ApiOperation(value = "单位端查看中间数据详情", response = AssetAppJyPo.class)
+    @GetMapping("/lookInfo/{id}")
+    public AjaxResult lookInfo(@PathVariable Long id) {
+        return success(assetAppJyService.getById(id));
+    }
+
+    /**
+     * 管理端审核
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @PreAuthorize("@ss.hasAnyRoles('admin,common')")
+    @ApiOperation(value = "管理端审核")
+    @PostMapping("/audit")
+    public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
+        AssetAppJyPo ass = new AssetAppJyPo();
+        BeanUtil.copyProperties(as, ass);
+        ass.setAppId(as.getCurrentId());
+        assetAppJyService.updateById(ass);
+        //通过数据同步
+        if ("2".equals(as.getAuditState())) {
+            AssetAppJyPo byId = assetAppJyService.getById(as.getCurrentId());
+            AssetApp aa = new AssetApp();
+            BeanUtil.copyProperties(byId, aa);
+            aa.setId(byId.getAssetId());
+            //修改主表
+            assetAppService.updateById(aa);
+        }
+        return success();
+    }
+    //=================================================
 
     /**
      * 通过主键查询单条app数据

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

@@ -11,6 +11,9 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.tc.entity.*;
 import com.ruoyi.tc.entity.po.*;
+import com.ruoyi.tc.entity.request.Acomma;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
+import com.ruoyi.tc.entity.request.AssetAuditRequest;
 import com.ruoyi.tc.entity.request.AssetCurrentPageRequest;
 import com.ruoyi.tc.service.*;
 import io.swagger.annotations.Api;
@@ -25,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -77,6 +81,23 @@ public class AssetCurrentController extends BaseController {
     @Resource
     private UnitService unitService;
 
+    @Resource
+    private AssetCurrentJyService assetCurrentJyService;
+
+
+    @Resource
+    private AssetBusinessFormJyService assetBusinessFormJyService;
+
+    @Resource
+    private AssetSupplyChainJyService assetSupplyChainJyService ;
+
+    @Resource
+    private UnitOtherConcatJyservice unitOtherConcatJyservice;
+
+    @Resource
+    private AssetBasicNetworkJyService assetBasicNetworkJyService;
+
+
     /**
      * 分页查询所有数据
      *
@@ -169,7 +190,7 @@ public class AssetCurrentController extends BaseController {
         //获取新增资产id
         Long id = assetCurrent.getId();
         Integer i = unitService.selectTaskId(assetCurrent.getDwmc(), "0");
-
+        if(i!=null){
             //新增资产复制主表
             AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo();
             BeanUtil.copyProperties(assetCurrent, assetCurrentCpPo);
@@ -206,10 +227,210 @@ public class AssetCurrentController extends BaseController {
                 //新增其他联系人
                 unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat());
             }
+        }
+        return success();
+    }
+    //=================================================
+    /**
+     * 单位自编辑进行校验
+     */
+    @ApiOperation(value = "单位自编辑进行校验")
+    @PreAuthorize("@ss.hasAnyRoles('unit')")
+    @PostMapping("/unitEdit")
+    public AjaxResult unitEdit(@RequestBody @Valid AssetCurrentJyPo assetCurrentJyPo) {
+        AssetCurrentJyPo one = assetCurrentJyService.lambdaQuery().eq(AssetCurrentJyPo::getXtmc, assetCurrentJyPo.getXtmc())
+                .eq(AssetCurrentJyPo::getDwmc, assetCurrentJyPo.getDwmc()).isNull(AssetCurrentJyPo::getTaskId).one();
+        assetCurrentJyPo.setAuditState("1");
+        assetCurrentJyPo.setAuditYy(null);
+        if (one != null) {
+            assetCurrentJyPo.setCurrentId(one.getCurrentId());
+            assetCurrentJyService.updateById(assetCurrentJyPo);
+
+            QueryWrapper<AssetSupplyChainJyPo> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.eq("asset_id", assetCurrentJyPo.getId());
+            assetSupplyChainJyService.remove(queryWrapper2);
+            QueryWrapper<AssetBasicNetworkJyPo> queryWrapper3 = new QueryWrapper<>();
+            queryWrapper3.eq("asset_id", assetCurrentJyPo.getId());
+            assetBasicNetworkJyService.remove(queryWrapper3);
+            QueryWrapper<AssetBusinessFormJyPo> queryWrapper4 = new QueryWrapper<>();
+            queryWrapper4.eq("asset_id", assetCurrentJyPo.getId());
+            assetBusinessFormJyService.remove(queryWrapper4);
+            QueryWrapper<UnitOtherConcatJyPo> queryWrapper5 = new QueryWrapper<>();
+            queryWrapper5.eq("asset_id", assetCurrentJyPo.getId());
+            unitOtherConcatJyservice.remove(queryWrapper5);
+            if (assetCurrentJyPo.getXjgywxt() != null) {
+                assetCurrentJyPo.getXjgywxt().setAssetId(assetCurrentJyPo.getId());
+                assetBusinessFormJyService.save(assetCurrentJyPo.getXjgywxt());
+            }
+            if (assetCurrentJyPo.getGylxxList() != null) {
+                for (AssetSupplyChainJyPo items : assetCurrentJyPo.getGylxxList()) {
+                    items.setAssetId(assetCurrentJyPo.getId());
+                }
+                //新增供应链
+                assetSupplyChainJyService.saveBatch(assetCurrentJyPo.getGylxxList());
+            }
+            if (assetCurrentJyPo.getJcwlList() != null) {
+                for (AssetBasicNetworkJyPo items : assetCurrentJyPo.getJcwlList()) {
+                    items.setAssetId(assetCurrentJyPo.getId());
+                }
+                //新增基础网络
+                assetBasicNetworkJyService.saveBatch(assetCurrentJyPo.getJcwlList());
+            }
+            if (assetCurrentJyPo.getOtherConcat() != null) {
+                for (UnitOtherConcatJyPo items : assetCurrentJyPo.getOtherConcat()) {
+                    items.setAssetId(assetCurrentJyPo.getId());
+                }
+                //新增其他联系人
+                unitOtherConcatJyservice.saveBatch(assetCurrentJyPo.getOtherConcat());
+            }
+
+        } else {
+            AssetCurrentCpPo acc = new AssetCurrentCpPo();
+            BeanUtil.copyProperties(assetCurrentJyPo, acc);
+            assetCurrentCpService.save(acc);
+            if (acc.getXjgywxt() != null) {
+                acc.getXjgywxt().setAssetId(acc.getId());
+                assetBusinessFormCpService.save(acc.getXjgywxt());
+            }
+            if (acc.getGylxxList() != null) {
+                for (AssetSupplyChainCpPo items : acc.getGylxxList()) {
+                    items.setAssetId(acc.getId());
+                }
+                //新增供应链
+                assetSupplyChainCpService.saveBatch(acc.getGylxxList());
+            }
+            if (acc.getJcwlList() != null) {
+                for (AssetBasicNetworkCpPo items : acc.getJcwlList()) {
+                    items.setAssetId(acc.getId());
+                }
+                //新增基础网络
+                assetBasicNetworkCpService.saveBatch(acc.getJcwlList());
+            }
+            if (acc.getOtherConcat() != null) {
+                for (UnitOtherConcatCpPo items : acc.getOtherConcat()) {
+                    items.setAssetId(acc.getId());
+                }
+                //新增其他联系人
+                unitOtherConcatCpService.saveBatch(acc.getOtherConcat());
+            }
+        }
 
         return success();
     }
 
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetCurrentCpPo.class)
+    @GetMapping("/getAuditList")
+    public AjaxResult getAuditList(AssetAuditPageRequest as) {
+        Page<AssetCurrentJyPo> page = new Page<>();
+        page.setSize(as.getSize());
+        page.setCurrent(as.getCurrent());
+        try {
+            if (!SecurityUtils.getLoginUser().getUser().isAdmin() && !SecurityUtils.hasRole("common")) {
+                as.setDwmc(SecurityUtils.getLoginUser().getUser().getNickName());
+            }
+        } catch (Exception e) {
+            throw new ServiceException("获取用户信息异常");
+        }
+        return success(assetCurrentJyService.getAuditList(page, as));
+    }
+
+    /**
+     * 查看中间数据详情
+     */
+    @ApiOperation(value = "单位端查看中间数据详情", response = AssetCurrentCpPo.class)
+    @GetMapping("/lookInfo/{id}")
+    public AjaxResult lookInfo(@PathVariable Long id) {
+        AssetCurrentCpPo byId = assetCurrentCpService.getById(id);
+        byId.setGylxxList(assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId ,byId.getId()).list());
+        byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, byId.getId()).list());
+        byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, byId.getId()).one());
+        byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, byId.getId()).list());
+        List<Acomma> a1 = new ArrayList<>();
+        if(byId.getGlym()!=null){
+            Arrays.asList(byId.getGlym().split(",")).forEach(x -> {
+                Acomma acomma = new Acomma();
+                acomma.setKey(x);
+                a1.add(acomma);
+            });
+            byId.setGlymList(a1);
+        }
+        List<Acomma> a2 = new ArrayList<>();
+        if(byId.getGlIp()!=null){
+            Arrays.asList(byId.getGlIp().split(",")).forEach(x -> {
+                Acomma acomma = new Acomma();
+                acomma.setKey(x);
+                a2.add(acomma);
+            });
+            byId.setGlIpList(a2);
+        }
+        return success(byId);
+    }
+
+    /**
+     * 管理端审核
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @PreAuthorize("@ss.hasAnyRoles('admin,common')")
+    @ApiOperation(value = "管理端审核")
+    @PostMapping("/audit")
+    public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
+        AssetCurrentCpPo ass = new AssetCurrentCpPo();
+        BeanUtil.copyProperties(as, ass);
+        assetCurrentCpService.updateById(ass);
+        //通过数据同步
+        if ("2".equals(as.getAuditState())) {
+            AssetCurrentCpPo byId = assetCurrentCpService.getById(as.getCurrentId());
+            AssetCurrent assetCurrent = new AssetCurrent();
+            BeanUtil.copyProperties(byId, assetCurrent);
+            //修改主表
+            assetCurrentService.updateById(assetCurrent);
+            //删除副表数据然后再添加
+            assetSupplyChainService.deleteByAssetIds(assetCurrent.getId());
+            assetBasicNetworkService.deleteByAssetIds(assetCurrent.getId());
+            assetBusinessFormService.deleteByAssetIds(assetCurrent.getId());
+            unitOtherConcatService.deleteByAssetIds(assetCurrent.getId());
+
+            List<AssetSupplyChainCpPo> list = assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId, byId.getId()).isNull(AssetSupplyChainCpPo::getTaskId).list();
+            list.forEach(x -> {
+                AssetSupplyChain a1 = new AssetSupplyChain();
+                BeanUtil.copyProperties(x, a1);
+                assetSupplyChainService.save(a1);
+            });
+
+            List<AssetBasicNetworkCpPo> list1 = assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, byId.getId()).isNull(AssetBasicNetworkCpPo::getTaskId).list();
+            list1.forEach(x -> {
+                AssetBasicNetwork a2 = new AssetBasicNetwork();
+                BeanUtil.copyProperties(x, a2);
+                assetBasicNetworkService.save(a2);
+            });
+
+            List<AssetBusinessFormCpPo> list2 = assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, byId.getId()).isNull(AssetBusinessFormCpPo::getTaskId).list();
+            list2.forEach(x -> {
+                AssetBusinessForm a3 = new AssetBusinessForm();
+                BeanUtil.copyProperties(x, a3);
+                assetBusinessFormService.save(a3);
+            });
+
+            List<UnitOtherConcatCpPo> list3 = unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, byId.getId()).isNull(UnitOtherConcatCpPo::getTaskId).list();
+            list3.forEach(x -> {
+                UnitOtherConcat a4 = new UnitOtherConcat();
+                BeanUtil.copyProperties(x, a4);
+                unitOtherConcatService.save(a4);
+            });
+        }
+        return success();
+    }
+    //=================================================
+
+
     /**
      * 修改数据
      *

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

@@ -1,6 +1,7 @@
 package com.ruoyi.tc.controller;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -9,17 +10,24 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.tc.entity.AssetApp;
 import com.ruoyi.tc.entity.AssetEmail;
+import com.ruoyi.tc.entity.po.*;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
+import com.ruoyi.tc.entity.request.AssetAuditRequest;
 import com.ruoyi.tc.entity.request.AssetEmailPageRequest;
+import com.ruoyi.tc.service.AssetEmailJyService;
 import com.ruoyi.tc.service.AssetEmailService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -38,6 +46,8 @@ public class AssetEmailController extends BaseController {
     @Resource
     private AssetEmailService assetEmailService;
 
+    @Resource
+    private AssetEmailJyService assetEmailJyService;
     /**
      * 分页查询
      *
@@ -60,6 +70,88 @@ public class AssetEmailController extends BaseController {
         return success(assetEmailService.page(page, req));
     }
 
+    //=================================================
+    /**
+     * 单位自编辑进行校验
+     */
+    @ApiOperation(value = "单位自编辑进行校验")
+    @PreAuthorize("@ss.hasAnyRoles('unit')")
+    @PostMapping("/unitEdit")
+    public AjaxResult unitEdit(@RequestBody @Valid AssetEmailJyPo assetEmailJyPo) {
+        AssetEmailJyPo one = assetEmailJyService.lambdaQuery().eq(AssetEmailJyPo::getSsdw,assetEmailJyPo.getSsdw())
+                .eq(AssetEmailJyPo::getDzyxhz,assetEmailJyPo.getDzyxhz()).isNull(AssetEmailJyPo::getTaskId).one();
+        assetEmailJyPo.setAuditState("1");
+        assetEmailJyPo.setAuditYy(null);
+        if (one != null) {
+            assetEmailJyPo.setEmailId(one.getEmailId());
+            assetEmailJyPo.setAssetId(one.getAssetId());
+            assetEmailJyService.updateById(assetEmailJyPo);
+        } else {
+            assetEmailJyPo.setAssetId(assetEmailService.lambdaQuery().eq(AssetEmail::getSsdw,assetEmailJyPo.getSsdw())
+                    .eq(AssetEmail::getDzyxhz,assetEmailJyPo.getDzyxhz()).one().getId());
+            assetEmailJyService.save(assetEmailJyPo);
+        }
+        return success();
+    }
+
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetEmailJyPo.class)
+    @GetMapping("/getAuditList")
+    public AjaxResult getAuditList(AssetAuditPageRequest as) {
+        Page<AssetEmailJyPo> page = new Page<>();
+        page.setSize(as.getSize());
+        page.setCurrent(as.getCurrent());
+        try {
+            if (!SecurityUtils.getLoginUser().getUser().isAdmin() && !SecurityUtils.hasRole("common")) {
+                as.setDwmc(SecurityUtils.getLoginUser().getUser().getNickName());
+            }
+        } catch (Exception e) {
+            throw new ServiceException("获取用户信息异常");
+        }
+        return success(assetEmailJyService.getAuditList(page, as));
+    }
+
+    /**
+     * 查看中间数据详情
+     */
+    @ApiOperation(value = "单位端查看中间数据详情", response = AssetEmailJyPo.class)
+    @GetMapping("/lookInfo/{id}")
+    public AjaxResult lookInfo(@PathVariable Long id) {
+        return success(assetEmailJyService.getById(id));
+    }
+
+    /**
+     * 管理端审核
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @PreAuthorize("@ss.hasAnyRoles('admin,common')")
+    @ApiOperation(value = "管理端审核")
+    @PostMapping("/audit")
+    public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
+        AssetEmailJyPo ass = new AssetEmailJyPo();
+        BeanUtil.copyProperties(as, ass);
+        ass.setEmailId(as.getCurrentId());
+        assetEmailJyService.updateById(ass);
+        //通过数据同步
+        if ("2".equals(as.getAuditState())) {
+            AssetEmailJyPo byId = assetEmailJyService.getById(as.getCurrentId());
+            AssetEmail aa = new  AssetEmail();
+            BeanUtil.copyProperties(byId, aa);
+            aa.setId(byId.getAssetId());
+            //修改主表
+            assetEmailService.updateById(aa);
+        }
+        return success();
+    }
+    //=================================================
+
     /**
      * 通过主键查询单条email数据
      *

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

@@ -10,23 +10,27 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.tc.entity.AssetEmail;
 import com.ruoyi.tc.entity.AssetMiniPrograms;
-import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo;
+import com.ruoyi.tc.entity.po.AssetEmailJyPo;
+import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
+import com.ruoyi.tc.entity.request.AssetAuditRequest;
 import com.ruoyi.tc.entity.request.AssetMiniProgramsPageRequest;
-import com.ruoyi.tc.service.AssetMiniProgramsCpService;
+import com.ruoyi.tc.service.AssetMiniProgramsJyService;
 import com.ruoyi.tc.service.AssetMiniProgramsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.util.List;
 
-import static com.ruoyi.common.core.domain.AjaxResult.success;
-
 /**
  * 小程序资产表(asset_mini_programs)表控制层
  *
@@ -43,6 +47,8 @@ public class AssetMiniProgramsController extends BaseController {
     @Resource
     private AssetMiniProgramsService assetMiniProgramsService;
 
+    @Resource
+    private AssetMiniProgramsJyService assetMiniProgramsJyService;
     /**
      * 分页查询
      *
@@ -65,6 +71,89 @@ public class AssetMiniProgramsController extends BaseController {
         return success(assetMiniProgramsService.page(page, req));
     }
 
+    //=================================================
+    /**
+     * 单位自编辑进行校验
+     */
+    @ApiOperation(value = "单位自编辑进行校验")
+    @PreAuthorize("@ss.hasAnyRoles('unit')")
+    @PostMapping("/unitEdit")
+    public AjaxResult unitEdit(@RequestBody @Valid AssetMiniProgramsJyPo assetMiniProgramsJyPo) {
+        AssetMiniProgramsJyPo one = assetMiniProgramsJyService.lambdaQuery().eq(AssetMiniProgramsJyPo::getSsdw,assetMiniProgramsJyPo.getSsdw())
+                .eq(AssetMiniProgramsJyPo::getXcxmc,assetMiniProgramsJyPo.getXcxmc()).isNull(AssetMiniProgramsJyPo::getTaskId).one();
+        assetMiniProgramsJyPo.setAuditState("1");
+        assetMiniProgramsJyPo.setAuditYy(null);
+        if (one != null) {
+            assetMiniProgramsJyPo.setMiniId(one.getMiniId());
+            assetMiniProgramsJyPo.setAssetId(one.getAssetId());
+            assetMiniProgramsJyService.updateById(assetMiniProgramsJyPo);
+        } else {
+            assetMiniProgramsJyPo.setAssetId(assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getSsdw,assetMiniProgramsJyPo.getSsdw())
+                    .eq(AssetMiniPrograms::getXcxmc,assetMiniProgramsJyPo.getXcxmc()).one().getId());
+            assetMiniProgramsJyService.save(assetMiniProgramsJyPo);
+        }
+        return success();
+    }
+
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetMiniProgramsJyPo.class)
+    @GetMapping("/getAuditList")
+    public AjaxResult getAuditList(AssetAuditPageRequest as) {
+        Page<AssetMiniProgramsJyPo> page = new Page<>();
+        page.setSize(as.getSize());
+        page.setCurrent(as.getCurrent());
+        try {
+            if (!SecurityUtils.getLoginUser().getUser().isAdmin() && !SecurityUtils.hasRole("common")) {
+                as.setDwmc(SecurityUtils.getLoginUser().getUser().getNickName());
+            }
+        } catch (Exception e) {
+            throw new ServiceException("获取用户信息异常");
+        }
+        return success(assetMiniProgramsJyService.getAuditList(page, as));
+    }
+
+    /**
+     * 查看中间数据详情
+     */
+    @ApiOperation(value = "单位端查看中间数据详情", response = AssetMiniProgramsJyPo.class)
+    @GetMapping("/lookInfo/{id}")
+    public AjaxResult lookInfo(@PathVariable Long id) {
+        return success(assetMiniProgramsJyService.getById(id));
+    }
+
+    /**
+     * 管理端审核
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @PreAuthorize("@ss.hasAnyRoles('admin,common')")
+    @ApiOperation(value = "管理端审核")
+    @PostMapping("/audit")
+    public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
+        AssetMiniProgramsJyPo ass = new AssetMiniProgramsJyPo();
+        BeanUtil.copyProperties(as, ass);
+        ass.setMiniId(as.getCurrentId());
+        assetMiniProgramsJyService.updateById(ass);
+        //通过数据同步
+        if ("2".equals(as.getAuditState())) {
+            AssetMiniProgramsJyPo byId = assetMiniProgramsJyService.getById(as.getCurrentId());
+            AssetMiniPrograms aa = new  AssetMiniPrograms();
+            BeanUtil.copyProperties(byId, aa);
+            aa.setId(byId.getAssetId());
+            //修改主表
+            assetMiniProgramsService.updateById(aa);
+        }
+        return success();
+    }
+    //=================================================
+
+
     /**
      * 通过主键查询单条小程序数据
      *

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

@@ -1,6 +1,7 @@
 package com.ruoyi.tc.controller;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -8,17 +9,25 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.tc.entity.AssetMiniPrograms;
 import com.ruoyi.tc.entity.AssetOfficialAccount;
+import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
+import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
+import com.ruoyi.tc.entity.request.AssetAuditRequest;
 import com.ruoyi.tc.entity.request.AssetOfficialAccountPageRequest;
+import com.ruoyi.tc.service.AssetOfficialAccountJyService;
 import com.ruoyi.tc.service.AssetOfficialAccountService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.security.Security;
 import java.util.List;
 
@@ -40,6 +49,8 @@ public class AssetOfficialAccountController {
     @Resource
     private AssetOfficialAccountService assetOfficialAccountService;
 
+    @Resource
+    private AssetOfficialAccountJyService assetOfficialAccountJyService;
     /**
      * 分页查询
      *
@@ -74,6 +85,88 @@ public class AssetOfficialAccountController {
         return success(assetOfficialAccountService.getById(id));
     }
 
+    //=================================================
+    /**
+     * 单位自编辑进行校验
+     */
+    @ApiOperation(value = "单位自编辑进行校验")
+    @PreAuthorize("@ss.hasAnyRoles('unit')")
+    @PostMapping("/unitEdit")
+    public AjaxResult unitEdit(@RequestBody @Valid AssetOfficialAccountJyPo ao) {
+        AssetOfficialAccountJyPo one = assetOfficialAccountJyService.lambdaQuery().eq(AssetOfficialAccountJyPo::getSsdw,ao.getSsdw())
+                .eq(AssetOfficialAccountJyPo::getGzhmc,ao.getGzhmc()).isNull(AssetOfficialAccountJyPo::getTaskId).one();
+        ao.setAuditState("1");
+        ao.setAuditYy(null);
+        if (one != null) {
+            ao.setAccountId(one.getAccountId());
+            ao.setAssetId(one.getAssetId());
+            assetOfficialAccountJyService.updateById(ao);
+        } else {
+            ao.setAssetId(assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getSsdw,ao.getSsdw())
+                    .eq(AssetOfficialAccount::getGzhmc,ao.getGzhmc()).one().getId());
+            assetOfficialAccountJyService.save(ao);
+        }
+        return success();
+    }
+
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetOfficialAccountJyPo.class)
+    @GetMapping("/getAuditList")
+    public AjaxResult getAuditList(AssetAuditPageRequest as) {
+        Page<AssetOfficialAccountJyPo> page = new Page<>();
+        page.setSize(as.getSize());
+        page.setCurrent(as.getCurrent());
+        try {
+            if (!SecurityUtils.getLoginUser().getUser().isAdmin() && !SecurityUtils.hasRole("common")) {
+                as.setDwmc(SecurityUtils.getLoginUser().getUser().getNickName());
+            }
+        } catch (Exception e) {
+            throw new ServiceException("获取用户信息异常");
+        }
+        return success(assetOfficialAccountJyService.getAuditList(page, as));
+    }
+
+    /**
+     * 查看中间数据详情
+     */
+    @ApiOperation(value = "单位端查看中间数据详情", response = AssetOfficialAccountJyPo.class)
+    @GetMapping("/lookInfo/{id}")
+    public AjaxResult lookInfo(@PathVariable Long id) {
+        return success(assetOfficialAccountJyService.getById(id));
+    }
+
+    /**
+     * 管理端审核
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @PreAuthorize("@ss.hasAnyRoles('admin,common')")
+    @ApiOperation(value = "管理端审核")
+    @PostMapping("/audit")
+    public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
+        AssetOfficialAccountJyPo ass = new AssetOfficialAccountJyPo();
+        BeanUtil.copyProperties(as, ass);
+        ass.setAccountId(as.getCurrentId());
+        assetOfficialAccountJyService.updateById(ass);
+        //通过数据同步
+        if ("2".equals(as.getAuditState())) {
+            AssetOfficialAccountJyPo byId = assetOfficialAccountJyService.getById(as.getCurrentId());
+            AssetOfficialAccount aa = new  AssetOfficialAccount();
+            BeanUtil.copyProperties(byId, aa);
+            aa.setId(byId.getAssetId());
+            //修改主表
+            assetOfficialAccountService.updateById(aa);
+        }
+        return success();
+    }
+    //=================================================
+
     /**
      * 新增公众号数据
      *

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

@@ -1,21 +1,26 @@
 package com.ruoyi.tc.controller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.tc.entity.ExamineInfo;
+import com.ruoyi.tc.entity.Unit;
+import com.ruoyi.tc.entity.UnitOtherConcat;
+import com.ruoyi.tc.service.ExamineInfoService;
+import com.ruoyi.tc.service.UnitOtherConcatService;
 import com.ruoyi.tc.service.UnitService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
 /**
  * 组织架构
+ *
  * @author du
  * @since 2024/12/9 10:42
  */
@@ -27,6 +32,11 @@ public class DeptSchemaController {
     @Resource
     private UnitService unitService;
 
+    @Resource
+    private UnitOtherConcatService unitOtherConcatService;
+
+    @Resource
+    private ExamineInfoService examineInfoService;
     /**
      * 根据资产类型返回组织架构
      */
@@ -39,4 +49,49 @@ public class DeptSchemaController {
         return AjaxResult.success(unitService.getSchema(type));
     }
 
+    /**
+     * 单位查看自己单位具体信息
+     */
+    @ApiOperation(value = "单位查看自己单位具体信息")
+    @PreAuthorize("@ss.hasAnyRoles('unit')")
+    @GetMapping("/unitOwnInfo")
+    public AjaxResult unitOwnInfo() {
+        Unit one = unitService.lambdaQuery().eq(Unit::getUserName, SecurityUtils.getLoginUser().getUsername()).one();
+        Unit byId = unitService.getById(one.getId());
+        return AjaxResult.success(byId);
+    }
+
+    /**
+     * 单位修改自己的单位信息
+     */
+    @ApiOperation(value = "单位修改自己的单位信息")
+    @PreAuthorize("@ss.hasAnyRoles('unit')")
+    @PostMapping("/unitEditOwn")
+    public AjaxResult unitEditOwn(@RequestBody Unit x) {
+        Unit byId = unitService.getById(x.getId());
+        if (!byId.getUserName().equals(x.getUserName()) || !byId.getNickName().equals(x.getNickName())) {
+            throw new ServiceException("单位名称和社会信用代码不允许修改!");
+        }
+        unitService.updateById(x);
+        //先删除
+        unitOtherConcatService.deleteByUnitIds(x.getId());
+        examineInfoService.deleteByUnitIds(x.getId());
+
+        if (x.getOtherConcat() != null) {
+            x.getOtherConcat().forEach(y -> {
+                y.setUnitId(x.getId());
+                y.setConcatId(null);
+            });
+            unitOtherConcatService.saveBatch(x.getOtherConcat());
+        }
+        if (x.getJcxxList() != null) {
+            x.getJcxxList().forEach(y -> {
+                y.setUnitId(x.getId());
+                y.setJcid(null);
+            });
+            examineInfoService.saveBatch(x.getJcxxList());
+        }
+        return AjaxResult.success();
+    }
+
 }

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

@@ -324,7 +324,7 @@ public class UnitController {
         String userNames = unitService.selectByIds(id);
         //根据单位名称查询任务
         List<AssetTask> units = unitService.selectTaskIdToDwmc(userNames);
-        if(units!=null && units.size()>0){
+        if(units == null || units.isEmpty()){
             unitService.deleteUsers(userNames);
             unitService.deleteUnits(id);
             unitOtherConcatService.deleteByUnitIds(id);
@@ -356,28 +356,20 @@ public class UnitController {
             }
             QueryWrapper<AssetApp> r1 = new QueryWrapper<>();
             r1.eq("ssdw", userNames);
-            AssetApp e1 = new AssetApp();
+            assetAppService.remove(r1);
-            e1.setDelFlag("2");
-            assetAppService.update(e1, r1);
 
 
             QueryWrapper<AssetEmail> r2 = new QueryWrapper<>();
             r2.eq("ssdw", userNames);
-            AssetEmail e2 = new AssetEmail();
+            assetEmailService.remove( r2);
-            e2.setDelFlag("2");
-            assetEmailService.update(e2, r2);
 
             QueryWrapper<AssetOfficialAccount> r3 = new QueryWrapper<>();
             r3.eq("ssdw", userNames);
-            AssetOfficialAccount e3 = new AssetOfficialAccount();
+            assetOfficialAccountService.remove( r3);
-            e3.setDelFlag("2");
-            assetOfficialAccountService.update(e3, r3);
 
             QueryWrapper<AssetMiniPrograms> r4 = new QueryWrapper<>();
             r4.eq("ssdw", userNames);
-            AssetMiniPrograms e4 = new AssetMiniPrograms();
+            assetMiniProgramsService.remove( r4);
-            e4.setDelFlag("2");
-            assetMiniProgramsService.update(e4, r4);
 
 
             QueryWrapper<AssetAppCpPo> s1 = new QueryWrapper<>();

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

@@ -150,4 +150,12 @@ public class AssetApp extends BaseClass implements Serializable {
     @ApiModelProperty("状态")
     @Excel(name = "状态", dictType = "gzh_state",comboReadDict = true)
     private String appState;
+
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("审核")
+    @TableField(exist = false)
+    private String auditState;
 }

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

@@ -50,6 +50,18 @@ public class AssetCurrent extends BaseClass implements Serializable {
     private String jsyydw;
 
 
+    /**
+     * DNS:
+     */
+    @ApiModelProperty("DNS")
+    private String dns;
+
+    /**
+     * 是否自建互联网专线ip
+     */
+    @ApiModelProperty("是否自建互联网专线ip")
+    private String isZjhlwip;
+
     @ApiModelProperty("组织机构名称（部门名称）")
     @TableField(exist = false)
     private String deptName;
@@ -1055,4 +1067,11 @@ public class AssetCurrent extends BaseClass implements Serializable {
 
     @ApiModelProperty("不通过原因")
     private String  btgyy;
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("审核")
+    @TableField(exist = false)
+    private String auditState;
 }

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

@@ -144,4 +144,11 @@ public class AssetEmail extends BaseClass implements Serializable {
 
     @ApiModelProperty("删除标志（0代表存在 2代表删除）")
     private String delFlag;
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("审核")
+    @TableField(exist = false)
+    private String auditState;
 }

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

@@ -197,4 +197,11 @@ public class AssetMiniPrograms extends BaseClass implements Serializable {
 
     @ApiModelProperty("是否报废")
     private Integer isbf=0;
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("审核")
+    @TableField(exist = false)
+    private String auditState;
 }

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

@@ -173,4 +173,23 @@ public class AssetOfficialAccount extends BaseClass implements Serializable {
      */
     @ApiModelProperty("删除标志（0代表存在 2代表删除）")
     private String delFlag;
+
+    /**
+     * 平台类型
+     */
+    @ApiModelProperty("平台类型")
+    private String ptlx;
+
+    /**
+     * 粉丝数
+     */
+    @ApiModelProperty("粉丝数")
+    private String fss;
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("审核")
+    @TableField(exist = false)
+    private String auditState;
 }

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

@@ -156,4 +156,14 @@ public class AssetAppCpPo extends BaseClass implements Serializable {
 
     @ApiModelProperty("app状态")
     private Integer appState;
+
+    /**
+     * 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
+     */
+    @ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
+    private String auditState;
+
+
+    @ApiModelProperty("单位自己编辑的 不通过原因")
+    private String auditYy;
 }

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

@@ -159,4 +159,14 @@ public class AssetAppJyPo extends BaseClass implements Serializable {
 
     @ApiModelProperty("app状态")
     private String appState;
+
+    /**
+     * 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
+     */
+    @ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
+    private String auditState;
+
+
+    @ApiModelProperty("单位自己编辑的 不通过原因")
+    private String auditYy;
 }

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

@@ -26,11 +26,11 @@ import java.util.List;
 public class AssetCurrentCpPo extends BaseClass implements Serializable {
 
     private static final long serialVersionUID = 1L;
-//    /**
+    /**
-//     * 主键id
+     * 主键id
-//     */
+     */
-//    @TableId(type = IdType.AUTO,value = "current_id")
+    @TableId(type = IdType.AUTO,value = "current_id")
-//    private Long currentId;
+    private Long currentId;
 
     @ApiModelProperty("资产id")
     private Long id;
@@ -944,4 +944,26 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
     @ApiModelProperty("建设运营单位")
     private String jsyydw;
 
+    /**
+     * DNS:
+     */
+    @ApiModelProperty("DNS")
+    private String dns;
+
+    /**
+     * 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
+     */
+    @ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
+    private String auditState;
+
+
+    @ApiModelProperty("单位自己编辑的 不通过原因")
+    private String auditYy;
+
+    /**
+     * 是否自建互联网专线ip
+     */
+    @TableField("is_zjhlwip")
+    @ApiModelProperty("是否自建互联网专线ip")
+    private String isZjhlwip;
 }

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

@@ -514,7 +514,6 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
     */
 //    @Excel(name = "ICP备案编号",sort = 25,width = 46)
     @Excel(name = "ICP备案编号（ICP备案状态选择为是则必填）",sort = 25,width = 46)
-    @NotBlank
     @Size(max= 50,message="ICP备案信息-ICP备案编号长度不能超过50")
     @ApiModelProperty("ICP备案信息-ICP备案编号")
     private String ipcIpcbabh;
@@ -522,7 +521,6 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
     * ICP备案信息-备案域名
     */
     @Excel(name = "*备案域名",sort = 26)
-    @NotBlank
     @Size(max= 50,message="ICP备案信息-备案域名长度不能超过50")
     @ApiModelProperty("ICP备案信息-备案域名")
     private String ipcBaym;
@@ -574,7 +572,6 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
     @Excel(name = "*公安机关备案号",sort = 28,width = 22)
     @Size(max= 50,message="公安机关备案信息-公安机关备案号长度不能超过50")
     @ApiModelProperty("公安机关备案信息-公安机关备案号")
-    @NotBlank
     private String gajgBah;
     /**
     * 公安机关备案信息-备案日期
@@ -660,7 +657,6 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
     /**
     * 等保信息-等保测评备案号
     */
-    @NotBlank
     @Excel(name = "*等保测评备案号",sort = 43,width = 22)
     @Size(max= 50,message="等保信息-等保测评备案号长度不能超过50")
     @ApiModelProperty("等保信息-等保测评备案号")
@@ -691,7 +687,6 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
     /**
     * 等保信息-定级时间
     */
-    @NotBlank
     @Excel(name = "定级时间（是否是等保系统是则必填，样式如2024-11-02）",sort = 119,width = 40)
     @Size(max= 50,message="等保信息-定级时间长度不能超过50")
     @ApiModelProperty("等保信息-定级时间")
@@ -719,7 +714,6 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
     /**
     * 等保信息-测评得分
     */
-    @NotBlank
     @Excel(name = "*测评得分",sort = 49)
     @Size(max= 50,message="等保信息-测评得分长度不能超过50")
     @ApiModelProperty("等保信息-测评得分")
@@ -1064,4 +1058,26 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
 
     @ApiModelProperty("建设运营单位")
     private String jsyydw;
+
+    /**
+     * DNS:
+     */
+    @ApiModelProperty("DNS")
+    private String dns;
+
+    /**
+     * 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
+     */
+    @ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
+    private String auditState;
+
+
+    @ApiModelProperty("单位自己编辑的 不通过原因")
+    private String auditYy;
+
+    /**
+     * 是否自建互联网专线ip
+     */
+    @ApiModelProperty("是否自建互联网专线ip")
+    private String isZjhlwip;
 }

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

@@ -156,5 +156,13 @@ public class AssetEmailCpPo extends BaseClass implements Serializable {
 
     @ApiModelProperty("不通过次数")
     private Integer count;
+    /**
+     * 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
+     */
+    @ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
+    private String auditState;
+
 
+    @ApiModelProperty("单位自己编辑的 不通过原因")
+    private String auditYy;
 }

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

@@ -154,5 +154,13 @@ public class AssetEmailJyPo extends BaseClass implements Serializable {
     private Integer status;
     @ApiModelProperty("不通过次数")
     private Integer count;
+    /**
+     * 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
+     */
+    @ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
+    private String auditState;
+
 
+    @ApiModelProperty("单位自己编辑的 不通过原因")
+    private String auditYy;
 }

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

@@ -205,4 +205,14 @@ public class AssetMiniProgramsCpPo extends BaseClass implements Serializable {
 
     @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
     private Integer status;
+
+    /**
+     * 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
+     */
+    @ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
+    private String auditState;
+
+
+    @ApiModelProperty("单位自己编辑的 不通过原因")
+    private String auditYy;
 }

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

@@ -204,4 +204,14 @@ public class AssetMiniProgramsJyPo extends BaseClass implements Serializable {
 
     @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
     private Integer status;
+
+    /**
+     * 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
+     */
+    @ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
+    private String auditState;
+
+
+    @ApiModelProperty("单位自己编辑的 不通过原因")
+    private String auditYy;
 }

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

@@ -167,4 +167,26 @@ public class AssetOfficialAccountCpPo extends BaseClass implements Serializable
 
     @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
     private Integer status;
+
+    /**
+     * 平台类型
+     */
+    @ApiModelProperty("平台类型")
+    private String ptlx;
+
+    /**
+     * 粉丝数
+     */
+    @ApiModelProperty("粉丝数")
+    private String fss;
+
+    /**
+     * 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
+     */
+    @ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
+    private String auditState;
+
+
+    @ApiModelProperty("单位自己编辑的 不通过原因")
+    private String auditYy;
 }

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

@@ -188,4 +188,26 @@ public class AssetOfficialAccountJyPo extends BaseClass implements Serializable
 
     @ApiModelProperty("不通过次数")
     private Integer count;
+
+    /**
+     * 平台类型
+     */
+    @ApiModelProperty("平台类型")
+    private String ptlx;
+
+    /**
+     * 粉丝数
+     */
+    @ApiModelProperty("粉丝数")
+    private String fss;
+
+    /**
+     * 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
+     */
+    @ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
+    private String auditState;
+
+
+    @ApiModelProperty("单位自己编辑的 不通过原因")
+    private String auditYy;
 }

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetAuditPageRequest.java

@@ -0,0 +1,37 @@
+package com.ruoyi.tc.entity.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 管理端审核列表分页请求体
+ * @author du
+ * @since 2024/12/23 14:45
+ */
+@Data
+public class AssetAuditPageRequest {
+
+    @ApiModelProperty("页码")
+    private Long current=1L;
+
+    @ApiModelProperty("页数")
+    private Long size=10L;
+
+    /**
+     * 资产名称
+     */
+    @ApiModelProperty("资产名称")
+    private String name;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String auditState;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty("单位名称")
+    private String dwmc;
+}

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetAuditRequest.java

@@ -0,0 +1,29 @@
+package com.ruoyi.tc.entity.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 管理端审核请求体
+ * @author du
+ * @since 2024/12/23 15:38
+ */
+@Data
+public class AssetAuditRequest {
+
+    @NotNull
+    @ApiModelProperty("资产id")
+    private Long currentId;
+
+    @NotBlank
+    @ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
+    private String auditState;
+
+
+    @ApiModelProperty("单位自己编辑的 不通过原因")
+    private String auditYy;
+
+}

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

@@ -1,7 +1,10 @@
 package com.ruoyi.tc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.tc.entity.po.AssetAppCpPo;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -58,6 +61,5 @@ public interface AssetAppCpMapper extends BaseMapper<AssetAppCpPo> {
      */
     @Select("select * from asset_app_cp where asset_id=#{assetId} and task_id =#{taskId} ")
     AssetAppCpPo findByassetIdandTaskId(@Param("assetId") Integer assetId, @Param("taskId")Integer taskId);
-
 }
 

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

@@ -1,8 +1,11 @@
 package com.ruoyi.tc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.tc.entity.po.AssetAppCpPo;
 import com.ruoyi.tc.entity.po.AssetAppJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 资产移动应用程序表(asset_app_cp)表数据库访问层
@@ -11,7 +14,13 @@ import com.ruoyi.tc.entity.po.AssetAppJyPo;
  */
 public interface AssetAppJyMapper extends BaseMapper<AssetAppJyPo> {
 
-
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    Page<AssetAppJyPo> getAuditList(Page<AssetAppJyPo> page, @Param("req") AssetAuditPageRequest as);
 
 }
 

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

@@ -1,7 +1,9 @@
 package com.ruoyi.tc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,5 +55,7 @@ public interface AssetCurrentCpMapper extends BaseMapper<AssetCurrentCpPo> {
      */
     @Select("select * from asset_current_cp where id=#{assetId} and task_id =#{taskId}")
     AssetCurrentCpPo findByassetIdandTaskId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId);
+
+
 }
 

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

@@ -1,7 +1,12 @@
 package com.ruoyi.tc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.tc.entity.po.AssetAppCpPo;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
 import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 现有资产复制表(AssetCurrentResponse)表数据库访问层
@@ -11,5 +16,12 @@ import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
  */
 public interface AssetCurrentJyMapper extends BaseMapper<AssetCurrentJyPo> {
 
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    Page<AssetCurrentJyPo> getAuditList(Page<AssetCurrentJyPo> page, @Param("req") AssetAuditPageRequest as);
 }
 

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

@@ -1,8 +1,11 @@
 package com.ruoyi.tc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.tc.entity.po.AssetEmailCpPo;
 import com.ruoyi.tc.entity.po.AssetEmailJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 电子邮件资产表(asset_email_cp)表数据库访问层
@@ -12,5 +15,12 @@ import com.ruoyi.tc.entity.po.AssetEmailJyPo;
 public interface AssetEmailJyMapper extends BaseMapper<AssetEmailJyPo> {
 
 
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    Page<AssetEmailJyPo> getAuditList(Page<AssetEmailJyPo> page,@Param("req") AssetAuditPageRequest as);
 }
 

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

@@ -1,9 +1,12 @@
 package com.ruoyi.tc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo;
 import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 小程序资产表(asset_mini_programs_cp)表数据库访问层
@@ -14,7 +17,12 @@ import org.apache.ibatis.annotations.Delete;
 public interface AssetMiniProgramsJyMapper extends BaseMapper<AssetMiniProgramsJyPo> {
 
 
-
+    /**
-
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    Page<AssetMiniProgramsJyPo> getAuditList(Page<AssetMiniProgramsJyPo> page,@Param("req") AssetAuditPageRequest as);
 }
 

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

@@ -1,7 +1,10 @@
 package com.ruoyi.tc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 公众号资产表(asset_official_account_cp)表数据库访问层
@@ -12,5 +15,12 @@ import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo;
 public interface AssetOfficialAccountJyMapper extends BaseMapper<AssetOfficialAccountJyPo> {
 
 
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    Page<AssetOfficialAccountJyPo> getAuditList(Page<AssetOfficialAccountJyPo> page, @Param("req") AssetAuditPageRequest as);
 }
 

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

@@ -21,7 +21,7 @@ public interface AssetSupplyChainMapper extends BaseMapper<AssetSupplyChain> {
     AssetSupplyChain getJsdw(Long id);
 
     /**
-     * 逻辑删除
+     * 删除
      */
     void deleteByAssetIds(Long id);
 

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

@@ -13,12 +13,12 @@ import java.util.List;
 public interface UnitOtherConcatMapper extends BaseMapper<UnitOtherConcat>
 {
     /**
-     * 根据unitId逻辑删除
+     * 根据unitId删除
      */
     void deleteByUnitIds(Long id);
 
     /**
-     * 根据assetId逻辑删除
+     * 根据assetId删除
      */
     void deleteByAssetIds(Long id);
 

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

@@ -1,7 +1,10 @@
 package com.ruoyi.tc.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.tc.entity.po.AssetAppCpPo;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 
 import java.util.List;
 
@@ -50,4 +53,5 @@ public interface AssetAppCpService extends IService<AssetAppCpPo> {
      * @return
      */
     AssetAppCpPo findByassetIdandTaskId(Integer assetId, Integer taskId);
+
 }

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

@@ -1,7 +1,10 @@
 package com.ruoyi.tc.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.tc.entity.po.AssetAppCpPo;
 import com.ruoyi.tc.entity.po.AssetAppJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 
 /**
  * 资产移动应用程序表(asset_app_cp)表服务接口
@@ -11,4 +14,11 @@ import com.ruoyi.tc.entity.po.AssetAppJyPo;
  */
 public interface AssetAppJyService extends IService<AssetAppJyPo> {
 
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    Page<AssetAppJyPo> getAuditList(Page<AssetAppJyPo> page, AssetAuditPageRequest as);
 }

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

@@ -1,7 +1,9 @@
 package com.ruoyi.tc.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 
 import java.util.List;
 
@@ -13,6 +15,7 @@ import java.util.List;
  */
 public interface AssetCurrentCpService extends IService<AssetCurrentCpPo> {
 
+
     /**
      * 根据资产id和任务id删除数据
      *

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

@@ -1,7 +1,10 @@
 package com.ruoyi.tc.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
 import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 
 /**
  * 现有资产表(AssetCurrent)表服务接口
@@ -11,6 +14,13 @@ import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
  */
 public interface AssetCurrentJyService extends IService<AssetCurrentJyPo> {
 
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    Page<AssetCurrentJyPo> getAuditList(Page<AssetCurrentJyPo> page, AssetAuditPageRequest as);
 
 }
 

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

@@ -1,8 +1,10 @@
 package com.ruoyi.tc.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.tc.entity.po.AssetEmailCpPo;
 import com.ruoyi.tc.entity.po.AssetEmailJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 
 /**
  * 电子邮件资产表(asset_email)表服务接口
@@ -12,4 +14,11 @@ import com.ruoyi.tc.entity.po.AssetEmailJyPo;
  */
 public interface AssetEmailJyService extends IService<AssetEmailJyPo> {
 
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    Page<AssetEmailJyPo> getAuditList(Page<AssetEmailJyPo> page, AssetAuditPageRequest as);
 }

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

@@ -1,8 +1,10 @@
 package com.ruoyi.tc.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo;
 import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 
 /**
  * 小程序资产(asset_mini_programs_cp)表服务接口
@@ -13,7 +15,11 @@ import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
 public interface AssetMiniProgramsJyService extends IService<AssetMiniProgramsJyPo> {
 
 
-
+    /**
-
+     * 分页查询管理端或者单位端审核列表
-
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    Page<AssetMiniProgramsJyPo> getAuditList(Page<AssetMiniProgramsJyPo> page, AssetAuditPageRequest as);
 }

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

@@ -1,7 +1,9 @@
 package com.ruoyi.tc.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 import com.ruoyi.tc.mapper.AssetOfficialAccountJyMapper;
 
 /**
@@ -12,4 +14,11 @@ import com.ruoyi.tc.mapper.AssetOfficialAccountJyMapper;
  */
 public interface AssetOfficialAccountJyService extends IService<AssetOfficialAccountJyPo> {
 
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    Page<AssetOfficialAccountJyPo> getAuditList(Page<AssetOfficialAccountJyPo> page, AssetAuditPageRequest as);
 }

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

@@ -19,7 +19,7 @@ public interface AssetSupplyChainService extends IService<AssetSupplyChain> {
     AssetSupplyChain getJsdw(Long id);
 
     /**
-     * 逻辑删除
+     * 删除
      */
     void deleteByAssetIds(Long id);
 

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

@@ -1,7 +1,10 @@
 package com.ruoyi.tc.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.tc.entity.po.AssetAppCpPo;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 import com.ruoyi.tc.mapper.AssetAppCpMapper;
 import com.ruoyi.tc.service.AssetAppCpService;
 import org.springframework.stereotype.Service;
@@ -43,4 +46,6 @@ public class AssetAppCpServiceImpl extends ServiceImpl<AssetAppCpMapper, AssetAp
     public AssetAppCpPo findByassetIdandTaskId(Integer assetId, Integer taskId) {
         return baseMapper.findByassetIdandTaskId(assetId,taskId);
     }
+
+
 }

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

@@ -1,8 +1,10 @@
 package com.ruoyi.tc.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.tc.entity.po.AssetAppCpPo;
 import com.ruoyi.tc.entity.po.AssetAppJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 import com.ruoyi.tc.mapper.AssetAppCpMapper;
 import com.ruoyi.tc.mapper.AssetAppJyMapper;
 import com.ruoyi.tc.service.AssetAppCpService;
@@ -18,4 +20,15 @@ import org.springframework.stereotype.Service;
 @Service("assetAppJyService")
 public class AssetAppJyServiceImpl extends ServiceImpl<AssetAppJyMapper, AssetAppJyPo> implements AssetAppJyService {
 
+
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @Override
+    public Page<AssetAppJyPo> getAuditList(Page<AssetAppJyPo> page, AssetAuditPageRequest as) {
+        return baseMapper.getAuditList(page,as);
+    }
 }

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

@@ -88,9 +88,13 @@ public class AssetAppServiceImpl extends ServiceImpl<AssetAppMapper, AssetApp> i
         save(assetApp);
         AssetAppCpPo a = new AssetAppCpPo();
         BeanUtil.copyProperties(assetApp, a);
-        a.setTaskId(unitService.selectTaskId(assetApp.getSsdw(), "4"));
+        Integer i = unitService.selectTaskId(assetApp.getSsdw(), "4");
+        if(i!=null){
+            a.setTaskId(i);
             a.setAssetId(assetApp.getId());
-        return assetAppCpService.save(a);
+            assetAppCpService.save(a);
+        }
+        return true;
     }
 
 

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

@@ -1,7 +1,9 @@
 package com.ruoyi.tc.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 import com.ruoyi.tc.mapper.AssetCurrentCpMapper;
 import com.ruoyi.tc.service.*;
 import org.springframework.stereotype.Service;
@@ -20,6 +22,8 @@ public class AssetCurrentCpServiceImpl extends ServiceImpl<AssetCurrentCpMapper,
 
     @Resource
     private  AssetCurrentCpMapper assetCurrentCpMapper;
+
+
     @Override
     public void deletByAssetIdandTaskId(Long assetId,int taskId) {
         assetCurrentCpMapper.deletByAssetIdandTaskId(assetId,taskId);

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

@@ -1,7 +1,10 @@
 package com.ruoyi.tc.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
 import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 import com.ruoyi.tc.mapper.AssetCurrentJyMapper;
 import com.ruoyi.tc.service.AssetCurrentJyService;
 import org.springframework.stereotype.Service;
@@ -16,5 +19,16 @@ import org.springframework.stereotype.Service;
 public class AssetCurrentJyServiceImpl extends ServiceImpl<AssetCurrentJyMapper, AssetCurrentJyPo> implements AssetCurrentJyService {
 
 
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @Override
+    public Page<AssetCurrentJyPo> getAuditList(Page<AssetCurrentJyPo> page, AssetAuditPageRequest as) {
+        return baseMapper.getAuditList(page,as);
+    }
+
 }
 

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

@@ -1,8 +1,10 @@
 package com.ruoyi.tc.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.tc.entity.po.AssetEmailCpPo;
 import com.ruoyi.tc.entity.po.AssetEmailJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 import com.ruoyi.tc.mapper.AssetEmailCpMapper;
 import com.ruoyi.tc.mapper.AssetEmailJyMapper;
 import com.ruoyi.tc.service.AssetEmailCpService;
@@ -18,4 +20,15 @@ import org.springframework.stereotype.Service;
 @Service("assetEmailJyService")
 public class AssetEmailJyServiceImpl extends ServiceImpl<AssetEmailJyMapper, AssetEmailJyPo> implements AssetEmailJyService {
 
+
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @Override
+    public Page<AssetEmailJyPo> getAuditList(Page<AssetEmailJyPo> page, AssetAuditPageRequest as) {
+        return baseMapper.getAuditList(page,as);
+    }
 }

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

@@ -89,9 +89,13 @@ public class AssetEmailServiceImpl extends ServiceImpl<AssetEmailMapper, AssetEm
         save(assetEmail);
         AssetEmailCpPo a = new AssetEmailCpPo();
         BeanUtil.copyProperties(assetEmail, a);
-        a.setTaskId(unitService.selectTaskId(assetEmail.getSsdw(), "3"));
+        Integer i = unitService.selectTaskId(assetEmail.getSsdw(), "3");
+        if(i!=null){
+            a.setTaskId(i);
             a.setAssetId(assetEmail.getId());
-        return assetEmailCpService.save(a);
+            assetEmailCpService.save(a);
+        }
+        return true;
     }
 
     /**

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

@@ -1,7 +1,9 @@
 package com.ruoyi.tc.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 import com.ruoyi.tc.mapper.AssetMiniProgramsCpMapper;
 import com.ruoyi.tc.mapper.AssetMiniProgramsJyMapper;
 import com.ruoyi.tc.service.AssetMiniProgramsJyService;
@@ -18,4 +20,15 @@ import javax.annotation.Resource;
 @Service("assetMiniProgramsJyService")
 public class AssetMiniProgramsJyServiceImpl extends ServiceImpl<AssetMiniProgramsJyMapper, AssetMiniProgramsJyPo> implements AssetMiniProgramsJyService {
 
+
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @Override
+    public Page<AssetMiniProgramsJyPo> getAuditList(Page<AssetMiniProgramsJyPo> page, AssetAuditPageRequest as) {
+        return baseMapper.getAuditList(page, as);
+    }
 }

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

@@ -81,9 +81,13 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl<AssetMiniProgramsM
         save(assetMiniPrograms);
         AssetMiniProgramsCpPo assetMiniProgramsCpPo = new AssetMiniProgramsCpPo();
         BeanUtil.copyProperties(assetMiniPrograms,assetMiniProgramsCpPo);
-        assetMiniProgramsCpPo.setTaskId(unitService.selectTaskId(assetMiniPrograms.getSsdw(),"1"));
+        Integer i = unitService.selectTaskId(assetMiniPrograms.getSsdw(), "1");
+        if(i!=null){
+            assetMiniProgramsCpPo.setTaskId(i);
             assetMiniProgramsCpPo.setAssetId(assetMiniPrograms.getId());
-        return assetMiniProgramsCpService.save(assetMiniProgramsCpPo);
+            assetMiniProgramsCpService.save(assetMiniProgramsCpPo);
+        }
+        return true;
     }
 
     /**

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

@@ -1,8 +1,10 @@
 package com.ruoyi.tc.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.tc.entity.po.AssetOfficialAccountCpPo;
 import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo;
+import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 import com.ruoyi.tc.mapper.AssetOfficialAccountCpMapper;
 import com.ruoyi.tc.mapper.AssetOfficialAccountJyMapper;
 import com.ruoyi.tc.service.AssetOfficialAccountCpService;
@@ -18,4 +20,14 @@ import org.springframework.stereotype.Service;
 @Service("assetOfficialAccountJyService")
 public class AssetOfficialAccountJyServiceImpl extends ServiceImpl<AssetOfficialAccountJyMapper, AssetOfficialAccountJyPo> implements AssetOfficialAccountJyService {
 
+    /**
+     * 分页查询管理端或者单位端审核列表
+     *
+     * @param as 查询实体
+     * @return 所有数据
+     */
+    @Override
+    public Page<AssetOfficialAccountJyPo> getAuditList(Page<AssetOfficialAccountJyPo> page, AssetAuditPageRequest as) {
+        return baseMapper.getAuditList(page,as);
+    }
 }

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

@@ -84,9 +84,13 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl<AssetOfficialAc
         save(assetOfficialAccount);
         AssetOfficialAccountCpPo a = new AssetOfficialAccountCpPo();
         BeanUtil.copyProperties(assetOfficialAccount, a);
-        a.setTaskId(unitService.selectTaskId(assetOfficialAccount.getSsdw(), "2"));
+        Integer i = unitService.selectTaskId(assetOfficialAccount.getSsdw(), "2");
+        if(i!=null){
+            a.setTaskId(i);
             a.setAssetId(assetOfficialAccount.getId());
-        return assetOfficialAccountCpService.save(a);
+            assetOfficialAccountCpService.save(a);
+        }
+        return  true;
     }
 
     /**

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

@@ -27,7 +27,7 @@ public class AssetSupplyChainServiceImpl extends ServiceImpl<AssetSupplyChainMap
     }
 
     /**
-     * 逻辑删除
+     * 删除
      */
     @Override
     public void deleteByAssetIds(Long id) {

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

@@ -0,0 +1,21 @@
+<?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.AssetAppJyMapper">
+    <select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetAppJyPo">
+        select a.* from asset_app_cp a
+        <where>
+            a.task_id is null
+            <if test="req.name!=null and req.name!='' ">
+                and a.app_name like concat('%',#{req.name},'%')
+            </if>
+            <if test="req.dwmc!=null and req.dwmc!='' ">
+                and a.ssdw like concat('%',#{req.dwmc},'%')
+            </if>
+            <if test="req.auditState!=null">
+                and a.audit_state =#{req.auditState}
+            </if>
+        </where>
+        order by a.create_time desc
+    </select>
+</mapper>
+

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

@@ -15,11 +15,12 @@
     </delete>
 
     <select id="page" resultType="com.ruoyi.tc.entity.AssetApp">
-        select a.*,c.dept_name as deptName from asset_app a
+        select a.*,c.dept_name as deptName,e.audit_state  as auditState from asset_app a
             left join unit_info b on a.ssdw = b.nick_name
             left join sys_dept c on b.dept_id = c.dept_id
+            left join asset_app_cp e on a.id = e.asset_id
         <where>
-            a.del_flag = '0'
+            a.del_flag = '0' and e.task_id is null and e.audit_state is not null
             <if test="req.yymc!=null and req.yymc!='' ">
                 and a.app_name like concat('%',#{req.yymc},'%')
             </if>

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

@@ -1,9 +1,9 @@
 <?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.AssetBasicNetWorkMapper">
-    <update id="deleteByAssetIds">
+    <delete id="deleteByAssetIds">
-        update asset_basic_network set del_flag = '2' where asset_id = #{id}
+        delete from  asset_basic_network  where asset_id = #{id}
-    </update>
+    </delete>
     <delete id="deleteIdList" >
         DELETE FROM asset_basic_network
         WHERE asset_id IN

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

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.tc.mapper.AssetBusinessFormMapper">
 
-    <update id="deleteByAssetIds">
+    <delete id="deleteByAssetIds">
-        update asset_business_form set del_flag = '2' where asset_id = #{id}
+        delete  from  asset_business_form  where asset_id = #{id}
-    </update>
+    </delete>
     <delete id="deleteIdList">
         DELETE FROM asset_business_form
         WHERE asset_id IN

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

@@ -0,0 +1,21 @@
+<?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.AssetCurrentJyMapper">
+    <select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetCurrentJyPo">
+        select a.* from asset_current_cp a
+        <where>
+            a.task_id is null
+            <if test="req.name!=null and req.name!='' ">
+                and a.xtmc like concat('%',#{req.name},'%')
+            </if>
+            <if test="req.dwmc!=null and req.dwmc!='' ">
+                and a.dwmc like concat('%',#{req.dwmc},'%')
+            </if>
+            <if test="req.auditState!=null">
+                and a.audit_state =#{req.auditState}
+            </if>
+        </where>
+        order by a.create_time desc
+    </select>
+</mapper>
+

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

@@ -13,11 +13,12 @@
 
 
     <select id="page" resultType="com.ruoyi.tc.entity.AssetCurrent">
-        select a.* from asset_current a
+        select a.*,e.audit_state as auditState from asset_current a
         left join unit_info b on a.dwmc = b.nick_name
         left join sys_dept c on b.dept_id = c.dept_id
+        left join asset_current_cp e on a.id = e.id
         <where>
-           a. del_flag = '0'
+           a. del_flag = '0' and e.task_id is null and e.audit_state is not null
             <if test="req.xtmc!=null and req.xtmc!='' ">
                 and a.xtmc like concat('%',#{req.xtmc},'%')
             </if>
@@ -148,11 +149,10 @@
         </where>
         order by create_time desc
     </select>
-    <update id="deleteByUnitIds">
+    <delete id="deleteByUnitIds">
-        update asset_current
+        delete from  asset_current
-        set del_flag = '2'
         where id = #{id}
-    </update>
+    </delete>
     <resultMap type="com.ruoyi.tc.entity.AssetCurrent" id="AssetCurrentMap">
         <result property="id" column="id"/>
         <result property="xtmc" column="xtmc"/>

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

@@ -0,0 +1,21 @@
+<?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.AssetEmailJyMapper">
+    <select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetEmailJyPo">
+        select a.* from asset_email_cp a
+        <where>
+            a.task_id is null
+            <if test="req.name!=null and req.name!='' ">
+                and a.dzyxhz like concat('%',#{req.name},'%')
+            </if>
+            <if test="req.dwmc!=null and req.dwmc!='' ">
+                and a.ssdw like concat('%',#{req.dwmc},'%')
+            </if>
+            <if test="req.auditState!=null">
+                and a.audit_state =#{req.auditState}
+            </if>
+        </where>
+        order by a.create_time desc
+    </select>
+</mapper>
+

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

@@ -15,11 +15,12 @@
     </delete>
 
     <select id="page" resultType="com.ruoyi.tc.entity.AssetEmail">
-        select a.* from asset_email a
+        select a.*,e.audit_state as auditState from asset_email a
         left join unit_info b on a.ssdw = b.nick_name
         left join sys_dept c on b.dept_id = c.dept_id
+        left join asset_email_cp e on a.id = e.asset_id
         <where>
-            a.del_flag = '0'
+            a.del_flag = '0' and e.task_id is null and e.audit_state is not null
             <if test="req.dzyxhz!=null and req.dzyxhz!='' ">
                 and a.dzyxhz like concat('%',#{req.dzyxhz},'%')
             </if>

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

@@ -0,0 +1,21 @@
+<?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.AssetMiniProgramsJyMapper">
+    <select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo">
+        select a.* from asset_mini_programs_cp a
+        <where>
+            a.task_id is null
+            <if test="req.name!=null and req.name!='' ">
+                and a.xcxmc like concat('%',#{req.name},'%')
+            </if>
+            <if test="req.dwmc!=null and req.dwmc!='' ">
+                and a.ssdw like concat('%',#{req.dwmc},'%')
+            </if>
+            <if test="req.auditState!=null">
+                and a.audit_state = #{req.auditState}
+            </if>
+        </where>
+        order by a.create_time desc
+    </select>
+</mapper>
+

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

@@ -15,11 +15,12 @@
     </delete>
 
     <select id="page" resultType="com.ruoyi.tc.entity.AssetMiniPrograms">
-        select a.* from asset_mini_programs a
+        select a.*,e.audit_state as auditState from asset_mini_programs a
         left join unit_info b on a.ssdw = b.nick_name
         left join sys_dept c on b.dept_id = c.dept_id
+        left join asset_mini_programs_cp e on a.id = e.asset_id
         <where>
-            a.del_flag = '0'
+            a.del_flag = '0' and e.task_id is null and e.audit_state is not null
             <if test="req.xcxmc!=null and req.xcxmc!='' ">
                 and a.xcxmc like concat('%',#{req.xcxmc},'%')
             </if>

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

@@ -0,0 +1,21 @@
+<?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.AssetOfficialAccountJyMapper">
+    <select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo">
+        select a.* from asset_official_account_cp a
+        <where>
+            a.task_id is null
+            <if test="req.name!=null and req.name!='' ">
+                and a.gzhmc like concat('%',#{req.name},'%')
+            </if>
+            <if test="req.dwmc!=null and req.dwmc!='' ">
+                and a.ssdw like concat('%',#{req.dwmc},'%')
+            </if>
+            <if test="req.auditState!=null">
+                and a.audit_state =#{req.auditState}
+            </if>
+        </where>
+        order by a.create_time desc
+    </select>
+</mapper>
+

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

@@ -19,11 +19,12 @@
         where ssdw = #{part}and del_flag=0
     </select>
     <select id="page" resultType="com.ruoyi.tc.entity.AssetOfficialAccount">
-        select a.* from asset_official_account a
+        select a.*,e.audit_state as auditState from asset_official_account a
         left join unit_info b on a.ssdw = b.nick_name
         left join sys_dept c on b.dept_id = c.dept_id
+        left join asset_official_account_cp e on a.id = e.asset_id
         <where>
-            a.del_flag = '0'
+            a.del_flag = '0' and e.task_id is null and e.audit_state is not null
             <if test="req.gzhmc!=null and req.gzhmc!='' ">
                 and a.gzhmc like concat('%',#{req.gzhmc},'%')
             </if>

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

@@ -1,9 +1,9 @@
 <?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.AssetSupplyChainMapper">
-    <update id="deleteByAssetIds">
+    <delete id="deleteByAssetIds">
-        update asset_supply_chain set del_flag = '2' where asset_id = #{id}
+        delete from asset_supply_chain  where asset_id = #{id}
-    </update>
+    </delete>
     <delete id="deleteIdList">
         DELETE FROM asset_supply_chain
         WHERE asset_id IN

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

@@ -1,8 +1,8 @@
 <?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">
+    <delete id="deleteByUnitIds">
-        update unit_examine_info set del_flag = '2' where unit_id = #{id}
+        delete from unit_examine_info  where unit_id = #{id}
-    </update>
+    </delete>
 </mapper>
 

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

@@ -128,7 +128,7 @@
                  left join unit_other_contact c on a.id = c.unit_id
                  left join unit_examine_info e on a.id = e.unit_id
                  left join sys_dept d on a.dept_id = d.dept_id
-        where id = #{id}
+        where a.id = #{id}
     </select>
 
 

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

@@ -4,12 +4,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.tc.mapper.UnitOtherConcatMapper">
 
-    <update id="deleteByUnitIds">
+    <delete id="deleteByUnitIds">
-        update unit_other_contact set del_flag = '2' where unit_id = #{id}
+        delete from unit_other_contact  where unit_id = #{id}
-    </update>
+    </delete>
-    <update id="deleteByAssetIds">
+    <delete id="deleteByAssetIds">
-        update unit_other_contact set del_flag = '2' where asset_id = #{id}
+        delete from  unit_other_contact where asset_id = #{id}
-    </update>
+    </delete>
     <delete id="deleteIdList">
         DELETE FROM unit_other_contact
         WHERE asset_id IN