结果报送，复检修改

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java

@@ -122,7 +122,7 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定数据业务不存在");
 	ErrorCode BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定检测项目数据业务不存在");
 	
-	ErrorCode BUSINESS_SUB_SAMPLE_PARENT_RECHECK_NOT_EXISTS = new ErrorCode(1_032_100_000, "分样复检业务数据不存在");
+	ErrorCode BUSINESS_SUB_SAMPLE_PARENT_RETEST_NOT_EXISTS  = new ErrorCode(1_032_100_000, "分样复测业务数据不存在");
 
 	ErrorCode BUSINESS_QC_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样业务不存在");
 	ErrorCode BUSINESS_QC_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测项目数据业务不存在");

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

@@ -25,82 +25,82 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleParentRecheckDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleParentRetestDO;
-import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleParentRecheckService;
+import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleParentRetestService;
 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-parent-recheck")
+@RequestMapping("/qms/business-sub-sample-parent-retest")
 @Validated
-public class BusinessSubSampleParentRecheckController implements BusinessControllerMarker {
+public class BusinessSubSampleParentRetestController implements BusinessControllerMarker {
 
 
     @Resource
-    private BusinessSubSampleParentRecheckService businessSubSampleParentRecheckService;
+    private BusinessSubSampleParentRetestService businessSubSampleParentRetestService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建分样复检业务数据")
+    @Operation(summary = "创建分样复测业务数据")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:create')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-retest:create')")
-    public CommonResult<BusinessSubSampleParentRecheckRespVO> createBusinessSubSampleParentRecheck(@Valid @RequestBody BusinessSubSampleParentRecheckSaveReqVO createReqVO) {
+    public CommonResult<BusinessSubSampleParentRetestRespVO> createBusinessSubSampleParentRetest(@Valid @RequestBody BusinessSubSampleParentRetestSaveReqVO createReqVO) {
-        return success(businessSubSampleParentRecheckService.createBusinessSubSampleParentRecheck(createReqVO));
+        return success(businessSubSampleParentRetestService.createBusinessSubSampleParentRetest(createReqVO));
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新分样复检业务数据")
+    @Operation(summary = "更新分样复测业务数据")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:update')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-retest:update')")
-    public CommonResult<Boolean> updateBusinessSubSampleParentRecheck(@Valid @RequestBody BusinessSubSampleParentRecheckSaveReqVO updateReqVO) {
+    public CommonResult<Boolean> updateBusinessSubSampleParentRetest(@Valid @RequestBody BusinessSubSampleParentRetestSaveReqVO updateReqVO) {
-        businessSubSampleParentRecheckService.updateBusinessSubSampleParentRecheck(updateReqVO);
+        businessSubSampleParentRetestService.updateBusinessSubSampleParentRetest(updateReqVO);
         return success(true);
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除分样复检业务数据")
+    @Operation(summary = "删除分样复测业务数据")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:delete')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-retest:delete')")
-    public CommonResult<Boolean> deleteBusinessSubSampleParentRecheck(@RequestParam("id") Long id) {
+    public CommonResult<Boolean> deleteBusinessSubSampleParentRetest(@RequestParam("id") Long id) {
-        businessSubSampleParentRecheckService.deleteBusinessSubSampleParentRecheck(id);
+        businessSubSampleParentRetestService.deleteBusinessSubSampleParentRetest(id);
         return success(true);
     }
 
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除分样复检业务数据")
+    @Operation(summary = "批量删除分样复测业务数据")
-                @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:delete')")
+                @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-retest:delete')")
-    public CommonResult<Boolean> deleteBusinessSubSampleParentRecheckList(@RequestBody BatchDeleteReqVO req) {
+    public CommonResult<Boolean> deleteBusinessSubSampleParentRetestList(@RequestBody BatchDeleteReqVO req) {
-        businessSubSampleParentRecheckService.deleteBusinessSubSampleParentRecheckListByIds(req.getIds());
+        businessSubSampleParentRetestService.deleteBusinessSubSampleParentRetestListByIds(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-parent-recheck:query')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-retest:query')")
-    public CommonResult<BusinessSubSampleParentRecheckRespVO> getBusinessSubSampleParentRecheck(@RequestParam("id") Long id) {
+    public CommonResult<BusinessSubSampleParentRetestRespVO> getBusinessSubSampleParentRetest(@RequestParam("id") Long id) {
-        BusinessSubSampleParentRecheckDO businessSubSampleParentRecheck = businessSubSampleParentRecheckService.getBusinessSubSampleParentRecheck(id);
+        BusinessSubSampleParentRetestDO businessSubSampleParentRetest = businessSubSampleParentRetestService.getBusinessSubSampleParentRetest(id);
-        return success(BeanUtils.toBean(businessSubSampleParentRecheck, BusinessSubSampleParentRecheckRespVO.class));
+        return success(BeanUtils.toBean(businessSubSampleParentRetest, BusinessSubSampleParentRetestRespVO.class));
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得分样复检业务数据分页")
+    @Operation(summary = "获得分样复测业务数据分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:query')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-retest:query')")
-    public CommonResult<PageResult<BusinessSubSampleParentRecheckRespVO>> getBusinessSubSampleParentRecheckPage(@Valid BusinessSubSampleParentRecheckPageReqVO pageReqVO) {
+    public CommonResult<PageResult<BusinessSubSampleParentRetestRespVO>> getBusinessSubSampleParentRetestPage(@Valid BusinessSubSampleParentRetestPageReqVO pageReqVO) {
-        PageResult<BusinessSubSampleParentRecheckDO> pageResult = businessSubSampleParentRecheckService.getBusinessSubSampleParentRecheckPage(pageReqVO);
+        PageResult<BusinessSubSampleParentRetestDO> pageResult = businessSubSampleParentRetestService.getBusinessSubSampleParentRetestPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessSubSampleParentRecheckRespVO.class));
+        return success(BeanUtils.toBean(pageResult, BusinessSubSampleParentRetestRespVO.class));
     }
 
     @GetMapping("/export-excel")
-    @Operation(summary = "导出分样复检业务数据 Excel")
+    @Operation(summary = "导出分样复测业务数据 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:export')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-retest:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportBusinessSubSampleParentRecheckExcel(@Valid BusinessSubSampleParentRecheckPageReqVO pageReqVO,
+    public void exportBusinessSubSampleParentRetestExcel(@Valid BusinessSubSampleParentRetestPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<BusinessSubSampleParentRecheckDO> list = businessSubSampleParentRecheckService.getBusinessSubSampleParentRecheckPage(pageReqVO).getList();
+        List<BusinessSubSampleParentRetestDO> list = businessSubSampleParentRetestService.getBusinessSubSampleParentRetestPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "分样复检业务数据.xls", "数据", BusinessSubSampleParentRecheckRespVO.class,
+        ExcelUtils.write(response, "分样复测业务数据.xls", "数据", BusinessSubSampleParentRetestRespVO.class,
-                        BeanUtils.toBean(list, BusinessSubSampleParentRecheckRespVO.class));
+                        BeanUtils.toBean(list, BusinessSubSampleParentRetestRespVO.class));
     }
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataExtendRespVO.java

@@ -45,6 +45,9 @@ public class BusinessAssayProjectDataExtendRespVO extends BusinessAssayProjectDa
     @Schema(description = "单位")
     private String dictionaryProjectUnit;
 
-    @Schema(description = "分析次数")
+    @Schema(description = "复检次数")
-    private Integer analysisCount;
+    private Integer recheckCount;
+
+    @Schema(description = "复测次数")
+    private Integer retestCount;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataGroupRespVO.java

@@ -11,6 +11,8 @@ public class BusinessAssayTaskDataGroupRespVO {
 	/** 方法名称 **/
 	private String configAssayMethodName;
 	
+	private String configAssayMethodDictionaryBusinessKey;
+	
 	/** 方法名称及类别 **/
 	private String configAssayMethodNameAndCategory;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataPageReqVO.java

@@ -82,8 +82,11 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] sampleFlowNodeTime;
 
-    @Schema(description = "分析次数,复检的累加次数", example = "13073")
+    @Schema(description = "复检次数", example = "7312")
-    private Integer analysisCount;
+    private Integer recheckCount;
+
+    @Schema(description = "复测次数", example = "28081")
+    private Integer retestCount;
 
     @Schema(description = "乐观锁", example = "11435")
     private Integer updateCount;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataReqVO.java

@@ -1,9 +1,7 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import com.zt.plat.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
@@ -82,8 +80,11 @@ public class BusinessAssayTaskDataReqVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] sampleFlowNodeTime;
 
-    @Schema(description = "分析次数,复检的累加次数", example = "13073")
+    @Schema(description = "复检次数", example = "7312")
-    private Integer analysisCount;
+    private Integer recheckCount;
+
+    @Schema(description = "复测次数", example = "28081")
+    private Integer retestCount;
 
     @Schema(description = "乐观锁", example = "11435")
     private Integer updateCount;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataRespVO.java

@@ -103,9 +103,13 @@ public class BusinessAssayTaskDataRespVO {
     @ExcelProperty("样品流程节点时间")
     private LocalDateTime sampleFlowNodeTime;
 
-    @Schema(description = "分析次数,复检的累加次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "13073")
+    @Schema(description = "复检次数", example = "7312")
-    @ExcelProperty("分析次数,复检的累加次数")
+    @ExcelProperty("复测次数")
-    private Integer analysisCount;
+    private Integer recheckCount;
+
+    @Schema(description = "复测次数", example = "28081")
+    @ExcelProperty("复测次数")
+    private Integer retestCount;
 
     @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435")
     @ExcelProperty("乐观锁")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataSaveReqVO.java

@@ -90,9 +90,11 @@ public class BusinessAssayTaskDataSaveReqVO {
     @NotNull(message = "样品流程节点时间不能为空")
     private LocalDateTime sampleFlowNodeTime;
 
-    @Schema(description = "分析次数,复检的累加次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "13073")
+    @Schema(description = "复检次数", example = "7312")
-    @NotNull(message = "分析次数,复检的累加次数不能为空")
+    private Integer recheckCount;
-    private Integer analysisCount;
+
+    @Schema(description = "复测次数", example = "28081")
+    private Integer retestCount;
 
     @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435")
     private Integer updateCount;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentGroupRespVO.java

@@ -9,6 +9,9 @@ public class BusinessSubParentSampleAssessmentGroupRespVO {
 	@Schema(description = "分析方法id")
 	private Long configAssayMethodId;
 	
+	@Schema(description = "方法大类")
+	private String configAssayMethodDictionaryBusinessKey;
+	
 	@Schema(description = "分析方法名称")
 	private String configAssayMethodName;
     

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentPageReqVO.java

@@ -28,6 +28,9 @@ public class BusinessSubParentSampleAssessmentPageReqVO extends PageParam {
     @Schema(description = "判定状态,in_progress-进行中 normal-正常", example = "1")
     private String assessmentStatus;
 
+    @Schema(description = "复测次数", example = "28081")
+    private Integer retestCount;
+
     @Schema(description = "是否已上报")
     private Integer isReported;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentProjectExtendRespVO.java

@@ -6,6 +6,9 @@ import lombok.Data;
 @Data
 public class BusinessSubParentSampleAssessmentProjectExtendRespVO extends BusinessSubParentSampleAssessmentProjectRespVO {
 	
+	@Schema(description = "复测次数")
+    private Integer retestCount;
+
     @Schema(description = "检测项目key")
     private String dictionaryProjectKey;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentRespVO.java

@@ -36,6 +36,10 @@ public class BusinessSubParentSampleAssessmentRespVO {
     @ExcelProperty("判定状态,in_progress-进行中 normal-正常")
     private String assessmentStatus;
 
+    @Schema(description = "复测次数", example = "28081")
+    @ExcelProperty("复测次数")
+    private Integer retestCount;
+
     @Schema(description = "是否已上报")
     @ExcelProperty("是否已上报")
     private Integer isReported;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentSaveReqVO.java

@@ -33,6 +33,9 @@ public class BusinessSubParentSampleAssessmentSaveReqVO {
     @Schema(description = "判定状态,in_progress-进行中 normal-正常", example = "1")
     private String assessmentStatus;
     
+    @Schema(description = "复测次数")
+    private Integer retestCount;
+
     @Schema(description = "是否已上报")
     private Integer isReported;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentPageReqVO.java

@@ -31,7 +31,10 @@ public class BusinessSubSampleAssessmentPageReqVO extends PageParam {
     @Schema(description = "判定状态,in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "2")
     private String assessmentStatus;
     
-    @Schema(description = "是否复测,1-是，0-否")
+    @Schema(description = "复测次数")
+    private Integer retestCount;
+
+    @Schema(description = "是否复检,1-是，0-否")
     private Integer isRecheck;
 
     @Schema(description = "是否已上报,1-是，0-否")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentProjectExtendRespVO.java

@@ -6,6 +6,9 @@ import lombok.Data;
 @Data
 public class BusinessSubSampleAssessmentProjectExtendRespVO extends BusinessSubSampleAssessmentProjectRespVO {
 	
+	@Schema(description = "复测次数")
+    private Integer retestCount;
+
 	/** 分析方法名称 **/
     @Schema(description = "分析方法名称")
     private String configAssayMethodName;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentRespVO.java

@@ -40,8 +40,11 @@ public class BusinessSubSampleAssessmentRespVO {
     @ExcelProperty("判定状态,in_progress-进行中 normal-正常，exceeds_tolerance-超差")
     private String assessmentStatus;
     
-    @Schema(description = "是否复测,1-是，0-否")
+    @Schema(description = "复测次数")
-    @ExcelProperty("是否复测,1-是，0-否")
+    private Integer retestCount;
+
+    @Schema(description = "是否复检,1-是，0-否")
+    @ExcelProperty("是否复检,1-是，0-否")
     private Integer isRecheck;
 
     @Schema(description = "是否已上报,1-是，0-否")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentSaveReqVO.java

@@ -35,7 +35,10 @@ public class BusinessSubSampleAssessmentSaveReqVO {
     @Schema(description = "判定状态,in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "2")
     private String assessmentStatus;
     
-    @Schema(description = "是否复测,1-是，0-否")
+    @Schema(description = "复测次数")
+    private Integer retestCount;
+
+    @Schema(description = "是否复检,1-是，0-否")
     private Integer isRecheck;
 
     @Schema(description = "是否已上报,1-是，0-否")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleParentRecheckPageReqVO.java

@@ -1,50 +0,0 @@
-package com.zt.plat.module.qms.business.bus.controller.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import com.zt.plat.framework.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-
-import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - 分样复检业务数据分页 Request VO")
-@Data
-public class BusinessSubSampleParentRecheckPageReqVO extends PageParam {
-
-    @Schema(description = "样品ID", example = "19065")
-    private Long sampleId;
-
-    @Schema(description = "样品主样ID", example = "26605")
-    private Long businessBaseSampleId;
-
-    @Schema(description = "样品分样ID", example = "29386")
-    private Long businessSubParentSampleId;
-
-    @Schema(description = "检测方法配置ID", example = "19087")
-    private Long configAssayMethodId;
-
-    @Schema(description = "复检样品主样ID", example = "12742")
-    private Long recheckBusinessBaseSampleId;
-
-    @Schema(description = "复检样品分样ID", example = "24043")
-    private Long recheckBusinessSubParentSampleId;
-
-    @Schema(description = "复检检测方法配置ID", example = "4026")
-    private Long recheckConfigAssayMethodId;
-
-    @Schema(description = "所属部门")
-    private String systemDepartmentCode;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-    @Schema(description = "乐观锁", example = "18382")
-    private Integer updateCount;
-
-    @Schema(description = "备注")
-    private String remark;
-
-}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleParentRetestPageReqVO.java

@@ -0,0 +1,59 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 分样复测业务数据分页 Request VO")
+@Data
+public class BusinessSubSampleParentRetestPageReqVO extends PageParam {
+
+    @Schema(description = "样品ID", example = "28939")
+    private Long sampleId;
+
+    @Schema(description = "样品主样ID", example = "3389")
+    private Long businessBaseSampleId;
+
+    @Schema(description = "样品分样ID", example = "6831")
+    private Long businessSubParentSampleId;
+
+    @Schema(description = "检测方法配置ID", example = "23450")
+    private Long configAssayMethodId;
+
+    @Schema(description = "班组判定数据业务ID", example = "32694")
+    private Long businessSubParentSampleAssessmentId;
+
+    @Schema(description = "复测次数", example = "12365")
+    private Integer retestCount;
+
+    @Schema(description = "复检样品主样ID", example = "23172")
+    private Long retestBusinessBaseSampleId;
+
+    @Schema(description = "复检样品分样ID", example = "11648")
+    private Long retestBusinessSubParentSampleId;
+
+    @Schema(description = "复检检测方法配置ID", example = "7801")
+    private Long retestConfigAssayMethodId;
+
+    @Schema(description = "班组判定数据业务ID", example = "21169")
+    private Long retestBusinessSubParentSampleAssessmentId;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "乐观锁", example = "30845")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleParentRetestRespVO.java

@@ -7,42 +7,54 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
-@Schema(description = "管理后台 - 分样复检业务数据 Response VO")
+@Schema(description = "管理后台 - 分样复测业务数据 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class BusinessSubSampleParentRecheckRespVO {
+public class BusinessSubSampleParentRetestRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4631")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20948")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "样品ID", example = "19065")
+    @Schema(description = "样品ID", example = "28939")
     @ExcelProperty("样品ID")
     private Long sampleId;
 
-    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26605")
+    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3389")
     @ExcelProperty("样品主样ID")
     private Long businessBaseSampleId;
 
-    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29386")
+    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6831")
     @ExcelProperty("样品分样ID")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19087")
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23450")
     @ExcelProperty("检测方法配置ID")
     private Long configAssayMethodId;
 
-    @Schema(description = "复检样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12742")
+    @Schema(description = "班组判定数据业务ID", example = "32694")
+    @ExcelProperty("班组判定数据业务ID")
+    private Long businessSubParentSampleAssessmentId;
+
+    @Schema(description = "复测次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "12365")
+    @ExcelProperty("复测次数")
+    private Integer retestCount;
+
+    @Schema(description = "复检样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23172")
     @ExcelProperty("复检样品主样ID")
-    private Long recheckBusinessBaseSampleId;
+    private Long retestBusinessBaseSampleId;
 
-    @Schema(description = "复检样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24043")
+    @Schema(description = "复检样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11648")
     @ExcelProperty("复检样品分样ID")
-    private Long recheckBusinessSubParentSampleId;
+    private Long retestBusinessSubParentSampleId;
 
-    @Schema(description = "复检检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4026")
+    @Schema(description = "复检检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7801")
     @ExcelProperty("复检检测方法配置ID")
-    private Long recheckConfigAssayMethodId;
+    private Long retestConfigAssayMethodId;
+
+    @Schema(description = "班组判定数据业务ID", example = "21169")
+    @ExcelProperty("班组判定数据业务ID")
+    private Long retestBusinessSubParentSampleAssessmentId;
 
     @Schema(description = "所属部门")
     @ExcelProperty("所属部门")
@@ -52,7 +64,7 @@ public class BusinessSubSampleParentRecheckRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "18382")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30845")
     @ExcelProperty("乐观锁")
     private Integer updateCount;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleParentRetestSaveReqVO.java

@@ -5,44 +5,54 @@ import lombok.*;
 import java.util.*;
 import jakarta.validation.constraints.*;
 
-@Schema(description = "管理后台 - 分样复检业务数据新增/修改 Request VO")
+@Schema(description = "管理后台 - 分样复测业务数据新增/修改 Request VO")
 @Data
-public class BusinessSubSampleParentRecheckSaveReqVO {
+public class BusinessSubSampleParentRetestSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4631")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20948")
     private Long id;
 
-    @Schema(description = "样品ID", example = "19065")
+    @Schema(description = "样品ID", example = "28939")
     private Long sampleId;
 
-    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26605")
+    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3389")
     @NotNull(message = "样品主样ID不能为空")
     private Long businessBaseSampleId;
 
-    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29386")
+    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6831")
     @NotNull(message = "样品分样ID不能为空")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19087")
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23450")
     @NotNull(message = "检测方法配置ID不能为空")
     private Long configAssayMethodId;
 
-    @Schema(description = "复检样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12742")
+    @Schema(description = "班组判定数据业务ID", example = "32694")
+    private Long businessSubParentSampleAssessmentId;
+
+    @Schema(description = "复测次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "12365")
+    @NotNull(message = "复测次数不能为空")
+    private Integer retestCount;
+
+    @Schema(description = "复检样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23172")
     @NotNull(message = "复检样品主样ID不能为空")
-    private Long recheckBusinessBaseSampleId;
+    private Long retestBusinessBaseSampleId;
 
-    @Schema(description = "复检样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24043")
+    @Schema(description = "复检样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11648")
     @NotNull(message = "复检样品分样ID不能为空")
-    private Long recheckBusinessSubParentSampleId;
+    private Long retestBusinessSubParentSampleId;
 
-    @Schema(description = "复检检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4026")
+    @Schema(description = "复检检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7801")
     @NotNull(message = "复检检测方法配置ID不能为空")
-    private Long recheckConfigAssayMethodId;
+    private Long retestConfigAssayMethodId;
+
+    @Schema(description = "班组判定数据业务ID", example = "21169")
+    private Long retestBusinessSubParentSampleAssessmentId;
 
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "18382")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30845")
     @NotNull(message = "乐观锁不能为空")
     private Integer updateCount;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/ModifySampleResultReportingReqVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class ModifySampleResultReportingReqVO {
 
-	private String businessSubParentSampleAssessmentIds;
+	private String businessSubParentSampleAssessmentProjectIds;
 	
 	private String businessSubSampleAssessmentIds;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/NoReportSubParentSampleAssessmentRespVO.java

@@ -7,6 +7,8 @@ import lombok.Data;
 @Data
 public class NoReportSubParentSampleAssessmentRespVO {
 	
+	private Long businessSubParentSampleAssessmentId;
+
     private Long baseSampleId;
 	
 	private Long businessBaseSampleId;
@@ -25,6 +27,7 @@ public class NoReportSubParentSampleAssessmentRespVO {
     
     private String assayType;
 
+    private Integer retestCount;
     
     private LocalDateTime sampleReceiveTime;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/RecheckSubSampleParentCreateReqVO.java

@@ -19,8 +19,9 @@ public class RecheckSubSampleParentCreateReqVO {
     
     private Long businessSubSampleId;
     
-    
 	private Long configAssayMethodId;
 	
+	private Long businessSubParentSampleAssessmentId;
+
 	List<RecheckSubSampleParentMethodRespVO> recheckProjectList;
 }

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

@@ -140,10 +140,15 @@ public class BusinessAssayTaskDataDO extends BusinessBaseDO {
     @TableField("SMP_FLW_NDE_TM")
     private LocalDateTime sampleFlowNodeTime;
     /**
-    * 分析次数,值为0为分析，大于0为第几次复检
+    * 复检次数
     */
-    @TableField("ANL_CNT")
+    @TableField("RCHK_CNT")
-    private Integer analysisCount;
+    private Integer recheckCount;
+    /**
+    * 复测次数
+    */
+    @TableField("RTST_CNT")
+    private Integer retestCount;
     /**
     * 乐观锁
     */

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubParentSampleAssessmentDO.java

@@ -58,6 +58,11 @@ public class BusinessSubParentSampleAssessmentDO extends BusinessBaseDO {
     @TableField("ASMT_STS")
     private String assessmentStatus;
     /**
+    * 复测次数
+    */
+    @TableField("RTST_CNT")
+    private Integer retestCount;
+    /**
     * 是否已上报
     */
     @TableField("IS_RPOD")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubSampleAssessmentDO.java

@@ -71,11 +71,16 @@ public class BusinessSubSampleAssessmentDO extends BusinessBaseDO {
     @TableField("ASMT_STS")
     private String assessmentStatus;
     /**
-    * 是否复测,1-是，0-否
+    * 是否复检,1-是，0-否
     */
     @TableField("IS_RCHK")
     private Integer isRecheck;
     /**
+    * 复测次数
+    */
+    @TableField("RTST_CNT")
+    private Integer retestCount;
+    /**
     * 是否已上报,1-是，0-否
     */
     @TableField("IS_RPOD")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubSampleParentRetestDO.java

@@ -7,12 +7,12 @@ import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 /**
-* 分样复检业务数据 DO
+* 分样复测业务数据 DO
 *
-* @author 后台管理
+* @author 后台管理-1
 */
-@TableName("t_bsn_sb_smp_prn_rchk")
+@TableName("t_bsn_sb_smp_prn_rtst")
-@KeySequence("t_bsn_sb_smp_prn_rchk_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@KeySequence("t_bsn_sb_smp_prn_rtst_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -22,7 +22,7 @@ import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 /**
 * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
 */
-public class BusinessSubSampleParentRecheckDO extends BusinessBaseDO {
+public class BusinessSubSampleParentRetestDO extends BusinessBaseDO {
 
 
 
@@ -52,20 +52,35 @@ public class BusinessSubSampleParentRecheckDO extends BusinessBaseDO {
     @TableField("CFG_ASY_MTHD_ID")
     private Long configAssayMethodId;
     /**
+    * 班组判定数据业务ID
+    */
+    @TableField("BSN_SB_PRN_SMP_ASMT_ID")
+    private Long businessSubParentSampleAssessmentId;
+    /**
+    * 复测次数
+    */
+    @TableField("RTST_CNT")
+    private Integer retestCount;
+    /**
     * 复检样品主样ID
     */
-    @TableField("RCHK_BSN_BSE_SMP_ID")
+    @TableField("RTST_BSN_BSE_SMP_ID")
-    private Long recheckBusinessBaseSampleId;
+    private Long retestBusinessBaseSampleId;
     /**
     * 复检样品分样ID
     */
-    @TableField("RCHK_BSN_SB_PRN_SMP_ID")
+    @TableField("RTST_BSN_SB_PRN_SMP_ID")
-    private Long recheckBusinessSubParentSampleId;
+    private Long retestBusinessSubParentSampleId;
     /**
     * 复检检测方法配置ID
     */
-    @TableField("RCHK_CFG_ASY_MTHD_ID")
+    @TableField("RTST_CFG_ASY_MTHD_ID")
-    private Long recheckConfigAssayMethodId;
+    private Long retestConfigAssayMethodId;
+    /**
+    * 班组判定数据业务ID
+    */
+    @TableField("RTST_BSN_SB_PRN_SMP_ASMT_ID")
+    private Long retestBusinessSubParentSampleAssessmentId;
     /**
     * 所属部门
     */

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayProjectDataMapper.java

@@ -6,7 +6,6 @@ import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayParameterDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayProjectDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
@@ -118,7 +117,8 @@ public interface BusinessAssayProjectDataMapper extends BaseMapperX<BusinessAssa
 				.selectAs(DictionaryProjectDO::getSimpleName, BusinessAssayProjectDataExtendRespVO::getSimpleName)
 				.selectAs(DictionaryProjectDO::getShowName, BusinessAssayProjectDataExtendRespVO::getShowName)
 				.selectAs(BusinessAssayTaskDataDO::getAssayOperator, BusinessAssayProjectDataExtendRespVO::getAssayOperator)
-				.selectAs(BusinessAssayTaskDataDO::getAnalysisCount, BusinessAssayProjectDataExtendRespVO::getAnalysisCount)
+				.selectAs(BusinessAssayTaskDataDO::getRecheckCount, BusinessAssayProjectDataExtendRespVO::getRecheckCount)
+				.selectAs(BusinessAssayTaskDataDO::getRetestCount, BusinessAssayProjectDataExtendRespVO::getRetestCount)
 				.selectAs(BusinessAssayTaskDataDO::getBusinessBaseSampleId, BusinessAssayProjectDataExtendRespVO::getBusinessBaseSampleId)
 				.selectAs(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, BusinessAssayProjectDataExtendRespVO::getBusinessSubParentSampleId)
 				.selectAs(BusinessAssayTaskDataDO::getBusinessSubSampleId, BusinessAssayProjectDataExtendRespVO::getBusinessSubSampleId)
@@ -137,7 +137,8 @@ public interface BusinessAssayProjectDataMapper extends BaseMapperX<BusinessAssa
 				.selectAs(DictionaryProjectDO::getSimpleName, BusinessAssayProjectDataExtendRespVO::getSimpleName)
 				.selectAs(DictionaryProjectDO::getShowName, BusinessAssayProjectDataExtendRespVO::getShowName)
 				.selectAs(BusinessAssayTaskDataDO::getAssayOperator, BusinessAssayProjectDataExtendRespVO::getAssayOperator)
-				.selectAs(BusinessAssayTaskDataDO::getAnalysisCount, BusinessAssayProjectDataExtendRespVO::getAnalysisCount)
+				.selectAs(BusinessAssayTaskDataDO::getRecheckCount, BusinessAssayProjectDataExtendRespVO::getRecheckCount)
+				.selectAs(BusinessAssayTaskDataDO::getRetestCount, BusinessAssayProjectDataExtendRespVO::getRetestCount)
 				.selectAs(BusinessAssayTaskDataDO::getBusinessBaseSampleId, BusinessAssayProjectDataExtendRespVO::getBusinessBaseSampleId)
 				.selectAs(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, BusinessAssayProjectDataExtendRespVO::getBusinessSubParentSampleId)
 				.selectAs(BusinessAssayTaskDataDO::getBusinessSubSampleId, BusinessAssayProjectDataExtendRespVO::getBusinessSubSampleId)

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

@@ -115,8 +115,11 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
     	if (ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()) && ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()[1])) {
     		mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getSampleFlowNodeTime, reqVO.getSampleFlowNodeTime()[0], reqVO.getSampleFlowNodeTime()[1]);
 		}
-    	if (ObjectUtil.isNotEmpty(reqVO.getAnalysisCount())) {
+    	if (ObjectUtil.isNotEmpty(reqVO.getRecheckCount())) {
-    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAnalysisCount, reqVO.getAnalysisCount());
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getRecheckCount, reqVO.getRecheckCount());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getRetestCount())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getRetestCount, reqVO.getRetestCount());
 		}
     	if (ObjectUtil.isNotEmpty(reqVO.getUpdateCount())) {
     		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getUpdateCount, reqVO.getUpdateCount());
@@ -134,7 +137,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         if (ObjectUtil.isNotEmpty(reqVO.getSampleStatus())) {
     		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getSampleStatus());
 		}
-        mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getSampleFlowNodeTime);
+        mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getSampleFlowNodeTime).orderByAsc(BusinessSubSampleDO::getSampleAssayCode);
 		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, mpjLambdaWrapper);
     }
 
@@ -218,8 +221,11 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
     	if (ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()) && ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()[1])) {
     		mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getSampleFlowNodeTime, reqVO.getSampleFlowNodeTime()[0], reqVO.getSampleFlowNodeTime()[1]);
 		}
-    	if (ObjectUtil.isNotEmpty(reqVO.getAnalysisCount())) {
+    	if (ObjectUtil.isNotEmpty(reqVO.getRecheckCount())) {
-    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAnalysisCount, reqVO.getAnalysisCount());
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getRecheckCount, reqVO.getRecheckCount());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getRetestCount())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getRetestCount, reqVO.getRetestCount());
 		}
     	if (ObjectUtil.isNotEmpty(reqVO.getUpdateCount())) {
     		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getUpdateCount, reqVO.getUpdateCount());
@@ -237,7 +243,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         if (ObjectUtil.isNotEmpty(reqVO.getSampleStatus())) {
     		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getSampleStatus());
 		}
-        mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getSampleFlowNodeTime);
+        mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getSampleFlowNodeTime).orderByAsc(BusinessSubSampleDO::getSampleAssayCode);
         return selectJoinPage(reqVO, BusinessAssayTaskDataExtendRespVO.class, mpjLambdaWrapper);
     }
     
@@ -469,22 +475,22 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 	}
 
 	/**
-	 * 查询最大分析次数的检测任务数据
+	 * 查询最大复检次数的检测任务数据
 	 * @param businessSubSampleId 子样id
 	 * @param configAssayMethodId 分析方法
 	 * @return
 	 */
-	default List<BusinessAssayTaskDataDO> selectMaxAnalysisCountByBusinessSubSampleIdAndConfigAssayMethodId(Long businessSubSampleId, Long configAssayMethodId) {
+	default List<BusinessAssayTaskDataDO> selectMaxRecheckCountByBusinessSubSampleIdAndConfigAssayMethodId(Long businessSubSampleId, Long configAssayMethodId) {
-		BusinessAssayTaskDataDO maxAnalysisCount = selectOne(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>()
+		BusinessAssayTaskDataDO maxRecheckCountBusinessAssayTaskData = selectOne(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>()
 				.eq(BusinessAssayTaskDataDO::getBusinessSubSampleId, businessSubSampleId)
 				.eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, configAssayMethodId)
-				.orderByDesc(BusinessAssayTaskDataDO::getAnalysisCount)
+				.orderByDesc(BusinessAssayTaskDataDO::getRecheckCount)
 				.last("LIMIT 1"));
 		
 		return selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>()
 				.eq(BusinessAssayTaskDataDO::getBusinessSubSampleId, businessSubSampleId)
 				.eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, configAssayMethodId)
-				.eq(BusinessAssayTaskDataDO::getAnalysisCount, maxAnalysisCount.getAnalysisCount()));
+				.eq(BusinessAssayTaskDataDO::getRecheckCount, maxRecheckCountBusinessAssayTaskData.getRecheckCount()));
 		
 		
 	}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentMapper.java

@@ -27,6 +27,7 @@ public interface BusinessSubParentSampleAssessmentMapper extends BaseMapperX<Bus
                 .eqIfPresent(BusinessSubParentSampleAssessmentDO::getTaskType, reqVO.getTaskType())
                 .eqIfPresent(BusinessSubParentSampleAssessmentDO::getAssayType, reqVO.getAssayType())
                 .eqIfPresent(BusinessSubParentSampleAssessmentDO::getAssessmentStatus, reqVO.getAssessmentStatus())
+                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getRetestCount, reqVO.getRetestCount())
                 .eqIfPresent(BusinessSubParentSampleAssessmentDO::getIsReported, reqVO.getIsReported())
                 .eqIfPresent(BusinessSubParentSampleAssessmentDO::getReporter, reqVO.getReporter())
                 .betweenIfPresent(BusinessSubParentSampleAssessmentDO::getReportTime, reqVO.getReportTime())

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.java

@@ -7,10 +7,12 @@ import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentProjectDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectDO;
 import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryProjectDO;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -52,17 +54,20 @@ public interface BusinessSubParentSampleAssessmentProjectMapper extends BaseMapp
     
     default List<BusinessSubParentSampleAssessmentProjectExtendRespVO> selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(List<Long> businessSubParentSampleIds, Long configAssayMethodId) {
     	return selectJoinList(BusinessSubParentSampleAssessmentProjectExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubParentSampleAssessmentProjectDO>()
+    			.leftJoin(BusinessSubParentSampleAssessmentDO.class, BusinessSubParentSampleAssessmentDO::getId, BusinessSubParentSampleAssessmentProjectDO::getBusinessSubParentSampleAssessmentId)
     		    .leftJoin(ConfigAssayMethodProjectDO.class, ConfigAssayMethodProjectDO::getId, BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodProjectId)
     			.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessSubParentSampleAssessmentProjectDO::getDictionaryProjectId)
     			.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodId)
     			.selectAll(BusinessSubParentSampleAssessmentProjectDO.class)
+    			.selectAs(BusinessSubParentSampleAssessmentDO::getRetestCount, BusinessSubParentSampleAssessmentProjectExtendRespVO::getRetestCount)
 				.selectAs(ConfigAssayMethodProjectDO::getDictionaryProjectUnit, BusinessSubSampleAssessmentProjectExtendRespVO::getDictionaryProjectUnit)
     			.selectAs(DictionaryProjectDO::getKey, BusinessSubSampleAssessmentProjectExtendRespVO::getDictionaryProjectKey)
 				.selectAs(DictionaryProjectDO::getSimpleName, BusinessSubSampleAssessmentProjectExtendRespVO::getSimpleName)
 				.selectAs(DictionaryProjectDO::getShowName, BusinessSubSampleAssessmentProjectExtendRespVO::getShowName)
 				.selectAs(ConfigAssayMethodDO::getName, BusinessSubSampleAssessmentProjectExtendRespVO::getConfigAssayMethodName)
     			.in(BusinessSubParentSampleAssessmentProjectDO::getBusinessSubParentSampleId, businessSubParentSampleIds)
-    			.eq(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodId, configAssayMethodId));
+    			.eq(BusinessSubParentSampleAssessmentProjectDO::getAssessmentStatus, QmsCommonConstant.NORMAL)
+    			.eq(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));
     }
     
     default List<BusinessSubParentSampleAssessmentProjectDO> selectByConfigAssayMethodId(Long configAssayMethodId) {

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.java

@@ -25,6 +25,7 @@ public interface BusinessSubSampleAssessmentMapper extends BaseMapperX<BusinessS
                 .eqIfPresent(BusinessSubSampleAssessmentDO::getTaskType, reqVO.getTaskType())
                 .eqIfPresent(BusinessSubSampleAssessmentDO::getAssayType, reqVO.getAssayType())
                 .eqIfPresent(BusinessSubSampleAssessmentDO::getAssessmentStatus, reqVO.getAssessmentStatus())
+                .eqIfPresent(BusinessSubSampleAssessmentDO::getRetestCount, reqVO.getRetestCount())
                 .eqIfPresent(BusinessSubSampleAssessmentDO::getIsRecheck, reqVO.getIsRecheck())
                 .eqIfPresent(BusinessSubSampleAssessmentDO::getIsReported, reqVO.getIsReported())
                 .eqIfPresent(BusinessSubSampleAssessmentDO::getReportedStatus, reqVO.getReportedStatus())
@@ -55,10 +56,11 @@ public interface BusinessSubSampleAssessmentMapper extends BaseMapperX<BusinessS
     			.eq(BusinessSubSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));
     }
     
-    default List<BusinessSubSampleAssessmentDO> selectByBusinessSubSampleIdsAndConfigAssayMethodId(List<Long> businessSubSampleIds, Long configAssayMethodId) {
+    default List<BusinessSubSampleAssessmentDO> selectByBusinessSubSampleIdsAndConfigAssayMethodIdAndRetestCount(List<Long> businessSubSampleIds, Long configAssayMethodId, Integer retestCount) {
     	return selectList(new LambdaQueryWrapperX<BusinessSubSampleAssessmentDO>()
     			.in(BusinessSubSampleAssessmentDO::getBusinessSubSampleId, businessSubSampleIds)
-    			.eq(BusinessSubSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));
+    			.eq(BusinessSubSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId)
+    			.eq(BusinessSubSampleAssessmentDO::getRetestCount, retestCount));
     }
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentProjectMapper.java

@@ -4,6 +4,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentProjectDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectDO;
@@ -48,12 +49,31 @@ public interface BusinessSubSampleAssessmentProjectMapper extends BaseMapperX<Bu
                 .orderByDesc(BusinessSubSampleAssessmentProjectDO::getId));
     }
     
-    default List<BusinessSubSampleAssessmentProjectExtendRespVO> selectByBusinessSubParentSampleIdAndConfigAssayMethodId(Long businessSubParentSampleId, Long configAssayMethodId) {
+    default List<BusinessSubSampleAssessmentProjectExtendRespVO> selectByBusinessSubParentSampleIdAndBusinessSubParentSampleAssessmentId(Long businessSubParentSampleId, Long businessSubParentSampleAssessmentId) {
     	return selectJoinList(BusinessSubSampleAssessmentProjectExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubSampleAssessmentProjectDO>()
+				.leftJoin(BusinessSubSampleAssessmentDO.class, BusinessSubSampleAssessmentDO::getId, BusinessSubSampleAssessmentProjectDO::getBusinessSubSampleAssessmentId)
 				.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessSubSampleAssessmentProjectDO::getConfigAssayMethodId)
     			.leftJoin(ConfigAssayMethodProjectDO.class, ConfigAssayMethodProjectDO::getId, BusinessSubSampleAssessmentProjectDO::getConfigAssayMethodProjectId)
     			.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessSubSampleAssessmentProjectDO::getDictionaryProjectId)
     			.selectAll(BusinessSubSampleAssessmentProjectDO.class)
+				.selectAs(BusinessSubSampleAssessmentDO::getRetestCount, BusinessSubSampleAssessmentProjectExtendRespVO::getRetestCount)
+				.selectAs(ConfigAssayMethodDO::getName, BusinessSubSampleAssessmentProjectExtendRespVO::getConfigAssayMethodName)
+				.selectAs(ConfigAssayMethodProjectDO::getDictionaryProjectUnit, BusinessSubSampleAssessmentProjectExtendRespVO::getDictionaryProjectUnit)
+    			.selectAs(DictionaryProjectDO::getKey, BusinessSubSampleAssessmentProjectExtendRespVO::getDictionaryProjectKey)
+				.selectAs(DictionaryProjectDO::getSimpleName, BusinessSubSampleAssessmentProjectExtendRespVO::getSimpleName)
+				.selectAs(DictionaryProjectDO::getShowName, BusinessSubSampleAssessmentProjectExtendRespVO::getShowName)
+				.eq(BusinessSubSampleAssessmentProjectDO::getBusinessSubParentSampleId, businessSubParentSampleId)
+				.eq(BusinessSubSampleAssessmentDO::getBusinessSubParentSampleAssessmentId, businessSubParentSampleAssessmentId));
+    }
+    
+    default List<BusinessSubSampleAssessmentProjectExtendRespVO> selectByBusinessSubParentSampleIdAndConfigAssayMethodId(Long businessSubParentSampleId, Long configAssayMethodId) {
+    	return selectJoinList(BusinessSubSampleAssessmentProjectExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubSampleAssessmentProjectDO>()
+				.leftJoin(BusinessSubSampleAssessmentDO.class, BusinessSubSampleAssessmentDO::getId, BusinessSubSampleAssessmentProjectDO::getBusinessSubSampleAssessmentId)
+				.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessSubSampleAssessmentProjectDO::getConfigAssayMethodId)
+    			.leftJoin(ConfigAssayMethodProjectDO.class, ConfigAssayMethodProjectDO::getId, BusinessSubSampleAssessmentProjectDO::getConfigAssayMethodProjectId)
+    			.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessSubSampleAssessmentProjectDO::getDictionaryProjectId)
+    			.selectAll(BusinessSubSampleAssessmentProjectDO.class)
+				.selectAs(BusinessSubSampleAssessmentDO::getRetestCount, BusinessSubSampleAssessmentProjectExtendRespVO::getRetestCount)
 				.selectAs(ConfigAssayMethodDO::getName, BusinessSubSampleAssessmentProjectExtendRespVO::getConfigAssayMethodName)
 				.selectAs(ConfigAssayMethodProjectDO::getDictionaryProjectUnit, BusinessSubSampleAssessmentProjectExtendRespVO::getDictionaryProjectUnit)
     			.selectAs(DictionaryProjectDO::getKey, BusinessSubSampleAssessmentProjectExtendRespVO::getDictionaryProjectKey)
@@ -65,10 +85,12 @@ public interface BusinessSubSampleAssessmentProjectMapper extends BaseMapperX<Bu
 
 	default List<BusinessSubSampleAssessmentProjectExtendRespVO> selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(List<Long> businessSubParentSampleIds, Long configAssayMethodId) {
 		return selectJoinList(BusinessSubSampleAssessmentProjectExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubSampleAssessmentProjectDO>()
+				.leftJoin(BusinessSubSampleAssessmentDO.class, BusinessSubSampleAssessmentDO::getId, BusinessSubSampleAssessmentProjectDO::getBusinessSubSampleAssessmentId)
 				.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessSubSampleAssessmentProjectDO::getConfigAssayMethodId)
 				.leftJoin(ConfigAssayMethodProjectDO.class, ConfigAssayMethodProjectDO::getId, BusinessSubSampleAssessmentProjectDO::getConfigAssayMethodProjectId)
 				.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessSubSampleAssessmentProjectDO::getDictionaryProjectId)
 				.selectAll(BusinessSubSampleAssessmentProjectDO.class)
+				.selectAs(BusinessSubSampleAssessmentDO::getRetestCount, BusinessSubSampleAssessmentProjectExtendRespVO::getRetestCount)
 				.selectAs(ConfigAssayMethodDO::getName, BusinessSubSampleAssessmentProjectExtendRespVO::getConfigAssayMethodName)
 				.selectAs(ConfigAssayMethodProjectDO::getDictionaryProjectUnit, BusinessSubSampleAssessmentProjectExtendRespVO::getDictionaryProjectUnit)
 				.selectAs(DictionaryProjectDO::getKey, BusinessSubSampleAssessmentProjectExtendRespVO::getDictionaryProjectKey)

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleParentRecheckMapper.java

@@ -1,42 +0,0 @@
-package com.zt.plat.module.qms.business.bus.dal.mapper;
-
-import java.util.*;
-
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.zt.plat.module.qms.business.bus.controller.vo.*;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleParentRecheckDO;
-import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 分样复检业务数据 Mapper
- *
- * @author 后台管理
- */
-@Mapper
-public interface BusinessSubSampleParentRecheckMapper extends BaseMapperX<BusinessSubSampleParentRecheckDO> {
-
-    default PageResult<BusinessSubSampleParentRecheckDO> selectPage(BusinessSubSampleParentRecheckPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<BusinessSubSampleParentRecheckDO>()
-                .eqIfPresent(BusinessSubSampleParentRecheckDO::getSampleId, reqVO.getSampleId())
-                .eqIfPresent(BusinessSubSampleParentRecheckDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
-                .eqIfPresent(BusinessSubSampleParentRecheckDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
-                .eqIfPresent(BusinessSubSampleParentRecheckDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
-                .eqIfPresent(BusinessSubSampleParentRecheckDO::getRecheckBusinessBaseSampleId, reqVO.getRecheckBusinessBaseSampleId())
-                .eqIfPresent(BusinessSubSampleParentRecheckDO::getRecheckBusinessSubParentSampleId, reqVO.getRecheckBusinessSubParentSampleId())
-                .eqIfPresent(BusinessSubSampleParentRecheckDO::getRecheckConfigAssayMethodId, reqVO.getRecheckConfigAssayMethodId())
-                .eqIfPresent(BusinessSubSampleParentRecheckDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
-                .betweenIfPresent(BusinessSubSampleParentRecheckDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(BusinessSubSampleParentRecheckDO::getUpdateCount, reqVO.getUpdateCount())
-                .eqIfPresent(BusinessSubSampleParentRecheckDO::getRemark, reqVO.getRemark())
-                .orderByDesc(BusinessSubSampleParentRecheckDO::getId));
-    }
-    
-    default List<BusinessSubSampleParentRecheckDO> selectByRecheckBusinessSubParentSampleIdsAndRecheckConfigAssayMethodId(List<Long> recheckBusinessSubParentSampleIds, Long recheckConfigAssayMethodId) {
-    	return selectList(new LambdaQueryWrapperX<BusinessSubSampleParentRecheckDO>()
-    			.in(BusinessSubSampleParentRecheckDO::getRecheckBusinessSubParentSampleId, recheckBusinessSubParentSampleIds)
-    			.eq(BusinessSubSampleParentRecheckDO::getRecheckConfigAssayMethodId, recheckConfigAssayMethodId));
-    }
-
-}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleParentRetestMapper.java

@@ -0,0 +1,45 @@
+package com.zt.plat.module.qms.business.bus.dal.mapper;
+
+import java.util.*;
+
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleParentRetestDO;
+import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 分样复测业务数据 Mapper
+ *
+ * @author 后台管理-1
+ */
+@Mapper
+public interface BusinessSubSampleParentRetestMapper extends BaseMapperX<BusinessSubSampleParentRetestDO> {
+
+    default PageResult<BusinessSubSampleParentRetestDO> selectPage(BusinessSubSampleParentRetestPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<BusinessSubSampleParentRetestDO>()
+                .eqIfPresent(BusinessSubSampleParentRetestDO::getSampleId, reqVO.getSampleId())
+                .eqIfPresent(BusinessSubSampleParentRetestDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
+                .eqIfPresent(BusinessSubSampleParentRetestDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
+                .eqIfPresent(BusinessSubSampleParentRetestDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
+                .eqIfPresent(BusinessSubSampleParentRetestDO::getBusinessSubParentSampleAssessmentId, reqVO.getBusinessSubParentSampleAssessmentId())
+                .eqIfPresent(BusinessSubSampleParentRetestDO::getRetestCount, reqVO.getRetestCount())
+                .eqIfPresent(BusinessSubSampleParentRetestDO::getRetestBusinessBaseSampleId, reqVO.getRetestBusinessBaseSampleId())
+                .eqIfPresent(BusinessSubSampleParentRetestDO::getRetestBusinessSubParentSampleId, reqVO.getRetestBusinessSubParentSampleId())
+                .eqIfPresent(BusinessSubSampleParentRetestDO::getRetestConfigAssayMethodId, reqVO.getRetestConfigAssayMethodId())
+                .eqIfPresent(BusinessSubSampleParentRetestDO::getRetestBusinessSubParentSampleAssessmentId, reqVO.getRetestBusinessSubParentSampleAssessmentId())
+                .eqIfPresent(BusinessSubSampleParentRetestDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+                .betweenIfPresent(BusinessSubSampleParentRetestDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(BusinessSubSampleParentRetestDO::getUpdateCount, reqVO.getUpdateCount())
+                .eqIfPresent(BusinessSubSampleParentRetestDO::getRemark, reqVO.getRemark())
+                .orderByDesc(BusinessSubSampleParentRetestDO::getId));
+    }
+
+	default List<BusinessSubSampleParentRetestDO> selectByRetestBusinessSubParentSampleIdsAndRetestConfigAssayMethodId(List<Long> retestBusinessSubParentSampleIds, Long retestConfigAssayMethodId) {
+		return selectList(new LambdaQueryWrapperX<BusinessSubSampleParentRetestDO>()
+				.in(BusinessSubSampleParentRetestDO::getRetestBusinessSubParentSampleId, retestBusinessSubParentSampleIds)
+				.eq(BusinessSubSampleParentRetestDO::getRetestConfigAssayMethodId, retestConfigAssayMethodId));
+	}
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleParentRecheckService.java

@@ -1,62 +0,0 @@
-package com.zt.plat.module.qms.business.bus.service;
-
-import java.util.*;
-import jakarta.validation.*;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.module.qms.business.bus.controller.vo.*;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleParentRecheckDO;
-import com.zt.plat.framework.common.pojo.PageParam;
-
-/**
- * 分样复检业务数据 Service 接口
- *
- * @author 后台管理
- */
-public interface BusinessSubSampleParentRecheckService {
-
-    /**
-     * 创建分样复检业务数据
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    BusinessSubSampleParentRecheckRespVO createBusinessSubSampleParentRecheck(@Valid BusinessSubSampleParentRecheckSaveReqVO createReqVO);
-
-    /**
-     * 更新分样复检业务数据
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateBusinessSubSampleParentRecheck(@Valid BusinessSubSampleParentRecheckSaveReqVO updateReqVO);
-
-    /**
-     * 删除分样复检业务数据
-     *
-     * @param id 编号
-     */
-    void deleteBusinessSubSampleParentRecheck(Long id);
-
-    /**
-    * 批量删除分样复检业务数据
-    *
-    * @param ids 编号
-    */
-    void deleteBusinessSubSampleParentRecheckListByIds(List<Long> ids);
-
-    /**
-     * 获得分样复检业务数据
-     *
-     * @param id 编号
-     * @return 分样复检业务数据
-     */
-    BusinessSubSampleParentRecheckDO getBusinessSubSampleParentRecheck(Long id);
-
-    /**
-     * 获得分样复检业务数据分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 分样复检业务数据分页
-     */
-    PageResult<BusinessSubSampleParentRecheckDO> getBusinessSubSampleParentRecheckPage(BusinessSubSampleParentRecheckPageReqVO pageReqVO);
-
-}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleParentRecheckServiceImpl.java

@@ -1,91 +0,0 @@
-package com.zt.plat.module.qms.business.bus.service;
-
-import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.module.qms.business.bus.controller.vo.*;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleParentRecheckDO;
-import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleParentRecheckMapper;
-
-import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
-import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
-
-/**
- * 分样复检业务数据 Service 实现类
- *
- * @author 后台管理
- */
-@Service
-@Validated
-public class BusinessSubSampleParentRecheckServiceImpl implements BusinessSubSampleParentRecheckService {
-
-    @Resource
-    private BusinessSubSampleParentRecheckMapper businessSubSampleParentRecheckMapper;
-
-    @Override
-    public BusinessSubSampleParentRecheckRespVO createBusinessSubSampleParentRecheck(BusinessSubSampleParentRecheckSaveReqVO createReqVO) {
-        // 插入
-        BusinessSubSampleParentRecheckDO businessSubSampleParentRecheck = BeanUtils.toBean(createReqVO, BusinessSubSampleParentRecheckDO.class);
-        businessSubSampleParentRecheckMapper.insert(businessSubSampleParentRecheck);
-        // 返回
-        return BeanUtils.toBean(businessSubSampleParentRecheck, BusinessSubSampleParentRecheckRespVO.class);
-    }
-
-    @Override
-    public void updateBusinessSubSampleParentRecheck(BusinessSubSampleParentRecheckSaveReqVO updateReqVO) {
-        // 校验存在
-        validateBusinessSubSampleParentRecheckExists(updateReqVO.getId());
-        // 更新
-        BusinessSubSampleParentRecheckDO updateObj = BeanUtils.toBean(updateReqVO, BusinessSubSampleParentRecheckDO.class);
-        businessSubSampleParentRecheckMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteBusinessSubSampleParentRecheck(Long id) {
-        // 校验存在
-        validateBusinessSubSampleParentRecheckExists(id);
-        // 删除
-        businessSubSampleParentRecheckMapper.deleteById(id);
-    }
-
-    @Override
-        public void deleteBusinessSubSampleParentRecheckListByIds(List<Long> ids) {
-        // 校验存在
-        validateBusinessSubSampleParentRecheckExists(ids);
-        // 删除
-        businessSubSampleParentRecheckMapper.deleteByIds(ids);
-        }
-
-    private void validateBusinessSubSampleParentRecheckExists(List<Long> ids) {
-        List<BusinessSubSampleParentRecheckDO> list = businessSubSampleParentRecheckMapper.selectByIds(ids);
-        if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
-            throw exception(BUSINESS_SUB_SAMPLE_PARENT_RECHECK_NOT_EXISTS);
-        }
-    }
-
-    private void validateBusinessSubSampleParentRecheckExists(Long id) {
-        if (businessSubSampleParentRecheckMapper.selectById(id) == null) {
-            throw exception(BUSINESS_SUB_SAMPLE_PARENT_RECHECK_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public BusinessSubSampleParentRecheckDO getBusinessSubSampleParentRecheck(Long id) {
-        return businessSubSampleParentRecheckMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<BusinessSubSampleParentRecheckDO> getBusinessSubSampleParentRecheckPage(BusinessSubSampleParentRecheckPageReqVO pageReqVO) {
-        return businessSubSampleParentRecheckMapper.selectPage(pageReqVO);
-    }
-
-}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleParentRetestService.java

@@ -0,0 +1,62 @@
+package com.zt.plat.module.qms.business.bus.service;
+
+import java.util.*;
+import jakarta.validation.*;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleParentRetestDO;
+import com.zt.plat.framework.common.pojo.PageParam;
+
+/**
+ * 分样复测业务数据 Service 接口
+ *
+ * @author 后台管理-1
+ */
+public interface BusinessSubSampleParentRetestService {
+
+    /**
+     * 创建分样复测业务数据
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    BusinessSubSampleParentRetestRespVO createBusinessSubSampleParentRetest(@Valid BusinessSubSampleParentRetestSaveReqVO createReqVO);
+
+    /**
+     * 更新分样复测业务数据
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateBusinessSubSampleParentRetest(@Valid BusinessSubSampleParentRetestSaveReqVO updateReqVO);
+
+    /**
+     * 删除分样复测业务数据
+     *
+     * @param id 编号
+     */
+    void deleteBusinessSubSampleParentRetest(Long id);
+
+    /**
+    * 批量删除分样复测业务数据
+    *
+    * @param ids 编号
+    */
+    void deleteBusinessSubSampleParentRetestListByIds(List<Long> ids);
+
+    /**
+     * 获得分样复测业务数据
+     *
+     * @param id 编号
+     * @return 分样复测业务数据
+     */
+    BusinessSubSampleParentRetestDO getBusinessSubSampleParentRetest(Long id);
+
+    /**
+     * 获得分样复测业务数据分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 分样复测业务数据分页
+     */
+    PageResult<BusinessSubSampleParentRetestDO> getBusinessSubSampleParentRetestPage(BusinessSubSampleParentRetestPageReqVO pageReqVO);
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleParentRetestServiceImpl.java

@@ -0,0 +1,91 @@
+package com.zt.plat.module.qms.business.bus.service;
+
+import cn.hutool.core.collection.CollUtil;
+import org.springframework.stereotype.Service;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleParentRetestDO;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleParentRetestMapper;
+
+import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
+import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
+import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
+
+/**
+ * 分样复测业务数据 Service 实现类
+ *
+ * @author 后台管理-1
+ */
+@Service
+@Validated
+public class BusinessSubSampleParentRetestServiceImpl implements BusinessSubSampleParentRetestService {
+
+    @Resource
+    private BusinessSubSampleParentRetestMapper businessSubSampleParentRetestMapper;
+
+    @Override
+    public BusinessSubSampleParentRetestRespVO createBusinessSubSampleParentRetest(BusinessSubSampleParentRetestSaveReqVO createReqVO) {
+        // 插入
+        BusinessSubSampleParentRetestDO businessSubSampleParentRetest = BeanUtils.toBean(createReqVO, BusinessSubSampleParentRetestDO.class);
+        businessSubSampleParentRetestMapper.insert(businessSubSampleParentRetest);
+        // 返回
+        return BeanUtils.toBean(businessSubSampleParentRetest, BusinessSubSampleParentRetestRespVO.class);
+    }
+
+    @Override
+    public void updateBusinessSubSampleParentRetest(BusinessSubSampleParentRetestSaveReqVO updateReqVO) {
+        // 校验存在
+        validateBusinessSubSampleParentRetestExists(updateReqVO.getId());
+        // 更新
+        BusinessSubSampleParentRetestDO updateObj = BeanUtils.toBean(updateReqVO, BusinessSubSampleParentRetestDO.class);
+        businessSubSampleParentRetestMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteBusinessSubSampleParentRetest(Long id) {
+        // 校验存在
+        validateBusinessSubSampleParentRetestExists(id);
+        // 删除
+        businessSubSampleParentRetestMapper.deleteById(id);
+    }
+
+    @Override
+        public void deleteBusinessSubSampleParentRetestListByIds(List<Long> ids) {
+        // 校验存在
+        validateBusinessSubSampleParentRetestExists(ids);
+        // 删除
+        businessSubSampleParentRetestMapper.deleteByIds(ids);
+        }
+
+    private void validateBusinessSubSampleParentRetestExists(List<Long> ids) {
+        List<BusinessSubSampleParentRetestDO> list = businessSubSampleParentRetestMapper.selectByIds(ids);
+        if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
+            throw exception(BUSINESS_SUB_SAMPLE_PARENT_RETEST_NOT_EXISTS);
+        }
+    }
+
+    private void validateBusinessSubSampleParentRetestExists(Long id) {
+        if (businessSubSampleParentRetestMapper.selectById(id) == null) {
+            throw exception(BUSINESS_SUB_SAMPLE_PARENT_RETEST_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public BusinessSubSampleParentRetestDO getBusinessSubSampleParentRetest(Long id) {
+        return businessSubSampleParentRetestMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<BusinessSubSampleParentRetestDO> getBusinessSubSampleParentRetestPage(BusinessSubSampleParentRetestPageReqVO pageReqVO) {
+        return businessSubSampleParentRetestMapper.selectPage(pageReqVO);
+    }
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java

@@ -256,7 +256,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 
 				{
 					put("title", businessAssayProjectDataExtendRespVO.getSampleAssayCode() + "(" + businessAssayProjectDataExtendRespVO.getAssayOperator() + ")");
-					put("field", businessAssayProjectDataExtendRespVO.getBusinessAssayTaskDataId() + ";" + businessAssayProjectDataExtendRespVO.getBusinessSubSampleId() + ";" + businessAssayProjectDataExtendRespVO.getAnalysisCount());
+					put("field", businessAssayProjectDataExtendRespVO.getBusinessAssayTaskDataId() + ";" + businessAssayProjectDataExtendRespVO.getBusinessSubSampleId() + ";" + businessAssayProjectDataExtendRespVO.getRecheckCount());
 				}});
 			}
 			
@@ -271,7 +271,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 			Map<String, Object> businessSubSampleAssessmentMap = BeanUtil.beanToMap(businessSubSampleAssessment);
 			List<BusinessAssayProjectDataExtendRespVO> businessAssayProjectDataSingleList = businessAssayProjectDataList.stream().filter(f -> f.getDictionaryProjectId().equals(businessSubSampleAssessment.getDictionaryProjectId())).collect(Collectors.toList());
 			for (BusinessAssayProjectDataExtendRespVO businessAssayProjectDataExtendRespVO : businessAssayProjectDataSingleList) {
-				businessSubSampleAssessmentMap.put(businessAssayProjectDataExtendRespVO.getBusinessAssayTaskDataId() + ";" + businessAssayProjectDataExtendRespVO.getBusinessSubSampleId() + ";" + businessAssayProjectDataExtendRespVO.getAnalysisCount(), businessAssayProjectDataExtendRespVO.getValue());
+				businessSubSampleAssessmentMap.put(businessAssayProjectDataExtendRespVO.getBusinessAssayTaskDataId() + ";" + businessAssayProjectDataExtendRespVO.getBusinessSubSampleId() + ";" + businessAssayProjectDataExtendRespVO.getRecheckCount(), businessAssayProjectDataExtendRespVO.getValue());
 			}
 			dataList.add(businessSubSampleAssessmentMap);
 		}
@@ -481,7 +481,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 	            		projectSymbol = ep.getSymbol();
 					}
 //	            	newMap.put(ep.getName(), ep.getValue());
-	            	newMap.put("projectName", ep.getName());
+	            	newMap.put("projectName", ep.getShowName());
 	            	newMap.put("projectValue", ep.getValue());
 	            	newMap.put("projectSymbol", projectSymbol);
 	            	newMap.put("projectUnit", ep.getUnit());
@@ -536,7 +536,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 	            		projectSymbol = ep.getSymbol();
 					}
 //	            	newMap.put(ep.getName(), ep.getValue());
-	            	newMap.put("projectName", ep.getName());
+	            	newMap.put("projectName", ep.getShowName());
 	            	newMap.put("projectValue", ep.getValue());
 	            	newMap.put("projectSymbol", projectSymbol);
 	            	newMap.put("projectUnit", ep.getUnit());
@@ -580,7 +580,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 					}
 	            	//map.put(p.getName(), p.getValue());
 	            	HashedMap<String, Object> newMap = SerializationUtils.clone(map);
-	            	newMap.put("projectName", p.getName());
+	            	newMap.put("projectName", p.getShowName());
 	            	newMap.put("projectValue", p.getValue());
 	            	newMap.put("projectSymbol", projectSymbol);
 	            	newMap.put("projectUnit", p.getUnit());
@@ -629,8 +629,9 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 			
 			//查询分析任务明细
 			List<BusinessAssayTaskDataDO> businessAssayTaskDataDOList = businessAssayTaskDataMapper.selectByBusinessAssayTaskId(businessAssayTaskId);
+			Integer recheckCount = businessAssayTaskDataDOList.get(0).getRecheckCount();
 			List<Long> businessSubSampleIdList = businessAssayTaskDataDOList.stream().map(m -> m.getBusinessSubSampleId()).distinct().collect(Collectors.toList());
-			List<BusinessSubSampleAssessmentDO> businessSubSampleAssessmentDOList = businessSubSampleAssessmentMapper.selectByBusinessSubSampleIdsAndConfigAssayMethodId(businessSubSampleIdList, businessAssayTaskDO.getConfigAssayMethodId());
+			List<BusinessSubSampleAssessmentDO> businessSubSampleAssessmentDOList = businessSubSampleAssessmentMapper.selectByBusinessSubSampleIdsAndConfigAssayMethodIdAndRetestCount(businessSubSampleIdList, businessAssayTaskDO.getConfigAssayMethodId(), recheckCount);
 			//根据子样分组
 			Map<Long, List<BusinessAssayTaskDataDO>> businessAssayTaskDataDOMap = businessAssayTaskDataDOList.stream().collect(Collectors.groupingBy(BusinessAssayTaskDataDO::getBusinessSubSampleId));
 			//循环分组
@@ -1033,7 +1034,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 		BusinessSubSampleAssessmentDO businessSubSampleAssessmentDO = businessSubSampleAssessmentMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessSubSampleId, configAssayMethodId);
 
 		BusinessAssayTaskDataDO newBusinessAssayTaskDataDO = null;
-		List<BusinessAssayTaskDataDO> businessAssayTaskDataDOList = businessAssayTaskDataMapper.selectMaxAnalysisCountByBusinessSubSampleIdAndConfigAssayMethodId(businessSubSampleId,	configAssayMethodId);
+		List<BusinessAssayTaskDataDO> businessAssayTaskDataDOList = businessAssayTaskDataMapper.selectMaxRecheckCountByBusinessSubSampleIdAndConfigAssayMethodId(businessSubSampleId,	configAssayMethodId);
 		List<Long> businessAssayTaskDataDOIdList = businessAssayTaskDataDOList.stream().map(m -> m.getId()).collect(Collectors.toList());
 		List<BusinessAssayProjectDataExtendRespVO> businessAssayProjectDataDOList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(businessAssayTaskDataDOIdList);
 		List<Long> businessAssayProjectDataDOIdList = businessAssayProjectDataDOList.stream().map(m -> m.getId()).collect(Collectors.toList());
@@ -1055,7 +1056,8 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 			newBusinessAssayTaskDataDO.setSampleFlowNodeTime(LocalDateTime.now());
 			newBusinessAssayTaskDataDO.setAssayDepartmentId(businessAssayTaskDataDO.getAssayDepartmentId());
 			newBusinessAssayTaskDataDO.setAssayDepartmentName(businessAssayTaskDataDO.getAssayDepartmentName());
-			newBusinessAssayTaskDataDO.setAnalysisCount(businessAssayTaskDataDO.getAnalysisCount() + 1);
+			newBusinessAssayTaskDataDO.setRecheckCount(businessAssayTaskDataDO.getRecheckCount() + 1);
+			newBusinessAssayTaskDataDO.setRetestCount(businessAssayTaskDataDO.getRetestCount());
 			newBusinessAssayTaskDataDO.setAssayProject(businessAssayTaskDataDO.getAssayProject());
 			
 			List<BusinessAssayProjectDataExtendRespVO> businessAssayProjectDataList = businessAssayProjectDataDOList.stream().filter(f -> f.getBusinessAssayTaskDataId().equals(businessAssayTaskDataDO.getId())).collect(Collectors.toList());

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java

@@ -52,7 +52,7 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAnaly
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentProjectDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleParentRecheckDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleParentRetestDO;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayParameterDataMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayProjectDataMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayReportDataMapper;
@@ -67,7 +67,7 @@ import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleAnalysisG
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleAssessmentMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleAssessmentProjectMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleMapper;
-import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleParentRecheckMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleParentRetestMapper;
 import com.zt.plat.module.qms.business.bus.liteflow.param.SampleFlowInfo;
 import com.zt.plat.module.qms.business.bus.liteflow.param.SampleFlowParam;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectExtendRespVO;
@@ -175,7 +175,7 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 		List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentExtendRespVOList = businessSubSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(businessSubParentSampleIds, reqVO.getConfigAssayMethodId());
 		
 		//获取复测业务数据
-		List<BusinessSubSampleParentRecheckDO> businessSubSampleParentRecheckDOList = businessSubSampleParentRecheckMapper.selectByRecheckBusinessSubParentSampleIdsAndRecheckConfigAssayMethodId(businessSubParentSampleIds, reqVO.getConfigAssayMethodId());
+		List<BusinessSubSampleParentRetestDO> businessSubSampleParentRecheckDOList = businessSubSampleParentRetestMapper.selectByRetestBusinessSubParentSampleIdsAndRetestConfigAssayMethodId(businessSubParentSampleIds, reqVO.getConfigAssayMethodId());
 		
 		//循环未上报的样品
 		for (NoReportSubParentSampleAssessmentRespVO noReportSubParentSampleAssessmentRespVO : noReportSubParentSampleAssessmentRespList) {
@@ -183,49 +183,29 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 			String sampleCode = businessSubSampleDOList.stream().filter(f -> f.getBusinessSubParentSampleId().equals(noReportSubParentSampleAssessmentRespVO.getBusinessSubParentSampleId())).map(m -> m.getSampleAssayCode()).distinct().collect(Collectors.joining(" | "));
 			noReportSubParentSampleAssessmentMap.put("sampleCode", sampleCode);
 
+			//报出结果
 			Map<String, Object> subSampleAssessmentBeforeMap = BeanUtil.copyProperties(noReportSubParentSampleAssessmentMap, Map.class);
 			Map<String, Object> subSampleAssessmentMap = BeanUtil.copyProperties(noReportSubParentSampleAssessmentMap, Map.class);
-			List<BusinessSubParentSampleAssessmentProjectExtendRespVO> curBusinessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentDOList.stream().filter(f -> f.getBusinessSubParentSampleId().equals(noReportSubParentSampleAssessmentRespVO.getBusinessSubParentSampleId())).collect(Collectors.toList());
+			List<BusinessSubParentSampleAssessmentProjectExtendRespVO> curBusinessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentDOList.stream().filter(f -> f.getBusinessSubParentSampleId().equals(noReportSubParentSampleAssessmentRespVO.getBusinessSubParentSampleId()) && f.getRetestCount().equals(noReportSubParentSampleAssessmentRespVO.getRetestCount())).collect(Collectors.toList());
+			List<Long> curBusinessSubParentSampleAssessmentDictionaryProjectIdList = curBusinessSubParentSampleAssessmentDOList.stream().map(m -> m.getDictionaryProjectId()).collect(Collectors.toList());
 			noReportSubParentSampleAssessmentMap.put("sampleReceiveTime", noReportSubParentSampleAssessmentRespVO.getSampleReceiveTime());
 			noReportSubParentSampleAssessmentMap.put("configAssayMethodName", "报出结果");
-			StringBuilder businessSubParentSampleAssessmentIds = new StringBuilder();
+			StringBuilder businessSubParentSampleAssessmentProjectIds = new StringBuilder();
-			for (BusinessSubParentSampleAssessmentProjectExtendRespVO businessSubParentSampleAssessmentDO : curBusinessSubParentSampleAssessmentDOList) {
+			for (BusinessSubParentSampleAssessmentProjectExtendRespVO businessSubParentSampleAssessmentProjectDO : curBusinessSubParentSampleAssessmentDOList) {
-				String assessmentValue = businessSubParentSampleAssessmentDO.getAssessmentValue();
+				String assessmentValue = businessSubParentSampleAssessmentProjectDO.getAssessmentValue();
-				if (StringUtils.isNotBlank(businessSubParentSampleAssessmentDO.getSymbol()) && !"=".equals(businessSubParentSampleAssessmentDO.getSymbol())) {//符号不为空，并且不为等于号。结果添加上符号
+				if (StringUtils.isNotBlank(businessSubParentSampleAssessmentProjectDO.getSymbol()) && !"=".equals(businessSubParentSampleAssessmentProjectDO.getSymbol())) {//符号不为空，并且不为等于号。结果添加上符号
-					assessmentValue = businessSubParentSampleAssessmentDO.getSymbol() + assessmentValue;
+					assessmentValue = businessSubParentSampleAssessmentProjectDO.getSymbol() + assessmentValue;
 				}
-				noReportSubParentSampleAssessmentMap.put(businessSubParentSampleAssessmentDO.getSimpleName(), assessmentValue);
+				noReportSubParentSampleAssessmentMap.put(businessSubParentSampleAssessmentProjectDO.getSimpleName(), assessmentValue);
-				businessSubParentSampleAssessmentIds.append(businessSubParentSampleAssessmentDO.getId()).append(",");
+				businessSubParentSampleAssessmentProjectIds.append(businessSubParentSampleAssessmentProjectDO.getId()).append(",");
 			}
-			businessSubParentSampleAssessmentIds.delete(businessSubParentSampleAssessmentIds.length() -1,  businessSubParentSampleAssessmentIds.length());
+			businessSubParentSampleAssessmentProjectIds.delete(businessSubParentSampleAssessmentProjectIds.length() -1,  businessSubParentSampleAssessmentProjectIds.length());
-			noReportSubParentSampleAssessmentMap.put("businessSubParentSampleAssessmentIds", businessSubParentSampleAssessmentIds.toString());
+			noReportSubParentSampleAssessmentMap.put("businessSubParentSampleAssessmentProjectIds", businessSubParentSampleAssessmentProjectIds.toString());
+			noReportSubParentSampleAssessmentMap.put("businessSubParentSampleAssessmentId", noReportSubParentSampleAssessmentRespVO.getBusinessSubParentSampleAssessmentId());
 			dataList.add(noReportSubParentSampleAssessmentMap);
 			
-			//复测之前的判定数据
+			//当前判定数据
-			BusinessSubSampleParentRecheckDO businessSubSampleParentRecheckDO = businessSubSampleParentRecheckDOList.stream().filter(f -> f.getRecheckBusinessSubParentSampleId().equals(noReportSubParentSampleAssessmentRespVO.getBusinessSubParentSampleId())).findFirst().orElse(null);
+			List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentList = businessSubSampleAssessmentExtendRespVOList.stream().filter(f -> f.getBusinessSubParentSampleId().equals(noReportSubParentSampleAssessmentRespVO.getBusinessSubParentSampleId()) && f.getRetestCount().equals(noReportSubParentSampleAssessmentRespVO.getRetestCount()) ).collect(Collectors.toList());
-			if (businessSubSampleParentRecheckDO != null) {
-				
-				List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentExtendBeforeList = businessSubSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdAndConfigAssayMethodId(businessSubSampleParentRecheckDO.getBusinessSubParentSampleId(), businessSubSampleParentRecheckDO.getConfigAssayMethodId());
-				StringBuilder businessSubSampleAssessmentIdsBefore = new StringBuilder();
-				for (BusinessSubSampleAssessmentProjectExtendRespVO businessSubSampleAssessmentProjectExtendRespVO : businessSubSampleAssessmentExtendBeforeList) {
-					subSampleAssessmentBeforeMap.put("sampleReceiveTime", noReportSubParentSampleAssessmentRespVO.getSampleReceiveTime());
-					subSampleAssessmentBeforeMap.put("configAssayMethodName", businessSubSampleAssessmentProjectExtendRespVO.getConfigAssayMethodName());
-					String assessmentValue = businessSubSampleAssessmentProjectExtendRespVO.getAssessmentValue();
-					if (StringUtils.isNotBlank(businessSubSampleAssessmentProjectExtendRespVO.getSymbol()) && !"=".equals(businessSubSampleAssessmentProjectExtendRespVO.getSymbol())) {//符号不为空，并且不为等于号。结果添加上符号
-						assessmentValue = businessSubSampleAssessmentProjectExtendRespVO.getSymbol() + assessmentValue;
-					}
-					subSampleAssessmentBeforeMap.put(businessSubSampleAssessmentProjectExtendRespVO.getSimpleName(), assessmentValue);
-					businessSubSampleAssessmentIdsBefore.append(businessSubSampleAssessmentProjectExtendRespVO.getId()).append(",");
-				}
-				businessSubSampleAssessmentIdsBefore.delete(businessSubSampleAssessmentIdsBefore.length() -1,  businessSubSampleAssessmentIdsBefore.length());
-				subSampleAssessmentBeforeMap.put("businessSubParentSampleAssessmentIds", businessSubParentSampleAssessmentIds.toString());
-				subSampleAssessmentBeforeMap.put("businessSubSampleAssessmentIds", businessSubSampleAssessmentIdsBefore.toString());
-
-				dataList.add(subSampleAssessmentBeforeMap);
-			}
-			
-			
-			List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentList = businessSubSampleAssessmentExtendRespVOList.stream().filter(f -> f.getBusinessSubParentSampleId().equals(noReportSubParentSampleAssessmentRespVO.getBusinessSubParentSampleId())).collect(Collectors.toList());
 			StringBuilder businessSubSampleAssessmentIds = new StringBuilder();
 			for (BusinessSubSampleAssessmentProjectExtendRespVO businessSubSampleAssessmentProjectExtendRespVO : businessSubSampleAssessmentList) {
 				subSampleAssessmentMap.put("sampleReceiveTime", noReportSubParentSampleAssessmentRespVO.getSampleReceiveTime());
@@ -238,10 +218,40 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 				businessSubSampleAssessmentIds.append(businessSubSampleAssessmentProjectExtendRespVO.getId()).append(",");
 			}
 			businessSubSampleAssessmentIds.delete(businessSubSampleAssessmentIds.length() -1,  businessSubSampleAssessmentIds.length());
-			subSampleAssessmentMap.put("businessSubParentSampleAssessmentIds", businessSubParentSampleAssessmentIds.toString());
+			subSampleAssessmentMap.put("businessSubParentSampleAssessmentProjectIds", businessSubParentSampleAssessmentProjectIds.toString());
 			subSampleAssessmentMap.put("businessSubSampleAssessmentIds", businessSubSampleAssessmentIds.toString());
 
 			dataList.add(subSampleAssessmentMap);
+
+			//复测之前的判定数据
+			BusinessSubSampleParentRetestDO businessSubSampleParentRecheckDO = businessSubSampleParentRecheckDOList.stream().filter(f -> f.getRetestBusinessSubParentSampleId().equals(noReportSubParentSampleAssessmentRespVO.getBusinessSubParentSampleId()) && f.getRetestCount().equals(noReportSubParentSampleAssessmentRespVO.getRetestCount())).findFirst().orElse(null);
+			if (businessSubSampleParentRecheckDO != null) {
+				
+				List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentExtendBeforeList = businessSubSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdAndBusinessSubParentSampleAssessmentId(businessSubSampleParentRecheckDO.getBusinessSubParentSampleId(), businessSubSampleParentRecheckDO.getBusinessSubParentSampleAssessmentId());
+				StringBuilder businessSubSampleAssessmentIdsBefore = new StringBuilder();
+				for (BusinessSubSampleAssessmentProjectExtendRespVO businessSubSampleAssessmentProjectExtendRespVO : businessSubSampleAssessmentExtendBeforeList) {
+					if (!curBusinessSubParentSampleAssessmentDictionaryProjectIdList.contains(businessSubSampleAssessmentProjectExtendRespVO.getDictionaryProjectId())) {
+						continue;
+					}
+					subSampleAssessmentBeforeMap.put("sampleReceiveTime", noReportSubParentSampleAssessmentRespVO.getSampleReceiveTime());
+					subSampleAssessmentBeforeMap.put("configAssayMethodName", businessSubSampleAssessmentProjectExtendRespVO.getConfigAssayMethodName());
+					String assessmentValue = businessSubSampleAssessmentProjectExtendRespVO.getAssessmentValue();
+					if (StringUtils.isNotBlank(businessSubSampleAssessmentProjectExtendRespVO.getSymbol()) && !"=".equals(businessSubSampleAssessmentProjectExtendRespVO.getSymbol())) {//符号不为空，并且不为等于号。结果添加上符号
+						assessmentValue = businessSubSampleAssessmentProjectExtendRespVO.getSymbol() + assessmentValue;
+					}
+					subSampleAssessmentBeforeMap.put(businessSubSampleAssessmentProjectExtendRespVO.getSimpleName(), assessmentValue);
+					businessSubSampleAssessmentIdsBefore.append(businessSubSampleAssessmentProjectExtendRespVO.getId()).append(",");
+				}
+				if (businessSubSampleAssessmentIdsBefore.length() > 0) {
+					businessSubSampleAssessmentIdsBefore.delete(businessSubSampleAssessmentIdsBefore.length() -1,  businessSubSampleAssessmentIdsBefore.length());
+					subSampleAssessmentBeforeMap.put("businessSubParentSampleAssessmentProjectIds", businessSubParentSampleAssessmentProjectIds.toString());
+					subSampleAssessmentBeforeMap.put("businessSubSampleAssessmentIds", businessSubSampleAssessmentIdsBefore.toString());
+
+					dataList.add(subSampleAssessmentBeforeMap);
+					
+				}
+			}
+			
 		}
 		
 		
@@ -314,7 +324,7 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 	private BusinessAssayParameterDataMapper businessAssayParameterDataMapper;
 	
 	@Resource
-	private BusinessSubSampleParentRecheckMapper businessSubSampleParentRecheckMapper;
+	private BusinessSubSampleParentRetestMapper businessSubSampleParentRetestMapper;
 	
 
 	@Override
@@ -326,7 +336,9 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 		List<BusinessAssayTaskDataDO> newBusinessAssayTaskDataDOList = new ArrayList<>();
 		List<BusinessAssayProjectDataDO> newBusinessAssayProjectDataDOList = new ArrayList<>();
 		List<BusinessAssayParameterDataDO> newBusinessAssayParameterDataDOList = new ArrayList<>();	
-		List<BusinessSubSampleParentRecheckDO> newBusinessSubSampleParentRecheckDOList = new ArrayList<>();
+		List<BusinessSubSampleParentRetestDO> newBusinessSubSampleParentRetestDOList = new ArrayList<>();
+		
+		BusinessSubParentSampleAssessmentDO olBusinessSubParentSampleAssessmentDO = businessSubParentSampleAssessmentMapper.selectById(reqVO.getBusinessSubParentSampleAssessmentId());
 		
 		//查询分样主样判定
 		BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessmentDO = businessSubParentSampleAssessmentMapper.selectByBusinessSubParentSampleIdAndConfigAssayMethodId(reqVO.getBusinessSubParentSampleId(), reqVO.getConfigAssayMethodId());
@@ -362,15 +374,6 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 				Long configAssayMethodId = entry.getKey();
 				List<RecheckSubSampleParentMethodRespVO> projectList = entry.getValue();
 				
-				BusinessSubSampleParentRecheckDO businessSubSampleParentRecheckDO = new BusinessSubSampleParentRecheckDO();
-				businessSubSampleParentRecheckDO.setBusinessBaseSampleId(businessSubSampleDO.getBusinessBaseSampleId());
-				businessSubSampleParentRecheckDO.setBusinessSubParentSampleId(businessSubSampleDO.getBusinessSubParentSampleId());
-				businessSubSampleParentRecheckDO.setConfigAssayMethodId(reqVO.getConfigAssayMethodId());
-				businessSubSampleParentRecheckDO.setRecheckBusinessBaseSampleId(businessSubSampleDO.getBusinessBaseSampleId());
-				businessSubSampleParentRecheckDO.setRecheckBusinessSubParentSampleId(businessSubSampleDO.getBusinessSubParentSampleId());
-				businessSubSampleParentRecheckDO.setRecheckConfigAssayMethodId(configAssayMethodId);
-				
-				newBusinessSubSampleParentRecheckDOList.add(businessSubSampleParentRecheckDO);
 				
 				//查询分析方法
 				ConfigAssayMethodDO configAssayMethodDO = configAssayMethodMapper.selectById(configAssayMethodId);
@@ -389,7 +392,22 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 					newBusinessSubParentSampleAssessmentDO.setConfigAssayMethodId(configAssayMethodId);
 					newBusinessSubParentSampleAssessmentDO.setAssayType(assayType);
 					newBusinessSubParentSampleAssessmentDO.setTaskType("复测");
+					newBusinessSubParentSampleAssessmentDO.setRetestCount(olBusinessSubParentSampleAssessmentDO.getRetestCount() + 1);
 					newSubParentSampleAssessmentDOList.add(newBusinessSubParentSampleAssessmentDO);
+					
+
+					BusinessSubSampleParentRetestDO businessSubSampleParentRetestDO = new BusinessSubSampleParentRetestDO();
+					businessSubSampleParentRetestDO.setBusinessBaseSampleId(businessSubSampleDO.getBusinessBaseSampleId());
+					businessSubSampleParentRetestDO.setBusinessSubParentSampleId(businessSubSampleDO.getBusinessSubParentSampleId());
+					businessSubSampleParentRetestDO.setBusinessSubParentSampleAssessmentId(reqVO.getBusinessSubParentSampleAssessmentId());
+					businessSubSampleParentRetestDO.setConfigAssayMethodId(reqVO.getConfigAssayMethodId());
+					businessSubSampleParentRetestDO.setRetestBusinessBaseSampleId(businessSubSampleDO.getBusinessBaseSampleId());
+					businessSubSampleParentRetestDO.setRetestBusinessSubParentSampleId(businessSubSampleDO.getBusinessSubParentSampleId());
+					businessSubSampleParentRetestDO.setRetestBusinessSubParentSampleAssessmentId(newBusinessSubParentSampleAssessmentDO.getId());
+					businessSubSampleParentRetestDO.setRetestCount(newBusinessSubParentSampleAssessmentDO.getRetestCount());
+					businessSubSampleParentRetestDO.setRetestConfigAssayMethodId(configAssayMethodId);
+					
+					newBusinessSubSampleParentRetestDOList.add(businessSubSampleParentRetestDO );
 				}
 				
 				BusinessSubSampleAssessmentDO newBusinessSubSampleAssessmentDO = newSubSampleAssessmentDOList.stream().filter(f -> f.getBusinessSubParentSampleAssessmentId().equals(businessSubParentSampleAssessmentDO.getId())).findFirst().orElse(null);
@@ -403,6 +421,7 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 					newBusinessSubSampleAssessmentDO.setConfigAssayMethodId(configAssayMethodId);
 					newBusinessSubSampleAssessmentDO.setAssayType(assayType);
 					newBusinessSubSampleAssessmentDO.setTaskType("复测");
+					newBusinessSubSampleAssessmentDO.setRetestCount(newBusinessSubParentSampleAssessmentDO.getRetestCount());
 					
 					newSubSampleAssessmentDOList.add(newBusinessSubSampleAssessmentDO);
 				}
@@ -425,6 +444,7 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 					businessAssayTaskDataDO.setSampleFlowNodeTime(LocalDateTime.now());
 					businessAssayTaskDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId());
 					businessAssayTaskDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName());
+					businessAssayTaskDataDO.setRetestCount(newBusinessSubSampleAssessmentDO.getRetestCount());
 					
 
 					StringBuilder assayProjectBuilder = new StringBuilder();
@@ -494,8 +514,8 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 		if (CollUtil.isNotEmpty(newBusinessAssayParameterDataDOList)) {
 			businessAssayParameterDataMapper.insertBatch(newBusinessAssayParameterDataDOList);
 		}
-		if (CollUtil.isNotEmpty(newBusinessSubSampleParentRecheckDOList)) {
+		if (CollUtil.isNotEmpty(newBusinessSubSampleParentRetestDOList)) {
-			businessSubSampleParentRecheckMapper.insertBatch(newBusinessSubSampleParentRecheckDOList);
+			businessSubSampleParentRetestMapper.insertBatch(newBusinessSubSampleParentRetestDOList);
 		}
 	}
 	
@@ -799,12 +819,14 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void modifySampleResultReporting(ModifySampleResultReportingReqVO reqVO) {
-		List<String> businessSubParentSampleAssessmentIdList = Arrays.asList(reqVO.getBusinessSubParentSampleAssessmentIds().split(","));
+		List<String> businessSubParentSampleAssessmentProjectIdList = Arrays.asList(reqVO.getBusinessSubParentSampleAssessmentProjectIds().split(","));
 		List<String> businessSubSampleAssessmentIdList = Arrays.asList(reqVO.getBusinessSubSampleAssessmentIds().split(","));
-		List<BusinessSubParentSampleAssessmentProjectDO> businessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentProjectMapper.selectByIds(businessSubParentSampleAssessmentIdList);
+		List<BusinessSubParentSampleAssessmentProjectDO> businessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentProjectMapper.selectByIds(businessSubParentSampleAssessmentProjectIdList);
 		List<BusinessSubSampleAssessmentProjectDO> businessSubSampleAssessmentDOList = businessSubSampleAssessmentProjectMapper.selectByIds(businessSubSampleAssessmentIdList);
 		for (BusinessSubParentSampleAssessmentProjectDO businessSubParentSampleAssessmentProjectDO : businessSubParentSampleAssessmentDOList) {
 			BusinessSubSampleAssessmentProjectDO businessSubSampleAssessmentProjectDO = businessSubSampleAssessmentDOList.stream().filter(f -> f.getDictionaryProjectId().equals(businessSubParentSampleAssessmentProjectDO.getDictionaryProjectId())).findFirst().orElse(null);
+			businessSubParentSampleAssessmentProjectDO.setConfigAssayMethodId(businessSubSampleAssessmentProjectDO.getConfigAssayMethodId());
+			businessSubParentSampleAssessmentProjectDO.setConfigAssayMethodProjectId(businessSubSampleAssessmentProjectDO.getConfigAssayMethodProjectId());
 			businessSubParentSampleAssessmentProjectDO.setAssessmentValue(businessSubSampleAssessmentProjectDO.getAssessmentValue());
 			businessSubParentSampleAssessmentProjectDO.setSymbol(businessSubSampleAssessmentProjectDO.getSymbol());
 		}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/qlexpress/config/QlExpressRuleEngineConfig.java

@@ -8,7 +8,7 @@ import com.alibaba.qlexpress4.InitOptions;
 import com.alibaba.qlexpress4.security.QLSecurityStrategy;
 import com.zt.plat.module.qms.core.qlexpress.function.RoundToScaleHalfEven;
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class QlExpressRuleEngineConfig {
 
 	@Bean

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

@@ -13,6 +13,7 @@
         SELECT
             tbatd.CFG_ASY_MTHD_ID AS configAssayMethodId,
             tcam.NAME AS configAssayMethodName,
+            tcam.DIC_BSN_KY AS configAssayMethodDictionaryBusinessKey,
             tcam.MTHD_NAME_CTGR AS configAssayMethodNameAndCategory,
             COUNT(tbatd.ID) AS sampleTaskCount
         FROM
@@ -47,7 +48,9 @@
         GROUP BY
             tbatd.CFG_ASY_MTHD_ID,
             tcam.NAME,
+            tcam.DIC_BSN_KY,
             tcam.MTHD_NAME_CTGR
+        ORDER BY tcam.DIC_BSN_KY ASC
      </select>
 
      <select id="selectUnAuditTaskGroupList" resultType="com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataGroupRespVO">
@@ -55,6 +58,7 @@
             t.CFG_ASY_MTHD_ID AS configAssayMethodId,
             t.ASY_TP AS assayType,
             tcam.NAME AS configAssayMethodName,
+            tcam.DIC_BSN_KY AS configAssayMethodDictionaryBusinessKey,
             tcam.MTHD_NAME_CTGR AS configAssayMethodNameAndCategory,
             count(CASE WHEN t.RPOD_STS = 'initial' THEN 1 END) AS asmt_initial_count,
             count(CASE WHEN t.RPOD_STS = 'pending_report' THEN 1 END) AS asmt_pending_report_count,
@@ -116,7 +120,9 @@
             t.CFG_ASY_MTHD_ID,
             t.ASY_TP,
             tcam.NAME,
+            tcam.DIC_BSN_KY,
             tcam.MTHD_NAME_CTGR
+        ORDER BY tcam.DIC_BSN_KY ASC
      </select>
      
      <select id="selectUnAssignTaskedSubSample" resultType="com.zt.plat.module.qms.business.bus.controller.vo.UnAssignTaskedSubSampleRespVO">

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml

@@ -13,6 +13,7 @@
         SELECT
                 t.CFG_ASY_MTHD_ID AS configAssayMethodId,
                 t.NAME AS configAssayMethodName,
+                t.DIC_BSN_KY AS configAssayMethodDictionaryBusinessKey,
                 t.MTHD_NAME_CTGR AS configAssayMethodNameAndCategory,
                 t.ASY_DEPT_ID AS assayDepartmentId,
                 t.ASY_DEPT_NAME AS assayDepartmentName,
@@ -24,6 +25,7 @@
                 tbssa.BSN_SB_PRN_SMP_ASMT_ID ,
                 tbssa.CFG_ASY_MTHD_ID,
                 tcam.NAME,
+                tcam.DIC_BSN_KY,
                 tcam.MTHD_NAME_CTGR,
                 tcam.ASY_DEPT_ID ,
                 tcam.ASY_DEPT_NAME
@@ -57,6 +59,7 @@
                 tbssa.BSN_SB_PRN_SMP_ASMT_ID ,
                 tbssa.CFG_ASY_MTHD_ID ,
                 tcam.NAME,
+                tcam.DIC_BSN_KY,
                 tcam.MTHD_NAME_CTGR,
                 tcam.ASY_DEPT_ID ,
                 tcam.ASY_DEPT_NAME
@@ -64,19 +67,23 @@
         GROUP BY
                 t.CFG_ASY_MTHD_ID,
                 t.NAME,
+                t.DIC_BSN_KY,
                 t.MTHD_NAME_CTGR,
                 t.ASY_DEPT_ID,
                 t.ASY_DEPT_NAME
+        ORDER BY t.DIC_BSN_KY ASC
     </select>
     
     <select id="selectNoReportSubParentSampleAssessment" resultType="com.zt.plat.module.qms.business.bus.controller.vo.NoReportSubParentSampleAssessmentRespVO" >                
         SELECT
+            t.ID AS businessSubParentSampleAssessmentId,
             tcssp.BSE_SMP_ID AS baseSampleId,
             tbsps.BSN_BSE_SMP_ID AS businessBaseSampleId,
             tbssa.BSN_SB_PRN_SMP_ID AS businessSubParentSampleId,
             tbssa.CFG_ASY_MTHD_ID AS configAssayMethodId ,
             tbssa.TSK_TP AS taskType,
             tbssa.ASY_TP AS assayType,
+            tbssa.RTST_CNT AS retestCount,
             tbsps.CFG_SB_SMP_PRN_ID AS configSubSampleParentId,
             tbsps.SMP_NAME AS sampleName,
             tbs.NAME AS baseSampleName,
@@ -96,21 +103,21 @@
             AND tcam.ASY_DEPT_ID = tbssag.ASY_DEPT_ID
         LEFT JOIN (
             SELECT
+                tbspsa.ID,
                 tbspsa.BSN_SB_PRN_SMP_ID ,
                 tbspsa.CFG_ASY_MTHD_ID ,
-                tbspsa.IS_RPOD
+                tbspsa.IS_RPOD, 
+                tbspsa.RTST_CNT
             FROM
                 T_BSN_SB_PRN_SMP_ASMT tbspsa
             WHERE
                 tbspsa.IS_RPOD = 0
                 AND tbspsa.DELETED = 0
                 AND tbspsa.CFG_ASY_MTHD_ID = #{reqVO.configAssayMethodId}
-            GROUP BY
-                tbspsa.BSN_SB_PRN_SMP_ID ,
-                tbspsa.CFG_ASY_MTHD_ID ,
-                tbspsa.IS_RPOD
         ) t ON
             tbssa.BSN_SB_PRN_SMP_ID = t.BSN_SB_PRN_SMP_ID 
+            AND tbssa.CFG_ASY_MTHD_ID = t.CFG_ASY_MTHD_ID 
+            AND tbssa.RTST_CNT = t.RTST_CNT
         WHERE
             tbssa.IS_RPOD = 1
             AND t.IS_RPOD = 0
@@ -119,12 +126,14 @@
             AND tbssag.SMP_RCV_TM BETWEEN #{reqVO.sampleReceiveTime[0]} AND #{reqVO.sampleReceiveTime[1]}
           </if>
         GROUP BY
+            t.ID,
             tcssp.BSE_SMP_ID ,
             tbsps.BSN_BSE_SMP_ID ,
             tbssa.BSN_SB_PRN_SMP_ID,
             tbssa.CFG_ASY_MTHD_ID,
             tbssa.TSK_TP ,
             tbssa.ASY_TP ,
+            tbssa.RTST_CNT,
             tbsps.CFG_SB_SMP_PRN_ID,
             tbsps.SMP_NAME ,
             tbs.NAME,

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleParentRetestMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleParentRecheckMapper">
+<mapper namespace="com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleParentRetestMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。