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 index 23304dc..b4eb92e 100644 --- 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 @@ -31,7 +31,11 @@ public class AssetCurrentShRequest { private Integer assetId; - + /** + * 不通过原因 + */ + @ApiModelProperty("不通过原因") + private String btgyy; /** * 审核状态(0待核查,1待审核,3审核通过,4审核不通过,5已报废) 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 02825ac..dd1af14 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 @@ -165,7 +165,7 @@ public interface AssetTaskMapper extends BaseMapper { * @return */ - int updateByTaskId(@Param("taskStatus") Integer taskStatus, @Param("taskId") Integer taskId, @Param("finishTime") LocalDateTime finishTime); + int updateByTaskId(@Param("taskStatus") Integer taskStatus, @Param("taskId") Integer taskId, @Param("finishTime") LocalDateTime finishTime,@Param("btgyy")String btgyy); /** 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 8c23010..08ade02 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 @@ -279,6 +279,7 @@ public class AssetTaskServiceImpl extends ServiceImpl item.getStatus() == 4); boolean hased = list.stream().anyMatch(item -> item.getStatus() == 5); LocalDateTime finishTime = null; + String btgyy=null; if (hasPendingApproval) { // 资产状态存在待审批,任务状态为进行中 taskStatus = 1; @@ -290,6 +291,7 @@ public class AssetTaskServiceImpl extends ServiceImpl task_finish_time=#{finishTime} + + btgyy=#{btgyy} + + btgyy where id =#{taskId}