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

回退信息等修改

Browse Source
This commit is contained in:
王兴荣
2026-01-06 10:43:07 +08:00
parent 8945098344
commit 8a1b2f0eb3
12 changed files with 227 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,8 @@ import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIg
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.framework.security.core.LoginUser;
import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO;
import com.zt.plat.module.qms.business.bus.service.BusinessAssayTaskService;
@@ -92,6 +94,10 @@ public class BusinessAssayTaskController implements BusinessControllerMarker {
@Operation(summary = "获得检测任务分配业务分页")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')")
public CommonResult<PageResult<BusinessAssayTaskExtendRespVO>> getBusinessAssayTaskPage(@Valid BusinessAssayTaskPageReqVO pageReqVO) {
if (pageReqVO.getDeptId() == null) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
pageReqVO.setDeptId(loginUser.getVisitDeptId());
}
PageResult<BusinessAssayTaskExtendRespVO> pageResult = businessAssayTaskService.getBusinessAssayTaskPage(pageReqVO);
return success(pageResult);
}

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

@@ -26,6 +26,8 @@ import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIg
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.framework.security.core.LoginUser;
import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
import com.zt.plat.module.qms.business.bus.service.BusinessAssayTaskDataService;
@@ -89,6 +91,10 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@Operation(summary = "获得未指派的子样检测任务业务分组列表")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
public CommonResult<?> getUnAssayTaskGroupList(BusinessAssayTaskDataReqVO reqVO) {
if (reqVO.getAssayDepartmentId() == null) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
reqVO.setAssayDepartmentId(loginUser.getVisitDeptId());
}
List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAssayTaskGroupList(reqVO);
return success(list);
}
@@ -97,6 +103,10 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@Operation(summary = "获得未审核的子样检测任务业务分组列表")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
public CommonResult<?> getUnAuditTaskGroupList(BusinessAssayTaskDataReqVO reqVO) {
if (reqVO.getAssayDepartmentId() == null) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
reqVO.setAssayDepartmentId(loginUser.getVisitDeptId());
}
List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAuditTaskGroupList(reqVO);
return success(list);
}

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

@@ -9,6 +9,8 @@ import com.alibaba.fastjson2.JSONObject;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.security.core.LoginUser;
import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.service.SampleResultReportingService;
@@ -39,6 +41,10 @@ public class SampleResultReportingController implements BusinessControllerMarker
//获取未上报的方法
@GetMapping("/getUnReportMethodGroupList")
public CommonResult<?> getUnReportMethodGroupList(BusinessSubParentSampleAssessmentGroupReqVO reqVO) {
if (reqVO.getAssayDepartmentId() == null) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
reqVO.setAssayDepartmentId(loginUser.getVisitDeptId());
}
List<BusinessSubParentSampleAssessmentGroupRespVO> list = sampleResultReportingService.getUnReportMethodGroupList(reqVO);
return success(list);
}

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

@@ -16,6 +16,8 @@ import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.security.core.LoginUser;
import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignManualParam;
import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignMethodParam;
@@ -54,6 +56,10 @@ public class SampleTaskAssignController implements BusinessControllerMarker {
@GetMapping("/getAssaySampleList")
public CommonResult<?> getAssaySampleList(BusinessAssayTaskDataReqVO reqVO) {
if (reqVO.getAssayDepartmentId() == null) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
reqVO.setAssayDepartmentId(loginUser.getVisitDeptId());
}
List<UnAssignTaskedSubSampleRespVO> list = sampleTaskAssignService.getAssaySampleList(reqVO);
return success(list);
}

47
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataExternalInfomation.java Normal file
View File

@@ -0,0 +1,47 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import java.io.Serializable;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
public class BusinessAssayTaskDataExternalInfomation implements Serializable {
private static final long serialVersionUID = 2740738762124170770L;
/** 是否退回 **/
private Integer isRollback;
/** 回退详情 **/
private List<RollbackDetail> rollbackDetailList;
@Data
@NoArgsConstructor
@AllArgsConstructor
public static class RollbackDetail {
/**
* 退回人ID
*/
private Long rollbackOperId;
/**
* 退回人
*/
private String rollbackOper;
/**
* 退回原因
*/
private String rollbackReason;
/**
* 退回时间 yyyy-MM-dd HH:mm:ss
*/
private String rollbackTime;
}
}

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

@@ -88,6 +88,9 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
@Schema(description = "复测次数", example = "28081")
private Integer retestCount;
@Schema(description = "扩展信息")
private String externalInfomation;
@Schema(description = "乐观锁", example = "11435")
private Integer updateCount;

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

@@ -86,6 +86,9 @@ public class BusinessAssayTaskDataReqVO {
@Schema(description = "复测次数", example = "28081")
private Integer retestCount;
@Schema(description = "扩展信息")
private String externalInfomation;
@Schema(description = "乐观锁", example = "11435")
private Integer updateCount;

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

@@ -111,6 +111,9 @@ public class BusinessAssayTaskDataRespVO {
@ExcelProperty("复测次数")
private Integer retestCount;
@Schema(description = "扩展信息")
private String externalInfomation;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435")
@ExcelProperty("乐观锁")
private Integer updateCount;

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

@@ -96,6 +96,9 @@ public class BusinessAssayTaskDataSaveReqVO {
@Schema(description = "复测次数", example = "28081")
private Integer retestCount;
@Schema(description = "扩展信息")
private String externalInfomation;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435")
private Integer updateCount;

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

@@ -150,6 +150,11 @@ public class BusinessAssayTaskDataDO extends BusinessBaseDO {
@TableField("RTST_CNT")
private Integer retestCount;
/**
* 扩展信息
*/
@TableField("EXT_INF")
private String externalInfomation;
/**
* 乐观锁
*/
@TableField("UPD_CNT")

Some files were not shown because too many files have changed in this diff Show More