suzhou-jichuang-lanhai
/
TcAssetVerificationJava
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

任务模块编写

Browse Source
duhanyu
dongdingding 5 months ago
parent 7c4eff528e
commit 0c71be162a
7 changed files with 115 additions and 21 deletions
Show Stats Download Patch File Download Diff File

34
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java
Unescape View File

@ -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();
}
}

38
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java
Unescape View File

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

4
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java
Unescape View File

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

11
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java
Unescape View File

@ -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);
}

19
ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetTaskService.java
Unescape View File

@ -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<AssetTask> {
/**
* 资产核查信息
*
* @param page 分页参数
* @param page 分页参数
* @param pageRequest 查询条件
* @return
*/
Page<AssestTaskXqresponse> zcHc(Page<AssestTaskXqresponse> page, AssestTaskXqRequest pageRequest);
/**
* 管理端审核
*
* @param req 请求类
* @return
*/
int sh(AssetCurrentShRequest req);
}

7
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java
Unescape View File

@ -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);
}
}

23
ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
Unescape View File

@ -223,12 +223,15 @@
</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>
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
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})
</foreach>
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 @@
</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">

Write Preview
Loading…
Cancel
Save