任务模块编写

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删除五张表数据
+//        //根据资产id和任务id删除五张表数据
-        assetCurrentCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+//        assetCurrentCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
-        assetBusinessFormCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+//        assetBusinessFormCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
-        assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+//        assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
-        unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
+//        unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
-        assetBasicNetworkCpService.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();
-    }
 
 }
 

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;
+
+
+
+}

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审核不通过）")
+    @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
-    private String status;
+    private Integer status;
 }

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<AssetTask> {
      * @return
      */
     AssetCurrentResponse findBytaskIdandAssestId(@Param("taskId") int taskId, @Param("assetId") int assetId);
+
+
+
+    /**
+     * 管理端审核
+     *
+     * @param req 请求类
+     * @return
+     */
+    int sh(@Param("req") AssetCurrentShRequest req);
 }
 

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)表服务接口
@@ -81,4 +77,13 @@ public interface AssetTaskService extends IService<AssetTask> {
      * @return
      */
     Page<AssestTaskXqresponse> zcHc(Page<AssestTaskXqresponse> page, AssestTaskXqRequest pageRequest);
+
+
+    /**
+     * 管理端审核
+     *
+     * @param req 请求类
+     * @return
+     */
+    int sh(AssetCurrentShRequest req);
 }

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<AssetTaskMapper, AssetTask
     public Page<AssestTaskXqresponse> zcHc(Page<AssestTaskXqresponse> assetTask, AssestTaskXqRequest pageRequest) {
         return assetTaskDao.zcHc(assetTask,pageRequest);
     }
+
+    @Override
+    public int sh(AssetCurrentShRequest req) {
+
+        return  assetTaskDao.sh(req);
+    }
 }

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

@@ -223,7 +223,10 @@
         </where>
     </select>
     <select id="findBytaskIdandAssestId" resultType="com.ruoyi.tc.entity.response.AssetCurrentResponse">
-        select  * from  asset_current_cp where  task_id =#{taskId} and id =#{assetId}
+        select *
+        from asset_current_cp
+        where task_id = #{taskId}
+          and id = #{assetId}
     </select>
 
     <!--新增所有列-->
@@ -317,6 +320,20 @@
         </set>
         where id = #{id}
     </update>
+    <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>
+            <if test="req.assetId  != null ">
+                id = #{req.assetId},
+            </if>
+            <if test="req.status  != null ">
+                status = #{req.status},
+            </if>
+        </set>
+    </update>
 
     <!--通过主键删除-->
     <delete id="deleteById">