Merge remote-tracking branch 'origin/test' into test

qms-server/src/main/resources/application-local.yml

@@ -65,7 +65,7 @@ rocketmq:
 xxl:
   job:
     admin:
-      addresses: http://172.16.46.63:30082/xxl-job-admin # 调度中心部署跟地址
+      addresses: http://192.168.26.116:888/xxl-job-admin # 调度中心部署跟地址
 
 # Lock4j 配置项
 lock4j:

qms-server/src/main/resources/application.yml

@@ -97,7 +97,8 @@ easy-trans:
 xxl:
   job:
     executor:
-      appname: ${spring.application.name} # 执行器 AppName
+#      appname: ${spring.application.name} # 执行器 AppName
+      appname: xxl-job-executor-sample # 执行器 AppName
       logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径
     accessToken: default_token # 执行器通讯TOKEN
 

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

@@ -142,6 +142,12 @@ public interface ErrorCodeConstants {
 	
 	ErrorCode BUSINESS_XRF_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "荧光采集记录不存在");
 
+	//第三方对接
+	ErrorCode OTHER_SYSTEM_CONFIG_NOT_EXISTS = new ErrorCode(1_032_100_000, "第三方系统配置不存在");
+	ErrorCode OTHER_BASE_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_100_000, "第三方系统样品大类对应不存在");
+	ErrorCode OTHER_DICTIONARY_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "第三方系统检测项目字典对应不存在");
+	ErrorCode OTHER_SYSTEM_USER_NOT_EXISTS = new ErrorCode(1_032_100_000, "第三方系统用户信息对应不存在");
+	
 
 	//检测报告
 	ErrorCode REPORT_DOCUMENT_MAIN_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告业务不存在");
@@ -177,10 +183,10 @@ public interface ErrorCodeConstants {
 	ErrorCode DEVICE_CONFIG_FLOW_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备通用流程配置不存在");
 
 //	-------------物料试剂-------------
-	ErrorCode MATERIAL_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_160_000, "试剂耗材不存在");
+	ErrorCode MATERIAL_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料不存在");
 	ErrorCode MATERIAL_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料分类/大类不存在");
 	ErrorCode MATERIAL_PRODUCT_PARENT_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料分类/大类的父类不存在");
-	ErrorCode MATERIAL_PRODUCT_CODE_MODELNO_EXISTED = new ErrorCode(1_032_160_000, "物料大类【编码+型号】重复");
+	ErrorCode MATERIAL_PRODUCT_CODE_SPECIFICATION_EXISTED = new ErrorCode(1_032_160_000, "物料大类【编码+规格】重复");
 	ErrorCode MATERIAL_CATEGORY_EXISTS_CHILDREN = new ErrorCode(1_032_160_000, "分类下含有子分类或物料大类，不可删除");
 	ErrorCode MATERIAL_PRODUCT_EXISTS_BATCH = new ErrorCode(1_032_160_000, "物料大类下存在物料批次，不可删除");
 	ErrorCode MATERIAL_PRODUCTS_EXISTS_CATEGORY = new ErrorCode(1_032_160_000, "物料大类列表中存在分类数据");
@@ -198,8 +204,7 @@ public interface ErrorCodeConstants {
 
 	ErrorCode SYSTEM_VERSION_MANAGEMENT_NOT_EXISTS = new ErrorCode(1_032_160_000, "客户端版本管理不存在");
 
-	ErrorCode MATERIAL_INVENTORY_CHECK_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_ITEM_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点项不存在");
-	ErrorCode MATERIAL_INVENTORY_CHECK_BATCH_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点项不存在");
 	ErrorCode MATERIAL_INVENTORY_CHECK_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点明细不存在");
 	ErrorCode MATERIAL_INVENTORY_OUTBOUND_NOT_EXISTS = new ErrorCode(1_032_160_000, "出库不存在");
 	ErrorCode MATERIAL_INVENTORY_OUTBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等不存在");
@@ -244,4 +249,13 @@ public interface ErrorCodeConstants {
 	ErrorCode RECORD_FILE_EXISTS = new ErrorCode(1_032_350_000, "文件记录目录存在文件");
 	ErrorCode RECORD_PERMISSION_NOT_ALLOW = new ErrorCode(1_032_350_401, "当前操作权限不允许");
 	ErrorCode RECORD_CATEGORY_NAME_EXISTS = new ErrorCode(1_032_350_400, "文件记录分类名称不能重复");
+
+
+	/*=================================  部门信息、用户信息 ==================================*/
+	ErrorCode CURRENT_USER_COMPANY_NOT_EXISTS = new ErrorCode(1_032_350_000, "当前用户公司不存在");
+	ErrorCode CURRENT_USER_DEPT_NOT_EXISTS = new ErrorCode(1_032_350_000, "当前用户部门不存在");
+	ErrorCode CURRENT_USER_NOT_EXISTS = new ErrorCode(1_032_350_000, "当前用户部门不存在");
+
+	// ========== 文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物 TODO 补充编号 ==========
+	ErrorCode RECORD_ASSIGN_NOT_EXISTS = new ErrorCode(1_032_450_000, "文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物不存在");
 }

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

@@ -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.BusinessSampleEntrustDepartmentDO;
 import com.zt.plat.module.qms.business.bus.service.BusinessSampleEntrustDepartmentService;
@@ -89,6 +91,10 @@ public class BusinessSampleEntrustDepartmentController implements BusinessContro
     @Operation(summary = "获得委检登记分析部门业务分页")
 //    @PreAuthorize("@ss.hasPermission('t:business-sample-entrust-department:query')")
     public CommonResult<PageResult<BusinessSampleEntrustDepartmentExtendRespVO>> getBusinessSampleEntrustDepartmentPage(@Valid BusinessSampleEntrustDepartmentPageReqVO pageReqVO) {
+    	if (pageReqVO.getAssayDepartmentId() == null) {
+    		LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+    		pageReqVO.setAssayDepartmentId(loginUser.getVisitDeptId());
+		}
         PageResult<BusinessSampleEntrustDepartmentExtendRespVO> pageResult = businessSampleEntrustDepartmentService.getBusinessSampleEntrustDepartmentPage(pageReqVO);
         return success(pageResult);
     }

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

@@ -87,10 +87,18 @@ public class BusinessSampleEntrustFileController implements BusinessControllerMa
 
     @GetMapping("/page")
     @Operation(summary = "获得委检登记附件业务分页")
-    @PreAuthorize("@ss.hasPermission('t:business-sample-entrust-file:query')")
+//    @PreAuthorize("@ss.hasPermission('t:business-sample-entrust-file:query')")
-    public CommonResult<PageResult<BusinessSampleEntrustFileRespVO>> getBusinessSampleEntrustFilePage(@Valid BusinessSampleEntrustFilePageReqVO pageReqVO) {
+    public CommonResult<PageResult<BusinessSampleEntrustFileExtendRespVO>> getBusinessSampleEntrustFilePage(@Valid BusinessSampleEntrustFilePageReqVO pageReqVO) {
-        PageResult<BusinessSampleEntrustFileDO> pageResult = businessSampleEntrustFileService.getBusinessSampleEntrustFilePage(pageReqVO);
+        PageResult<BusinessSampleEntrustFileExtendRespVO> pageResult = businessSampleEntrustFileService.getBusinessSampleEntrustFilePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessSampleEntrustFileRespVO.class));
+        return success(pageResult);
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得委检登记附件业务分页")
+//    @PreAuthorize("@ss.hasPermission('t:business-sample-entrust-file:query')")
+    public CommonResult<List<BusinessSampleEntrustFileExtendRespVO>> getBusinessSampleEntrustFileList(@Valid BusinessSampleEntrustFilePageReqVO pageReqVO) {
+        List<BusinessSampleEntrustFileExtendRespVO> listResult = businessSampleEntrustFileService.getBusinessSampleEntrustFileList(pageReqVO);
+        return success(listResult);
     }
 
     @GetMapping("/export-excel")
@@ -100,7 +108,7 @@ public class BusinessSampleEntrustFileController implements BusinessControllerMa
     public void exportBusinessSampleEntrustFileExcel(@Valid BusinessSampleEntrustFilePageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<BusinessSampleEntrustFileDO> list = businessSampleEntrustFileService.getBusinessSampleEntrustFilePage(pageReqVO).getList();
+        List<BusinessSampleEntrustFileExtendRespVO> list = businessSampleEntrustFileService.getBusinessSampleEntrustFilePage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "委检登记附件业务.xls", "数据", BusinessSampleEntrustFileRespVO.class,
                         BeanUtils.toBean(list, BusinessSampleEntrustFileRespVO.class));

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

@@ -164,8 +164,8 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
     @GetMapping("/getBySampleCodeAndFlowKey")
     @Operation(summary = "根据样品编号及样品流程节点key获取样品信息")
     public CommonResult<?> getBySampleCodeAndFlowKey(@Valid BusinessSubSampleReqVO reqVO) {
-    	BusinessSubSampleExtendRespVO result = businessSubSampleService.getBySampleCodeAndFlowKey(reqVO);
+    	List<BusinessSubSampleExtendRespVO> resultList = businessSubSampleService.getBySampleCodeAndFlowKey(reqVO);
-    	return success(result);
+    	return success(resultList);
 	}
 
     @GetMapping("/export-excel")

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

@@ -0,0 +1,19 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessSampleEntrustFileExtendRespVO extends BusinessSampleEntrustFileRespVO {
+
+    private String entrustNumber;
+
+    private String entrustUnit;
+    
+    @Schema(description = "文件 URL", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/zt.jpg")
+    private String url;
+
+    // 附件预览地址
+    @Schema(description = "附件预览地址", example = "https://www.iocoder.cn/zt.jpg")
+    private String previewUrl;
+}

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

@@ -31,6 +31,9 @@ public class BusinessSampleEntrustFilePageReqVO extends PageParam {
     @Schema(description = "路径")
     private String filePath;
 
+    @Schema(description = "扩展信息")
+    private String externalInfomation;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 

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

@@ -6,6 +6,7 @@ import java.util.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 
 @Schema(description = "管理后台 - 委检登记附件业务 Response VO")
 @Data
@@ -24,6 +25,7 @@ public class BusinessSampleEntrustFileRespVO {
     @ExcelProperty("检验委托登记分析部门ID")
     private Long businessSampleEntrustDepartmentId;
 
+    @Dict(dicCode = "file_attachment_category")
     @Schema(description = "附件分类,（委检登记上传/分析原始记录/报告记录）")
     @ExcelProperty("附件分类,（委检登记上传/分析原始记录/报告记录）")
     private String fileCategory;
@@ -40,6 +42,9 @@ public class BusinessSampleEntrustFileRespVO {
     @ExcelProperty("路径")
     private String filePath;
 
+    @Schema(description = "扩展信息")
+    private String externalInfomation;
+
     @Schema(description = "所属部门")
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;

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

@@ -31,6 +31,9 @@ public class BusinessSampleEntrustFileSaveReqVO {
     @Schema(description = "路径")
     private String filePath;
 
+    @Schema(description = "扩展信息")
+    private String externalInfomation;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;