From 6d0e27996fb2bb271330802e77363360252eaa18 Mon Sep 17 00:00:00 2001 From: wxr Date: Tue, 21 Oct 2025 19:16:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=BB=E5=8A=A1=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/SampleTaskAssignController.java | 9 ++++++++- .../dataobject/BusinessAssayTaskDataDO.java | 6 +++--- .../mapper/BusinessAssayTaskDetailMapper.java | 7 +++++++ .../bus/service/SampleTaskAssignService.java | 7 +++++++ .../service/SampleTaskAssignServiceImpl.java | 20 +++++++++++++++++++ .../mapper/BusinessAssayTaskDetailMapper.xml | 6 ++++++ 6 files changed, 51 insertions(+), 4 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java index 76c48af..8d21d95 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java @@ -12,6 +12,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success; import java.util.List; import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignManualParam; import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignMethodParam; import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignSampleParam; @@ -53,7 +54,7 @@ public class SampleTaskAssignController { @PostMapping("/manualAssign") public CommonResult manualAssign(@RequestBody SampleTaskAssignManualParam param) { sampleTaskAssignService.manualAssign(param); - return success("成功"); + return success("成功"); } @PostMapping("/sampleAssign") @@ -62,6 +63,12 @@ public class SampleTaskAssignController { return success("成功"); } + @PostMapping("/removeAssignTaskDetail") + public CommonResult removeAssignTaskDetail(@RequestBody BatchDeleteReqVO req) { + sampleTaskAssignService.removeAssignTaskDetail(req); + return success("成功"); + } + @PostMapping("/submitAssign") public CommonResult submitAssign(Long id) { sampleTaskAssignService.submitAssign(id); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDataDO.java index 478d371..97e156d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDataDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDataDO.java @@ -57,7 +57,7 @@ public class BusinessAssayTaskDataDO extends BusinessBaseDO { /** * 指派单ID */ - @TableField("BSN_ASY_TSK_ID") + @TableField(value = "BSN_ASY_TSK_ID", updateStrategy = FieldStrategy.ALWAYS) private Long businessAssayTaskId; /** * 任务类型,【字典】【jy_sample_task_type】常规、抽查... @@ -87,12 +87,12 @@ public class BusinessAssayTaskDataDO extends BusinessBaseDO { /** * 分析人 */ - @TableField("ASY_OPTR") + @TableField(value = "ASY_OPTR", updateStrategy = FieldStrategy.ALWAYS) private String assayOperator; /** * 分配任务时间 */ - @TableField("ASN_TSK_TM") + @TableField(value = "ASN_TSK_TM", updateStrategy = FieldStrategy.ALWAYS) private LocalDateTime assignTaskTime; /** * 是否已分配任务 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.java index f476532..7ba64b3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.java @@ -10,6 +10,7 @@ import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import java.util.List; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 检测任务分配明细 Mapper @@ -60,4 +61,10 @@ public interface BusinessAssayTaskDetailMapper extends BaseMapperX idList); } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java index 5bccfcc..dd25b32 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java @@ -3,6 +3,7 @@ package com.zt.plat.module.qms.business.bus.service; import java.util.List; import com.yomahub.liteflow.flow.LiteflowResponse; +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignManualParam; import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignMethodParam; import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignSampleParam; @@ -47,4 +48,10 @@ public interface SampleTaskAssignService { */ void voidAssign(Long id); + /** + * 批量删除指派明细 + * @param req + */ + void removeAssignTaskDetail(BatchDeleteReqVO req); + } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java index 4bb7483..a12ebdb 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java @@ -14,12 +14,14 @@ import com.yomahub.liteflow.flow.LiteflowResponse; import cn.hutool.core.collection.CollUtil; import com.zt.plat.framework.common.exception.ServiceException; import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.security.core.LoginUser; import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils; import com.zt.plat.framework.tenant.core.context.TenantContextHolder; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDetailMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskMapper; @@ -159,4 +161,22 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { businessAssayTaskMapper.updateById(businessAssayTaskDO); businessAssayTaskDataMapper.updateBatch(businessAssayTaskDataDOList); } + + @Override + public void removeAssignTaskDetail(BatchDeleteReqVO req) { + List businessAssayTaskDetailDOList = businessAssayTaskDetailMapper.selectByIds(req.getIds()); + List businessAssayTaskDataIdList = businessAssayTaskDetailDOList.stream().map(m -> m.getBusinessAssayTaskDataId()).collect(Collectors.toList()); + List businessAssayTaskDataDOList = businessAssayTaskDataMapper.selectByIds(businessAssayTaskDataIdList); + for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataDOList) { + businessAssayTaskDataDO.setIsAssignTasked(QmsCommonConstant.NO); + businessAssayTaskDataDO.setAssignTaskTime(null); + businessAssayTaskDataDO.setAssayOperator(null); + businessAssayTaskDataDO.setBusinessAssayTaskId(null); + } + //更新检测任务 + businessAssayTaskDataMapper.updateBatch(businessAssayTaskDataDOList); + + //删除任务单明细数据 + businessAssayTaskDetailMapper.physicalDeleteByIds(req.getIds()); + } } diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.xml index bc26f6a..04e9410 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.xml @@ -9,4 +9,10 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> + + DELETE FROM T_BSN_ASY_TSK_DTL t WHERE t.ID IN + + #{item} + + \ No newline at end of file