zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

删除任务单明细数据

Browse Source
This commit is contained in:
王兴荣
2025-10-21 19:16:30 +08:00
parent 71d5eb061d
commit 6d0e27996f
6 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java
View File

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

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDataDO.java
View File

@@ -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;
/**
* 是否已分配任务

7
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.java
View File

@@ -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<BusinessAssay
.eqIfPresent(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, businessAssayTaskId));
}
/**
* 物理批量删除删除
* @param idList
* @return
*/
int physicalDeleteByIds(@Param("idList") List<Long> idList);
}

7
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java
View File

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

20
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java
View File

@@ -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<BusinessAssayTaskDetailDO> businessAssayTaskDetailDOList = businessAssayTaskDetailMapper.selectByIds(req.getIds());
List<Long> businessAssayTaskDataIdList = businessAssayTaskDetailDOList.stream().map(m -> m.getBusinessAssayTaskDataId()).collect(Collectors.toList());
List<BusinessAssayTaskDataDO> 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());
}
}

6
zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.xml
View File

@@ -9,4 +9,10 @@
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
<delete id="physicalDeleteByIds">
DELETE FROM T_BSN_ASY_TSK_DTL t WHERE t.ID IN
<foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
</mapper>