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

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已报废）

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

@@ -165,7 +165,7 @@ public interface AssetTaskMapper extends BaseMapper<AssetTask> {
      * @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);
 
 
     /**

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

@@ -279,6 +279,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
         boolean hasRejected = list.stream().anyMatch(item -> item.getStatus() == 4);
         boolean hased = list.stream().anyMatch(item -> item.getStatus() == 5);
         LocalDateTime finishTime = null;
+        String btgyy=null;
         if (hasPendingApproval) {
             // 资产状态存在待审批，任务状态为进行中
             taskStatus = 1;
@@ -290,6 +291,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
         } else if (allApproved && !hasPendingApproval && !hasRejected && hasExpired) {
             // 资产状态全部为已通过，资产完成时间有超期的为超期完成
             taskStatus = 3;
+             btgyy=req.getBtgyy();
             finishTime = LocalDateTime.now();
             taskSaveOrDelete(req);
         } else if (hasRejected) {
@@ -310,7 +312,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
             taskStatus = 3;
         }
         //修改主表任务状态
-        assetTaskDao.updateByTaskId(taskStatus, req.getTaskId(), finishTime);
+        assetTaskDao.updateByTaskId(taskStatus, req.getTaskId(), finishTime,btgyy);
         return a;
     }
 

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

@@ -406,6 +406,10 @@
             <if test="finishTime != null ">
                 task_finish_time=#{finishTime}
             </if>
+            <if test="btgyy != btgyy and btgyy!='' ">
+                btgyy=#{btgyy}
+            </if>
+            btgyy
         </set>
 
         where id =#{taskId}