委托登记修改
This commit is contained in:
@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import com.alibaba.fastjson2.JSONObject;
|
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.common.pojo.CommonResult;
|
||||||
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
||||||
import com.zt.plat.module.qms.business.bus.service.SampleAnalysisAuditService;
|
import com.zt.plat.module.qms.business.bus.service.SampleAnalysisAuditService;
|
||||||
@@ -25,7 +26,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
|||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/qms/bus/sample/analysis-audit")
|
@RequestMapping("/qms/bus/sample/analysis-audit")
|
||||||
@Validated
|
@Validated
|
||||||
public class SampleAnalysisAuditController {
|
public class SampleAnalysisAuditController implements BusinessControllerMarker {
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private SampleAnalysisAuditService sampleAnalysisAuditService;
|
private SampleAnalysisAuditService sampleAnalysisAuditService;
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import com.alibaba.fastjson2.JSONObject;
|
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.common.pojo.CommonResult;
|
||||||
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
||||||
import com.zt.plat.module.qms.business.bus.service.SampleAnalysisService;
|
import com.zt.plat.module.qms.business.bus.service.SampleAnalysisService;
|
||||||
@@ -23,7 +24,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
|||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/qms/bus/sample/analysis")
|
@RequestMapping("/qms/bus/sample/analysis")
|
||||||
@Validated
|
@Validated
|
||||||
public class SampleAnalysisController {
|
public class SampleAnalysisController implements BusinessControllerMarker {
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private SampleAnalysisService sampleAnalysisService ;
|
private SampleAnalysisService sampleAnalysisService ;
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|||||||
import com.alibaba.fastjson2.JSONObject;
|
import com.alibaba.fastjson2.JSONObject;
|
||||||
import com.yomahub.liteflow.core.FlowExecutor;
|
import com.yomahub.liteflow.core.FlowExecutor;
|
||||||
import com.yomahub.liteflow.flow.LiteflowResponse;
|
import com.yomahub.liteflow.flow.LiteflowResponse;
|
||||||
|
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
|
||||||
import com.zt.plat.framework.common.pojo.CommonResult;
|
import com.zt.plat.framework.common.pojo.CommonResult;
|
||||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||||
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
||||||
@@ -34,7 +34,7 @@ import jakarta.validation.Valid;
|
|||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/qms/bus/sample/entrust")
|
@RequestMapping("/qms/bus/sample/entrust")
|
||||||
@Validated
|
@Validated
|
||||||
public class SampleEntrustController {
|
public class SampleEntrustController implements BusinessControllerMarker {
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private FlowExecutor flowExecutor;
|
private FlowExecutor flowExecutor;
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|||||||
import com.alibaba.fastjson2.JSON;
|
import com.alibaba.fastjson2.JSON;
|
||||||
import com.yomahub.liteflow.core.FlowExecutor;
|
import com.yomahub.liteflow.core.FlowExecutor;
|
||||||
import com.yomahub.liteflow.flow.LiteflowResponse;
|
import com.yomahub.liteflow.flow.LiteflowResponse;
|
||||||
|
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
|
||||||
import com.zt.plat.framework.common.pojo.CommonResult;
|
import com.zt.plat.framework.common.pojo.CommonResult;
|
||||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||||
import com.zt.plat.framework.tenant.core.context.TenantContextHolder;
|
import com.zt.plat.framework.tenant.core.context.TenantContextHolder;
|
||||||
@@ -33,7 +33,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.error;
|
|||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/qms/bus/sample/flow")
|
@RequestMapping("/qms/bus/sample/flow")
|
||||||
@Validated
|
@Validated
|
||||||
public class SampleFlowController {
|
public class SampleFlowController implements BusinessControllerMarker {
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private SampleFlowService sampleFlowService;
|
private SampleFlowService sampleFlowService;
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import com.alibaba.fastjson2.JSONObject;
|
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.common.pojo.CommonResult;
|
||||||
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
||||||
import com.zt.plat.module.qms.business.bus.service.SampleResultReportingService;
|
import com.zt.plat.module.qms.business.bus.service.SampleResultReportingService;
|
||||||
@@ -28,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestBody;
|
|||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/qms/bus/sample/result-reporting")
|
@RequestMapping("/qms/bus/sample/result-reporting")
|
||||||
@Validated
|
@Validated
|
||||||
public class SampleResultReportingController {
|
public class SampleResultReportingController implements BusinessControllerMarker {
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private SampleResultReportingService sampleResultReportingService;
|
private SampleResultReportingService sampleResultReportingService;
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
|
||||||
import com.zt.plat.framework.common.pojo.CommonResult;
|
import com.zt.plat.framework.common.pojo.CommonResult;
|
||||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||||
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
||||||
@@ -27,7 +28,7 @@ import jakarta.annotation.Resource;
|
|||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/qms/bus/sample/task-assign")
|
@RequestMapping("/qms/bus/sample/task-assign")
|
||||||
@Validated
|
@Validated
|
||||||
public class SampleTaskAssignController {
|
public class SampleTaskAssignController implements BusinessControllerMarker {
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private SampleTaskAssignService sampleTaskAssignService;
|
private SampleTaskAssignService sampleTaskAssignService;
|
||||||
|
|||||||
@@ -98,4 +98,8 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
|
|||||||
@Schema(description = "备注")
|
@Schema(description = "备注")
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
//===================================扩展字段===============================================
|
||||||
|
|
||||||
|
@Schema(description = "样品状态")
|
||||||
|
private String sampleStatus;
|
||||||
}
|
}
|
||||||
@@ -101,6 +101,8 @@ public class BusinessAssayTaskDataReqVO {
|
|||||||
//=== 扩展字段,判定上报状态
|
//=== 扩展字段,判定上报状态
|
||||||
@Schema(description = "判定上报状态")
|
@Schema(description = "判定上报状态")
|
||||||
private String asmtReportedStatus;
|
private String asmtReportedStatus;
|
||||||
|
|
||||||
|
@Schema(description = "样品状态")
|
||||||
|
private String sampleStatus;
|
||||||
|
|
||||||
}
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user