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

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

@@ -109,4 +109,14 @@ public class RecordConstants {
         /** 记录 */
         public static final String RECORD = "记录";
     }
+
+    /**
+     * 文件分类目录类型
+     */
+    public static class CategoryType {
+        /** 分类 */
+        public static final String BASE_TYPE = "base_type"; // 基础分类
+        /** 记录 */
+        public static final String PARTY_BUILD_TYPE = "party_build_type"; // 党建分类
+    }
 }

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

@@ -85,6 +85,9 @@ public class RecordApplyPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "是否提交")
+    private Integer isSubmit;
+
     @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/recordapply/vo/RecordApplyRespVO.java

@@ -116,6 +116,9 @@ public class RecordApplyRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "是否提交")
+    private Integer isSubmit;
+
     //    ===================扩展字段=========================
     @Schema(description = "附件对象")
     private CommonResult<List<BusinessFileWithUrlRespDTO>> businessFileRet;

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

@@ -93,6 +93,9 @@ public class RecordApplySaveReqVO {
     @Schema(description = "流程实例ID")
     private String flowInstanceId;
 
+    @Schema(description = "是否提交")
+    private Integer isSubmit;
+
     // ============================================
 
     @Schema(description = "上传文件列表")
@@ -101,19 +104,19 @@ public class RecordApplySaveReqVO {
     @Schema(description = "删除的文件id")
     private List<Long> deleteFileIdList;
 
-    @Schema(description = "文件记录ID")
+//    @Schema(description = "文件记录ID")
-    private Long recordId;
+//    private Long recordId;
-
+//
-    @Schema(description = "用户IDs")
+//    @Schema(description = "用户IDs")
-    private Long[] userIds;
+//    private Long[] userIds;
-
+//
-    @Schema(description = "用户IDs")
+//    @Schema(description = "用户IDs")
-    private Long[] deptIds;
+//    private Long[] deptIds;
 
     private List<RecordApplyDetailSaveReqVO> detailList;
 
-    // 分发参数
+    // 记录Id
-//    private List<RecordApplyUserAndDeptReqVO> targetList;
+    private List<Long> recordList;
 
 
 }

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

@@ -22,6 +22,7 @@ import io.swagger.v3.oas.annotations.Operation;
 
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
+
 import java.util.*;
 import java.io.IOException;
 
@@ -30,11 +31,13 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
 
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+
 import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 
 import com.zt.plat.module.qms.resource.record.dal.dataobject.recordcategory.RecordCategoryDO;
@@ -46,14 +49,14 @@ import com.zt.plat.module.qms.resource.record.service.recordcategory.RecordCateg
 @Validated
 @DeptDataPermissionIgnore(enable = "true")
 @FileUploadController(source = "qms.recordcategory")
-public class RecordCategoryController extends AbstractFileUploadController implements BusinessControllerMarker{
+public class RecordCategoryController extends AbstractFileUploadController implements BusinessControllerMarker {
 
     private static final Logger log = LoggerFactory.getLogger(RecordCategoryController.class);
 
     static {
         FileUploadController annotation = RecordCategoryController.class.getAnnotation(FileUploadController.class);
         if (annotation != null) {
-        setFileUploadInfo(annotation);
+            setFileUploadInfo(annotation);
         }
     }
 
@@ -64,8 +67,8 @@ public class RecordCategoryController extends AbstractFileUploadController imple
     @Operation(summary = "创建文件记录分类")
     //@PreAuthorize("@ss.hasPermission('qms:record-category:create')")
     public CommonResult<RecordCategoryRespVO> createRecordCategory(@Valid @RequestBody RecordCategorySaveReqVO createReqVO) {
-        if (ObjectUtils.isEmpty(createReqVO.getParentId()))createReqVO.setParentId(0L);
+        if (ObjectUtils.isEmpty(createReqVO.getParentId())) createReqVO.setParentId(0L);
-        if (ObjectUtils.isEmpty(createReqVO.getSortNo()))createReqVO.setSortNo(1);
+        if (ObjectUtils.isEmpty(createReqVO.getSortNo())) createReqVO.setSortNo(1);
         return success(recordCategoryService.createRecordCategory(createReqVO));
     }
 
@@ -96,7 +99,7 @@ public class RecordCategoryController extends AbstractFileUploadController imple
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除文件记录分类")
-                //@PreAuthorize("@ss.hasPermission('qms:record-category:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:record-category:delete')")
     public CommonResult<Boolean> deleteRecordCategoryList(@RequestBody BatchDeleteReqVO req) {
         recordCategoryService.deleteRecordCategoryListByIds(req.getIds());
         return success(true);
@@ -120,17 +123,29 @@ public class RecordCategoryController extends AbstractFileUploadController imple
         return success(BeanUtils.toBean(list, RecordCategoryRespVO.class));
     }
 
+    /*
+     *  获取指定的分类树
+     *      例：党建文件
+     */
+    @GetMapping("/getAppointCategoryTree")
+    @Operation(summary = "获得文件记录分类")
+    //@PreAuthorize("@ss.hasPermission('qms:record-category:query')")
+    public CommonResult<List<RecordCategoryRespVO>> getAppointCategoryTree(@Valid RecordCategoryPageReqVO pageReqVO) {
+        List<RecordCategoryDO> list = recordCategoryService.getRecordCategoryTree(pageReqVO);
+        return success(BeanUtils.toBean(list, RecordCategoryRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出文件记录分类 Excel")
     //@PreAuthorize("@ss.hasPermission('qms:record-category:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportRecordCategoryExcel(@Valid RecordCategoryPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
+                                          HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<RecordCategoryDO> list = recordCategoryService.getRecordCategoryPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "文件记录分类.xls", "数据", RecordCategoryRespVO.class,
-                        BeanUtils.toBean(list, RecordCategoryRespVO.class));
+                BeanUtils.toBean(list, RecordCategoryRespVO.class));
     }
 
 }

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

@@ -57,4 +57,7 @@ public class RecordCategoryPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+//    =====================================
+    private String appointFlag;
+
 }

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

@@ -153,6 +153,18 @@ public class RecordRecordController extends AbstractFileUploadController impleme
         return success(BeanUtils.toBean(result, RecordRecordRespVO.class));
     }
 
+    /**
+     * 文件记录提交（不走流程）
+     */
+//    @GetMapping("/recordSubmit")
+//    @Operation(summary = "获得文件、模板、记录分页")
+//    //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
+//    public CommonResult<RecordRecordRespVO> recordSubmitStatus(RecordRecordPageReqVO pageReqVO) {
+//        RecordRecordDO bean = BeanUtils.toBean(pageReqVO, RecordRecordDO.class);
+//        RecordRecordDO recordRecordDO = recordRecordService.recordSubmitStatus(bean);
+//        return success(BeanUtils.toBean(recordRecordDO, RecordRecordRespVO.class));
+//    }
+
     @GetMapping("/selectRecordRecordPage")
     @Operation(summary = "获得文件、模板、记录分页")
     //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")

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

@@ -149,6 +149,9 @@ public class RecordApplyDO extends BusinessBaseDO {
     @TableField("RMK")
     private String remark;
 
+    @TableField("IS_SBM")
+    private Integer isSubmit;
+
     //    =========临时字段========
     @TableField(exist = false)
     private LocalDateTime expirationDate;     // TODO

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordCategoryMapper.java

@@ -6,8 +6,11 @@ import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.module.qms.resource.record.controller.admin.recordcategory.vo.RecordCategoryPageReqVO;
 import com.zt.plat.module.qms.resource.record.dal.dataobject.recordcategory.RecordCategoryDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
  * 文件记录分类 Mapper
  *
@@ -44,4 +47,16 @@ public interface RecordCategoryMapper extends BaseMapperX<RecordCategoryDO> {
     @Select("SELECT * FROM t_rcd_ctgr WHERE deleted = 0 AND id = #{categoryRootId} AND JSON_VALUE(CST_CFG, '$.appraisalFlag') = '1'")
     RecordCategoryDO selectCategoryAppraisalDO(Long categoryRootId);
 
+    /**
+     * 通过查询 JSON 字段（CST_CFG）中指定字段的值，获取指定 ID 的分类记录
+     *  例：1，"$.appraisalFlag", "1"
+     * @param categoryRootId
+     * @param jsonKey
+     * @param jsonValue
+     * @return
+     */
+//    @Select("SELECT * FROM t_rcd_ctgr WHERE deleted = 0 AND id = #{categoryRootId} AND JSON_VALUE(CST_CFG, #{jsonKey}) = #{jsonValue}")
+    List<RecordCategoryDO> selectCategoryByJsonField(@Param("categoryRootId") Long categoryRootId, @Param("jsonKey") String jsonKey, @Param("jsonValue") String jsonValue);
+
+
 }