diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/RecordApplyController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/RecordApplyController.java index 2f16c590..46b0ddec 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/RecordApplyController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/RecordApplyController.java @@ -11,10 +11,7 @@ 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.common.service.BusinessFileService; -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; 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 581390b2..16fc366f 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 @@ -4,10 +4,13 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import com.zt.plat.module.qms.core.aspect.annotation.Dict; import lombok.*; + import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import com.zt.plat.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -44,8 +47,8 @@ public class RecordApplyPageReqVO extends PageParam { @Schema(description = "评审范围") private String reviewRange; -// @Schema(description = "分发目标") -// private String assignTarget; + @Schema(description = "修改标识") + private String modifyFlag; @Schema(description = "参加评审部门") private String targetDepartmentIds; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyRespVO.java index 0291308a..35d672f2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyRespVO.java @@ -56,8 +56,8 @@ public class RecordApplyRespVO { @ExcelProperty("评审范围") private String reviewRange; -// @Schema(description = "分发目标") -// private String assignTarget; + @Schema(description = "修改标识") + private String modifyFlag; @Schema(description = "参加评审部门") @ExcelProperty("参加评审部门") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplySaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplySaveReqVO.java index 759d3203..5e39f4c8 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplySaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplySaveReqVO.java @@ -45,8 +45,8 @@ public class RecordApplySaveReqVO { @ExcelProperty("部门名称") private String applyDepartmentName; -// @Schema(description = "分发目标") -// private String assignTarget; + @Schema(description = "修改标识") + private String modifyFlag; @Schema(description = "评审时间") private LocalDateTime reviewTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordassign/vo/RecordAssignPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordassign/vo/RecordAssignPageReqVO.java index da9b0118..b1c4e46e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordassign/vo/RecordAssignPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordassign/vo/RecordAssignPageReqVO.java @@ -36,7 +36,7 @@ public class RecordAssignPageReqVO extends PageParam { private LocalDateTime assignEndDate; @Schema(description = "分发号") - private Integer CollectionFlag; + private Integer collectionFlag; @Schema(description = "排序号") private Integer sortNo; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordassign/vo/RecordAssignRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordassign/vo/RecordAssignRespVO.java index a0a3e9c9..5fdc1621 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordassign/vo/RecordAssignRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordassign/vo/RecordAssignRespVO.java @@ -45,7 +45,7 @@ public class RecordAssignRespVO { private LocalDateTime assignEndDate; @Schema(description = "是否收回") - private Integer CollectionFlag; + private Integer collectionFlag; @Schema(description = "原始父级Id") private String mainId; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordassign/vo/RecordAssignSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordassign/vo/RecordAssignSaveReqVO.java index c2f0286f..9fedfc31 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordassign/vo/RecordAssignSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordassign/vo/RecordAssignSaveReqVO.java @@ -26,14 +26,14 @@ public class RecordAssignSaveReqVO { @Schema(description = "分发号") private String assignCode; - @Schema(description = "分发结束时间") + @Schema(description = "分发开始时间") private LocalDateTime assignStartDate; - @Schema(description = "是否收回") + @Schema(description = "分发结束时间") private LocalDateTime assignEndDate; - @Schema(description = "分发号") - private Integer CollectionFlag; + @Schema(description = "是否收回") + private Integer collectionFlag; @Schema(description = "排序号") private Integer sortNo; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordcategory/RecordCategoryController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordcategory/RecordCategoryController.java index bc9dca9e..92797e20 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordcategory/RecordCategoryController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordcategory/RecordCategoryController.java @@ -73,7 +73,6 @@ public class RecordCategoryController extends AbstractFileUploadController imple @PostMapping("/create-temp-data") @Operation(summary = "创建文件记录分类临时数据") public CommonResult createRecordTempCategory(@RequestBody RecordCategorySaveReqVO createReqVO) { -// RecordCategorySaveReqVO recordCategoryRespVO = new RecordCategorySaveReqVO(); return success(recordCategoryService.createRecordCategory(createReqVO)); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordcategory/vo/RecordCategoryPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordcategory/vo/RecordCategoryPageReqVO.java index 002fb122..861361a2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordcategory/vo/RecordCategoryPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordcategory/vo/RecordCategoryPageReqVO.java @@ -35,6 +35,9 @@ public class RecordCategoryPageReqVO extends PageParam { @Schema(description = "排序号") private Integer sortNo; + @Schema(description = "排序号") + private String cancelFlag; + @Schema(description = "其他配置") private String customConfig; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordpermission/RecordPermissionController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordpermission/RecordPermissionController.java index a81fdddd..5fae416a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordpermission/RecordPermissionController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordpermission/RecordPermissionController.java @@ -123,8 +123,8 @@ public class RecordPermissionController extends AbstractFileUploadController imp return success(BeanUtils.toBean(matchedPermissionList, RecordPermissionRespVO.class)); } - @GetMapping("/page") - @Operation(summary = "获得记录权限分页") +// @GetMapping("/page") +// @Operation(summary = "获得记录权限分页") //@PreAuthorize("@ss.hasPermission('qms:record-permission:query')") public CommonResult> getRecordPermissionPage(@Valid RecordPermissionPageReqVO pageReqVO) { PageResult pageResult = recordPermissionService.getRecordPermissionPage(pageReqVO); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/vo/RecordRecordPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/vo/RecordRecordPageReqVO.java index 2d4b282a..16a5d11b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/vo/RecordRecordPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/vo/RecordRecordPageReqVO.java @@ -72,10 +72,10 @@ public class RecordRecordPageReqVO extends PageParam { private LocalDateTime[] effectiveDate; @Schema(description = "过期标识,0-有效，1-过期", example = "1") - private Integer expirationStatus; + private String expirationStatus; @Schema(description = "作废标志,0-有效，1-作废") - private Integer cancelFlag; + private String cancelFlag; @Schema(description = "表单数据") private String formData; 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 1a3f3bc4..d38d4922 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 @@ -86,11 +86,11 @@ public class RecordApplyDO extends BusinessBaseDO { */ @TableField("RVW_RNG") private String reviewRange; -// /** -// * 分发目标 -// */ -// @TableField("ASN_TGT") -// private String assignTarget; + /** + * 修改标志 + */ + @TableField("MDF_FLG") + private String modifyFlag; /** * 目标部门 */ diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordassign/RecordAssignDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordassign/RecordAssignDO.java index 09c6cb08..e35d16fb 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordassign/RecordAssignDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordassign/RecordAssignDO.java @@ -65,7 +65,7 @@ public class RecordAssignDO extends BusinessBaseDO { * 是否收回 */ @TableField("COLT_FLG") - private Integer CollectionFlag; + private Integer collectionFlag; /** * 排序 */ diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordcategory/RecordCategoryDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordcategory/RecordCategoryDO.java index cac26108..59277527 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordcategory/RecordCategoryDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordcategory/RecordCategoryDO.java @@ -66,6 +66,11 @@ public class RecordCategoryDO extends BusinessBaseDO { */ @TableField("SRT_NO") private Integer sortNo; + /** + * 取消标识 + */ + @TableField("CNL_FLG") + private String cancelFlag; /** * 自定义配置 */ diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordpermission/RecordPermissionDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordpermission/RecordPermissionDO.java index 517097bf..f3411310 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordpermission/RecordPermissionDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordpermission/RecordPermissionDO.java @@ -115,4 +115,18 @@ public class RecordPermissionDO extends BusinessBaseDO { @TableField("RMK") private String remark; + + //==================================== + + + // ==================扩展字段======================= + @TableField(exist = false) + private Long userId; + + @TableField(exist = false) + private List userDeptIds; + + @TableField(exist = false) + private Set userRoles; + } \ 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 f6660fc8..b68d3e53 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 @@ -1,19 +1,11 @@ package com.zt.plat.module.qms.resource.record.dal.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo.RecordApplyJoinPageVO; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; 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.recordrecord.vo.RecordRecordRespVO; import com.zt.plat.module.qms.resource.record.dal.dataobject.recordapply.RecordApplyDO; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; - -import java.util.List; /** * 文件记录通用申请 Mapper diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordCategoryMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordCategoryMapper.java index 70e6c281..445d3114 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordCategoryMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordCategoryMapper.java @@ -18,6 +18,7 @@ public interface RecordCategoryMapper extends BaseMapperX { default PageResult selectPage(RecordCategoryPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(RecordCategoryDO::getCancelFlag, "1") .eqIfPresent(RecordCategoryDO::getParentId, reqVO.getParentId()) .eqIfPresent(RecordCategoryDO::getIdPath, reqVO.getIdPath()) .likeIfPresent(RecordCategoryDO::getName, reqVO.getName()) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordPermissionMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordPermissionMapper.java index 95f9933c..2db87fb9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordPermissionMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordPermissionMapper.java @@ -4,6 +4,7 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.vo.RecordPermissionPageReqVO; +import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordPageReqVO; import com.zt.plat.module.qms.resource.record.dal.dataobject.recordpermission.RecordPermissionDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -46,18 +47,13 @@ public interface RecordPermissionMapper extends BaseMapperX * 2. 或用户所在部门有权限 (targetType='部门' AND targetId in userDepts) * 3. 或用户的角色有权限 (targetType='角色' AND targetId in userRoles) */ - List selectPermissionList(@Param("recordP") RecordPermissionDO recordP, - @Param("userId") Long userId, - @Param("userDepts") List userDepts, - @Param("userRoles") Set userRoles); // permission: 管理员/可编辑/可查看 + List selectPermissionList(@Param("recordP") RecordPermissionDO recordP); // permission: 管理员/可编辑/可查看 /** * 检查用户是否有记录的权限 * 查询条件：permission='可查看' AND * 1. 用户 ( targetId=userId AND targetType='用户') * 2. 部门 (targetType='部门' AND targetId in userDepts) */ - List selectRecordPermissionList(@Param("recordP") RecordPermissionDO recordP, - @Param("userId") Long userId, - @Param("userDepts") List userDepts); // permission: 管理员/可编辑/可查看 + List selectRecordPermissionList(@Param("recordP") RecordPermissionDO recordP); // permission: 管理员/可编辑/可查看 } \ 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/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 c54ae706..82e67fa8 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 @@ -5,17 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo.RecordApplyJoinPageVO; 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.recordpermission.RecordPermissionDO; import com.zt.plat.module.qms.resource.record.dal.dataobject.recordrecord.RecordRecordDO; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; /** * 文件、模板、记录 Mapper diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordapply/RecordApplyService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordapply/RecordApplyService.java index 8775f94d..bef2af00 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordapply/RecordApplyService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordapply/RecordApplyService.java @@ -4,11 +4,9 @@ import com.alibaba.fastjson.JSONObject; import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.module.qms.api.task.dto.QmsBpmDTO; -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.dal.dataobject.recordapply.RecordApplyDO; import jakarta.validation.Valid; 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 ae75541f..246b736a 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 @@ -4,8 +4,6 @@ import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; @@ -23,7 +21,6 @@ import com.zt.plat.module.qms.enums.QmsBpmConstant; import com.zt.plat.module.qms.enums.QmsCommonConstant; import com.zt.plat.module.qms.resource.record.common.RecordCommonUtils; import com.zt.plat.module.qms.resource.record.constant.RecordConstants; -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; @@ -36,7 +33,6 @@ import com.zt.plat.module.qms.resource.record.dal.dataobject.recordpermission.Re import com.zt.plat.module.qms.resource.record.dal.dataobject.recordrecord.RecordRecordDO; import com.zt.plat.module.qms.resource.record.dal.mapper.RecordApplyMapper; import com.zt.plat.module.qms.resource.record.service.recordapplydetail.RecordApplyDetailService; -import com.zt.plat.module.qms.resource.record.service.recordassign.RecordAssignService; import com.zt.plat.module.qms.resource.record.service.recordcategory.RecordCategoryService; import com.zt.plat.module.qms.resource.record.service.recordpermission.RecordPermissionService; import com.zt.plat.module.qms.resource.record.service.recordrecord.RecordRecordService; @@ -91,9 +87,6 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn @Resource private BusinessFileService businessFileService; - @Resource - private RecordAssignService recordAssignService; - @Override public RecordApplyRespVO createRecordApply(RecordApplySaveReqVO createReqVO) { // 插入 @@ -203,12 +196,8 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn public RecordApplyDO getRecordApply(Long id) { RecordApplyDO recordApplyDO = recordApplyMapper.selectById(id); if (ObjectUtils.isEmpty(recordApplyDO)) return recordApplyDO; - String businessType = recordApplyDO.getBusinessType(); List recordApplyDetailDOS; -// if (businessType.equals(RecordConstants.BusinessType.DISTRIBUTION)) - recordApplyDetailDOS = recordApplyDetailService.selectAllList(id); -// else -// recordApplyDetailDOS = recordApplyDetailService.selectDetailAndRecordList(id); + recordApplyDetailDOS = recordApplyDetailService.selectAllList(id); recordApplyDO.setDetailList(recordApplyDetailDOS); return recordApplyDO; } @@ -257,7 +246,7 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn List detailList = param.getDetailList(); if (ObjectUtils.isEmpty(detailList)) throw exception0(RECORD_APPLY_NOT_EXISTS.getCode(), "没有找到文件记录数据"); - // TODO + RecordApplyDO recordApply = createApply(param); return createApplyDetailData(param, recordApply); @@ -296,7 +285,7 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn throw exception0(RECORD_APPLY_NOT_EXISTS.getCode(), "没有找到文件记录数据"); boolean recordApplyDetailBatch = recordApplyDetailService.createRecordApplyDetailBatch(detailSaveReqVOList); if (!recordApplyDetailBatch) - throw exception(RECORD_APPLY_NOT_EXISTS, "保存申请明细失败"); + throw exception0(RECORD_APPLY_NOT_EXISTS.getCode(), "保存申请明细失败"); return CommonResult.success(BeanUtils.toBean(recordApply, RecordApplyRespVO.class)); } @@ -333,14 +322,10 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn // 添加更改申请明细 public List addUpdateDetail(List detailList, RecordApplyDO recordApplyDO) { List detailSaveReqVOList = new ArrayList<>(); - for (RecordApplyDetailSaveReqVO item : detailList) { - RecordApplyDetailDO recordApplyDetailDO = new RecordApplyDetailDO(); - recordApplyDetailDO.setApplyId(recordApplyDO.getId()); - recordApplyDetailDO.setDocumentId(item.getDocumentId()); - recordApplyDetailDO.setIsModify(item.getIsModify()); - recordApplyDetailDO.setModifyCause(item.getModifyCause()); - recordApplyDetailDO.setFormData(item.getFormData()); - detailSaveReqVOList.add(recordApplyDetailDO); + List detailDOList = BeanUtils.toBean(detailList, RecordApplyDetailDO.class); + for (RecordApplyDetailDO item : detailDOList) { + item.setApplyId(recordApplyDO.getId()); + detailSaveReqVOList.add(item); } return detailSaveReqVOList; } @@ -374,7 +359,7 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn recordApplyDetailDO.setTargetType(RecordConstants.TargetType.USER); // 用户 recordApplyDetailDO.setSaveFlag(item.getSaveFlag()); recordApplyDetailDO.setEndDate(item.getEndDate()); -// recordApplyDetailDO.setFormData(item.getFormData()); + recordApplyDetailDO.setFormData(item.getFormData()); detailSaveReqVOList.add(recordApplyDetailDO); } return detailSaveReqVOList; @@ -384,7 +369,6 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn public List addRecordSubmitDetail(Long recordId, Long applyId) { List detailSaveReqVOList = new ArrayList<>(); RecordApplyDetailDO recordApplyDetailDO = new RecordApplyDetailDO(); -// Long recordId = param.getDetailList().get(0).getDocumentId(); recordApplyDetailDO.setApplyId(applyId); recordApplyDetailDO.setDocumentId(recordId); // 文件Id recordApplyDetailDO.setTargetType(RecordConstants.TargetType.USER); @@ -426,8 +410,6 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn recordRecordService.updateRecordRecordById(effectiveRecordRecordDO); return true; } else { // 需要走流程 - // 判断是否到生效日期 -// RecordRecordDO effectiveRecordRecordDO = isEffective(recordDO); recordDO.setSubmitFlag(1); recordDO.setRecordStatus(0); recordRecordService.updateRecordRecordById(recordDO); @@ -451,8 +433,8 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn return recordDO; } +// 修改评审状态 public void updateReviewFlag(Long applyId) { -// Long[] recordIdS = param.getRecordIdS(); List recordApplyDetailDOS = recordApplyDetailService.selectAllList(applyId); // 修改recordRecord的submitFlag 字段状态为0，评审中 List recordRecordDOS = new ArrayList<>(); @@ -643,7 +625,7 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn recordApplyDO.setBusinessStatus(QmsCommonConstant.VOID); } recordApplyMapper.updateById(recordApplyDO); - if (businessType.equals(RecordConstants.BusinessType.RECORD_SUBMIT)){ // 文件申请, 更新文件记录审批状态 + if (businessType.equals(RecordConstants.BusinessType.RECORD_SUBMIT)) { // 文件申请, 更新文件记录审批状态 RecordRecordDO recordRecordDO = new RecordRecordDO(); recordRecordDO.setId(recordApplyDetailDOS.get(0).getDocumentId()); recordRecordDO.setApplyStatus(QmsCommonConstant.VOID); @@ -669,7 +651,8 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn JSONObject ret = new JSONObject(); return CommonResult.success(ret); } - public String processHandle(String businessType, List recordApplyDetailDOS){ + + public String processHandle(String businessType, List recordApplyDetailDOS) { switch (businessType) { case RecordConstants.BusinessType.RECORD_SUBMIT: recordSubmitCallHandle(recordApplyDetailDOS); @@ -678,13 +661,13 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn reviewCallHandle(recordApplyDetailDOS); break; case RecordConstants.BusinessType.DISTRIBUTION: // 分发 - recordPermissionAdd(recordApplyDetailDOS); + recordPermissionAdd(recordApplyDetailDOS,businessType); // 更改申请流程 break; case RecordConstants.BusinessType.RECORD_UPDATE: // 修改申请 break; case RecordConstants.BusinessType.VIEW_APPLY: // 查看申请 - recordPermissionAdd(recordApplyDetailDOS); + recordPermissionAdd(recordApplyDetailDOS,businessType); break; case RecordConstants.BusinessType.INVALID: // 作废 -- > 回收权限 recordInvalidFlowStatus(recordApplyDetailDOS); @@ -709,24 +692,38 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn // 评审通过，处理修改修改的文件，走更改申请流程 public void reviewCallHandle(List recordApplyDetailDOS) { List detailDOList = new ArrayList<>(); - // 1条申请----> 多条明细记录 ----> 多条文件记录 + for (RecordApplyDetailDO applyDetailDO : recordApplyDetailDOS) { - if (applyDetailDO.getIsModify() == 1) { //是否修改，是：直接创建更改申请 - RecordApplyDetailSaveReqVO detailDO = new RecordApplyDetailSaveReqVO(); - detailDO.setDocumentId(applyDetailDO.getDocumentId()); - detailDO.setIsModify(1); - detailDO.setModifyCause(applyDetailDO.getModifyCause()); - detailDO.setApplyStartDate(LocalDateTime.now()); - detailDOList.add(detailDO); - } - } - // 文件评审通过了，如果需要修改文件，直接申请流程 - if (!ObjectUtils.isEmpty(detailDOList)) { + if (applyDetailDO.getIsModify() != 1) continue; //是否修改，是：直接创建更改申请 + RecordApplyDetailSaveReqVO detailDO = new RecordApplyDetailSaveReqVO(); + Long documentId = applyDetailDO.getDocumentId(); + detailDO.setDocumentId(documentId); + detailDO.setIsModify(1); + detailDO.setModifyCause(applyDetailDO.getModifyCause()); + detailDO.setApplyStartDate(LocalDateTime.now()); + String formData = applyDetailDO.getFormData(); + JSONObject formDataJson = JSONObject.parseObject(formData); + // 把documentId 存到 formDataJson 中key = id 的里面 + formDataJson.put("id", documentId); +// detailDO.setFormData(formDataJson.toJSONString()); + detailDOList.add(detailDO); + // 创建更改申请 RecordApplySaveReqVO recordApplyRespVO = new RecordApplySaveReqVO(); recordApplyRespVO.setBusinessType(RecordConstants.BusinessType.RECORD_UPDATE); + recordApplyRespVO.setModifyFlag("1"); + recordApplyRespVO.setApplyContent(applyDetailDO.getModifyCause()); // 修改原因 + recordApplyRespVO.setFormData(formDataJson.toJSONString()); recordApplyRespVO.setDetailList(detailDOList); createApplyData(recordApplyRespVO); + } + // 文件评审通过了，如果需要修改文件，直接申请流程 +// if (!ObjectUtils.isEmpty(detailDOList)) { +// RecordApplySaveReqVO recordApplyRespVO = new RecordApplySaveReqVO(); +// recordApplyRespVO.setBusinessType(RecordConstants.BusinessType.RECORD_UPDATE); +// recordApplyRespVO.setDetailList(detailDOList); +// createApplyData(recordApplyRespVO); +// } } // 文件提交-更改状态 @@ -735,7 +732,7 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn recordRecordService.updateRecordRecordById(recordDO); } - // 文件批量跟新状态 + // 作废：文件批量跟新状态 public void recordInvalidFlowStatus(List recordApplyDetailDOS) { List recordIds = recordApplyDetailDOS.stream().map(RecordApplyDetailDO::getDocumentId).toList(); // 修改文件状态为已生效 @@ -745,10 +742,11 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn updateWrapper.set(RecordRecordDO::getRecordStatus, 0); recordRecordService.updateRecord(updateWrapper); - // 回收文件权限 + // 回收文件权限,如果需要保留的权限，则不回收 LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.eq(RecordPermissionDO::getSourceType, RecordConstants.PermissionSourceType.RECORD); update.eq(RecordPermissionDO::getCancelFlag, "0"); // 未回收 + update.eq(RecordPermissionDO::getSaveFlag, "0"); // 未保留 update.in(RecordPermissionDO::getSourceId, recordIds); // 记录id update.set(RecordPermissionDO::getCancelFlag, "1"); // 设置为已回收 recordPermissionService.updatePermission(update); @@ -781,27 +779,24 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn } // 文件分发/申请-添加权限 - public void recordPermissionAdd(List recordApplyDetailDOS) { + public void recordPermissionAdd(List recordApplyDetailDOS,String businessType) { LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); for (RecordApplyDetailDO applyDetailDO : recordApplyDetailDOS) { // 添加记录 String targetType = applyDetailDO.getTargetType(); + if (businessType.equals(RecordConstants.BusinessType.VIEW_APPLY)) + targetType = RecordConstants.TargetType.USER; + if (ObjectUtils.isEmpty(targetType)) - throw exception(RECORD_APPLY_NOT_EXISTS, "分发对象类型不能为空"); - // 通过-----> 创建人员权限表记录 -// String formData = applyDetailDO.getFormData(); -// JSONObject jsonObject = JSONObject.parseObject(formData, JSONObject.class); -// //TODO -// Object expirationDate = jsonObject.getTimestamp("expirationDate"); -// LocalDateTime localDateTime = convertToLocalDateTime(endDate); + throw exception0(RECORD_APPLY_NOT_EXISTS.getCode(), "分发对象类型不能为空"); + RecordPermissionDO permissionDO = new RecordPermissionDO(); String saveFlag = applyDetailDO.getSaveFlag(); // 文件查看使用 LocalDateTime endDate = applyDetailDO.getEndDate(); if (!ObjectUtils.isEmpty(saveFlag)) { permissionDO.setSaveFlag(saveFlag); -// permissionDO.setSaveEndDate(endDate); - } + }else permissionDO.setSaveFlag("1"); // 默认保留 List permissionDOList = new ArrayList<>(); permissionDO.setExpirationDate(endDate); // 过期效期 permissionDO.setPermission(RecordConstants.PermissionType.VIEW); // 可查看 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordassign/RecordAssignServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordassign/RecordAssignServiceImpl.java index b4c63158..6a01d693 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordassign/RecordAssignServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordassign/RecordAssignServiceImpl.java @@ -51,9 +51,9 @@ public class RecordAssignServiceImpl implements RecordAssignService { public void updateRecordAssign(RecordAssignSaveReqVO updateReqVO) { Long id = updateReqVO.getId(); - Integer isModify = updateReqVO.getIsModify(); + Integer collectionFlag = updateReqVO.getCollectionFlag(); RecordAssignDO updateObj = BeanUtils.toBean(updateReqVO, RecordAssignDO.class); - if (!ObjectUtils.isEmpty(isModify) && isModify == 1) { // 修改 + if (!ObjectUtils.isEmpty(collectionFlag) && collectionFlag == 1) { // 修改 updateReqVO.setId(null); createRecordAssign(updateReqVO); // 创建新记录 // 校验存在 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordcategory/RecordCategoryServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordcategory/RecordCategoryServiceImpl.java index f72a4a45..b6175f44 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordcategory/RecordCategoryServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordcategory/RecordCategoryServiceImpl.java @@ -44,6 +44,7 @@ public class RecordCategoryServiceImpl implements RecordCategoryService { public RecordCategoryRespVO createRecordCategory(RecordCategorySaveReqVO createReqVO) { // 插入 RecordCategoryDO recordCategory = BeanUtils.toBean(createReqVO, RecordCategoryDO.class); + recordCategory.setCancelFlag("-1"); // 临时数据 int insert = recordCategoryMapper.insert(recordCategory); if (insert <= 0) throw exception(RECORD_CATEGORY_NOT_EXISTS); Long id = recordCategory.getId();// 获取插入后的ID @@ -120,7 +121,7 @@ public class RecordCategoryServiceImpl implements RecordCategoryService { updateObj.setIdPath(parentCategory.getIdPath() + "/" + updateObj.getId()); } } - + updateObj.setCancelFlag("1"); // 更新当前数据 recordCategoryMapper.updateById(updateObj); @@ -210,14 +211,18 @@ public class RecordCategoryServiceImpl implements RecordCategoryService { // 获取所有分类树 @Override public List getRecordCategoryTree(RecordCategoryPageReqVO pageReqVO) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); - queryWrapper.orderByAsc(RecordCategoryDO::getSortNo); // 升序 - String name = pageReqVO.getName(); - if (!ObjectUtils.isEmpty(name)) queryWrapper.eq(RecordCategoryDO::getName, name); + pageReqVO.setPageSize(9999); + pageReqVO.setPageNo(1); +// LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); +// queryWrapper.orderByAsc(RecordCategoryDO::getSortNo); // 升序 +// String name = pageReqVO.getName(); +// if (!ObjectUtils.isEmpty(name)) queryWrapper.eq(RecordCategoryDO::getName, name); // 需要过滤name=null和""的情况 - queryWrapper.isNotNull(RecordCategoryDO::getName); // 排除 name 为 NULL 的数据 - queryWrapper.ne(RecordCategoryDO::getName, ""); // 排除 name 为空字符串的数据 - return recordCategoryMapper.selectList(queryWrapper); +// queryWrapper.isNotNull(RecordCategoryDO::getName); // 排除 name 为 NULL 的数据 +// queryWrapper.ne(RecordCategoryDO::getName, ""); // 排除 name 为空字符串的数据 + pageReqVO.setCancelFlag("1"); + PageResult recordCategoryDOPageResult = recordCategoryMapper.selectPage(pageReqVO); + return recordCategoryDOPageResult.getList(); } @Override diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordpermission/RecordPermissionService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordpermission/RecordPermissionService.java index 4ab7fb2d..eea821e6 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordpermission/RecordPermissionService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordpermission/RecordPermissionService.java @@ -6,6 +6,7 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.vo.RecordPermissionPageReqVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.vo.RecordPermissionRespVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.vo.RecordPermissionSaveReqVO; +import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordPageReqVO; import com.zt.plat.module.qms.resource.record.dal.dataobject.recordpermission.RecordPermissionDO; import jakarta.validation.Valid; @@ -65,7 +66,7 @@ public interface RecordPermissionService { List selectAllListBySourceId(RecordPermissionDO recordPermissionDO); - List selectRecordPermission(RecordPermissionDO recordPermissionDO); +// List selectRecordPermission(RecordPermissionDO recordPermissionDO); // 批量查询 boolean insertRecordPermissionBatch(List recordPermissionDO); @@ -81,7 +82,7 @@ public interface RecordPermissionService { List selectPermissionList(RecordPermissionDO recordPermissionDO); // 检查用户是否有记录的权限,返回权限列表 - List selectRecordPermissionList(RecordPermissionDO recordPermissionDO); + List selectRecordPermissionList(); /** * 判断当前分类是否有管理员权限 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordpermission/RecordPermissionServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordpermission/RecordPermissionServiceImpl.java index 19331b8f..5048d634 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordpermission/RecordPermissionServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordpermission/RecordPermissionServiceImpl.java @@ -5,41 +5,36 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.xxl.job.core.context.XxlJobHelper; -import com.xxl.job.core.handler.annotation.XxlJob; import com.zt.plat.framework.common.biz.system.permission.PermissionCommonApi; import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.security.core.LoginUser; import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils; -import com.zt.plat.module.qms.core.aspect.annotation.QmsPermission; import com.zt.plat.module.qms.enums.QmsPermissionConstant; import com.zt.plat.module.qms.resource.record.constant.RecordConstants; import com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.vo.RecordPermissionPageReqVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.vo.RecordPermissionRespVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.vo.RecordPermissionSaveReqVO; -import com.zt.plat.module.qms.resource.record.dal.dataobject.recordcategory.RecordCategoryDO; +import com.zt.plat.module.qms.resource.record.dal.dataobject.recordpermission.RecordPermissionDO; +import com.zt.plat.module.qms.resource.record.dal.mapper.RecordPermissionMapper; import com.zt.plat.module.system.api.dept.DeptApi; import com.zt.plat.module.system.api.dept.dto.DeptRespDTO; -import com.zt.plat.module.system.api.dept.dto.DeptSimpleRespDTO; import com.zt.plat.module.system.api.permission.PermissionApi; -import com.zt.plat.module.system.api.permission.RoleApi; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import java.time.LocalDateTime; -import java.util.*; - -import com.zt.plat.module.qms.resource.record.dal.dataobject.recordpermission.RecordPermissionDO; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.util.object.BeanUtils; - -import com.zt.plat.module.qms.resource.record.dal.mapper.RecordPermissionMapper; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; +import static com.zt.plat.module.qms.enums.ErrorCodeConstants.RECORD_PERMISSION_NOT_EXISTS; /** * 记录权限 Service 实现类 @@ -63,9 +58,9 @@ public class RecordPermissionServiceImpl implements RecordPermissionService { @Resource private DeptApi deptApi; - private List deptIds = new ArrayList<>(); - - private Set roles = new HashSet<>(); +// private List deptIds = new ArrayList<>(); +// +// private Set roles = new HashSet<>(); /** * 通过分类Id 获取满足当前用户的权限列表 @@ -74,30 +69,36 @@ public class RecordPermissionServiceImpl implements RecordPermissionService { * @return */ @Override - public List selectPermissionList(RecordPermissionDO recordPermissionDO) { + public List selectPermissionList(RecordPermissionDO permissionDO) { LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); Long userId = loginUser.getId(); List deptIds = getParentDepts(); Set roles = getRoles(userId); if (deptIds.isEmpty()) deptIds = new ArrayList<>(); if (roles.isEmpty()) roles = new HashSet<>(); + permissionDO.setUserId(userId); // 当前用户ID + permissionDO.setUserDeptIds(deptIds); // 当前用户部门ID + permissionDO.setUserRoles(roles); // 当前用户部门ID // 查询用户是否有该分类的管理员权限 - return recordPermissionMapper.selectPermissionList(recordPermissionDO, userId, deptIds, roles); + return recordPermissionMapper.selectPermissionList(permissionDO); } // 检查用户是否有记录的权限,返回权限列表 @Override - public List selectRecordPermissionList(RecordPermissionDO recordPermissionDO) { + public List selectRecordPermissionList() { LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); Long userId = loginUser.getId(); List deptIds = getParentDepts(); - if (deptIds.isEmpty()) deptIds = new ArrayList<>(); - // 查询用户是否有该分类的管理员权限 +// if (deptIds.isEmpty()) deptIds = new ArrayList<>(); +// // 查询用户是否有该分类的管理员权限 + RecordPermissionDO permissionDO = new RecordPermissionDO(); String view = RecordConstants.PermissionType.VIEW; - recordPermissionDO.setPermission(view); + permissionDO.setPermission(view); String record = RecordConstants.PermissionSourceType.RECORD; - recordPermissionDO.setSourceType(record); - return recordPermissionMapper.selectRecordPermissionList(recordPermissionDO, userId, deptIds); + permissionDO.setSourceType(record); + permissionDO.setUserId(userId); // 当前用户ID + permissionDO.setUserDeptIds(deptIds); // 当前用户部门ID + return recordPermissionMapper.selectRecordPermissionList(permissionDO); } @@ -147,7 +148,8 @@ public class RecordPermissionServiceImpl implements RecordPermissionService { // if (!ObjectUtils.isEmpty(roles)) return roles; CommonResult> userRoleIdListByUserId = permissionApi.getUserRoleIdListByUserId(userId); Set userRoles = userRoleIdListByUserId.getData(); - roles.addAll(userRoles); +// Set roles = new HashSet<>(); +// roles.addAll(userRoles); return userRoles; } @@ -202,7 +204,7 @@ public class RecordPermissionServiceImpl implements RecordPermissionService { LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); Long userId = loginUser.getId(); CommonResult booleanCommonResult = permissionCommonApi.hasAnyRoles(userId, QmsPermissionConstant.ADMIN_ROLE); - log.info("booleanCommonResult:{}", booleanCommonResult.getData()); +// log.info("booleanCommonResult:{}", booleanCommonResult.getData()); return booleanCommonResult.getData(); } @@ -217,18 +219,18 @@ public class RecordPermissionServiceImpl implements RecordPermissionService { } // 查询管理员-- 单条数据 - @Override - public List selectRecordPermission(RecordPermissionDO recordPermissionDO) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); - queryWrapper.eq(RecordPermissionDO::getTargetId, recordPermissionDO.getTargetId()); - queryWrapper.eq(RecordPermissionDO::getTargetType, recordPermissionDO.getTargetType()); - queryWrapper.eq(RecordPermissionDO::getPermission, recordPermissionDO.getPermission()); - if (!ObjectUtils.isEmpty(recordPermissionDO.getSourceId())) - queryWrapper.eq(RecordPermissionDO::getSourceId, recordPermissionDO.getSourceId()); - if (!ObjectUtils.isEmpty(recordPermissionDO.getSourceType())) - queryWrapper.eq(RecordPermissionDO::getSourceType, recordPermissionDO.getSourceType()); - return recordPermissionMapper.selectList(queryWrapper); - } +// @Override +// public List selectRecordPermission(RecordPermissionDO recordPermissionDO) { +// LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); +// queryWrapper.eq(RecordPermissionDO::getTargetId, recordPermissionDO.getTargetId()); +// queryWrapper.eq(RecordPermissionDO::getTargetType, recordPermissionDO.getTargetType()); +// queryWrapper.eq(RecordPermissionDO::getPermission, recordPermissionDO.getPermission()); +// if (!ObjectUtils.isEmpty(recordPermissionDO.getSourceId())) +// queryWrapper.eq(RecordPermissionDO::getSourceId, recordPermissionDO.getSourceId()); +// if (!ObjectUtils.isEmpty(recordPermissionDO.getSourceType())) +// queryWrapper.eq(RecordPermissionDO::getSourceType, recordPermissionDO.getSourceType()); +// return recordPermissionMapper.selectList(queryWrapper); +// } @Override public boolean insertRecordPermissionBatch(List permissionDOList) { @@ -332,6 +334,7 @@ public class RecordPermissionServiceImpl implements RecordPermissionService { updateWrapper.eq(RecordPermissionDO::getExpirationStatus, "0"); // 未过期 updateWrapper.le(RecordPermissionDO::getExpirationDate, LocalDateTime.now()); // 过期时间小于当前时间 updateWrapper.set(RecordPermissionDO::getExpirationStatus, "1"); + updateWrapper.set(RecordPermissionDO::getSaveFlag, "0"); // 回收没有需要保留的权限 return recordPermissionMapper.update(updateWrapper); } 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 cd15c76e..a44efc02 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 @@ -419,7 +419,6 @@ public class RecordRecordServiceImpl implements RecordRecordService { List recordIds) { List categoryIds = selectCategoryIds(categoryId); LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(); -// pageReqVO.setCategoryId(null); lambdaQueryWrapper.in(RecordRecordDO::getCategoryId, categoryIds); if (!ObjectUtils.isEmpty(pageReqVO.getCurrentFlag())) lambdaQueryWrapper.like(RecordRecordDO::getCurrentFlag, pageReqVO.getCurrentFlag());// 查询最新版本/旧版本 @@ -455,16 +454,11 @@ public class RecordRecordServiceImpl implements RecordRecordService { // 没有分类的权限，判断是否有文件记录的权限，并获取记录列表 if (ObjectUtils.isEmpty(recordPermissionDOS)) { -// LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); -// Long userId = loginUser.getId(); -// List parentDepts = recordPermissionService.getParentDepts(); - // TODO -// IPage iPage = recordRecordMapper.selectRecordPermissionList(page, pageReqVO, userId, parentDepts); -// return new PageResult<>(iPage.getRecords(), iPage.getTotal()); - RecordPermissionDO permissionDO = new RecordPermissionDO(); - permissionDO.setCancelFlag("0"); // 作废 - permissionDO.setExpirationStatus("0"); // 过期 - List permissionDOList = recordPermissionService.selectRecordPermissionList(permissionDO); + +// RecordPermissionDO permissionDO = new RecordPermissionDO(); +// permissionDO.setCancelFlag("0"); // 作废 +// permissionDO.setExpirationStatus("0"); // 过期 + List permissionDOList = recordPermissionService.selectRecordPermissionList(); if (ObjectUtils.isEmpty(permissionDOList)) return PageResult.empty(); //获取有权限的记录Id @@ -501,6 +495,7 @@ public class RecordRecordServiceImpl implements RecordRecordService { @Override public PageResult getRecordHistoryPage(RecordRecordPageReqVO pageReqVO) { Long mainId = pageReqVO.getMainId(); + pageReqVO.setCurrentFlag(0); // 查询历史版本 if (ObjectUtils.isEmpty(mainId)) throw exception(RECORD_RECORD_NOT_EXISTS); return recordRecordMapper.selectPage(pageReqVO); } 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 d2e4a066..21b62c4f 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 @@ -24,10 +24,11 @@ rp.SVE_FLG as saveFlag - - SELECT - + FROM t_rcd_ctgr rc INNER JOIN t_rcd_perm rp ON rc.id = rp.src_id WHERE rp.deleted = 0 and rc.deleted = 0 AND rc.id = #{recordP.sourceId} @@ -35,27 +36,27 @@ and rp.perm = #{recordP.permission} AND ( - ( rp.tgt_id = #{userId} AND rp.tgt_tp = '用户') - - OR - (rp.tgt_tp = '部门' AND rp.tgt_id IN - - #{deptId} - - ) - - - OR - (rp.tgt_tp = '角色' AND rp.tgt_id IN - - #{roleId} - - ) - + ( rp.tgt_id = #{recordP.userId} AND rp.tgt_tp = '用户') + + OR + (rp.tgt_tp = '部门' AND rp.tgt_id IN + + #{deptId} + + ) + + + OR + (rp.tgt_tp = '角色' AND rp.tgt_id IN + + #{roleId} + + ) + ) - + + + \ No newline at end of file