资产修改

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

@@ -5,9 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.tc.entity.AssetCurrent;
+import com.ruoyi.tc.entity.*;
-import com.ruoyi.tc.entity.AssetLc;
-import com.ruoyi.tc.entity.AssetTask;
 import com.ruoyi.tc.entity.po.*;
 import com.ruoyi.tc.entity.request.AssestTaskXqRequest;
 import com.ruoyi.tc.entity.request.AssetCurrentShRequest;
@@ -16,6 +14,7 @@ import com.ruoyi.tc.entity.request.AssetdwHcRequest;
 import com.ruoyi.tc.entity.response.AssestTaskXqresponse;
 import com.ruoyi.tc.entity.response.AssetTaskIdResponse;
 import com.ruoyi.tc.entity.response.AssetdwHcResponse;
+import com.ruoyi.tc.mapper.AssetTaskMapper;
 import com.ruoyi.tc.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.time.LocalDateTime;
+import java.util.Optional;
 
 /**
  * 任务主表(AssetTask)表控制层
@@ -42,7 +42,8 @@ public class AssetTaskController extends BaseController {
      */
     @Resource
     private AssetTaskService assetTaskService;
-
+    @Resource
+    private AssetMiniProgramsService assetMiniProgramsService;
     @Resource
     private AssetCurrentCpService assetCurrentCpService;
 
@@ -79,6 +80,45 @@ public class AssetTaskController extends BaseController {
 
     @Resource
     private AssetCurrentService assetCurrentService;
+
+    @Resource
+    private AssetMiniProgramsCpService assetMiniProgramsCpService;
+
+    @Resource
+    private AssetOfficialAccountCpService assetOfficialAccountCpService;
+
+    @Resource
+    private AssetAppCpService assetAppCpService;
+
+
+    @Resource
+    private AssetEmailCpService assetEmailCpService;
+
+
+    @Resource
+    private AssetMiniProgramsJyService assetMiniProgramsJyService;
+
+    @Resource
+    private AssetOfficialAccountJyService assetOfficialAccountJyService;
+
+    @Resource
+    private AssetAppJyService assetAppJyService;
+
+    @Resource
+    private AssetEmailJyService assetEmailJyService;
+
+    @Resource
+    private AssetOfficialAccountService assetOfficialAccountService;
+
+    @Resource
+    private AssetAppService assetAppService;
+
+    @Resource
+    private AssetEmailService assetEmailService;
+
+    @Resource
+    private AssetTaskMapper assetTaskDao;
+
     /**
      * 分页查询
      *
@@ -145,19 +185,75 @@ public class AssetTaskController extends BaseController {
 
 
     /**
-     * 任务审核详情信息
+     * web资产任务审核详情信息
      *
      * @param taskId  任务id
      * @param assetId 资产id
      * @return
      */
-    @ApiOperation(value = "任务审核详情信息", response = AssetCurrent.class)
+    @ApiOperation(value = "web资产任务审核详情信息", response = AssetCurrent.class)
     @GetMapping("/taskSh")
     public AjaxResult taskSh(@RequestParam("taskId") int taskId, @RequestParam("assetId") int assetId) {
 
         return AjaxResult.success(assetTaskService.taskSh(taskId, assetId));
     }
 
+    /**
+     * 小程序资产任务审核详情信息
+     *
+     * @param taskId  任务id
+     * @param assetId 资产id
+     * @return
+     */
+    @ApiOperation(value = "小程序资产任务审核详情信息", response = AssetCurrent.class)
+    @GetMapping("/minitaskSh")
+    public AjaxResult minitaskSh(@RequestParam("taskId") int taskId, @RequestParam("assetId") int assetId) {
+
+        return AjaxResult.success(assetTaskService.minitaskSh(taskId, assetId));
+    }
+
+    /**
+     * 公众号资产任务审核详情信息
+     *
+     * @param taskId  任务id
+     * @param assetId 资产id
+     * @return
+     */
+    @ApiOperation(value = "公众号资产任务审核详情信息", response = AssetCurrent.class)
+    @GetMapping("/officetaskSh")
+    public AjaxResult officetaskSh(@RequestParam("taskId") int taskId, @RequestParam("assetId") int assetId) {
+
+        return AjaxResult.success(assetTaskService.officetaskSh(taskId, assetId));
+    }
+
+
+    /**
+     * 电子邮件资产任务审核详情信息
+     *
+     * @param taskId  任务id
+     * @param assetId 资产id
+     * @return
+     */
+    @ApiOperation(value = "电子邮件资产任务审核详情信息", response = AssetCurrent.class)
+    @GetMapping("/emailtaskSh")
+    public AjaxResult emailtaskSh(@RequestParam("taskId") int taskId, @RequestParam("assetId") int assetId) {
+
+        return AjaxResult.success( assetTaskService.emailtaskSh(taskId, assetId));
+    }
+
+    /**
+     * 移动应用程序资产任务审核详情信息
+     *
+     * @param taskId  任务id
+     * @param assetId 资产id
+     * @return
+     */
+    @ApiOperation(value = "移动应用程序资产", response = AssetCurrent.class)
+    @GetMapping("/apptaskSh")
+    public AjaxResult apptaskSh(@RequestParam("taskId") int taskId, @RequestParam("assetId") int assetId) {
+
+        return AjaxResult.success(assetTaskService.apptaskSh(taskId, assetId));
+    }
 
     /**
      * 资产核查信息
@@ -174,12 +270,12 @@ public class AssetTaskController extends BaseController {
 
 
     /**
-     * 单位端暂存报废
+     * web单位端暂存报废
      *
      * @param assetCurrent 现有资产复制表
      * @return
      */
-    @ApiOperation(value = "单位端暂存报废")
+    @ApiOperation(value = "web单位端暂存报废")
     @PostMapping("/zc")
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult zcHc(@RequestBody AssetCurrentCpPo assetCurrent) {
@@ -189,6 +285,9 @@ public class AssetTaskController extends BaseController {
         assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
         unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
         assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+        //根据taskid获取当前任务的count数量
+        AssetTask assetTask = assetTaskDao.getByTaskId(assetCurrent.getTaskId());
+        int ygt = Optional.ofNullable(assetTask.getYgt()).orElse(0);
         AssetCurrent ac = new AssetCurrent();
         if (StringUtils.isBlank(assetCurrent.getBfyy())) {
             //待审批
@@ -197,6 +296,9 @@ public class AssetTaskController extends BaseController {
             //已报废
             assetCurrent.setStatus(5);
             assetCurrent.setXtzt("5");
+            //已关停
+            ygt++;
+            assetTaskService.updateYgtByTaskId(assetCurrent.getTaskId(),ygt);
 
         }
         StringBuilder a = new StringBuilder();
@@ -368,6 +470,257 @@ public class AssetTaskController extends BaseController {
         return AjaxResult.success(assetTaskService.dwHc(assetdwHcResponsePage, req));
     }
 
+    /**
+     * 小程序单位端暂存报废
+     *
+     * @param assetMiniProgramsCpPo 小程序复制表
+     * @return
+     */
+    @ApiOperation(value = "小程序单位端暂存报废")
+    @PostMapping("/xcxzc")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult xcxzc(@RequestBody AssetMiniProgramsCpPo assetMiniProgramsCpPo) {
+        //根据资产id和任务id删除数据
+        assetMiniProgramsCpService.deletByAssetIdandTaskId(assetMiniProgramsCpPo.getAssetId(), assetMiniProgramsCpPo.getTaskId());
+        //根据taskid获取当前任务的count数量
+        AssetTask assetTask = assetTaskDao.getByTaskId(assetMiniProgramsCpPo.getTaskId());
+        int ygt = Optional.ofNullable(assetTask.getYgt()).orElse(0);
+        AssetMiniPrograms ac = new AssetMiniPrograms();
+        if (StringUtils.isBlank(assetMiniProgramsCpPo.getBfyy())) {
+            //待审批
+            assetMiniProgramsCpPo.setStatus(0);
+        } else {
+            //已报废
+            assetMiniProgramsCpPo.setStatus(5);
+            ac.setIsbf(2);
+            ac.setId(assetMiniProgramsCpPo.getAssetId());
+            assetMiniProgramsService.updateById(ac);
+            //已关停
+            ygt++;
+            assetTaskService.updateYgtByTaskId(assetMiniProgramsCpPo.getTaskId(),ygt);
+        }
+        assetMiniProgramsCpService.save(assetMiniProgramsCpPo);
+        return success();
+    }
+
+
+    /**
+     * 公众号单位端暂存报废
+     *
+     * @param assetOfficialAccountCpPo 公众号复制表
+     * @return
+     */
+    @ApiOperation(value = "公众号单位端暂存报废")
+    @PostMapping("/gzhzc")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult gzhzc(@RequestBody AssetOfficialAccountCpPo assetOfficialAccountCpPo) {
+        //根据资产id和任务id删除数据
+        assetOfficialAccountCpService.deletByAssetIdandTaskId(assetOfficialAccountCpPo.getAssetId(), assetOfficialAccountCpPo.getTaskId());
+        //根据taskid获取当前任务的count数量
+        AssetTask assetTask = assetTaskDao.getByTaskId(assetOfficialAccountCpPo.getTaskId());
+        int ygt = Optional.ofNullable(assetTask.getYgt()).orElse(0);
+        AssetOfficialAccount ac = new AssetOfficialAccount();
+        if (StringUtils.isBlank(assetOfficialAccountCpPo.getBfyy())) {
+            //待审批
+            assetOfficialAccountCpPo.setStatus(0);
+        } else {
+            //已报废
+            assetOfficialAccountCpPo.setStatus(5);
+            ac.setIsbf(2);
+            ac.setId(assetOfficialAccountCpPo.getAssetId());
+            assetOfficialAccountService.updateById(ac);
+            //已关停
+            ygt++;
+            assetTaskService.updateYgtByTaskId(assetOfficialAccountCpPo.getTaskId(),ygt);
+        }
+
+        assetOfficialAccountCpService.save(assetOfficialAccountCpPo);
+        return success();
+    }
 
+
+    /**
+     * 资产移动应用程序单位端暂存报废
+     *
+     * @param assetAppCpPo 资产移动应用程序复制表
+     * @return
+     */
+    @ApiOperation(value = "资产移动应用程序单位端暂存报废")
+    @PostMapping("/appzc")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult appzc(@RequestBody AssetAppCpPo assetAppCpPo) {
+        //根据资产id和任务id删除数据
+        assetAppCpService.deletByAssetIdandTaskId(assetAppCpPo.getAssetId(), assetAppCpPo.getTaskId());
+        //根据taskid获取当前任务的count数量
+        AssetTask assetTask = assetTaskDao.getByTaskId(assetAppCpPo.getTaskId());
+        int ygt = Optional.ofNullable(assetTask.getYgt()).orElse(0);
+        AssetApp ac = new AssetApp();
+        if (StringUtils.isBlank(assetAppCpPo.getBfyy())) {
+            //待审批
+            assetAppCpPo.setStatus(0);
+        } else {
+            //已报废
+            assetAppCpPo.setStatus(5);
+            ac.setIsbf(2);
+            ac.setId(assetAppCpPo.getAssetId());
+            assetAppService.updateById(ac);
+            //已关停
+            ygt++;
+            assetTaskService.updateYgtByTaskId(assetAppCpPo.getTaskId(),ygt);
+        }
+
+        assetAppCpService.save(assetAppCpPo);
+        return success();
+    }
+
+
+    /**
+     * 电子邮件单位端暂存报废
+     *
+     * @param assetEmailCpPo 电子邮件复制表
+     * @return
+     */
+    @ApiOperation(value = "电子邮件单位端暂存报废")
+    @PostMapping("/emailzc")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult emailzc(@RequestBody AssetEmailCpPo assetEmailCpPo) {
+        //根据资产id和任务id删除数据
+        assetEmailCpService.deletByAssetIdandTaskId(assetEmailCpPo.getAssetId(), assetEmailCpPo.getTaskId());
+        //根据taskid获取当前任务的count数量
+        AssetTask assetTask = assetTaskDao.getByTaskId(assetEmailCpPo.getTaskId());
+        int ygt = Optional.ofNullable(assetTask.getYgt()).orElse(0);
+        AssetEmail ac = new AssetEmail();
+        if (StringUtils.isBlank(assetEmailCpPo.getBfyy())) {
+            //待审批
+            assetEmailCpPo.setStatus(0);
+        } else {
+            //已报废
+            assetEmailCpPo.setStatus(5);
+            ac.setIsbf(2);
+            ac.setId(assetEmailCpPo.getAssetId());
+            assetEmailService.updateById(ac);
+            //已关停
+            ygt++;
+            assetTaskService.updateYgtByTaskId(assetEmailCpPo.getTaskId(),ygt);
+        }
+
+
+        assetEmailCpService.save(assetEmailCpPo);
+        return success();
+    }
+
+
+    /**
+     * 小程序单位端校验提交
+     *
+     * @param assetMiniProgramsJyPo 小程序资产复制表
+     * @return
+     */
+    @ApiOperation(value = "小程序单位端校验提交")
+    @PostMapping("/xcxjyTj")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult xcxJyTj(@RequestBody AssetMiniProgramsJyPo assetMiniProgramsJyPo) {
+        assetMiniProgramsCpService.deletByAssetIdandTaskId(assetMiniProgramsJyPo.getAssetId(), assetMiniProgramsJyPo.getTaskId());
+        //新增流程节点时间
+        AssetLc assetLc = new AssetLc();
+        assetLc.setTaskId(assetMiniProgramsJyPo.getTaskId());
+        assetLc.setAssetName(assetMiniProgramsJyPo.getXcxmc());
+        assetMiniProgramsJyPo.setStatus(1);
+        //当审核状态为带待核查
+        if (assetMiniProgramsJyPo.getStatus().equals(1)) {
+            assetLc.setXfTime(LocalDateTime.now());
+            assetLc.setTaskId(assetMiniProgramsJyPo.getTaskId());
+            assetLc.setAssetName("单位核查完成提交" + assetMiniProgramsJyPo.getXcxmc());
+            assetLcService.insert(assetLc);
+        }
+        assetMiniProgramsJyService.save(assetMiniProgramsJyPo);
+        return success();
+    }
+
+
+    /**
+     * 公众号单位端校验提交
+     *
+     * @param assetOfficialAccountJyPo 公众号资产复制表
+     * @return
+     */
+    @ApiOperation(value = "公众号单位端校验提交")
+    @PostMapping("/gzhjyTj")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult gzhjyTj(@RequestBody AssetOfficialAccountJyPo assetOfficialAccountJyPo) {
+        assetOfficialAccountCpService.deletByAssetIdandTaskId(assetOfficialAccountJyPo.getAssetId(), assetOfficialAccountJyPo.getTaskId());
+        //新增流程节点时间
+        AssetLc assetLc = new AssetLc();
+        assetLc.setTaskId(assetOfficialAccountJyPo.getTaskId());
+        assetLc.setAssetName(assetOfficialAccountJyPo.getGzhmc());
+        assetOfficialAccountJyPo.setStatus(1);
+        //当审核状态为带待核查
+        if (assetOfficialAccountJyPo.getStatus().equals(1)) {
+            assetLc.setXfTime(LocalDateTime.now());
+            assetLc.setTaskId(assetOfficialAccountJyPo.getTaskId());
+            assetLc.setAssetName("单位核查完成提交" + assetOfficialAccountJyPo.getGzhmc());
+            assetLcService.insert(assetLc);
+        }
+        assetOfficialAccountJyService.save(assetOfficialAccountJyPo);
+        return success();
+    }
+
+
+    /**
+     * 资产移动应用程序单位端校验提交
+     *
+     * @param assetAppJyPo 资产移动应用程序资产复制表
+     * @return
+     */
+    @ApiOperation(value = "资产移动应用程序单位端校验提交")
+    @PostMapping("/appjyTj")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult appjyTj(@RequestBody AssetAppJyPo assetAppJyPo) {
+        //根据资产id和任务id删除数据
+        assetAppCpService.deletByAssetIdandTaskId(assetAppJyPo.getAssetId(), assetAppJyPo.getTaskId());
+        //新增流程节点时间
+        AssetLc assetLc = new AssetLc();
+        assetLc.setTaskId(assetAppJyPo.getTaskId());
+        assetLc.setAssetName(assetAppJyPo.getAppName());
+        assetAppJyPo.setStatus(1);
+        //当审核状态为带待核查
+        if (assetAppJyPo.getStatus().equals(1)) {
+            assetLc.setXfTime(LocalDateTime.now());
+            assetLc.setTaskId(assetAppJyPo.getTaskId());
+            assetLc.setAssetName("单位核查完成提交" + assetAppJyPo.getAppName());
+            assetLcService.insert(assetLc);
+        }
+        assetAppJyService.save(assetAppJyPo);
+        return success();
+    }
+
+
+    /**
+     * 电子邮件单位端校验提交
+     *
+     * @param assetEmailJyPo 电子邮件资产复制表
+     * @return
+     */
+    @ApiOperation(value = "电子邮件单位端校验提交")
+    @PostMapping("/emailjyTj")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult emailjyTj(@RequestBody AssetEmailJyPo assetEmailJyPo) {
+        //根据资产id和任务id删除数据
+        assetEmailCpService.deletByAssetIdandTaskId(assetEmailJyPo.getAssetId(), assetEmailJyPo.getTaskId());
+        //新增流程节点时间
+        AssetLc assetLc = new AssetLc();
+        assetLc.setTaskId(assetEmailJyPo.getTaskId());
+        assetLc.setAssetName(assetEmailJyPo.getDzyxhz());
+        assetEmailJyPo.setStatus(1);
+        //当审核状态为带待核查
+        if (assetEmailJyPo.getStatus().equals(1)) {
+            assetLc.setXfTime(LocalDateTime.now());
+            assetLc.setTaskId(assetEmailJyPo.getTaskId());
+            assetLc.setAssetName("单位核查完成提交" + assetEmailJyPo.getDzyxhz());
+            assetLcService.insert(assetLc);
+        }
+        assetEmailJyService.save(assetEmailJyPo);
+        return success();
+    }
 }
 

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

@@ -34,7 +34,7 @@ import java.util.*;
  */
 @Api(tags = "单位表控制层")
 @RestController
-@PreAuthorize("@ss.hasAnyRoles('admin,common')")
+//@PreAuthorize("@ss.hasAnyRoles('admin,common')")
 @RequestMapping("/tc/unit")
 public class UnitController {
 

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

@@ -32,6 +32,9 @@ public class AssetApp extends BaseClass implements Serializable {
     @ApiModelProperty("所属单位")
     @Excel(name = "所属单位", sort = 1, width = 24)
     private String ssdw;
+
+    @ApiModelProperty("是否报废")
+    private Integer isbf=0;
     /**
      * 移动应用名称
      */

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

@@ -31,6 +31,9 @@ public class AssetEmail extends BaseClass implements Serializable {
     @Excel(name = "所属单位", sort = 1, width = 24)
     @ApiModelProperty("所属单位")
     private String ssdw;
+
+    @ApiModelProperty("是否报废")
+    private Integer isbf=0;
     /**
     * 电子邮箱后缀
     */

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

@@ -187,4 +187,9 @@ public class AssetMiniPrograms extends BaseClass implements Serializable {
     */
     @ApiModelProperty("删除标志（0代表存在 2代表删除）")
     private String delFlag;
+
+
+
+    @ApiModelProperty("是否报废")
+    private Integer isbf=0;
 }

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

@@ -161,6 +161,8 @@ public class AssetOfficialAccount extends BaseClass implements Serializable {
     @ApiModelProperty("菜单类型")
     private String cdlx;
 
+    @ApiModelProperty("是否报废")
+    private Integer isbf=0;
     /**
      * 删除标志（0代表存在 2代表删除）
      */

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

@@ -121,5 +121,37 @@ public class AssetTask implements Serializable {
     @ApiModelProperty("备注")
     private String reamark;
 
+
+    /**
+     * 资产类型
+     */
+    @ApiModelProperty("0:web资产，1:小程序资产，2：公众号资产，3：电子邮件资产，4：移动应用程序资产")
+    private String type;
+
+
+    /**
+     * 单位全部资产数量
+     */
+    @ApiModelProperty("单位全部资产数量")
+    private Integer totalCount;
+
+
+    /**
+     * 通过数量
+     */
+    @ApiModelProperty("通过数量")
+    private Integer count;
+
+    /**
+     * 超期数量
+     */
+    @ApiModelProperty("超期数量")
+    private Integer deadlineCount;
+
+    /**
+     * 超期数量
+     */
+    @ApiModelProperty("已关停")
+    private Integer ygt;
 }
 

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

@@ -0,0 +1,153 @@
+package com.ruoyi.tc.entity.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.tc.baseClass.BaseClass;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 资产移动应用程序(asset_app_cp)表
+ *
+ * @author du
+ */
+@Data
+@ApiModel("资产移动应用程序")
+@TableName(value = "asset_app_cp")
+public class AssetAppCpPo extends BaseClass implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("id")
+    @TableId(value = "app_id", type = IdType.AUTO)
+    private Long appId;
+
+    @ApiModelProperty("资产id")
+    private Long assetId;
+
+    @ApiModelProperty("任务id")
+    private Integer taskId;
+    /**
+     * 所属单位
+     */
+    @ApiModelProperty("所属单位")
+
+    private String ssdw;
+    /**
+     * 移动应用名称
+     */
+    @ApiModelProperty("移动应用名称")
+
+    private String appName;
+    /**
+     * 包名
+     */
+
+    @ApiModelProperty("包名")
+    private String pack;
+    /**
+     * icp备案状态（字典）
+     */
+
+    @ApiModelProperty("icp备案状态（字典）")
+    private String icpState;
+    /**
+     * icp备案号
+     */
+
+    @ApiModelProperty("icp备案号")
+    private String icpbah;
+    /**
+     * 统一社会信用代码
+     */
+
+    @ApiModelProperty("统一社会信用代码")
+    private String tyshxydm;
+    /**
+     * 文件名
+     */
+
+    @ApiModelProperty("文件名")
+    private String wjm;
+    /**
+     * 所属行业（字典）
+     */
+    @ApiModelProperty("所属行业（字典）")
+
+    private String sshy;
+    /**
+     * 重点行业（字典）
+     */
+
+    @ApiModelProperty("重点行业（字典）")
+    private String zdhy;
+    /**
+     * 行政区划（字典）
+     */
+
+    @ApiModelProperty("行政区划（字典）")
+    private String xzqh;
+    /**
+     * 简介
+     */
+
+    @ApiModelProperty("简介")
+    private String jj;
+    /**
+     * 安全加固情况（字典）
+     */
+
+    @ApiModelProperty("安全加固情况（字典）")
+    private String aqjgqk;
+    /**
+     * 版本信息
+     */
+
+    @ApiModelProperty("版本信息")
+    private String bbxx;
+    /**
+     * 版本号
+     */
+
+    @ApiModelProperty("版本号")
+    private String bbh;
+    /**
+     * 版本信息（MD5）
+     */
+
+    @ApiModelProperty("版本信息（MD5）")
+    private String bbxxMd5;
+    /**
+     * 版本信息（上架平台）
+     */
+
+    @ApiModelProperty("版本信息（上架平台）")
+    private String bbxxSjpt;
+    /**
+     * 文件大小
+     */
+
+    @ApiModelProperty("文件大小")
+    private String wjdx;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+    @ApiModelProperty("报废原因")
+    private String bfyy;
+
+
+
+    @ApiModelProperty("不通过原因")
+    private String  btgyy;
+
+    @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
+    private Integer status;
+}

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

@@ -0,0 +1,159 @@
+package com.ruoyi.tc.entity.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.tc.baseClass.BaseClass;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 资产移动应用程序(asset_app_cp)表
+ *
+ * @author du
+ */
+@Data
+@ApiModel("资产移动应用程序")
+@TableName(value = "asset_app_cp")
+public class AssetAppJyPo extends BaseClass implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("id")
+    @TableId(value = "app_id", type = IdType.AUTO)
+    private Long appId;
+
+    @ApiModelProperty("资产id")
+    private Long assetId;
+
+    @ApiModelProperty("任务id")
+    private Integer taskId;
+    /**
+     * 所属单位
+     */
+    @ApiModelProperty("所属单位")
+    @Excel(name = "所属单位", sort = 1, width = 24)
+    private String ssdw;
+    /**
+     * 移动应用名称
+     */
+    @ApiModelProperty("移动应用名称")
+    @Excel(name = "移动应用名称", sort = 2, width = 22)
+    private String appName;
+    /**
+     * 包名
+     */
+    @Excel(name = "包名", sort = 3, width = 28)
+    @ApiModelProperty("包名")
+    private String pack;
+    /**
+     * icp备案状态（字典）
+     */
+    @Excel(name = "icp备案状态", dictType = "app_icp_state", comboReadDict = true, sort = 4, width = 22)
+    @ApiModelProperty("icp备案状态（字典）")
+    private String icpState;
+    /**
+     * icp备案号
+     */
+    @Excel(name = "icp备案号", sort = 5)
+    @ApiModelProperty("icp备案号")
+    private String icpbah;
+    /**
+     * 统一社会信用代码
+     */
+    @Excel(name = "统一社会信用代码", sort = 6, width = 22)
+    @ApiModelProperty("统一社会信用代码")
+    private String tyshxydm;
+    /**
+     * 文件名
+     */
+    @Excel(name = "文件名", sort = 7, width = 22)
+    @ApiModelProperty("文件名")
+    private String wjm;
+    /**
+     * 所属行业（字典）
+     */
+    @ApiModelProperty("所属行业（字典）")
+    @Excel(name = "所属行业", dictType = "app_sshy", comboReadDict = true, sort = 8, width = 18)
+    private String sshy;
+    /**
+     * 重点行业（字典）
+     */
+    @Excel(name = "重点行业", dictType = "app_zdhy", comboReadDict = true, sort = 9, width = 18)
+    @ApiModelProperty("重点行业（字典）")
+    private String zdhy;
+    /**
+     * 行政区划（字典）
+     */
+    @Excel(name = "行政区划", dictType = "app_xzqh", comboReadDict = true, sort = 10, width = 18)
+    @ApiModelProperty("行政区划（字典）")
+    private String xzqh;
+    /**
+     * 简介
+     */
+    @Excel(name = "简介", sort = 11, width = 28)
+    @ApiModelProperty("简介")
+    private String jj;
+    /**
+     * 安全加固情况（字典）
+     */
+    @Excel(name = "安全加固情况", dictType = "app_aqjgqk", comboReadDict = true, sort = 12, width = 18)
+    @ApiModelProperty("安全加固情况（字典）")
+    private String aqjgqk;
+    /**
+     * 版本信息
+     */
+    @Excel(name = "版本信息", sort = 13, width = 20)
+    @ApiModelProperty("版本信息")
+    private String bbxx;
+    /**
+     * 版本号
+     */
+    @Excel(name = "版本信息（版本号）", sort = 14, width = 24)
+    @ApiModelProperty("版本号")
+    private String bbh;
+    /**
+     * 版本信息（MD5）
+     */
+    @Excel(name = "版本信息（MD5）", sort = 15, width = 28)
+    @ApiModelProperty("版本信息（MD5）")
+    private String bbxxMd5;
+    /**
+     * 版本信息（上架平台）
+     */
+    @Excel(name = "版本信息（上架平台）", sort = 16, width = 24)
+    @ApiModelProperty("版本信息（上架平台）")
+    private String bbxxSjpt;
+    /**
+     * 文件大小
+     */
+    @Excel(name = "文件大小", sort = 17, width = 20)
+    @ApiModelProperty("文件大小")
+    private String wjdx;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @ApiModelProperty("报废原因")
+    private String bfyy;
+
+
+
+    @ApiModelProperty("不通过原因")
+    private String  btgyy;
+
+    @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
+    private Integer status;
+
+
+
+
+
+}

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

@@ -0,0 +1,159 @@
+package com.ruoyi.tc.entity.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.tc.baseClass.BaseClass;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 电子邮件资产表(asset_email_cp)实体类
+ *
+ * @author du
+ * @since 2024/11/13 14:44
+ */
+@Data
+@ApiModel("电子邮件资产表")
+@TableName(value = "asset_email_cp")
+public class AssetEmailCpPo extends BaseClass implements Serializable {
+
+
+    @ApiModelProperty("email_id")
+    @TableId(value = "email_id", type = IdType.AUTO)
+    private Long emailId;
+
+
+    @ApiModelProperty("资产id")
+    private Long assetId;
+
+    @ApiModelProperty("任务id")
+    private Integer taskId;
+    /**
+     * 所属单位
+     */
+
+    @ApiModelProperty("所属单位")
+    private String ssdw;
+    /**
+     * 电子邮箱后缀
+     */
+
+    @ApiModelProperty("电子邮箱后缀")
+    private String dzyxhz;
+    /**
+     * 建设类型（字典）
+     */
+
+    @ApiModelProperty("建设类型（字典）")
+    private String jslx;
+    /**
+     * 邮件系统供应商
+     */
+
+    @ApiModelProperty("邮件系统供应商")
+    private String yjxtgys;
+    /**
+     * 密码算法
+     */
+
+    @ApiModelProperty("密码算法")
+    private String mmsf;
+    /**
+     * 邮件系统状态（字典)
+     */
+
+    @ApiModelProperty("邮件系统状态（字典)")
+    private String yjxtzc;
+    /**
+     * 安全防护系统（字典）
+     */
+
+    @ApiModelProperty("安全防护系统（字典）")
+    private String aqfhxt;
+    /**
+     * 安全备份环境(字典）
+     */
+
+    @ApiModelProperty("安全备份环境(字典）")
+    private String aqbfhj;
+    /**
+     * 数字证书厂商
+     */
+
+    @ApiModelProperty("数字证书厂商")
+    private String szzscs;
+    /**
+     * 上线时间
+     */
+
+    @ApiModelProperty("上线时间")
+    private String sxsj;
+    /**
+     * 所属行业（字典）
+     */
+
+    @ApiModelProperty("所属行业（字典）")
+    private String sshy;
+    /**
+     * 重点行业（字典）
+     */
+
+    @ApiModelProperty("重点行业（字典）")
+    private String zdhy;
+    /**
+     * 行政区划（字典）
+     */
+
+    @ApiModelProperty("行政区划（字典）")
+    private String xzqh;
+    /**
+     * 简介
+     */
+
+    @ApiModelProperty("简介")
+    private String jj;
+    /**
+     * 系统责任人
+     */
+
+    @ApiModelProperty("系统责任人")
+    private String xtzrr;
+    /**
+     * 系统责任人电话
+     */
+
+    @ApiModelProperty("系统责任人电话")
+    private String xtzrrdh;
+    /**
+     * 系统责任人邮箱
+     */
+    @ApiModelProperty("系统责任人邮箱")
+    private String xtzrryx;
+    /**
+     * 系统责任人地址
+     */
+
+    @ApiModelProperty("系统责任人地址")
+    private String xtzrrdz;
+
+
+    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @ApiModelProperty("报废原因")
+    private String bfyy;
+
+    @ApiModelProperty("不通过原因")
+    private String  btgyy;
+
+    @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
+    private Integer status;
+
+
+
+}

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

@@ -0,0 +1,157 @@
+package com.ruoyi.tc.entity.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.tc.baseClass.BaseClass;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 电子邮件资产表(asset_email_cp)实体类
+ * @author du
+ * @since 2024/11/13 14:44
+*/
+@Data
+@ApiModel("电子邮件资产表")
+@TableName(value = "asset_email_cp")
+public class AssetEmailJyPo extends BaseClass implements Serializable {
+
+
+    @ApiModelProperty("email_id")
+    @TableId(value = "email_id",type = IdType.AUTO)
+    private Long emailId;
+
+    @ApiModelProperty("资产id")
+    private Long assetId;
+
+    @ApiModelProperty("任务id")
+    private Integer taskId;
+    /**
+    * 所属单位
+    */
+    @Excel(name = "所属单位", sort = 1, width = 24)
+    @ApiModelProperty("所属单位")
+    private String ssdw;
+    /**
+    * 电子邮箱后缀
+    */
+    @Excel(name = "电子邮箱后缀", sort = 2, width = 20)
+    @ApiModelProperty("电子邮箱后缀")
+    private String dzyxhz;
+    /**
+    * 建设类型（字典）
+    */
+    @Excel(name = "建设类型", sort = 3, width = 20,dictType = "email_jslx",comboReadDict = true)
+    @ApiModelProperty("建设类型（字典）")
+    private String jslx;
+    /**
+    * 邮件系统供应商
+    */
+    @Excel(name = "邮件系统供应商", sort = 4, width = 24)
+    @ApiModelProperty("邮件系统供应商")
+    private String yjxtgys;
+    /**
+    * 密码算法
+    */
+    @Excel(name = "密码算法", sort = 5, width = 22)
+    @ApiModelProperty("密码算法")
+    private String mmsf;
+    /**
+    * 邮件系统状态（字典)
+    */
+    @Excel(name = "邮件系统状态", sort = 6, width = 20,dictType = "email_state",comboReadDict = true)
+    @ApiModelProperty("邮件系统状态（字典)")
+    private String yjxtzc;
+    /**
+    * 安全防护系统（字典）
+    */
+    @Excel(name = "安全防护系统", sort = 7, dictType = "email_hasorno",comboReadDict = true)
+    @ApiModelProperty("安全防护系统（字典）")
+    private String aqfhxt;
+    /**
+    * 安全备份环境(字典）
+    */
+    @Excel(name = "安全备份环境", sort = 8, dictType = "email_hasorno",comboReadDict = true)
+    @ApiModelProperty("安全备份环境(字典）")
+    private String aqbfhj;
+    /**
+    * 数字证书厂商
+    */
+    @Excel(name = "数字证书厂商", sort = 9)
+    @ApiModelProperty("数字证书厂商")
+    private String szzscs;
+    /**
+    * 上线时间
+    */
+    @Excel(name = "上线时间", sort = 10)
+    @ApiModelProperty("上线时间")
+    private String sxsj;
+    /**
+    * 所属行业（字典）
+    */
+    @Excel(name = "所属行业",dictType = "app_sshy",comboReadDict = true,sort = 11, width = 18)
+    @ApiModelProperty("所属行业（字典）")
+    private String sshy;
+    /**
+    * 重点行业（字典）
+    */
+    @Excel(name = "重点行业",dictType = "app_zdhy",comboReadDict = true,sort = 12, width = 18)
+    @ApiModelProperty("重点行业（字典）")
+    private String zdhy;
+    /**
+    * 行政区划（字典）
+    */
+    @Excel(name = "行政区划",dictType = "app_xzqh",comboReadDict = true,sort = 13, width = 18)
+    @ApiModelProperty("行政区划（字典）")
+    private String xzqh;
+    /**
+    * 简介
+    */
+    @Excel(name = "简介",sort = 14, width = 28)
+    @ApiModelProperty("简介")
+    private String jj;
+    /**
+    * 系统责任人
+    */
+    @Excel(name = "系统责任人",sort = 15)
+    @ApiModelProperty("系统责任人")
+    private String xtzrr;
+    /**
+    * 系统责任人电话
+    */
+    @Excel(name = "系统责任人电话",sort = 16)
+    @ApiModelProperty("系统责任人电话")
+    private String xtzrrdh;
+    /**
+    * 系统责任人邮箱
+    */
+    @Excel(name = "系统责任人邮箱",sort = 17)
+    @ApiModelProperty("系统责任人邮箱")
+    private String xtzrryx;
+    /**
+    * 系统责任人地址
+    */
+    @Excel(name = "系统责任人地址",sort = 18)
+    @ApiModelProperty("系统责任人地址")
+    private String xtzrrdz;
+
+
+    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @ApiModelProperty("报废原因")
+    private String bfyy;
+
+    @ApiModelProperty("不通过原因")
+    private String  btgyy;
+
+    @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
+    private Integer status;
+
+
+}

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

@@ -0,0 +1,207 @@
+package com.ruoyi.tc.entity.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.tc.baseClass.BaseClass;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 小程序资产表(asset_mini_programs_cp)实体类
+ *
+ * @author du
+ * @since 2024/11/13 14:44
+ */
+@Data
+@ApiModel("小程序资产表")
+@TableName(value = "asset_mini_programs_cp")
+public class AssetMiniProgramsCpPo extends BaseClass implements Serializable {
+
+    /**
+     *
+     */
+    @ApiModelProperty("mini_id")
+    @TableId(value = "mini_id", type = IdType.AUTO)
+    private Long miniId;
+
+
+    @ApiModelProperty("资产id")
+    private Long assetId;
+
+    @ApiModelProperty("任务id")
+    private Integer taskId;
+
+    /**
+     * 所属单位
+     */
+
+    @ApiModelProperty("所属单位")
+    private String ssdw;
+    /**
+     * 小程序名称
+     */
+
+    @ApiModelProperty("小程序名称")
+    private String xcxmc;
+    /**
+     * appid
+     */
+
+    @ApiModelProperty("appid")
+    private String appId;
+    /**
+     * 认证主体
+     */
+
+    @ApiModelProperty("认证主体")
+    private String rzzt;
+    /**
+     * 统一社会信用代码
+     */
+
+    @ApiModelProperty("统一社会信用代码")
+    private String tyshxydm;
+    /**
+     * 小程序状态（字典）
+     */
+
+    @ApiModelProperty("小程序状态（字典）")
+    private String state;
+    /**
+     * 账号原始ID
+     */
+
+    @ApiModelProperty("账号原始ID")
+    private String ysId;
+    /**
+     * 小程序包状态(字典)
+     */
+    @ApiModelProperty("小程序包状态(字典)")
+    private String packState;
+    /**
+     * 认证状态(字典）
+     */
+
+    @ApiModelProperty("认证状态(字典）")
+    private String rzState;
+    /**
+     * 认证时间
+     */
+
+    @ApiModelProperty("认证时间")
+    private String rzsj;
+    /**
+     * 认证类型（字典）
+     */
+
+    @ApiModelProperty("认证类型（字典）")
+    private String rzlx;
+    /**
+     * icp备案状态
+     */
+    @ApiModelProperty("icp备案状态")
+
+    private String icpState;
+    /**
+     * 域命白名单
+     */
+
+    @ApiModelProperty("域命白名单")
+    private String ymbmd;
+    /**
+     * 服务类目
+     */
+
+    @ApiModelProperty("服务类目")
+    private String fwlm;
+    /**
+     * 行业电子邮箱
+     */
+
+    @ApiModelProperty("行业电子邮箱")
+    private String hydzyx;
+    /**
+     * 所属行业（字典）
+     */
+    @ApiModelProperty("所属行业（字典）")
+
+    private String sshy;
+    /**
+     * 重点行业(字典)
+     */
+
+    @ApiModelProperty("重点行业(字典)")
+    private String zdhy;
+    /**
+     * 行政区划（字典)
+     */
+
+    @ApiModelProperty("行政区划（字典)")
+    private String xzqh;
+    /**
+     * 系统简介
+     */
+
+    @ApiModelProperty("系统简介")
+    private String xtjj;
+    /**
+     * 系统责任人
+     */
+
+    @ApiModelProperty("系统责任人")
+    private String xtzrr;
+    /**
+     * 系统责任人电话
+     */
+
+    @ApiModelProperty("系统责任人电话")
+    private String xtzrrdh;
+    /**
+     * 系统责任人邮箱
+     */
+
+    @ApiModelProperty("系统责任人邮箱")
+    private String xtzrryx;
+    /**
+     * 系统责任人地址
+     */
+
+    @ApiModelProperty("系统责任人地址")
+    private String xtzrrdz;
+    /**
+     * 引用插件appid
+     */
+
+    @ApiModelProperty("引用插件appid")
+    private String yycjAppid;
+    /**
+     * 引用插件开发者
+     */
+
+    @ApiModelProperty("引用插件开发者")
+    private String yycjKfz;
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+
+    @ApiModelProperty("报废原因")
+    private String bfyy;
+
+
+
+
+
+
+    @ApiModelProperty("不通过原因")
+    private String  btgyy;
+
+    @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
+    private Integer status;
+}

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

@@ -0,0 +1,206 @@
+package com.ruoyi.tc.entity.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.tc.baseClass.BaseClass;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 小程序资产表(asset_mini_programs_cp)实体类
+ *
+ * @author du
+ * @since 2024/11/13 14:44
+ */
+@Data
+@ApiModel("小程序资产表")
+@TableName(value = "asset_mini_programs_cp")
+public class AssetMiniProgramsJyPo extends BaseClass implements Serializable {
+
+    /**
+    *
+    */
+    @ApiModelProperty("mini_id")
+    @TableId(value = "mini_id",type = IdType.AUTO)
+    private Long miniId;
+
+
+    @ApiModelProperty("资产id")
+    private Long assetId;
+
+    @ApiModelProperty("任务id")
+    private Integer taskId;
+
+    /**
+    * 所属单位
+    */
+    @Excel(name = "所属单位", sort = 1, width = 22)
+    @ApiModelProperty("所属单位")
+    private String ssdw;
+    /**
+    * 小程序名称
+    */
+    @Excel(name = "小程序名称", sort = 2, width = 22)
+    @ApiModelProperty("小程序名称")
+    private String xcxmc;
+    /**
+    * appid
+    */
+    @Excel(name = "APPID", sort = 3, width = 22)
+    @ApiModelProperty("appid")
+    private String appId;
+    /**
+    * 认证主体
+    */
+    @Excel(name = "认证主体", sort = 4, width = 26)
+    @ApiModelProperty("认证主体")
+    private String rzzt;
+    /**
+    * 统一社会信用代码
+    */
+    @Excel(name = "统一社会信用代码", sort = 5)
+    @ApiModelProperty("统一社会信用代码")
+    private String tyshxydm;
+    /**
+    * 小程序状态（字典）
+    */
+    @Excel(name = "小程序状态", sort = 6,dictType = "gzh_state",comboReadDict = true)
+    @ApiModelProperty("小程序状态（字典）")
+    private String state;
+    /**
+    * 账号原始ID
+    */
+    @Excel(name = "账号原始ID", sort = 7)
+    @ApiModelProperty("账号原始ID")
+    private String ysId;
+    /**
+    * 小程序包状态(字典)
+    */
+    @Excel(name = "小程序包状态", sort = 8,dictType = "email_state",comboReadDict = true)
+    @ApiModelProperty("小程序包状态(字典)")
+    private String packState;
+    /**
+    * 认证状态(字典）
+    */
+    @Excel(name = "认证状态", sort = 9,dictType = "gzh_rzzt",comboReadDict = true)
+    @ApiModelProperty("认证状态(字典）")
+    private String rzState;
+    /**
+    * 认证时间
+    */
+    @Excel(name = "认证时间", sort = 10)
+    @ApiModelProperty("认证时间")
+    private String rzsj;
+    /**
+    * 认证类型（字典）
+    */
+    @Excel(name = "认证类型", sort = 11,dictType = "gzh_rzlx",comboReadDict = true)
+    @ApiModelProperty("认证类型（字典）")
+    private String rzlx;
+    /**
+    * icp备案状态
+    */
+    @ApiModelProperty("icp备案状态")
+    @Excel(name = "icp备案状态", sort = 12)
+    private String icpState;
+    /**
+    * 域命白名单
+    */
+    @Excel(name = "域名白名单", sort = 13)
+    @ApiModelProperty("域命白名单")
+    private String ymbmd;
+    /**
+    * 服务类目
+    */
+    @Excel(name = "服务类目", sort = 14)
+    @ApiModelProperty("服务类目")
+    private String fwlm;
+    /**
+    * 行业电子邮箱
+    */
+    @Excel(name = "行业电子邮箱", sort = 15)
+    @ApiModelProperty("行业电子邮箱")
+    private String hydzyx;
+    /**
+    * 所属行业（字典）
+    */
+    @ApiModelProperty("所属行业（字典）")
+    @Excel(name = "所属行业",dictType = "app_sshy",comboReadDict = true,sort = 16, width = 18)
+    private String sshy;
+    /**
+    * 重点行业(字典)
+    */
+    @Excel(name = "重点行业",dictType = "app_zdhy",comboReadDict = true,sort = 17, width = 18)
+    @ApiModelProperty("重点行业(字典)")
+    private String zdhy;
+    /**
+    * 行政区划（字典)
+    */
+    @Excel(name = "行政区划",dictType = "app_xzqh",comboReadDict = true,sort = 18, width = 18)
+    @ApiModelProperty("行政区划（字典)")
+    private String xzqh;
+    /**
+    * 系统简介
+    */
+    @Excel(name = "系统简介",sort = 19, width = 24)
+    @ApiModelProperty("系统简介")
+    private String xtjj;
+    /**
+    * 系统责任人
+    */
+    @Excel(name = "系统责任人",sort = 20)
+    @ApiModelProperty("系统责任人")
+    private String xtzrr;
+    /**
+    * 系统责任人电话
+    */
+    @Excel(name = "系统责任人电话",sort = 21)
+    @ApiModelProperty("系统责任人电话")
+    private String xtzrrdh;
+    /**
+    * 系统责任人邮箱
+    */
+    @Excel(name = "系统责任人邮箱",sort = 22)
+    @ApiModelProperty("系统责任人邮箱")
+    private String xtzrryx;
+    /**
+    * 系统责任人地址
+    */
+    @Excel(name = "系统责任人地址",sort = 23,width = 24)
+    @ApiModelProperty("系统责任人地址")
+    private String xtzrrdz;
+    /**
+    * 引用插件appid
+    */
+    @Excel(name = "引用插件（APPID）",sort = 24)
+    @ApiModelProperty("引用插件appid")
+    private String yycjAppid;
+    /**
+    * 引用插件开发者
+    */
+    @Excel(name = "引用插件（开发者）",sort = 25)
+    @ApiModelProperty("引用插件开发者")
+    private String yycjKfz;
+    /**
+    * 删除标志（0代表存在 2代表删除）
+    */
+    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @ApiModelProperty("报废原因")
+    private String bfyy;
+
+
+
+
+    @ApiModelProperty("不通过原因")
+    private String  btgyy;
+
+    @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
+    private Integer status;
+}

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

@@ -0,0 +1,169 @@
+package com.ruoyi.tc.entity.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.tc.baseClass.BaseClass;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 公众号资产表(asset_official_account_cp)实体类
+ *
+ * @author du
+ * @since 2024/11/13 14:44
+ */
+@Data
+@ApiModel("公众号资产表")
+@TableName(value = "asset_official_account_cp")
+public class AssetOfficialAccountCpPo extends BaseClass implements Serializable {
+
+
+    @ApiModelProperty("id")
+    @TableId(value = "account_id", type = IdType.AUTO)
+    private Long accountId;
+
+    @ApiModelProperty("资产id")
+    private Long assetId;
+
+    @ApiModelProperty("任务id")
+    private Integer taskId;
+
+    /**
+     * 所属单位
+     */
+
+    @ApiModelProperty("所属单位")
+    private String ssdw;
+
+    /**
+     * 公众号名称
+     */
+
+    @ApiModelProperty("公众号名称")
+    private String gzhmc;
+    /**
+     * 微信号
+     */
+
+    @ApiModelProperty("微信号")
+    private String wxh;
+    /**
+     * 认证主体
+     */
+
+    @ApiModelProperty("认证主体")
+    private String rzzt;
+    /**
+     * 统一社会信用代码
+     */
+    @ApiModelProperty("统一社会信用代码")
+    private String tyshxydm;
+    /**
+     * 公众号状态（字典）
+     */
+    @ApiModelProperty("公众号状态（字典）")
+    private String gzhzt;
+    /**
+     * 公众号id
+     */
+    @ApiModelProperty("公众号id")
+    private String gzhId;
+    /**
+     * 公众号类型（字典）
+     */
+    @ApiModelProperty("公众号类型（字典）")
+    private String gzhlx;
+    /**
+     * 认证状态（字典）
+     */
+    @ApiModelProperty("认证状态（字典）")
+    private String rzState;
+    /**
+     * 认证时间
+     */
+    @ApiModelProperty("认证时间")
+    private String rzsj;
+    /**
+     * 认证类型（字典）
+     */
+    @ApiModelProperty("认证类型（字典）")
+    private String rzlx;
+    /**
+     * 所属行业（字典）
+     */
+    @ApiModelProperty("所属行业（字典）")
+    private String sshy;
+    /**
+     * 重点行业（字典）
+     */
+    @ApiModelProperty("重点行业（字典）")
+    private String zdhy;
+    /**
+     * 行政区划（字典）
+     */
+    @ApiModelProperty("行政区划（字典）")
+    private String xzqh;
+    /**
+     * 系统简介
+     */
+    @ApiModelProperty("系统简介")
+    private String xtjj;
+    /**
+     * 系统责任人
+     */
+    @ApiModelProperty("系统责任人")
+    private String xtzrr;
+    /**
+     * 系统责任人电话
+     */
+    @ApiModelProperty("系统责任人电话")
+    private String xtzrrdh;
+    /**
+     * 系统责任人邮箱
+     */
+    @ApiModelProperty("系统责任人邮箱")
+    private String xtzrryx;
+    /**
+     * 系统责任人地址
+     */
+    @ApiModelProperty("系统责任人地址")
+    private String xtzrrdz;
+    /**
+     * 菜单名称
+     */
+    @ApiModelProperty("菜单名称")
+    private String cdmc;
+    /**
+     * 菜单链接
+     */
+    @ApiModelProperty("菜单链接")
+    private String cdlj;
+    /**
+     * 菜单类型
+     */
+    @ApiModelProperty("菜单类型")
+    private String cdlx;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+
+    @ApiModelProperty("报废原因")
+    private String bfyy;
+
+
+
+
+    @ApiModelProperty("不通过原因")
+    private String  btgyy;
+
+    @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
+    private Integer status;
+}

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

@@ -0,0 +1,188 @@
+package com.ruoyi.tc.entity.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.tc.baseClass.BaseClass;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 公众号资产表(asset_official_account_cp)实体类
+ *
+ * @author du
+ * @since 2024/11/13 14:44
+ */
+@Data
+@ApiModel("公众号资产表")
+@TableName(value = "asset_official_account_cp")
+public class AssetOfficialAccountJyPo extends BaseClass implements Serializable {
+
+
+    @ApiModelProperty("id")
+    @TableId(value = "account_id", type = IdType.AUTO)
+    private Long accountId;
+
+    @ApiModelProperty("资产id")
+    private Long assetId;
+
+    @ApiModelProperty("任务id")
+    private Integer taskId;
+
+    /**
+     * 所属单位
+     */
+    @Excel(name = "所属单位", sort = 1, width = 24)
+    @ApiModelProperty("所属单位")
+    private String ssdw;
+
+    /**
+     * 公众号名称
+     */
+    @Excel(name = "公众号名称", sort = 2, width = 20)
+    @ApiModelProperty("公众号名称")
+    private String gzhmc;
+    /**
+     * 微信号
+     */
+    @Excel(name = "微信号", sort = 3, width = 22)
+    @ApiModelProperty("微信号")
+    private String wxh;
+    /**
+     * 认证主体
+     */
+    @Excel(name = "认证主体", sort = 4, width = 24)
+    @ApiModelProperty("认证主体")
+    private String rzzt;
+    /**
+     * 统一社会信用代码
+     */
+    @Excel(name = "统一社会信用代码", sort = 5, width = 24)
+    @ApiModelProperty("统一社会信用代码")
+    private String tyshxydm;
+    /**
+     * 公众号状态（字典）
+     */
+    @Excel(name = "公众号状态", sort = 6, dictType = "gzh_state", comboReadDict = true)
+    @ApiModelProperty("公众号状态（字典）")
+    private String gzhzt;
+    /**
+     * 公众号id
+     */
+    @Excel(name = "公众号ID", sort = 7)
+    @ApiModelProperty("公众号id")
+    private String gzhId;
+    /**
+     * 公众号类型（字典）
+     */
+    @Excel(name = "公众号类型", sort = 8, dictType = "gzh_lx", comboReadDict = true)
+    @ApiModelProperty("公众号类型（字典）")
+    private String gzhlx;
+    /**
+     * 认证状态（字典）
+     */
+    @Excel(name = "认证状态", sort = 9, dictType = "gzh_rzzt", comboReadDict = true)
+    @ApiModelProperty("认证状态（字典）")
+    private String rzState;
+    /**
+     * 认证时间
+     */
+    @Excel(name = "认证时间", sort = 10)
+    @ApiModelProperty("认证时间")
+    private String rzsj;
+    /**
+     * 认证类型（字典）
+     */
+    @Excel(name = "认证类型", sort = 11, dictType = "gzh_rzlx", comboReadDict = true)
+    @ApiModelProperty("认证类型（字典）")
+    private String rzlx;
+    /**
+     * 所属行业（字典）
+     */
+    @Excel(name = "所属行业", dictType = "app_sshy", comboReadDict = true, sort = 12, width = 18)
+    @ApiModelProperty("所属行业（字典）")
+    private String sshy;
+    /**
+     * 重点行业（字典）
+     */
+    @Excel(name = "重点行业", dictType = "app_zdhy", comboReadDict = true, sort = 13, width = 18)
+    @ApiModelProperty("重点行业（字典）")
+    private String zdhy;
+    /**
+     * 行政区划（字典）
+     */
+    @Excel(name = "行政区划", dictType = "app_xzqh", comboReadDict = true, sort = 14, width = 18)
+    @ApiModelProperty("行政区划（字典）")
+    private String xzqh;
+    /**
+     * 系统简介
+     */
+    @Excel(name = "系统简介", sort = 15, width = 26)
+    @ApiModelProperty("系统简介")
+    private String xtjj;
+    /**
+     * 系统责任人
+     */
+    @Excel(name = "系统责任人", sort = 16)
+    @ApiModelProperty("系统责任人")
+    private String xtzrr;
+    /**
+     * 系统责任人电话
+     */
+    @Excel(name = "系统责任人电话", sort = 17)
+    @ApiModelProperty("系统责任人电话")
+    private String xtzrrdh;
+    /**
+     * 系统责任人邮箱
+     */
+    @Excel(name = "系统责任人邮箱", sort = 18)
+    @ApiModelProperty("系统责任人邮箱")
+    private String xtzrryx;
+    /**
+     * 系统责任人地址
+     */
+    @Excel(name = "系统责任人地址", sort = 19)
+    @ApiModelProperty("系统责任人地址")
+    private String xtzrrdz;
+    /**
+     * 菜单名称
+     */
+    @Excel(name = "菜单信息（菜单名称）", sort = 20)
+    @ApiModelProperty("菜单名称")
+    private String cdmc;
+    /**
+     * 菜单链接
+     */
+    @Excel(name = "菜单信息（菜单链接）", sort = 21, width = 28)
+    @ApiModelProperty("菜单链接")
+    private String cdlj;
+    /**
+     * 菜单类型
+     */
+    @Excel(name = "菜单信息（菜单类型）", sort = 22)
+    @ApiModelProperty("菜单类型")
+    private String cdlx;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @ApiModelProperty("报废原因")
+    private String bfyy;
+
+    @ApiModelProperty("是否报废")
+    private Integer isbf;
+
+
+    @ApiModelProperty("不通过原因")
+    private String  btgyy;
+
+    @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
+    private Integer status;
+}

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

@@ -35,4 +35,11 @@ public class AssestTaskXqRequest {
      */
     @ApiModelProperty("审核状态（0待核查，1待审核，3审核通过，4审核不通过，5审核不通过）")
     private String status;
+
+
+    /**
+     * 资产类型
+     */
+    @ApiModelProperty("0:web资产，1:小程序资产，2：公众号资产，3：电子邮件资产，4：移动应用程序资产")
+    private String type;
 }

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

@@ -18,6 +18,13 @@ public class AssetCurrentShRequest {
     @ApiModelProperty("任务id")
     private Integer taskId;
 
+
+    /**
+     * 资产类型
+     */
+    @ApiModelProperty("0:web资产，1:小程序资产，2：公众号资产，3：电子邮件资产，4：移动应用程序资产")
+    private Integer type;
+
     /**
      * 系统名称
      */

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

@@ -32,4 +32,10 @@ public class UnitRequest {
 
     @ApiModelProperty("页数")
     private Long size=10L;
+
+    /**
+     * 资产类型
+     */
+    @ApiModelProperty("0:web资产，1:小程序资产，2：公众号资产，3：电子邮件资产，4：移动应用程序资产")
+    private String type;
 }

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskIdResponse.java

@@ -118,5 +118,10 @@ public class AssetTaskIdResponse {
     private String reamark;
 
 
+    /**
+     * 资产类型
+     */
+    @ApiModelProperty("0:web资产，1:小程序资产，2：公众号资产，3：电子邮件资产，4：移动应用程序资产")
+    private String type;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskResponse.java

@@ -122,4 +122,11 @@ public class AssetTaskResponse {
      */
     @ApiModelProperty("审核状态（0待核查，1待审核，3审核通过，4审核不通过，5审核不通过）")
     private String status;
+
+
+    /**
+     * 资产类型
+     */
+    @ApiModelProperty("0:web资产，1:小程序资产，2：公众号资产，3：电子邮件资产，4：移动应用程序资产")
+    private String type;
 }

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

@@ -0,0 +1,61 @@
+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.AssetApp;
+import com.ruoyi.tc.entity.po.AssetAppCpPo;
+import com.ruoyi.tc.entity.request.AssetAppPageRequest;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+/**
+ * 资产移动应用程序表(asset_app_cp)表数据库访问层
+ * @author makejava
+ * @since 2024-11-15 10:03:56
+ */
+public interface AssetAppCpMapper extends BaseMapper<AssetAppCpPo> {
+
+
+
+    /**
+     * 根据资产id和任务id删除数据
+     *
+     * @param assetId 资产id
+     * @param taskId  任务id
+     */
+    @Delete("delete from asset_app_cp where asset_id=#{assetId} and task_id =#{taskId}  ")
+    void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId") int taskId);
+
+
+
+
+
+    /**
+     * 根据taskid查询查询数据
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    @Select("select * from  asset_app_cp where task_id=#{taskId}")
+    List<AssetAppCpPo> findByTaskId(@Param("taskId") int taskId);
+
+
+
+
+    /**
+     * 修改不通过原因
+     *
+     * @param assetId 资产id
+     * @param taskId 任务id
+     * @param btgyy 不通过原因
+     */
+    @Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
+    void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy);
+
+
+}
+

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

@@ -0,0 +1,17 @@
+package com.ruoyi.tc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.tc.entity.po.AssetAppCpPo;
+import com.ruoyi.tc.entity.po.AssetAppJyPo;
+
+/**
+ * 资产移动应用程序表(asset_app_cp)表数据库访问层
+ * @author makejava
+ * @since 2024-11-15 10:03:56
+ */
+public interface AssetAppJyMapper extends BaseMapper<AssetAppJyPo> {
+
+
+
+}
+

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

@@ -10,6 +10,7 @@ import java.util.List;
 
 /**
  * 资产移动应用程序表(asset_app)表数据库访问层
+ *
  * @author makejava
  * @since 2024-11-15 10:03:56
  */
@@ -33,7 +34,6 @@ public interface AssetAppMapper extends BaseMapper<AssetApp> {
     List<AssetApp> page(@Param("req") AssetAppPageRequest as);
 
 
-
     /**
      * 逻辑删除
      *
@@ -41,5 +41,21 @@ public interface AssetAppMapper extends BaseMapper<AssetApp> {
      */
     void deleteById(Long id);
 
+
+    /**
+     * 删除
+     *
+     * @param idList
+     */
+    void deleteIdList(@Param("idList") List<Long> idList);
+
+
+    /**
+     * 根据单位查询资产总数
+     *
+     * @param part 单位
+     * @return
+     */
+    Integer findBydwmc(@Param("part") String part);
 }
 

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

@@ -58,5 +58,15 @@ public interface AssetCurrentMapper extends BaseMapper<AssetCurrent> {
      * 查询所有数据(带子表)
      */
     List<AssetExport> selectAllAsset(@Param("req") AssetCurrentPageRequest as);
+
+
+
+    /**
+     * 根据单位查询资产总数
+     *
+     * @param part 单位
+     * @return
+     */
+    Integer findBydwmc(@Param("part") String part);
 }
 

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

@@ -0,0 +1,52 @@
+package com.ruoyi.tc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.tc.entity.po.AssetEmailCpPo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+/**
+ * 电子邮件资产表(asset_email_cp)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-11-15 10:03:56
+ */
+public interface AssetEmailCpMapper extends BaseMapper<AssetEmailCpPo> {
+    /**
+     * 根据资产id和任务id删除数据
+     *
+     * @param assetId 资产id
+     * @param taskId  任务id
+     */
+    @Delete("delete from asset_email_cp where asset_id=#{assetId} and task_id =#{taskId}  ")
+    void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId") int taskId);
+
+
+
+    /**
+     * 根据taskid查询查询数据
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    @Select("select * from  asset_email_cp where task_id=#{taskId}")
+    List<AssetEmailCpPo> findByTaskId(@Param("taskId") int taskId);
+
+
+
+    /**
+     * 修改不通过原因
+     *
+     * @param assetId 资产id
+     * @param taskId 任务id
+     * @param btgyy 不通过原因
+     */
+    @Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
+    void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy);
+
+}
+

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

@@ -0,0 +1,16 @@
+package com.ruoyi.tc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.tc.entity.po.AssetEmailCpPo;
+import com.ruoyi.tc.entity.po.AssetEmailJyPo;
+
+/**
+ * 电子邮件资产表(asset_email_cp)表数据库访问层
+ * @author makejava
+ * @since 2024-11-15 10:03:56
+ */
+public interface AssetEmailJyMapper extends BaseMapper<AssetEmailJyPo> {
+
+
+}
+

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

@@ -41,5 +41,21 @@ public interface AssetEmailMapper extends BaseMapper<AssetEmail> {
      */
     void deleteById(Long id);
 
+
+    /**
+     * 删除
+     * @param idList
+     */
+    void deleteIdList(@Param("idList") List<Long> idList);
+
+
+    /**
+     * 根据单位查询资产总数
+     *
+     * @param part 单位
+     * @return
+     */
+    Integer findBydwmc(@Param("part") String part);
+
 }
 

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

@@ -0,0 +1,54 @@
+package com.ruoyi.tc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+/**
+ * 小程序资产表(asset_mini_programs_cp)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-11-15 10:03:56
+ */
+public interface AssetMiniProgramsCpMapper extends BaseMapper<AssetMiniProgramsCpPo> {
+
+    /**
+     * 根据资产id和任务id删除数据
+     *
+     * @param assetId 资产id
+     * @param taskId  任务id
+     */
+    @Delete("delete from asset_mini_programs_cp where asset_id=#{assetId} and task_id =#{taskId}  ")
+    void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId") int taskId);
+
+
+
+    /**
+     * 根据taskid查询查询数据
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    @Select("select * from  asset_mini_programs_cp where task_id=#{taskId}")
+    List<AssetMiniProgramsCpPo> findByTaskId(@Param("taskId") int taskId);
+
+
+
+    /**
+     * 修改不通过原因
+     *
+     * @param assetId 资产id
+     * @param taskId 任务id
+     * @param btgyy 不通过原因
+     */
+    @Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
+    void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy);
+
+
+}
+

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

@@ -0,0 +1,20 @@
+package com.ruoyi.tc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo;
+import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
+import org.apache.ibatis.annotations.Delete;
+
+/**
+ * 小程序资产表(asset_mini_programs_cp)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-11-15 10:03:56
+ */
+public interface AssetMiniProgramsJyMapper extends BaseMapper<AssetMiniProgramsJyPo> {
+
+
+
+
+}
+

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

@@ -42,5 +42,21 @@ public interface AssetMiniProgramsMapper extends BaseMapper<AssetMiniPrograms> {
      */
     void deleteById(Long id);
 
+
+
+    /**
+     * 删除
+     * @param idList
+     */
+    void deleteIdList(@Param("idList") List<Long> idList);
+
+
+    /**
+     * 根据单位查询资产总数
+     *
+     * @param part 单位
+     * @return
+     */
+    Integer findBydwmc(@Param("part") String part);
 }
 

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

@@ -0,0 +1,53 @@
+package com.ruoyi.tc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.tc.entity.po.AssetAppCpPo;
+import com.ruoyi.tc.entity.po.AssetOfficialAccountCpPo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+/**
+ * 公众号资产表(asset_official_account_cp)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-11-15 10:03:56
+ */
+public interface AssetOfficialAccountCpMapper extends BaseMapper<AssetOfficialAccountCpPo> {
+
+    /**
+     * 根据资产id和任务id删除数据
+     *
+     * @param assetId 资产id
+     * @param taskId  任务id
+     */
+    @Delete("delete from asset_official_account_cp where asset_id=#{assetId} and task_id =#{taskId}  ")
+    void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId") int taskId);
+
+
+    /**
+     * 根据taskid查询查询数据
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    @Select("select * from  asset_official_account_cp where task_id=#{taskId}")
+    List<AssetOfficialAccountCpPo> findByTaskId(@Param("taskId") int taskId);
+
+
+
+    /**
+     * 修改不通过原因
+     *
+     * @param assetId 资产id
+     * @param taskId 任务id
+     * @param btgyy 不通过原因
+     */
+    @Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
+    void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy);
+
+}
+

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

@@ -0,0 +1,16 @@
+package com.ruoyi.tc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo;
+
+/**
+ * 公众号资产表(asset_official_account_cp)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-11-15 10:03:56
+ */
+public interface AssetOfficialAccountJyMapper extends BaseMapper<AssetOfficialAccountJyPo> {
+
+
+}
+

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

@@ -41,5 +41,19 @@ public interface AssetOfficialAccountMapper extends BaseMapper<AssetOfficialAcco
      */
     void deleteById(Long id);
 
+
+    /**
+     * 删除
+     * @param idList
+     */
+    void deleteIdList(@Param("idList") List<Long> idList);
+
+    /**
+     * 根据单位查询资产总数
+     *
+     * @param part 单位
+     * @return
+     */
+    Integer findBydwmc(@Param("part") String part);
 }
 

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

@@ -113,7 +113,7 @@ public interface AssetTaskMapper extends BaseMapper<AssetTask> {
 
 
     /**
-     * 资产核查信息
+     * web资产核查信息
      *
      * @param page        分页参数
      * @param pageRequest 查询条件
@@ -122,6 +122,46 @@ public interface AssetTaskMapper extends BaseMapper<AssetTask> {
     Page<AssestTaskXqresponse> zcHc(Page<AssestTaskXqresponse> page, @Param("req") AssestTaskXqRequest pageRequest);
 
 
+    /**
+     * 小程序资产核查信息
+     *
+     * @param page        分页参数
+     * @param pageRequest 查询条件
+     * @return
+     */
+    Page<AssestTaskXqresponse> xcxZcHc(Page<AssestTaskXqresponse> page, @Param("req") AssestTaskXqRequest pageRequest);
+
+
+    /**
+     * 公众号资产核查信息
+     *
+     * @param page        分页参数
+     * @param pageRequest 查询条件
+     * @return
+     */
+    Page<AssestTaskXqresponse> gzhZcHc(Page<AssestTaskXqresponse> page, @Param("req") AssestTaskXqRequest pageRequest);
+
+
+    /**
+     * 邮件资产核查信息
+     *
+     * @param page        分页参数
+     * @param pageRequest 查询条件
+     * @return
+     */
+    Page<AssestTaskXqresponse> emailZcHc(Page<AssestTaskXqresponse> page, @Param("req") AssestTaskXqRequest pageRequest);
+
+
+    /**
+     * 移动应用程序资产核查信息
+     *
+     * @param page        分页参数
+     * @param pageRequest 查询条件
+     * @return
+     */
+    Page<AssestTaskXqresponse> appZcHc(Page<AssestTaskXqresponse> page, @Param("req") AssestTaskXqRequest pageRequest);
+
+
     /**
      * 根据任务id，资产id查询资产主表信息
      *
@@ -141,6 +181,41 @@ public interface AssetTaskMapper extends BaseMapper<AssetTask> {
     int sh(@Param("req") AssetCurrentShRequest req);
 
 
+    /**
+     * 小程序管理端审核
+     *
+     * @param req 请求类
+     * @return
+     */
+    int xcxsh(@Param("req") AssetCurrentShRequest req);
+
+
+    /**
+     * 公众号管理端审核
+     *
+     * @param req 请求类
+     * @return
+     */
+    int gzhsh(@Param("req") AssetCurrentShRequest req);
+
+
+    /**
+     * 电子邮件管理端审核
+     *
+     * @param req 请求类
+     * @return
+     */
+    int emailsh(@Param("req") AssetCurrentShRequest req);
+
+
+    /**
+     * app管理端审核
+     *
+     * @param req 请求类
+     * @return
+     */
+    int appsh(@Param("req") AssetCurrentShRequest req);
+
     /**
      * 管理端-单位核查情况
      *
@@ -175,5 +250,22 @@ public interface AssetTaskMapper extends BaseMapper<AssetTask> {
      * @return
      */
     List<AssetTask> taskList(@Param("dwmc") String dwmc);
+
+
+    /**
+     * 修改已关停
+     *
+     * @param taskId 任务id
+     */
+
+    void updateYgtByTaskId(@Param("taskId") Integer taskId,@Param("count") int count);
+
+    /**
+     * 根据taskid获取当前任务的count数量
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    AssetTask getByTaskId(@Param("taskId") int taskId);
 }
 

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

@@ -67,4 +67,15 @@ public interface UnitMapper extends BaseMapper<Unit> {
      * @return 单位
      */
     List<Unit> selectAllUnit(@Param("req") GeneralQueryRequest req);
+
+
+
+
+    /**
+     * 根据单位查询资产总数
+     *
+     * @param part 单位
+     * @return
+     */
+    Integer findBydwmc(@Param("part") String part);
 }

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

@@ -0,0 +1,44 @@
+package com.ruoyi.tc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.tc.entity.po.AssetAppCpPo;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
+
+import java.util.List;
+
+/**
+ * 资产移动应用程序表(asset_app_cp)表服务接口
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+public interface AssetAppCpService extends IService<AssetAppCpPo> {
+
+    /**
+     * 根据资产id和任务id删除数据
+     *
+     * @param assetId 资产id
+     * @param taskId  任务id
+     */
+    void deletByAssetIdandTaskId(Long assetId, int taskId);
+
+
+
+    /**
+     * 根据taskid查询查询数据
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    List<AssetAppCpPo> findByTaskId(int taskId);
+
+
+    /**
+     * 修改不通过原因
+     *
+     * @param assetId 资产id
+     * @param taskId 任务id
+     * @param btgyy 不通过原因
+     */
+    void updateByAssetId(Integer assetId, Integer taskId, String btgyy);
+}

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

@@ -0,0 +1,14 @@
+package com.ruoyi.tc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.tc.entity.po.AssetAppJyPo;
+
+/**
+ * 资产移动应用程序表(asset_app_cp)表服务接口
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+public interface AssetAppJyService extends IService<AssetAppJyPo> {
+
+}

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

@@ -36,4 +36,23 @@ public interface AssetAppService extends IService<AssetApp> {
      * @return 所有数据
      */
     List<AssetApp> getAllList(AssetAppPageRequest as);
+
+
+
+    /**
+     * 删除
+     * @param idList
+     */
+    void deleteIdList(List<Long> idList);
+
+
+
+
+    /**
+     * 根据单位查询资产总数
+     *
+     * @param part 单位
+     * @return
+     */
+    Integer findBydwmc(String part);
 }

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

@@ -57,5 +57,14 @@ public interface AssetCurrentService extends IService<AssetCurrent> {
      * 查询所有数据(带子表)
      */
     List<AssetExport> selectAllAsset(AssetCurrentPageRequest as);
+
+
+    /**
+     * 根据单位查询资产总数
+     *
+     * @param part 单位
+     * @return
+     */
+    Integer findBydwmc(String part);
 }
 

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

@@ -0,0 +1,50 @@
+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.AssetEmail;
+import com.ruoyi.tc.entity.po.AssetAppCpPo;
+import com.ruoyi.tc.entity.po.AssetEmailCpPo;
+import com.ruoyi.tc.entity.po.AssetEmailJyPo;
+import com.ruoyi.tc.entity.request.AssetEmailPageRequest;
+
+import java.util.List;
+
+/**
+ * 电子邮件资产表(asset_email)表服务接口
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+public interface AssetEmailCpService extends IService<AssetEmailCpPo> {
+
+
+    /**
+     * 根据资产id和任务id删除数据
+     *
+     * @param assetId 资产id
+     * @param taskId  任务id
+     */
+    void deletByAssetIdandTaskId(Long assetId, int taskId);
+
+
+
+    /**
+     * 根据taskid查询查询数据
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    List<AssetEmailCpPo> findByTaskId(int taskId);
+
+
+    /**
+     * 修改不通过原因
+     *
+     * @param assetId 资产id
+     * @param taskId 任务id
+     * @param btgyy 不通过原因
+     */
+    void updateByAssetId(Integer assetId, Integer taskId, String btgyy);
+
+}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.tc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.tc.entity.po.AssetEmailCpPo;
+import com.ruoyi.tc.entity.po.AssetEmailJyPo;
+
+/**
+ * 电子邮件资产表(asset_email)表服务接口
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+public interface AssetEmailJyService extends IService<AssetEmailJyPo> {
+
+}

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

@@ -37,4 +37,22 @@ public interface AssetEmailService extends IService<AssetEmail> {
      * @return 所有数据
      */
     List<AssetEmail> getAllList(AssetEmailPageRequest as);
+
+
+    /**
+     * 删除
+     * @param idList
+     */
+    void deleteIdList(List<Long> idList);
+
+
+
+    /**
+     * 根据单位查询资产总数
+     *
+     * @param part 单位
+     * @return
+     */
+    Integer findBydwmc(String part);
 }
+

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

@@ -0,0 +1,53 @@
+package com.ruoyi.tc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.tc.entity.po.AssetAppCpPo;
+import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo;
+
+import java.util.List;
+
+/**
+ * 小程序资产(asset_mini_programs_cp)表服务接口
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+public interface AssetMiniProgramsCpService extends IService<AssetMiniProgramsCpPo> {
+
+
+    /**
+     * 根据资产id和任务id删除数据
+     *
+     * @param assetId 资产id
+     * @param taskId  任务id
+     */
+    void deletByAssetIdandTaskId(Long assetId, int taskId);
+
+
+
+    /**
+     * 根据taskid查询查询数据
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    List<AssetMiniProgramsCpPo> findByTaskId(int taskId);
+
+
+
+
+
+    /**
+     * 修改不通过原因
+     *
+     * @param assetId 资产id
+     * @param taskId 任务id
+     * @param btgyy 不通过原因
+     */
+    void updateByAssetId(Integer assetId, Integer taskId, String btgyy);
+
+
+
+
+
+}

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

@@ -0,0 +1,19 @@
+package com.ruoyi.tc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo;
+import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
+
+/**
+ * 小程序资产(asset_mini_programs_cp)表服务接口
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+public interface AssetMiniProgramsJyService extends IService<AssetMiniProgramsJyPo> {
+
+
+
+
+
+}

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

@@ -36,4 +36,20 @@ public interface AssetMiniProgramsService extends IService<AssetMiniPrograms> {
      * @return 所有数据
      */
     List<AssetMiniPrograms> getAllList(AssetMiniProgramsPageRequest as);
+
+
+    /**
+     * 根据单位查询资产总数
+     *
+     * @param part 单位
+     * @return
+     */
+    Integer findBydwmc(String part);
+
+
+    /**
+     * 删除
+     * @param idList
+     */
+    void deleteIdList(List<Long> idList);
 }

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

@@ -0,0 +1,47 @@
+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.AssetOfficialAccount;
+import com.ruoyi.tc.entity.po.AssetAppCpPo;
+import com.ruoyi.tc.entity.po.AssetOfficialAccountCpPo;
+import com.ruoyi.tc.entity.request.AssetOfficialAccountPageRequest;
+import com.ruoyi.tc.mapper.AssetOfficialAccountCpMapper;
+
+import java.util.List;
+
+/**
+ * 公众号资产(asset_official_account_cp)表服务接口
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+public interface AssetOfficialAccountCpService extends IService<AssetOfficialAccountCpPo> {
+
+    /**
+     * 根据资产id和任务id删除数据
+     *
+     * @param assetId 资产id
+     * @param taskId  任务id
+     */
+    void deletByAssetIdandTaskId(Long assetId, int taskId);
+
+
+
+    /**
+     * 根据taskid查询查询数据
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    List<AssetOfficialAccountCpPo> findByTaskId(int taskId);
+
+    /**
+     * 修改不通过原因
+     *
+     * @param assetId 资产id
+     * @param taskId 任务id
+     * @param btgyy 不通过原因
+     */
+    void updateByAssetId(Integer assetId, Integer taskId, String btgyy);
+}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.tc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo;
+import com.ruoyi.tc.mapper.AssetOfficialAccountJyMapper;
+
+/**
+ * 公众号资产(asset_official_account_cp)表服务接口
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+public interface AssetOfficialAccountJyService extends IService<AssetOfficialAccountJyPo> {
+
+}

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

@@ -35,4 +35,19 @@ public interface AssetOfficialAccountService extends IService<AssetOfficialAccou
      * @return 所有数据
      */
     List<AssetOfficialAccount> getAllList(AssetOfficialAccountPageRequest as);
+
+
+    /**
+     * 根据单位查询资产总数
+     *
+     * @param part 单位
+     * @return
+     */
+    Integer findBydwmc(String part);
+
+    /**
+     * 删除
+     * @param idList
+     */
+    void deleteIdList(List<Long> idList);
 }

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

@@ -3,14 +3,15 @@ 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.AssetTask;
+import com.ruoyi.tc.entity.po.*;
 import com.ruoyi.tc.entity.request.AssestTaskXqRequest;
 import com.ruoyi.tc.entity.request.AssetCurrentShRequest;
 import com.ruoyi.tc.entity.request.AssetTaskPageRequest;
 import com.ruoyi.tc.entity.request.AssetdwHcRequest;
 import com.ruoyi.tc.entity.response.AssestTaskXqresponse;
-import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
 import com.ruoyi.tc.entity.response.AssetTaskResponse;
 import com.ruoyi.tc.entity.response.AssetdwHcResponse;
+import io.swagger.models.auth.In;
 
 import java.util.List;
 
@@ -65,7 +66,7 @@ public interface AssetTaskService extends IService<AssetTask> {
 
 
     /**
-     * 任务审核
+     * web资产任务审核详情信息
      *
      * @param taskId  任务id
      * @param assetId 资产id
@@ -73,6 +74,45 @@ public interface AssetTaskService extends IService<AssetTask> {
      */
     AssetCurrentCpPo taskSh(int taskId, int assetId);
 
+
+    /**
+     * 小程序资产任务审核详情信息
+     *
+     * @param taskId  任务id
+     * @param assetId 资产id
+     * @return
+     */
+    AssetMiniProgramsCpPo minitaskSh(int taskId, int assetId);
+
+
+    /**
+     * 公众号资产任务审核详情信息
+     *
+     * @param taskId  任务id
+     * @param assetId 资产id
+     * @return
+     */
+    AssetOfficialAccountCpPo officetaskSh(int taskId, int assetId);
+
+
+    /**
+     * 电子邮件资产任务审核详情信息
+     *
+     * @param taskId  任务id
+     * @param assetId 资产id
+     * @return
+     */
+    AssetEmailCpPo emailtaskSh(int taskId, int assetId);
+
+    /**
+     * 电子邮件资产任务审核详情信息
+     *
+     * @param taskId  任务id
+     * @param assetId 资产id
+     * @return
+     */
+    AssetAppCpPo apptaskSh(int taskId, int assetId);
+
     /**
      * 资产核查信息
      *
@@ -107,4 +147,12 @@ public interface AssetTaskService extends IService<AssetTask> {
      * @return
      */
     List<AssetTask> taskList(String dwmc);
+
+    /**
+     * 修改已关停
+     *
+     * @param taskId 任务id
+     */
+
+    void updateYgtByTaskId(Integer taskId,Integer count);
 }

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

@@ -1,7 +1,6 @@
 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.Unit;
@@ -12,6 +11,7 @@ import java.util.List;
 
 /**
  * 单位信息（unit_info）表业务层
+ *
  * @author du
  * @since 2024/11/13 15:02
  */
@@ -52,6 +52,7 @@ public interface UnitService extends IService<Unit> {
      * 逻辑删除用户
      */
     void deleteUsers(String userNames);
+
     /**
      * 逻辑删除单位
      */
@@ -72,4 +73,13 @@ public interface UnitService extends IService<Unit> {
      * @return 单位
      */
     List<Unit> selectAllUnit(GeneralQueryRequest req);
+
+
+    /**
+     * 根据单位查询资产总数
+     *
+     * @param part 单位
+     * @return
+     */
+    Integer findBydwmc(String part);
 }

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

@@ -0,0 +1,41 @@
+package com.ruoyi.tc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.tc.entity.po.AssetAppCpPo;
+import com.ruoyi.tc.mapper.AssetAppCpMapper;
+import com.ruoyi.tc.service.AssetAppCpService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 资产移动应用程序表(asset_app_cp)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+@Service("assetAppCpService")
+public class AssetAppCpServiceImpl extends ServiceImpl<AssetAppCpMapper, AssetAppCpPo> implements AssetAppCpService {
+
+
+    @Resource
+    private AssetAppCpMapper assetAppCpMapper;
+
+    @Override
+    public void deletByAssetIdandTaskId(Long assetId, int taskId) {
+
+        assetAppCpMapper.deletByAssetIdandTaskId(assetId, taskId);
+
+    }
+
+    @Override
+    public List<AssetAppCpPo> findByTaskId(int taskId) {
+        return assetAppCpMapper.findByTaskId(taskId);
+    }
+
+    @Override
+    public void updateByAssetId(Integer assetId, Integer taskId, String btgyy) {
+        baseMapper.updateByAssetId(assetId,taskId,btgyy);
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.ruoyi.tc.service.impl;
+
+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.mapper.AssetAppCpMapper;
+import com.ruoyi.tc.mapper.AssetAppJyMapper;
+import com.ruoyi.tc.service.AssetAppCpService;
+import com.ruoyi.tc.service.AssetAppJyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 资产移动应用程序表(asset_app_cp)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+@Service("assetAppJyService")
+public class AssetAppJyServiceImpl extends ServiceImpl<AssetAppJyMapper, AssetAppJyPo> implements AssetAppJyService {
+
+}

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

@@ -49,4 +49,18 @@ public class AssetAppServiceImpl extends ServiceImpl<AssetAppMapper, AssetApp> i
     public List<AssetApp> getAllList(AssetAppPageRequest as) {
         return baseMapper.page(as);
     }
+
+    @Override
+    public void deleteIdList(List<Long> idList) {
+        baseMapper.deleteIdList(idList);
+    }
+
+    @Override
+    public Integer findBydwmc(String part) {
+        return baseMapper.findBydwmc(part);
+    }
+
+
+
+
 }

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

@@ -109,5 +109,10 @@ public class AssetCurrentServiceImpl extends ServiceImpl<AssetCurrentMapper, Ass
     public List<AssetExport> selectAllAsset(AssetCurrentPageRequest as) {
         return baseMapper.selectAllAsset(as);
     }
+
+    @Override
+    public Integer findBydwmc(String part) {
+        return baseMapper.findBydwmc(part);
+    }
 }
 

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

@@ -0,0 +1,48 @@
+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.AssetEmail;
+import com.ruoyi.tc.entity.po.AssetEmailCpPo;
+import com.ruoyi.tc.entity.request.AssetEmailPageRequest;
+import com.ruoyi.tc.mapper.AssetAppCpMapper;
+import com.ruoyi.tc.mapper.AssetEmailCpMapper;
+import com.ruoyi.tc.mapper.AssetEmailMapper;
+import com.ruoyi.tc.service.AssetEmailCpService;
+import com.ruoyi.tc.service.AssetEmailService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 电子邮件资产表(asset_email)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+@Service("assetEmailCpService")
+public class AssetEmailCpServiceImpl extends ServiceImpl<AssetEmailCpMapper, AssetEmailCpPo> implements AssetEmailCpService {
+
+
+
+    @Resource
+    private AssetEmailCpMapper assetEmailCpMapper;
+    @Override
+    public void deletByAssetIdandTaskId(Long assetId, int taskId) {
+
+        assetEmailCpMapper.deletByAssetIdandTaskId(assetId,taskId);
+
+    }
+
+    @Override
+    public List<AssetEmailCpPo> findByTaskId(int taskId) {
+        return assetEmailCpMapper.findByTaskId(taskId);
+    }
+
+
+    @Override
+    public void updateByAssetId(Integer assetId, Integer taskId, String btgyy) {
+        assetEmailCpMapper.updateByAssetId(assetId,taskId,btgyy);
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.ruoyi.tc.service.impl;
+
+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.mapper.AssetEmailCpMapper;
+import com.ruoyi.tc.mapper.AssetEmailJyMapper;
+import com.ruoyi.tc.service.AssetEmailCpService;
+import com.ruoyi.tc.service.AssetEmailJyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电子邮件资产表(asset_email)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+@Service("assetEmailJyService")
+public class AssetEmailJyServiceImpl extends ServiceImpl<AssetEmailJyMapper, AssetEmailJyPo> implements AssetEmailJyService {
+
+}

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

@@ -49,4 +49,16 @@ public class AssetEmailServiceImpl extends ServiceImpl<AssetEmailMapper, AssetEm
     public List<AssetEmail> getAllList(AssetEmailPageRequest as) {
         return baseMapper.page(as);
     }
+
+    @Override
+    public void deleteIdList(List<Long> idList) {
+        baseMapper.deleteIdList(idList);
+    }
+
+
+
+    @Override
+    public Integer findBydwmc(String part) {
+        return baseMapper.findBydwmc(part);
+    }
 }

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

@@ -0,0 +1,39 @@
+package com.ruoyi.tc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo;
+import com.ruoyi.tc.mapper.AssetMiniProgramsCpMapper;
+import com.ruoyi.tc.service.AssetMiniProgramsCpService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 小程序资产(asset_mini_programs_cp)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+@Service("assetMiniProgramsCpService")
+public class AssetMiniProgramsCpServiceImpl extends ServiceImpl<AssetMiniProgramsCpMapper, AssetMiniProgramsCpPo> implements AssetMiniProgramsCpService {
+
+    @Resource
+    private  AssetMiniProgramsCpMapper assetMiniProgramsCpMapper;
+    @Override
+    public void deletByAssetIdandTaskId(Long assetId, int taskId) {
+
+        assetMiniProgramsCpMapper.deletByAssetIdandTaskId(assetId,taskId);
+
+    }
+
+    @Override
+    public List<AssetMiniProgramsCpPo> findByTaskId(int taskId) {
+        return assetMiniProgramsCpMapper.findByTaskId(taskId);
+    }
+
+    @Override
+    public void updateByAssetId(Integer assetId, Integer taskId, String btgyy) {
+        assetMiniProgramsCpMapper.updateByAssetId(assetId,taskId,btgyy);
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.ruoyi.tc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
+import com.ruoyi.tc.mapper.AssetMiniProgramsCpMapper;
+import com.ruoyi.tc.mapper.AssetMiniProgramsJyMapper;
+import com.ruoyi.tc.service.AssetMiniProgramsJyService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 小程序资产(asset_mini_programs_cp)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+@Service("assetMiniProgramsJyService")
+public class AssetMiniProgramsJyServiceImpl extends ServiceImpl<AssetMiniProgramsJyMapper, AssetMiniProgramsJyPo> implements AssetMiniProgramsJyService {
+
+}

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

@@ -49,4 +49,17 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl<AssetMiniProgramsM
     public List<AssetMiniPrograms> getAllList(AssetMiniProgramsPageRequest as) {
         return baseMapper.page(as);
     }
+
+    @Override
+    public void deleteIdList(List<Long> idList) {
+        baseMapper.deleteIdList(idList);
+    }
+
+
+
+
+    @Override
+    public Integer findBydwmc(String part) {
+        return baseMapper.findBydwmc(part);
+    }
 }

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

@@ -0,0 +1,47 @@
+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.AssetOfficialAccount;
+import com.ruoyi.tc.entity.po.AssetAppCpPo;
+import com.ruoyi.tc.entity.po.AssetOfficialAccountCpPo;
+import com.ruoyi.tc.entity.request.AssetOfficialAccountPageRequest;
+import com.ruoyi.tc.mapper.AssetMiniProgramsCpMapper;
+import com.ruoyi.tc.mapper.AssetOfficialAccountCpMapper;
+import com.ruoyi.tc.mapper.AssetOfficialAccountMapper;
+import com.ruoyi.tc.service.AssetOfficialAccountCpService;
+import com.ruoyi.tc.service.AssetOfficialAccountService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 公众号资产(asset_official_account_cp)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+@Service("assetOfficialAccountCpService")
+public class AssetOfficialAccountCpServiceImpl extends ServiceImpl<AssetOfficialAccountCpMapper, AssetOfficialAccountCpPo> implements AssetOfficialAccountCpService {
+
+
+    @Resource
+    private AssetOfficialAccountCpMapper assetOfficialAccountCpMapper;
+    @Override
+    public void deletByAssetIdandTaskId(Long assetId, int taskId) {
+
+        assetOfficialAccountCpMapper.deletByAssetIdandTaskId(assetId,taskId);
+
+    }
+
+    @Override
+    public List<AssetOfficialAccountCpPo> findByTaskId(int taskId) {
+        return assetOfficialAccountCpMapper.findByTaskId(taskId);
+    }
+
+    @Override
+    public void updateByAssetId(Integer assetId, Integer taskId, String btgyy) {
+        assetOfficialAccountCpMapper.updateByAssetId(assetId,taskId,btgyy);
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.ruoyi.tc.service.impl;
+
+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.mapper.AssetOfficialAccountCpMapper;
+import com.ruoyi.tc.mapper.AssetOfficialAccountJyMapper;
+import com.ruoyi.tc.service.AssetOfficialAccountCpService;
+import com.ruoyi.tc.service.AssetOfficialAccountJyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 公众号资产(asset_official_account_cp)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-11-28 17:13:07
+ */
+@Service("assetOfficialAccountJyService")
+public class AssetOfficialAccountJyServiceImpl extends ServiceImpl<AssetOfficialAccountJyMapper, AssetOfficialAccountJyPo> implements AssetOfficialAccountJyService {
+
+}

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

@@ -49,4 +49,17 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl<AssetOfficialAc
     public List<AssetOfficialAccount> getAllList(AssetOfficialAccountPageRequest as) {
         return baseMapper.page(as);
     }
+
+
+    @Override
+    public void deleteIdList(List<Long> idList) {
+        baseMapper.deleteIdList(idList);
+    }
+
+
+
+    @Override
+    public Integer findBydwmc(String part) {
+        return baseMapper.findBydwmc(part);
+    }
 }

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

@@ -1,50 +1,28 @@
 package com.ruoyi.tc.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.tc.entity.AssetBasicNetwork;
+import com.ruoyi.tc.entity.*;
-import com.ruoyi.tc.entity.AssetBusinessForm;
+import com.ruoyi.tc.entity.po.*;
-import com.ruoyi.tc.entity.AssetCurrent;
+import com.ruoyi.tc.entity.request.*;
-import com.ruoyi.tc.entity.AssetLc;
-import com.ruoyi.tc.entity.AssetSupplyChain;
-import com.ruoyi.tc.entity.AssetTask;
-import com.ruoyi.tc.entity.UnitOtherConcat;
-import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo;
-import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo;
-import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
-import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo;
-import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo;
-import com.ruoyi.tc.entity.request.Acomma;
-import com.ruoyi.tc.entity.request.AssestTaskXqRequest;
-import com.ruoyi.tc.entity.request.AssetCurrentShRequest;
-import com.ruoyi.tc.entity.request.AssetTaskPageRequest;
-import com.ruoyi.tc.entity.request.AssetdwHcRequest;
 import com.ruoyi.tc.entity.response.AssestTaskXqresponse;
 import com.ruoyi.tc.entity.response.AssetTaskResponse;
-import com.ruoyi.tc.entity.response.AssetTaskStatusResponse;
 import com.ruoyi.tc.entity.response.AssetdwHcResponse;
 import com.ruoyi.tc.mapper.AssetTaskMapper;
-import com.ruoyi.tc.service.AssetBasicNetworkCpService;
+import com.ruoyi.tc.service.*;
-import com.ruoyi.tc.service.AssetBasicNetworkService;
-import com.ruoyi.tc.service.AssetBusinessFormCpService;
-import com.ruoyi.tc.service.AssetBusinessFormService;
-import com.ruoyi.tc.service.AssetCurrentCpService;
-import com.ruoyi.tc.service.AssetCurrentService;
-import com.ruoyi.tc.service.AssetLcService;
-import com.ruoyi.tc.service.AssetSupplyChainCpService;
-import com.ruoyi.tc.service.AssetSupplyChainService;
-import com.ruoyi.tc.service.AssetTaskService;
-import com.ruoyi.tc.service.UnitOtherConcatCpService;
-import com.ruoyi.tc.service.UnitOtherConcatService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -81,7 +59,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
     @Resource
     private AssetCurrentService assetCurrentService;
 
-
+    @Resource
+    private AssetOfficialAccountService assetOfficialAccountService;
     @Resource
     private AssetBusinessFormService assetBusinessFormService;
 
@@ -95,6 +74,35 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
     @Resource
     private UnitOtherConcatService unitOtherConcatService;
 
+
+    @Resource
+    private AssetMiniProgramsService assetMiniProgramsService;
+
+    @Resource
+    private AssetMiniProgramsCpService assetMiniProgramsCpService;
+
+    @Resource
+    private AssetOfficialAccountCpService assetOfficialAccountCpService;
+
+
+    @Resource
+    private AssetEmailCpService assetEmailCpService;
+
+    @Resource
+    private AssetEmailService assetEmailService;
+    @Resource
+    private AssetAppService assetAppService;
+
+    @Resource
+    private AssetAppCpService assetAppCpService;
+
+
+    @Resource
+    private UnitService unitService;
+
+    @Resource
+    private AssetTaskService assetTaskService;
+
     /**
      * 通过ID查询单条数据
      *
@@ -106,6 +114,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
         return assetTaskDao.queryById(id);
     }
 
+
     /**
      * 分页查询
      *
@@ -125,6 +134,42 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
      */
     @Override
     public void insert(AssetTask assetTask) {
+        int a = 0;
+        //遍历单位
+        String[] taskParts = assetTask.getDwmc().split(",");
+        for (String part : taskParts) {
+            //根据单位查询所有资产
+            //web
+            //  遍历资产类型字段
+            String[] uParts = assetTask.getType().split(",");
+            int current = 0;
+            int xcx = 0;
+            int gzh = 0;
+            int email = 0;
+            int app = 0;
+            int totalCount = 0;
+            for (String qq : uParts) {
+
+                if (qq.equals("0")) {
+                    current = assetCurrentService.findBydwmc(part);
+                    totalCount += current;
+                } else if (qq.equals("1")) {
+                    xcx = assetMiniProgramsService.findBydwmc(part);
+                    totalCount += xcx;
+                } else if (qq.equals("2")) {
+                    gzh = assetOfficialAccountService.findBydwmc(part);
+                    totalCount += gzh;
+                } else if (qq.equals("3")) {
+                    email = assetEmailService.findBydwmc(part);
+                    totalCount += email;
+                } else if (qq.equals("4")) {
+                    app = assetAppService.findBydwmc(part);
+                    totalCount += app;
+                }
+
+            }
+            assetTask.setTotalCount(totalCount);
+        }
         //任务新增
         assetTaskDao.insert(assetTask);
         int id = assetTask.getId();
@@ -134,6 +179,11 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
         assetLc.setXfTime(LocalDateTime.now());
         assetLc.setAssetName("管理员任务下发");
         assetLcService.insert(assetLc);
+        //  遍历资产类型字段
+        String[] assetParts = assetTask.getType().split(",");
+        for (String assetPart : assetParts) {
+            if (assetPart.equals("0")) {
+                //遍历单位
                 String[] parts = assetTask.getDwmc().split(",");
                 for (String part : parts) {
                     //根据单位名称查询资产
@@ -192,8 +242,94 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                         }
                     }
                 }
+            } else if (assetPart.equals("1")) {
+                //遍历小程序资产单位
+                String[] parts = assetTask.getDwmc().split(",");
+                for (String part : parts) {
+                    //根据单位名称查询资产
+                    QueryWrapper<AssetMiniPrograms> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("ssdw", part);
+                    queryWrapper.eq("isbf", 0);
+                    List<AssetMiniPrograms> list = assetMiniProgramsService.list(queryWrapper);
+                    List<AssetMiniProgramsCpPo> miniProgramsNewList = list.stream()
+                            .map(cpPo -> {
+                                AssetMiniProgramsCpPo assetMiniProgramsCpPo = new AssetMiniProgramsCpPo();
+                                assetMiniProgramsCpPo.setTaskId(id);
+                                assetMiniProgramsCpPo.setStatus(0);
+                                assetMiniProgramsCpPo.setAssetId(cpPo.getId());
+                                BeanUtils.copyProperties(cpPo, assetMiniProgramsCpPo); // 复制属性
+                                return assetMiniProgramsCpPo; // 返回新对象
+                            })
+                            .collect(Collectors.toList()); // 收集到列表中
+                    assetMiniProgramsCpService.saveBatch(miniProgramsNewList);
+                }
+            } else if (assetPart.equals("2")) {
+                //遍历公众号资产单位
+                String[] parts = assetTask.getDwmc().split(",");
+                for (String part : parts) {
+                    //根据单位名称查询资产
+                    QueryWrapper<AssetOfficialAccount> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("ssdw", part);
+                    queryWrapper.eq("isbf", 0);
+                    List<AssetOfficialAccount> list = assetOfficialAccountService.list(queryWrapper);
+                    List<AssetOfficialAccountCpPo> officialAccountProgramsNewList = list.stream()
+                            .map(cpPo -> {
+                                AssetOfficialAccountCpPo assetOfficialAccountCpPo = new AssetOfficialAccountCpPo();
+                                assetOfficialAccountCpPo.setTaskId(id);
+                                assetOfficialAccountCpPo.setStatus(0);
+                                assetOfficialAccountCpPo.setAssetId(cpPo.getId());
+                                BeanUtils.copyProperties(cpPo, assetOfficialAccountCpPo); // 复制属性
+                                return assetOfficialAccountCpPo; // 返回新对象
+                            })
+                            .collect(Collectors.toList()); // 收集到列表中
+                    assetOfficialAccountCpService.saveBatch(officialAccountProgramsNewList);
+                }
+            } else if (assetPart.equals("3")) {
+                //遍历电子邮件资产单位
+                String[] parts = assetTask.getDwmc().split(",");
+                for (String part : parts) {
+                    //根据单位名称查询资产
+                    QueryWrapper<AssetEmail> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("ssdw", part);
+                    queryWrapper.eq("isbf", 0);
+                    List<AssetEmail> list = assetEmailService.list(queryWrapper);
+                    List<AssetEmailCpPo> emailCpNewList = list.stream()
+                            .map(cpPo -> {
+                                AssetEmailCpPo emailCpPo = new AssetEmailCpPo();
+                                emailCpPo.setTaskId(id);
+                                emailCpPo.setAssetId(cpPo.getId());
+                                emailCpPo.setStatus(0);
+                                BeanUtils.copyProperties(cpPo, emailCpPo); // 复制属性
+                                return emailCpPo; // 返回新对象
+                            })
+                            .collect(Collectors.toList()); // 收集到列表中
+                    assetEmailCpService.saveBatch(emailCpNewList);
+                }
+            } else if (assetPart.equals("4")) {
+                //遍历资产移动应用程序资产单位
+                String[] parts = assetTask.getDwmc().split(",");
+                for (String part : parts) {
+                    //根据单位名称查询资产
+                    QueryWrapper<AssetApp> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("ssdw", part);
+                    queryWrapper.eq("isbf", 0);
+                    List<AssetApp> list = assetAppService.list(queryWrapper);
+                    List<AssetAppCpPo> appCpNewList = list.stream()
+                            .map(cpPo -> {
+                                AssetAppCpPo appCpPo = new AssetAppCpPo();
+                                appCpPo.setTaskId(id);
+                                appCpPo.setAssetId(cpPo.getId());
+                                appCpPo.setStatus(0);
+                                BeanUtils.copyProperties(cpPo, appCpPo); // 复制属性
+                                return appCpPo; // 返回新对象
+                            })
+                            .collect(Collectors.toList()); // 收集到列表中
+                    assetAppCpService.saveBatch(appCpNewList);
+                }
+            }
 
         }
+    }
 
     /**
      * 修改数据
@@ -220,6 +356,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
 
     @Override
     public AssetCurrentCpPo taskSh(int taskId, int assetId) {
+
         AssetCurrentCpPo byId = assetTaskDao.findBytaskIdandAssestId(taskId, assetId);
         byId.setGylxxList(assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId, assetId).eq(AssetSupplyChainCpPo::getDelFlag, "0").eq(AssetSupplyChainCpPo::getTaskId, taskId).list());
         byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, assetId).eq(AssetBasicNetworkCpPo::getDelFlag, "0").eq(AssetBasicNetworkCpPo::getTaskId, taskId).list());
@@ -240,12 +377,57 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
         });
         byId.setGlIpList(a2);
         return byId;
+
+
+    }
+
+    @Override
+    public AssetMiniProgramsCpPo minitaskSh(int taskId, int assetId) {
+        QueryWrapper<AssetMiniProgramsCpPo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("asset_id", assetId);
+        queryWrapper.eq("task_id", taskId);
+        return assetMiniProgramsCpService.getOne(queryWrapper);
+    }
+
+    @Override
+    public AssetOfficialAccountCpPo officetaskSh(int taskId, int assetId) {
+        QueryWrapper<AssetOfficialAccountCpPo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("asset_id", assetId);
+        queryWrapper.eq("task_id", taskId);
+        return assetOfficialAccountCpService.getOne(queryWrapper);
+    }
+
+    @Override
+    public AssetEmailCpPo emailtaskSh(int taskId, int assetId) {
+        QueryWrapper<AssetEmailCpPo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("asset_id", assetId);
+        queryWrapper.eq("task_id", taskId);
+        return assetEmailCpService.getOne(queryWrapper);
+    }
+
+    @Override
+    public AssetAppCpPo apptaskSh(int taskId, int assetId) {
+        QueryWrapper<AssetAppCpPo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("asset_id", assetId);
+        queryWrapper.eq("task_id", taskId);
+        return assetAppCpService.getOne(queryWrapper);
     }
 
     @Override
     public Page<AssestTaskXqresponse> zcHc(Page<AssestTaskXqresponse> assetTask, AssestTaskXqRequest pageRequest) {
         assetTask.setOptimizeCountSql(false);
-        Page<AssestTaskXqresponse> result = assetTaskDao.zcHc(assetTask, pageRequest);
+        Page<AssestTaskXqresponse> result = null;
+        if (pageRequest.getType().equals("0")) {
+            result = assetTaskDao.zcHc(assetTask, pageRequest);
+        } else if (pageRequest.getType().equals("1")) {
+            result = assetTaskDao.xcxZcHc(assetTask, pageRequest);
+        } else if (pageRequest.getType().equals("2")) {
+            result = assetTaskDao.gzhZcHc(assetTask, pageRequest);
+        } else if (pageRequest.getType().equals("3")) {
+            result = assetTaskDao.emailZcHc(assetTask, pageRequest);
+        } else if (pageRequest.getType().equals("4")) {
+            result = assetTaskDao.appZcHc(assetTask, pageRequest);
+        }
         // 确保 records 不为 null
         if (result.getRecords() == null) {
             result.setRecords(new ArrayList<>()); // 设置为空数组
@@ -255,69 +437,214 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
 
     @Override
     public int sh(AssetCurrentShRequest req) {
-        AssetLc assetLc = new AssetLc();
+        //根据taskid获取当前任务的count数量
-        int taskStatus = 0;
+        AssetTask assetTask = assetTaskDao.getByTaskId(req.getTaskId());
-        if (req.getStatus() == 3) {
+        if (req.getType() == 0) {
-            assetLc.setTaskId(req.getTaskId());
+            //web资产
-            assetLc.setXfTime(LocalDateTime.now());
+            //是否超期
-            assetLc.setAssetName("管理员审核通过"+req.getXtmc());
+            ifCq(req, assetTask);
-            assetLcService.insert(assetLc);
+            //创建任务流程
-        } else if (req.getStatus() == 4) {
+            getTaskStatus(req);
-            assetLc.setTaskId(req.getTaskId());
+            assetTaskDao.sh(req);
-            assetLc.setAssetName("管理员审核不通过"+req.getXtmc());
+        } else if (req.getType() == 1) {
-            assetLc.setXfTime(LocalDateTime.now());
+            //小程序资产
-            assetLcService.insert(assetLc);
+            //创建任务流程
-        }
+            ifCq(req, assetTask);
-        int a = assetTaskDao.sh(req);
+            getTaskStatus(req);
-        //单位端资产审核，更新任务表状态
+            assetTaskDao.xcxsh(req);
-        //查询当前任务下的所有资产状态和完成时间
+        } else if (req.getType() == 2) {
-        List<AssetTaskStatusResponse> list = assetTaskDao.findByTaskId(req.getTaskId());
+            //公众号资产
-        // 检查状态
+            //创建任务流程
-        boolean hasPendingApproval = list.stream().anyMatch(item -> item.getStatus() == 0 || item.getStatus() == 1);
+            ifCq(req, assetTask);
-        boolean allApproved = list.stream().allMatch(item -> item.getStatus() == 3);
+            getTaskStatus(req);
-        boolean hasExpired = list.stream().anyMatch(item -> item.getDeadstatus() == 6);
+            assetTaskDao.gzhsh(req);
-        boolean hasRejected = list.stream().anyMatch(item -> item.getStatus() == 4);
+        } else if (req.getType() == 3) {
-        boolean hased = list.stream().anyMatch(item -> item.getStatus() == 5);
+            //电子邮件
+            //创建任务流程
+            ifCq(req, assetTask);
+            getTaskStatus(req);
+            assetTaskDao.emailsh(req);
+        } else if (req.getType() == 4) {
+            //app
+            //创建任务流程
+            ifCq(req, assetTask);
+            getTaskStatus(req);
+            assetTaskDao.appsh(req);
+        }
+        AssetTask finalTask = assetTaskDao.getByTaskId(req.getTaskId());
+        //判断当前任务资产是否全部审核完成
+        int deadlineCount = Optional.ofNullable(finalTask.getDeadlineCount()).orElse(0);
+        int count = Optional.ofNullable(finalTask.getCount()).orElse(0);
+        int totalCount = Optional.ofNullable(finalTask.getTotalCount()).orElse(0);
+        int ygt = Optional.ofNullable(finalTask.getYgt()).orElse(0);
         LocalDateTime finishTime = null;
-        String btgyy=null;
+        if (ygt + count >= totalCount && deadlineCount == 0) {
-        if (hasPendingApproval) {
+            //关停和通过数量=全部数量并且超期完成数量为0 状态是正常完成 status=2
-            // 资产状态存在待审批，任务状态为进行中
+            finalTask.setTaskStatus(2);
-            taskStatus = 1;
-        } else if (allApproved && !hasPendingApproval && !hasRejected && !hasExpired) {
-            // 资产状态全部为已通过中并且全部资产完成时间在任务期限之前
-            taskStatus = 2;
             finishTime = LocalDateTime.now();
+            finalTask.setTaskFinishTime(finishTime);
+            assetTaskService.update(finalTask);
+            //同步主表数据 web
             taskSaveOrDelete(req);
-        } else if (allApproved && !hasPendingApproval && !hasRejected && hasExpired) {
+            syb(req);
-            // 资产状态全部为已通过，资产完成时间有超期的为超期完成
+
-            taskStatus = 3;
+        } else if (deadlineCount + count + ygt >= totalCount && deadlineCount != 0) {
+            //超期完成和通过数量=全部数量并且超期完成数量不为0 状态是超期完成 status=3
+            finalTask.setTaskStatus(3);
             finishTime = LocalDateTime.now();
+            finalTask.setTaskFinishTime(finishTime);
+            assetTaskService.update(finalTask);
+
+            //同步主表数据 web
             taskSaveOrDelete(req);
-        } else if (hasRejected) {
+            syb(req);
-            // 审核不通过
+        } else {
-            taskStatus = 1;
+            // 状态是进行中 status=1
-            btgyy=req.getBtgyy();
+            finalTask.setTaskStatus(1);
+            String btgyy = req.getBtgyy();
+            assetTaskService.update(finalTask);
             //修改不通过原因
+            if (req.getType()==0){
                 assetCurrentCpService.updateByAssetId(req.getAssetId(), req.getTaskId(), btgyy);
-        } else if (hased && !hasRejected && !hasExpired) {
+            }else if(req.getType()==1){
-           //存在已报废并且其他都已完成 且未超期
+                assetMiniProgramsCpService.updateByAssetId(req.getAssetId(), req.getTaskId(), btgyy);
-            taskStatus = 2;
+            }else if(req.getType()==2){
-            finishTime = LocalDateTime.now();
+                assetOfficialAccountCpService.updateByAssetId(req.getAssetId(), req.getTaskId(), btgyy);
-            taskSaveOrDelete(req);
+            }else if(req.getType()==3){
+                assetEmailCpService.updateByAssetId(req.getAssetId(), req.getTaskId(), btgyy);
+            }else if(req.getType()==4){
+            assetAppCpService.updateByAssetId(req.getAssetId(), req.getTaskId(), btgyy);
         }
-        else if(hased && !hasRejected && hasExpired){
+
-            //存在已报废并且其他都已完成 且未超期
+
-            taskStatus = 3;
-            finishTime = LocalDateTime.now();
-            taskSaveOrDelete(req);
-        } else if (hased  && !hasPendingApproval && !allApproved && ! hasExpired && !hasRejected) {
-            taskStatus = 3;
         }
-        //修改主表任务状态
+        return 0;
-        assetTaskDao.updateByTaskId(taskStatus, req.getTaskId(), finishTime);
-        return a;
     }
 
+    private void syb(AssetCurrentShRequest req) {
+        //app 小程序 邮件 公众号
+        List<AssetAppCpPo> appList = assetAppCpService.findByTaskId(req.getTaskId());
+        List<AssetEmailCpPo> emailCpPoListList = assetEmailCpService.findByTaskId(req.getTaskId());
+        List<AssetMiniProgramsCpPo> miniProgramsCpPoListList = assetMiniProgramsCpService.findByTaskId(req.getTaskId());
+        List<AssetOfficialAccountCpPo> officialAccountCpPoListList = assetOfficialAccountCpService.findByTaskId(req.getTaskId());
+        //app
+        List<Long> appidList = appList.stream()
+                .map(AssetAppCpPo::getAssetId)
+                .collect(Collectors.toList());
+        //删除原有数据
+        if (CollectionUtil.isNotEmpty(appidList)) {
+            assetAppService.deleteIdList(appidList);
+        }
+        //将子表数据复制到主表中
+        List<AssetApp> appNewList = appList.stream()
+                .map(cpPo -> {
+                    AssetApp current = new AssetApp();
+                    BeanUtils.copyProperties(cpPo, current); // 复制属性
+                    return current; // 返回新对象
+                })
+                .collect(Collectors.toList()); // 收集到列表中
+        assetAppService.saveBatch(appNewList);
+
+        //邮件
+        List<Long> emailidList = emailCpPoListList.stream()
+                .map(AssetEmailCpPo::getAssetId)
+                .collect(Collectors.toList());
+        //删除原有数据
+        if (CollectionUtil.isNotEmpty(emailidList)) {
+            assetEmailService.deleteIdList(emailidList);
+        }
+        //将子表数据复制到主表中
+        List<AssetEmail> emailNewList = appList.stream()
+                .map(cpPo -> {
+                    AssetEmail current = new AssetEmail();
+                    BeanUtils.copyProperties(cpPo, current); // 复制属性
+                    return current; // 返回新对象
+                })
+                .collect(Collectors.toList()); // 收集到列表中
+        assetEmailService.saveBatch(emailNewList);
+
+        //小程序
+        List<Long> miniidList = miniProgramsCpPoListList.stream()
+                .map(AssetMiniProgramsCpPo::getAssetId)
+                .collect(Collectors.toList());
+        //删除原有数据
+        if (CollectionUtil.isNotEmpty(miniidList)) {
+            assetMiniProgramsService.deleteIdList(miniidList);
+        }
+        //将子表数据复制到主表中
+        List<AssetMiniPrograms> miniNewList = appList.stream()
+                .map(cpPo -> {
+                    AssetMiniPrograms current = new AssetMiniPrograms();
+                    BeanUtils.copyProperties(cpPo, current); // 复制属性
+                    return current; // 返回新对象
+                })
+                .collect(Collectors.toList()); // 收集到列表中
+        assetMiniProgramsService.saveBatch(miniNewList);
+
+
+        //公众号
+        List<Long> officialidList = officialAccountCpPoListList.stream()
+                .map(AssetOfficialAccountCpPo::getAssetId)
+                .collect(Collectors.toList());
+        //删除原有数据
+        if (CollectionUtil.isNotEmpty(officialidList)) {
+            assetOfficialAccountService.deleteIdList(officialidList);
+        }
+        //将子表数据复制到主表中
+        List<AssetOfficialAccount> officialNewList = appList.stream()
+                .map(cpPo -> {
+                    AssetOfficialAccount current = new AssetOfficialAccount();
+                    BeanUtils.copyProperties(cpPo, current); // 复制属性
+                    return current; // 返回新对象
+                })
+                .collect(Collectors.toList()); // 收集到列表中
+        assetOfficialAccountService.saveBatch(officialNewList);
+    }
+
+    private void ifCq(AssetCurrentShRequest req, AssetTask assetTask) {
+
+        if (req.getStatus().equals(3)) {
+            AssetTask newAssetTask = new AssetTask();
+            //比较是否超期
+            int deadlineStatus = extracted(assetTask);
+            int deadlineCount = Optional.ofNullable(assetTask.getDeadlineCount()).orElse(0);
+            int count = Optional.ofNullable(assetTask.getCount()).orElse(0);
+            BeanUtils.copyProperties(assetTask, newAssetTask);
+            if (deadlineStatus == 1) {
+                //超期
+                newAssetTask.setDeadlineCount(deadlineCount + 1);
+                assetTaskService.update(newAssetTask);
+            } else {
+                newAssetTask.setCount(count + 1);
+                assetTaskService.update(newAssetTask);
+            }
+
+        }
+    }
+
+    //当前时间喝任务截至时间比较
+    private int extracted(AssetTask assetTask) {
+        int status = 0;
+        // 获取当前时间
+        LocalDate now = LocalDate.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        String formattedDateTime = formatter.format(now);
+        //获取任务截至时间
+        String deadLine = assetTask.getTaskDeadline();
+        // 转换为 LocalDateTime
+        LocalDate deadlineDate = LocalDate.parse(deadLine, formatter);
+        LocalDate currentDate = LocalDate.parse(formattedDateTime, formatter);
+        if (deadlineDate.isBefore(currentDate)) {
+            //超期
+            status = 1;
+        } else {
+            //未超期
+            status = 2;
+        }
+        return status;
+    }
+
+    //web
     private void taskSaveOrDelete(AssetCurrentShRequest req) {
         // 根据taskid查询五张数据
         List<AssetCurrentCpPo> currentList = assetCurrentCpService.findByTaskId(req.getTaskId());
@@ -424,4 +751,74 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
     public List<AssetTask> taskList(String dwmc) {
         return assetTaskDao.taskList(dwmc);
     }
+
+    @Override
+    public void updateYgtByTaskId(Integer taskId, Integer count) {
+        assetTaskDao.updateYgtByTaskId(taskId, count);
+    }
+
+    //创建任务流程
+    private void getTaskStatus(AssetCurrentShRequest req) {
+        AssetLc assetLc = new AssetLc();
+        int taskStatus = 0;
+        if (req.getStatus() == 3) {
+            assetLc.setTaskId(req.getTaskId());
+            assetLc.setXfTime(LocalDateTime.now());
+            assetLc.setAssetName("管理员审核通过" + req.getXtmc());
+            assetLcService.insert(assetLc);
+        } else if (req.getStatus() == 4) {
+            assetLc.setTaskId(req.getTaskId());
+            assetLc.setAssetName("管理员审核不通过" + req.getXtmc());
+            assetLc.setXfTime(LocalDateTime.now());
+            assetLcService.insert(assetLc);
+        }
+
+    }
+
+
+    // //单位端资产审核，更新任务表状态
+    //            //查询当前任务下的所有资产状态和完成时间
+    //            List<AssetTaskStatusResponse> list = assetTaskDao.findByTaskId(req.getTaskId());
+    //            // 检查状态
+    //            boolean hasPendingApproval = list.stream().anyMatch(item -> item.getStatus() == 0 || item.getStatus() == 1);
+    //            boolean allApproved = list.stream().allMatch(item -> item.getStatus() == 3);
+    //            boolean hasExpired = list.stream().anyMatch(item -> item.getDeadstatus() == 6);
+    //            boolean hasRejected = list.stream().anyMatch(item -> item.getStatus() == 4);
+    //            boolean hased = list.stream().anyMatch(item -> item.getStatus() == 5);
+    //            LocalDateTime finishTime = null;
+    //            String btgyy = null;
+    //            if (hasPendingApproval) {
+    //                // 资产状态存在待审批，任务状态为进行中
+    //                taskStatus = 1;
+    //            } else if (allApproved && !hasPendingApproval && !hasRejected && !hasExpired) {
+    //                // 资产状态全部为已通过中并且全部资产完成时间在任务期限之前
+    //                taskStatus = 2;
+    //                finishTime = LocalDateTime.now();
+    //                taskSaveOrDelete(req);
+    //            } else if (allApproved && !hasPendingApproval && !hasRejected && hasExpired) {
+    //                // 资产状态全部为已通过，资产完成时间有超期的为超期完成
+    //                taskStatus = 3;
+    //                finishTime = LocalDateTime.now();
+    //                taskSaveOrDelete(req);
+    //            } else if (hasRejected) {
+    //                // 审核不通过
+    //                taskStatus = 1;
+    //                btgyy = req.getBtgyy();
+    //                //修改不通过原因
+    //                assetCurrentCpService.updateByAssetId(req.getAssetId(), req.getTaskId(), btgyy);
+    //            } else if (hased && !hasRejected && !hasExpired) {
+    //                //存在已报废并且其他都已完成 且未超期
+    //                taskStatus = 2;
+    //                finishTime = LocalDateTime.now();
+    //                taskSaveOrDelete(req);
+    //            } else if (hased && !hasRejected && hasExpired) {
+    //                //存在已报废并且其他都已完成 且未超期
+    //                taskStatus = 3;
+    //                finishTime = LocalDateTime.now();
+    //                taskSaveOrDelete(req);
+    //            } else if (hased && !hasPendingApproval && !allApproved && !hasExpired && !hasRejected) {
+    //                taskStatus = 3;
+    //            }
+    //            //修改主表任务状态
+    //            assetTaskDao.updateByTaskId(taskStatus, req.getTaskId(), finishTime);
 }

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

@@ -130,4 +130,9 @@ public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit> implements Un
         return baseMapper.selectAllUnit(req);
     }
 
+    @Override
+    public Integer findBydwmc(String part) {
+        return baseMapper.findBydwmc(part);
+    }
+
 }

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

@@ -6,6 +6,13 @@
         set del_flag = '2'
         where id = #{id}
     </update>
+    <delete id="deleteIdList" >
+        DELETE FROM asset_app
+        WHERE id IN
+        <foreach item="id" index="index" collection="idList" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 
     <select id="page" resultType="com.ruoyi.tc.entity.AssetApp">
         select * from asset_app
@@ -26,5 +33,10 @@
         </where>
         order by create_time desc
     </select>
+    <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
+        select count(*)
+        from asset_app
+        where ssdw = #{part} and isbf=0
+    </select>
 </mapper>
 

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

@@ -458,4 +458,10 @@
         </where>
         order by a.create_time
     </select>
+    <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
+
+        select count(*)
+        from asset_current
+        where dwmc = #{part} and isbf=0
+    </select>
 </mapper>

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

@@ -6,6 +6,13 @@
         set del_flag = '2'
         where id = #{id}
     </update>
+    <delete id="deleteIdList">
+        DELETE FROM asset_email
+        WHERE id IN
+        <foreach item="id" index="index" collection="idList" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 
     <select id="page" resultType="com.ruoyi.tc.entity.AssetEmail">
         select * from asset_email
@@ -26,5 +33,10 @@
         </where>
         order by create_time desc
     </select>
+    <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
+        select count(*)
+        from asset_email
+        where ssdw = #{part} and isbf=0
+    </select>
 </mapper>
 

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

@@ -6,6 +6,13 @@
         set del_flag = '2'
         where id = #{id}
     </update>
+    <delete id="deleteIdList" >
+        DELETE FROM asset_mini_programs
+        WHERE id IN
+        <foreach item="id" index="index" collection="idList" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 
     <select id="page" resultType="com.ruoyi.tc.entity.AssetMiniPrograms">
         select * from asset_mini_programs
@@ -26,5 +33,11 @@
         </where>
         order by create_time desc
     </select>
+
+    <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
+        select count(*)
+        from asset_mini_programs
+        where ssdw = #{part} and isbf=0
+    </select>
 </mapper>
 

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

@@ -6,7 +6,18 @@
         set del_flag = '2'
         where id = #{id}
     </update>
-
+    <delete id="deleteIdList" >
+        DELETE FROM asset_official_account
+        WHERE id IN
+        <foreach item="id" index="index" collection="idList" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
+        select count(*)
+        from asset_official_account
+        where ssdw = #{part} and isbf=0
+    </select>
     <select id="page" resultType="com.ruoyi.tc.entity.AssetOfficialAccount">
         select * from asset_official_account
         <where>

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

@@ -20,6 +20,7 @@
         <result property="deptId" column="dept_id" jdbcType="INTEGER"/>
         <result property="version" column="version" jdbcType="VARCHAR"/>
         <result property="reamark" column="reamark" jdbcType="VARCHAR"/>
+        <result property="type" column="type" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
@@ -40,7 +41,8 @@
                a.user_id,
                a.dept_id,
                a.version,
-               a.reamark
+               a.reamark,
+               a.type
 
         from asset_task a
 
@@ -225,7 +227,6 @@
             <if test="req.taskId !=null  ">
                 and b.task_id=#{req.taskId}
             </if>
-
             <if test="req.status!=null  ">
                 and b.status =#{req.status}
             </if>
@@ -244,15 +245,21 @@
     <select id="dwHc" resultType="com.ruoyi.tc.entity.response.AssetdwHcResponse">
         SELECT
         dwmc,
-        COUNT(*) AS total,
+        SUM(total) AS total,
-        SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM(notChecked) AS notChecked,
-        SUM(CASE WHEN status = 3 or status = 5 THEN 1 ELSE 0 END) AS checked,
+        SUM(checked) AS checked,
         ROUND(
         CASE
-        WHEN COUNT(*) > 0 THEN
+        WHEN SUM(total) > 0 THEN
-        SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) * 100 / COUNT(*)
+        SUM(notChecked) * 100 / SUM(total)
         ELSE 0
         END, 2) AS checkedRatio
+        FROM (
+        SELECT
+        dwmc ,
+        COUNT(*) AS total,
+        SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM(CASE WHEN status = 3 OR status = 5 THEN 1 ELSE 0 END) AS checked
         FROM
         asset_current_cp
         <where>
@@ -267,12 +274,95 @@
         GROUP BY
         dwmc
 
+        UNION ALL
+
+        SELECT
+        ssdw AS dwmc,
+        COUNT(*) AS total,
+        SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM(CASE WHEN status = 3 OR status = 5 THEN 1 ELSE 0 END) AS checked
+        FROM
+        asset_mini_programs_cp
+        <where>
+            <if test="req.dwmc!=null and req.dwmc!='' ">
+                and ssdw like concat('%',#{req.ssdw},'%')
+            </if>
+
+            <if test="req.taskId!=null and req.taskId!='' ">
+                and task_id =#{req.taskId}
+            </if>
+        </where>
+        GROUP BY
+        ssdw
+
+        UNION ALL
+
+        SELECT
+        ssdw AS dwmc,
+        COUNT(*) AS total,
+        SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM(CASE WHEN status = 3 OR status = 5 THEN 1 ELSE 0 END) AS checked
+        FROM
+        asset_app_cp
+        <where>
+            <if test="req.dwmc!=null and req.dwmc!='' ">
+                and ssdw like concat('%',#{req.ssdw},'%')
+            </if>
+
+            <if test="req.taskId!=null and req.taskId!='' ">
+                and task_id =#{req.taskId}
+            </if>
+        </where>
+        GROUP BY
+        ssdw
+        UNION ALL
+        SELECT
+        ssdw AS dwmc,
+        COUNT(*) AS total,
+        SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM(CASE WHEN status = 3 OR status = 5 THEN 1 ELSE 0 END) AS checked
+        FROM
+        asset_official_account_cp
+        <where>
+            <if test="req.dwmc!=null and req.dwmc!='' ">
+                and ssdw like concat('%',#{req.ssdw},'%')
+            </if>
+
+            <if test="req.taskId!=null and req.taskId!='' ">
+                and task_id =#{req.taskId}
+            </if>
+        </where>
+        GROUP BY
+        ssdw
+        UNION ALL
+        SELECT
+        ssdw AS dwmc,
+        COUNT(*) AS total,
+        SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM(CASE WHEN status = 3 OR status = 5 THEN 1 ELSE 0 END) AS checked
+        FROM
+        asset_email_cp
+        <where>
+            <if test="req.dwmc!=null and req.dwmc!='' ">
+                and ssdw like concat('%',#{req.ssdw},'%')
+            </if>
+
+            <if test="req.taskId!=null and req.taskId!='' ">
+                and task_id =#{req.taskId}
+            </if>
+        </where>
+        GROUP BY
+        ssdw
+        ) AS combined_results
+        GROUP BY
+        dwmc
+
+
     </select>
     <select id="findByTaskId" resultType="com.ruoyi.tc.entity.response.AssetTaskStatusResponse">
         SELECT
         a.STATUS,
         CASE
-
         WHEN DATE ( a.update_time ) > b.task_deadline THEN
         '6' ELSE '7'
         END AS deadstatus
@@ -295,16 +385,166 @@
             and task_status=1
         </where>
     </select>
+    <select id="xcxZcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
+        select
+        b.xcxmc as xtmc,
+        b.ssdw as zcdwmc,
+        b.status,
+        b.asset_id as id ,
+        b.task_id,
+        b.btgyy
+        from asset_task a
+        LEFT JOIN
+        asset_mini_programs_cp b ON FIND_IN_SET(b.ssdw, a.dwmc)
+        <where>
+            <if test="req.dwmc!=null and req.dwmc!='' ">
+                and b.ssdw like concat('%',#{req.dwmc},'%')
+            </if>
+            <if test="req.taskId !=null  ">
+                and a.id = #{req.taskId}
+            </if>
+            <if test="req.taskId !=null  ">
+                and b.task_id=#{req.taskId}
+            </if>
+            <if test="req.status!=null  ">
+                and b.status =#{req.status}
+            </if>
+
+        </where>
+        order by b.mini_id desc
+    </select>
+    <select id="gzhZcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
+        select
+        b.gzhmc as xtmc,
+        b.ssdw as zcdwmc,
+        b.status,
+        b.asset_id as id ,
+        b.task_id,
+        b.btgyy
+        from asset_task a
+        LEFT JOIN
+        asset_official_account_cp b ON FIND_IN_SET(b.ssdw, a.dwmc)
+        <where>
+            <if test="req.dwmc!=null and req.dwmc!='' ">
+                and b.ssdw like concat('%',#{req.dwmc},'%')
+            </if>
+            <if test="req.taskId !=null  ">
+                and a.id = #{req.taskId}
+            </if>
+            <if test="req.taskId !=null  ">
+                and b.task_id=#{req.taskId}
+            </if>
+            <if test="req.status!=null  ">
+                and b.status =#{req.status}
+            </if>
+        </where>
+        order by b.account_id desc
+    </select>
+    <select id="emailZcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
+        select
+        b.dzyxhz as xtmc,
+        b.ssdw as zcdwmc,
+        b.status,
+        b.asset_id  as id,
+        b.task_id,
+        b.btgyy
+        from asset_task a
+        LEFT JOIN
+        asset_email_cp b ON FIND_IN_SET(b.ssdw, a.dwmc)
+        <where>
+            <if test="req.dwmc!=null and req.dwmc!='' ">
+                and b.ssdw like concat('%',#{req.dwmc},'%')
+            </if>
+            <if test="req.taskId !=null  ">
+                and a.id = #{req.taskId}
+            </if>
+            <if test="req.taskId !=null  ">
+                and b.task_id=#{req.taskId}
+            </if>
+            <if test="req.status!=null  ">
+                and b.status =#{req.status}
+            </if>
+        </where>
+        order by b.email_id desc
+    </select>
+    <select id="appZcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
+
+
+        select
+        b.app_name as xtmc,
+        b.ssdw as zcdwmc,
+        b.status,
+        b.asset_id as id,
+        b.task_id,
+        b.btgyy
+        from asset_task a
+        LEFT JOIN
+        asset_app_cp b ON FIND_IN_SET(b.ssdw, a.dwmc)
+        <where>
+            <if test="req.dwmc!=null and req.dwmc!='' ">
+                and b.ssdw like concat('%',#{req.dwmc},'%')
+            </if>
+            <if test="req.taskId !=null  ">
+                and a.id = #{req.taskId}
+            </if>
+            <if test="req.taskId !=null  ">
+                and b.task_id=#{req.taskId}
+            </if>
+            <if test="req.status!=null  ">
+                and b.status =#{req.status}
+            </if>
+        </where>
+        order by b.app_id desc
+    </select>
+    <select id="getByTaskId" resultType="com.ruoyi.tc.entity.AssetTask" parameterType="int">
+        select * from asset_task where id=#{taskId}
+    </select>
+    <update id="xcxsh"
+            parameterType="com.ruoyi.tc.entity.request.AssetCurrentShRequest">
+        update asset_mini_programs_cp
+        <set>
+            <if test="req.status != null ">
+                status = #{req.status},
+            </if>
+            update_time=now()
+        </set>
+        where asset_id = #{req.assetId} and task_id = #{req.taskId}
+    </update>
+    <update id="gzhsh"
+            parameterType="com.ruoyi.tc.entity.request.AssetCurrentShRequest">
+
+        update asset_official_account_cp
+        <set>
+            <if test="req.status != null ">
+                status = #{req.status},
+            </if>
+            update_time=now()
+        </set>
+        where asset_id = #{req.assetId} and task_id = #{req.taskId}
+    </update>
+
+    <update id="emailsh"
+            parameterType="com.ruoyi.tc.entity.request.AssetCurrentShRequest">
+        update asset_email_cp
+        <set>
+            <if test="req.status != null ">
+                status = #{req.status},
+            </if>
+            update_time=now()
+        </set>
+        where asset_id = #{req.assetId} and task_id = #{req.taskId}
+
+    </update>
 
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into asset_task(task_name, task_time, task_deadline, task_finish_time, task_status, dwmc,
                                create_id, create_by, create_time, update_id, update_by, update_time, user_id, dept_id,
-                               version, reamark)
+                               version, reamark,type,total_count,count,deadline_count,ygt)
         values (#{taskName}, #{taskTime}, #{taskDeadline}, #{taskFinishTime}, #{taskStatus}, #{dwmc},
                 #{createId}, #{createBy}, #{createTime}, #{updateId}, #{updateBy}, #{updateTime}, #{userId}, #{deptId},
-                #{version}, #{reamark})
+                #{version}, #{reamark},#{type},#{totalCount},#{count},#{deadlineCount},#{ygt})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
@@ -385,6 +625,19 @@
             <if test="reamark != null and reamark != ''">
                 reamark = #{reamark},
             </if>
+            <if test="count != null ">
+                count = #{count},
+            </if>
+            <if test="totalCount != null ">
+                total_count = #{totalCount},
+            </if>
+            <if test="deadlineCount != null">
+                deadline_count = #{deadlineCount},
+            </if>
+
+            <if test="ygt != null">
+                ygt = #{ygt},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -412,6 +665,20 @@
         where id =#{taskId}
 
     </update>
+    <update id="appsh" parameterType="com.ruoyi.tc.entity.request.AssetCurrentShRequest">
+        update asset_app_cp
+        <set>
+            <if test="req.status != null ">
+                status = #{req.status},
+            </if>
+            update_time=now()
+        </set>
+        where asset_id = #{req.assetId} and task_id = #{req.taskId}
+
+    </update>
+    <update id="updateYgtByTaskId" parameterType="java.lang.Integer">
+        update  asset_task set ygt=#{count} where id =#{taskId}
+    </update>
 
     <!--通过主键删除-->
     <delete id="deleteById">

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

@@ -98,15 +98,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.user_name like concat('%',#{req.userName},'%')
             </if>
             <if test="req.deptId != null ">
-                AND (a.dept_id = #{req.deptId} OR a.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{req.deptId}, ancestors) ))
+                AND (a.dept_id = #{req.deptId} OR a.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE
+                find_in_set(#{req.deptId}, ancestors) ))
             </if>
         </where>
         order by create_time desc
     </select>
     <select id="getById" parameterType="unit">
-        select a.*,c.*,e.*,d.dept_name as deptName,
+        select a.*,
+               c.*,
+               e.*,
+               d.dept_name as deptName,
                IF(d.ancestors != 0, concat(d.ancestors, ',', d.dept_id), d.dept_id)
-                as ancestors from unit_info a
+                           as ancestors
+        from unit_info a
                  left join unit_other_contact c on a.id = c.unit_id
                  left join unit_examine_info e on a.id = e.unit_id
                  left join sys_dept d on a.dept_id = d.dept_id
@@ -115,34 +120,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectByIds" resultType="java.lang.String">
-        select user_name from unit_info where id = #{id}
+        select user_name
+        from unit_info
+        where id = #{id}
     </select>
     <select id="dwList" resultType="com.ruoyi.tc.entity.Unit">
-        SELECT a.*
+        SELECT  distinct a.*
         FROM unit_info a
-        <if test="req.type!= null and req.type like '%0%'">
+        <if test="req.type!= null and req.type.indexOf('0') != -1">
-            LEFT JOIN asset_current b ON a.nick_name = b.dwmc
+            INNER JOIN asset_current cr ON a.nick_name = cr.dwmc
         </if>
-        <if test="req.type!= null and req.type like '%1%'">
+        <if test="req.type!= null and req.type.indexOf('1') != -1">
-            LEFT JOIN asset_mini_programs e ON a.nick_name = e.ssdw
+            INNER JOIN asset_mini_programs pr ON a.nick_name = pr.ssdw
         </if>
-        <if test="req.type!= null and req.type like '%2%'">
+        <if test="req.type!= null and req.type.indexOf('2') != -1">
-            LEFT JOIN asset_official_account f ON a.nick_name = f.ssdw
+            INNER JOIN asset_official_account ac ON a.nick_name = ac.ssdw
         </if>
-        <if test="req.type!= null and req.type like '%3%'">
+        <if test="req.type!= null and req.type.indexOf('3') != -1">
-            LEFT JOIN asset_email d ON a.nick_name = d.ssdw
+            INNER JOIN asset_email em ON a.nick_name = em.ssdw
         </if>
-        <if test="req.type!= null and req.type like '%4%'">
+        <if test="req.type!= null and req.type.indexOf('4') != -1">
-            LEFT JOIN asset_app c ON a.nick_name = c.ssdw
+            INNER JOIN asset_app ap ON a.nick_name = ap.ssdw
         </if>
-
-
-        WHERE NOT EXISTS (
-        SELECT 1
-        FROM asset_task
         <where>
-            task_status = 1 AND FIND_IN_SET(a.nick_name, dwmc)
+            NOT EXISTS (
-            ) AND a.del_flag = '0' and a.nick_name IN (SELECT dwmc FROM asset_current)
+            SELECT 1
+            FROM asset_task b
+            where
+            b.task_status = 1 AND FIND_IN_SET(a.nick_name, b.dwmc)
+            AND FIND_IN_SET(#{req.type}, b.type)
+            ) AND a.del_flag = '0'
+
             <if test="req.nickName != null and req.nickName != '' ">
                 and a.nick_name like concat('%',#{req.nickName},'%')
             </if>
@@ -152,23 +160,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="req.userName != null and req.userName != '' ">
                 and a.user_name like concat('%',#{req.userName},'%')
             </if>
-            <if test="req.type!= null and req.type like '%0%'">
-                and b.dwmc IS NOT NULL
-            </if>
-            <if test="req.type!= null and req.type like '%1%'">
-                AND e.ssdw IS NOT NULL
-            </if>
-            <if test="req.type!= null and req.type like '%2%'">
-                AND f.ssdw IS NOT NULL
-            </if>
-            <if test="req.type!= null and req.type like '%3%'">
-                AND d.ssdw IS NOT NULL
-            </if>
-            <if test="req.type!= null and req.type like '%4%'">
-                AND c.ssdw IS NOT NULL
-            </if>
         </where>
 
+
     </select>
 
     <select id="selectAllUnit" resultType="com.ruoyi.tc.entity.Unit">
@@ -185,11 +179,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time
     </select>
+    <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
+
+        select count(*)
+        from unit_info
+        where nick_name = #{part}
+    </select>
 
     <update id="deleteUnits">
-        update unit_info set del_flag = '2' where id = #{id}
+        update unit_info
+        set del_flag = '2'
+        where id = #{id}
     </update>
     <update id="deleteUsers">
-        update sys_user set del_flag = '2' where user_name = #{userNames}
+        update sys_user
+        set del_flag = '2'
+        where user_name = #{userNames}
     </update>
 </mapper>

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -115,7 +115,7 @@ public class SecurityConfig
                     // 静态资源，可匿名访问
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                     .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
-//                        .antMatchers("/unit/assetTask/**","/tc/**","/unit/assetLc/**","/tc/unit/**").permitAll()
+                        .antMatchers("/unit/assetTask/**","/tc/**","/unit/assetLc/**","/tc/unit/**").permitAll()
                         // 除上面外的所有请求全部需要鉴权认证
                         .antMatchers("/tc/without/**").permitAll()
                         .anyRequest().authenticated();