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

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

@@ -12,7 +12,10 @@ 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.module.qms.resource.record.controller.admin.recordapply.vo.RecordApplyDetailJoinPageVO;
+
+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;
@@ -114,13 +117,6 @@ public class RecordApplyController extends AbstractFileUploadController implemen
         
         // 先转换为VO，避免JSONObject中包含ArrayList导致的转换错误
         RecordApplyRespVO respVO = BeanUtils.toBean(recordApply, RecordApplyRespVO.class);
-        
-//        // 单独处理formDataObject字段
-//        String formData = recordApply.getFormData();
-//        if (!ObjectUtils.isEmpty(formData)) {
-//            JSONObject jsonObject = JSONObject.parseObject(formData, JSONObject.class);
-//            respVO.setFormDataObject(jsonObject);
-//        }
         return success(respVO);
     }
 
@@ -130,14 +126,6 @@ public class RecordApplyController extends AbstractFileUploadController implemen
     public CommonResult<PageResult<RecordApplyRespVO>> getRecordApplyPage(@Valid RecordApplyPageReqVO pageReqVO) {
         PageResult<RecordApplyDO> pageResult = recordApplyService.getRecordApplyPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, RecordApplyRespVO.class));
-//        List<RecordApplyDO> list = pageResult.getList();
-//
-//        // 先转换为VO列表
-//        List<RecordApplyRespVO> respVOList = BeanUtils.toBean(list, RecordApplyRespVO.class);
-//        PageResult<RecordApplyRespVO> result = new PageResult<>();
-//        result.setList(respVOList);
-//        result.setTotal(pageResult.getTotal());
-//        return success(result);
     }
 
 
@@ -152,9 +140,32 @@ public class RecordApplyController extends AbstractFileUploadController implemen
     @GetMapping("/recordDistributePage")
     @Operation(summary = "文件分发分页")
     //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
-    public CommonResult<PageResult<RecordApplyPageReqVO>> recordDistributePage(@Valid RecordApplyPageReqVO pageReqVO) {
+    public CommonResult<PageResult<RecordApplyJoinPageVO>> recordDistributePage(@Valid RecordApplyPageReqVO pageReqVO) {
-        PageResult<RecordApplyDO> pageResult = recordApplyService.recordDistributePage(pageReqVO);
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
-        return success(BeanUtils.toBean(pageResult, RecordApplyPageReqVO.class));
+        Long userId = loginUser.getId();
+        pageReqVO.setApplyUserId(userId);
+        PageResult<RecordApplyJoinPageVO> recordApplyJoinPageVOPageResult = recordApplyService.recordDistributePage(pageReqVO);
+        return success(recordApplyJoinPageVOPageResult);
+    }
+
+    @GetMapping("/recordUpdatePage")
+    @Operation(summary = "文件更改申请分页")
+    //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
+    public CommonResult<PageResult<RecordApplyJoinPageVO>> recordUpdatePage(@Valid RecordApplyPageReqVO pageReqVO) {
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        Long userId = loginUser.getId();
+        pageReqVO.setApplyUserId(userId);
+        return success(recordApplyService.recordUpdatePage(pageReqVO));
+    }
+
+    @GetMapping("/recordInvalidPage")
+    @Operation(summary = "文件更改申请分页")
+    //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
+    public CommonResult<PageResult<RecordApplyJoinPageVO>> recordInvalidPage(@Valid RecordApplyPageReqVO pageReqVO) {
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        Long userId = loginUser.getId();
+        pageReqVO.setApplyUserId(userId);
+        return success(recordApplyService.recordInvalidPage(pageReqVO));
     }
 
     @GetMapping("/export-excel")

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

@@ -12,7 +12,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 
 @Schema(description = "管理后台 - 文件评审分页 Request VO")
 @Data
-public class RecordApplyDetailJoinPageVO extends PageParam {
+public class RecordApplyJoinPageVO {
 
     // ============recordApply=================>
 
@@ -23,9 +23,11 @@ public class RecordApplyDetailJoinPageVO extends PageParam {
     private String title;
 
     @Schema(description = "业务类型", example = "1")
-    @Dict(dicCode = "record_apply_review")
     private String businessType;
 
+    @Dict(dicCode = "flow_status")
+    private String businessStatus;
+
     @Schema(description = "申请人id", example = "15000")
     private Long applyUserId;
 
@@ -45,7 +47,7 @@ public class RecordApplyDetailJoinPageVO extends PageParam {
     private String reviewUserName;
 
     @Schema(description = "参加评审人员id")
-    private String reviewUserIds;
+    private String targetUserIds;
 
     @Schema(description = "表单数据")
     private String formData;
@@ -58,18 +60,18 @@ public class RecordApplyDetailJoinPageVO extends PageParam {
 
     @Schema(description = "开始日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] applyStartDate;
+    private LocalDateTime applyStartDate;
 
     @Schema(description = "截止日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] applyEndDate;
+    private LocalDateTime applyEndDate;
 
     @Schema(description = "备注")
     private String remark;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
+    private LocalDateTime createTime;
 
     // ============recordApplyDetail=================>
     @Schema(description = "applyDetailId", example = "28812")
@@ -109,7 +111,7 @@ public class RecordApplyDetailJoinPageVO extends PageParam {
 
     @Schema(description = "编制日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] makeDate;
+    private LocalDateTime makeDate;
 
 //    @Schema(description = "是否长期有效")
 //    private Integer permanently;
@@ -122,11 +124,11 @@ public class RecordApplyDetailJoinPageVO extends PageParam {
 
     @Schema(description = "过期日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] expirationDate;
+    private LocalDateTime expirationDate;
 
     @Schema(description = "生效日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] effectiveDate;
+    private LocalDateTime effectiveDate;
 
     @Schema(description = "过期标识,0-有效，1-过期", example = "1")
     private Integer expirationStatus;
@@ -138,5 +140,4 @@ public class RecordApplyDetailJoinPageVO extends PageParam {
     private Integer collectionFlag;
 
 
-
 }

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

@@ -48,10 +48,10 @@ public class RecordApplyPageReqVO extends PageParam {
     private String assignTarget;
 
     @Schema(description = "参加评审部门")
-    private String reviewDepartmentIds;
+    private String targetDepartmentIds;
 
     @Schema(description = "参加评审人员id")
-    private String reviewUserIds;
+    private String targetUserIds;
 
     @Schema(description = "表单数据")
     private String formData;

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

@@ -62,11 +62,11 @@ public class RecordApplyRespVO {
 
     @Schema(description = "参加评审部门")
     @ExcelProperty("参加评审部门")
-    private String reviewDepartmentIds;
+    private String targetDepartmentIds;
 
     @Schema(description = "参加评审人员id")
     @ExcelProperty("参加评审人员id")
-    private String reviewUserIds;
+    private String targetUserIds;
 
     @Schema(description = "表单数据")
     @ExcelProperty("表单数据")
@@ -110,7 +110,7 @@ public class RecordApplyRespVO {
 
     @Schema(description = "业务状态")
     @ExcelProperty("业务状态")
-    @Dict(dicCode = "record_apply_review")
+    @Dict(dicCode = "flow_status")
     private String businessStatus;
 
     @Schema(description = "创建时间")

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

@@ -53,13 +53,13 @@ public class RecordApplySaveReqVO {
     private String reviewRange;
 
     @Schema(description = "参加评审部门")
-    private String reviewDepartmentIds;
+    private String targetDepartmentIds;
 
     @Schema(description = "参加评审人员", example = "赵六")
     private String reviewUserName;
 
     @Schema(description = "参加评审人员id")
-    private String reviewUserIds;
+    private String targetUserIds;
 
     @Schema(description = "表单数据")
     private String formData;
@@ -102,5 +102,8 @@ public class RecordApplySaveReqVO {
 
     private List<RecordApplyDetailRespVO> paramsList;
 
+    // 分发参数
+    private List<RecordApplyUserAndDeptReqVO> targetList;
+
 
 }

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

@@ -0,0 +1,14 @@
+package com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo;
+
+import lombok.Data;
+
+@Data
+public class RecordApplyUserAndDeptReqVO {
+    private Long userId;
+
+    private String userName;
+
+    private Long deptId;
+
+    private String deptName;
+}

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

@@ -1,11 +1,16 @@
 package com.zt.plat.module.qms.resource.record.controller.admin.recordapplydetail.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
 import java.util.*;
+
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
+
 import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 文件记录通用申请明细 Response VO")
@@ -70,4 +75,11 @@ public class RecordApplyDetailRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    // =================临时数据======================
+    @Schema(description = "文件名称")
+    private String recordName;
+
+    @Schema(description = "文件编号")
+    private String recordCode;
+
 }

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

@@ -112,6 +112,15 @@ public class RecordCategoryController extends AbstractFileUploadController imple
         return success(BeanUtils.toBean(recordCategory, RecordCategoryRespVO.class));
     }
 
+    @GetMapping("/isAdminByUserId")
+    @Operation(summary = "通过分类Id判断当前用户是否有管理员权限")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    //@PreAuthorize("@ss.hasPermission('qms:record-category:query')")
+    public CommonResult<Boolean> isAdminByUserId(@RequestParam("id") Long id) {
+        boolean b = recordCategoryService.isAdminByUserId(id);
+        return success(b);
+    }
+
 
     // 文件评审，获取满足当前账户权限的记录列表
     @GetMapping("/getReviewRecordList")

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

@@ -167,5 +167,15 @@ public class RecordRecordRespVO {
     @Schema(description = "所属分类的自定义配置")
     private Object customConfig;
 
+//    ====== 文件提交申请关联字段 ======
+
+    @Schema(description = "文件提交申请ID")
+    private Long applyId;
+
+    @Schema(description = "文件提交流程实例ID")
+    private String flowInstanceId;
+
+    @Schema(description = "文件提交业务状态")
+    private String applyBusinessStatus;
 
 }

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

@@ -91,15 +91,17 @@ public class RecordApplyDO extends BusinessBaseDO {
     @TableField("ASN_TGT")
     private String assignTarget;
     /**
-    * 参加评审部门
+    * 目标部门
     */
-    @TableField("RVW_DEPT_IDS")
+//    @TableField("RVW_DEPT_IDS")
-    private String reviewDepartmentIds;
+    @TableField("TGT_DEPT_IDS")
+    private String targetDepartmentIds;
     /**
-    * 参加评审人员id
+    * 目标id
     */
-    @TableField("RVW_USER_IDS")
+//    @TableField("RVW_USER_IDS")
-    private String reviewUserIds;
+    @TableField("TGT_USER_IDS")
+    private String targetUserIds;
     /**
      * 表单数据
      */