修改文件分发/文件查看添加权限，重复记录更新过期日期

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

@@ -55,8 +55,8 @@ public class RecordPermissionPageReqVO extends PageParam {
     @Schema(description = "是否保留标志")
     private String saveFlag;
 
-    @Schema(description = "保留结束日期")
+//    @Schema(description = "保留结束日期")
-    private LocalDateTime saveEndDate;
+//    private LocalDateTime saveEndDate;
 
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
@@ -64,6 +64,12 @@ public class RecordPermissionPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "生效日期")
+    private LocalDateTime effectiveDate;
+
+    @Schema(description = "申请类型")
+    private LocalDateTime applyType;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

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

@@ -70,8 +70,8 @@ public class RecordPermissionRespVO {
     @Schema(description = "是否保留标志")
     private String saveFlag;
 
-    @Schema(description = "保留结束日期")
+//    @Schema(description = "保留结束日期")
-    private LocalDateTime saveEndDate;
+//    private LocalDateTime saveEndDate;
 
     @Schema(description = "所属部门")
     @ExcelProperty("所属部门")
@@ -81,6 +81,12 @@ public class RecordPermissionRespVO {
     @ExcelProperty("备注")
     private String remark;
 
+    @Schema(description = "生效日期")
+    private LocalDateTime effectiveDate;
+
+    @Schema(description = "申请类型")
+    private LocalDateTime applyType;
+
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

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

@@ -57,12 +57,18 @@ public class RecordPermissionSaveReqVO {
     @Schema(description = "是否保留标志")
     private String saveFlag;
 
-    @Schema(description = "保留结束日期")
+//    @Schema(description = "保留结束日期")
-    private LocalDateTime saveEndDate;
+//    private LocalDateTime saveEndDate;
 
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
+    @Schema(description = "生效日期")
+    private LocalDateTime effectiveDate;
+
+    @Schema(description = "申请类型")
+    private LocalDateTime applyType;
+
     @Schema(description = "备注")
     private String remark;
 

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

@@ -27,6 +27,10 @@ public class RecordJoinPermissionRespVO extends RecordRecordRespVO{
     @ExcelProperty("记录id")
     private Long sourceId;
 
+    @Schema(description = "是否保留标志")
+    @Dict(dicCode = "yes_or_no")
+    private String saveFlag;
+
     @Schema(description = "授权类型", example = "1")
     @ExcelProperty("授权类型")
     private String targetType;
@@ -58,6 +62,12 @@ public class RecordJoinPermissionRespVO extends RecordRecordRespVO{
     @Dict(dicCode = "yes_or_no")
     private Integer permCancelFlag;
 
+    @Schema(description = "生效日期")
+    private LocalDateTime permEffectiveDate;
+
+    @Schema(description = "申请类型")
+    private String applyType;
+
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
     private LocalDateTime permCreateTime;

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

@@ -45,6 +45,11 @@ public class RecordPermissionDO extends BusinessBaseDO {
     @TableField("SRC_TP")
     private String sourceType;
     /**
+    * 记录类型
+    */
+    @TableField("APL_TP")
+    private String applyType;
+    /**
     * 记录id
     */
     @TableField("SRC_ID")
@@ -79,6 +84,11 @@ public class RecordPermissionDO extends BusinessBaseDO {
     */
     @TableField("PMNT")
     private String permanently;
+    /**
+     * 生效日期
+     */
+    @TableField("EFCT_DT")
+    private LocalDateTime effectiveDate;
     /**
     * 过期日期
     */
@@ -99,11 +109,11 @@ public class RecordPermissionDO extends BusinessBaseDO {
     */
     @TableField("SVE_FLG")
     private String saveFlag;
-    /**
+//    /**
-    * 保留结束日期
+//    * 保留结束日期
-    */
+//    */
-    @TableField("SVE_END_DT")
+//    @TableField("SVE_END_DT")
-    private LocalDateTime saveEndDate;
+//    private LocalDateTime saveEndDate;
     /**
     * 所属部门
     */

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordassign/RecordAssignServiceImpl.java

@@ -109,6 +109,7 @@ public class RecordAssignServiceImpl implements RecordAssignService {
     @Override
     public List<RecordAssignRespVO> selectListByTargetIds(List<Long> targetIds) {
         LambdaQueryWrapper<RecordAssignDO> queryWrapper = Wrappers.lambdaQuery(RecordAssignDO.class);
+        queryWrapper.eq(RecordAssignDO::getCurrentFlag, 1);
         queryWrapper.in(RecordAssignDO::getTargetId, targetIds);
         List<RecordAssignDO> recordAssignDOList = recordAssignMapper.selectList(queryWrapper);
         return BeanUtils.toBean(recordAssignDOList, RecordAssignRespVO.class);

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordpermission/RecordPermissionService.java

@@ -71,7 +71,7 @@ public interface RecordPermissionService {
 //    List<RecordPermissionDO> selectRecordPermission(RecordPermissionDO recordPermissionDO);
 
     // 批量查询
-    boolean insertRecordPermissionBatch(List<RecordPermissionDO> recordPermissionDO);
+    int insertOrUpdateRecordPermissionBatch(List<RecordPermissionDO> recordPermissionDO);
 
     List<RecordPermissionDO> selectList(LambdaQueryWrapper<RecordPermissionDO> lambdaQueryWrapper);
 
@@ -124,4 +124,8 @@ public interface RecordPermissionService {
     IPage<RecordJoinPermissionRespVO> selectRecordByPermission(RecordPermissionPageReqVO pageReqVO);
 
     IPage<RecordJoinPermissionRespVO> selectPermissionByRecord(RecordRecordPageReqVO pageReqVO);
+
+    boolean insertBatch(List<RecordPermissionDO> toInsert);
+
+    boolean updateBatch(List<RecordPermissionDO> toUpdate);
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordpermission/RecordPermissionServiceImpl.java

@@ -27,6 +27,7 @@ import com.zt.plat.module.system.api.dept.dto.DeptRespDTO;
 import com.zt.plat.module.system.api.permission.PermissionApi;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.executor.BatchResult;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
@@ -233,8 +234,9 @@ public class RecordPermissionServiceImpl implements RecordPermissionService {
 //    }
 
     @Override
-    public boolean insertRecordPermissionBatch(List<RecordPermissionDO> permissionDOList) {
+    public int insertOrUpdateRecordPermissionBatch(List<RecordPermissionDO> permissionDOList) {
-        return recordPermissionMapper.insertBatch(permissionDOList);
+        List<BatchResult> batchResults = recordPermissionMapper.insertOrUpdate(permissionDOList);
+        return batchResults.size();
     }
 
     @Override
@@ -349,6 +351,16 @@ public class RecordPermissionServiceImpl implements RecordPermissionService {
         return recordPermissionMapper.selectPermissionByRecord(page, pageReqVO);
     }
 
+    @Override
+    public boolean insertBatch(List<RecordPermissionDO> toInsert) {
+        return recordPermissionMapper.insertBatch(toInsert);
+    }
+
+    @Override
+    public boolean updateBatch(List<RecordPermissionDO> toUpdate) {
+        return recordPermissionMapper.updateBatch(toUpdate);
+    }
+
     //权限到期，定时回收权限
     public Integer expireDateExpireJob() {
         LambdaUpdateWrapper<RecordPermissionDO> updateWrapper = Wrappers.lambdaUpdate();
@@ -360,13 +372,13 @@ public class RecordPermissionServiceImpl implements RecordPermissionService {
     }
 
     //权限保留日期到期，定时回收权限
-    public Integer saveEndDateExpireJob() {
+//    public Integer saveEndDateExpireJob() {
-        LambdaUpdateWrapper<RecordPermissionDO> updateWrapper = Wrappers.lambdaUpdate();
+//        LambdaUpdateWrapper<RecordPermissionDO> updateWrapper = Wrappers.lambdaUpdate();
-        updateWrapper.eq(RecordPermissionDO::getSaveFlag, "1"); // 保留
+//        updateWrapper.eq(RecordPermissionDO::getSaveFlag, "1"); // 保留
-        updateWrapper.le(RecordPermissionDO::getSaveEndDate, LocalDateTime.now()); // 保留时间小于当前时间
+//        updateWrapper.le(RecordPermissionDO::getSaveEndDate, LocalDateTime.now()); // 保留时间小于当前时间
-        updateWrapper.set(RecordPermissionDO::getSaveFlag, "0");
+//        updateWrapper.set(RecordPermissionDO::getSaveFlag, "0");
-        return recordPermissionMapper.update(updateWrapper);
+//        return recordPermissionMapper.update(updateWrapper);
-    }
+//    }
 
 
 }

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/record/dal/mapper/RecordPermissionMapper.xml

@@ -28,7 +28,10 @@
         <result column="targetId" property="targetId"/>
         <result column="targetType" property="targetType"/>
         <result column="targetName" property="targetName"/>
+        <result column="saveFlag" property="saveFlag"/>
         <result column="permission" property="permission"/>
+        <result column="applyType" property="applyType"/>
+        <result column="permEffectiveDate" property="permEffectiveDate"/>
         <result column="permExpirationDate" property="permExpirationDate"/>
         <result column="permExpirationStatus" property="permExpirationStatus"/>
         <result column="permCancelFlag" property="permCancelFlag"/>
@@ -120,8 +123,10 @@
 
     <sql id="recordAndPermissionColumn">
         SELECT
-            trp.SRC_ID as sourceId,trp.SRC_TP as sourceType, trp.TGT_TP as targetType,trp.TGT_ID as targetId,trp.TGT_NAME as targetName,trp.PERM as permission,trp.CNL_FLG as permCancelFlag,
+            trp.SRC_ID as sourceId,trp.SRC_TP as sourceType, trp.TGT_TP as targetType,trp.TGT_ID as targetId,trp.TGT_NAME as targetName,trp.SVE_FLG as saveFlag,
-            trp.EXPR_STS as permExpirationStatus,trp.EXPR_DT as permExpirationDate, trp.CREATE_TIME as permCreateTime, trr.ID as Id,trr.CTGR_ID as categoryId,trr.CD as code, trr.NAME as name,
+            trp.APL_TP as applyType, trp.EFCT_DT as permEffectiveDate,
+            trp.PERM as permission,trp.CNL_FLG as permCancelFlag,trp.EXPR_STS as permExpirationStatus,trp.EXPR_DT as permExpirationDate,
+            trp.CREATE_TIME as permCreateTime, trr.ID as Id,trr.CTGR_ID as categoryId,trr.CD as code, trr.NAME as name,
             trr.VER as version,trr.CRNT_FLG as currentFlag,trr.MKE_DT as makeDate,trr.PMNT as permanently,
             trr.RCD_STS as recordStatus,trr.EXPR_DT as expirationDate,trr.EFCT_DT as effectiveDate,trr.EXPR_STS as expirationStatus,
             trr.CNL_FLG as cancelFlag,trr.MAIN_ID as mainId, trr.APL_STS as applyStatus, trr.CREATE_TIME as createTime