From 0c71be162ab3aa175a5d710e9dd3bc41cd6826c6 Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Wed, 20 Nov 2024 17:20:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A8=A1=E5=9D=97=E7=BC=96?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tc/controller/AssetTaskController.java | 34 ++++++++++++----- .../entity/request/AssetCurrentShRequest.java | 38 +++++++++++++++++++ .../entity/response/AssetCurrentResponse.java | 4 +- .../com/ruoyi/tc/mapper/AssetTaskMapper.java | 11 ++++++ .../ruoyi/tc/service/AssetTaskService.java | 19 ++++++---- .../tc/service/impl/AssetTaskServiceImpl.java | 7 ++++ .../main/resources/mapper/AssetTaskDao.xml | 23 +++++++++-- 7 files changed, 115 insertions(+), 21 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java index e53bb32..a72eb72 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java @@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.tc.entity.AssetCurrent; 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.response.*; import com.ruoyi.tc.service.*; @@ -154,12 +155,19 @@ public class AssetTaskController extends BaseController { @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()); +// //根据资产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())); assetCurrentCpService.save(assetCurrent); @@ -211,13 +219,21 @@ public class AssetTaskController extends BaseController { } + + /** + * 管理端审核 + * + * @param req 请求类 + * @return + */ @ApiOperation(value = "管理端审核") @PostMapping("/sh") - public AjaxResult sh(@RequestBody AssetCurrentResponse assetCurrent) { + public AjaxResult sh(@RequestBody AssetCurrentShRequest req) { + return AjaxResult.success(assetTaskService.sh(req)); + } + - return AjaxResult.success(); - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java new file mode 100644 index 0000000..a968d1e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java @@ -0,0 +1,38 @@ +package com.ruoyi.tc.entity.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dong + * @since 2024/11/20 16:29 + */ +@Data +@ApiModel("管理端审核请求类") +public class AssetCurrentShRequest { + + /** + * 任务id + */ + @ApiModelProperty("任务id") + private Integer taskId; + + + + /** + * 资产id + */ + @ApiModelProperty("资产id") + private Integer assetId; + + + /** + * 审核状态（0待核查，1待审核，3审核通过，4审核不通过，5已报废） + */ + @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") + private Integer status; + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java index 39473de..a43e4bb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java @@ -934,6 +934,6 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @ApiModelProperty("报废原因") private String bfyy; - @ApiModelProperty("审核状态（0待核查，1待审核，3审核通过，4审核不通过，5审核不通过）") - private String status; + @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") + private Integer status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java index 2ed74f7..0d7aebd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java @@ -4,6 +4,7 @@ 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.request.AssestTaskXqRequest; +import com.ruoyi.tc.entity.request.AssetCurrentShRequest; import com.ruoyi.tc.entity.request.AssetTaskPageRequest; import com.ruoyi.tc.entity.response.AssestTaskXqresponse; import com.ruoyi.tc.entity.response.AssetCurrentResponse; @@ -125,5 +126,15 @@ public interface AssetTaskMapper extends BaseMapper { * @return */ AssetCurrentResponse findBytaskIdandAssestId(@Param("taskId") int taskId, @Param("assetId") int assetId); + + + + /** + * 管理端审核 + * + * @param req 请求类 + * @return + */ + int sh(@Param("req") AssetCurrentShRequest req); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetTaskService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetTaskService.java index 2ec3b66..b7dffe1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetTaskService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetTaskService.java @@ -1,18 +1,14 @@ package com.ruoyi.tc.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.tc.entity.AssetCurrent; import com.ruoyi.tc.entity.AssetTask; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.AssestTaskXqresponse; import com.ruoyi.tc.entity.response.AssetCurrentResponse; -import com.ruoyi.tc.entity.response.AssetTaskIdResponse; import com.ruoyi.tc.entity.response.AssetTaskResponse; -import org.springframework.data.domain.PageRequest; - -import java.util.List; /** * 任务主表(AssetTask)表服务接口 @@ -76,9 +72,18 @@ public interface AssetTaskService extends IService { /** * 资产核查信息 * - * @param page 分页参数 + * @param page 分页参数 * @param pageRequest 查询条件 * @return */ Page zcHc(Page page, AssestTaskXqRequest pageRequest); + + + /** + * 管理端审核 + * + * @param req 请求类 + * @return + */ + int sh(AssetCurrentShRequest req); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java index 72b19c7..92442ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java @@ -4,6 +4,7 @@ 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.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.mapper.AssetTaskMapper; @@ -174,4 +175,10 @@ public class AssetTaskServiceImpl extends ServiceImpl zcHc(Page assetTask, AssestTaskXqRequest pageRequest) { return assetTaskDao.zcHc(assetTask,pageRequest); } + + @Override + public int sh(AssetCurrentShRequest req) { + + return assetTaskDao.sh(req); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml index e6abc1c..9b9ea78 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml @@ -223,12 +223,15 @@ - insert into asset_task( task_name, task_time, task_deadline, task_finish_time, task_status, dwmc, + insert into asset_task(task_name, task_time, task_deadline, task_finish_time, task_status, dwmc, create_id, create_by, create_time, update_id, update_by, update_time, user_id, dept_id, version, reamark) values (#{taskName}, #{taskTime}, #{taskDeadline}, #{taskFinishTime}, #{taskStatus}, #{dwmc}, @@ -253,7 +256,7 @@ (#{entity.taskName},#{entity.taskTime},#{entity.taskDeadline}#{entity.taskFinishTime}#{entity.taskStatus}#{entity.dwmc}#{entity.createId}#{entity.createBy}#{entity.createTime}#{entity.updateId}#{entity.updateBy}#{entity.updateTime}#{entity.userId}#{entity.deptId}#{entity.version}#{entity.reamark}) on duplicate key update - task_name = values(task_name)task_time = values(task_time)task_deadline = + task_name = values(task_name)task_time = values(task_time)task_deadline = values(task_deadline)task_finish_time = values(task_finish_time)task_status = values(task_status)dwmc = values(dwmc)create_id = values(create_id)create_by = values(create_by)create_time = values(create_time)update_id = values(update_id)update_by = values(update_by)update_time = @@ -317,6 +320,20 @@ where id = #{id} + + update asset_current_cp + + + task_id = #{req.taskId}, + + + id = #{req.assetId}, + + + status = #{req.status}, + + +