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

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

@@ -1,6 +1,5 @@
 package com.ruoyi.tc.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.tc.entity.AssetLc;
@@ -19,7 +18,7 @@ import javax.validation.Valid;
  * @author makejava
  * @since 2024-11-18 14:46:40
  */
-@Api("任务流程")
+@Api(tags = "任务流程")
 @RestController
 @RequestMapping("/unit/assetLc")
 public class AssetLcController extends BaseController {
@@ -30,16 +29,15 @@ public class AssetLcController extends BaseController {
     private AssetLcService assetLcService;
 
     /**
-     * 分页查询
+     * 查询
      *
-     * @param assetLc     筛选条件
-     * @param req 分页对象
+     * @param req 对象
      * @return 查询结果
      */
     @GetMapping("/page")
     @ApiOperation(value = "分页查询", response = AssetLc.class)
-    public AjaxResult queryByPage(Page<AssetLc> assetLc, AssetLcRequest req) {
-        return AjaxResult.success(this.assetLcService.queryByPage(assetLc, req));
+    public AjaxResult queryByPage(AssetLcRequest req) {
+        return AjaxResult.success(this.assetLcService.queryByPage(req));
     }
 
     /**

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

@@ -3,12 +3,18 @@ package com.ruoyi.tc.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.tc.entity.AssetCurrent;
+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;
 import com.ruoyi.tc.entity.request.AssetTaskPageRequest;
-import com.ruoyi.tc.entity.response.*;
+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.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -49,6 +55,25 @@ public class AssetTaskController extends BaseController {
     @Resource
     private UnitOtherConcatCpService unitOtherConcatCpService;
 
+    @Resource
+    private AssetCurrentJyService assetCurrentJyService;
+
+    @Resource
+    private AssetBusinessFormJyService assetBusinessFormJyService;
+
+    @Resource
+    private AssetSupplyChainJyService assetSupplyChainJyService;
+
+    @Resource
+    AssetBasicNetworkJyService assetBasicNetworkJyService;
+
+    @Resource
+    private UnitOtherConcatJyservice unitOtherConcatJyservice;
+
+
+    @Resource
+    private AssetLcService assetLcService;
+
     /**
      * 分页查询
      *
@@ -58,7 +83,6 @@ public class AssetTaskController extends BaseController {
      */
     @ApiOperation(value = "分页查询", response = AssetTask.class)
     @GetMapping("/page")
-
     public AjaxResult queryByPage(Page<AssetTask> assetTask, AssetTaskPageRequest pageRequest) {
         return AjaxResult.success(this.assetTaskService.queryByPage(assetTask, pageRequest));
     }
@@ -140,7 +164,6 @@ public class AssetTaskController extends BaseController {
     @ApiOperation(value = "资产核查信息", response = AssestTaskXqresponse.class)
     @GetMapping("/zcHc")
     public AjaxResult zcHc(Page<AssestTaskXqresponse> page, AssestTaskXqRequest pageRequest) {
-
         return AjaxResult.success(assetTaskService.zcHc(page, pageRequest));
     }
 
@@ -154,22 +177,37 @@ public class AssetTaskController extends BaseController {
     @ApiOperation(value = "单位端暂存报废")
     @PostMapping("/zc")
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult zcHc(@RequestBody AssetCurrentResponse assetCurrent) {
-//        //根据资产id和任务id删除五张表数据
-//        assetCurrentCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
-//        assetBusinessFormCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
-//        assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
-//        unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
-//        assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
-       if(assetCurrent.getBfyy().isEmpty()) {
-           //待审批
-           assetCurrent.setStatus(1);
-       }else{
-           //已报废
-           assetCurrent.setStatus(5);
-       }
-        assetCurrent.setGlym(String.join(",", assetCurrent.getGlymList()));
-        assetCurrent.setGlIp(String.join(",", assetCurrent.getGlIpList()));
+    public AjaxResult zcHc(@RequestBody AssetCurrentCpPo assetCurrent) {
+        //根据资产id和任务id删除五张表数据
+        assetCurrentCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+        assetBusinessFormCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+        assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+        unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+        assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+        if (StringUtils.isBlank(assetCurrent.getBfyy())) {
+            //待审批
+            assetCurrent.setStatus(0);
+        } else {
+            //已报废
+            assetCurrent.setStatus(5);
+        }
+        StringBuilder a = new StringBuilder();
+        if (!assetCurrent.getGlymList().isEmpty()) {
+            assetCurrent.getGlymList().forEach(x -> {
+                a.append(x);
+                a.append(",");
+            });
+        }
+        assetCurrent.setGlym(a.toString());
+        StringBuilder b = new StringBuilder();
+        if (!assetCurrent.getGlIpList().isEmpty()) {
+            assetCurrent.getGlymList().forEach(x -> {
+                b.append(x);
+                b.append(",");
+            });
+        }
+        assetCurrent.setGlIp(b.toString());
+//        assetCurrent.setCurrentId(null);
         assetCurrentCpService.save(assetCurrent);
         //新增新监管业务形态
         if (assetCurrent.getXjgywxt() != null) {
@@ -178,25 +216,28 @@ public class AssetTaskController extends BaseController {
             assetBusinessFormCpService.save(assetCurrent.getXjgywxt());
         }
         if (!assetCurrent.getGylxxList().isEmpty()) {
-            for (AssetSupplyChainCpResponse items : assetCurrent.getGylxxList()) {
+            for (AssetSupplyChainCpPo items : assetCurrent.getGylxxList()) {
                 items.setAssetId(assetCurrent.getId());
                 items.setTaskId(assetCurrent.getTaskId());
+
             }
             //新增供应链
             assetSupplyChainCpService.saveBatch(assetCurrent.getGylxxList());
         }
         if (!assetCurrent.getJcwlList().isEmpty()) {
-            for (AssetBasicNetworkCpResponse items : assetCurrent.getJcwlList()) {
+            for (AssetBasicNetworkCpPo items : assetCurrent.getJcwlList()) {
                 items.setAssetId(assetCurrent.getId());
                 items.setTaskId(assetCurrent.getTaskId());
+
             }
             //新增基础网络
             assetBasicNetworkCpService.saveBatch(assetCurrent.getJcwlList());
         }
         if (!assetCurrent.getOtherConcat().isEmpty()) {
-            for (UnitOtherConcatCpResponse items : assetCurrent.getOtherConcat()) {
+            for (UnitOtherConcatCpPo items : assetCurrent.getOtherConcat()) {
                 items.setAssetId(assetCurrent.getId());
                 items.setTaskId(assetCurrent.getTaskId());
+
             }
             //新增其他联系人
             unitOtherConcatCpService.saveBatch(assetCurrent.getOtherConcat());
@@ -205,19 +246,91 @@ public class AssetTaskController extends BaseController {
     }
 
     /**
-     * 单位端提交
+     * 单位端校验提交
      *
      * @param assetCurrent 现有资产复制表
      * @return
      */
-    @ApiOperation(value = "单位端提交")
-    @PostMapping("/tj")
+    @ApiOperation(value = "单位端校验提交")
+    @PostMapping("/jyTj")
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult tj(@RequestBody AssetCurrentResponse assetCurrent) {
+    public AjaxResult tj(@RequestBody AssetCurrentJyPo assetCurrent) {
+        //根据资产id和任务id删除五张表数据
+        assetCurrentCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+        assetBusinessFormCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+        assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+        unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+        assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+        //新增流程节点时间
+        AssetLc assetLc = new AssetLc();
+        assetLc.setTaskId(assetCurrent.getTaskId());
+        assetLc.setAssetName(assetCurrent.getXtmc());
+        //当审核状态为审核不通过 单位端重新提交
+        if (assetCurrent.getStatus().equals(4)) {
+            assetLc.setTaskId(assetCurrent.getTaskId());
+            assetLc.setXfTime(LocalDateTime.now());
+            assetLc.setAssetName("单位重新核查提交时间" + assetCurrent.getXtmc());
+            assetLcService.insert(assetLc);
+        }
 
-        return AjaxResult.success();
-    }
+        StringBuilder a = new StringBuilder();
+        if (!assetCurrent.getGlymList().isEmpty()) {
+            assetCurrent.getGlymList().forEach(x -> {
+                a.append(x);
+                a.append(",");
+            });
+        }
+        assetCurrent.setGlym(a.toString());
+        StringBuilder b = new StringBuilder();
+        if (!assetCurrent.getGlIpList().isEmpty()) {
+            assetCurrent.getGlymList().forEach(x -> {
+                b.append(x);
+                b.append(",");
+            });
+        }
+        assetCurrent.setGlIp(b.toString());
+        assetCurrent.setStatus(1);
+        //当审核状态为带待核查
+        if (assetCurrent.getStatus().equals(1)) {
+            assetLc.setXfTime(LocalDateTime.now());
+            assetLc.setTaskId(assetCurrent.getTaskId());
+            assetLc.setAssetName("单位核查完成提交" + assetCurrent.getXtmc());
+            assetLcService.insert(assetLc);
+        }
+        assetCurrentJyService.save(assetCurrent);
+        //新增新监管业务形态
+        if (assetCurrent.getXjgywxt() != null) {
+            assetCurrent.getXjgywxt().setAssetId(assetCurrent.getId());
+            assetCurrent.getXjgywxt().setTaskId(assetCurrent.getTaskId());
+            assetBusinessFormJyService.save(assetCurrent.getXjgywxt());
+        }
+        if (!assetCurrent.getGylxxList().isEmpty()) {
+            for (AssetSupplyChainJyPo items : assetCurrent.getGylxxList()) {
+                items.setAssetId(assetCurrent.getId());
+                items.setTaskId(assetCurrent.getTaskId());
+            }
+            //新增供应链
+            assetSupplyChainJyService.saveBatch(assetCurrent.getGylxxList());
+        }
+        if (!assetCurrent.getJcwlList().isEmpty()) {
+            for (AssetBasicNetworkJyPo items : assetCurrent.getJcwlList()) {
+                items.setAssetId(assetCurrent.getId());
+                items.setTaskId(assetCurrent.getTaskId());
+            }
+            //新增基础网络
+            assetBasicNetworkJyService.saveBatch(assetCurrent.getJcwlList());
+        }
+        if (!assetCurrent.getOtherConcat().isEmpty()) {
+            for (UnitOtherConcatJyPo items : assetCurrent.getOtherConcat()) {
+                items.setAssetId(assetCurrent.getId());
+                items.setTaskId(assetCurrent.getTaskId());
+            }
+            //新增其他联系人
+            unitOtherConcatJyservice.saveBatch(assetCurrent.getOtherConcat());
+        }
 
+        return success();
+    }
 
 
     /**
@@ -233,6 +346,17 @@ public class AssetTaskController extends BaseController {
     }
 
 
+    /**
+     * 管理端-单位核查情况
+     *
+     * @param req 请求类
+     * @return
+     */
+    @ApiOperation(value = "管理端-单位核查情况", response = AssetdwHcResponse.class)
+    @GetMapping("/dwHc")
+    public AjaxResult dwHc(Page<AssetdwHcResponse> assetdwHcResponsePage, AssetdwHcRequest req) {
+        return AjaxResult.success(assetTaskService.dwHc(assetdwHcResponsePage, req));
+    }
 
 
 }

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

@@ -32,38 +32,19 @@ public class AssetLc implements Serializable {
     /**
      * 管理员下发时间
      */
-    @ApiModelProperty("管理员下发时间")
+    @ApiModelProperty("时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime xfTime;
+
+
     /**
-     * 单位核查完成提交时间
-     */
-    @ApiModelProperty("单位核查完成提交时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime dwhcTime;
-    /**
-     * 管理员审核驳回时间
-     */
-    @ApiModelProperty("管理员审核驳回时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime shbhTime;
-    /**
-     * 单位重新核查提交时间
-     */
-    @ApiModelProperty("单位重新核查提交时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime dwcxhcTime;
-    /**
-     * 管理员审核通过时间
+     * 流程名称
      */
-    @ApiModelProperty("管理员审核通过时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime shtgTime;
+    @ApiModelProperty("流程名称")
+    private String assetName;
+
+
     /**
      * 用户id
      */
@@ -120,5 +101,6 @@ public class AssetLc implements Serializable {
     private String remark;
 
 
+
 }
 

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

@@ -54,10 +54,10 @@ public class AssetTask implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime taskFinishTime;
     /**
-     * 任务状态1：进行中，2：正常完成，3：超期完成，4：正常完成，5：审核驳回
+     * 任务状态1：进行中，2：正常完成，3：超期完成，
      */
-    @ApiModelProperty("任务状态1：进行中，2：正常完成，3：超期完成，4：正常完成，5：审核驳回")
-    private String taskStatus;
+    @ApiModelProperty("任务状态1：进行中，2：正常完成，3：超期完成，4：审核驳回")
+    private Integer taskStatus=1;
     /**
      * 单位名称
      */

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

@@ -1,4 +1,4 @@
-package com.ruoyi.tc.entity.response;
+package com.ruoyi.tc.entity.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -12,16 +12,21 @@ import java.io.Serializable;
 
 /**
  * 资产基础网络复制表(asset_basic_network)实体类
+ *
  * @author du
  * @since 2024/11/13 14:44
-*/
+ */
 @Data
 @ApiModel("资产基础网络复制表")
 @TableName(value = "asset_basic_network_cp")
-public class AssetBasicNetworkCpResponse extends BaseClass implements Serializable {
+public class AssetBasicNetworkCpPo extends BaseClass implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(type = IdType.AUTO,value = "network_id")
+    private Long networkId;
 
 
-    private Long id;
 
     /**
      * 资源id
@@ -89,4 +94,10 @@ public class AssetBasicNetworkCpResponse extends BaseClass implements Serializab
 
     @ApiModelProperty("任务id")
     private Integer taskId;
+
+    /**
+     * 设备IP类型
+     */
+    @ApiModelProperty("设备IP类型")
+    private String ipType;
 }

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

@@ -0,0 +1,104 @@
+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_basic_network)实体类
+ * @author du
+ * @since 2024/11/13 14:44
+*/
+@Data
+@ApiModel("资产基础网络")
+@TableName(value = "asset_basic_network_cp")
+public class AssetBasicNetworkJyPo extends BaseClass implements Serializable {
+
+    /**
+     * 主键id
+     */
+    @TableId(type = IdType.AUTO,value = "network_id")
+    private Long networkId;
+
+
+
+    /**
+    * 资源id
+    */
+    @ApiModelProperty("资源id")
+    private Long assetId;
+    /**
+    * 1.服务器信息2网络设备3安全设备
+    */
+    @ApiModelProperty("1.服务器信息2网络设备3安全设备")
+    private Integer type;
+    /**
+    * 设备类型
+    */
+    @ApiModelProperty("设备类型")
+    private String sblx;
+    /**
+    * 品牌
+    */
+    @ApiModelProperty("品牌")
+    private String pp;
+    /**
+    * 设备IP
+    */
+    @ApiModelProperty("设备IP")
+    private String sbIp;
+
+    /**
+     * 设备IP类型
+     */
+    @ApiModelProperty("设备IP类型")
+    private String ipType;
+    /**
+    * 操作系统
+    */
+    @ApiModelProperty("操作系统")
+    private String czxt;
+    /**
+    * 操作系统版本
+    */
+    @ApiModelProperty("操作系统版本")
+    private String czxtbb;
+    /**
+    * 硬件型号
+    */
+    @ApiModelProperty("硬件型号")
+    private String yjxh;
+    /**
+    * 硬件序列号
+    */
+    @ApiModelProperty("硬件序列号")
+    private String yjxlh;
+    /**
+    * 硬件版本信息
+    */
+    @ApiModelProperty("硬件版本信息")
+    private String yjbbxx;
+    /**
+    * 硬件用途
+    */
+    @ApiModelProperty("硬件用途")
+    private String yjyt;
+    /**
+    * 硬件部署位置
+    */
+    @ApiModelProperty("硬件部署位置")
+    private String yjbsxx;
+
+    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+
+    @ApiModelProperty("任务id")
+    private Integer taskId;
+}

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

@@ -1,4 +1,4 @@
-package com.ruoyi.tc.entity.response;
+package com.ruoyi.tc.entity.po;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -20,9 +20,14 @@ import java.io.Serializable;
 @Data
 @ApiModel("资产新监管业务形态复制表")
 @TableName(value = "asset_business_form_cp")
-public class AssetBusinessFormCpResponse extends BaseClass implements Serializable {
+public class AssetBusinessFormCpPo extends BaseClass implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(type = IdType.AUTO,value = "business_id")
+    private  Long businessId;
+
 
-    private Long id;
     /**
      * 资源id
      */

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

@@ -0,0 +1,411 @@
+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 javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * 资产新监管业务形态(asset_business_form)实体类
+ * @author du
+ * @since 2024/11/13 14:44
+ */
+@Data
+@ApiModel("资产新监管业务形态")
+@TableName(value = "asset_business_form_cp")
+public class AssetBusinessFormJyPo extends BaseClass implements Serializable {
+
+    /**
+     * 主键id
+     */
+    @TableId(type = IdType.AUTO,value = "business_id")
+    private  Long businessId;
+
+
+    /**
+    * 资源id
+    */
+    @ApiModelProperty("资源id")
+    private Long assetId;
+    /**
+    * 云平台-云平台服务商
+    */
+    @Size(max= 50,message="云平台-云平台服务商长度不能超过50")
+    @ApiModelProperty("云平台-云平台服务商")
+    private String yptFws;
+    /**
+    * 云平台-是否租户级安全
+    */
+    @ApiModelProperty("云平台-是否租户级安全")
+    private String yptSfzh;
+    /**
+    * 云平台-云平台类型
+    */
+    @Size(max= 50,message="云平台-云平台类型长度不能超过50")
+    @ApiModelProperty("云平台-云平台类型")
+    private String yptLx;
+    /**
+    * 云平台-硬件资源大小
+    */
+    @Size(max= 50,message="云平台-硬件资源大小长度不能超过50")
+    @ApiModelProperty("云平台-硬件资源大小")
+    private String yptYjzydx;
+    /**
+    * 云平台-平台架构
+    */
+    @Size(max= 50,message="云平台-平台架构长度不能超过50")
+    @ApiModelProperty("云平台-平台架构")
+    private String yptPtjg;
+    /**
+    * 云平台-互联网IP段
+    */
+    @Size(max= 50,message="云平台-互联网IP段长度不能超过50")
+    @ApiModelProperty("云平台-互联网IP段")
+    private String yptIp;
+    /**
+    * 云平台-机房联系人
+    */
+    @Size(max= 50,message="云平台-机房联系人长度不能超过50")
+    @ApiModelProperty("云平台-机房联系人")
+    private String yptJflxr;
+    /**
+    * 云平台-机房联系人电话
+    */
+    @Size(max= 50,message="云平台-机房联系人电话长度不能超过50")
+    @ApiModelProperty("云平台-机房联系人电话")
+    private String yptJflxrdh;
+    /**
+    * 云平台-服务器设备类型
+    */
+    @Size(max= 50,message="云平台-服务器设备类型长度不能超过50")
+    @ApiModelProperty("云平台-服务器设备类型")
+    private String yptFwqsblx;
+    /**
+    * 大数据平台-平台服务商
+    */
+    @Size(max= 50,message="大数据平台-平台服务商长度不能超过50")
+    @ApiModelProperty("大数据平台-平台服务商")
+    private String dsjPtfws;
+    /**
+    * 大数据平台-敏感数据类型
+    */
+    @Size(max= 50,message="大数据平台-敏感数据类型长度不能超过50")
+    @ApiModelProperty("大数据平台-敏感数据类型")
+    private String dsjMgsjlx;
+    /**
+    * 大数据平台-硬件资源
+    */
+    @Size(max= 50,message="大数据平台-硬件资源长度不能超过50")
+    @ApiModelProperty("大数据平台-硬件资源")
+    private String dsjYjzy;
+    /**
+    * 大数据平台-系统数据量
+    */
+    @Size(max= 50,message="大数据平台-系统数据量长度不能超过50")
+    @ApiModelProperty("大数据平台-系统数据量")
+    private String dsjXtsjl;
+    /**
+    * 大数据平台-机房联系人
+    */
+    @Size(max= 50,message="大数据平台-机房联系人长度不能超过50")
+    @ApiModelProperty("大数据平台-机房联系人")
+    private String dsjJflxr;
+    /**
+    * 大数据平台-机房联系人电话
+    */
+    @Size(max= 50,message="大数据平台-机房联系人电话长度不能超过50")
+    @ApiModelProperty("大数据平台-机房联系人电话")
+    private String dsjJflxrdh;
+    /**
+    * 大数据平台-是否数据审计
+    */
+    @ApiModelProperty("大数据平台-是否数据审计")
+    private String dsjSfsjsj;
+    /**
+    * 一般物联网设备-系统集成商名称
+    */
+    @Size(max= 50,message="一般物联网设备-系统集成商名称长度不能超过50")
+    @ApiModelProperty("一般物联网设备-系统集成商名称")
+    private String wlwsbXtjcs;
+    /**
+    * 一般物联网设备-用户数量
+    */
+    @Size(max= 50,message="一般物联网设备-用户数量长度不能超过50")
+    @ApiModelProperty("一般物联网设备-用户数量")
+    private String wlwsbYhsl;
+    /**
+    * 一般物联网设备-服务对象
+    */
+    @ApiModelProperty("一般物联网设备-服务对象")
+    private String wlwsbFwdx;
+    /**
+    * 一般物联网设备-终端数量
+    */
+    @Size(max= 50,message="一般物联网设备-终端数量长度不能超过50")
+    @ApiModelProperty("一般物联网设备-终端数量")
+    private String wlwsbZdsl;
+    /**
+    * 一般物联网设备-网络互联情况
+    */
+    @ApiModelProperty("一般物联网设备-网络互联情况")
+    private String wlwsbWlhlqk;
+    /**
+    * 一般物联网设备-联系人
+    */
+    @Size(max= 50,message="一般物联网设备-联系人长度不能超过50")
+    @ApiModelProperty("一般物联网设备-联系人")
+    private String wlwsbLxr;
+    /**
+    * 一般物联网设备-服务范围
+    */
+    @ApiModelProperty("一般物联网设备-服务范围")
+    private String wlwsbFwfw;
+    /**
+    * 一般物联网设备-联系人电话
+    */
+    @Size(max= 50,message="一般物联网设备-联系人电话长度不能超过50")
+    @ApiModelProperty("一般物联网设备-联系人电话")
+    private String wlwsbLxrdh;
+    /**
+    * 一般物联网设备-服务内容
+    */
+    @Size(max= 500,message="一般物联网设备-服务内容长度不能超过500")
+    @ApiModelProperty("一般物联网设备-服务内容")
+    private String wlwsbFwnr;
+    /**
+    * 摄像头-摄像头品牌
+    */
+    @Size(max= 50,message="摄像头-摄像头品牌长度不能超过50")
+    @ApiModelProperty("摄像头-摄像头品牌")
+    private String sxtPp;
+    /**
+    * 摄像头-位置
+    */
+    @Size(max= 255,message="摄像头-位置长度不能超过255")
+    @ApiModelProperty("摄像头-位置")
+    private String sxtWz;
+    /**
+    * 摄像头-摄像头IP
+    */
+    @Size(max= 50,message="摄像头-摄像头IP长度不能超过50")
+    @ApiModelProperty("摄像头-摄像头IP")
+    private String sxtIp;
+    /**
+    * 摄像头-区域
+    */
+    @Size(max= 50,message="摄像头-区域长度不能超过50")
+    @ApiModelProperty("摄像头-区域")
+    private String sxtQy;
+    /**
+    * 摄像头-摄像头数量
+    */
+    @Size(max= 50,message="摄像头-摄像头数量长度不能超过50")
+    @ApiModelProperty("摄像头-摄像头数量")
+    private String sxtSl;
+    /**
+    * 摄像头-端口
+    */
+    @Size(max= 50,message="摄像头-端口长度不能超过50")
+    @ApiModelProperty("摄像头-端口")
+    private String sxtDk;
+    /**
+    * 摄像头-设备型号
+    */
+    @Size(max= 50,message="摄像头-设备型号长度不能超过50")
+    @ApiModelProperty("摄像头-设备型号")
+    private String sxtSbxh;
+    /**
+    * 摄像头-固定版本
+    */
+    @Size(max= 50,message="摄像头-固定版本长度不能超过50")
+    @ApiModelProperty("摄像头-固定版本")
+    private String sxtGdbb;
+    /**
+    * 移动APP-移动APP系统
+    */
+    @Size(max= 50,message="移动APP-移动APP系统长度不能超过50")
+    @ApiModelProperty("移动APP-移动APP系统")
+    private String appXt;
+    /**
+    * 移动APP-服务端域名
+    */
+    @Size(max= 50,message="移动APP-服务端域名长度不能超过50")
+    @ApiModelProperty("移动APP-服务端域名")
+    private String appYm;
+    /**
+    * 移动APP-移动APP渠道
+    */
+    @Size(max= 50,message="移动APP-移动APP渠道长度不能超过50")
+    @ApiModelProperty("移动APP-移动APP渠道")
+    private String appQd;
+    /**
+    * 移动APP-服务端IP
+    */
+    @Size(max= 50,message="移动APP-服务端IP长度不能超过50")
+    @ApiModelProperty("移动APP-服务端IP")
+    private String appIp;
+    /**
+    * 移动APP-联系人
+    */
+    @Size(max= 50,message="移动APP-联系人长度不能超过50")
+    @ApiModelProperty("移动APP-联系人")
+    private String appLxr;
+    /**
+    * 移动APP-联系人电话
+    */
+    @Size(max= 50,message="移动APP-联系人电话长度不能超过50")
+    @ApiModelProperty("移动APP-联系人电话")
+    private String appLxrdh;
+    /**
+    * 移动APP-APP是否有身份认证
+    */
+    @ApiModelProperty("移动APP-APP是否有身份认证")
+    private String appSfysfrz;
+    /**
+    * 工业控制-系统集成商名称
+    */
+    @Size(max= 255,message="工业控制-系统集成商名称长度不能超过255")
+    @ApiModelProperty("工业控制-系统集成商名称")
+    private String gykzJcs;
+    /**
+    * 工业控制-运行时间
+    */
+    @Size(max= 255,message="工业控制-运行时间长度不能超过255")
+    @ApiModelProperty("工业控制-运行时间")
+    private String gykzYxsj;
+    /**
+    * 工业控制-服务对象
+    */
+    @ApiModelProperty("工业控制-服务对象")
+    private String gykzFwdx;
+    /**
+    * 工业控制-集成商国内外情况
+    */
+    @Size(max= 255,message="工业控制-集成商国内外情况长度不能超过255")
+    @ApiModelProperty("工业控制-集成商国内外情况")
+    private String gykzJcsqk;
+    /**
+    * 工业控制-网络互联情况
+    */
+    @ApiModelProperty("工业控制-网络互联情况")
+    private String gykzWlhxqk;
+    /**
+    * 工业控制-联系人
+    */
+    @Size(max= 255,message="工业控制-联系人长度不能超过255")
+    @ApiModelProperty("工业控制-联系人")
+    private String gykzLxr;
+    /**
+    * 工业控制-服务范围
+    */
+    @ApiModelProperty("工业控制-服务范围")
+    private String gykzFwfw;
+    /**
+    * 工业控制-联系人电话
+    */
+    @Size(max= 50,message="工业控制-联系人电话长度不能超过50")
+    @ApiModelProperty("工业控制-联系人电话")
+    private String gykzLxrdh;
+    /**
+    * 工业控制-设备名称
+    */
+    @Size(max= 50,message="工业控制-设备名称长度不能超过50")
+    @ApiModelProperty("工业控制-设备名称")
+    private String gykzSbmc;
+    /**
+    * 工业控制-设备品牌
+    */
+    @Size(max= 50,message="工业控制-设备品牌长度不能超过50")
+    @ApiModelProperty("工业控制-设备品牌")
+    private String gykzSbpp;
+    /**
+    * 工业控制-设备类别
+    */
+    @Size(max= 50,message="工业控制-设备类别长度不能超过50")
+    @ApiModelProperty("工业控制-设备类别")
+    private String gykzSblb;
+    /**
+    * 工业控制-运营商
+    */
+    @Size(max= 50,message="工业控制-运营商长度不能超过50")
+    @ApiModelProperty("工业控制-运营商")
+    private String gykzYys;
+    /**
+    * 工业控制-互联网IP
+    */
+    @Size(max= 50,message="工业控制-互联网IP长度不能超过50")
+    @ApiModelProperty("工业控制-互联网IP")
+    private String gykzHlwIp;
+    /**
+    * 工业控制-网络层级
+    */
+    @Size(max= 50,message="工业控制-网络层级长度不能超过50")
+    @ApiModelProperty("工业控制-网络层级")
+    private String gykzWlcj;
+    /**
+    * 工业控制-控制台IP
+    */
+    @Size(max= 50,message="工业控制-控制台IP长度不能超过50")
+    @ApiModelProperty("工业控制-控制台IP")
+    private String gykzKztIp;
+    /**
+    * 工业控制-描述
+    */
+    @Size(max= 500,message="工业控制-描述长度不能超过500")
+    @ApiModelProperty("工业控制-描述")
+    private String gykzMs;
+    /**
+    * CDN信息-CDN供应商
+    */
+    @Size(max= 255,message="CDN信息-CDN供应商长度不能超过255")
+    @ApiModelProperty("CDN信息-CDN供应商")
+    private String cdnGys;
+    /**
+    * CDN信息-CDN是否使用
+    */
+    @ApiModelProperty("CDN信息-CDN是否使用")
+    private String cdnSfsy;
+    /**
+    * CDN信息-CDN类型
+    */
+    @Size(max= 50,message="CDN信息-CDN类型长度不能超过50")
+    @ApiModelProperty("CDN信息-CDN类型")
+    private String cdnLx;
+    /**
+    * CDN信息-CDN域名
+    */
+    @Size(max= 50,message="CDN信息-CDN域名长度不能超过50")
+    @ApiModelProperty("CDN信息-CDN域名")
+    private String cdnYm;
+    /**
+    * CDN信息-联系人
+    */
+    @Size(max= 50,message="CDN信息-联系人长度不能超过50")
+    @ApiModelProperty("CDN信息-联系人")
+    private String cdnLxr;
+    /**
+    * CDN信息-联系人电话
+    */
+    @Size(max= 50,message="CDN信息-联系人电话长度不能超过50")
+    @ApiModelProperty("CDN信息-联系人电话")
+    private String cdnLxrdh;
+    /**
+    * CDN信息-CDN加速信息
+    */
+    @Size(max= 500,message="CDN信息-CDN加速信息长度不能超过500")
+    @ApiModelProperty("CDN信息-CDN加速信息")
+    private String cdnJsxx;
+
+    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @ApiModelProperty("任务id")
+    private Integer taskId;
+}

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

@@ -1,21 +1,15 @@
-package com.ruoyi.tc.entity.response;
+package com.ruoyi.tc.entity.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 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 com.ruoyi.tc.entity.AssetBasicNetwork;
-import com.ruoyi.tc.entity.AssetBusinessForm;
-import com.ruoyi.tc.entity.AssetSupplyChain;
-import com.ruoyi.tc.entity.UnitOtherConcat;
+import com.ruoyi.tc.entity.request.Acomma;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.List;
@@ -29,9 +23,15 @@ import java.util.List;
 @Data
 @ApiModel("现有资产复制表")
 @TableName(value = "asset_current_cp")
-public class AssetCurrentResponse extends BaseClass implements Serializable {
+public class AssetCurrentCpPo extends BaseClass implements Serializable {
 
     private static final long serialVersionUID = 1L;
+//    /**
+//     * 主键id
+//     */
+//    @TableId(type = IdType.AUTO,value = "current_id")
+//    private Long currentId;
+
     @ApiModelProperty("资产id")
     private Long id;
 
@@ -104,12 +104,12 @@ public class AssetCurrentResponse extends BaseClass implements Serializable {
 
     @ApiModelProperty("关联域名list")
     @TableField(exist = false)
-    private List<String> glymList;
-
+    private List<Acomma> glymList;
 
     @ApiModelProperty("关联iplist）")
     @TableField(exist = false)
-    private List<String> glIpList;
+    private List<Acomma> glIpList;
+
 
     /**
      * 关联ip（多个用,分隔）
@@ -196,12 +196,12 @@ public class AssetCurrentResponse extends BaseClass implements Serializable {
      */
     @ApiModelProperty("存活率（字典）")
     private String chl;
-    /**
-     * 地理位置
-     */
-
-    @ApiModelProperty("地理位置")
-    private String dlwz;
+//    /**
+//     * 地理位置
+//     */
+//
+//    @ApiModelProperty("地理位置")
+//    private String dlwz;
     /**
      * 经度
      */
@@ -409,7 +409,7 @@ public class AssetCurrentResponse extends BaseClass implements Serializable {
 
     @ApiModelProperty("其他联系人")
     @TableField(exist = false)
-    private List<UnitOtherConcatCpResponse> otherConcat;
+    private List<UnitOtherConcatCpPo> otherConcat;
 
     /**
      * ICP备案信息-是否备案
@@ -608,17 +608,12 @@ public class AssetCurrentResponse extends BaseClass implements Serializable {
     private String dbxxSfydsfcp;
 
     @ApiModelProperty("地理位置-省")
-
-    @TableField(exist = false)
     private String sheng;
 
     @ApiModelProperty("地理位置-市")
-
-    @TableField(exist = false)
     private String shi;
 
     @ApiModelProperty("地理位置-区（县）")
-    @TableField(exist = false)
     private String qu;
     /**
      * 等保信息-测评得分
@@ -727,20 +722,20 @@ public class AssetCurrentResponse extends BaseClass implements Serializable {
      */
     @ApiModelProperty("供应链信息列表")
     @TableField(exist = false)
-    private List<AssetSupplyChainCpResponse> gylxxList;
+    private List<AssetSupplyChainCpPo> gylxxList;
     /**
      * 基础网络列表
      */
     @ApiModelProperty("基础网络列表")
     @TableField(exist = false)
-    private List<AssetBasicNetworkCpResponse> jcwlList;
+    private List<AssetBasicNetworkCpPo> jcwlList;
 
     /**
      * 新监管业务形态
      */
     @ApiModelProperty("新监管业务形态")
     @TableField(exist = false)
-    private AssetBusinessFormCpResponse xjgywxt;
+    private AssetBusinessFormCpPo xjgywxt;
     /**
      * Whois信息-有效性
      */
@@ -935,5 +930,5 @@ public class AssetCurrentResponse extends BaseClass implements Serializable {
     private String bfyy;
 
     @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
-    private Integer status;
+    private Integer status=0;
 }

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

@@ -1,4 +1,4 @@
-package com.ruoyi.tc.entity.response;
+package com.ruoyi.tc.entity.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -19,9 +18,17 @@ import java.io.Serializable;
 @Data
 @ApiModel("资产供应链信息复制表响应类")
 @TableName(value = "asset_supply_chain_cp")
-public class AssetSupplyChainCpResponse extends BaseClass implements Serializable {
+public class AssetSupplyChainCpPo extends BaseClass implements Serializable {
+
+    /**
+     * 主键id
+     */
+    @TableId(type = IdType.AUTO,value = "supply_id")
+    private Long  supplyId;
+
+
+
 
-    private Long id;
     /**
      * 资产id
      */

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

@@ -0,0 +1,84 @@
+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 javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * 资产供应链信息(asset_supply_chain)实体类
+ * @author du
+ * @since 2024/11/13 14:44
+ */
+@Data
+@ApiModel("资产供应链信息")
+@TableName(value = "asset_supply_chain_cp")
+public class AssetSupplyChainJyPo extends BaseClass implements Serializable {
+
+    /**
+     * 主键id
+     */
+    @TableId(type = IdType.AUTO,value = "supply_id")
+    private Long  supplyId;
+
+
+
+
+    /**
+    * 资产id
+    */
+    @ApiModelProperty("资产id")
+    private Long assetId;
+    /**
+    * 1.测评单位2.硬件供应商单位3.机房运维单位4.系统设计单位5.系统建设单位6.安全服务单位 7系统运营单位
+    */
+    @ApiModelProperty("1.测评单位2.硬件供应商单位3.机房运维单位4.系统设计单位5.系统建设单位6.安全服务单位 7系统运营单位")
+    private Integer type;
+    /**
+    * 名称
+    */
+    @Size(max= 50,message="名称长度不能超过50")
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 统一信用代码
+    */
+    @Size(max= 50,message="统一信用代码长度不能超过50")
+    @ApiModelProperty("统一信用代码")
+    private String tyshxydm;
+    /**
+    * 联系人
+    */
+    @Size(max= 50,message="联系人长度不能超过50")
+    @ApiModelProperty("联系人")
+    private String lxr;
+    /**
+    * 联系电话
+    */
+    @Size(max= 50,message="联系电话长度不能超过50")
+    @ApiModelProperty("联系电话")
+    private String lxdh;
+    /**
+    * 供应商注册地址
+    */
+    @Size(max= 500,message="供应商注册地址长度不能超过500")
+    @ApiModelProperty("供应商注册地址")
+    private String gyszcdz;
+    /**
+    * 注册地是否为太仓
+    */
+    @ApiModelProperty("注册地是否为太仓")
+    private String sfwtc;
+
+    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @ApiModelProperty("任务id")
+    private Integer taskId;
+}

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

@@ -1,5 +1,7 @@
-package com.ruoyi.tc.entity.response;
+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;
@@ -17,8 +19,13 @@ import java.io.Serializable;
 @Data
 @ApiModel("单位其他联系人复制表")
 @TableName(value = "unit_other_contact_cp")
-public class UnitOtherConcatCpResponse extends BaseClass implements Serializable {
-    @ApiModelProperty("主键id")
+public class UnitOtherConcatCpPo extends BaseClass implements Serializable {
+
+
+
+
+    @ApiModelProperty("主表id")
+    @TableId(type = IdType.AUTO,value = "concat_id")
     private Long concatId;
 
     @ApiModelProperty("单位id")

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

@@ -0,0 +1,57 @@
+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;
+
+/**
+ * 单位其他联系人(unit_other_contact)实体类
+ * @author du
+ * @since 2024/11/13 14:44
+ */
+@Data
+@ApiModel("单位其他联系人")
+@TableName(value = "unit_other_contact_cp")
+public class UnitOtherConcatJyPo extends BaseClass implements Serializable {
+
+
+
+
+
+    /**
+     * 主表id
+     */
+    @TableId(type = IdType.AUTO,value = "concat_id")
+    @ApiModelProperty("主表id")
+    private Long concatId;
+
+    @ApiModelProperty("单位id")
+    private Long unitId;
+
+    @ApiModelProperty("资产id")
+    private Long assetId;
+
+    @ApiModelProperty("其他联系人姓名")
+    private String qtlxrxm;
+
+    @ApiModelProperty("其他联系人联系方式")
+    private String qtlxrlxfs;
+
+    @ApiModelProperty("其他联系人邮箱")
+    private String qtlxryx;
+
+    @ApiModelProperty("其他联系人职务职称")
+    private String qtlxrzwzc;
+
+    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @ApiModelProperty("任务id")
+    private Integer taskId;
+}

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

@@ -27,6 +27,8 @@ public class AssetCurrentShRequest {
     private Integer assetId;
 
 
+
+
     /**
      * 审核状态（0待核查，1待审核，3审核通过，4审核不通过，5已报废）
      */

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

@@ -16,6 +16,12 @@ import java.time.LocalDateTime;
 @ApiModel("任务主表分页请求类")
 public class AssetTaskPageRequest {
 
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty("主键id")
+    private Integer id;
     /**
      * 任务名称
      */

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

@@ -0,0 +1,23 @@
+package com.ruoyi.tc.entity.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dong
+ * @since 2024/11/21 18:49
+ */
+@Data
+@ApiModel("单位核查情况请求类")
+public class AssetdwHcRequest {
+
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty("单位名称")
+    private String dwmc;
+
+
+}

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

@@ -0,0 +1,35 @@
+package com.ruoyi.tc.entity.response;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author dong
+ * @since 2024/11/22 9:35
+ */
+@Data
+@ApiModel("资产表状态时间详情类")
+public class AssetTaskStatusResponse {
+
+
+    /**
+     * 审核状态
+     */
+
+    @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
+    private Integer status;
+
+
+    /**
+     * 超期状态
+     */
+
+    @ApiModelProperty("6已超期；7未超期")
+    private Integer deadstatus;
+
+}

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

@@ -0,0 +1,52 @@
+package com.ruoyi.tc.entity.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dong
+ * @since 2024/11/21 18:36
+ */
+@Data
+@ApiModel("核查单位信息响应类")
+public class AssetdwHcResponse {
+
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty("单位名称")
+    private String dwmc;
+
+
+
+
+    /**
+     * 核查资产数量
+     */
+    @ApiModelProperty("核查资产数量")
+    private Integer total;
+
+
+    /**
+     * 完成数量
+     */
+    @ApiModelProperty("完成数量")
+    private Integer checked;
+
+
+    /**
+     * 完成数量
+     */
+    @ApiModelProperty("完成数量")
+    private Integer notChecked;
+
+
+    /**
+     * 百分比
+     */
+    @ApiModelProperty("百分比")
+    private double checkedRatio;
+
+}

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

@@ -1,8 +1,9 @@
 package com.ruoyi.tc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.tc.entity.response.AssetBasicNetworkCpResponse;
+import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo;
 import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -13,7 +14,7 @@ import java.util.List;
  * @author makejava
  * @since 2024-11-15 10:03:56
  */
-public interface AssetBasicNetWorkCpMapper extends BaseMapper<AssetBasicNetworkCpResponse> {
+public interface AssetBasicNetWorkCpMapper extends BaseMapper<AssetBasicNetworkCpPo> {
 
     /**
      * 根据资产id资产供应链原有id
@@ -23,7 +24,7 @@ public interface AssetBasicNetWorkCpMapper extends BaseMapper<AssetBasicNetworkC
      */
 
     @Select("select * from asset_basic_network where  asset_id=#{assetId} ")
-    List<AssetBasicNetworkCpResponse> findByassetId(Long assetId);
+    List<AssetBasicNetworkCpPo> findByassetId(Long assetId);
 
 
     /**
@@ -32,7 +33,18 @@ public interface AssetBasicNetWorkCpMapper extends BaseMapper<AssetBasicNetworkC
      * @param assetId 资产id
      * @param taskId  任务id
      */
-    @Delete("delete from asset_basic_network_cp where asset_id=#{assetId} and task_id ={taskId}  ")
-    void deletByAssetIdandTaskId(Long assetId, int taskId);
+    @Delete("delete from asset_basic_network_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_basic_network_cp where task_id=#{taskId}")
+    List<AssetBasicNetworkCpPo> findByTaskId(int taskId);
 
 }

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

@@ -0,0 +1,14 @@
+package com.ruoyi.tc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.tc.entity.po.AssetBasicNetworkJyPo;
+
+/**
+ * 资产基础网络复制表(asset_basic_network_cp)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-11-15 10:03:56
+ */
+public interface AssetBasicNetWorkJyMapper extends BaseMapper<AssetBasicNetworkJyPo> {
+
+}

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

@@ -1,8 +1,10 @@
 package com.ruoyi.tc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.tc.entity.response.AssetBusinessFormCpResponse;
+import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
 import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -13,7 +15,7 @@ import java.util.List;
  * @author makejava
  * @since 2024-11-15 10:03:56
  */
-public interface AssetBusinessFormCpMapper extends BaseMapper<AssetBusinessFormCpResponse> {
+public interface AssetBusinessFormCpMapper extends BaseMapper<AssetBusinessFormCpPo> {
 
 
     /**
@@ -23,7 +25,7 @@ public interface AssetBusinessFormCpMapper extends BaseMapper<AssetBusinessFormC
      * @return
      */
     @Select("select * from asset_business_form where asset_id =#{assetId}")
-    List<AssetBusinessFormCpResponse> findByassetId(Long assetId);
+    List<AssetBusinessFormCpPo> findByassetId(Long assetId);
 
 
     /**
@@ -32,8 +34,19 @@ public interface AssetBusinessFormCpMapper extends BaseMapper<AssetBusinessFormC
      * @param assetId 资产id
      * @param taskId  任务id
      */
-    @Delete("delete from asset_business_form_cp where asset_id=#{assetId} and task_id ={taskId}  ")
-    void deletByAssetIdandTaskId(Long assetId, int taskId);
+    @Delete("delete from asset_business_form_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_business_form_cp where task_id=#{taskId}")
+    List<AssetBusinessFormCpPo> findByTaskId(int taskId);
 
 }
 

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

@@ -0,0 +1,40 @@
+package com.ruoyi.tc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo;
+import com.ruoyi.tc.entity.po.AssetBusinessFormJyPo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * 资产新监管业务形态复制表(asset_business_form_cp)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-11-15 10:03:56
+ */
+public interface AssetBusinessFormJyMapper extends BaseMapper<AssetBusinessFormJyPo> {
+
+
+    /**
+     * 根据资产id查询业务主表原有id
+     *
+     * @param assetId 资产id
+     * @return
+     */
+    @Select("select * from asset_business_form where asset_id =#{assetId}")
+    List<AssetBusinessFormCpPo> findByassetId(Long assetId);
+
+
+    /**
+     * 根据资产id和任务id删除数据
+     *
+     * @param assetId 资产id
+     * @param taskId  任务id
+     */
+    @Delete("delete from asset_business_form_cp where asset_id=#{assetId} and task_id ={taskId}  ")
+    void deletByAssetIdandTaskId(Long assetId, int taskId);
+
+}
+

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

@@ -1,12 +1,10 @@
 package com.ruoyi.tc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.tc.entity.AssetCurrent;
-import com.ruoyi.tc.entity.request.AssetCurrentPageRequest;
-import com.ruoyi.tc.entity.response.AssetCurrentResponse;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -16,13 +14,26 @@ import java.util.List;
  * @author makejava
  * @since 2024-11-15 10:03:56
  */
-public interface AssetCurrentCpMapper extends BaseMapper<AssetCurrentResponse> {
+public interface AssetCurrentCpMapper extends BaseMapper<AssetCurrentCpPo> {
     /**
      *
      * @param assetId
      * @param taskId
      */
-    @Delete("delete from asset_current_cp where id=#{assetId} and task_id ={taskId}  ")
-    void deletByAssetIdandTaskId(Long assetId,int taskId);
+    @Delete("delete from asset_current_cp where 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_current_cp where task_id=#{taskId}")
+    List<AssetCurrentCpPo> findByTaskId(int taskId);
 }
 

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

@@ -0,0 +1,15 @@
+package com.ruoyi.tc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
+
+/**
+ * 现有资产复制表(AssetCurrentResponse)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-11-15 10:03:56
+ */
+public interface AssetCurrentJyMapper extends BaseMapper<AssetCurrentJyPo> {
+
+}
+

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

@@ -19,11 +19,11 @@ public interface AssetLcMapper {
     /**
      * 页条件查询
      *
-     * @param page 分页条件
+
      * @param pageRequest  查询条件
      * @return 填报任务
      */
-    Page<AssetLc> queryByPage(Page<AssetLc> page, @Param("req") AssetLcRequest pageRequest);
+    List<AssetLc> queryByPage( @Param("req") AssetLcRequest pageRequest);
 
 
     /**

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

@@ -1,8 +1,10 @@
 package com.ruoyi.tc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.tc.entity.response.AssetSupplyChainCpResponse;
+import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo;
+import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo;
 import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -13,7 +15,7 @@ import java.util.List;
  * @author makejava
  * @since 2024-11-15 10:03:56
  */
-public interface AssetSupplyChainCpMapper extends BaseMapper<AssetSupplyChainCpResponse> {
+public interface AssetSupplyChainCpMapper extends BaseMapper<AssetSupplyChainCpPo> {
 
 
     /**
@@ -23,7 +25,7 @@ public interface AssetSupplyChainCpMapper extends BaseMapper<AssetSupplyChainCpR
      * @return
      */
     @Select("select * from asset_supply_chain where asset_id=#{assetId}")
-    List<AssetSupplyChainCpResponse> findByassetId(Long assetId);
+    List<AssetSupplyChainCpPo> findByassetId(Long assetId);
 
 
     /**
@@ -32,8 +34,19 @@ public interface AssetSupplyChainCpMapper extends BaseMapper<AssetSupplyChainCpR
      * @param assetId 资产id
      * @param taskId  任务id
      */
-    @Delete("delete from asset_business_form_cp where asset_id=#{assetId} and task_id ={taskId}  ")
-    void deletByAssetIdandTaskId(Long assetId, int taskId);
+    @Delete("delete from asset_supply_chain_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_supply_chain_cp where task_id=#{taskId}")
+    List<AssetSupplyChainCpPo> findByTaskId(int taskId);
 }
 

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

@@ -0,0 +1,18 @@
+package com.ruoyi.tc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.tc.entity.po.AssetSupplyChainJyPo;
+
+/**
+ * 资产供应链信息复制(asset_supply_chain_cp)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-11-15 10:03:56
+ */
+public interface AssetSupplyChainJyMapper extends BaseMapper<AssetSupplyChainJyPo> {
+
+
+
+
+}
+

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

@@ -3,15 +3,19 @@ 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.AssetTask;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
 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.AssetCurrentResponse;
 import com.ruoyi.tc.entity.response.AssetTaskResponse;
+import com.ruoyi.tc.entity.response.AssetTaskStatusResponse;
+import com.ruoyi.tc.entity.response.AssetdwHcResponse;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -105,7 +109,7 @@ public interface AssetTaskMapper extends BaseMapper<AssetTask> {
      * @param dwmc 单位名称
      * @return
      */
-    List<AssetCurrentResponse> findByDwmcAssetCurrent(String dwmc);
+    List<AssetCurrentCpPo> findByDwmcAssetCurrent(String dwmc);
 
 
     /**
@@ -125,8 +129,7 @@ public interface AssetTaskMapper extends BaseMapper<AssetTask> {
      * @param assetId 资产id
      * @return
      */
-    AssetCurrentResponse findBytaskIdandAssestId(@Param("taskId") int taskId, @Param("assetId") int assetId);
-
+    AssetCurrentCpPo findBytaskIdandAssestId(@Param("taskId") int taskId, @Param("assetId") int assetId);
 
 
     /**
@@ -136,5 +139,33 @@ public interface AssetTaskMapper extends BaseMapper<AssetTask> {
      * @return
      */
     int sh(@Param("req") AssetCurrentShRequest req);
+
+
+    /**
+     * 管理端-单位核查情况
+     *
+     * @return
+     */
+    Page<AssetdwHcResponse> dwHc(Page<AssetdwHcResponse> assetdwHcResponsePage, @Param("req") AssetdwHcRequest req);
+
+
+    /**
+     * 查询当前任务下的所有资产状态和完成时间
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    List<AssetTaskStatusResponse> findByTaskId(Integer taskId);
+
+    /**
+     * 修改主表任务状态
+     *
+     * @param taskStatus 任务状态
+     * @param taskId     任务id
+     * @return
+     */
+
+    int updateByTaskId(@Param("taskStatus") Integer taskStatus, @Param("taskId") Integer taskId,@Param("finishTime") LocalDateTime finishTime );
+
 }
 

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

@@ -1,8 +1,9 @@
 package com.ruoyi.tc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.tc.entity.response.UnitOtherConcatCpResponse;
+import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo;
 import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -12,7 +13,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-public interface UnitOtherConcatCpMapper extends BaseMapper<UnitOtherConcatCpResponse> {
+public interface UnitOtherConcatCpMapper extends BaseMapper<UnitOtherConcatCpPo> {
 
 
     /**
@@ -22,7 +23,7 @@ public interface UnitOtherConcatCpMapper extends BaseMapper<UnitOtherConcatCpRes
      * @return
      */
     @Select("select * from unit_other_contact where asset_id =#{assetId}")
-    List<UnitOtherConcatCpResponse> findByassetId(Long assetId);
+    List<UnitOtherConcatCpPo> findByassetId(Long assetId);
 
 
     /**
@@ -31,6 +32,17 @@ public interface UnitOtherConcatCpMapper extends BaseMapper<UnitOtherConcatCpRes
      * @param assetId 资产id
      * @param taskId  任务id
      */
-    @Delete("delete from unit_other_contact_cp where asset_id=#{assetId} and task_id ={taskId}  ")
-    void deletByAssetIdandTaskId(Long assetId, int taskId);
+    @Delete("delete from unit_other_contact_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  unit_other_contact_cp where task_id=#{taskId}")
+    List<UnitOtherConcatCpPo> findByTaskId(int taskId);
 }

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

@@ -0,0 +1,19 @@
+package com.ruoyi.tc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo;
+import com.ruoyi.tc.entity.po.UnitOtherConcatJyPo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * 单位其他联系人复制(unit_other_contact_cp)数据层
+ *
+ * @author ruoyi
+ */
+public interface UnitOtherConcatJyMapper extends BaseMapper<UnitOtherConcatJyPo> {
+
+
+}

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

@@ -1,8 +1,8 @@
 package com.ruoyi.tc.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.tc.entity.AssetBasicNetwork;
-import com.ruoyi.tc.entity.response.AssetBasicNetworkCpResponse;
+import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo;
+import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo;
 
 import java.util.List;
 
@@ -12,7 +12,7 @@ import java.util.List;
  * @author makejava
  * @since 2024-11-15 16:05:26
  */
-public interface AssetBasicNetworkCpService extends IService<AssetBasicNetworkCpResponse> {
+public interface AssetBasicNetworkCpService extends IService<AssetBasicNetworkCpPo> {
 
     /**
      * 根据资产id资产供应链原有id
@@ -20,7 +20,7 @@ public interface AssetBasicNetworkCpService extends IService<AssetBasicNetworkCp
      * @param assetId 资产id
      * @return
      */
-    List<AssetBasicNetworkCpResponse> findByassetId(Long assetId);
+    List<AssetBasicNetworkCpPo> findByassetId(Long assetId);
 
 
 
@@ -31,4 +31,13 @@ public interface AssetBasicNetworkCpService extends IService<AssetBasicNetworkCp
      * @param taskId  任务id
      */
     void deletByAssetIdandTaskId(Long assetId, int taskId);
+
+
+    /**
+     * 根据taskid查询查询数据
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    List<AssetBasicNetworkCpPo> findByTaskId(int taskId);
 }

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

@@ -0,0 +1,18 @@
+package com.ruoyi.tc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo;
+import com.ruoyi.tc.entity.po.AssetBasicNetworkJyPo;
+
+import java.util.List;
+
+/**
+ * 资产基础网络复制表(asset_basic_network)表服务接口
+ *
+ * @author makejava
+ * @since 2024-11-15 16:05:26
+ */
+public interface AssetBasicNetworkJyService extends IService<AssetBasicNetworkJyPo> {
+
+
+}

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

@@ -1,7 +1,8 @@
 package com.ruoyi.tc.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.tc.entity.response.AssetBusinessFormCpResponse;
+import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
 
 import java.util.List;
 
@@ -11,14 +12,14 @@ import java.util.List;
  * @author makejava
  * @since 2024-11-15 16:06:53
  */
-public interface AssetBusinessFormCpService extends IService<AssetBusinessFormCpResponse> {
+public interface AssetBusinessFormCpService extends IService<AssetBusinessFormCpPo> {
 
     /**
      * 根据资产id查询业务主表原有id
      * @param assetId 资产id
      * @return
      */
-    List<AssetBusinessFormCpResponse> findByassetId(Long assetId);
+    List<AssetBusinessFormCpPo> findByassetId(Long assetId);
 
 
 
@@ -30,5 +31,15 @@ public interface AssetBusinessFormCpService extends IService<AssetBusinessFormCp
      */
     void deletByAssetIdandTaskId(Long assetId, int taskId);
 
+
+
+    /**
+     * 根据taskid查询查询数据
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    List<AssetBusinessFormCpPo> findByTaskId(int taskId);
+
 }
 

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

@@ -0,0 +1,17 @@
+package com.ruoyi.tc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.tc.entity.po.AssetBusinessFormJyPo;
+
+/**
+ * 资产新监管业务形态复制(asset_business_form_cp)表服务接口
+ *
+ * @author makejava
+ * @since 2024-11-15 16:06:53
+ */
+public interface AssetBusinessFormJyService extends IService<AssetBusinessFormJyPo> {
+
+
+
+}
+

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

@@ -1,7 +1,9 @@
 package com.ruoyi.tc.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.tc.entity.response.AssetCurrentResponse;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
+
+import java.util.List;
 
 /**
  * 现有资产复制表(AssetCurrentResponse)表服务接口
@@ -9,7 +11,7 @@ import com.ruoyi.tc.entity.response.AssetCurrentResponse;
  * @author makejava
  * @since 2024-11-15 10:04:03
  */
-public interface AssetCurrentCpService extends IService<AssetCurrentResponse> {
+public interface AssetCurrentCpService extends IService<AssetCurrentCpPo> {
 
     /**
      * 根据资产id和任务id删除数据
@@ -19,5 +21,14 @@ public interface AssetCurrentCpService extends IService<AssetCurrentResponse> {
      */
     void deletByAssetIdandTaskId(Long assetId, int taskId);
 
+
+    /**
+     * 根据taskid查询查询数据
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    List<AssetCurrentCpPo> findByTaskId(int taskId);
+
 }
 

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

@@ -0,0 +1,16 @@
+package com.ruoyi.tc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
+
+/**
+ * 现有资产表(AssetCurrent)表服务接口
+ *
+ * @author makejava
+ * @since 2024-11-15 10:04:03
+ */
+public interface AssetCurrentJyService extends IService<AssetCurrentJyPo> {
+
+
+}
+

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

@@ -3,7 +3,9 @@ package com.ruoyi.tc.service;
 import com.ruoyi.tc.entity.AssetLc;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.tc.entity.request.AssetLcRequest;
+import com.ruoyi.tc.entity.response.AssetTaskStatusResponse;
 
+import java.util.List;
 /**
  * 任务流程(AssetLc)表服务接口
  *
@@ -27,7 +29,7 @@ public interface AssetLcService {
      * @param pageRequest      分页对象
      * @return 查询结果
      */
-    Page<AssetLc> queryByPage(Page<AssetLc>assetLc, AssetLcRequest pageRequest);
+    List<AssetLc> queryByPage( AssetLcRequest pageRequest);
 
     /**
      * 新增数据

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

@@ -1,7 +1,8 @@
 package com.ruoyi.tc.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.tc.entity.response.AssetSupplyChainCpResponse;
+import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo;
+import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo;
 
 import java.util.List;
 
@@ -11,7 +12,7 @@ import java.util.List;
  * @author makejava
  * @since 2024-11-15 16:07:30
  */
-public interface AssetSupplyChainCpService extends IService<AssetSupplyChainCpResponse> {
+public interface AssetSupplyChainCpService extends IService<AssetSupplyChainCpPo> {
 
     /**
      * 根据资产id资产供应链原有id
@@ -19,7 +20,16 @@ public interface AssetSupplyChainCpService extends IService<AssetSupplyChainCpRe
      * @param assetId 资产id
      * @return
      */
-    List<AssetSupplyChainCpResponse> findByassetId(Long assetId);
+    List<AssetSupplyChainCpPo> findByassetId(Long assetId);
+
+
+    /**
+     * 根据taskid查询查询数据
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    List<AssetSupplyChainCpPo> findByTaskId(int taskId);
 
 
 

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

@@ -0,0 +1,14 @@
+package com.ruoyi.tc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.tc.entity.po.AssetSupplyChainJyPo;
+
+/**
+ * 资产供应链信息(asset_supply_chain)表服务接口
+ * @author makejava
+ * @since 2024-11-15 16:07:30
+ */
+public interface AssetSupplyChainJyService extends IService<AssetSupplyChainJyPo> {
+
+
+}

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

@@ -6,9 +6,11 @@ import com.ruoyi.tc.entity.AssetTask;
 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.AssetCurrentResponse;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
 import com.ruoyi.tc.entity.response.AssetTaskResponse;
+import com.ruoyi.tc.entity.response.AssetdwHcResponse;
 
 /**
  * 任务主表(AssetTask)表服务接口
@@ -67,7 +69,7 @@ public interface AssetTaskService extends IService<AssetTask> {
      * @param assetId 资产id
      * @return
      */
-    AssetCurrentResponse taskSh(int taskId, int assetId);
+    AssetCurrentCpPo taskSh(int taskId, int assetId);
 
     /**
      * 资产核查信息
@@ -86,4 +88,12 @@ public interface AssetTaskService extends IService<AssetTask> {
      * @return
      */
     int sh(AssetCurrentShRequest req);
+
+
+    /**
+     * 管理端-单位核查情况
+     *
+     * @return
+     */
+    Page<AssetdwHcResponse> dwHc(Page<AssetdwHcResponse> assetdwHcResponsePage,AssetdwHcRequest req);
 }

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

@@ -1,8 +1,9 @@
 package com.ruoyi.tc.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.tc.entity.UnitOtherConcat;
-import com.ruoyi.tc.entity.response.UnitOtherConcatCpResponse;
+import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo;
+import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo;
+import com.ruoyi.tc.entity.po.UnitOtherConcatJyPo;
 
 import java.util.List;
 
@@ -11,7 +12,7 @@ import java.util.List;
  * @author du
  * @since 2024/11/13 14:55
  */
-public interface UnitOtherConcatCpService extends IService<UnitOtherConcatCpResponse> {
+public interface UnitOtherConcatCpService extends IService<UnitOtherConcatCpPo> {
 
     /**
      * 根据资产id资产供应链原有id
@@ -19,7 +20,7 @@ public interface UnitOtherConcatCpService extends IService<UnitOtherConcatCpResp
      * @param assetId 资产id
      * @return
      */
-    List<UnitOtherConcatCpResponse> findByassetId(Long assetId);
+    List<UnitOtherConcatCpPo> findByassetId(Long assetId);
 
 
     /**
@@ -29,4 +30,14 @@ public interface UnitOtherConcatCpService extends IService<UnitOtherConcatCpResp
      * @param taskId  任务id
      */
     void deletByAssetIdandTaskId(Long assetId, int taskId);
+
+
+
+    /**
+     * 根据taskid查询查询数据
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    List<UnitOtherConcatCpPo> findByTaskId(int taskId);
 }

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

@@ -0,0 +1,17 @@
+package com.ruoyi.tc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo;
+import com.ruoyi.tc.entity.po.UnitOtherConcatJyPo;
+
+import java.util.List;
+
+/**
+ * 单位其他联系人复制(unit_other_contact_cp)业务层
+ * @author du
+ * @since 2024/11/13 14:55
+ */
+public interface UnitOtherConcatJyservice extends IService<UnitOtherConcatJyPo> {
+
+
+}

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

@@ -1,7 +1,7 @@
 package com.ruoyi.tc.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.tc.entity.response.AssetBasicNetworkCpResponse;
+import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo;
 import com.ruoyi.tc.mapper.AssetBasicNetWorkCpMapper;
 import com.ruoyi.tc.service.AssetBasicNetworkCpService;
 import org.springframework.stereotype.Service;
@@ -16,13 +16,13 @@ import java.util.List;
  * @since 2024-11-15 16:05:26
  */
 @Service("assetBasicNetworkCpService")
-public class AssetBasicNetworkCpServiceImpl extends ServiceImpl<AssetBasicNetWorkCpMapper, AssetBasicNetworkCpResponse> implements AssetBasicNetworkCpService {
+public class AssetBasicNetworkCpServiceImpl extends ServiceImpl<AssetBasicNetWorkCpMapper, AssetBasicNetworkCpPo> implements AssetBasicNetworkCpService {
 
     @Resource
     private AssetBasicNetWorkCpMapper assetBasicNetWorkCpMapper;
 
     @Override
-    public List<AssetBasicNetworkCpResponse> findByassetId(Long assetId) {
+    public List<AssetBasicNetworkCpPo> findByassetId(Long assetId) {
         return assetBasicNetWorkCpMapper.findByassetId(assetId);
     }
 
@@ -31,5 +31,10 @@ public class AssetBasicNetworkCpServiceImpl extends ServiceImpl<AssetBasicNetWor
          assetBasicNetWorkCpMapper.deletByAssetIdandTaskId(assetId, taskId);
     }
 
+    @Override
+    public List<AssetBasicNetworkCpPo> findByTaskId(int taskId) {
+        return assetBasicNetWorkCpMapper.findByTaskId(taskId);
+    }
+
 
 }

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

@@ -0,0 +1,25 @@
+package com.ruoyi.tc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo;
+import com.ruoyi.tc.entity.po.AssetBasicNetworkJyPo;
+import com.ruoyi.tc.mapper.AssetBasicNetWorkCpMapper;
+import com.ruoyi.tc.mapper.AssetBasicNetWorkJyMapper;
+import com.ruoyi.tc.service.AssetBasicNetworkCpService;
+import com.ruoyi.tc.service.AssetBasicNetworkJyService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 资产基础网络复制表(AssetBasicNetworkCpResponse)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-11-15 16:05:26
+ */
+@Service("assetBasicNetworkJyService")
+public class AssetBasicNetworkJyServiceImpl extends ServiceImpl<AssetBasicNetWorkJyMapper, AssetBasicNetworkJyPo> implements AssetBasicNetworkJyService {
+
+
+}

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

@@ -1,7 +1,7 @@
 package com.ruoyi.tc.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.tc.entity.response.AssetBusinessFormCpResponse;
+import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo;
 import com.ruoyi.tc.mapper.AssetBusinessFormCpMapper;
 import com.ruoyi.tc.service.AssetBusinessFormCpService;
 import org.springframework.stereotype.Service;
@@ -16,13 +16,13 @@ import javax.annotation.Resource;
  * @since 2024-11-15 16:06:53
  */
 @Service("assetBusinessFormCpService")
-public class AssetBusinessFormCpServiceImpl extends ServiceImpl<AssetBusinessFormCpMapper, AssetBusinessFormCpResponse> implements AssetBusinessFormCpService {
+public class AssetBusinessFormCpServiceImpl extends ServiceImpl<AssetBusinessFormCpMapper, AssetBusinessFormCpPo> implements AssetBusinessFormCpService {
 
     @Resource
     private AssetBusinessFormCpMapper assetBusinessFormCpMapper;
 
     @Override
-    public List<AssetBusinessFormCpResponse> findByassetId(Long assetId) {
+    public List<AssetBusinessFormCpPo> findByassetId(Long assetId) {
         return assetBusinessFormCpMapper.findByassetId(assetId);
     }
 
@@ -30,5 +30,10 @@ public class AssetBusinessFormCpServiceImpl extends ServiceImpl<AssetBusinessFor
     public void deletByAssetIdandTaskId(Long assetId, int taskId) {
          assetBusinessFormCpMapper.deletByAssetIdandTaskId(assetId,taskId);
     }
+
+    @Override
+    public List<AssetBusinessFormCpPo> findByTaskId(int taskId) {
+        return assetBusinessFormCpMapper.findByTaskId(taskId);
+    }
 }
 

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

@@ -0,0 +1,20 @@
+package com.ruoyi.tc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.tc.entity.po.AssetBusinessFormJyPo;
+import com.ruoyi.tc.mapper.AssetBusinessFormJyMapper;
+import com.ruoyi.tc.service.AssetBusinessFormJyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 资产新监管业务形态复制(AssetBusinessFormCp)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-11-15 16:06:53
+ */
+@Service("assetBusinessFormJyService")
+public class AssetBusinessFormJyServiceImpl extends ServiceImpl<AssetBusinessFormJyMapper, AssetBusinessFormJyPo> implements AssetBusinessFormJyService {
+
+
+}
+

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

@@ -1,17 +1,12 @@
 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.*;
-import com.ruoyi.tc.entity.request.AssetCurrentPageRequest;
-import com.ruoyi.tc.entity.response.AssetCurrentResponse;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
 import com.ruoyi.tc.mapper.AssetCurrentCpMapper;
-import com.ruoyi.tc.mapper.AssetCurrentMapper;
 import com.ruoyi.tc.service.*;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -21,7 +16,7 @@ import java.util.List;
  * @since 2024-11-15 10:04:03
  */
 @Service("assetCurrentCpService")
-public class AssetCurrentCpServiceImpl extends ServiceImpl<AssetCurrentCpMapper, AssetCurrentResponse> implements AssetCurrentCpService {
+public class AssetCurrentCpServiceImpl extends ServiceImpl<AssetCurrentCpMapper, AssetCurrentCpPo> implements AssetCurrentCpService {
 
     @Resource
     private  AssetCurrentCpMapper assetCurrentCpMapper;
@@ -29,5 +24,10 @@ public class AssetCurrentCpServiceImpl extends ServiceImpl<AssetCurrentCpMapper,
     public void deletByAssetIdandTaskId(Long assetId,int taskId) {
         assetCurrentCpMapper.deletByAssetIdandTaskId(assetId,taskId);
     }
+
+    @Override
+    public List<AssetCurrentCpPo> findByTaskId(int taskId) {
+        return assetCurrentCpMapper.findByTaskId(taskId);
+    }
 }
 

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

@@ -0,0 +1,20 @@
+package com.ruoyi.tc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
+import com.ruoyi.tc.mapper.AssetCurrentJyMapper;
+import com.ruoyi.tc.service.AssetCurrentJyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 现有资产复制表(AssetCurrentResponse)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-11-15 10:04:03
+ */
+@Service("assetCurrentJyService")
+public class AssetCurrentJyServiceImpl extends ServiceImpl<AssetCurrentJyMapper, AssetCurrentJyPo> implements AssetCurrentJyService {
+
+
+}
+

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

@@ -8,7 +8,7 @@ import com.ruoyi.tc.service.AssetLcService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.annotation.Resource;
-
+import java.util.List;
 /**
  * 任务流程(AssetLc)表服务实现类
  *
@@ -34,15 +34,15 @@ public class AssetLcServiceImpl implements AssetLcService {
     }
 
     /**
-     * 分页查询
+     * 查询
      *
-     * @param assetLc 筛选条件
-     * @param pageRequest      分页对象
+     * @param
+     * @param pageRequest     对象
      * @return 查询结果
      */
     @Override
-    public Page<AssetLc> queryByPage(Page<AssetLc> assetLc, AssetLcRequest pageRequest) {
-        return assetLcDao.queryByPage(assetLc, pageRequest);
+    public List<AssetLc> queryByPage( AssetLcRequest pageRequest) {
+        return assetLcDao.queryByPage( pageRequest);
 
     }
 

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

@@ -1,12 +1,10 @@
 package com.ruoyi.tc.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.tc.entity.AssetSupplyChain;
-import com.ruoyi.tc.entity.response.AssetSupplyChainCpResponse;
+import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo;
+import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo;
 import com.ruoyi.tc.mapper.AssetSupplyChainCpMapper;
-import com.ruoyi.tc.mapper.AssetSupplyChainMapper;
 import com.ruoyi.tc.service.AssetSupplyChainCpService;
-import com.ruoyi.tc.service.AssetSupplyChainService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -19,15 +17,20 @@ import java.util.List;
  * @since 2024-11-15 16:07:30
  */
 @Service("assetSupplyChainCpService")
-public class AssetSupplyChainCpServiceImpl extends ServiceImpl<AssetSupplyChainCpMapper, AssetSupplyChainCpResponse> implements AssetSupplyChainCpService {
+public class AssetSupplyChainCpServiceImpl extends ServiceImpl<AssetSupplyChainCpMapper, AssetSupplyChainCpPo> implements AssetSupplyChainCpService {
 
    @Resource
    private  AssetSupplyChainCpMapper assetSupplyChainCpMapper;
     @Override
-        public  List<AssetSupplyChainCpResponse> findByassetId(Long assetId) {
+        public  List<AssetSupplyChainCpPo> findByassetId(Long assetId) {
         return assetSupplyChainCpMapper.findByassetId(assetId);
     }
 
+    @Override
+    public List<AssetSupplyChainCpPo> findByTaskId(int taskId) {
+        return assetSupplyChainCpMapper.findByTaskId(taskId);
+    }
+
     @Override
     public void deletByAssetIdandTaskId(Long assetId, int taskId) {
         assetSupplyChainCpMapper.deletByAssetIdandTaskId(assetId,taskId);

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

@@ -0,0 +1,19 @@
+package com.ruoyi.tc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.tc.entity.po.AssetSupplyChainJyPo;
+import com.ruoyi.tc.mapper.AssetSupplyChainJyMapper;
+import com.ruoyi.tc.service.AssetSupplyChainJyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 资产供应链信息表复制(AssetSupplyChainCpResponse)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-11-15 16:07:30
+ */
+@Service("assetSupplyChainJyService")
+public class AssetSupplyChainJyServiceImpl extends ServiceImpl<AssetSupplyChainJyMapper, AssetSupplyChainJyPo> implements AssetSupplyChainJyService {
+
+
+}

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

@@ -2,29 +2,24 @@ 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.AssetTask;
-import com.ruoyi.tc.entity.request.AssestTaskXqRequest;
-import com.ruoyi.tc.entity.request.AssetCurrentShRequest;
-import com.ruoyi.tc.entity.request.AssetTaskPageRequest;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.tc.entity.*;
+import com.ruoyi.tc.entity.po.*;
+import com.ruoyi.tc.entity.request.*;
 import com.ruoyi.tc.entity.response.AssestTaskXqresponse;
-import com.ruoyi.tc.entity.response.AssetBasicNetworkCpResponse;
-import com.ruoyi.tc.entity.response.AssetBusinessFormCpResponse;
-import com.ruoyi.tc.entity.response.AssetCurrentResponse;
-import com.ruoyi.tc.entity.response.AssetSupplyChainCpResponse;
 import com.ruoyi.tc.entity.response.AssetTaskResponse;
-import com.ruoyi.tc.entity.response.UnitOtherConcatCpResponse;
+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.AssetBusinessFormCpService;
-import com.ruoyi.tc.service.AssetCurrentCpService;
-import com.ruoyi.tc.service.AssetSupplyChainCpService;
-import com.ruoyi.tc.service.AssetTaskService;
-import com.ruoyi.tc.service.UnitOtherConcatCpService;
+import com.ruoyi.tc.service.*;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 任务主表(AssetTask)表服务实现类
@@ -54,7 +49,25 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
     @Resource
     private UnitOtherConcatCpService unitOtherConcatCpService;
 
+    @Resource
+    private AssetLcService assetLcService;
+
+    @Resource
+    private AssetCurrentService assetCurrentService;
+
+
+    @Resource
+    private AssetBusinessFormService assetBusinessFormService;
+
+    @Resource
+    private AssetBasicNetworkService assetBasicNetworkService;
 
+
+    @Resource
+    private AssetSupplyChainService assetSupplyChainService;
+
+    @Resource
+    private  UnitOtherConcatService unitOtherConcatService;
     /**
      * 通过ID查询单条数据
      *
@@ -88,22 +101,28 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
     public void insert(AssetTask assetTask) {
         //任务新增
         int id = assetTaskDao.insert(assetTask);
+        //新增流程节点
+        AssetLc assetLc = new AssetLc();
+        assetLc.setTaskId(id);
+        assetLc.setXfTime(LocalDateTime.now());
+        assetLc.setAssetName("管理员任务下发");
+        assetLcService.insert(assetLc);
         String[] parts = assetTask.getDwmc().split(",");
         for (String part : parts) {
             //根据单位名称查询资产
-            List<AssetCurrentResponse> list = assetTaskDao.findByDwmcAssetCurrent(part);
-            for (AssetCurrentResponse assetCurrentResponse : list) {
+            List<AssetCurrentCpPo> list = assetTaskDao.findByDwmcAssetCurrent(part);
+            for (AssetCurrentCpPo assetCurrentResponse : list) {
                 assetCurrentResponse.setTaskId(id);
             }
             assetCurrentCpService.saveBatch(list);
-            List<AssetBusinessFormCpResponse> assetBusinessFormCpResponseList = new ArrayList<>();
-            for (AssetCurrentResponse assetCurrentResponse : list) {
+            List<AssetBusinessFormCpPo> assetBusinessFormCpResponseList = new ArrayList<>();
+            for (AssetCurrentCpPo assetCurrentResponse : list) {
                 //新增新监管业务形态
                 //根据资产id查询新监管业务形态主表id
-                List<AssetBusinessFormCpResponse> bussList = assetBusinessFormCpService.findByassetId(assetCurrentResponse.getId());
+                List<AssetBusinessFormCpPo> bussList = assetBusinessFormCpService.findByassetId(assetCurrentResponse.getId());
                 if (bussList != null) {
-                    for (AssetBusinessFormCpResponse assetBusinessFormCpResponse : bussList) {
-                        assetCurrentResponse.getXjgywxt().setId(assetBusinessFormCpResponse.getId());
+                    for (AssetBusinessFormCpPo assetBusinessFormCpResponse : bussList) {
+                        assetCurrentResponse.getXjgywxt().setBusinessId(assetBusinessFormCpResponse.getBusinessId());
                         assetCurrentResponse.getXjgywxt().setAssetId(assetCurrentResponse.getId());
                         assetCurrentResponse.getXjgywxt().setTaskId(id);
                         assetBusinessFormCpResponseList.add(assetCurrentResponse.getXjgywxt());
@@ -111,30 +130,30 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                     assetBusinessFormCpService.saveBatch(assetBusinessFormCpResponseList);
                 }
                 //根据资产id查询供应链主表id-
-                List<AssetSupplyChainCpResponse> supplyChainList = assetSupplyChainCpService.findByassetId(assetCurrentResponse.getId());
+                List<AssetSupplyChainCpPo> supplyChainList = assetSupplyChainCpService.findByassetId(assetCurrentResponse.getId());
                 if (supplyChainList != null) {
-                    for (AssetSupplyChainCpResponse items : supplyChainList) {
+                    for (AssetSupplyChainCpPo items : supplyChainList) {
                         items.setAssetId(assetCurrentResponse.getId());
-                        items.setId(items.getId());
+                        items.setSupplyId(items.getSupplyId());
                         items.setTaskId(id);
                         //新增供应链
                     }
                     assetSupplyChainCpService.saveBatch(supplyChainList);
                 }
-                List<AssetBasicNetworkCpResponse> BasicNetworkCpList = assetBasicNetworkCpService.findByassetId(assetCurrentResponse.getId());
+                List<AssetBasicNetworkCpPo> BasicNetworkCpList = assetBasicNetworkCpService.findByassetId(assetCurrentResponse.getId());
                 if (BasicNetworkCpList != null) {
-                    for (AssetBasicNetworkCpResponse items : BasicNetworkCpList) {
+                    for (AssetBasicNetworkCpPo items : BasicNetworkCpList) {
                         //根据资产id查询基础网络主表id
                         items.setAssetId(assetCurrentResponse.getId());
-                        items.setId(items.getId());
+                        items.setNetworkId(items.getNetworkId());
                         items.setTaskId(id);
                         //新增基础网络
                     }
                     assetBasicNetworkCpService.saveBatch(BasicNetworkCpList);
                 }
-                List<UnitOtherConcatCpResponse> unitOtherConcatList = unitOtherConcatCpService.findByassetId(assetCurrentResponse.getId());
+                List<UnitOtherConcatCpPo> unitOtherConcatList = unitOtherConcatCpService.findByassetId(assetCurrentResponse.getId());
                 if (unitOtherConcatList != null) {
-                    for (UnitOtherConcatCpResponse items : unitOtherConcatList) {
+                    for (UnitOtherConcatCpPo items : unitOtherConcatList) {
                         //根据资产id查询其他联系人主表id
                         items.setAssetId(assetCurrentResponse.getId());
                         items.setConcatId(items.getConcatId());
@@ -172,23 +191,167 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
     }
 
     @Override
-    public AssetCurrentResponse taskSh(int taskId, int assetId) {
-        AssetCurrentResponse byId = assetTaskDao.findBytaskIdandAssestId(taskId, assetId);
-        byId.setGylxxList(assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpResponse::getAssetId, assetId).eq(AssetSupplyChainCpResponse::getDelFlag, "0").eq(AssetSupplyChainCpResponse::getTaskId, taskId).list());
-        byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpResponse::getAssetId, assetId).eq(AssetBasicNetworkCpResponse::getDelFlag, "0").eq(AssetBasicNetworkCpResponse::getTaskId, taskId).list());
-        byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpResponse::getAssetId, assetId).eq(AssetBusinessFormCpResponse::getDelFlag, "0").eq(AssetBusinessFormCpResponse::getTaskId, taskId).one());
-        byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpResponse::getAssetId, assetId).eq(UnitOtherConcatCpResponse::getDelFlag, "0").eq(UnitOtherConcatCpResponse::getTaskId, taskId).list());
+    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());
+        byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, assetId).eq(AssetBusinessFormCpPo::getDelFlag, "0").eq(AssetBusinessFormCpPo::getTaskId, taskId).one());
+        byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, assetId).eq(UnitOtherConcatCpPo::getDelFlag, "0").eq(UnitOtherConcatCpPo::getTaskId, taskId).list());
+        List<Acomma> a1 = new ArrayList<>();
+        Arrays.asList(byId.getGlym().split(",")).forEach(x -> {
+            Acomma acomma = new Acomma();
+            acomma.setKey(x);
+            a1.add(acomma);
+        });
+        byId.setGlymList(a1);
+        List<Acomma> a2 = new ArrayList<>();
+        Arrays.asList(byId.getGlIp().split(",")).forEach(x -> {
+            Acomma acomma = new Acomma();
+            acomma.setKey(x);
+            a2.add(acomma);
+        });
+        byId.setGlIpList(a2);
         return byId;
     }
 
     @Override
     public Page<AssestTaskXqresponse> zcHc(Page<AssestTaskXqresponse> assetTask, AssestTaskXqRequest pageRequest) {
+        assetTask.setOptimizeCountSql(false);
         return assetTaskDao.zcHc(assetTask, pageRequest);
     }
 
     @Override
     public int sh(AssetCurrentShRequest req) {
+        AssetLc assetLc = new AssetLc();
+        int taskStatus = 0;
+        if (req.getStatus() == 3) {
+            assetLc.setTaskId(req.getTaskId());
+            assetLc.setXfTime(LocalDateTime.now());
+            assetLc.setAssetName("管理员审核通过");
+            assetLcService.insert(assetLc);
+        } else if (req.getStatus() == 4) {
+            assetLc.setTaskId(req.getTaskId());
+            assetLc.setAssetName("管理员审核不通过");
+            assetLc.setXfTime(LocalDateTime.now());
+            assetLcService.insert(assetLc);
+        }
+        int a = assetTaskDao.sh(req);
+        //单位端资产审核，更新任务表状态
+        //查询当前任务下的所有资产状态和完成时间
+        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);
+        LocalDateTime finishTime = 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 = 4;
+        }
+        //修改主表任务状态
+        assetTaskDao.updateByTaskId(taskStatus, req.getTaskId(), finishTime);
+        return a;
+    }
+
+    private void taskSaveOrDelete(AssetCurrentShRequest req) {
+        // 根据taskid查询五张数据
+        List<AssetCurrentCpPo> currentList = assetCurrentCpService.findByTaskId(req.getTaskId());
+        List<Long> idList = currentList.stream()
+                .map(AssetCurrentCpPo::getId)
+                .collect(Collectors.toList());
+        //删除原有数据
+        assetCurrentService.removeBatchByIds(idList);
+        //将子表数据复制到主表中
+        List<AssetCurrent> currentNewList = currentList.stream()
+                .map(cpPo -> {
+                    AssetCurrent current = new AssetCurrent();
+                    BeanUtils.copyProperties(cpPo, current); // 复制属性
+                    return current; // 返回新对象
+                })
+                .collect(Collectors.toList()); // 收集到列表中
+        assetCurrentService.saveBatch(currentNewList);
+        //AssetBusinessFormCpPo
+        List<AssetBusinessFormCpPo> bussinessList = assetBusinessFormCpService.findByTaskId(req.getTaskId());
+        List<Long> bussinessidList = bussinessList.stream()
+                .map(AssetBusinessFormCpPo::getAssetId)
+                .collect(Collectors.toList());
+        //删除原有数据
+        assetBusinessFormService.removeBatchByIds(bussinessidList);
+        //将子表数据复制到主表中
+        List<AssetBusinessForm> bussinessNewList = bussinessList.stream()
+                .map(cpPo -> {
+                    AssetBusinessForm businessForm = new AssetBusinessForm();
+                    BeanUtils.copyProperties(cpPo, businessForm); // 复制属性
+                    return businessForm; // 返回新对象
+                })
+                .collect(Collectors.toList()); // 收集到列表中
+        assetBusinessFormService.saveBatch(bussinessNewList);
+        //AssetBasicNetworkCpPo
+        List<AssetBasicNetworkCpPo> netWorkList = assetBasicNetworkCpService.findByTaskId(req.getTaskId());
+        List<Long> netWorkidList = netWorkList.stream()
+                .map(AssetBasicNetworkCpPo::getAssetId)
+                .collect(Collectors.toList());
+        //删除原有数据
+        assetBasicNetworkService.removeBatchByIds(netWorkidList);
+        //将子表数据复制到主表中
+        List<AssetBasicNetwork> netWorkNewList = netWorkList.stream()
+                .map(cpPo -> {
+                    AssetBasicNetwork network = new AssetBasicNetwork();
+                    BeanUtils.copyProperties(cpPo, network); // 复制属性
+                    return network; // 返回新对象
+                })
+                .collect(Collectors.toList()); // 收集到列表中
+        assetBasicNetworkService.saveBatch(netWorkNewList);
+        //AssetSupplyChainCpPo
+        List<AssetSupplyChainCpPo> SupplyChainList = assetSupplyChainCpService.findByTaskId(req.getTaskId());
+        List<Long> SupplyChainidList = SupplyChainList.stream()
+                .map(AssetSupplyChainCpPo::getAssetId)
+                .collect(Collectors.toList());
+        //删除原有数据
+        assetSupplyChainService.removeBatchByIds(SupplyChainidList);
+        List<AssetSupplyChain> SupplyChainNewList = SupplyChainList.stream()
+                .map(cpPo -> {
+                    AssetSupplyChain supplyChain = new AssetSupplyChain();
+                    BeanUtils.copyProperties(cpPo, supplyChain); // 复制属性
+                    return supplyChain; // 返回新对象
+                })
+                .collect(Collectors.toList());
+        assetSupplyChainService.saveBatch(SupplyChainNewList);
+        //UnitOtherConcatCpPo
+        List<UnitOtherConcatCpPo> UnitOtherConcatList = unitOtherConcatCpService.findByTaskId(req.getTaskId());
+        List<Long> UnitOtherConcatidList = UnitOtherConcatList.stream()
+                .map(UnitOtherConcatCpPo::getAssetId)
+                .collect(Collectors.toList());
+        //删除原有数据
+        unitOtherConcatService.removeBatchByIds(UnitOtherConcatidList);
+        List<UnitOtherConcat> UnitOtherConcatNewList = UnitOtherConcatList.stream()
+                .map(cpPo -> {
+                    UnitOtherConcat unitOtherConcat = new UnitOtherConcat();
+                    BeanUtils.copyProperties(cpPo, unitOtherConcat); // 复制属性
+                    return unitOtherConcat; // 返回新对象
+                })
+                .collect(Collectors.toList());
+        assetSupplyChainService.saveBatch(SupplyChainNewList);
+        unitOtherConcatService.saveBatch(UnitOtherConcatNewList);
+    }
+
+    @Override
+    public Page<AssetdwHcResponse> dwHc(Page<AssetdwHcResponse> assetdwHcResponsePage, AssetdwHcRequest req) {
 
-        return  assetTaskDao.sh(req);
+        return assetTaskDao.dwHc(assetdwHcResponsePage, req);
     }
 }

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

@@ -1,7 +1,7 @@
 package com.ruoyi.tc.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.tc.entity.response.UnitOtherConcatCpResponse;
+import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo;
 import com.ruoyi.tc.mapper.UnitOtherConcatCpMapper;
 import com.ruoyi.tc.service.UnitOtherConcatCpService;
 import org.springframework.stereotype.Service;
@@ -16,12 +16,12 @@ import java.util.List;
  * @since 2024/11/13 14:58
  */
 @Service("unitOtherConcatCpService")
-public class UnitOtherConcatCpServiceImpl extends ServiceImpl<UnitOtherConcatCpMapper, UnitOtherConcatCpResponse> implements UnitOtherConcatCpService {
+public class UnitOtherConcatCpServiceImpl extends ServiceImpl<UnitOtherConcatCpMapper, UnitOtherConcatCpPo> implements UnitOtherConcatCpService {
     @Resource
     private UnitOtherConcatCpMapper unitOtherConcatCpMapper;
 
     @Override
-    public List<UnitOtherConcatCpResponse> findByassetId(Long assetId) {
+    public List<UnitOtherConcatCpPo> findByassetId(Long assetId) {
         return unitOtherConcatCpMapper.findByassetId(assetId);
     }
 
@@ -29,4 +29,9 @@ public class UnitOtherConcatCpServiceImpl extends ServiceImpl<UnitOtherConcatCpM
     public void deletByAssetIdandTaskId(Long assetId, int taskId) {
         unitOtherConcatCpMapper.deletByAssetIdandTaskId(assetId,taskId);
     }
+
+    @Override
+    public List<UnitOtherConcatCpPo> findByTaskId(int taskId) {
+        return unitOtherConcatCpMapper.findByTaskId(taskId);
+    }
 }

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

@@ -0,0 +1,24 @@
+package com.ruoyi.tc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo;
+import com.ruoyi.tc.entity.po.UnitOtherConcatJyPo;
+import com.ruoyi.tc.mapper.UnitOtherConcatCpMapper;
+import com.ruoyi.tc.mapper.UnitOtherConcatJyMapper;
+import com.ruoyi.tc.service.UnitOtherConcatCpService;
+import com.ruoyi.tc.service.UnitOtherConcatJyservice;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 单位其他联系人复制(unit_other_contact_cp)业务处理层
+ *
+ * @author du
+ * @since 2024/11/13 14:58
+ */
+@Service("unitOtherConcatJyservice")
+public class UnitOtherConcatJyServiceImpl extends ServiceImpl<UnitOtherConcatJyMapper, UnitOtherConcatJyPo> implements UnitOtherConcatJyservice {
+
+}

ruoyi-admin/src/main/resources/application-test.yml

@@ -0,0 +1,61 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://localhost:3306/tc-asset-verification?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: adminadmin
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true

ruoyi-admin/src/main/resources/application.yml

@@ -52,7 +52,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid
+    active: test
   # 文件上传
   servlet:
     multipart:

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

@@ -48,7 +48,7 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="AssetLcMap">
         select
-        id,task_id,xf_time,dwhc_time,shbh_time,dwcxhc_time,shtg_time,ueser_i,ddept_id,create_id,create_by,create_time,update_id,update_by,update_time,version,remark
+        id,task_id,xf_time,dept_id,create_id,create_by,create_time,update_id,update_by,update_time,version,remark,assetName
         from asset_lc
         <where>
             <if test="id != null">
@@ -164,11 +164,24 @@
             </if>
         </where>
     </select>
+    <select id="queryByPage" resultType="com.ruoyi.tc.entity.AssetLc">
+        select
+        id,task_id,xf_time,dept_id,create_id,create_by,create_time,update_id,update_by,update_time,version,remark,asset_name
+        from asset_lc
+        <where>
+
+            <if test="req.taskId != null">
+                and task_id = #{req.taskId}
+            </if>
+
+        </where>
+
+    </select>
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into asset_lc(task_idxf_timedwhc_timeshbh_timedwcxhc_timeshtg_timeueser_iddept_idcreate_idcreate_bycreate_timeupdate_idupdate_byupdate_timeversionremark)
-        values (#{taskId}#{xfTime}#{dwhcTime}#{shbhTime}#{dwcxhcTime}#{shtgTime}#{ueserId}#{deptId}#{createId}#{createBy}#{createTime}#{updateId}#{updateBy}#{updateTime}#{version}#{remark})
+        insert into asset_lc(task_id,xf_time,asset_name,ueser_id,dept_id,create_id,create_by,create_time,update_id,update_by,update_time,version,remark)
+        values (#{taskId},#{xfTime},#{assetName},#{ueserId},#{deptId},#{createId},#{createBy},#{createTime},#{updateId},#{updateBy},#{updateTime},#{version},#{remark})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">

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

@@ -186,9 +186,12 @@
                 and task_status = #{req.taskStatus}
             </if>
 
+            <if test="req.id != null ">
+                and id = #{req.id}
+            </if>
         </where>
     </select>
-    <select id="findByDwmcAssetCurrent" resultType="com.ruoyi.tc.entity.response.AssetCurrentResponse">
+    <select id="findByDwmcAssetCurrent" resultType="com.ruoyi.tc.entity.po.AssetCurrentCpPo">
         select * from asset_current
         <where>
             del_flag = '0' and isbf = '0'
@@ -221,13 +224,56 @@
                 and b.xtlx = #{req.xtlx}
             </if>
         </where>
+        order by b.current_id desc
     </select>
-    <select id="findBytaskIdandAssestId" resultType="com.ruoyi.tc.entity.response.AssetCurrentResponse">
+    <select id="findBytaskIdandAssestId" resultType="com.ruoyi.tc.entity.po.AssetCurrentCpPo">
         select *
         from asset_current_cp
         where task_id = #{taskId}
           and id = #{assetId}
     </select>
+    <select id="dwHc" resultType="com.ruoyi.tc.entity.response.AssetdwHcResponse">
+        SELECT
+        dwmc,
+        COUNT(*) AS total,
+        SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM(CASE WHEN status = 1 THEN 1 ELSE 0 END) AS checked,
+        ROUND(
+        CASE
+        WHEN COUNT(*) > 0 THEN
+        SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) * 100 / COUNT(*)
+        ELSE 0
+        END, 2) AS checkedRatio
+        FROM
+        asset_current_cp
+        <where>
+            <if test="req.dwmc!=null and req.dwmc!='' ">
+                and dwmc like concat('%',#{req.dwmc},'%')
+            </if>
+        </where>
+        GROUP BY
+        dwmc
+
+    </select>
+    <select id="findByTaskId" resultType="com.ruoyi.tc.entity.response.AssetTaskStatusResponse">
+        SELECT
+        a.status,
+        CASE
+        WHEN DATE(a.update_time) > STR_TO_DATE(IFNULL(b.task_deadline, '1970-01-01'), '%Y-%m-%d') THEN '6'
+        ELSE '7'
+        END AS deadstatus
+        FROM
+        asset_current_cp a
+        LEFT JOIN
+        asset_task b ON a.task_id = b.id
+        <where>
+            <if test="taskId!=null ">
+                and a.task_id =#{taskId}
+            </if>
+        </where>
+
+    </select>
+
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
@@ -323,16 +369,26 @@
     <update id="sh" parameterType="com.ruoyi.tc.entity.request.AssetCurrentShRequest">
         update asset_current_cp
         <set>
-            <if test="req.taskId != null ">
-                task_id = #{req.taskId},
+            <if test="req.status != null ">
+                status = #{req.status},
             </if>
-            <if test="req.assetId  != null ">
-                id = #{req.assetId},
+            update_time=now()
+        </set>
+        where id = #{req.assetId} and task_id = #{req.taskId}
+    </update>
+    <update id="updateByTaskId">
+        update  asset_task
+        <set>
+            <if test="taskStatus != null ">
+                task_status=#{taskStatus},
             </if>
-            <if test="req.status  != null ">
-                status = #{req.status},
+            <if test="finishTime != null ">
+                task_finish_time=#{finishTime}
             </if>
         </set>
+
+        where id =#{taskId}
+
     </update>
 
     <!--通过主键删除-->

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/**").permitAll()
+                        .antMatchers("/unit/assetTask/**","/tc/**","/unit/assetLc/**").permitAll()
                         // 除上面外的所有请求全部需要鉴权认证
                     .anyRequest().authenticated();
             })