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

方法变更样品查询

Browse Source
This commit is contained in:
王兴荣
2025-11-19 17:18:32 +08:00
parent 1f8aebf598
commit c6c44828e0
7 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,8 +40,8 @@ public class SampleTaskAssignController {
} }
@GetMapping("/getAssaySampleList") @GetMapping("/getAssaySampleList")
public CommonResult<?> getAssaySampleList() { public CommonResult<?> getAssaySampleList(BusinessAssayTaskDataReqVO reqVO) {
List<UnAssignTaskedSubSampleRespVO> list = sampleTaskAssignService.getAssaySampleList(); List<UnAssignTaskedSubSampleRespVO> list = sampleTaskAssignService.getAssaySampleList(reqVO);
return success(list); return success(list);
} }

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java
View File

@@ -107,4 +107,6 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
@Schema(description = "备注") @Schema(description = "备注")
private String remark; private String remark;
@Schema(description = "部门id")
private Long deptId;
} }

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

@@ -329,7 +329,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
* 查询未指派的子样 * 查询未指派的子样
* @return * @return
*/ */
List<UnAssignTaskedSubSampleRespVO> selectUnAssignTaskedSubSample(); List<UnAssignTaskedSubSampleRespVO> selectUnAssignTaskedSubSample(@Param("reqVO") BusinessAssayTaskDataReqVO reqVO);
} }

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

@@ -60,6 +60,7 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
.eqIfPresent(BusinessAssayTaskDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) .eqIfPresent(BusinessAssayTaskDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
.betweenIfPresent(BusinessAssayTaskDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(BusinessAssayTaskDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(BusinessAssayTaskDO::getRemark, reqVO.getRemark()) .eqIfPresent(BusinessAssayTaskDO::getRemark, reqVO.getRemark())
.eqIfPresent(BusinessAssayTaskDO::getDeptId, reqVO.getDeptId())
.orderByDesc(BusinessAssayTaskDO::getId)); .orderByDesc(BusinessAssayTaskDO::getId));
} }
@@ -99,6 +100,7 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
.eqIfPresent(BusinessAssayTaskDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) .eqIfPresent(BusinessAssayTaskDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
.betweenIfPresent(BusinessAssayTaskDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(BusinessAssayTaskDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(BusinessAssayTaskDO::getRemark, reqVO.getRemark()) .eqIfPresent(BusinessAssayTaskDO::getRemark, reqVO.getRemark())
.eqIfPresent(BusinessAssayTaskDO::getDeptId, reqVO.getDeptId())
.orderByDesc(BusinessAssayTaskDO::getId)); .orderByDesc(BusinessAssayTaskDO::getId));
} }

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

@@ -22,7 +22,7 @@ public interface SampleTaskAssignService {
* 获取未指派任务子样信息 * 获取未指派任务子样信息
* @return * @return
*/ */
List<UnAssignTaskedSubSampleRespVO> getAssaySampleList(); List<UnAssignTaskedSubSampleRespVO> getAssaySampleList(BusinessAssayTaskDataReqVO reqVO);
/** /**
* 根据子样id查询分析方法 * 根据子样id查询分析方法

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

@@ -177,8 +177,8 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService {
} }
@Override @Override
public List<UnAssignTaskedSubSampleRespVO> getAssaySampleList() { public List<UnAssignTaskedSubSampleRespVO> getAssaySampleList(BusinessAssayTaskDataReqVO reqVO) {
List<UnAssignTaskedSubSampleRespVO> list = businessAssayTaskDataMapper.selectUnAssignTaskedSubSample(); List<UnAssignTaskedSubSampleRespVO> list = businessAssayTaskDataMapper.selectUnAssignTaskedSubSample(reqVO);
return list; return list;
} }

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

@@ -74,7 +74,18 @@
T_BSN_ASY_TSK_DAT tbatd T_BSN_ASY_TSK_DAT tbatd
LEFT JOIN T_BSN_SB_SMP tbss ON LEFT JOIN T_BSN_SB_SMP tbss ON
tbatd.BSN_SB_SMP_ID = tbss.ID tbatd.BSN_SB_SMP_ID = tbss.ID
WHERE tbatd.IS_ASN_TSKD = 0 WHERE
tbatd.DELETED = 0
AND tbatd.IS_ASN_TSKD = 0
<if test="reqVO.assayDepartmentId != null and reqVO.assayDepartmentId != ''">
AND tbatd.ASY_DEPT_ID = #{reqVO.assayDepartmentId}
</if>
<if test="reqVO.sampleFlowNodeKey != null and reqVO.sampleFlowNodeKey != ''">
AND tbatd.SMP_FLW_NDE_KY = #{reqVO.sampleFlowNodeKey}
</if>
<if test="reqVO.sampleFlowNodeTime[0] != null and reqVO.sampleFlowNodeTime[0] != null">
AND tbatd.SMP_FLW_NDE_TM #{reqVO.sampleFlowNodeTime[0]} and #{reqVO.sampleFlowNodeTime[1]}
</if>
AND tbatd.SMP_FLW_NDE_KY = 'flw_analysis' AND tbatd.SMP_FLW_NDE_KY = 'flw_analysis'
GROUP BY tbss.ID , GROUP BY tbss.ID ,
tbss.SMP_NAME , tbss.SMP_NAME ,