diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/constant/RecordConstants.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/constant/RecordConstants.java index cf20c948..dbc908b1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/constant/RecordConstants.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/constant/RecordConstants.java @@ -53,7 +53,7 @@ public class RecordConstants { /** * 查看申请 */ - public static final String VIEW_APPLY = "文件查看"; + public static final String VIEW_APPLY = "文件借阅"; /** * 作废 */ @@ -67,7 +67,7 @@ public class RecordConstants { * */ public static final String RECORD_SUBMIT = "文件提交"; /** - * 文件提交 + * 文件更改 * */ public static final String RECORD_UPDATE = "文件更改"; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyPageReqVO.java index bef44c60..0b940cbc 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyPageReqVO.java @@ -42,7 +42,8 @@ public class RecordApplyPageReqVO extends PageParam { private String applyDepartmentName; @Schema(description = "评审时间") - private LocalDateTime reviewTime; + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] reviewTime; @Schema(description = "评审范围") private String reviewRange; @@ -92,4 +93,11 @@ public class RecordApplyPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; -} \ No newline at end of file + // ==============临时字段================ + @Schema(description = "创建时间") + private String name; + + @Schema(description = "创建时间") + private String code; + +} diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordpermission/vo/RecordPermissionPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordpermission/vo/RecordPermissionPageReqVO.java index e9e3f12e..71d85d80 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordpermission/vo/RecordPermissionPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordpermission/vo/RecordPermissionPageReqVO.java @@ -55,9 +55,6 @@ public class RecordPermissionPageReqVO extends PageParam { @Schema(description = "是否保留标志") private String saveFlag; -// @Schema(description = "保留结束日期") -// private LocalDateTime saveEndDate; - @Schema(description = "所属部门") private String systemDepartmentCode; @@ -80,4 +77,8 @@ public class RecordPermissionPageReqVO extends PageParam { private List userDeptIds; + private String recordName; + + private String recordCode; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordapply/RecordApplyDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordapply/RecordApplyDO.java index cd35d5fb..c7a25d77 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordapply/RecordApplyDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordapply/RecordApplyDO.java @@ -165,5 +165,9 @@ public class RecordApplyDO extends BusinessBaseDO { @TableField(exist = false) private List assignList; + @TableField(exist = false) + private String name; + @TableField(exist = false) + private String code; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordApplyMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordApplyMapper.java index b68d3e53..06244b43 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordApplyMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordApplyMapper.java @@ -23,6 +23,7 @@ public interface RecordApplyMapper extends BaseMapperX { .likeIfPresent(RecordApplyDO::getApplyUserName, reqVO.getApplyUserName()) .eqIfPresent(RecordApplyDO::getApplyDepartmentName, reqVO.getApplyDepartmentName()) .eqIfPresent(RecordApplyDO::getApplyDepartmentId, reqVO.getApplyDepartmentId()) + .betweenIfPresent(RecordApplyDO::getReviewTime, reqVO.getReviewTime()) .eqIfPresent(RecordApplyDO::getReviewRange, reqVO.getReviewRange()) .likeIfPresent(RecordApplyDO::getTargetDepartmentIds, reqVO.getTargetDepartmentIds()) .eqIfPresent(RecordApplyDO::getTargetUserIds, reqVO.getTargetUserIds()) @@ -35,6 +36,8 @@ public interface RecordApplyMapper extends BaseMapperX { .eqIfPresent(RecordApplyDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) .eqIfPresent(RecordApplyDO::getRemark, reqVO.getRemark()) .betweenIfPresent(RecordApplyDO::getCreateTime, reqVO.getCreateTime()) + .apply(reqVO.getName() != null && !reqVO.getName().isEmpty(), "JSON_VALUE(FORM_DAT, '$.name') = {0}", reqVO.getName()) + .apply(reqVO.getCode() != null && !reqVO.getCode().isEmpty(), "JSON_VALUE(FORM_DAT, '$.code') = {0}", reqVO.getCode()) .orderByDesc(RecordApplyDO::getId)); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordRecordMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordRecordMapper.java index 82e67fa8..206e2887 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordRecordMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordRecordMapper.java @@ -49,7 +49,4 @@ public interface RecordRecordMapper extends BaseMapperX { IPage getEffectRecordPage(Page page, RecordRecordPageReqVO reqVO); - -// IPage getNotSubmitEffectRecordPage(Page page, @Param("reqVO") RecordRecordPageReqVO reqVO); - } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordapply/RecordApplyServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordapply/RecordApplyServiceImpl.java index c0f69df8..cffb3148 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordapply/RecordApplyServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordapply/RecordApplyServiceImpl.java @@ -105,18 +105,9 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn List detailIds = detailList.stream().map(RecordApplyDetailSaveReqVO::getId).toList(); recordApplyDetailService.deleteNotInDetailIdList(applyId, null, recordList); //先删除记录 recordApplyDetailService.deleteNotInDetailIdList(applyId, detailIds, null); // 在删除不需要的明细数据 - CommonResult applyDetailData = createApplyDetailData(updateReqVO, recordApplyDO); -// Long documentId = recordApplyDetailDOS.get(0).getDocumentId(); - // 判断文件是否改变 -// Long newDocumentId = detailList.get(0).getDocumentId(); -// if (!documentId.equals(newDocumentId)) { // 删除重新添加 -// List deleteFileIdList = recordApplyDetailDOS.stream().map(RecordApplyDetailDO::getId).toList(); -// recordApplyDetailService.deleteRecordApplyDetailListByIds(deleteFileIdList); -// return true; -// } - return applyDetailData; + return createApplyDetailData(updateReqVO, recordApplyDO); } - return new CommonResult(); + return new CommonResult<>(); } @Override @@ -149,15 +140,24 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn if (item.getId() != null) detailIds.add(item.getId()); // 有id的 else { item.setApplyId(applyId); - newDetailList.add(item); // 新数据 + // 新数据 + if (RecordConstants.BusinessType.VIEW_APPLY.equals(businessType)){ // 查看申请,新增数据添加目标用户 + item.setTargetId(SecurityFrameworkUtils.getLoginUserId()); + item.setTargetType(RecordConstants.TargetType.USER); + item.setTargetName(SecurityFrameworkUtils.getLoginUserNickname()); + } + newDetailList.add(item); } }); - recordApplyDetailService.deleteNotInDetailIdList(applyId, null, detailIds); -// if (!ObjectUtils.isEmpty(deleteDetailAllList)) { -// List deleteDetailIds = deleteDetailAllList.stream().map(RecordApplyDetailDO::getId).toList(); -// recordApplyDetailService.deleteRecordApplyDetailListByIds(deleteDetailIds); -// } - // 更新 + + //删除明细id 不存在的数据 + recordApplyDetailService.deleteNotInDetailIdList(applyId, detailIds,null ); + + // 更新旧的明细数据 + List recordApplyDetailSaveReqVOList = BeanUtils.toBean(detailList, RecordApplyDetailSaveReqVO.class); + recordApplyDetailService.updateRecordApplyDetailBatch(recordApplyDetailSaveReqVOList); + + // 添加新数据 if (!ObjectUtils.isEmpty(newDetailList)) { recordApplyDetailService.createRecordApplyDetailBatch(newDetailList); } @@ -188,8 +188,8 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn } // 删除ID 不存在的数据 List detailList = updateReqVO.getDetailList(); - List list = detailList.stream().map(RecordApplyDetailSaveReqVO::getId).toList(); - recordApplyDetailService.deleteNotInDetailIdList(applyId, list, null); + List detailIds = detailList.stream().map(RecordApplyDetailSaveReqVO::getId).toList(); + recordApplyDetailService.deleteNotInDetailIdList(applyId, detailIds, null); createApplyDetailData(updateReqVO,recordApplyDO); return BeanUtils.toBean(updateReqVO, RecordApplyRespVO.class); @@ -290,8 +290,10 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn recordApply.setApplyDepartmentName(loginUser.getVisitDeptName()); //生成标题 - String title = nickName + "的" + businessType + "_" + new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss").format(new Date()); - recordApply.setTitle(title); + if (ObjectUtils.isEmpty(param.getTitle())) { + String title = nickName + "的" + businessType + "_" + new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss").format(new Date()); + recordApply.setTitle(title); + } try { recordApplyMapper.insert(recordApply); } catch (Exception e) { @@ -592,7 +594,7 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn if (ObjectUtils.isEmpty(applyId)) throw exception0(RECORD_RECORD_NOT_EXISTS.getCode(), "申请记录不存在"); RecordApplyDO recordApplyDO = recordApplyMapper.selectById(applyId); - // TODO // 提交,不需要走流程 + // TODO 提交,不需要走流程 Integer isSubmit = param.getIsSubmit(); if (!ObjectUtils.isEmpty(isSubmit) && isSubmit == 1) { RecordApplyDO applyDO = applySubmitStatus(recordApplyDO); @@ -691,6 +693,7 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn // 更新申请提交状态 recordApplyDO.setIsSubmit(1); recordApplyDO.setBusinessStatus(QmsCommonConstant.SUBMITTED); + recordApplyDO.setApplyEndDate(LocalDateTime.now()); recordApplyMapper.updateById(recordApplyDO); return recordApplyDO; } @@ -957,7 +960,7 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn else permissionDO.setSaveFlag(saveFlag); if (businessType.equals(RecordConstants.BusinessType.VIEW_APPLY)) { targetType = RecordConstants.TargetType.USER; - permissionDO.setSaveFlag("1"); // 文件查看使用 +// permissionDO.setSaveFlag("1"); // 文件查看使用 } if (ObjectUtils.isEmpty(targetType)) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java index 5247c88b..9d9c4c08 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java @@ -141,6 +141,11 @@ public class RecordRecordServiceImpl implements RecordRecordService { private int calculateRecordStatus(LocalDateTime effectiveDate, LocalDateTime expirationDate) { LocalDateTime now = LocalDateTime.now(); + // 当前日期 > 过期日期，过期 + if (expirationDate != null && expirationDate.isBefore(now)) { + return 3; // 过期 + } + // 如果生效日期为空，立即生效 if (effectiveDate == null) { return 1; @@ -153,10 +158,6 @@ public class RecordRecordServiceImpl implements RecordRecordService { // 生效日期 ≤ 当前日期，判断是否过期 if (effectiveDate.isBefore(now)) { - // 当前日期 < 过期日期，生效中 - if (expirationDate != null && expirationDate.isBefore(now)) { - return 3; // 过期 - } // 当前日期 ≥ 过期日期，已过期 return 1; } @@ -186,10 +187,11 @@ public class RecordRecordServiceImpl implements RecordRecordService { // 根据新版本文件的有效状态，来处理旧版本 Integer recordStatus = recordRecordDO.getRecordStatus(); + Integer expirationStatus = recordRecordDO.getExpirationStatus(); RecordRecordDO oldRecordRecordDO = new RecordRecordDO(); oldRecordRecordDO.setId(oldId); oldRecordRecordDO.setCurrentFlag(0);// 旧版本 - if (recordStatus == 1) { // 作废旧版本文件 + if (recordStatus == 1 || expirationStatus == 1) { // 生效、过期 oldRecordRecordDO.setCancelFlag(1); // 作废 } recordRecordMapper.updateById(oldRecordRecordDO); @@ -222,129 +224,6 @@ public class RecordRecordServiceImpl implements RecordRecordService { } - // 流程--查询记录列表 // TODO -// @Override -// public List getRecordList(RecordRecordPageReqVO pageReqVO) { -// -// String appraisalFlag = pageReqVO.getAppraisalFlag(); -// Long categoryId = pageReqVO.getCategoryId(); -// -// Page page = new Page<>(1, 999); -// -// if (appraisalFlag.equals("1")) { // 评审获取所有需要参加评审的列表 -// // 查询所有 根分类上 appraisalFlag 为 1 的数据 -// String appraisal = "\"appraisalFlag\":" + 1 + ","; -// -// List recordCategoryDOS = recordCategoryService.selectCategoryAppraisalList(appraisal, null); -// // 获取所有 分类id -// List categoryIdPath = new ArrayList<>(); -// recordCategoryDOS.forEach(item -> { -// Long id = item.getId(); -// String idPath = "/0//" + id + "//"; // 根分类的路径 -// categoryIdPath.add(idPath); -// }); -// if (ObjectUtils.isEmpty(categoryIdPath)) return new ArrayList<>(); -// // 查询 分类下面所有的记录 -// pageReqVO.setRecordStatus(1); -// IPage recordRecordDOS = recordRecordMapper.selectRecordByIdPathLike(page, pageReqVO, categoryIdPath); -// return BeanUtils.toBean(recordRecordDOS.getRecords(), RecordRecordRespVO.class); -// -// } -// // TODO 待删除 -// RecordCategoryDO recordCategoryDO = validateRecordCategoryExists(categoryId); -// if (categoryId == null) CommonResult.error(RECORD_CATEGORY_NOT_EXISTS); -// -// // 校验分类存在 -// if (ObjectUtils.isEmpty(recordCategoryDO)) return new ArrayList<>(); -// String idPath = recordCategoryDO.getIdPath(); -// -// if (ObjectUtils.isEmpty(idPath)) return new ArrayList<>(); -// Long rootCategoryId = getRootCategoryId(idPath); -// -// // 判断是否有权限 -// // 判断是否有当前分类的父分类权限 （可编辑，可查看，管理员--> 任意条件） -// RecordPermissionDO recordPermissionDO = new RecordPermissionDO(); -// recordPermissionDO.setSourceId(categoryId); -// List recordPermissionDOS = recordPermissionService.selectPermissionList(recordPermissionDO); -// -// List recordRecordList; -// -// if (recordPermissionDOS.isEmpty()) return new ArrayList<>(); -// -// boolean b = getRecordReviewList(rootCategoryId); -// if (!b) return new ArrayList<>(); -// -// String businessType = pageReqVO.getBusinessType(); -// if (ObjectUtils.isEmpty(businessType)) return new ArrayList<>(); -// -// pageReqVO.setRecordStatus(1); // 查询当前有效和 即将生效的文件 -// pageReqVO.setCancelFlag(0); // 作废状态 -// pageReqVO.setExpirationStatus(0); // 过期状态 -// -// -// IPage iPage = recordRecordMapper.selectRecordWithApplyPage(page, pageReqVO); - - /// / PageResult result = new PageResult<>(iPage.getRecords(), iPage.getTotal()); -// recordRecordList = iPage.getRecords(); -// return BeanUtils.toBean(recordRecordList, RecordRecordRespVO.class); -// -// } - - // 文件提交，修改生效状态 -// @Override -// public RecordRecordDO recordSubmitStatus(RecordRecordDO recordDO) { -// Integer recordStatus = recordDO.getRecordStatus(); -// if (recordStatus != null && recordStatus == 1) -// throw exception0(RECORD_APPLY_NOT_EXISTS.getCode(), "文件已提交，无法提交申请"); -//// RecordCategoryDO recordCategory = recordCategoryService.getRecordCategory(recordDO.getCategoryId()); -// // 获取分类的根分类Id -//// String idPath = recordCategory.getIdPath(); -//// Optional segment = RecordCommonUtils.getSegment(idPath, 1); -//// String s = segment.orElse(null); -//// if (ObjectUtils.isEmpty(s)) -//// throw exception(RECORD_APPLY_NOT_EXISTS); -//// RecordCategoryDO category = recordCategoryService.getRecordCategory(Long.valueOf(s)); -//// String customConfig = category.getCustomConfig(); -//// if (ObjectUtils.isEmpty(customConfig)) { // 空，直接判断是否到生效日期 -// // 判断是否到生效日期 -//// RecordRecordDO effectiveRecordRecordDO = isEffective(recordDO); -//// this.updateRecordRecordById(effectiveRecordRecordDO); -//// return true; -//// } -//// JSONObject jsonObject = JSONObject.parseObject(customConfig); -//// Integer submitFlag = jsonObject.getInteger("submitFlag"); -//// if (submitFlag == 0) { -// // 不允许提交，直接修改文件记录状态 -//// recordDO.setRecordStatus(1); // 已生效 -// RecordRecordDO effectiveRecordRecordDO = isEffective(recordDO); -// this.updateRecordRecordById(effectiveRecordRecordDO); -// return effectiveRecordRecordDO; -//// return true; -//// } else { // 需要走流程 -//// recordDO.setSubmitFlag(1); -//// recordDO.setRecordStatus(0); -//// this.updateRecordRecordById(recordDO); -//// } -// -//// return false; -// } -// -// // 判断文件记录生效状态 -// public RecordRecordDO isEffective(RecordRecordDO recordDO) { -// LocalDateTime effectiveDate = recordDO.getEffectiveDate(); -// if (effectiveDate == null) { // 没有生效日期，立即生效 -// recordDO.setRecordStatus(1); -// } else { -// recordDO.setRecordStatus(0); // 待生效 -// LocalDateTime now = LocalDateTime.now(); -// if (now.isAfter(effectiveDate) || now.isEqual(effectiveDate)) { -// recordDO.setRecordStatus(1); // 已生效 -// } -// } -// return recordDO; -// } - - //通过跟分类的自定义属性判断文件状态 public RecordRecordDO judgeRootCategoryJson(RecordRecordDO recordDO) { RecordCategoryDO categoryDO = recordCategoryService.getRecordCategory(recordDO.getCategoryId()); diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/record/dal/mapper/RecordPermissionMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/record/dal/mapper/RecordPermissionMapper.xml index ee3fceef..282343aa 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/record/dal/mapper/RecordPermissionMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/record/dal/mapper/RecordPermissionMapper.xml @@ -137,12 +137,13 @@ FROM T_RCD_PERM trp INNER JOIN T_RCD_RCD trr ON trr.ID = trp.SRC_ID - WHERE trp.deleted = 0 and trr.deleted = 0 and trp.CNL_FLG = '0' AND trp.EXPR_STS = '0' AND trp.SRC_TP=#{recordP.sourceType} - + WHERE trp.deleted = 0 and trr.deleted = 0 and trp.CNL_FLG = '0' AND trp.EXPR_STS = '0' AND + trp.SRC_TP=#{recordP.sourceType} + and trp.TGT_TP = '用户' AND trp.TGT_ID = #{recordP.userId} - + and (trp.tgt_tp = '部门' AND trp.tgt_id IN @@ -151,6 +152,14 @@ ) + + + and trr.name like CONCAT('%', #{recordP.recordName}, '%') + + + + and trr.CD like CONCAT('%', #{recordP.recordCode}, '%') + diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/record/dal/mapper/RecordRecordMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/record/dal/mapper/RecordRecordMapper.xml index 099c6b82..162c8ce2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/record/dal/mapper/RecordRecordMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/record/dal/mapper/RecordRecordMapper.xml @@ -39,6 +39,10 @@ FROM t_rcd_rcd trr WHERE trr.deleted = 0 and trr.EXPR_STS = 0 and trr.CNL_FLG = 0 + + AND trr.CRNT_FLG = #{reqVO.currentFlag} + + and (trr.RCD_STS = 1 or (trr.APL_STS = 'completed' and trr.EFCT_DT > now())) @@ -68,35 +72,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file