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

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

Browse Source
This commit is contained in:
FCL
2026-03-13 11:00:59 +08:00
parent 520a8977dc e4c3e8a289
commit 5a69846961
19 changed files with 246 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/constant/RecordConstants.java
View File

@@ -77,7 +77,7 @@ public class RecordConstants {
/**
* 分发
*/
public static final String DISTRIBUTION__DEFINITION_KEY = "QMS_RECORD_DISTRIBUTION";
public static final String DISTRIBUTION_DEFINITION_KEY = "QMS_RECORD_DISTRIBUTION";
/**
* 查看申请
*/

8
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/RecordApplyController.java
View File

@@ -1,6 +1,5 @@
package com.zt.plat.module.qms.resource.record.controller.admin.recordapply;
import com.alibaba.fastjson2.JSONObject;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import com.zt.plat.framework.business.annotation.FileUploadController;
import com.zt.plat.framework.business.controller.AbstractFileUploadController;
@@ -12,27 +11,20 @@ import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
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.resource.record.controller.admin.recordapply.vo.RecordApplyJoinPageVO;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo.RecordApplyPageReqVO;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo.RecordApplyRespVO;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo.RecordApplySaveReqVO;
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;
import com.zt.plat.module.qms.resource.record.dal.dataobject.recordapply.RecordApplyDO;
import com.zt.plat.module.qms.resource.record.dal.dataobject.recordrecord.RecordRecordDO;
import com.zt.plat.module.qms.resource.record.service.recordapply.RecordApplyService;
import com.zt.plat.module.qms.resource.record.service.recordrecord.RecordRecordService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyRespVO.java
View File

@@ -120,7 +120,7 @@ public class RecordApplyRespVO {
// // ===============临时字段=================》
@Schema(description = "明细列表")
private List<RecordApplyDetailRespVO> dataList;
private List<RecordApplyDetailRespVO> detailList;
// ===============临时字段=================》
@@ -134,7 +134,5 @@ public class RecordApplyRespVO {
// @Schema(description = "用户IDs")
// private Long[] deptIds;
private List<RecordApplyDetailSaveReqVO> paramsList;
}

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplySaveReqVO.java
View File

@@ -103,7 +103,7 @@ public class RecordApplySaveReqVO {
@Schema(description = "用户IDs")
private Long[] deptIds;
private List<RecordApplyDetailSaveReqVO> paramsList;
private List<RecordApplyDetailSaveReqVO> detailList;
// 分发参数
// private List<RecordApplyUserAndDeptReqVO> targetList;

9
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapplydetail/vo/RecordApplyDetailRespVO.java
View File

@@ -82,4 +82,13 @@ public class RecordApplyDetailRespVO {
@Schema(description = "文件编号")
private String recordCode;
@Schema(description = "版本号")
private String version;
@Schema(description = "文件记录-是否长期有效")
private String recordPermanently;
@Schema(description = "文件过期时间")
private LocalDateTime expirationDate;
}

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

@@ -3,6 +3,7 @@ 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.constant.RecordConstants;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo.RecordApplyRespVO;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo.RecordApplySaveReqVO;
import com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.vo.RecordPermissionPageReqVO;
@@ -11,6 +12,7 @@ import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.R
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;
import com.zt.plat.module.qms.resource.record.dal.dataobject.recordpermission.RecordPermissionDO;
import com.zt.plat.module.qms.resource.record.service.recordcategory.RecordCategoryService;
import com.zt.plat.module.qms.resource.record.service.recordpermission.RecordPermissionService;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;

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

@@ -24,12 +24,6 @@ public class RecordRecordPageReqVO extends PageParam {
@Schema(description = "业务类型")
private String businessType;
// @Schema(description = "部门IDS")
// private String departmentIds;
//
// @Schema(description = "用户IDS")
// private String userIds;
@Schema(description = "表单key")
private String formKey;

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordapply/RecordApplyDO.java
View File

@@ -151,6 +151,6 @@ public class RecordApplyDO extends BusinessBaseDO {
// ==========================
@TableField(exist = false)
private List<RecordApplyDetailDO> dataList;
private List<RecordApplyDetailDO> detailList;
}

10
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordapplydetail/RecordApplyDetailDO.java
View File

@@ -108,4 +108,14 @@ public class RecordApplyDetailDO extends BusinessBaseDO {
@TableField(exist = false)
private String recordCode;
@TableField(exist = false)
private String version;
@TableField(exist = false)
private String recordPermanently;
@TableField(exist = false)
private LocalDateTime expirationDate;
}

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordApplyDetailMapper.java
View File

@@ -7,6 +7,7 @@ import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail
import com.zt.plat.module.qms.resource.record.dal.dataobject.recordapplydetail.RecordApplyDetailDO;
import com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo.RecordApplyDetailJoinVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -48,9 +49,12 @@ public interface RecordApplyDetailMapper extends BaseMapperX<RecordApplyDetailDO
"WHERE trad.DOC_ID = #{documentId} AND tra.BSN_TP = #{businessType}")
List<RecordApplyDetailJoinVO> selectJoinByDocumentIdAndBusinessType(Long documentId, String businessType);
@Select("SELECT trad.ID as id,trad.APL_ID as applyId, trad.DOC_ID as documentId, trad.TGT_TP as targetType," +
"trad.TGT_ID as targetId, trad.IS_MDF as isModify, trad.MDF_CAUS as modifyCause," +
"trad.APL_STRT_DT as applyStartDate, trad.APL_END_DT as applyEndDate,trr.NAME AS recordName," +
"trr.CD AS recordCode FROM T_RCD_APL_DTL trad LEFT JOIN T_RCD_RCD trr ON trad.DOC_ID = trr.ID WHERE trad.APL_ID = #{applyId}")
List<RecordApplyDetailDO> selectDetailAndRecordList(Long applyId);
// @Select("SELECT trad.ID as id,trad.APL_ID as applyId, trad.DOC_ID as documentId, trad.TGT_TP as targetType," +
// "trad.TGT_ID as targetId, trad.IS_MDF as isModify, trad.MDF_CAUS as modifyCause," +
// "trad.APL_STRT_DT as applyStartDate, trad.APL_END_DT as applyEndDate,trr.NAME AS recordName," +
// "trr.CD AS recordCode, trr.VER AS version, trr.PMNT as recordPermanently, trr.EXPR_DT as expirationDate " +
// "FROM T_RCD_APL_DTL trad LEFT JOIN T_RCD_RCD trr ON trad.DOC_ID = trr.ID WHERE trad.DELETED = 0 and trad.APL_ID = #{applyId}")
List<RecordApplyDetailDO> selectDetailAndRecordList(@Param("applyId") Long applyId);
List<RecordApplyDetailDO> selectDistributionDetailAndRecordList(@Param("applyId") Long applyId);
}

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