Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

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

@@ -1331,6 +1331,9 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
         					ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource();
         					String project = source.getProject();
         					BusinessAssayProjectDataExtendRespVO currentBusinessAssayProjectData = businessAssayProjectDataExtendList.stream().filter(f -> f.getBusinessAssayTaskDataId().equals(businessAssayTaskData.getId()) && project.equals(f.getSimpleName())).findFirst().orElse(null);
+        					if (currentBusinessAssayProjectData == null) {
+								continue;
+							}
         					ConfigSubSampleMethodConfPoint target = configSubSampleMethodConfItem.getTarget();
         					for (BusinessAssayTaskDataDO targetBusinessAssayTaskData : targetBusinessAssayTaskDataList) {
         						List<String> targetProjectList = Arrays.asList(target.getProject().split(","));
@@ -1362,6 +1365,9 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
         					ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource();
         					String project = source.getProject();
         					BusinessAssayProjectDataExtendRespVO currentBusinessAssayProjectData = businessAssayProjectDataExtendList.stream().filter(f -> f.getBusinessAssayTaskDataId().equals(businessAssayTaskData.getId()) && project.equals(f.getSimpleName())).findFirst().orElse(null);
+        					if (currentBusinessAssayProjectData == null) {
+								continue;
+							}
         					ConfigSubSampleMethodConfPoint target = configSubSampleMethodConfItem.getTarget();
         					for (BusinessAssayTaskDataDO targetBusinessAssayTaskData : targetBusinessAssayTaskDataList) {
         						List<String> targetProjectList = Arrays.asList(target.getProject().split(","));
@@ -1393,6 +1399,9 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
         					ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource();
         					String project = source.getProject();
         					BusinessAssayProjectDataExtendRespVO currentBusinessAssayProjectData = businessAssayProjectDataExtendList.stream().filter(f -> f.getBusinessAssayTaskDataId().equals(businessAssayTaskData.getId()) && project.equals(f.getSimpleName())).findFirst().orElse(null);
+        					if (currentBusinessAssayProjectData == null) {
+								continue;
+							}
         					ConfigSubSampleMethodConfPoint target = configSubSampleMethodConfItem.getTarget();
         					for (BusinessAssayTaskDataDO targetBusinessAssayTaskData : targetBusinessAssayTaskDataList) {
         						List<String> targetProjectList = Arrays.asList(target.getProject().split(","));

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/RecordRecordController.java

@@ -1,6 +1,8 @@
 package com.zt.plat.module.qms.resource.record.controller.admin.recordrecord;
 
 import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+import com.zt.plat.module.qms.common.service.BusinessFileService;
+import com.zt.plat.module.qms.resource.clientManage.controller.vo.VersionManagementRespVO;
 import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordPageReqVO;
 import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordRespVO;
 import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordSaveReqVO;
@@ -38,10 +40,10 @@ import com.zt.plat.module.qms.resource.record.service.recordrecord.RecordRecordS
 
 @Tag(name = "管理后台 - 文件、模板、记录")
 @RestController
-@RequestMapping("/qms/record-record")
+@RequestMapping("/qms/resource/record-record")
 @Validated
 @DeptDataPermissionIgnore(enable = "true")
-@FileUploadController(source = "qms.recordrecord")
+@FileUploadController(source = "qms.recordrecord", codeKey = "data.fileUploadBusinessCode")
 public class RecordRecordController extends AbstractFileUploadController implements BusinessControllerMarker{
 
     static {
@@ -53,9 +55,20 @@ public class RecordRecordController extends AbstractFileUploadController impleme
 
     @Resource
     private RecordRecordService recordRecordService;
+    @Resource
+    private BusinessFileService businessFileService;
+
+//    @GetMapping("/getRecordListByCategoryId")
+//    @Operation(summary = "根据文件分类ID获取分类明细记录")
+//    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+//    //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
+//    public CommonResult<PageResult<RecordRecordRespVO>> getRecordListByCategoryId(@RequestParam("id") Long categoryId) {
+//        PageResult<RecordRecordDO> recordRecordListByCategoryId = recordRecordService.getRecordListByCategoryId(categoryId);
+//        return success(BeanUtils.toBean(recordRecordListByCategoryId, RecordRecordRespVO.class));
+//    }
 
     @PostMapping("/create")
-    @Operation(summary = "创建文件、模板、记录")
+    @Operation(summary = "创建文件、模板、记录->分类明细")
     //@PreAuthorize("@ss.hasPermission('qms:record-record:create')")
     public CommonResult<RecordRecordRespVO> createRecordRecord(@Valid @RequestBody RecordRecordSaveReqVO createReqVO) {
         return success(recordRecordService.createRecordRecord(createReqVO));
@@ -64,9 +77,9 @@ public class RecordRecordController extends AbstractFileUploadController impleme
     @PutMapping("/update")
     @Operation(summary = "更新文件、模板、记录")
     //@PreAuthorize("@ss.hasPermission('qms:record-record:update')")
-    public CommonResult<Boolean> updateRecordRecord(@Valid @RequestBody RecordRecordSaveReqVO updateReqVO) {
+    public CommonResult<RecordRecordSaveReqVO> updateRecordRecord(@Valid @RequestBody RecordRecordSaveReqVO updateReqVO) {
         recordRecordService.updateRecordRecord(updateReqVO);
-        return success(true);
+        return success(BeanUtils.toBean(updateReqVO, RecordRecordSaveReqVO.class));
     }
 
     @DeleteMapping("/delete")
@@ -93,14 +106,22 @@ public class RecordRecordController extends AbstractFileUploadController impleme
     //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
     public CommonResult<RecordRecordRespVO> getRecordRecord(@RequestParam("id") Long id) {
         RecordRecordDO recordRecord = recordRecordService.getRecordRecord(id);
-        return success(BeanUtils.toBean(recordRecord, RecordRecordRespVO.class));
+        RecordRecordRespVO vo = BeanUtils.toBean(recordRecord, RecordRecordRespVO.class);
+        vo.setBusinessFileRet(businessFileService.getBusinessFileList(id));
+        return success(vo);
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得文件、模板、记录分页")
     //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
     public CommonResult<PageResult<RecordRecordRespVO>> getRecordRecordPage(@Valid RecordRecordPageReqVO pageReqVO) {
-        PageResult<RecordRecordDO> pageResult = recordRecordService.getRecordRecordPage(pageReqVO);
+        PageResult<RecordRecordDO> pageResult = new PageResult<>();
+        Integer isQueryHistory = pageReqVO.getIsQueryHistory();
+        if (isQueryHistory != null && isQueryHistory == 1) { // 查询历史分页
+            pageResult=recordRecordService.getRecordHistoryPage(pageReqVO);
+        }else {
+            pageResult = recordRecordService.getRecordRecordPage(pageReqVO);
+        }
         return success(BeanUtils.toBean(pageResult, RecordRecordRespVO.class));
     }
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/vo/RecordRecordPageReqVO.java

@@ -29,14 +29,14 @@ public class RecordRecordPageReqVO extends PageParam {
     private String version;
 
     @Schema(description = "是否最新版本,默认显示最新版本")
-    private String currentFlag;
+    private Integer currentFlag;
 
     @Schema(description = "编制日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] makeDate;
 
     @Schema(description = "是否涉密")
-    private String confidentialFlag;
+    private Integer confidentialFlag;
 
     @Schema(description = "密级")
     private String confidentialLevel;
@@ -48,7 +48,7 @@ public class RecordRecordPageReqVO extends PageParam {
     private String confidentialKey;
 
     @Schema(description = "是否长期有效")
-    private String permanently;
+    private Integer permanently;
 
     @Schema(description = "过期日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -82,4 +82,14 @@ public class RecordRecordPageReqVO extends PageParam {
     @Schema(description = "是否回收权限")
     private Integer collectionFlag;
 
+    @Schema(description = "原始父级ID")
+    private Long mainId;
+
+    @Schema(description = "是否可编辑")
+    private Integer operationFlag;
+
+//    ===========临时字段==========
+    @Schema(description = "是否查询历史数据")
+    private Integer isQueryHistory; // 1-查询，0-不查询
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/vo/RecordRecordRespVO.java

@@ -1,10 +1,17 @@
 package com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo;
 
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.module.infra.api.businessfile.dto.BusinessFileWithUrlRespDTO;
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
 import java.util.*;
+
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
+
 import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 文件、模板、记录 Response VO")
@@ -38,7 +45,8 @@ public class RecordRecordRespVO {
 
     @Schema(description = "是否最新版本,默认显示最新版本", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("是否最新版本,默认显示最新版本")
-    private String currentFlag;
+    @Dict(dicCode = "yes_or_no")
+    private Integer currentFlag;
 
     @Schema(description = "编制日期")
     @ExcelProperty("编制日期")
@@ -46,7 +54,8 @@ public class RecordRecordRespVO {
 
     @Schema(description = "是否涉密", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("是否涉密")
-    private String confidentialFlag;
+    @Dict(dicCode = "yes_or_no")
+    private Integer confidentialFlag;
 
     @Schema(description = "密级")
     @ExcelProperty("密级")
@@ -62,7 +71,8 @@ public class RecordRecordRespVO {
 
     @Schema(description = "是否长期有效", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("是否长期有效")
-    private String permanently;
+    @Dict(dicCode = "yes_or_no")
+    private Integer permanently;
 
     @Schema(description = "过期日期")
     @ExcelProperty("过期日期")
@@ -70,11 +80,13 @@ public class RecordRecordRespVO {
 
     @Schema(description = "过期标识,0-有效，1-过期", example = "1")
     @ExcelProperty("过期标识,0-有效，1-过期")
-    private String expirationStatus;
+    @Dict(dicCode = "yes_or_no")
+    private Integer expirationStatus;
 
     @Schema(description = "作废标志,0-有效，1-作废")
     @ExcelProperty("作废标志,0-有效，1-作废")
-    private String cancelFlag;
+    @Dict(dicCode = "yes_or_no")
+    private Integer cancelFlag;
 
     @Schema(description = "表单数据")
     @ExcelProperty("表单数据")
@@ -100,4 +112,24 @@ public class RecordRecordRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "原始父级ID")
+    private Long mainId;
+
+    @Schema(description = "是否可编辑")
+    @ExcelProperty("是否可编辑")
+    private Integer operationFlag;
+
+    //===========临时字段=============>
+    @Schema(description = "文件分类名称")
+    @ExcelProperty("文件分类名称")
+    private String categoryName;
+
+    @Schema(description = "附件上传code")
+    @ExcelProperty("附件上传code")
+    private String fileUploadBusinessCode = "qms_resource_version_manage";
+
+    //    ===================扩展字段=========================
+    @Schema(description = "附件对象")
+    private CommonResult<List<BusinessFileWithUrlRespDTO>> businessFileRet;
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/vo/RecordRecordSaveReqVO.java

@@ -1,12 +1,13 @@
 package com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.zt.plat.module.qms.resource.clientManage.controller.vo.UploadFileVo;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import jakarta.validation.constraints.NotEmpty;
-import java.util.*;
+import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.*;
+import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 文件、模板、记录新增/修改 Request VO")
 @Data
@@ -35,15 +36,14 @@ public class RecordRecordSaveReqVO {
     private String version;
 
     @Schema(description = "是否最新版本,默认显示最新版本", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "是否最新版本,默认显示最新版本不能为空")
+    private Integer currentFlag;
-    private String currentFlag;
 
     @Schema(description = "编制日期")
     private LocalDateTime makeDate;
 
     @Schema(description = "是否涉密", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "是否涉密不能为空")
+    @NotNull(message = "是否涉密不能为空")
-    private String confidentialFlag;
+    private Integer confidentialFlag;
 
     @Schema(description = "密级")
     private String confidentialLevel;
@@ -55,8 +55,7 @@ public class RecordRecordSaveReqVO {
     private String confidentialKey;
 
     @Schema(description = "是否长期有效", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "是否长期有效不能为空")
+    private Integer permanently;
-    private String permanently;
 
     @Schema(description = "过期日期")
     private LocalDateTime expirationDate;
@@ -84,4 +83,20 @@ public class RecordRecordSaveReqVO {
 
     @Schema(description = "是否回收权限")
     private Integer collectionFlag;
+
+    @Schema(description = "原始父级ID")
+    private Long mainId;
+
+    @Schema(description = "是否可编辑")
+    private Integer operationFlag;
+
+    //    =================临时字段==================>
+    @Schema(description = "是否新版本")
+    private String newVersion;
+
+    @Schema(description = "上传文件列表")
+    private List<UploadFileVo> files;
+
+    @Schema(description = "删除的文件id")
+    private List<Long> deleteFileIdList;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dao/recordrecord/RecordRecordMapper.java

@@ -37,6 +37,7 @@ public interface RecordRecordMapper extends BaseMapperX<RecordRecordDO> {
                 .eqIfPresent(RecordRecordDO::getSourceUrl, reqVO.getSourceUrl())
                 .eqIfPresent(RecordRecordDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .eqIfPresent(RecordRecordDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(RecordRecordDO::getMainId, reqVO.getMainId())
                 .betweenIfPresent(RecordRecordDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(RecordRecordDO::getId));
     }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordrecord/RecordRecordDO.java

@@ -62,7 +62,7 @@ public class RecordRecordDO extends BusinessBaseDO {
     * 是否最新版本,默认显示最新版本
     */
     @TableField("CRNT_FLG")
-    private String currentFlag;
+    private Integer currentFlag;
     /**
     * 编制日期
     */
@@ -72,7 +72,7 @@ public class RecordRecordDO extends BusinessBaseDO {
     * 是否涉密
     */
     @TableField("CNF_FLG")
-    private String confidentialFlag;
+    private Integer confidentialFlag;
     /**
     * 密级
     */
@@ -138,5 +138,23 @@ public class RecordRecordDO extends BusinessBaseDO {
      */
     @TableField("COLT_FLG")
     private Integer collectionFlag;
+    /**
+     * 原始父级ID
+     */
+    @TableField("MAIN_ID")
+    private Long mainId;
+    /**
+     * 是否可编辑
+     */
+    @TableField("OPTN_FLG")
+    private Integer operationFlag;
+
+//    =============临时字段============>
+
+    @TableField(exist = false)
+    private String categoryName;
+
+    @TableField(exist = false)
+    private String newVersion;
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordcategory/RecordCategoryServiceImpl.java

@@ -72,7 +72,10 @@ public class RecordCategoryServiceImpl implements RecordCategoryService {
     public void updateRecordCategory(RecordCategorySaveReqVO updateReqVO) {
         // 校验存在
         validateRecordCategoryExists(updateReqVO.getId());
-        
+
+        Long parentId1 = updateReqVO.getParentId();
+        if (parentId1 == null || parentId1 == 0L) throw exception(RECORD_CATEGORY_NOT_EXISTS);
+
         // 获取更新前的旧数据
         RecordCategoryDO oldObj = recordCategoryMapper.selectById(updateReqVO.getId());
         String oldIdPath = oldObj.getIdPath();

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordService.java

@@ -61,4 +61,7 @@ public interface RecordRecordService {
      */
     PageResult<RecordRecordDO> getRecordRecordPage(RecordRecordPageReqVO pageReqVO);
 
+//    PageResult<RecordRecordDO> getRecordListByCategoryId(Long categoryId);
+
+    PageResult<RecordRecordDO> getRecordHistoryPage(RecordRecordPageReqVO pageReqVO);
 }