feat:qms阶段性提交:检验流程调整、报告、样品库等

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchController.java

@@ -64,19 +64,19 @@ public class BusinessSampleDispatchController implements BusinessControllerMarke
         return success(true);
     }
 
-    @PutMapping("/addOrRemoveSample")
+    @PostMapping("/addOrRemoveSample")
     @Operation(summary = "增加或移除样品")
     public CommonResult<Boolean> addOrRemoveSample(@Valid @RequestBody BusinessSampleDispatchSaveReqVO updateReqVO) {
         businessSampleDispatchService.addOrRemoveSample(updateReqVO);
         return success(true);
     }
 
-    @PutMapping("/addBySampleCode")
+    @PostMapping("/addBySampleReturnCode")
-    @Operation(summary = "增加或移除样品")
+    @Operation(summary = "按归库码增加样品")
-    public CommonResult<Boolean> addBySampleCode(HttpServletRequest request) {
+    public CommonResult<Boolean> addBySampleReturnCode(@RequestBody JSONObject param) {
-        String id = request.getParameter("id");
+        String id = param.getString("id");
-        String sampleCode = request.getParameter("sampleCode");
+        String sampleReturnCode = param.getString("sampleReturnCode");
-        BusinessSubSampleDO businessSubSampleDO = businessSubSampleService.getBySampleCode(sampleCode);
+        BusinessSubSampleDO businessSubSampleDO = businessSubSampleService.getBySampleReturnCode(sampleReturnCode);
         if(businessSubSampleDO == null)
             return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "未查询到此样品！");
         //判断样品状态
@@ -88,6 +88,8 @@ public class BusinessSampleDispatchController implements BusinessControllerMarke
         if("1".equals(dispatchStatus)){
             return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "样品已被调拨：请归还后再调拨！");
         }
+        //todo 重复校验
+
         List<Long> sampleIds = new ArrayList<>();
         sampleIds.add(businessSubSampleDO.getId());
         BusinessSampleDispatchSaveReqVO updateReqVO = new BusinessSampleDispatchSaveReqVO();

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchDetailController.java

@@ -50,11 +50,11 @@ public class BusinessSampleDispatchDetailController implements BusinessControlle
     @GetMapping("/searchBySampleCode")
     @Operation(summary = "扫码查询待归还样品")
     public CommonResult<BusinessSampleDispatchDetailExtendRespVO> searchBySampleCode(HttpServletRequest request) {
-        String sampleCode = request.getParameter("sampleCode");
+        String sampleReturnCode = request.getParameter("sampleReturnCode");
-        if(ObjectUtils.isEmpty(sampleCode))
+        if(ObjectUtils.isEmpty(sampleReturnCode))
             return CommonResult.error(BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS.getCode(), "请输入样品编号！");
         BusinessSampleDispatchDetailPageReqVO reqVO = new BusinessSampleDispatchDetailPageReqVO();
-        reqVO.setSampleCode(sampleCode);
+        reqVO.setSampleReturnCode(sampleReturnCode);
         reqVO.setBorrowStatus("1");
         reqVO.setGivebackStatus("0");
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleAssessmentController.java

@@ -42,14 +42,14 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
 
     @PostMapping("/create")
     @Operation(summary = "创建班组判定数据业务")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:create')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:create')")
     public CommonResult<BusinessSubParentSampleAssessmentRespVO> createBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO createReqVO) {
         return success(businessSubParentSampleAssessmentService.createBusinessSubParentSampleAssessment(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新班组判定数据业务")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:update')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:update')")
     public CommonResult<Boolean> updateBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO updateReqVO) {
         businessSubParentSampleAssessmentService.updateBusinessSubParentSampleAssessment(updateReqVO);
         return success(true);
@@ -58,7 +58,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
     @DeleteMapping("/delete")
     @Operation(summary = "删除班组判定数据业务")
     @Parameter(name = "id", description = "编号", required = true)
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
     public CommonResult<Boolean> deleteBusinessSubParentSampleAssessment(@RequestParam("id") Long id) {
         businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessment(id);
         return success(true);
@@ -67,7 +67,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除班组判定数据业务")
-                //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
+                @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
     public CommonResult<Boolean> deleteBusinessSubParentSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
         businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessmentListByIds(req.getIds());
         return success(true);
@@ -76,7 +76,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
     @GetMapping("/get")
     @Operation(summary = "获得班组判定数据业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
     public CommonResult<BusinessSubParentSampleAssessmentRespVO> getBusinessSubParentSampleAssessment(@RequestParam("id") Long id) {
         BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessment = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessment(id);
         return success(BeanUtils.toBean(businessSubParentSampleAssessment, BusinessSubParentSampleAssessmentRespVO.class));
@@ -84,7 +84,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
 
     @GetMapping("/page")
     @Operation(summary = "获得班组判定数据业务分页")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
     public CommonResult<PageResult<BusinessSubParentSampleAssessmentRespVO>> getBusinessSubParentSampleAssessmentPage(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO) {
         PageResult<BusinessSubParentSampleAssessmentDO> pageResult = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessmentPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleAssessmentRespVO.class));
@@ -92,7 +92,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出班组判定数据业务 Excel")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:export')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSubParentSampleAssessmentExcel(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAssessmentController.java

@@ -1,8 +1,5 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAssessmentPageReqVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAssessmentRespVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAssessmentSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -32,7 +29,7 @@ import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleAssessmentSe
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
 import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 
-@Tag(name = "管理后台 - 子样判定数据业务")
+@Tag(name = "管理后台 - 子样判定业务")
 @RestController
 @RequestMapping("/qms/business-sub-sample-assessment")
 @Validated
@@ -43,24 +40,24 @@ public class BusinessSubSampleAssessmentController implements BusinessController
     private BusinessSubSampleAssessmentService businessSubSampleAssessmentService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建子样判定数据业务")
+    @Operation(summary = "创建子样判定业务")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:create')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:create')")
     public CommonResult<BusinessSubSampleAssessmentRespVO> createBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO createReqVO) {
         return success(businessSubSampleAssessmentService.createBusinessSubSampleAssessment(createReqVO));
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新子样判定数据业务")
+    @Operation(summary = "更新子样判定业务")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:update')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:update')")
     public CommonResult<Boolean> updateBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO updateReqVO) {
         businessSubSampleAssessmentService.updateBusinessSubSampleAssessment(updateReqVO);
         return success(true);
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除子样判定数据业务")
+    @Operation(summary = "删除子样判定业务")
     @Parameter(name = "id", description = "编号", required = true)
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
     public CommonResult<Boolean> deleteBusinessSubSampleAssessment(@RequestParam("id") Long id) {
         businessSubSampleAssessmentService.deleteBusinessSubSampleAssessment(id);
         return success(true);
@@ -68,40 +65,40 @@ public class BusinessSubSampleAssessmentController implements BusinessController
 
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除子样判定数据业务")
+    @Operation(summary = "批量删除子样判定业务")
-                //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
+                @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
     public CommonResult<Boolean> deleteBusinessSubSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
         businessSubSampleAssessmentService.deleteBusinessSubSampleAssessmentListByIds(req.getIds());
         return success(true);
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得子样判定数据业务")
+    @Operation(summary = "获得子样判定业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
     public CommonResult<BusinessSubSampleAssessmentRespVO> getBusinessSubSampleAssessment(@RequestParam("id") Long id) {
         BusinessSubSampleAssessmentDO businessSubSampleAssessment = businessSubSampleAssessmentService.getBusinessSubSampleAssessment(id);
         return success(BeanUtils.toBean(businessSubSampleAssessment, BusinessSubSampleAssessmentRespVO.class));
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得子样判定数据业务分页")
+    @Operation(summary = "获得子样判定业务分页")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
     public CommonResult<PageResult<BusinessSubSampleAssessmentRespVO>> getBusinessSubSampleAssessmentPage(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO) {
         PageResult<BusinessSubSampleAssessmentDO> pageResult = businessSubSampleAssessmentService.getBusinessSubSampleAssessmentPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessSubSampleAssessmentRespVO.class));
     }
 
     @GetMapping("/export-excel")
-    @Operation(summary = "导出子样判定数据业务 Excel")
+    @Operation(summary = "导出子样判定业务 Excel")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:export')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSubSampleAssessmentExcel(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<BusinessSubSampleAssessmentDO> list = businessSubSampleAssessmentService.getBusinessSubSampleAssessmentPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "子样判定数据业务.xls", "数据", BusinessSubSampleAssessmentRespVO.class,
+        ExcelUtils.write(response, "子样判定业务.xls", "数据", BusinessSubSampleAssessmentRespVO.class,
                         BeanUtils.toBean(list, BusinessSubSampleAssessmentRespVO.class));
     }
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleController.java

@@ -106,6 +106,14 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
         return success(pageResult);
     }
 
+    @GetMapping("/page-analysis-group")
+    @Operation(summary = "获得子样分析部门分页")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
+    public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> getAnalysisGroupPage(@Valid BusinessSubSamplePageReqVO pageReqVO) {
+        PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getAnalysisGroupPage(pageReqVO);
+        return success(pageResult);
+    }
+
     @GetMapping("/page-stock")
     @Operation(summary = "查询样品库分页数据")
     public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> pageStock(@Valid BusinessSubSamplePageReqVO pageReqVO) {
@@ -113,6 +121,13 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
         return success(pageResult);
     }
 
+    @GetMapping("/selectPageForDispatch")
+    @Operation(summary = "查询可申请调拨子样")
+    public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> selectPageForDispatch(@Valid BusinessSubSamplePageReqVO pageReqVO) {
+        PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.selectPageForDispatch(pageReqVO);
+        return success(pageResult);
+    }
+
     @GetMapping("/page-task")
     @Operation(summary = "获得子样业务分页")
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisAuditController.java

@@ -47,10 +47,8 @@ public class SampleAnalysisAuditController {
 	}
 	
 	@GetMapping("/getSampleResultAssessmentList")
-	public CommonResult<JSONObject> getSampleResultAssessmentList(Long configAssayMethodId, String assessmentStatus) {
+	public CommonResult<JSONObject> getSampleResultAssessmentList(Long configAssayMethodId, String asmtReportedStatus) {
-		
+		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(configAssayMethodId, asmtReportedStatus);
-		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(configAssayMethodId, assessmentStatus);
-		
 		return success(result);
 	}
 	

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleFlowController.java

@@ -146,9 +146,9 @@ public class SampleFlowController {
     	flowNodeList.add(fx);
 
     	bzs.setNextFlowNodeList(new ArrayList<>() {{
-    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("样品当前分析班组结果超差，需要发起复检"));
+//    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("样品当前分析班组结果超差，需要发起复检"));
-    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setCondition("当前部门数据已全部判断上报"));
+    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setCondition("subSampleSelfReportedOthersPending"));//当前部门数据已全部判断上报
-    		add(BeanUtils.toBean(ypgk,SampleFlowNode.class).setCondition("当前样品所有分析任务已全部上报完"));
+    		add(BeanUtils.toBean(ypgk,SampleFlowNode.class).setCondition("subSampleAlldeptAnalyzed"));//当前样品所有分析任务已全部上报完
     	}});
     	flowNodeList.add(bzs);
     	

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleResultReportingController.java

@@ -35,8 +35,8 @@ public class SampleResultReportingController {
 	
 	//获取未上报的方法
 	@GetMapping("/getUnReportMethodGroupList")
-	public CommonResult<?> getUnReportMethodGroupList() {
+	public CommonResult<?> getUnReportMethodGroupList(BusinessSubParentSampleAssessmentGroupReqVO reqVO) {
-		List<BusinessSubParentSampleAssessmentGroupRespVO> list = sampleResultReportingService.getUnReportMethodGroupList();
+		List<BusinessSubParentSampleAssessmentGroupRespVO> list = sampleResultReportingService.getUnReportMethodGroupList(reqVO);
 		return success(list);
 	}