diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssestTaskXqresponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssestTaskXqresponse.java index 33223f3..952be54 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssestTaskXqresponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssestTaskXqresponse.java @@ -47,4 +47,11 @@ public class AssestTaskXqresponse { */ @ApiModelProperty("审核状态(0待核查,1待审核,3审核通过,4审核不通过,5已报废)") private String status; + + + /** + * 不通过原因 + */ + @ApiModelProperty("不通过原因") + private String btgyy; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java index e57daca..84e77a5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java @@ -5,6 +5,7 @@ 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 org.apache.ibatis.annotations.Update; import java.util.List; @@ -16,15 +17,11 @@ import java.util.List; */ public interface AssetCurrentCpMapper extends BaseMapper { /** - * * @param assetId * @param taskId */ @Delete("delete from asset_current_cp where id=#{assetId} and task_id =#{taskId} ") - void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId")int taskId); - - - + void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId") int taskId); /** @@ -35,5 +32,16 @@ public interface AssetCurrentCpMapper extends BaseMapper { */ @Select("select * from asset_current_cp where task_id=#{taskId}") List findByTaskId(int taskId); + + + /** + * 修改不通过原因 + * + * @param assetId 资产id + * @param taskId 任务id + * @param btgyy 不通过原因 + */ + @Update("update asset_current_cp set btgyy=#{btgyy} where id=#{assetId} and task_id =#{taskId} ") + void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy") String btgyy); } 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 dd1af14..02825ac 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,@Param("btgyy")String btgyy); + int updateByTaskId(@Param("taskStatus") Integer taskStatus, @Param("taskId") Integer taskId, @Param("finishTime") LocalDateTime finishTime); /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java index 04fa751..6f15df3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java @@ -30,5 +30,15 @@ public interface AssetCurrentCpService extends IService { */ List findByTaskId(int taskId); + + /** + * 修改不通过原因 + * + * @param assetId 资产id + * @param taskId 任务id + * @param btgyy 不通过原因 + */ + void updateByAssetId(Integer assetId, Integer taskId, String btgyy); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java index 89a7074..c256f19 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java @@ -29,5 +29,10 @@ public class AssetCurrentCpServiceImpl extends ServiceImpl findByTaskId(int taskId) { return assetCurrentCpMapper.findByTaskId(taskId); } + + @Override + public void updateByAssetId(Integer assetId, Integer taskId, String btgyy) { + assetCurrentCpMapper.updateByAssetId(assetId,taskId,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 08ade02..7e4d9ee 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 @@ -291,12 +291,14 @@ public class AssetTaskServiceImpl extends ServiceImpl task_finish_time=#{finishTime} - - btgyy=#{btgyy} - - btgyy where id =#{taskId}