diff --git a/src/main/java/com/jtem/modules/pda/service/ToolHeaderService.java b/src/main/java/com/jtem/modules/pda/service/ToolHeaderService.java index 830c788..7fb30dc 100644 --- a/src/main/java/com/jtem/modules/pda/service/ToolHeaderService.java +++ b/src/main/java/com/jtem/modules/pda/service/ToolHeaderService.java @@ -271,4 +271,6 @@ public interface ToolHeaderService { PageUtils getToolAttributeList(PartSubPropertiesValueData data); PageUtils getToolCostList(ToolCostData data); + + void refuseToolUseQtyAssess(ToolUseQtyAssessData data); } diff --git a/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java b/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java index 276df0f..ffc2bb8 100644 --- a/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java +++ b/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java @@ -811,4 +811,17 @@ public class ToolHeaderServiceImpl implements ToolHeaderService { return new PageUtils(resultList); } + /** + * @description: 驳回寿命评估 + * @author: fengyuan_yang + * @date: 2023/8/11 14:16 + * @param: [data] + * @return: void + **/ + @Override + public void refuseToolUseQtyAssess(ToolUseQtyAssessData data) { + // 更新寿命评估表数据 + toolDetailMapper.checkToolUseQtyAssess(data); + } + } diff --git a/src/main/java/com/jtem/modules/toolMan/controller/ToolInfoController.java b/src/main/java/com/jtem/modules/toolMan/controller/ToolInfoController.java index bffcf05..d1897c1 100644 --- a/src/main/java/com/jtem/modules/toolMan/controller/ToolInfoController.java +++ b/src/main/java/com/jtem/modules/toolMan/controller/ToolInfoController.java @@ -378,6 +378,19 @@ public class ToolInfoController extends AbstractController { return R.ok(); } + /** + * @description: 驳回寿命评估 + * @author: fengyuan_yang + * @date: 2023/8/11 14:15 + * @param: [data] + * @return: com.jtem.common.utils.R + **/ + @PostMapping("refuseToolUseQtyAssess") + public R refuseToolUseQtyAssess(@RequestBody ToolUseQtyAssessData data){ + toolHeaderService.refuseToolUseQtyAssess(data); + return R.ok(); + } + /** * @description: 根据实例编码获取寿命评估记录 * @author: fengyuan_yang diff --git a/src/main/resources/mapper/pda/ToolDetailMapper.xml b/src/main/resources/mapper/pda/ToolDetailMapper.xml index ae9d020..1d7a6ed 100644 --- a/src/main/resources/mapper/pda/ToolDetailMapper.xml +++ b/src/main/resources/mapper/pda/ToolDetailMapper.xml @@ -560,7 +560,8 @@ ORDER BY CASE WHEN status = '待审核' THEN 1 - WHEN status = '已完成' THEN 2 + WHEN status = '已驳回' THEN 2 + WHEN status = '已完成' THEN 3 END,create_date