CPS体系驾驶舱-AB类改善、C类改善、CPS问题记录相关接口新增

 package com.qgutech.qgyun.apaas.sync.cps.controller;
 
+import com.qgutech.qgyun.apaas.sync.cps.dto.CImprovementDetailDTO;
 import com.qgutech.qgyun.apaas.sync.cps.dto.CImprovementSummaryDTO;
 import com.qgutech.qgyun.apaas.sync.cps.model.CImprovement;
 import com.qgutech.qgyun.apaas.sync.cps.service.CImprovementService;
@@ -50,4 +51,23 @@ public class CImprovementController {
         List<CImprovementSummaryDTO> summaryList = cImprovementService.summaryByYearAndQuarter(year, quarter);
         return new JsonResult<>(true, "成功", summaryList);
     }
+
+    /**
+     * 根据年份、季度、单位车间id查询C类改善记录详情列表
+     * <p>
+     * 查询该年份季度时间范围内、由该单位车间下人员发起的C类改善记录，
+     * 并将记录中涉及的单位、室组、区域、班组、发起人、部门等关联实体名称补充完整
+     *
+     * @param year        年份，格式：yyyy，可为空（默认当前年）
+     * @param quarter     季度枚举值（#1#-#4#），必传
+     * @param roomGroupId 室组id，必传
+     * @return C类改善记录详情列表（含关联实体名称）
+     */
+    @GetMapping("/list/detail")
+    public JsonResult listDetail(@RequestParam(required = false) String year,
+                                 @RequestParam String quarter,
+                                 @RequestParam String roomGroupId) {
+        List<CImprovementDetailDTO> detailList = cImprovementService.listDetailByYearQuarterAndRoomGroup(year, quarter, roomGroupId);
+        return new JsonResult<>(true, "成功", detailList);
+    }
 }

 package com.qgutech.qgyun.apaas.sync.cps.controller;
 
+import com.qgutech.qgyun.apaas.sync.cps.dto.CpsProblemDetailDTO;
+import com.qgutech.qgyun.apaas.sync.cps.dto.CpsProblemSourceSummaryDTO;
+import com.qgutech.qgyun.apaas.sync.cps.dto.CpsProblemSummaryDTO;
 import com.qgutech.qgyun.apaas.sync.cps.model.CpsProblem;
 import com.qgutech.qgyun.apaas.sync.cps.service.CpsProblemService;
 import com.qgutech.qgyun.framework.common.result.JsonResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -32,4 +36,78 @@ public class CpsProblemController {
         List<CpsProblem> cpsProblemList = cpsProblemService.listAll();
         return new JsonResult<>(true, "成功", cpsProblemList);
     }
+
+    /**
+     * 根据计划解决时间范围汇总各责任单位下各处理状态的问题数
+     * <p>
+     * 开始、结束时间为空时默认使用当前月的开始、结束时间
+     *
+     * @param startTime 开始时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月 1 号 00:00:00）
+     * @param endTime   结束时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月最后一天 23:59:59）
+     * @return 责任单位 + 状态维度的问题数汇总列表
+     */
+    @GetMapping("/summary/status")
+    public JsonResult summaryByStatus(@RequestParam(required = false) String startTime,
+                                      @RequestParam(required = false) String endTime) {
+        List<CpsProblemSummaryDTO> summaryList = cpsProblemService.summaryByPlanResolveTime(startTime, endTime);
+        return new JsonResult<>(true, "成功", summaryList);
+    }
+
+    /**
+     * 根据计划解决时间范围、责任单位id、问题处理状态查询问题记录明细
+     * <p>
+     * 明细中包含工作单位、责任单位、室组、区域、班组、问题提出人、问题处理人等关联实体名称；
+     * 开始、结束时间为空时默认使用当前月的开始、结束时间
+     *
+     * @param startTime 开始时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月 1 号 00:00:00）
+     * @param endTime   结束时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月最后一天 23:59:59）
+     * @param wtzrdwId  责任单位id，必传
+     * @param status    问题处理状态编号（#1#-待处理;#2#-处理中;#3#-已关闭;#4#-已逾期），必传
+     * @return 问题记录明细列表
+     */
+    @GetMapping("/list/detail")
+    public JsonResult listDetail(@RequestParam(required = false) String startTime,
+                                 @RequestParam(required = false) String endTime,
+                                 @RequestParam String wtzrdwId,
+                                 @RequestParam String status) {
+        List<CpsProblemDetailDTO> detailList = cpsProblemService.listDetailByPlanResolveTime(
+                startTime, endTime, wtzrdwId, status);
+        return new JsonResult<>(true, "成功", detailList);
+    }
+
+    /**
+     * 根据创建时间范围汇总各问题来源对应的问题数
+     * <p>
+     * 开始、结束时间为空时默认使用当前月的开始、结束时间
+     *
+     * @param startTime 开始时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月 1 号 00:00:00）
+     * @param endTime   结束时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月最后一天 23:59:59）
+     * @return 问题来源 + 问题数汇总列表
+     */
+    @GetMapping("/summary/source")
+    public JsonResult summaryBySource(@RequestParam(required = false) String startTime,
+                                      @RequestParam(required = false) String endTime) {
+        List<CpsProblemSourceSummaryDTO> summaryList = cpsProblemService.summaryByCreatedAtSource(startTime, endTime);
+        return new JsonResult<>(true, "成功", summaryList);
+    }
+
+    /**
+     * 根据创建时间范围、问题来源查询问题记录明细
+     * <p>
+     * 明细中包含工作单位、责任单位、室组、区域、班组、问题提出人、问题处理人等关联实体名称；
+     * 开始、结束时间为空时默认使用当前月的开始、结束时间
+     *
+     * @param startTime 开始时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月 1 号 00:00:00）
+     * @param endTime   结束时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月最后一天 23:59:59）
+     * @param wtly      问题来源编号（#1#-开班;#2#-过程验证;#3#-过程确认;#4#-体系健康体检;#5#-单位自检），必传
+     * @return 问题记录明细列表
+     */
+    @GetMapping("/list/detail/source")
+    public JsonResult listDetailBySource(@RequestParam(required = false) String startTime,
+                                         @RequestParam(required = false) String endTime,
+                                         @RequestParam String wtly) {
+        List<CpsProblemDetailDTO> detailList = cpsProblemService.listDetailByCreatedAtAndSource(
+                startTime, endTime, wtly);
+        return new JsonResult<>(true, "成功", detailList);
+    }
 }

+package com.qgutech.qgyun.apaas.sync.cps.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * C类改善记录详情（含关联实体名称）
+ */
+@Getter
+@Setter
+@ToString
+public class CImprovementDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * 记录ID
+     */
+    private String id;
+
+    /*
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createdAt;
+
+    /*
+     * 改善名称
+     */
+    private String gsmc;
+
+    /*
+     * 问题编号
+     */
+    private String wtbh;
+
+    /*
+     * 来源问题记录id
+     */
+    private String lywt;
+
+    /*
+     * 问题说明
+     */
+    private String wtsm;
+
+    /*
+     * 改善后效果
+     */
+    private String gshxg;
+
+    /*
+     * 状态  #1#-草稿;#2#-已提交;#3#-已否决;#4#-已确认;
+     */
+    private String zt;
+
+    /*
+     * 状态名称（枚举 CImprovementStatusEnum）
+     */
+    private String ztDesc;
+
+    /*
+     * 是否问题类改善
+     */
+    private Boolean sfwtlg;
+
+    /*
+     * 是否是车间班组
+     */
+    private Boolean sfscjb;
+
+    /*
+     * 是否推送优秀案例
+     */
+    private Boolean sftsyxal;
+
+    /*
+     * 是否推送金点子
+     */
+    private Boolean sftsjdz;
+
+    /*
+     * 流程实例ID
+     */
+    private String processInstanceId;
+
+    /*
+     * 审批状态
+     */
+    private String approvalStatus;
+
+    /*
+     * 室组区域名称（原始字段）
+     */
+    private String szqymc;
+
+    /*
+     * 员工号
+     */
+    private String ygh;
+
+    // ========== 关联实体ID及名称 ==========
+
+    /*
+     * 员工id（组织用户）
+     */
+    private String yh;
+
+    /*
+     * 员工姓名（组织用户）
+     */
+    private String yhName;
+
+    /*
+     * 发起人id/工号
+     */
+    private String fqr;
+
+    /*
+     * 发起人姓名
+     */
+    private String fqrName;
+
+    /*
+     * 部门id（组织结构）
+     */
+    private String bm;
+
+    /*
+     * 部门名称（组织结构）
+     */
+    private String bmName;
+
+    /*
+     * 室组信息id
+     */
+    private String szmc;
+
+    /*
+     * 室组名称
+     */
+    private String szmcName;
+
+    /*
+     * 室组编号
+     */
+    private String szbh;
+
+    /*
+     * 班组信息id
+     */
+    private String bz;
+
+    /*
+     * 班组名称
+     */
+    private String bzName;
+
+    /*
+     * 单位车间id
+     */
+    private String dwcj;
+
+    /*
+     * 单位车间名称
+     */
+    private String dwcjName;
+
+    /*
+     * 单位车间编号
+     */
+    private String dwcjCode;
+
+    /*
+     * 区域id
+     */
+    private String szqy;
+
+    /*
+     * 区域名称
+     */
+    private String szqyName;
+
+    /*
+     * 区长确认-组织用户id
+     */
+    private String qzqr;
+
+    /*
+     * 区长确认-姓名
+     */
+    private String qzqrName;
+
+    /*
+     * 改善员确认-组织用户id
+     */
+    private String gsyqr;
+
+    /*
+     * 改善员确认-姓名
+     */
+    private String gsyqrName;
+}

@@ -32,6 +32,12 @@ public class CImprovementSummaryDTO implements Serializable {
     private String szmc;
 
     /**
+     * 室组编号
+     */
+    @ApiModelProperty(value = "室组编号")
+    private String szbh;
+
+    /**
      * 所属单位车间编码
      */
     @ApiModelProperty(value = "所属单位车间编码")
@@ -44,6 +50,12 @@ public class CImprovementSummaryDTO implements Serializable {
     private String dwcjName;
 
     /**
+     * 所属单位车间编号
+     */
+    @ApiModelProperty(value = "所属单位车间编号")
+    private String dwcjCode;
+
+    /**
      * 年份
      */
     @ApiModelProperty(value = "年份")

+package com.qgutech.qgyun.apaas.sync.cps.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * CPS问题记录详情（含关联实体名称）
+ */
+@Getter
+@Setter
+@ToString
+public class CpsProblemDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * 记录ID
+     */
+    private String id;
+
+    /*
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createdAt;
+
+    /*
+     * 问题编号
+     */
+    private String wtbh;
+
+    /*
+     * 问题描述
+     */
+    private String wtms;
+
+    /*
+     * 问题来源:#1#-开班;#2#-过程验证;#3#-过程确认;#4#-体系健康体检;#5#-单位自检（单位牵头）
+     */
+    private String wtly;
+
+    /*
+     * 问题来源名称（枚举 WtlyEnum）
+     */
+    private String wtlyDesc;
+
+    /*
+     * 问题所属板块
+     */
+    private String wtssbk;
+
+    /*
+     * 问题类别：#1#-方针展开;#2#-标准化作业;#3#-目视化;#4#-时间数据处理;#5#-过程确认;#6#-持续改善
+     */
+    private String wtlb;
+
+    /*
+     * 问题类别名称（枚举 WtlbEnum）
+     */
+    private String wtlbDesc;
+
+    /*
+     * 问题性质：#1#-无标准；#2#-未执行标准；#3#-标准不足
+     */
+    private String wtxz;
+
+    /*
+     * 问题性质名称（枚举 WtxzEnum）
+     */
+    private String wtxzDesc;
+
+    /*
+     * 6S分类：#1#-整理;#2#-整顿;#3#-清洁;#4#-清扫;#5#-素养;#6#-安全
+     */
+    private String sfl;
+
+    /*
+     * 6S分类名称（枚举 SflEnum）
+     */
+    private String sflDesc;
+
+    /*
+     * 问题层级-#1#-1;#2#-2;#3#-3;#4#-4;#5#-5;#0#-0
+     */
+    private String mbghlk;
+
+    /*
+     * 问题层级名称（枚举 MbghlkEnum）
+     */
+    private String mbghlkDesc;
+
+    /*
+     * 人员类别：#1#-区长;#2#-班长;#3#-高级经理;#4#-经理;#5#-主管;#6#-专家;#7#-一般员工
+     */
+    private String rylb;
+
+    /*
+     * 人员类别名称（枚举 RylbEnum）
+     */
+    private String rylbDesc;
+
+    /*
+     * 问题是否关闭
+     */
+    private Boolean wtsfgb;
+
+    /*
+     * 问题附件
+     */
+    private String wtfj;
+
+    /*
+     * 问题整改后附件
+     */
+    private String wtzghfj;
+
+    /*
+     * 问题解决措施
+     */
+    private String wtjjcs;
+
+    /*
+     * 问题处理方式:#1#-自己解决;#2#-工作安排/同级支持;#3#-问题升级至
+     */
+    private String wtclfs;
+
+    /*
+     * 问题处理方式名称（枚举 WtclfsEnum）
+     */
+    private String wtclfsDesc;
+
+    /*
+     * 工作安排/同级支持
+     */
+    private String gzap;
+
+    /*
+     * 问题升级至
+     */
+    private String wtsjz;
+
+    /*
+     * 问题处理方式2
+     */
+    private String wtclfs2;
+
+    /*
+     * 问题处理方式2名称（枚举 WtclfsEnum）
+     */
+    private String wtclfs2Desc;
+
+    /*
+     * 工作安排/同级支持2
+     */
+    private String gzap2;
+
+    /*
+     * 问题升级至2
+     */
+    private String wtsjz2;
+
+    /*
+     * 问题处理方式3
+     */
+    private String wtclfs3;
+
+    /*
+     * 问题处理方式3名称（枚举 WtclfsEnum）
+     */
+    private String wtclfs3Desc;
+
+    /*
+     * 工作安排/同级支持3
+     */
+    private String gzap3;
+
+    /*
+     * 问题升级至3
+     */
+    private String wtsjz3;
+
+    /*
+     * 计划解决时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jhjjsj;
+
+    /*
+     * 问题解决时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date tntpvy;
+
+    /*
+     * 流程实例ID
+     */
+    private String processInstanceId;
+
+    /*
+     * 审批状态
+     */
+    private String approvalStatus;
+
+    // ========== 关联实体ID及名称 ==========
+
+    /*
+     * 工作单位id
+     */
+    private String gzdw;
+
+    /*
+     * 工作单位名称
+     */
+    private String gzdwName;
+
+    /*
+     * 工作单位编号
+     */
+    private String gzdwCode;
+
+    /*
+     * 问题责任单位id
+     */
+    private String wtzrdw;
+
+    /*
+     * 问题责任单位名称
+     */
+    private String wtzrdwName;
+
+    /*
+     * 问题责任单位编号
+     */
+    private String wtzrdwCode;
+
+    /*
+     * 室组id
+     */
+    private String sz;
+
+    /*
+     * 室组名称
+     */
+    private String szName;
+
+    /*
+     * 室组编号
+     */
+    private String szCode;
+
+    /*
+     * 区域id
+     */
+    private String qy;
+
+    /*
+     * 区域名称
+     */
+    private String qyName;
+
+    /*
+     * 区域编号
+     */
+    private String qyCode;
+
+    /*
+     * 班组id
+     */
+    private String bz;
+
+    /*
+     * 班组名称
+     */
+    private String bzName;
+
+    /*
+     * 班组编号
+     */
+    private String bzCode;
+
+    /*
+     * 问题提出人id
+     */
+    private String wttcr;
+
+    /*
+     * 问题提出人姓名
+     */
+    private String wttcrName;
+
+    /*
+     * 问题处理人id
+     */
+    private String wtclr;
+
+    /*
+     * 问题处理人姓名
+     */
+    private String wtclrName;
+
+    /*
+     * 问题处理状态编号
+     */
+    private String wtclzt;
+
+    /*
+     * 问题处理状态中文描述
+     */
+    private String wtclztDesc;
+}

+package com.qgutech.qgyun.apaas.sync.cps.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * CPS问题按问题来源汇总结果
+ */
+@Getter
+@Setter
+@ToString
+public class CpsProblemSourceSummaryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * 问题来源编号（#1#-开班;#2#-过程验证;#3#-过程确认;#4#-体系健康体检;#5#-单位自检（单位牵头））
+     */
+    private String wtly;
+
+    /*
+     * 问题来源中文名称（枚举 WtlyEnum）
+     */
+    private String wtlyDesc;
+
+    /*
+     * 该问题来源下的问题数
+     */
+    private Integer count;
+
+    public CpsProblemSourceSummaryDTO() {
+    }
+
+    public CpsProblemSourceSummaryDTO(String wtly, String wtlyDesc, Integer count) {
+        this.wtly = wtly;
+        this.wtlyDesc = wtlyDesc;
+        this.count = count;
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * CPS问题汇总结果（按责任单位 + 处理状态维度）
+ */
+@Getter
+@Setter
+@ToString
+public class CpsProblemSummaryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * 责任单位id
+     */
+    private String wtzrdw;
+
+    /*
+     * 责任单位名称
+     */
+    private String wtzrdwName;
+
+    /*
+     * 责任单位编号
+     */
+    private String wtzrdwCode;
+
+    /*
+     * 该责任单位下问题总数
+     */
+    private Integer totalCount;
+
+    /*
+     * 各处理状态下的问题数明细
+     */
+    private List<StatusCount> statusCounts = new ArrayList<>();
+
+    /**
+     * 状态计数明细
+     */
+    @Getter
+    @Setter
+    @ToString
+    public static class StatusCount implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        /*
+         * 状态编号（#1#-待处理;#2#-处理中;#3#-已关闭;#4#-已逾期）
+         */
+        private String statusCode;
+
+        /*
+         * 状态中文描述
+         */
+        private String statusDesc;
+
+        /*
+         * 该状态下的问题数
+         */
+        private Integer count;
+
+        public StatusCount() {
+        }
+
+        public StatusCount(String statusCode, String statusDesc, Integer count) {
+            this.statusCode = statusCode;
+            this.statusDesc = statusDesc;
+            this.count = count;
+        }
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.enums;
+
+import lombok.Getter;
+
+/**
+ * C类改善状态枚举
+ * <p>
+ * 数据库字段 zt 存储编号：#1#-草稿，#2#-已提交，#3#-已否决，#4#-已确认
+ */
+@Getter
+public enum CImprovementStatusEnum {
+
+    /**
+     * 草稿
+     */
+    DRAFT("#1#", "草稿"),
+
+    /**
+     * 已提交
+     */
+    SUBMITTED("#2#", "已提交"),
+
+    /**
+     * 已否决
+     */
+    REJECTED("#3#", "已否决"),
+
+    /**
+     * 已确认
+     */
+    CONFIRMED("#4#", "已确认");
+
+    /**
+     * 数据库中存储的编号
+     */
+    private final String code;
+
+    /**
+     * 中文描述
+     */
+    private final String desc;
+
+    CImprovementStatusEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    /**
+     * 根据编号获取枚举
+     *
+     * @param code 编号
+     * @return 枚举实例，未找到返回 null
+     */
+    public static CImprovementStatusEnum fromCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (CImprovementStatusEnum status : values()) {
+            if (status.code.equals(code)) {
+                return status;
+            }
+        }
+        if (!code.startsWith("#")) {
+            String wrapped = "#" + code + "#";
+            for (CImprovementStatusEnum status : values()) {
+                if (status.code.equals(wrapped)) {
+                    return status;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 根据编号获取中文描述
+     *
+     * @param code 编号
+     * @return 中文描述，未找到返回原编号
+     */
+    public static String getDescByCode(String code) {
+        CImprovementStatusEnum status = fromCode(code);
+        return status != null ? status.getDesc() : code;
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.enums;
+
+import lombok.Getter;
+
+/**
+ * 问题层级枚举
+ * <p>
+ * 数据库字段 mbghlk 存储编号：
+ * #0#-0，#1#-1，#2#-2，#3#-3，#4#-4，#5#-5
+ */
+@Getter
+public enum MbghlkEnum {
+
+    LEVEL_0("#0#", "0"),
+    LEVEL_1("#1#", "1"),
+    LEVEL_2("#2#", "2"),
+    LEVEL_3("#3#", "3"),
+    LEVEL_4("#4#", "4"),
+    LEVEL_5("#5#", "5");
+
+    private final String code;
+    private final String desc;
+
+    MbghlkEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static MbghlkEnum fromCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (MbghlkEnum item : values()) {
+            if (item.code.equals(code)) {
+                return item;
+            }
+        }
+        if (!code.startsWith("#")) {
+            String wrapped = "#" + code + "#";
+            for (MbghlkEnum item : values()) {
+                if (item.code.equals(wrapped)) {
+                    return item;
+                }
+            }
+        }
+        return null;
+    }
+
+    public static String getDescByCode(String code) {
+        MbghlkEnum item = fromCode(code);
+        return item != null ? item.getDesc() : code;
+    }
+}

@@ -70,6 +70,15 @@ public enum QuarterEnum {
                 return quarter;
             }
         }
+        if (!code.startsWith("#")) {
+            code = "#" + code + "#";
+            for (QuarterEnum quarter : values()) {
+                if (quarter.code.equals(code)) {
+                    return quarter;
+                }
+            }
+        }
+
         return null;
     }
 }

+package com.qgutech.qgyun.apaas.sync.cps.enums;
+
+import lombok.Getter;
+
+/**
+ * 人员类别枚举
+ * <p>
+ * 数据库字段 rylb 存储编号：
+ * #1#-区长，#2#-班长，#3#-高级经理，#4#-经理，#5#-主管，#6#-专家，#7#-一般员工
+ */
+@Getter
+public enum RylbEnum {
+
+    QUZHANG("#1#", "区长"),
+    BANZHANG("#2#", "班长"),
+    GAOJI_JINGLI("#3#", "高级经理"),
+    JINGLI("#4#", "经理"),
+    ZHUGUAN("#5#", "主管"),
+    ZHUANJIA("#6#", "专家"),
+    YIBAN_YUANGONG("#7#", "一般员工");
+
+    private final String code;
+    private final String desc;
+
+    RylbEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static RylbEnum fromCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (RylbEnum item : values()) {
+            if (item.code.equals(code)) {
+                return item;
+            }
+        }
+        if (!code.startsWith("#")) {
+            String wrapped = "#" + code + "#";
+            for (RylbEnum item : values()) {
+                if (item.code.equals(wrapped)) {
+                    return item;
+                }
+            }
+        }
+        return null;
+    }
+
+    public static String getDescByCode(String code) {
+        RylbEnum item = fromCode(code);
+        return item != null ? item.getDesc() : code;
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.enums;
+
+import lombok.Getter;
+
+/**
+ * 6S分类枚举
+ * <p>
+ * 数据库字段 sfl 存储编号：
+ * #1#-整理，#2#-整顿，#3#-清洁，#4#-清扫，#5#-素养，#6#-安全
+ */
+@Getter
+public enum SflEnum {
+
+    ZHENGLI("#1#", "整理"),
+    ZHENDUN("#2#", "整顿"),
+    QINGJIE("#3#", "清洁"),
+    QINGSAO("#4#", "清扫"),
+    SUYANG("#5#", "素养"),
+    ANQUAN("#6#", "安全");
+
+    private final String code;
+    private final String desc;
+
+    SflEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static SflEnum fromCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (SflEnum item : values()) {
+            if (item.code.equals(code)) {
+                return item;
+            }
+        }
+        if (!code.startsWith("#")) {
+            String wrapped = "#" + code + "#";
+            for (SflEnum item : values()) {
+                if (item.code.equals(wrapped)) {
+                    return item;
+                }
+            }
+        }
+        return null;
+    }
+
+    public static String getDescByCode(String code) {
+        SflEnum item = fromCode(code);
+        return item != null ? item.getDesc() : code;
+    }
+}

@@ -58,6 +58,14 @@ public enum WorkshopStatusEnum {
                 return status;
             }
         }
+        if (!code.startsWith("#")) {
+            code = "#" + code + "#";
+            for (WorkshopStatusEnum status : values()) {
+                if (status.code.equals(code)) {
+                    return status;
+                }
+            }
+        }
         return null;
     }
 

+package com.qgutech.qgyun.apaas.sync.cps.enums;
+
+import lombok.Getter;
+
+/**
+ * 问题处理方式枚举
+ * <p>
+ * 数据库字段 wtclfs / wtclfs2 / wtclfs3 存储编号：
+ * #1#-自己解决，#2#-工作安排/同级支持，#3#-问题升级至
+ */
+@Getter
+public enum WtclfsEnum {
+
+    ZIJI_JIEJUE("#1#", "自己解决"),
+    GONGZUO_ANPAI("#2#", "工作安排/同级支持"),
+    WENTI_SHENGJI("#3#", "问题升级至");
+
+    private final String code;
+    private final String desc;
+
+    WtclfsEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static WtclfsEnum fromCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (WtclfsEnum item : values()) {
+            if (item.code.equals(code)) {
+                return item;
+            }
+        }
+        if (!code.startsWith("#")) {
+            String wrapped = "#" + code + "#";
+            for (WtclfsEnum item : values()) {
+                if (item.code.equals(wrapped)) {
+                    return item;
+                }
+            }
+        }
+        return null;
+    }
+
+    public static String getDescByCode(String code) {
+        WtclfsEnum item = fromCode(code);
+        return item != null ? item.getDesc() : code;
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.enums;
+
+import lombok.Getter;
+
+/**
+ * 问题处理状态枚举
+ * <p>
+ * 数据库字段 wtclzt 存储编号：#1#-待处理，#2#-处理中，#3#-已关闭，#4#-已逾期
+ */
+@Getter
+public enum WtclztEnum {
+
+    /**
+     * 待处理
+     */
+    PENDING("#1#", "待处理"),
+
+    /**
+     * 处理中
+     */
+    PROCESSING("#2#", "处理中"),
+
+    /**
+     * 已关闭
+     */
+    CLOSED("#3#", "已关闭"),
+
+    /**
+     * 已逾期
+     */
+    OVERDUE("#4#", "已逾期");
+
+    /**
+     * 数据库中存储的编号
+     */
+    private final String code;
+
+    /**
+     * 中文描述
+     */
+    private final String desc;
+
+    WtclztEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    /**
+     * 根据编号获取枚举
+     *
+     * @param code 编号
+     * @return 枚举实例，未找到返回 null
+     */
+    public static WtclztEnum fromCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (WtclztEnum status : values()) {
+            if (status.code.equals(code)) {
+                return status;
+            }
+        }
+        if (!code.startsWith("#")) {
+            String wrapped = "#" + code + "#";
+            for (WtclztEnum status : values()) {
+                if (status.code.equals(wrapped)) {
+                    return status;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 根据编号获取中文描述
+     *
+     * @param code 编号
+     * @return 中文描述，未找到返回原编号
+     */
+    public static String getDescByCode(String code) {
+        WtclztEnum status = fromCode(code);
+        return status != null ? status.getDesc() : code;
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.enums;
+
+import lombok.Getter;
+
+/**
+ * 问题类别枚举
+ * <p>
+ * 数据库字段 wtlb 存储编号：
+ * #1#-方针展开，#2#-标准化作业，#3#-目视化，#4#-时间数据处理，#5#-过程确认，#6#-持续改善
+ */
+@Getter
+public enum WtlbEnum {
+
+    FANGZHEN_ZHANKAI("#1#", "方针展开"),
+    BIAOZHUNHUA_ZUOYE("#2#", "标准化作业"),
+    MUSHIHUA("#3#", "目视化"),
+    SHIJIAN_SHUJU_CHULI("#4#", "时间数据处理"),
+    GUOCHENG_QUEREN("#5#", "过程确认"),
+    CHIXU_GAISHAN("#6#", "持续改善");
+
+    private final String code;
+    private final String desc;
+
+    WtlbEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static WtlbEnum fromCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (WtlbEnum item : values()) {
+            if (item.code.equals(code)) {
+                return item;
+            }
+        }
+        if (!code.startsWith("#")) {
+            String wrapped = "#" + code + "#";
+            for (WtlbEnum item : values()) {
+                if (item.code.equals(wrapped)) {
+                    return item;
+                }
+            }
+        }
+        return null;
+    }
+
+    public static String getDescByCode(String code) {
+        WtlbEnum item = fromCode(code);
+        return item != null ? item.getDesc() : code;
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.enums;
+
+import lombok.Getter;
+
+/**
+ * 问题来源枚举
+ * <p>
+ * 数据库字段 wtly 存储编号：
+ * #1#-开班，#2#-过程验证，#3#-过程确认，#4#-体系健康体检，#5#-单位自检（单位牵头）
+ */
+@Getter
+public enum WtlyEnum {
+
+    /**
+     * 开班
+     */
+    KAIBAN("#1#", "开班"),
+
+    /**
+     * 过程验证
+     */
+    GUOCHENG_YANZHENG("#2#", "过程验证"),
+
+    /**
+     * 过程确认
+     */
+    GUOCHENG_QUEREN("#3#", "过程确认"),
+
+    /**
+     * 体系健康体检
+     */
+    TIXI_JIANKANG_TIJIAN("#4#", "体系健康体检"),
+
+    /**
+     * 单位自检（单位牵头）
+     */
+    DANWEI_ZIJIAN("#5#", "单位自检（单位牵头）");
+
+    private final String code;
+    private final String desc;
+
+    WtlyEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static WtlyEnum fromCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (WtlyEnum item : values()) {
+            if (item.code.equals(code)) {
+                return item;
+            }
+        }
+        if (!code.startsWith("#")) {
+            String wrapped = "#" + code + "#";
+            for (WtlyEnum item : values()) {
+                if (item.code.equals(wrapped)) {
+                    return item;
+                }
+            }
+        }
+        return null;
+    }
+
+    public static String getDescByCode(String code) {
+        WtlyEnum item = fromCode(code);
+        return item != null ? item.getDesc() : code;
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.enums;
+
+import lombok.Getter;
+
+/**
+ * 问题性质枚举
+ * <p>
+ * 数据库字段 wtxz 存储编号：
+ * #1#-无标准，#2#-未执行标准，#3#-标准不足
+ */
+@Getter
+public enum WtxzEnum {
+
+    WU_BIAOZHUN("#1#", "无标准"),
+    WEI_ZHIXING_BIAOZHUN("#2#", "未执行标准"),
+    BIAOZHUN_BUZU("#3#", "标准不足");
+
+    private final String code;
+    private final String desc;
+
+    WtxzEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static WtxzEnum fromCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (WtxzEnum item : values()) {
+            if (item.code.equals(code)) {
+                return item;
+            }
+        }
+        if (!code.startsWith("#")) {
+            String wrapped = "#" + code + "#";
+            for (WtxzEnum item : values()) {
+                if (item.code.equals(wrapped)) {
+                    return item;
+                }
+            }
+        }
+        return null;
+    }
+
+    public static String getDescByCode(String code) {
+        WtxzEnum item = fromCode(code);
+        return item != null ? item.getDesc() : code;
+    }
+}

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -15,28 +13,41 @@ import javax.persistence.Table;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "Area", description = "区域信息")
 @Table(name = "t_auto_hfca_ixzvok_cnfeci")
 public class Area extends BaseCorpModel {
 
-    @ApiModelProperty(value = "区域名称")
+    /*
+     * 区域名称
+     */
     private String qymc;
 
-    @ApiModelProperty(value = "区域编号")
+    /*
+     * 区域编号
+     */
     private String qybh;
 
-    @ApiModelProperty(value = "区域负责人")
+    /*
+     * 区域负责人
+     */
     private String qyfzr;
 
-    @ApiModelProperty(value = "所属车间")
+    /*
+     * 所属车间
+     */
     private String sscj;
 
-    @ApiModelProperty(value = "所属室组")
+    /*
+     * 所属室组
+     */
     private String sssz;
 
-    @ApiModelProperty(value = "所属组织")
+    /*
+     * 所属组织
+     */
     private String sszz;
 
-    @ApiModelProperty(value = "状态")
+    /*
+     * 状态
+     */
     private String zt;
 }

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -15,16 +13,14 @@ import javax.persistence.Table;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "CImprovement", description = "C类改善")
 @Table(name = "t_auto_hfca_ixzvok_clgsgl")
 public class CImprovement extends BaseCorpModel {
 
-    @ApiModelProperty(value = "yh")
-    private String yh;
+    public static final String FQR = "fqr";
 
-   /*
-    * 员工号
-    */
+    /*
+     * 员工号
+     */
     private String ygh;
 
     /*
@@ -42,11 +38,8 @@ public class CImprovement extends BaseCorpModel {
      */
     private String bm;
 
-    @ApiModelProperty(value = "szqymc")
-    private String szqymc;
-
     /*
-     *是否问题类改善
+     * 是否问题类改善
      */
     private Boolean sfwtlg;
 
@@ -71,7 +64,7 @@ public class CImprovement extends BaseCorpModel {
     private String qzqr;
 
     /*
-     *改善员确认-组织用户id
+     * 改善员确认-组织用户id
      */
     private String gsyqr;
 
@@ -81,7 +74,7 @@ public class CImprovement extends BaseCorpModel {
     private Boolean sftsyxal;
 
     /*
-     * 状态
+     * 状态  #1#-草稿;#2#-已提交;#3#-已否决;#4#-已确认;
      */
     private String zt;
 
@@ -105,10 +98,14 @@ public class CImprovement extends BaseCorpModel {
      */
     private String szmc;
 
-    @ApiModelProperty(value = "流程实例ID")
+    /*
+     * 流程实例ID
+     */
     private String processInstanceId;
 
-    @ApiModelProperty(value = "审批状态")
+    /*
+     * 审批状态
+     */
     private String approvalStatus;
 
     /*

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -13,7 +8,6 @@ import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Table;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -25,6 +19,10 @@ import java.util.Date;
 @Table(name = "t_auto_hfca_ixzvok_jhzvno")
 public class CImprovementTarget extends BaseCorpModel {
 
+    public static final String YEAR = "year";
+    public static final String DWCJ = "dwcj";
+    public static final String SZXX = "szxx";
+
     /*
      * 年份
      */

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -16,121 +14,182 @@ import java.util.Date;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "CpsProblem", description = "CPS体系问题记录信息")
 @Table(name = "t_auto_hfca_ixzvok_cpstxw")
 public class CpsProblem extends BaseCorpModel {
 
-    @ApiModelProperty(value = "问题编号")
+    public static final String JHJJSJ = "jhjjsj";
+    public static final String GZDW = "gzdw";
+    public static final String WTZRDW = "wtzrdw";
+    public static final String WTCLZT = "wtclzt";
+    public static final String WTLY = "wtly";
+
+    /*
+     * 问题编号
+     */
     private String wtbh;
 
-    @ApiModelProperty(value = "问题来源")
+    /*
+     * 问题来源:#1#-开班;#2#-过程验证;#3#-过程确认;#4#-体系健康体检;#5#-单位自检（单位牵头）;
+     */
     private String wtly;
 
-    @ApiModelProperty(value = "问题提出人")
+    /*
+     * 问题提出人
+     */
     private String wttcr;
 
-    @ApiModelProperty(value = "工作单位")
+    /*
+     * 工作单位
+     */
     private String gzdw;
 
-    @ApiModelProperty(value = "所在区域名称")
-    private String szqymc;
-
-    @ApiModelProperty(value = "人员类别")
+    /*
+     * 人员类别：#1#-区长;#2#-班长;#3#-高级经理;#4#-经理;#5#-主管;#6#-专家;#7#-一般员工;
+     */
     private String rylb;
 
-    @ApiModelProperty(value = "问题描述")
+    /*
+     * 问题描述
+     */
     private String wtms;
 
-    @ApiModelProperty(value = "问题单位")
-    private String wtdw;
+    /*
+     * 问题责任单位
+     */
+    private String wtzrdw;
 
-    @ApiModelProperty(value = "问题附件")
+    /*
+     * 问题附件
+     */
     private String wtfj;
 
-    @ApiModelProperty(value = "问题所属板块")
+    /*
+     * 问题所属板块
+     */
     private String wtssbk;
 
-    @ApiModelProperty(value = "问题类别")
+    /*
+     * 问题类别：#1#-方针展开;#2#-标准化作业;#3#-目视化;#4#-时间数据处理;#5#-过程确认;#6#-持续改善;
+     */
     private String wtlb;
 
-    @ApiModelProperty(value = "问题性质")
+    /*
+     * 问题性质：#1#-无标准；#2#-未执行标准；#3#-标准不足；
+     */
     private String wtxz;
 
-    @ApiModelProperty(value = "sfl")
+    /*
+     * 6S分类：#1#-整理;#2#-整顿;#3#-清洁;#4#-清扫;#5#-素养;#6#-安全;
+     */
     private String sfl;
 
-    @ApiModelProperty(value = "问题是否关闭")
+    /*
+     * 问题是否关闭
+     */
     private Boolean wtsfgb;
 
-    @ApiModelProperty(value = "室组")
+    /*
+     * 室组
+     */
     private String sz;
 
-    @ApiModelProperty(value = "mbghlk")
+    /*
+     * 问题层级-#1#-1;#2#-2;#3#-3;#4#-4;#5#-5;#0#-0;
+     */
     private String mbghlk;
 
-    @ApiModelProperty(value = "问题处理方式")
+    /*
+     * 问题处理方式:#1#-自己解决;#2#-工作安排\同级支持;#3#-问题升级至;
+     */
     private String wtclfs;
 
-    @ApiModelProperty(value = "tntpvy")
+    /*
+     * 问题解决时间
+     */
     private Date tntpvy;
 
-    @ApiModelProperty(value = "gzap")
+    /*
+     * 工作安排/同级支持
+     */
     private String gzap;
 
-    @ApiModelProperty(value = "wtsjz")
+    /*
+     * 问题升级至
+     */
     private String wtsjz;
 
-    @ApiModelProperty(value = "wtjjcs")
+    /*
+     * 问题解决措施
+     */
     private String wtjjcs;
 
-    @ApiModelProperty(value = "wtzghfj")
+    /*
+     * 问题整改后附件
+     */
     private String wtzghfj;
 
-    @ApiModelProperty(value = "wtclr")
+    /*
+     * 问题处理人
+     */
     private String wtclr;
 
-    @ApiModelProperty(value = "wtclzt")
+    /*
+     * 问题处理状态, #1#-待处理;#2#-处理中;#3#-已关闭;#4#-已逾期;
+     */
     private String wtclzt;
 
-    @ApiModelProperty(value = "lywt")
-    private String lywt;
-
-    @ApiModelProperty(value = "zcwt")
-    private String zcwt;
-
-    @ApiModelProperty(value = "区域")
+    /*
+     * 区域
+     */
     private String qy;
 
-    @ApiModelProperty(value = "班组")
+    /*
+     * 班组
+     */
     private String bz;
 
-    @ApiModelProperty(value = "lylx")
-    private String lylx;
-
-    @ApiModelProperty(value = "jhjjsj")
+    /*
+     * 计划解决时间
+     */
     private Date jhjjsj;
 
-    @ApiModelProperty(value = "wtclfs2")
+    /*
+     * 问题处理方式2
+     */
     private String wtclfs2;
 
-    @ApiModelProperty(value = "gzap2")
+    /*
+     * 工作安排/同级支持2
+     */
     private String gzap2;
 
-    @ApiModelProperty(value = "wtsjz2")
+    /*
+     * 问题升级至2
+     */
     private String wtsjz2;
 
-    @ApiModelProperty(value = "wtclfs3")
+    /*
+     * 问题处理方式3
+     */
     private String wtclfs3;
 
-    @ApiModelProperty(value = "gzap3")
+    /*
+     * 工作安排/同级支持3
+     */
     private String gzap3;
 
-    @ApiModelProperty(value = "wtsjz3")
+    /*
+     * 问题升级至3
+     */
     private String wtsjz3;
 
-    @ApiModelProperty(value = "流程实例ID")
+    /*
+     * 流程实例ID
+     */
     private String processInstanceId;
 
-    @ApiModelProperty(value = "审批状态")
+    /*
+     * 审批状态
+     */
     private String approvalStatus;
 }

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -15,31 +13,48 @@ import javax.persistence.Table;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "Personnel", description = "人员信息")
 @Table(name = "t_auto_hfca_ixzvok_bzcygl")
 public class Personnel extends BaseCorpModel {
 
-    @ApiModelProperty(value = "所属班组")
+    public static final String GH = "gh";
+
+    /*
+     * 所属班组
+     */
     private String ssbz;
 
-    @ApiModelProperty(value = "姓名")
+    /*
+     * 姓名
+     */
     private String xm;
 
-    @ApiModelProperty(value = "人员")
+    /*
+     * 人员
+     */
     private String ry;
 
-    @ApiModelProperty(value = "所属部门")
+    /*
+     * 所属部门
+     */
     private String ssbm;
 
-    @ApiModelProperty(value = "工号")
+    /*
+     * 工号
+     */
     private String gh;
 
-    @ApiModelProperty(value = "所属单位")
+    /*
+     * 所属单位
+     */
     private String ssdw;
 
-    @ApiModelProperty(value = "所属室组")
+    /*
+     * 所属室组
+     */
     private String sssz;
 
-    @ApiModelProperty(value = "所属区域")
+    /*
+     * 所属区域
+     */
     private String ssqy;
 }

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -16,28 +14,41 @@ import java.util.Date;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "PjoBatch", description = "PJO计划批次信息")
 @Table(name = "t_auto_hfca_ixzvok_ouziyg")
 public class PjoBatch extends BaseCorpModel {
 
-    @ApiModelProperty(value = "批次编号")
+    /*
+     * 批次编号
+     */
     private String pcbh;
 
-    @ApiModelProperty(value = "批次执行人")
+    /*
+     * 批次执行人
+     */
     private String pczxr;
 
-    @ApiModelProperty(value = "批次执行开始日期")
+    /*
+     * 批次执行开始日期
+     */
     private Date pczxksrq;
 
-    @ApiModelProperty(value = "批次执行结束日期")
+    /*
+     * 批次执行结束日期
+     */
     private Date pczxjsrq;
 
-    @ApiModelProperty(value = "执行区域")
+    /*
+     * 执行区域
+     */
     private String zxqy;
 
-    @ApiModelProperty(value = "状态")
+    /*
+     * 状态
+     */
     private String zt;
 
-    @ApiModelProperty(value = "批次名称")
+    /*
+     * 批次名称
+     */
     private String pcmc;
 }

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -16,103 +14,166 @@ import java.util.Date;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "PjoExec", description = "PJO计划执行信息")
 @Table(name = "t_auto_hfca_ixzvok_wmkgsv")
 public class PjoExec extends BaseCorpModel {
 
-    @ApiModelProperty(value = "当日生产班次")
+    /*
+     * 当日生产班次
+     */
     private String drscbc;
 
-    @ApiModelProperty(value = "qkxdwk")
+    /*
+     * qkxdwk
+     */
     private Date qkxdwk;
 
-    @ApiModelProperty(value = "PJO执行人")
+    /*
+     * PJO执行人
+     */
     private String pjozxr;
 
-    @ApiModelProperty(value = "PJO批次")
+    /*
+     * PJO批次
+     */
     private String pjopc;
 
-    @ApiModelProperty(value = "车间")
+    /*
+     * 车间
+     */
     private String cj;
 
-    @ApiModelProperty(value = "产线")
+    /*
+     * 产线
+     */
     private String cx;
 
-    @ApiModelProperty(value = "CPS区域")
+    /*
+     * CPS区域
+     */
     private String cpsqy;
 
-    @ApiModelProperty(value = "班组")
+    /*
+     * 班组
+     */
     private String bz;
 
-    @ApiModelProperty(value = "PJO观察人姓名")
+    /*
+     * PJO观察人姓名
+     */
     private String pjogcrxm;
 
-    @ApiModelProperty(value = "工位信息")
+    /*
+     * 工位信息
+     */
     private String gwxx;
 
-    @ApiModelProperty(value = "所属批次")
+    /*
+     * 所属批次
+     */
     private String sspc;
 
-    @ApiModelProperty(value = "工位性质")
+    /*
+     * 工位性质
+     */
     private String gwxz;
 
-    @ApiModelProperty(value = "PJO是否正常开展")
+    /*
+     * PJO是否正常开展
+     */
     private Boolean pjosfzckz;
 
-    @ApiModelProperty(value = "gchtxzyyc")
+    /*
+     * gchtxzyyc
+     */
     private String gchtxzyyc;
 
-    @ApiModelProperty(value = "gchtxcyyc")
+    /*
+     * gchtxcyyc
+     */
     private String gchtxcyyc;
 
-    @ApiModelProperty(value = "gcdwt")
+    /*
+     * gcdwt
+     */
     private String gcdwt;
 
-    @ApiModelProperty(value = "gcgjjh")
+    /*
+     * gcgjjh
+     */
     private String gcgjjh;
 
-    @ApiModelProperty(value = "lfwkuc")
+    /*
+     * lfwkuc
+     */
     private String lfwkuc;
 
-    @ApiModelProperty(value = "zyczdwt")
+    /*
+     * zyczdwt
+     */
     private String zyczdwt;
 
-    @ApiModelProperty(value = "zdbgwdgsjy")
+    /*
+     * zdbgwdgsjy
+     */
     private String zdbgwdgsjy;
 
-    @ApiModelProperty(value = "lvqwyc")
+    /*
+     * lvqwyc
+     */
     private String lvqwyc;
 
-    @ApiModelProperty(value = "zyqm")
+    /*
+     * zyqm
+     */
     private String zyqm;
 
-    @ApiModelProperty(value = "zysfyjy")
+    /*
+     * zysfyjy
+     */
     private Boolean zysfyjy;
 
-    @ApiModelProperty(value = "cyjy")
+    /*
+     * cyjy
+     */
     private String cyjy;
 
-    @ApiModelProperty(value = "zyjy")
+    /*
+     * zyjy
+     */
     private String zyjy;
 
-    @ApiModelProperty(value = "状态")
+    /*
+     * 状态
+     */
     private String zt;
 
-    @ApiModelProperty(value = "区域")
+    /*
+     * 区域
+     */
     private String qy;
 
-    @ApiModelProperty(value = "gwxx2")
+    /*
+     * gwxx2
+     */
     private String gwxx2;
 
-    @ApiModelProperty(value = "zyqmb")
+    /*
+     * zyqmb
+     */
     private String zyqmb;
 
-    @ApiModelProperty(value = "gwzx1")
+    /*
+     * gwzx1
+     */
     private String gwzx1;
 
-    @ApiModelProperty(value = "gwzx2")
+    /*
+     * gwzx2
+     */
     private String gwzx2;
 
-    @ApiModelProperty(value = "线体")
+    /*
+     * 线体
+     */
     private String xt;
 }

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -15,34 +13,51 @@ import javax.persistence.Table;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "PjoWorkstationExec", description = "PJO计划工位执行情况信息")
 @Table(name = "t_auto_hfca_ixzvok_kjpssd")
 public class PjoWorkstationExec extends BaseCorpModel {
 
-    @ApiModelProperty(value = "工位状态")
+    /*
+     * 工位状态
+     */
     private String gwzt;
 
-    @ApiModelProperty(value = "PJO批次")
+    /*
+     * PJO批次
+     */
     private String pjopc;
 
-    @ApiModelProperty(value = "工位")
+    /*
+     * 工位
+     */
     private String gw;
 
-    @ApiModelProperty(value = "clbcfl")
+    /*
+     * clbcfl
+     */
     private Double clbcfl;
 
-    @ApiModelProperty(value = "工位名称")
+    /*
+     * 工位名称
+     */
     private String gwmc;
 
-    @ApiModelProperty(value = "工位编号")
+    /*
+     * 工位编号
+     */
     private String gwbh;
 
-    @ApiModelProperty(value = "所属车间")
+    /*
+     * 所属车间
+     */
     private String sscj;
 
-    @ApiModelProperty(value = "所属区域")
+    /*
+     * 所属区域
+     */
     private String ssqy;
 
-    @ApiModelProperty(value = "工位执行所属班组")
+    /*
+     * 工位执行所属班组
+     */
     private String gwzxssbz;
 }

@@ -2,8 +2,6 @@ package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -18,62 +16,95 @@ import java.util.Date;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "ProcessConfirmExec", description = "过程确认计划执行记录信息")
 @Table(name = "t_auto_hfca_ixzvok_gcqrjhzx")
 public class ProcessConfirmExec extends BaseCorpModel {
 
+    /*
+     * 活动执行日期
+     */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "活动执行日期")
     private Date hdzxrq;
 
-    @ApiModelProperty(value = "过程确认计划人员")
+    /*
+     * 过程确认计划人员
+     */
     private String gcqrjhry;
 
-    @ApiModelProperty(value = "执行人员")
+    /*
+     * 执行人员
+     */
     private String zxry;
 
-    @ApiModelProperty(value = "工号")
+    /*
+     * 工号
+     */
     private String gh;
 
-    @ApiModelProperty(value = "人员类别")
+    /*
+     * 人员类别
+     */
     private String rylb;
 
-    @ApiModelProperty(value = "单位")
+    /*
+     * 单位
+     */
     private String dw;
 
-    @ApiModelProperty(value = "室组")
+    /*
+     * 室组
+     */
     private String sz;
 
-    @ApiModelProperty(value = "区域")
+    /*
+     * 区域
+     */
     private String qy;
 
-    @ApiModelProperty(value = "班组")
+    /*
+     * 班组
+     */
     private String bz;
 
-    @ApiModelProperty(value = "线体")
+    /*
+     * 线体
+     */
     private String xt;
 
-    @ApiModelProperty(value = "班次")
+    /*
+     * 班次
+     */
     private String bc;
 
+    /*
+     * 过期时间
+     */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "过期时间")
     private Date gqsj;
 
-    @ApiModelProperty(value = "状态")
+    /*
+     * 状态
+     */
     private String zt;
 
-    @ApiModelProperty(value = "是否已执行")
+    /*
+     * 是否已执行
+     */
     private Boolean sfyzx;
 
-    @ApiModelProperty(value = "未执行原因说明")
+    /*
+     * 未执行原因说明
+     */
     private String wzxyysm;
 
-    @ApiModelProperty(value = "是否发现问题")
+    /*
+     * 是否发现问题
+     */
     private Boolean sffxwt;
 
-    @ApiModelProperty(value = "未执行原因")
+    /*
+     * 未执行原因
+     */
     private String wzxyys;
 }

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -16,103 +14,166 @@ import java.util.Date;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "ProcessConfirmPersonnel", description = "过程确认维护人员信息")
 @Table(name = "t_auto_hfca_ixzvok_gcjhrywh")
 public class ProcessConfirmPersonnel extends BaseCorpModel {
 
-    @ApiModelProperty(value = "活动执行日期")
+    /*
+     * 活动执行日期
+     */
     private Date hdzxrq;
 
-    @ApiModelProperty(value = "执行人员")
+    /*
+     * 执行人员
+     */
     private String zxry;
 
-    @ApiModelProperty(value = "活动执行人姓名")
+    /*
+     * 活动执行人姓名
+     */
     private String hdzxrxm;
 
-    @ApiModelProperty(value = "工号")
+    /*
+     * 工号
+     */
     private String gh;
 
-    @ApiModelProperty(value = "工作单位")
+    /*
+     * 工作单位
+     */
     private String gzdw;
 
-    @ApiModelProperty(value = "人员类别")
+    /*
+     * 人员类别
+     */
     private String rylb;
 
-    @ApiModelProperty(value = "所在区域名称")
+    /*
+     * 所在区域名称
+     */
     private String szqymc;
 
-    @ApiModelProperty(value = "班组")
+    /*
+     * 班组
+     */
     private String bz;
 
-    @ApiModelProperty(value = "线体")
+    /*
+     * 线体
+     */
     private String xt;
 
-    @ApiModelProperty(value = "班次")
+    /*
+     * 班次
+     */
     private String bc;
 
-    @ApiModelProperty(value = "过期时间")
+    /*
+     * 过期时间
+     */
     private Date gqsj;
 
-    @ApiModelProperty(value = "状态")
+    /*
+     * 状态
+     */
     private String zt;
 
-    @ApiModelProperty(value = "过程执行")
+    /*
+     * 过程执行
+     */
     private String gczx;
 
-    @ApiModelProperty(value = "未执行原因")
+    /*
+     * 未执行原因
+     */
     private String wzxyy;
 
-    @ApiModelProperty(value = "是否发现问题")
+    /*
+     * 是否发现问题
+     */
     private Boolean sffxwt;
 
-    @ApiModelProperty(value = "单位名称")
+    /*
+     * 单位名称
+     */
     private String dwmc;
 
-    @ApiModelProperty(value = "单位编号")
+    /*
+     * 单位编号
+     */
     private String dwbh;
 
-    @ApiModelProperty(value = "单位负责人")
+    /*
+     * 单位负责人
+     */
     private String dwfzr;
 
-    @ApiModelProperty(value = "人员")
+    /*
+     * 人员
+     */
     private String ry;
 
-    @ApiModelProperty(value = "人员所属单位")
+    /*
+     * 人员所属单位
+     */
     private String ryssdw;
 
-    @ApiModelProperty(value = "所属室组")
+    /*
+     * 所属室组
+     */
     private String sssz;
 
-    @ApiModelProperty(value = "所属班组")
+    /*
+     * 所属班组
+     */
     private String ssbz;
 
-    @ApiModelProperty(value = "室组")
+    /*
+     * 室组
+     */
     private String sz;
 
-    @ApiModelProperty(value = "区域")
+    /*
+     * 区域
+     */
     private String qy;
 
-    @ApiModelProperty(value = "所属区域")
+    /*
+     * 所属区域
+     */
     private String ssqy;
 
-    @ApiModelProperty(value = "eaohkg")
+    /*
+     * eaohkg
+     */
     private String eaohkg;
 
-    @ApiModelProperty(value = "过程确认计划人员")
+    /*
+     * 过程确认计划人员
+     */
     private String gcqrjhry;
 
-    @ApiModelProperty(value = "单位")
+    /*
+     * 单位
+     */
     private String dw;
 
-    @ApiModelProperty(value = "所属单位")
+    /*
+     * 所属单位
+     */
     private String ssdw;
 
-    @ApiModelProperty(value = "所属线体")
+    /*
+     * 所属线体
+     */
     private String ssxt;
 
-    @ApiModelProperty(value = "人员姓名")
+    /*
+     * 人员姓名
+     */
     private String ryxm;
 
-    @ApiModelProperty(value = "是否已执行")
+    /*
+     * 是否已执行
+     */
     private Boolean sfyzx;
 }

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Table;
+import java.util.Date;
 
 /**
  * 季度人员信息
@@ -15,28 +16,53 @@ import javax.persistence.Table;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "QuarterPersonnel", description = "季度人员信息")
 @Table(name = "t_auto_hfca_ixzvok_wltctp")
 public class QuarterPersonnel extends BaseCorpModel {
 
-    @ApiModelProperty(value = "季度信息")
+    public static final String JDXX = "jdxx";
+    public static final String YEAR = "year";
+    public static final String SHDW = "shdw";
+    public static final String SHSZ = "shsz";
+    public static final String YHRY = "yhry";
+    /*
+     * 年份
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date year;
+
+    /*
+     * 季度枚举 #1#-第一季度 #2#-第二季度 #3#-第三季度 #4#-第四季度
+     */
     private String jdxx;
 
-    @ApiModelProperty(value = "员工人员")
+    /*
+     * 员工人员
+     */
     private String yhry;
 
-    @ApiModelProperty(value = "人员工号")
+    /*
+     * 人员工号
+     */
     private String rygh;
 
-    @ApiModelProperty(value = "所在单位")
+    /*
+     * 所在单位
+     */
     private String shdw;
 
-    @ApiModelProperty(value = "所在室组")
+    /*
+     * 所在室组
+     */
     private String shsz;
 
-    @ApiModelProperty(value = "所属区域")
+    /*
+     * 所属区域
+     */
     private String ssqy;
 
-    @ApiModelProperty(value = "所属班组")
+    /*
+     * 所属班组
+     */
     private String ssbz;
 }

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -15,25 +13,36 @@ import javax.persistence.Table;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "RoomGroup", description = "室组信息")
 @Table(name = "t_auto_hfca_ixzvok_efawtt")
 public class RoomGroup extends BaseCorpModel {
 
-    @ApiModelProperty(value = "室组名称")
+    /*
+     * 室组名称
+     */
     private String szmc;
 
-    @ApiModelProperty(value = "室组编号")
+    /*
+     * 室组编号
+     */
     private String szbh;
 
-    @ApiModelProperty(value = "室组负责人")
+    /*
+     * 室组负责人
+     */
     private String szfzr;
 
-    @ApiModelProperty(value = "所属单位")
+    /*
+     * 所属单位
+     */
     private String ssdw;
 
-    @ApiModelProperty(value = "所属组织")
+    /*
+     * 所属组织
+     */
     private String sszz;
 
-    @ApiModelProperty(value = "状态")
+    /*
+     * 状态
+     */
     private String zt;
 }

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -15,19 +13,26 @@ import javax.persistence.Table;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "Shift", description = "班次信息")
 @Table(name = "t_auto_hfca_ixzvok_usnoxx")
 public class Shift extends BaseCorpModel {
 
-    @ApiModelProperty(value = "班次名称")
+    /*
+     * 班次名称
+     */
     private String bcmc;
 
-    @ApiModelProperty(value = "班次编号")
+    /*
+     * 班次编号
+     */
     private String bcbh;
 
-    @ApiModelProperty(value = "班次类型")
+    /*
+     * 班次类型
+     */
     private String bclx;
 
-    @ApiModelProperty(value = "状态")
+    /*
+     * 状态
+     */
     private String zt;
 }

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -15,61 +13,96 @@ import javax.persistence.Table;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "StdActivityCase", description = "标准活动优秀案例")
 @Table(name = "t_auto_hfca_ixzvok_bzhdyx")
 public class StdActivityCase extends BaseCorpModel {
 
-    @ApiModelProperty(value = "hdzxr")
+    /*
+     * hdzxr
+     */
     private String hdzxr;
 
-    @ApiModelProperty(value = "ygbh")
+    /*
+     * ygbh
+     */
     private String ygbh;
 
-    @ApiModelProperty(value = "gzdw")
+    /*
+     * gzdw
+     */
     private String gzdw;
 
-    @ApiModelProperty(value = "szqymc")
+    /*
+     * szqymc
+     */
     private String szqymc;
 
-    @ApiModelProperty(value = "xt")
+    /*
+     * xt
+     */
     private String xt;
 
-    @ApiModelProperty(value = "wtbm")
+    /*
+     * wtbm
+     */
     private String wtbm;
 
-    @ApiModelProperty(value = "tjalfj")
+    /*
+     * tjalfj
+     */
     private String tjalfj;
 
-    @ApiModelProperty(value = "qz")
+    /*
+     * qz
+     */
     private String qz;
 
-    @ApiModelProperty(value = "bdwcps")
+    /*
+     * bdwcps
+     */
     private String bdwcps;
 
-    @ApiModelProperty(value = "dwldsh")
+    /*
+     * dwldsh
+     */
     private String dwldsh;
 
-    @ApiModelProperty(value = "_c_sftscp")
+    /*
+     * _c_sftscp
+     */
     private String cSftscp;
 
-    @ApiModelProperty(value = "sftscp")
+    /*
+     * sftscp
+     */
     private Boolean sftscp;
 
-    @ApiModelProperty(value = "sz")
+    /*
+     * sz
+     */
     private String sz;
 
-    @ApiModelProperty(value = "bdwcpstxy")
+    /*
+     * bdwcpstxy
+     */
     private String bdwcpstxy;
 
-    @ApiModelProperty(value = "sftscps")
+    /*
+     * sftscps
+     */
     private String sftscps;
 
-    @ApiModelProperty(value = "zt")
+    /*
+     * zt
+     */
     private String zt;
 
-    @ApiModelProperty(value = "流程实例ID")
+    /*
+     * 流程实例ID
+     */
     private String processInstanceId;
 
-    @ApiModelProperty(value = "审批状态")
+    /*
+     * 审批状态
+     */
     private String approvalStatus;
 }

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -15,34 +13,51 @@ import javax.persistence.Table;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "Team", description = "班组信息")
 @Table(name = "t_auto_hfca_ixzvok_bzxxgl")
 public class Team extends BaseCorpModel {
 
-    @ApiModelProperty(value = "班组名称")
+    /*
+     * 班组名称
+     */
     private String bzmc;
 
-    @ApiModelProperty(value = "班组编号")
+    /*
+     * 班组编号
+     */
     private String bzbh;
 
-    @ApiModelProperty(value = "班组负责人")
+    /*
+     * 班组负责人
+     */
     private String bzfzr;
 
-    @ApiModelProperty(value = "所属区域")
+    /*
+     * 所属区域
+     */
     private String ssqy;
 
-    @ApiModelProperty(value = "班次")
+    /*
+     * 班次
+     */
     private String bc;
 
-    @ApiModelProperty(value = "iytfgx")
+    /*
+     * iytfgx
+     */
     private String iytfgx;
 
-    @ApiModelProperty(value = "班组成员")
+    /*
+     * 班组成员
+     */
     private String bzcy;
 
-    @ApiModelProperty(value = "所属组织")
+    /*
+     * 所属组织
+     */
     private String sszz;
 
-    @ApiModelProperty(value = "状态")
+    /*
+     * 状态
+     */
     private String zt;
 }

@@ -2,7 +2,6 @@ package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.apaas.sync.cps.enums.WorkshopStatusEnum;
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -19,34 +18,41 @@ import javax.persistence.Transient;
 @Table(name = "t_auto_hfca_ixzvok_phwifn")
 public class Workshop extends BaseCorpModel {
 
-    /**
+    /*
      * 单位名称
      */
     private String dwmc;
 
-    @ApiModelProperty(value = "单位编号")
+    /*
+     * 单位编号
+     */
     private String dwbh;
 
-    @ApiModelProperty(value = "所属线体")
+    /*
+     * 所属线体
+     */
     private String ssxt;
 
-    @ApiModelProperty(value = "单位负责人")
+    /*
+     * 单位负责人
+     */
     private String dwfzr;
 
-    @ApiModelProperty(value = "所属组织")
+    /*
+     * 所属组织
+     */
     private String sszz;
 
-    /**
+    /*
      * 状态-#1#:草稿;#2#:启用;#3#:停用;
      */
-    @ApiModelProperty(value = "状态", hidden = true)
     private String ieiblp;
 
-    /**
+    /**********非持久化字段*********/
+    /*
      * 状态中文描述（非数据库字段，用于前端展示）
      */
     @Transient
-    @ApiModelProperty(value = "状态描述")
     private String statusDesc;
 
     /**

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -15,37 +13,56 @@ import javax.persistence.Table;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "Workstation", description = "工位信息")
 @Table(name = "t_auto_hfca_ixzvok_jtcffk")
 public class Workstation extends BaseCorpModel {
 
-    @ApiModelProperty(value = "工位名称")
+    /*
+     * 工位名称
+     */
     private String gwmc;
 
-    @ApiModelProperty(value = "工位编号")
+    /*
+     * 工位编号
+     */
     private String gwbh;
 
-    @ApiModelProperty(value = "工位性质")
+    /*
+     * 工位性质
+     */
     private String gwxz;
 
-    @ApiModelProperty(value = "所属区域")
+    /*
+     * 所属区域
+     */
     private String ssqy;
 
-    @ApiModelProperty(value = "所属班组")
+    /*
+     * 所属班组
+     */
     private String ssbz;
 
-    @ApiModelProperty(value = "所属车间")
+    /*
+     * 所属车间
+     */
     private String sscj;
 
-    @ApiModelProperty(value = "所属室组")
+    /*
+     * 所属室组
+     */
     private String ssqz;
 
-    @ApiModelProperty(value = "状态")
+    /*
+     * 状态
+     */
     private String zt;
 
-    @ApiModelProperty(value = "线体")
+    /*
+     * 线体
+     */
     private String xt;
 
-    @ApiModelProperty(value = "byiwiz")
+    /*
+     * byiwiz
+     */
     private String byiwiz;
 }

 package com.qgutech.qgyun.apaas.sync.cps.model;
 
 import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -15,19 +13,26 @@ import javax.persistence.Table;
 @Getter
 @Setter
 @ToString
-@ApiModel(value = "XtLine", description = "线体信息")
 @Table(name = "t_auto_hfca_ixzvok_umsoxi")
 public class XtLine extends BaseCorpModel {
 
-    @ApiModelProperty(value = "线体名称")
+    /*
+     * 线体名称
+     */
     private String xtmc;
 
-    @ApiModelProperty(value = "线体编号")
+    /*
+     * 线体编号
+     */
     private String xtbh;
 
-    @ApiModelProperty(value = "线体负责人")
+    /*
+     * 线体负责人
+     */
     private String xtfzr;
 
-    @ApiModelProperty(value = "amoigs")
+    /*
+     * amoigs
+     */
     private String amoigs;
 }

@@ -6,7 +6,6 @@ import com.qgutech.qgyun.apaas.sync.base.BoErrorCode;
 import com.qgutech.qgyun.apaas.sync.base.BoException;
 import com.qgutech.qgyun.apaas.sync.cps.dto.AbImprovementSummaryDTO;
 import com.qgutech.qgyun.apaas.sync.cps.mapper.AbImprovementMapper;
-import com.qgutech.qgyun.apaas.sync.cps.mapper.AbImprovementTargetMapper;
 import com.qgutech.qgyun.apaas.sync.cps.model.AbImprovement;
 import com.qgutech.qgyun.apaas.sync.cps.model.AbImprovementTarget;
 import com.qgutech.qgyun.apaas.sync.cps.model.Workshop;
@@ -18,8 +17,6 @@ import org.springframework.util.Assert;
 import tk.mybatis.mapper.entity.Example;
 
 import javax.annotation.Resource;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -143,7 +140,7 @@ public class AbImprovementService extends BaseServiceImpl<AbImprovement> {
 
         // 7. 组装汇总结果（每个单位车间一条记录）
         Map<String, Double> finalTargetMap = targetMap;
-        return dwcjSummaryMap.entrySet().stream()
+        List<AbImprovementSummaryDTO> resultList = dwcjSummaryMap.entrySet().stream()
                 .map(entry -> {
                     String dwcj = entry.getKey();
                     AbImprovementSummaryDTO dto = new AbImprovementSummaryDTO();
@@ -151,7 +148,7 @@ public class AbImprovementService extends BaseServiceImpl<AbImprovement> {
                     dto.setYear(queryYear);
                     dto.setTotalQnjyjz(entry.getValue());
                     dto.setMb(finalTargetMap.get(dwcj));
-                    // 设置单位车间名称
+                    // 设置单位车间名称、编号
                     Workshop workshop = workshopMap.get(dwcj);
                     if (workshop != null) {
                         dto.setDwcjName(workshop.getDwmc());
@@ -164,5 +161,10 @@ public class AbImprovementService extends BaseServiceImpl<AbImprovement> {
                     return dto;
                 })
                 .collect(Collectors.toList());
+
+        // 8. 按单位车间编号升序排序，编号为空的排在最后
+        resultList.sort(Comparator.comparing(AbImprovementSummaryDTO::getDwcjCode,
+                Comparator.nullsLast(Comparator.naturalOrder())));
+        return resultList;
     }
 }

 package com.qgutech.qgyun.apaas.sync.cps.service;
 
-import com.qgutech.qgyun.framework.database.mybatis.service.BaseServiceImpl;
 import com.qgutech.qgyun.apaas.sync.base.BoErrorCode;
 import com.qgutech.qgyun.apaas.sync.base.BoException;
+import com.qgutech.qgyun.apaas.sync.cps.dto.CImprovementDetailDTO;
 import com.qgutech.qgyun.apaas.sync.cps.dto.CImprovementSummaryDTO;
 import com.qgutech.qgyun.apaas.sync.cps.enums.QuarterEnum;
+import com.qgutech.qgyun.apaas.sync.cps.enums.CImprovementStatusEnum;
 import com.qgutech.qgyun.apaas.sync.cps.mapper.CImprovementMapper;
-import com.qgutech.qgyun.apaas.sync.cps.mapper.CImprovementTargetMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.Area;
 import com.qgutech.qgyun.apaas.sync.cps.model.CImprovement;
 import com.qgutech.qgyun.apaas.sync.cps.model.CImprovementTarget;
+import com.qgutech.qgyun.apaas.sync.cps.model.Personnel;
 import com.qgutech.qgyun.apaas.sync.cps.model.QuarterPersonnel;
 import com.qgutech.qgyun.apaas.sync.cps.model.RoomGroup;
+import com.qgutech.qgyun.apaas.sync.cps.model.Team;
 import com.qgutech.qgyun.apaas.sync.cps.model.Workshop;
+import com.qgutech.qgyun.apaas.sync.org.model.UcOrg;
+import com.qgutech.qgyun.apaas.sync.org.model.UcUser;
+import com.qgutech.qgyun.apaas.sync.org.service.UcOrgService;
+import com.qgutech.qgyun.apaas.sync.org.service.UcUserService;
+import com.qgutech.qgyun.apaas.sync.utils.DateDealUtils;
+import com.qgutech.qgyun.framework.database.mybatis.service.BaseServiceImpl;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import tk.mybatis.mapper.entity.Example;
 
 import javax.annotation.Resource;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -35,7 +43,7 @@ public class CImprovementService extends BaseServiceImpl<CImprovement> {
     private CImprovementMapper cImprovementMapper;
 
     @Resource
-    private CImprovementTargetMapper cImprovementTargetMapper;
+    private CImprovementTargetService cImprovementTargetService;
 
     @Resource
     private QuarterPersonnelService quarterPersonnelService;
@@ -46,6 +54,21 @@ public class CImprovementService extends BaseServiceImpl<CImprovement> {
     @Resource
     private WorkshopService workshopService;
 
+    @Resource
+    private TeamService teamService;
+
+    @Resource
+    private AreaService areaService;
+
+    @Resource
+    private PersonnelService personnelService;
+
+    @Resource
+    private UcUserService ucUserService;
+
+    @Resource
+    private UcOrgService ucOrgService;
+
     @Transactional(readOnly = true)
     public CImprovement getById(String id) {
         Assert.hasLength(id, "id is empty!");
@@ -91,13 +114,13 @@ public class CImprovementService extends BaseServiceImpl<CImprovement> {
     }
 
     /**
-     * 根据年份和季度查询C类改善汇总（按单位车间分组）
+     * 根据年份和季度查询C类改善汇总（按室组维度分组）
      * <p>
-     * 年份为空时默认查询当前年，季度必传
+     * 年份为空时默认查询当前年，季度必传；返回列表按室组编号升序排序
      *
      * @param year    年份，格式：yyyy，可为空
      * @param quarter 季度枚举值（#1#-#4#），必传
-     * @return C类改善汇总列表
+     * @return C类改善汇总列表（按室组编号升序）
      */
     @Transactional(readOnly = true)
     public List<CImprovementSummaryDTO> summaryByYearAndQuarter(String year, String quarter) {
@@ -111,28 +134,27 @@ public class CImprovementService extends BaseServiceImpl<CImprovement> {
         Assert.isTrue(queryYear.matches("\\d{4}"), "year format must be yyyy!");
 
         // 3. 计算季度的开始时间和结束时间
-        Date startTime = parseQuarterStartTime(queryYear, quarterEnum);
-        Date endTime = parseQuarterEndTime(queryYear, quarterEnum);
+        Date startTime = DateDealUtils.parseQuarterStartTime(queryYear, quarterEnum);
+        Date endTime = DateDealUtils.parseQuarterEndTime(queryYear, quarterEnum);
 
         // 4. 查询该季度时间范围内的C类改善记录
         Example example = new Example(CImprovement.class);
         example.createCriteria()
-                .andBetween("createTime", startTime, endTime);
+                .andBetween(CImprovement.CREATED_AT, startTime, endTime);
         List<CImprovement> cImprovementList = cImprovementMapper.selectByExample(example);
 
         // 5. 查询该年份季度的季度人员信息
-        Date yearStartTime = parseYearStartTime(queryYear);
-        List<QuarterPersonnel> quarterPersonnelList = quarterPersonnelService.listByYearAndQuarter(yearStartTime, quarter);
+        List<QuarterPersonnel> quarterPersonnelList = quarterPersonnelService.listByYearAndQuarter(queryYear, quarterEnum);
 
         if (CollectionUtils.isEmpty(quarterPersonnelList)) {
             return new ArrayList<>(0);
         }
 
-        // 6. 构建人员工号到季度人员信息的映射
+        // 6. 构建人员id到季度人员信息的映射
         Map<String, QuarterPersonnel> personnelMap = quarterPersonnelList.stream()
                 .filter(item -> item.getRygh() != null)
                 .collect(Collectors.toMap(
-                        QuarterPersonnel::getRygh,
+                        QuarterPersonnel::getYhry,
                         item -> item,
                         (v1, v2) -> v1
                 ));
@@ -146,13 +168,12 @@ public class CImprovementService extends BaseServiceImpl<CImprovement> {
                 ));
 
         // 8. 统计每个室组有C类改善记录的人数（同一人多条记录算一次）
-        // 先获取有改善记录的发起人工号集合
-        Set<String> improvementFqrSet = cImprovementList.stream()
+        Set<String> improvementFqrSet = CollectionUtils.isEmpty(cImprovementList) ? Collections.emptySet()
+                : cImprovementList.stream()
                 .filter(item -> item.getFqr() != null)
                 .map(CImprovement::getFqr)
                 .collect(Collectors.toSet());
 
-        // 按室组统计有改善记录的人数
         Map<String, Set<String>> roomGroupImprovementPersonnelMap = new HashMap<>();
         for (String fqr : improvementFqrSet) {
             QuarterPersonnel personnel = personnelMap.get(fqr);
@@ -161,13 +182,8 @@ public class CImprovementService extends BaseServiceImpl<CImprovement> {
             }
         }
 
-        // 9. 查询该年份的C类目标信息（按室组维度）
-        Example targetExample = new Example(CImprovementTarget.class);
-        targetExample.createCriteria()
-                .andEqualTo("year", yearStartTime);
-        List<CImprovementTarget> targetList = cImprovementTargetMapper.selectByExample(targetExample);
-
-        // 构建目标值映射Map：szxx（室组） -> mb
+        // 9. 查询该年份的C类目标信息（按室组维度），走 CImprovementTargetService
+        List<CImprovementTarget> targetList = cImprovementTargetService.listByYear(queryYear);
         Map<String, Double> targetMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(targetList)) {
             targetMap = targetList.stream()
@@ -179,29 +195,26 @@ public class CImprovementService extends BaseServiceImpl<CImprovement> {
                     ));
         }
 
-        // 10. 查询室组详细信息（室组名称、所属单位）
+        // 10. 查询室组详细信息（室组名称、室组编号、所属单位）
         Set<String> roomGroupIds = roomGroupPersonnelCountMap.keySet();
-        Map<String, RoomGroup> roomGroupMap = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(roomGroupIds)) {
-            roomGroupMap = roomGroupService.mapByIds(roomGroupIds);
-        }
+        Map<String, RoomGroup> roomGroupMap = CollectionUtils.isEmpty(roomGroupIds)
+                ? new HashMap<>(0)
+                : roomGroupService.mapByIds(roomGroupIds);
 
-        // 11. 根据室组所属单位查询单位车间详细信息
+        // 11. 根据室组所属单位查询单位车间详细信息（含单位编号）
         Set<String> dwcjIds = roomGroupMap.values().stream()
                 .map(RoomGroup::getSsdw)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toSet());
-        Map<String, Workshop> workshopMap = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(dwcjIds)) {
-            workshopMap = workshopService.mapByIds(dwcjIds);
-        }
+        Map<String, Workshop> workshopMap = CollectionUtils.isEmpty(dwcjIds)
+                ? new HashMap<>(0)
+                : workshopService.mapByIds(dwcjIds);
 
         // 12. 组装汇总结果（按室组维度）
         Map<String, Double> finalTargetMap = targetMap;
         Map<String, RoomGroup> finalRoomGroupMap = roomGroupMap;
         Map<String, Workshop> finalWorkshopMap = workshopMap;
-        String finalQueryYear = queryYear;
-        return roomGroupPersonnelCountMap.entrySet().stream()
+        List<CImprovementSummaryDTO> resultList = roomGroupPersonnelCountMap.entrySet().stream()
                 .map(entry -> {
                     String szxx = entry.getKey();
                     int totalPersonnel = entry.getValue().intValue();
@@ -209,7 +222,7 @@ public class CImprovementService extends BaseServiceImpl<CImprovement> {
 
                     CImprovementSummaryDTO dto = new CImprovementSummaryDTO();
                     dto.setSzxx(szxx);
-                    dto.setYear(finalQueryYear);
+                    dto.setYear(queryYear);
                     dto.setQuarter(quarter);
                     dto.setQuarterDesc(quarterEnum.getDesc());
                     dto.setTotalPersonnel(totalPersonnel);
@@ -217,15 +230,17 @@ public class CImprovementService extends BaseServiceImpl<CImprovement> {
                     // 目标值按室组维度匹配
                     dto.setMb(finalTargetMap.get(szxx));
 
-                    // 设置室组名称及所属单位车间信息
+                    // 设置室组名称、室组编号及所属单位车间信息
                     RoomGroup roomGroup = finalRoomGroupMap.get(szxx);
                     if (roomGroup != null) {
                         dto.setSzmc(roomGroup.getSzmc());
+                        dto.setSzbh(roomGroup.getSzbh());
                         String dwcj = roomGroup.getSsdw();
                         dto.setDwcj(dwcj);
                         Workshop workshop = finalWorkshopMap.get(dwcj);
                         if (workshop != null) {
                             dto.setDwcjName(workshop.getDwmc());
+                            dto.setDwcjCode(workshop.getDwbh());
                         }
                     }
 
@@ -237,41 +252,179 @@ public class CImprovementService extends BaseServiceImpl<CImprovement> {
                     return dto;
                 })
                 .collect(Collectors.toList());
+
+        // 13. 按室组编号升序排序，编号为空的排在最后
+        resultList.sort(Comparator.comparing(CImprovementSummaryDTO::getSzbh,
+                Comparator.nullsLast(Comparator.naturalOrder())));
+        return resultList;
     }
 
     /**
-     * 解析年份开始时间
+     * 根据年份、季度、单位车间id查询C类改善记录详情列表
+     * <p>
+     * 查询该年份季度时间范围内、由该单位车间下人员发起的C类改善记录，
+     * 并将记录中涉及的单位、室组、区域、班组、发起人、部门等关联实体名称补充完整
+     *
+     * @param year       年份，格式：yyyy，可为空（默认当前年）
+     * @param quarter    季度枚举值（#1#-#4#），必传
+     * @param roomGroupId 室组id，必传
+     * @return C类改善记录详情列表（含关联实体名称）
      */
-    private Date parseYearStartTime(String year) {
-        try {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            return sdf.parse(year + "-01-01 00:00:00");
-        } catch (ParseException e) {
-            throw new BoException(BoErrorCode.PARAM_ERROR, "年份格式错误");
+    @Transactional(readOnly = true)
+    public List<CImprovementDetailDTO> listDetailByYearQuarterAndRoomGroup(String year, String quarter, String roomGroupId) {
+        // 1. 校验参数
+        Assert.hasLength(quarter, "quarter is empty!");
+        Assert.hasLength(roomGroupId, "roomGroupId is empty!");
+        QuarterEnum quarterEnum = QuarterEnum.fromCode(quarter);
+        Assert.notNull(quarterEnum, "quarter format is invalid!");
+
+        String queryYear = StringUtils.isBlank(year) ? String.valueOf(Calendar.getInstance().get(Calendar.YEAR)) : year;
+        Assert.isTrue(queryYear.matches("\\d{4}"), "year format must be yyyy!");
+
+        // 2. 计算季度时间范围
+        Date startTime = DateDealUtils.parseQuarterStartTime(queryYear, quarterEnum);
+        Date endTime = DateDealUtils.parseQuarterEndTime(queryYear, quarterEnum);
+
+        // 3. 查询该年份季度该室组下的季度人员信息
+        List<QuarterPersonnel> quarterPersonnelList = quarterPersonnelService.listByYearQuarterAndRoomGroup(queryYear, quarterEnum, roomGroupId);
+        if (CollectionUtils.isEmpty(quarterPersonnelList)) {
+            return new ArrayList<>(0);
         }
-    }
 
-    /**
-     * 解析季度开始时间
-     */
-    private Date parseQuarterStartTime(String year, QuarterEnum quarter) {
-        try {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            return sdf.parse(year + "-" + quarter.getStartDate() + " 00:00:00");
-        } catch (ParseException e) {
-            throw new BoException(BoErrorCode.PARAM_ERROR, "季度日期格式错误");
+        // 4. 获取人员id集合（yhry），用于匹配C类改善记录的发起人
+        Set<String> personnelYhrySet = quarterPersonnelList.stream()
+                .filter(item -> item.getYhry() != null)
+                .map(QuarterPersonnel::getYhry)
+                .collect(Collectors.toSet());
+        if (CollectionUtils.isEmpty(personnelYhrySet)) {
+            return new ArrayList<>(0);
         }
-    }
 
-    /**
-     * 解析季度结束时间
-     */
-    private Date parseQuarterEndTime(String year, QuarterEnum quarter) {
-        try {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            return sdf.parse(year + "-" + quarter.getEndDate() + " 23:59:59");
-        } catch (ParseException e) {
-            throw new BoException(BoErrorCode.PARAM_ERROR, "季度日期格式错误");
+        // 5. 查询该季度时间范围内、发起人属于该单位车间人员的C类改善记录
+        Example example = new Example(CImprovement.class);
+        example.createCriteria()
+                .andBetween(CImprovement.CREATED_AT, startTime, endTime)
+                .andIn(CImprovement.FQR, personnelYhrySet);
+        List<CImprovement> cImprovementList = cImprovementMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(cImprovementList)) {
+            return new ArrayList<>(0);
+        }
+
+        // 6. 收集所有关联实体ID
+        Set<String> roomGroupIds = new HashSet<>();
+        Set<String> teamIds = new HashSet<>();
+        Set<String> orgIds = new HashSet<>();
+        Set<String> userIds = new HashSet<>();
+        Set<String> areaIds = new HashSet<>();
+        Set<String> workshopIds = new HashSet<>();
+
+        for (CImprovement item : cImprovementList) {
+            if (item.getSzmc() != null) roomGroupIds.add(item.getSzmc());
+            if (item.getBz() != null) teamIds.add(item.getBz());
+            if (item.getBm() != null) orgIds.add(item.getBm());
+            if (item.getQzqr() != null) userIds.add(item.getQzqr());
+            if (item.getGsyqr() != null) userIds.add(item.getGsyqr());
+            if (item.getFqr() != null) userIds.add(item.getFqr());
         }
+
+        // 从季度人员信息中收集区域id和单位车间id
+        for (QuarterPersonnel qp : quarterPersonnelList) {
+            if (qp.getSsqy() != null) areaIds.add(qp.getSsqy());
+            if (qp.getShdw() != null) workshopIds.add(qp.getShdw());
+        }
+
+        // 7. 批量查询关联实体
+        Map<String, RoomGroup> roomGroupMap = CollectionUtils.isEmpty(roomGroupIds)
+                ? new HashMap<>(0) : roomGroupService.mapByIds(roomGroupIds);
+        Map<String, Team> teamMap = CollectionUtils.isEmpty(teamIds)
+                ? new HashMap<>(0) : teamService.mapByIds(teamIds);
+        Map<String, UcOrg> orgMap = CollectionUtils.isEmpty(orgIds)
+                ? new HashMap<>(0) : ucOrgService.mapByIds(orgIds);
+        Map<String, UcUser> userMap = CollectionUtils.isEmpty(userIds)
+                ? new HashMap<>(0) : ucUserService.mapByIds(userIds);
+        Map<String, Area> areaMap = CollectionUtils.isEmpty(areaIds)
+                ? new HashMap<>(0) : areaService.mapByIds(areaIds);
+
+        // 从室组中补充单位车间id
+        for (RoomGroup rg : roomGroupMap.values()) {
+            if (rg.getSsdw() != null) workshopIds.add(rg.getSsdw());
+        }
+        Map<String, Workshop> workshopMap = CollectionUtils.isEmpty(workshopIds)
+                ? new HashMap<>(0) : workshopService.mapByIds(workshopIds);
+
+        List<CImprovementDetailDTO> resultList = cImprovementList.stream()
+                .map(item -> {
+                    CImprovementDetailDTO dto = new CImprovementDetailDTO();
+                    // 复制原始字段
+                    BeanUtils.copyProperties(item, dto);
+
+                    // 状态名称（枚举 CImprovementStatusEnum）
+                    dto.setZtDesc(CImprovementStatusEnum.getDescByCode(item.getZt()));
+
+                    // 室组名称、编号及所属单位车间
+                    if (item.getSzmc() != null) {
+                        RoomGroup rg = roomGroupMap.get(item.getSzmc());
+                        if (rg != null) {
+                            dto.setSzmcName(rg.getSzmc());
+                            dto.setSzbh(rg.getSzbh());
+                            if (rg.getSsdw() != null) {
+                                dto.setDwcj(rg.getSsdw());
+                                Workshop ws = workshopMap.get(rg.getSsdw());
+                                if (ws != null) {
+                                    dto.setDwcjName(ws.getDwmc());
+                                    dto.setDwcjCode(ws.getDwbh());
+                                }
+                            }
+                        }
+                    }
+
+                    // 班组名称
+                    if (item.getBz() != null) {
+                        Team team = teamMap.get(item.getBz());
+                        if (team != null) {
+                            dto.setBzName(team.getBzmc());
+                        }
+                    }
+
+                    // 部门名称
+                    if (item.getBm() != null) {
+                        UcOrg org = orgMap.get(item.getBm());
+                        if (org != null) {
+                            dto.setBmName(org.getName());
+                        }
+                    }
+
+                    // 发起人姓名
+                    if (item.getFqr() != null) {
+                        UcUser user = userMap.get(item.getFqr());
+                        if (user != null) {
+                            dto.setFqrName(user.getName());
+                        }
+                    }
+
+                    // 区长确认姓名
+                    if (item.getQzqr() != null) {
+                        UcUser user = userMap.get(item.getQzqr());
+                        if (user != null) {
+                            dto.setQzqrName(user.getName());
+                        }
+                    }
+
+                    // 改善员确认姓名
+                    if (item.getGsyqr() != null) {
+                        UcUser user = userMap.get(item.getGsyqr());
+                        if (user != null) {
+                            dto.setGsyqrName(user.getName());
+                        }
+                    }
+
+                    return dto;
+                })
+                .collect(Collectors.toList());
+
+        // 10. 按创建时间降序排序
+        resultList.sort(Comparator.comparing(CImprovementDetailDTO::getCreatedAt,
+                Comparator.nullsLast(Comparator.reverseOrder())));
+        return resultList;
     }
 }

+package com.qgutech.qgyun.apaas.sync.cps.service;
+
+import com.qgutech.qgyun.apaas.sync.cps.mapper.CImprovementTargetMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.CImprovementTarget;
+import com.qgutech.qgyun.apaas.sync.utils.DateDealUtils;
+import com.qgutech.qgyun.framework.database.mybatis.service.BaseServiceImpl;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+import tk.mybatis.mapper.entity.Example;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * CImprovementTarget 服务
+ */
+@Service
+public class CImprovementTargetService extends BaseServiceImpl<CImprovementTarget> {
+
+    @Resource
+    private CImprovementTargetMapper cImprovementTargetMapper;
+
+    /**
+     * 根据年份查询C类改善目标
+     *
+     * @param year 年份，格式：yyyy，为空时默认当前年
+     * @return C类改善目标列表
+     */
+    @Transactional(readOnly = true)
+    public List<CImprovementTarget> listByYear(String year) {
+        // 1. 处理年份参数，为空时默认为当前年
+        String queryYear = StringUtils.isBlank(year) ? String.valueOf(Calendar.getInstance().get(Calendar.YEAR)) : year;
+        Assert.isTrue(queryYear.matches("\\d{4}"), "year format must be yyyy!");
+
+        // 2. 计算年份的开始时间和结束时间
+        Date startTime = DateDealUtils.parseYearStartTime(queryYear);
+        Date endTime = DateDealUtils.parseYearEndTime(queryYear);
+
+        // 3. 查询该年份的C类目标信息
+        Example targetExample = new Example(entityClass);
+        targetExample.createCriteria()
+                .andBetween(CImprovementTarget.YEAR, startTime, endTime);
+        List<CImprovementTarget> targetList = cImprovementTargetMapper.selectByExample(targetExample);
+        if (CollectionUtils.isEmpty(targetList)) {
+            return new ArrayList<>(0);
+        }
+        return targetList;
+    }
+}

 package com.qgutech.qgyun.apaas.sync.cps.service;
 
-import com.qgutech.qgyun.framework.database.mybatis.service.BaseServiceImpl;
 import com.qgutech.qgyun.apaas.sync.base.BoErrorCode;
 import com.qgutech.qgyun.apaas.sync.base.BoException;
+import com.qgutech.qgyun.apaas.sync.cps.dto.CpsProblemDetailDTO;
+import com.qgutech.qgyun.apaas.sync.cps.dto.CpsProblemSourceSummaryDTO;
+import com.qgutech.qgyun.apaas.sync.cps.dto.CpsProblemSummaryDTO;
+import com.qgutech.qgyun.apaas.sync.cps.enums.MbghlkEnum;
+import com.qgutech.qgyun.apaas.sync.cps.enums.RylbEnum;
+import com.qgutech.qgyun.apaas.sync.cps.enums.SflEnum;
+import com.qgutech.qgyun.apaas.sync.cps.enums.WtclfsEnum;
+import com.qgutech.qgyun.apaas.sync.cps.enums.WtclztEnum;
+import com.qgutech.qgyun.apaas.sync.cps.enums.WtlbEnum;
+import com.qgutech.qgyun.apaas.sync.cps.enums.WtlyEnum;
+import com.qgutech.qgyun.apaas.sync.cps.enums.WtxzEnum;
 import com.qgutech.qgyun.apaas.sync.cps.mapper.CpsProblemMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.Area;
 import com.qgutech.qgyun.apaas.sync.cps.model.CpsProblem;
+import com.qgutech.qgyun.apaas.sync.cps.model.RoomGroup;
+import com.qgutech.qgyun.apaas.sync.cps.model.Team;
+import com.qgutech.qgyun.apaas.sync.cps.model.Workshop;
+import com.qgutech.qgyun.apaas.sync.org.model.UcUser;
+import com.qgutech.qgyun.apaas.sync.org.service.UcUserService;
+import com.qgutech.qgyun.apaas.sync.utils.DateDealUtils;
+import com.qgutech.qgyun.framework.database.mybatis.service.BaseServiceImpl;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
@@ -24,6 +44,21 @@ public class CpsProblemService extends BaseServiceImpl<CpsProblem> {
     @Resource
     private CpsProblemMapper cpsProblemMapper;
 
+    @Resource
+    private WorkshopService workshopService;
+
+    @Resource
+    private RoomGroupService roomGroupService;
+
+    @Resource
+    private AreaService areaService;
+
+    @Resource
+    private TeamService teamService;
+
+    @Resource
+    private UcUserService ucUserService;
+
     @Transactional(readOnly = true)
     public CpsProblem getById(String id) {
         Assert.hasLength(id, "id is empty!");
@@ -67,4 +102,402 @@ public class CpsProblemService extends BaseServiceImpl<CpsProblem> {
 
         return cpsProblemMapper.selectAll();
     }
+
+    /**
+     * 根据计划解决时间范围查询问题记录，并按责任单位 + 问题处理状态维度汇总问题数
+     * <p>
+     * 开始、结束时间为空时默认使用当前月的开始、结束时间
+     *
+     * @param startTime 开始时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月 1 号 00:00:00）
+     * @param endTime   结束时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月最后一天 23:59:59）
+     * @return 各责任单位下各处理状态的问题数汇总列表（按责任单位编号升序）
+     */
+    @Transactional(readOnly = true)
+    public List<CpsProblemSummaryDTO> summaryByPlanResolveTime(String startTime, String endTime) {
+        // 1. 解析时间参数，为空时默认当前月起止时间
+        Date start = DateDealUtils.parseStartTimeOrCurrentMonthStart(startTime);
+        Date end = DateDealUtils.parseEndTimeOrCurrentMonthEnd(endTime);
+        Assert.notNull(start, "startTime is invalid!");
+        Assert.notNull(end, "endTime is invalid!");
+        Assert.isTrue(!start.after(end), "startTime must be earlier than endTime!");
+
+        // 2. 查询计划解决时间在范围内的所有问题记录
+        Example example = new Example(CpsProblem.class);
+        example.createCriteria()
+                .andBetween(CpsProblem.JHJJSJ, start, end);
+        List<CpsProblem> cpsProblemList = cpsProblemMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(cpsProblemList)) {
+            return new ArrayList<>(0);
+        }
+
+        // 3. 按责任单位分组，再按处理状态计数
+        Map<String, Map<String, Long>> wtdwStatusCountMap = cpsProblemList.stream()
+                .filter(item -> item.getWtzrdw() != null)
+                .collect(Collectors.groupingBy(
+                        CpsProblem::getWtzrdw,
+                        Collectors.groupingBy(
+                                item -> item.getWtclzt() == null ? "" : item.getWtclzt(),
+                                Collectors.counting()
+                        )
+                ));
+
+        if (wtdwStatusCountMap.isEmpty()) {
+            return new ArrayList<>(0);
+        }
+
+        // 4. 批量查询责任单位详细信息
+        Set<String> workshopIds = wtdwStatusCountMap.keySet();
+        Map<String, Workshop> workshopMap = workshopService.mapByIds(workshopIds);
+
+        // 5. 组装汇总结果
+        List<CpsProblemSummaryDTO> resultList = wtdwStatusCountMap.entrySet().stream()
+                .map(entry -> {
+                    String wtzrdw = entry.getKey();
+                    Map<String, Long> statusCountMap = entry.getValue();
+
+                    CpsProblemSummaryDTO dto = new CpsProblemSummaryDTO();
+                    dto.setWtzrdw(wtzrdw);
+
+                    // 设置责任单位名称、编号
+                    Workshop workshop = workshopMap.get(wtzrdw);
+                    if (workshop != null) {
+                        dto.setWtzrdwName(workshop.getDwmc());
+                        dto.setWtzrdwCode(workshop.getDwbh());
+                    }
+
+                    // 计算总数
+                    int totalCount = statusCountMap.values().stream().mapToInt(Long::intValue).sum();
+                    dto.setTotalCount(totalCount);
+
+                    // 按预定义状态顺序填充状态明细（保证 4 个状态都存在，即使为 0）
+                    List<CpsProblemSummaryDTO.StatusCount> statusCounts = new ArrayList<>();
+                    for (WtclztEnum statusEnum : WtclztEnum.values()) {
+                        Long count = statusCountMap.getOrDefault(statusEnum.getCode(), 0L);
+                        statusCounts.add(new CpsProblemSummaryDTO.StatusCount(
+                                statusEnum.getCode(), statusEnum.getDesc(), count.intValue()));
+                    }
+                    // 处理非预定义状态（如空值或异常状态码）
+                    for (Map.Entry<String, Long> sc : statusCountMap.entrySet()) {
+                        String code = sc.getKey();
+                        if (StringUtils.isBlank(code) || WtclztEnum.fromCode(code) == null) {
+                            String desc = StringUtils.isBlank(code) ? "未设置" : code;
+                            statusCounts.add(new CpsProblemSummaryDTO.StatusCount(
+                                    code, desc, sc.getValue().intValue()));
+                        }
+                    }
+                    dto.setStatusCounts(statusCounts);
+
+                    return dto;
+                })
+                .collect(Collectors.toList());
+
+        // 6. 按责任单位编号升序排序，编号为空的排在最后
+        resultList.sort(Comparator.comparing(CpsProblemSummaryDTO::getWtzrdwCode,
+                Comparator.nullsLast(Comparator.naturalOrder())));
+        return resultList;
+    }
+
+    /**
+     * 根据计划解决时间范围、责任单位id、问题处理状态查询问题记录明细
+     * <p>
+     * 结果中包含工作单位、责任单位、室组、区域、班组、问题提出人、问题处理人等关联实体名称；
+     * 开始、结束时间为空时默认使用当前月的开始、结束时间
+     *
+     * @param startTime 开始时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月 1 号 00:00:00）
+     * @param endTime   结束时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月最后一天 23:59:59）
+     * @param wtzrdwId    责任单位id，必传
+     * @param status    问题处理状态编号（#1#-#4#），必传
+     * @return 问题记录明细列表（按创建时间降序）
+     */
+    @Transactional(readOnly = true)
+    public List<CpsProblemDetailDTO> listDetailByPlanResolveTime(String startTime, String endTime,
+                                                                 String wtzrdwId, String status) {
+        // 1. 校验参数
+        Assert.hasLength(wtzrdwId, "wtzrdwId is empty!");
+        Assert.hasLength(status, "status is empty!");
+
+        // 解析时间参数，为空时默认当前月起止时间
+        Date start = DateDealUtils.parseStartTimeOrCurrentMonthStart(startTime);
+        Date end = DateDealUtils.parseEndTimeOrCurrentMonthEnd(endTime);
+        Assert.notNull(start, "startTime is invalid!");
+        Assert.notNull(end, "endTime is invalid!");
+        Assert.isTrue(!start.after(end), "startTime must be earlier than endTime!");
+
+        // 校验状态格式，允许传入 #1# 或 1 两种形式，统一转换为 #1#
+        WtclztEnum statusEnum = WtclztEnum.fromCode(status);
+        Assert.notNull(statusEnum, "status format is invalid!");
+        String statusCode = statusEnum.getCode();
+
+        // 2. 查询问题记录
+        Example example = new Example(CpsProblem.class);
+        example.createCriteria()
+                .andBetween(CpsProblem.JHJJSJ, start, end)
+                .andEqualTo(CpsProblem.WTZRDW, wtzrdwId)
+                .andEqualTo(CpsProblem.WTCLZT, statusCode);
+        List<CpsProblem> cpsProblemList = cpsProblemMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(cpsProblemList)) {
+            return new ArrayList<>(0);
+        }
+
+        // 3. 收集所有关联实体ID
+        Set<String> workshopIds = new HashSet<>();
+        Set<String> roomGroupIds = new HashSet<>();
+        Set<String> areaIds = new HashSet<>();
+        Set<String> teamIds = new HashSet<>();
+        Set<String> userIds = new HashSet<>();
+
+        for (CpsProblem item : cpsProblemList) {
+            if (item.getGzdw() != null) workshopIds.add(item.getGzdw());
+            if (item.getWtzrdw() != null) workshopIds.add(item.getWtzrdw());
+            if (item.getSz() != null) roomGroupIds.add(item.getSz());
+            if (item.getQy() != null) areaIds.add(item.getQy());
+            if (item.getBz() != null) teamIds.add(item.getBz());
+            if (item.getWttcr() != null) userIds.add(item.getWttcr());
+            if (item.getWtclr() != null) userIds.add(item.getWtclr());
+        }
+
+        // 4. 批量查询关联实体
+        Map<String, Workshop> workshopMap = CollectionUtils.isEmpty(workshopIds)
+                ? new HashMap<>(0) : workshopService.mapByIds(workshopIds);
+        Map<String, RoomGroup> roomGroupMap = CollectionUtils.isEmpty(roomGroupIds)
+                ? new HashMap<>(0) : roomGroupService.mapByIds(roomGroupIds);
+        Map<String, Area> areaMap = CollectionUtils.isEmpty(areaIds)
+                ? new HashMap<>(0) : areaService.mapByIds(areaIds);
+        Map<String, Team> teamMap = CollectionUtils.isEmpty(teamIds)
+                ? new HashMap<>(0) : teamService.mapByIds(teamIds);
+        Map<String, UcUser> userMap = CollectionUtils.isEmpty(userIds)
+                ? new HashMap<>(0) : ucUserService.mapByIds(userIds);
+
+        // 5. 组装明细结果
+        List<CpsProblemDetailDTO> resultList = buildDetailList(cpsProblemList, workshopMap, roomGroupMap, areaMap, teamMap, userMap);
+
+        // 6. 按创建时间降序排序
+        resultList.sort(Comparator.comparing(CpsProblemDetailDTO::getCreatedAt,
+                Comparator.nullsLast(Comparator.reverseOrder())));
+        return resultList;
+    }
+
+    /**
+     * 根据创建时间范围查询问题记录，并按问题来源维度汇总问题数
+     * <p>
+     * 开始、结束时间为空时默认使用当前月的开始、结束时间；
+     * 结果按 WtlyEnum 预定义顺序输出（含计数为 0 的来源），未知编号追加在后
+     *
+     * @param startTime 开始时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月 1 号 00:00:00）
+     * @param endTime   结束时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月最后一天 23:59:59）
+     * @return 各问题来源对应的问题数汇总列表
+     */
+    @Transactional(readOnly = true)
+    public List<CpsProblemSourceSummaryDTO> summaryByCreatedAtSource(String startTime, String endTime) {
+        // 1. 解析时间参数，为空时默认当前月起止时间
+        Date start = DateDealUtils.parseStartTimeOrCurrentMonthStart(startTime);
+        Date end = DateDealUtils.parseEndTimeOrCurrentMonthEnd(endTime);
+        Assert.notNull(start, "startTime is invalid!");
+        Assert.notNull(end, "endTime is invalid!");
+        Assert.isTrue(!start.after(end), "startTime must be earlier than endTime!");
+
+        // 2. 查询创建时间在范围内的问题记录
+        Example example = new Example(CpsProblem.class);
+        example.createCriteria()
+                .andBetween(CpsProblem.CREATED_AT, start, end);
+        List<CpsProblem> cpsProblemList = cpsProblemMapper.selectByExample(example);
+
+        // 3. 按问题来源分组计数（包含 null 和空字符串，统一归为“未设置”）
+        Map<String, Long> sourceCountMap = CollectionUtils.isEmpty(cpsProblemList)
+                ? new HashMap<>(0)
+                : cpsProblemList.stream()
+                .collect(Collectors.groupingBy(
+                        item -> item.getWtly() == null ? "" : item.getWtly(),
+                        Collectors.counting()
+                ));
+
+        // 4. 按 WtlyEnum 预定义顺序输出，保证 5 个来源都存在（即使为 0）
+        List<CpsProblemSourceSummaryDTO> resultList = new ArrayList<>();
+        for (WtlyEnum sourceEnum : WtlyEnum.values()) {
+            Long count = sourceCountMap.getOrDefault(sourceEnum.getCode(), 0L);
+            resultList.add(new CpsProblemSourceSummaryDTO(
+                    sourceEnum.getCode(), sourceEnum.getDesc(), count.intValue()));
+        }
+
+        // 5. 处理非预定义来源（如空值或异常编号）
+        for (Map.Entry<String, Long> entry : sourceCountMap.entrySet()) {
+            String code = entry.getKey();
+            if (StringUtils.isBlank(code) || WtlyEnum.fromCode(code) == null) {
+                String desc = StringUtils.isBlank(code) ? "未设置" : code;
+                resultList.add(new CpsProblemSourceSummaryDTO(code, desc, entry.getValue().intValue()));
+            }
+        }
+
+        return resultList;
+    }
+
+    /**
+     * 根据创建时间范围、问题来源查询问题记录明细
+     * <p>
+     * 结果中包含工作单位、责任单位、室组、区域、班组、问题提出人、问题处理人等关联实体名称；
+     * 开始、结束时间为空时默认使用当前月的开始、结束时间
+     *
+     * @param startTime 开始时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月 1 号 00:00:00）
+     * @param endTime   结束时间，格式：yyyy-MM-dd [HH:mm:ss]，可为空（默认当前月最后一天 23:59:59）
+     * @param wtly      问题来源编号（#1#-#5#），必传；兼容传入 1 ~ 5 的短形式
+     * @return 问题记录明细列表（按创建时间降序）
+     */
+    @Transactional(readOnly = true)
+    public List<CpsProblemDetailDTO> listDetailByCreatedAtAndSource(String startTime, String endTime, String wtly) {
+        // 1. 校验参数
+        Assert.hasLength(wtly, "wtly is empty!");
+        WtlyEnum sourceEnum = WtlyEnum.fromCode(wtly);
+        Assert.notNull(sourceEnum, "wtly format is invalid!");
+        String sourceCode = sourceEnum.getCode();
+
+        // 解析时间参数，为空时默认当前月起止时间
+        Date start = DateDealUtils.parseStartTimeOrCurrentMonthStart(startTime);
+        Date end = DateDealUtils.parseEndTimeOrCurrentMonthEnd(endTime);
+        Assert.notNull(start, "startTime is invalid!");
+        Assert.notNull(end, "endTime is invalid!");
+        Assert.isTrue(!start.after(end), "startTime must be earlier than endTime!");
+
+        // 2. 查询问题记录
+        Example example = new Example(CpsProblem.class);
+        example.createCriteria()
+                .andBetween(CpsProblem.CREATED_AT, start, end)
+                .andEqualTo(CpsProblem.WTLY, sourceCode);
+        List<CpsProblem> cpsProblemList = cpsProblemMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(cpsProblemList)) {
+            return new ArrayList<>(0);
+        }
+
+        // 3. 收集关联实体ID
+        Set<String> workshopIds = new HashSet<>();
+        Set<String> roomGroupIds = new HashSet<>();
+        Set<String> areaIds = new HashSet<>();
+        Set<String> teamIds = new HashSet<>();
+        Set<String> userIds = new HashSet<>();
+        for (CpsProblem item : cpsProblemList) {
+            if (item.getGzdw() != null) workshopIds.add(item.getGzdw());
+            if (item.getWtzrdw() != null) workshopIds.add(item.getWtzrdw());
+            if (item.getSz() != null) roomGroupIds.add(item.getSz());
+            if (item.getQy() != null) areaIds.add(item.getQy());
+            if (item.getBz() != null) teamIds.add(item.getBz());
+            if (item.getWttcr() != null) userIds.add(item.getWttcr());
+            if (item.getWtclr() != null) userIds.add(item.getWtclr());
+        }
+
+        // 4. 批量查询关联实体
+        Map<String, Workshop> workshopMap = CollectionUtils.isEmpty(workshopIds)
+                ? new HashMap<>(0) : workshopService.mapByIds(workshopIds);
+        Map<String, RoomGroup> roomGroupMap = CollectionUtils.isEmpty(roomGroupIds)
+                ? new HashMap<>(0) : roomGroupService.mapByIds(roomGroupIds);
+        Map<String, Area> areaMap = CollectionUtils.isEmpty(areaIds)
+                ? new HashMap<>(0) : areaService.mapByIds(areaIds);
+        Map<String, Team> teamMap = CollectionUtils.isEmpty(teamIds)
+                ? new HashMap<>(0) : teamService.mapByIds(teamIds);
+        Map<String, UcUser> userMap = CollectionUtils.isEmpty(userIds)
+                ? new HashMap<>(0) : ucUserService.mapByIds(userIds);
+
+        // 5. 组装明细结果
+        List<CpsProblemDetailDTO> resultList = buildDetailList(cpsProblemList, workshopMap, roomGroupMap, areaMap, teamMap, userMap);
+
+        // 6. 按创建时间降序排序
+        resultList.sort(Comparator.comparing(CpsProblemDetailDTO::getCreatedAt,
+                Comparator.nullsLast(Comparator.reverseOrder())));
+        return resultList;
+    }
+
+    /**
+     * 组装 CPS 问题明细 DTO 列表（含枚举名称、关联实体名称）
+     */
+    private List<CpsProblemDetailDTO> buildDetailList(List<CpsProblem> cpsProblemList,
+                                                      Map<String, Workshop> workshopMap,
+                                                      Map<String, RoomGroup> roomGroupMap,
+                                                      Map<String, Area> areaMap,
+                                                      Map<String, Team> teamMap,
+                                                      Map<String, UcUser> userMap) {
+        return cpsProblemList.stream()
+                .map(item -> {
+                    CpsProblemDetailDTO dto = new CpsProblemDetailDTO();
+                    // 复制原始字段（同名属性）
+                    BeanUtils.copyProperties(item, dto);
+                    // 模型字段 wtzrdw 对应 DTO 字段 wtdw，需手动赋值
+                    dto.setWtzrdw(item.getWtzrdw());
+
+                    // 处理状态描述
+                    dto.setWtclztDesc(WtclztEnum.getDescByCode(item.getWtclzt()));
+
+                    // 各枚举字段中文名称
+                    dto.setWtlyDesc(WtlyEnum.getDescByCode(item.getWtly()));
+                    dto.setWtlbDesc(WtlbEnum.getDescByCode(item.getWtlb()));
+                    dto.setWtxzDesc(WtxzEnum.getDescByCode(item.getWtxz()));
+                    dto.setSflDesc(SflEnum.getDescByCode(item.getSfl()));
+                    dto.setMbghlkDesc(MbghlkEnum.getDescByCode(item.getMbghlk()));
+                    dto.setRylbDesc(RylbEnum.getDescByCode(item.getRylb()));
+                    dto.setWtclfsDesc(WtclfsEnum.getDescByCode(item.getWtclfs()));
+                    dto.setWtclfs2Desc(WtclfsEnum.getDescByCode(item.getWtclfs2()));
+                    dto.setWtclfs3Desc(WtclfsEnum.getDescByCode(item.getWtclfs3()));
+
+                    // 工作单位
+                    if (item.getGzdw() != null) {
+                        Workshop ws = workshopMap.get(item.getGzdw());
+                        if (ws != null) {
+                            dto.setGzdwName(ws.getDwmc());
+                            dto.setGzdwCode(ws.getDwbh());
+                        }
+                    }
+
+                    // 问题责任单位
+                    if (item.getWtzrdw() != null) {
+                        Workshop ws = workshopMap.get(item.getWtzrdw());
+                        if (ws != null) {
+                            dto.setWtzrdwName(ws.getDwmc());
+                            dto.setWtzrdwCode(ws.getDwbh());
+                        }
+                    }
+
+                    // 室组
+                    if (item.getSz() != null) {
+                        RoomGroup rg = roomGroupMap.get(item.getSz());
+                        if (rg != null) {
+                            dto.setSzName(rg.getSzmc());
+                            dto.setSzCode(rg.getSzbh());
+                        }
+                    }
+
+                    // 区域
+                    if (item.getQy() != null) {
+                        Area area = areaMap.get(item.getQy());
+                        if (area != null) {
+                            dto.setQyName(area.getQymc());
+                            dto.setQyCode(area.getQybh());
+                        }
+                    }
+
+                    // 班组
+                    if (item.getBz() != null) {
+                        Team team = teamMap.get(item.getBz());
+                        if (team != null) {
+                            dto.setBzName(team.getBzmc());
+                            dto.setBzCode(team.getBzbh());
+                        }
+                    }
+
+                    // 问题提出人
+                    if (item.getWttcr() != null) {
+                        UcUser user = userMap.get(item.getWttcr());
+                        if (user != null) {
+                            dto.setWttcrName(user.getName());
+                        }
+                    }
+
+                    // 问题处理人
+                    if (item.getWtclr() != null) {
+                        UcUser user = userMap.get(item.getWtclr());
+                        if (user != null) {
+                            dto.setWtclrName(user.getName());
+                        }
+                    }
+
+                    return dto;
+                })
+                .collect(Collectors.toList());
+    }
 }

@@ -67,4 +67,28 @@ public class PersonnelService extends BaseServiceImpl<Personnel> {
 
         return personnelMapper.selectAll();
     }
+
+    /**
+     * 根据工号集合查询人员信息
+     *
+     * @param ghSet 工号集合
+     * @return 工号到人员信息的映射
+     */
+    @Transactional(readOnly = true)
+    public Map<String, Personnel> mapByGh(Collection<String> ghSet) {
+        if (CollectionUtils.isEmpty(ghSet)) {
+            return new HashMap<>(0);
+        }
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(Personnel.GH, ghSet);
+        List<Personnel> personnelList = personnelMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(personnelList)) {
+            return new HashMap<>(0);
+        }
+
+        return personnelList.stream()
+                .filter(p -> p.getGh() != null)
+                .collect(Collectors.toMap(Personnel::getGh, p -> p, (v1, v2) -> v1));
+    }
 }

 package com.qgutech.qgyun.apaas.sync.cps.service;
 
+import com.qgutech.qgyun.apaas.sync.cps.enums.QuarterEnum;
+import com.qgutech.qgyun.apaas.sync.utils.DateDealUtils;
 import com.qgutech.qgyun.framework.database.mybatis.service.BaseServiceImpl;
 import com.qgutech.qgyun.apaas.sync.base.BoErrorCode;
 import com.qgutech.qgyun.apaas.sync.base.BoException;
 import com.qgutech.qgyun.apaas.sync.cps.mapper.QuarterPersonnelMapper;
 import com.qgutech.qgyun.apaas.sync.cps.model.QuarterPersonnel;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
@@ -71,19 +74,56 @@ public class QuarterPersonnelService extends BaseServiceImpl<QuarterPersonnel> {
     /**
      * 根据年份和季度查询季度人员信息
      *
-     * @param yearStartTime 年份开始时间
-     * @param quarter       季度枚举值（#1#-#4#）
+     * @param year    年份
+     * @param quarter 季度枚举值（#1#-#4#）
      * @return 季度人员信息列表
      */
     @Transactional(readOnly = true)
-    public List<QuarterPersonnel> listByYearAndQuarter(Date yearStartTime, String quarter) {
-        Assert.notNull(yearStartTime, "year is empty!");
-        Assert.hasLength(quarter, "quarter is empty!");
+    public List<QuarterPersonnel> listByYearAndQuarter(String year, QuarterEnum quarter) {
+        // 2. 处理年份参数，为空时默认为当前年
+        String queryYear = StringUtils.isBlank(year) ? String.valueOf(Calendar.getInstance().get(Calendar.YEAR)) : year;
+        Assert.isTrue(queryYear.matches("\\d{4}"), "year format must be yyyy!");
+        Assert.notNull(quarter, "quarter is empty!");
 
+        Date yearStartTime = DateDealUtils.parseYearStartTime(queryYear);
+        Date yearEndTime = DateDealUtils.parseYearEndTime(queryYear);
         Example example = new Example(entityClass);
         example.createCriteria()
-                .andEqualTo("year", yearStartTime)
-                .andEqualTo("jdxx", quarter);
+                .andBetween(QuarterPersonnel.YEAR, yearStartTime, yearEndTime)
+                .andEqualTo(QuarterPersonnel.JDXX, quarter.getCode());
+        List<QuarterPersonnel> quarterPersonnelList = quarterPersonnelMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(quarterPersonnelList)) {
+            return new ArrayList<>(0);
+        }
+        return quarterPersonnelList;
+    }
+
+    /**
+     * 根据年份、季度和室组id查询季度人员信息
+     *
+     * @param year        年份，格式：yyyy，为空时默认当前年
+     * @param quarter     季度枚举值（#1#-#4#）
+     * @param roomGroupId  室组id
+     * @return 季度人员信息列表
+     */
+    @Transactional(readOnly = true)
+    public List<QuarterPersonnel> listByYearQuarterAndRoomGroup(String year, QuarterEnum quarter, String roomGroupId) {
+        // 1. 处理年份参数，为空时默认为当前年
+        String queryYear = StringUtils.isBlank(year) ? String.valueOf(Calendar.getInstance().get(Calendar.YEAR)) : year;
+        Assert.isTrue(queryYear.matches("\\d{4}"), "year format must be yyyy!");
+        Assert.notNull(quarter, "quarter is empty!");
+        Assert.hasLength(roomGroupId, "roomGroupId is empty!");
+
+        // 2. 计算年份的开始时间和结束时间
+        Date yearStartTime = DateDealUtils.parseYearStartTime(queryYear);
+        Date yearEndTime = DateDealUtils.parseYearEndTime(queryYear);
+
+        // 3. 查询该年份季度该室组下的季度人员信息
+        Example example = new Example(entityClass);
+        example.createCriteria()
+                .andBetween(QuarterPersonnel.YEAR, yearStartTime, yearEndTime)
+                .andEqualTo(QuarterPersonnel.JDXX, quarter.getCode())
+                .andEqualTo(QuarterPersonnel.SHSZ, roomGroupId);
         List<QuarterPersonnel> quarterPersonnelList = quarterPersonnelMapper.selectByExample(example);
         if (CollectionUtils.isEmpty(quarterPersonnelList)) {
             return new ArrayList<>(0);

+package com.qgutech.qgyun.apaas.sync.org.mapper;
+
+import com.qgutech.qgyun.apaas.sync.org.model.UcOrg;
+import com.qgutech.qgyun.framework.database.mybatis.registermapper.QguBaseMapper;
+
+public interface UcOrgMapper extends QguBaseMapper<UcOrg> {
+}

+package com.qgutech.qgyun.apaas.sync.org.mapper;
+
+import com.qgutech.qgyun.apaas.sync.org.model.UcUser;
+import com.qgutech.qgyun.framework.database.mybatis.registermapper.QguBaseMapper;
+
+public interface UcUserMapper extends QguBaseMapper<UcUser> {
+}

+package com.qgutech.qgyun.apaas.sync.org.model;
+
+import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.persistence.Table;
+
+/**
+ * 组织结构信息
+ */
+@Getter
+@Setter
+@ToString
+@Table(name = "t_apaas_uc_org")
+public class UcOrg extends BaseCorpModel {
+
+    public static final String NAME = "name";
+    public static final String PARENT_ID = "parentId";
+
+    /*
+     * 部门编码
+     */
+    private String code;
+
+    /*
+     * 部门名称
+     */
+    private String name;
+
+    /*
+     * 部门负责人
+     */
+    private String administrator;
+
+    /*
+     * 部门类型
+     */
+    private String type;
+
+    /*
+     * 父级ID
+     */
+    private String parentId;
+
+    /*
+     * 引用类型
+     */
+    private String refType;
+
+    /*
+     * 引用ID
+     */
+    private String refId;
+
+    /*
+     * 排序
+     */
+    private Double sorts;
+}

+package com.qgutech.qgyun.apaas.sync.org.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.qgutech.qgyun.framework.database.model.BaseCorpModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * 组织用户信息
+ */
+@Getter
+@Setter
+@ToString
+@Table(name = "t_apaas_uc_user")
+public class UcUser extends BaseCorpModel {
+
+    public static final String NAME = "name";
+
+    /*
+     * 姓名
+     */
+    private String name;
+
+    /*
+     * 姓名全拼
+     */
+    private String nameSpell;
+
+    /*
+     * 手机号
+     */
+    private String mobile;
+
+    /*
+     * 邮箱
+     */
+    private String email;
+
+    /*
+     * 身份证号
+     */
+    private String idCard;
+
+    /*
+     * 上级ID
+     */
+    private String leaderId;
+
+    /*
+     * 登录名
+     */
+    private String loginName;
+
+    /*
+     * 状态
+     */
+    private String status;
+
+    /*
+     * 密码
+     */
+    private String pwd;
+
+    /*
+     * 类型
+     */
+    private String type;
+
+    /*
+     * 是否启用报表（自定义字段）
+     */
+    @Column(name = "_d_10409_enabled_report")
+    private Boolean d10409EnabledReport;
+
+    /*
+     * 门户ID
+     */
+    private String portalId;
+
+    /*
+     * lflzvg
+     */
+    private String lflzvg;
+
+    /*
+     * 性别
+     */
+    private String sex;
+
+    /*
+     * 上级
+     */
+    private String leader;
+
+    /*
+     * 生日
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthday;
+
+    /*
+     * 启用报表
+     */
+    private String enabledReport;
+
+    /*
+     * 头像
+     */
+    private String avatar;
+
+    /*
+     * 引用类型
+     */
+    private String refType;
+
+    /*
+     * 引用ID
+     */
+    private String refId;
+}

+package com.qgutech.qgyun.apaas.sync.org.service;
+
+import com.qgutech.qgyun.apaas.sync.base.BoErrorCode;
+import com.qgutech.qgyun.apaas.sync.base.BoException;
+import com.qgutech.qgyun.apaas.sync.org.mapper.UcOrgMapper;
+import com.qgutech.qgyun.apaas.sync.org.model.UcOrg;
+import com.qgutech.qgyun.framework.database.mybatis.service.BaseServiceImpl;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+import tk.mybatis.mapper.entity.Example;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 组织结构信息服务
+ */
+@Service
+public class UcOrgService extends BaseServiceImpl<UcOrg> {
+
+    @Resource
+    private UcOrgMapper ucOrgMapper;
+
+    @Transactional(readOnly = true)
+    public UcOrg getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(UcOrg.ID, id);
+        UcOrg ucOrg = ucOrgMapper.selectOneByExample(example);
+        if (null == ucOrg) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return ucOrg;
+    }
+
+    @Transactional(readOnly = true)
+    public List<UcOrg> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(UcOrg.ID, ids);
+        List<UcOrg> ucOrgList = ucOrgMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(ucOrgList)) {
+            return new ArrayList<>(0);
+        }
+        return ucOrgList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, UcOrg> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<UcOrg> ucOrgList = listByIds(ids);
+        if (CollectionUtils.isEmpty(ucOrgList)) {
+            return new HashMap<>(0);
+        }
+
+        return ucOrgList.stream().collect(Collectors.toMap(UcOrg::getId, ucOrg -> ucOrg));
+    }
+
+    @Transactional(readOnly = true)
+    public List<UcOrg> listAll() {
+
+        return ucOrgMapper.selectAll();
+    }
+}

+package com.qgutech.qgyun.apaas.sync.org.service;
+
+import com.qgutech.qgyun.apaas.sync.base.BoErrorCode;
+import com.qgutech.qgyun.apaas.sync.base.BoException;
+import com.qgutech.qgyun.apaas.sync.org.mapper.UcUserMapper;
+import com.qgutech.qgyun.apaas.sync.org.model.UcUser;
+import com.qgutech.qgyun.framework.database.mybatis.service.BaseServiceImpl;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+import tk.mybatis.mapper.entity.Example;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 组织用户信息服务
+ */
+@Service
+public class UcUserService extends BaseServiceImpl<UcUser> {
+
+    @Resource
+    private UcUserMapper ucUserMapper;
+
+    @Transactional(readOnly = true)
+    public UcUser getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(UcUser.ID, id);
+        UcUser ucUser = ucUserMapper.selectOneByExample(example);
+        if (null == ucUser) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return ucUser;
+    }
+
+    @Transactional(readOnly = true)
+    public List<UcUser> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(UcUser.ID, ids);
+        List<UcUser> ucUserList = ucUserMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(ucUserList)) {
+            return new ArrayList<>(0);
+        }
+        return ucUserList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, UcUser> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<UcUser> ucUserList = listByIds(ids);
+        if (CollectionUtils.isEmpty(ucUserList)) {
+            return new HashMap<>(0);
+        }
+
+        return ucUserList.stream().collect(Collectors.toMap(UcUser::getId, ucUser -> ucUser));
+    }
+
+    @Transactional(readOnly = true)
+    public List<UcUser> listAll() {
+
+        return ucUserMapper.selectAll();
+    }
+}

@@ -2,19 +2,23 @@ package com.qgutech.qgyun.apaas.sync.utils;
 
 import com.qgutech.qgyun.apaas.sync.base.BoErrorCode;
 import com.qgutech.qgyun.apaas.sync.base.BoException;
+import com.qgutech.qgyun.apaas.sync.cps.enums.QuarterEnum;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 
 public class DateDealUtils {
 
+    private static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+
     /**
      * 解析年份开始时间
      */
     public static Date parseYearStartTime(String year) {
         try {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat sdf = new SimpleDateFormat(DATE_TIME_PATTERN);
             return sdf.parse(year + "-01-01 00:00:00");
         } catch (ParseException e) {
             throw new BoException(BoErrorCode.PARAM_ERROR, "年份格式错误");
@@ -26,10 +30,151 @@ public class DateDealUtils {
      */
     public static Date parseYearEndTime(String year) {
         try {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat sdf = new SimpleDateFormat(DATE_TIME_PATTERN);
             return sdf.parse(year + "-12-31 23:59:59");
         } catch (ParseException e) {
             throw new BoException(BoErrorCode.PARAM_ERROR, "年份格式错误");
         }
     }
+
+    /**
+     * 解析季度开始时间
+     */
+    public static Date parseQuarterStartTime(String year, QuarterEnum quarter) {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat(DATE_TIME_PATTERN);
+            return sdf.parse(year + "-" + quarter.getStartDate() + " 00:00:00");
+        } catch (ParseException e) {
+            throw new BoException(BoErrorCode.PARAM_ERROR, "季度日期格式错误");
+        }
+    }
+
+    /**
+     * 解析季度结束时间
+     */
+    public static Date parseQuarterEndTime(String year, QuarterEnum quarter) {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat(DATE_TIME_PATTERN);
+            return sdf.parse(year + "-" + quarter.getEndDate() + " 23:59:59");
+        } catch (ParseException e) {
+            throw new BoException(BoErrorCode.PARAM_ERROR, "季度日期格式错误");
+        }
+    }
+
+    /**
+     * 解析日期字符串，支持以下格式：
+     * <ul>
+     *   <li>yyyy-MM-dd HH:mm:ss</li>
+     *   <li>yyyy-MM-dd</li>
+     *   <li>yyyy/MM/dd HH:mm:ss</li>
+     *   <li>yyyy/MM/dd</li>
+     * </ul>
+     *
+     * @param dateStr 日期字符串
+     * @return 解析后的日期，为空时返回 null
+     */
+    public static Date parseDate(String dateStr) {
+        if (dateStr == null || dateStr.trim().isEmpty()) {
+            return null;
+        }
+        String trimmed = dateStr.trim();
+        String[] patterns = new String[]{
+                "yyyy-MM-dd HH:mm:ss",
+                "yyyy-MM-dd",
+                "yyyy/MM/dd HH:mm:ss",
+                "yyyy/MM/dd"
+        };
+        for (String pattern : patterns) {
+            try {
+                SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+                sdf.setLenient(false);
+                return sdf.parse(trimmed);
+            } catch (ParseException ignored) {
+                // 尝试下一个格式
+            }
+        }
+        throw new BoException(BoErrorCode.PARAM_ERROR, "日期格式错误，支持 yyyy-MM-dd [HH:mm:ss]");
+    }
+
+    /**
+     * 将开始时间字符串解析为当天的 00:00:00（若未包含时间部分）
+     */
+    public static Date parseStartTime(String dateStr) {
+        Date date = parseDate(dateStr);
+        if (date == null) {
+            return null;
+        }
+        // 如果传入的字符串不包含时间部分，则默认为当天开始
+        if (dateStr != null && dateStr.trim().length() <= 10) {
+            return date;
+        }
+        return date;
+    }
+
+    /**
+     * 将结束时间字符串解析为当天的 23:59:59（若未包含时间部分）
+     */
+    public static Date parseEndTime(String dateStr) {
+        Date date = parseDate(dateStr);
+        if (date == null) {
+            return null;
+        }
+        // 如果传入的字符串不包含时间部分，则默认为当天结束
+        if (dateStr != null && dateStr.trim().length() <= 10) {
+            java.util.Calendar cal = java.util.Calendar.getInstance();
+            cal.setTime(date);
+            cal.set(java.util.Calendar.HOUR_OF_DAY, 23);
+            cal.set(java.util.Calendar.MINUTE, 59);
+            cal.set(java.util.Calendar.SECOND, 59);
+            cal.set(java.util.Calendar.MILLISECOND, 999);
+            return cal.getTime();
+        }
+        return date;
+    }
+
+    /**
+     * 获取当前月的开始时间（当月 1 号 00:00:00.000）
+     */
+    public static Date getCurrentMonthStartTime() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        return cal.getTime();
+    }
+
+    /**
+     * 获取当前月的结束时间（当月最后一天 23:59:59.999）
+     */
+    public static Date getCurrentMonthEndTime() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+        cal.set(Calendar.HOUR_OF_DAY, 23);
+        cal.set(Calendar.MINUTE, 59);
+        cal.set(Calendar.SECOND, 59);
+        cal.set(Calendar.MILLISECOND, 999);
+        return cal.getTime();
+    }
+
+    /**
+     * 解析开始时间字符串，为空时默认返回当前月开始时间
+     */
+    public static Date parseStartTimeOrCurrentMonthStart(String dateStr) {
+        if (dateStr == null || dateStr.trim().isEmpty()) {
+            return getCurrentMonthStartTime();
+        }
+        return parseStartTime(dateStr);
+    }
+
+    /**
+     * 解析结束时间字符串，为空时默认返回当前月结束时间
+     */
+    public static Date parseEndTimeOrCurrentMonthEnd(String dateStr) {
+        if (dateStr == null || dateStr.trim().isEmpty()) {
+            return getCurrentMonthEndTime();
+        }
+        return parseEndTime(dateStr);
+    }
 }

+# CPS 模块接口 API 说明文档
+
+## 目录
+
+- [1. AB类改善接口](#1-ab类改善接口)
+  - [1.1 获取所有AB类改善列表](#11-获取所有ab类改善列表)
+  - [1.2 根据年份查询AB类改善汇总](#12-根据年份查询ab类改善汇总)
+- [2. C类改善接口](#2-c类改善接口)
+  - [2.1 获取所有C类改善列表](#21-获取所有c类改善列表)
+  - [2.2 根据年份和季度查询C类改善发起率汇总](#22-根据年份和季度查询c类改善发起率汇总)
+  - [2.3 根据年份、季度、室组id查询C类改善记录详情](#23-根据年份季度室组id查询c类改善记录详情)
+- [3. CPS问题接口](#3-cps问题接口)
+  - [3.1 获取所有CPS问题列表](#31-获取所有cps问题列表)
+  - [3.2 根据计划解决时间范围汇总各责任单位下各处理状态的问题数](#32-根据计划解决时间范围汇总各责任单位下各处理状态的问题数)
+  - [3.3 根据计划解决时间范围、责任单位id、问题处理状态查询问题记录明细](#33-根据计划解决时间范围责任单位id问题处理状态查询问题记录明细)
+  - [3.4 根据创建时间范围汇总各问题来源对应的问题数](#34-根据创建时间范围汇总各问题来源对应的问题数)
+  - [3.5 根据创建时间范围、问题来源查询问题记录明细](#35-根据创建时间范围问题来源查询问题记录明细)
+
+---
+
+## 通用说明
+
+### 统一响应格式
+
+所有接口返回统一的 `JsonResult` 结构：
+
+```json
+{
+  "success": true,
+  "message": "成功",
+  "data": []
+}
+```
+
+| 字段 | 类型 | 说明 |
+|------|------|------|
+| success | Boolean | 请求是否成功 |
+| message | String | 响应消息 |
+| data | Object/Array | 响应数据体 |
+
+### 枚举值说明
+
+#### 季度枚举（QuarterEnum）
+
+| 编号 | 描述 | 起始日期 | 结束日期 |
+|------|------|----------|----------|
+| #1# | 第一季度 | 01-01 | 03-31 |
+| #2# | 第二季度 | 04-01 | 06-30 |
+| #3# | 第三季度 | 07-01 | 09-30 |
+| #4# | 第四季度 | 10-01 | 12-31 |
+
+#### 问题处理状态枚举（WtclztEnum）
+
+| 编号 | 描述 |
+|------|------|
+| #1# | 待处理 |
+| #2# | 处理中 |
+| #3# | 已关闭 |
+| #4# | 已逾期 |
+
+#### 问题来源枚举（WtlyEnum）
+
+| 编号 | 描述 |
+|------|------|
+| #1# | 开班 |
+| #2# | 过程验证 |
+| #3# | 过程确认 |
+| #4# | 体系健康体检 |
+| #5# | 单位自检（单位牵头） |
+
+#### 问题类别枚举（WtlbEnum）
+
+| 编号 | 描述 |
+|------|------|
+| #1# | 方针展开 |
+| #2# | 标准化作业 |
+| #3# | 目视化 |
+| #4# | 时间数据处理 |
+| #5# | 过程确认 |
+| #6# | 持续改善 |
+
+#### 问题性质枚举（WtxzEnum）
+
+| 编号 | 描述 |
+|------|------|
+| #1# | 无标准 |
+| #2# | 未执行标准 |
+| #3# | 标准不足 |
+
+#### 6S分类枚举（SflEnum）
+
+| 编号 | 描述 |
+|------|------|
+| #1# | 整理 |
+| #2# | 整顿 |
+| #3# | 清洁 |
+| #4# | 清扫 |
+| #5# | 素养 |
+| #6# | 安全 |
+
+#### 问题层级枚举（MbghlkEnum）
+
+| 编号 | 描述 |
+|------|------|
+| #0# | 0 |
+| #1# | 1 |
+| #2# | 2 |
+| #3# | 3 |
+| #4# | 4 |
+| #5# | 5 |
+
+#### 人员类别枚举（RylbEnum）
+
+| 编号 | 描述 |
+|------|------|
+| #1# | 区长 |
+| #2# | 班长 |
+| #3# | 高级经理 |
+| #4# | 经理 |
+| #5# | 主管 |
+| #6# | 专家 |
+| #7# | 一般员工 |
+
+#### 问题处理方式枚举（WtclfsEnum）
+
+| 编号 | 描述 |
+|------|------|
+| #1# | 自己解决 |
+| #2# | 工作安排/同级支持 |
+| #3# | 问题升级至 |
+
+#### C类改善状态枚举（CImprovementStatusEnum）
+
+| 编号 | 描述 |
+|------|------|
+| #1# | 草稿 |
+| #2# | 已提交 |
+| #3# | 已否决 |
+| #4# | 已确认 |
+
+---
+
+## 1. AB类改善接口
+
+### 1.1 获取所有AB类改善列表
+
+**接口路径：** `GET /abImprovement/list/all`
+
+**接口说明：** 获取系统中所有AB类改善记录列表。
+
+**请求参数：** 无
+
+**响应数据：** `List<AbImprovement>`
+
+**响应字段说明：**
+
+| 字段 | 类型 | 说明 |
+|------|------|------|
+| id | String | 记录ID |
+| createdAt | Date | 创建时间（yyyy-MM-dd HH:mm:ss） |
+| lcslmc | String | 流程实例名称 |
+| dwcj | String | 单位车间id |
+| sqr | String | 申请人 |
+| sqbm | String | 申请部门 |
+| sqrq | Date | 申请日期 |
+| lxr | String | 立项人 |
+| qnjyjz | Double | 全年节约价值 |
+| gslx | String | 改善类型 |
+| tdrs | Double | 团队人数 |
+
+**响应示例：**
+
+```json
+{
+  "success": true,
+  "message": "成功",
+  "data": [
+    {
+      "id": "abc123",
+      "createdAt": "2026-09-15 10:30:00",
+      "lcslmc": "AB类改善流程-2026-001",
+      "dwcj": "workshop001",
+      "sqr": "张三",
+      "sqbm": "生产部",
+      "sqrq": "2026-09-10 09:00:00",
+      "lxr": "李四",
+      "qnjyjz": 50000.0,
+      "gslx": "效率提升",
+      "tdrs": 5.0
+    }
+  ]
+}
+```
+
+---
+
+### 1.2 根据年份查询AB类改善汇总
+
+**接口路径：** `GET /abImprovement/summary/year`
+
+**接口说明：** 按单位车间分组汇总指定年份的AB类改善记录，包含节约价值汇总、目标值及完成率。
+
+**请求参数：**
+
+| 参数名 | 类型 | 必传 | 说明 |
+|--------|------|------|------|
+| year | String | 否 | 年份，格式：yyyy，为空时默认当前年 |
+
+**响应数据：** `List<AbImprovementSummaryDTO>`
+
+**响应字段说明：**
+
+| 字段 | 类型 | 说明 |
+|------|------|------|
+| dwcj | String | 单位车间编码 |
+| dwcjName | String | 单位车间名称 |
+| dwcjCode | String | 单位车间编号 |
+| year | String | 年份 |
+| totalQnjyjz | Double | 节约价值汇总 |
+| mb | Double | 目标值 |
+| completionRate | Double | 完成率（%） |
+
+**响应示例：**
+
+```json
+{
+  "success": true,
+  "message": "成功",
+  "data": [
+    {
+      "dwcj": "workshop001",
+      "dwcjName": "总装车间",
+      "dwcjCode": "ZZ001",
+      "year": "2026",
+      "totalQnjyjz": 150000.0,
+      "mb": 200000.0,
+      "completionRate": 75.0
+    }
+  ]
+}
+```
+
+---
+
+## 2. C类改善接口
+
+### 2.1 获取所有C类改善列表
+
+**接口路径：** `GET /cImprovement/list/all`
+
+**接口说明：** 获取系统中所有C类改善记录列表。
+
+**请求参数：** 无
+
+**响应数据：** `List<CImprovement>`
+
+**响应字段说明：**
+
+| 字段 | 类型 | 说明 |
+|------|------|------|
+| id | String | 记录ID |
+| createdAt | Date | 创建时间（yyyy-MM-dd HH:mm:ss） |
+| ygh | String | 员工号 |
+| lywt | String | 来源问题记录id |
+| wtbh | String | 问题编号 |
+| bm | String | 部门id |
+| sfwtlg | Boolean | 是否问题类改善 |
+| sfscjb | Boolean | 是否是车间班组 |
+| bz | String | 班组信息id |
+| gsmc | String | 改善名称 |
+| qzqr | String | 区长确认-组织用户id |
+| gsyqr | String | 改善员确认-组织用户id |
+| sftsyxal | Boolean | 是否推送优秀案例 |
+| zt | String | 状态（#1#-草稿;#2#-已提交;#3#-已否决;#4#-已确认） |
+| wtsm | String | 问题说明 |
+| gshxg | String | 改善后效果 |
+| fqr | String | 发起人 |
+| szmc | String | 室组信息id |
+| processInstanceId | String | 流程实例ID |
+| approvalStatus | String | 审批状态 |
+| sftsjdz | Boolean | 是否推送金点子 |
+
+**响应示例：**
+
+```json
+{
+  "success": true,
+  "message": "成功",
+  "data": [
+    {
+      "id": "c123",
+      "createdAt": "2026-09-15 14:20:00",
+      "ygh": "YG001",
+      "lywt": "wt001",
+      "wtbh": "WT202609001",
+      "bm": "org001",
+      "sfwtlg": true,
+      "sfscjb": true,
+      "bz": "team001",
+      "gsmc": "优化装配流程",
+      "qzqr": "user001",
+      "gsyqr": "user002",
+      "sftsyxal": false,
+      "zt": "#2#",
+      "wtsm": "装配效率低",
+      "gshxg": "效率提升20%",
+      "fqr": "user003",
+      "szmc": "rg001",
+      "processInstanceId": "pi123",
+      "approvalStatus": "approved",
+      "sftsjdz": false
+    }
+  ]
+}
+```
+
+---
+
+### 2.2 根据年份和季度查询C类改善发起率汇总
+
+**接口路径：** `GET /cImprovement/summary/quarter`
+
+**接口说明：** 按室组维度统计指定年份季度的C类改善发起率，包含室组总人数、有改善记录人数、发起率及目标值。
+
+**请求参数：**
+
+| 参数名 | 类型 | 必传 | 说明 |
+|--------|------|------|------|
+| year | String | 否 | 年份，格式：yyyy，为空时默认当前年 |
+| quarter | String | 是 | 季度枚举值（#1#-#4#） |
+
+**响应数据：** `List<CImprovementSummaryDTO>`
+
+**响应字段说明：**
+
+| 字段 | 类型 | 说明 |
+|------|------|------|
+| szxx | String | 室组编码 |
+| szmc | String | 室组名称 |
+| szbh | String | 室组编号 |
+| dwcj | String | 所属单位车间编码 |
+| dwcjName | String | 所属单位车间名称 |
+| dwcjCode | String | 所属单位车间编号 |
+| year | String | 年份 |
+| quarter | String | 季度 |
+| quarterDesc | String | 季度描述 |
+| totalPersonnel | Integer | 室组总人数 |
+| improvementPersonnel | Integer | 有C类改善记录的人数 |
+| improvementRate | Double | C类改善发起率（%） |
+| mb | Double | 目标值 |
+
+**响应示例：**
+
+```json
+{
+  "success": true,
+  "message": "成功",
+  "data": [
+    {
+      "szxx": "rg001",
+      "szmc": "装配一组",
+      "szbh": "SZ001",
+      "dwcj": "workshop001",
+      "dwcjName": "总装车间",
+      "dwcjCode": "ZZ001",
+      "year": "2026",
+      "quarter": "#3#",
+      "quarterDesc": "第三季度",
+      "totalPersonnel": 50,
+      "improvementPersonnel": 35,
+      "improvementRate": 70.0,
+      "mb": 80.0
+    }
+  ]
+}
+```
+
+---
+
+### 2.3 根据年份、季度、室组id查询C类改善记录详情
+
+**接口路径：** `GET /cImprovement/list/detail`
+
+**接口说明：** 查询指定年份季度时间范围内、由该室组下人员发起的C类改善记录，并补充关联实体名称。
+
+**请求参数：**
+
+| 参数名 | 类型 | 必传 | 说明 |
+|--------|------|------|------|
+| year | String | 否 | 年份，格式：yyyy，为空时默认当前年 |
+| quarter | String | 是 | 季度枚举值（#1#-#4#） |
+| roomGroupId | String | 是 | 室组id |
+
+**响应数据：** `List<CImprovementDetailDTO>`
+
+**响应字段说明：**
+
+| 字段 | 类型 | 说明 |
+|------|------|------|
+| id | String | 记录ID |
+| createdAt | Date | 创建时间（yyyy-MM-dd HH:mm:ss） |
+| gsmc | String | 改善名称 |
+| wtbh | String | 问题编号 |
+| lywt | String | 来源问题记录id |
+| wtsm | String | 问题说明 |
+| gshxg | String | 改善后效果 |
+| zt | String | 状态（#1#-草稿;#2#-已提交;#3#-已否决;#4#-已确认） |
+| ztDesc | String | 状态名称 |
+| sfwtlg | Boolean | 是否问题类改善 |
+| sfscjb | Boolean | 是否是车间班组 |
+| sftsyxal | Boolean | 是否推送优秀案例 |
+| sftsjdz | Boolean | 是否推送金点子 |
+| processInstanceId | String | 流程实例ID |
+| approvalStatus | String | 审批状态 |
+| szqymc | String | 室组区域名称（原始字段） |
+| ygh | String | 员工号 |
+| yh | String | 员工id（组织用户） |
+| yhName | String | 员工姓名（组织用户） |
+| fqr | String | 发起人id/工号 |
+| fqrName | String | 发起人姓名 |
+| bm | String | 部门id（组织结构） |
+| bmName | String | 部门名称（组织结构） |
+| szmc | String | 室组信息id |
+| szmcName | String | 室组名称 |
+| szbh | String | 室组编号 |
+| bz | String | 班组信息id |
+| bzName | String | 班组名称 |
+| dwcj | String | 单位车间id |
+| dwcjName | String | 单位车间名称 |
+| dwcjCode | String | 单位车间编号 |
+| szqy | String | 区域id |
+| szqyName | String | 区域名称 |
+| qzqr | String | 区长确认-组织用户id |
+| qzqrName | String | 区长确认-姓名 |
+| gsyqr | String | 改善员确认-组织用户id |
+| gsyqrName | String | 改善员确认-姓名 |
+
+**响应示例：**
+
+```json
+{
+  "success": true,
+  "message": "成功",
+  "data": [
+    {
+      "id": "c123",
+      "createdAt": "2026-09-15 14:20:00",
+      "gsmc": "优化装配流程",
+      "wtbh": "WT202609001",
+      "lywt": "wt001",
+      "wtsm": "装配效率低",
+      "gshxg": "效率提升20%",
+      "zt": "#2#",
+      "ztDesc": "已提交",
+      "sfwtlg": true,
+      "sfscjb": true,
+      "sftsyxal": false,
+      "sftsjdz": false,
+      "processInstanceId": "pi123",
+      "approvalStatus": "approved",
+      "szqymc": "装配区域",
+      "ygh": "YG001",
+      "yh": "user001",
+      "yhName": "张三",
+      "fqr": "user003",
+      "fqrName": "王五",
+      "bm": "org001",
+      "bmName": "生产部",
+      "szmc": "rg001",
+      "szmcName": "装配一组",
+      "szbh": "SZ001",
+      "bz": "team001",
+      "bzName": "装配一班",
+      "dwcj": "workshop001",
+      "dwcjName": "总装车间",
+      "dwcjCode": "ZZ001",
+      "szqy": "area001",
+      "szqyName": "装配区域",
+      "qzqr": "user001",
+      "qzqrName": "张三",
+      "gsyqr": "user002",
+      "gsyqrName": "李四"
+    }
+  ]
+}
+```
+
+---
+
+## 3. CPS问题接口
+
+### 3.1 获取所有CPS问题列表
+
+**接口路径：** `GET /cpsProblem/list/all`
+
+**接口说明：** 获取系统中所有CPS问题记录列表。
+
+**请求参数：** 无
+
+**响应数据：** `List<CpsProblem>`
+
+**响应字段说明：**
+
+| 字段 | 类型 | 说明 |
+|------|------|------|
+| id | String | 记录ID |
+| createdAt | Date | 创建时间（yyyy-MM-dd HH:mm:ss） |
+| wtbh | String | 问题编号 |
+| wtly | String | 问题来源（#1#-开班;#2#-过程验证;#3#-过程确认;#4#-体系健康体检;#5#-单位自检） |
+| wttcr | String | 问题提出人 |
+| gzdw | String | 工作单位 |
+| rylb | String | 人员类别（#1#-区长;#2#-班长;#3#-高级经理;#4#-经理;#5#-主管;#6#-专家;#7#-一般员工） |
+| wtms | String | 问题描述 |
+| wtzrdw | String | 问题责任单位 |
+| wtfj | String | 问题附件 |
+| wtssbk | String | 问题所属板块 |
+| wtlb | String | 问题类别（#1#-方针展开;#2#-标准化作业;#3#-目视化;#4#-时间数据处理;#5#-过程确认;#6#-持续改善） |
+| wtxz | String | 问题性质（#1#-无标准;#2#-未执行标准;#3#-标准不足） |
+| sfl | String | 6S分类（#1#-整理;#2#-整顿;#3#-清洁;#4#-清扫;#5#-素养;#6#-安全） |
+| wtsfgb | Boolean | 问题是否关闭 |
+| sz | String | 室组 |
+| mbghlk | String | 问题层级（#0#-0;#1#-1;#2#-2;#3#-3;#4#-4;#5#-5） |
+| wtclfs | String | 问题处理方式（#1#-自己解决;#2#-工作安排/同级支持;#3#-问题升级至） |
+| tntpvy | Date | 问题解决时间 |
+| gzap | String | 工作安排/同级支持 |
+| wtsjz | String | 问题升级至 |
+| wtjjcs | String | 问题解决措施 |
+| wtzghfj | String | 问题整改后附件 |
+| wtclr | String | 问题处理人 |
+| wtclzt | String | 问题处理状态（#1#-待处理;#2#-处理中;#3#-已关闭;#4#-已逾期） |
+| qy | String | 区域 |
+| bz | String | 班组 |
+| jhjjsj | Date | 计划解决时间 |
+| wtclfs2 | String | 问题处理方式2 |
+| gzap2 | String | 工作安排/同级支持2 |
+| wtsjz2 | String | 问题升级至2 |
+| wtclfs3 | String | 问题处理方式3 |
+| gzap3 | String | 工作安排/同级支持3 |
+| wtsjz3 | String | 问题升级至3 |
+| processInstanceId | String | 流程实例ID |
+| approvalStatus | String | 审批状态 |
+
+**响应示例：**
+
+```json
+{
+  "success": true,
+  "message": "成功",
+  "data": [
+    {
+      "id": "p123",
+      "createdAt": "2026-09-15 09:00:00",
+      "wtbh": "WT202609001",
+      "wtly": "#1#",
+      "wttcr": "user001",
+      "gzdw": "workshop001",
+      "rylb": "#1#",
+      "wtms": "装配线设备故障",
+      "wtzrdw": "workshop002",
+      "wtfj": "file001",
+      "wtssbk": "设备管理",
+      "wtlb": "#2#",
+      "wtxz": "#1#",
+      "sfl": "#6#",
+      "wtsfgb": false,
+      "sz": "rg001",
+      "mbghlk": "#1#",
+      "wtclfs": "#1#",
+      "tntpvy": "2026-09-20 18:00:00",
+      "gzap": "安排维修",
+      "wtsjz": "",
+      "wtjjcs": "更换零件",
+      "wtzghfj": "file002",
+      "wtclr": "user002",
+      "wtclzt": "#2#",
+      "qy": "area001",
+      "bz": "team001",
+      "jhjjsj": "2026-09-25 18:00:00",
+      "wtclfs2": "",
+      "gzap2": "",
+      "wtsjz2": "",
+      "wtclfs3": "",
+      "gzap3": "",
+      "wtsjz3": "",
+      "processInstanceId": "pi123",
+      "approvalStatus": "processing"
+    }
+  ]
+}
+```
+
+---
+
+### 3.2 根据计划解决时间范围汇总各责任单位下各处理状态的问题数
+
+**接口路径：** `GET /cpsProblem/summary/status`
+
+**接口说明：** 按计划解决时间范围查询问题记录，按责任单位分组统计各处理状态下的问题数。
+
+**请求参数：**
+
+| 参数名 | 类型 | 必传 | 说明 |
+|--------|------|------|------|
+| startTime | String | 否 | 开始时间，格式：yyyy-MM-dd [HH:mm:ss]，为空默认当前月1号 00:00:00 |
+| endTime | String | 否 | 结束时间，格式：yyyy-MM-dd [HH:mm:ss]，为空默认当前月最后一天 23:59:59 |
+
+**响应数据：** `List<CpsProblemSummaryDTO>`
+
+**响应字段说明：**
+
+| 字段 | 类型 | 说明 |
+|------|------|------|
+| wtzrdw | String | 责任单位id |
+| wtzrdwName | String | 责任单位名称 |
+| wtzrdwCode | String | 责任单位编号 |
+| totalCount | Integer | 该责任单位下问题总数 |
+| statusCounts | Array | 各处理状态下的问题数明细 |
+| statusCounts[].statusCode | String | 状态编号 |
+| statusCounts[].statusDesc | String | 状态中文描述 |
+| statusCounts[].count | Integer | 该状态下的问题数 |
+
+**响应示例：**
+
+```json
+{
+  "success": true,
+  "message": "成功",
+  "data": [
+    {
+      "wtzrdw": "workshop001",
+      "wtzrdwName": "总装车间",
+      "wtzrdwCode": "ZZ001",
+      "totalCount": 25,
+      "statusCounts": [
+        {
+          "statusCode": "#1#",
+          "statusDesc": "待处理",
+          "count": 5
+        },
+        {
+          "statusCode": "#2#",
+          "statusDesc": "处理中",
+          "count": 10
+        },
+        {
+          "statusCode": "#3#",
+          "statusDesc": "已关闭",
+          "count": 8
+        },
+        {
+          "statusCode": "#4#",
+          "statusDesc": "已逾期",
+          "count": 2
+        }
+      ]
+    }
+  ]
+}
+```
+
+---
+
+### 3.3 根据计划解决时间范围、责任单位id、问题处理状态查询问题记录明细
+
+**接口路径：** `GET /cpsProblem/list/detail`
+
+**接口说明：** 按计划解决时间范围、责任单位id、问题处理状态查询问题记录明细，包含关联实体名称。
+
+**请求参数：**
+
+| 参数名 | 类型 | 必传 | 说明 |
+|--------|------|------|------|
+| startTime | String | 否 | 开始时间，格式：yyyy-MM-dd [HH:mm:ss]，为空默认当前月1号 00:00:00 |
+| endTime | String | 否 | 结束时间，格式：yyyy-MM-dd [HH:mm:ss]，为空默认当前月最后一天 23:59:59 |
+| wtzrdwId | String | 是 | 责任单位id |
+| status | String | 是 | 问题处理状态编号（#1#-待处理;#2#-处理中;#3#-已关闭;#4#-已逾期） |
+
+**响应数据：** `List<CpsProblemDetailDTO>`
+
+**响应字段说明：**
+
+| 字段 | 类型 | 说明 |
+|------|------|------|
+| id | String | 记录ID |
+| createdAt | Date | 创建时间（yyyy-MM-dd HH:mm:ss） |
+| wtbh | String | 问题编号 |
+| wtms | String | 问题描述 |
+| wtly | String | 问题来源编号 |
+| wtlyDesc | String | 问题来源名称 |
+| wtssbk | String | 问题所属板块 |
+| wtlb | String | 问题类别编号 |
+| wtlbDesc | String | 问题类别名称 |
+| wtxz | String | 问题性质编号 |
+| wtxzDesc | String | 问题性质名称 |
+| sfl | String | 6S分类编号 |
+| sflDesc | String | 6S分类名称 |
+| mbghlk | String | 问题层级编号 |
+| mbghlkDesc | String | 问题层级名称 |
+| rylb | String | 人员类别编号 |
+| rylbDesc | String | 人员类别名称 |
+| wtsfgb | Boolean | 问题是否关闭 |
+| wtfj | String | 问题附件 |
+| wtzghfj | String | 问题整改后附件 |
+| wtjjcs | String | 问题解决措施 |
+| wtclfs | String | 问题处理方式编号 |
+| wtclfsDesc | String | 问题处理方式名称 |
+| gzap | String | 工作安排/同级支持 |
+| wtsjz | String | 问题升级至 |
+| wtclfs2 | String | 问题处理方式2编号 |
+| wtclfs2Desc | String | 问题处理方式2名称 |
+| gzap2 | String | 工作安排/同级支持2 |
+| wtsjz2 | String | 问题升级至2 |
+| wtclfs3 | String | 问题处理方式3编号 |
+| wtclfs3Desc | String | 问题处理方式3名称 |
+| gzap3 | String | 工作安排/同级支持3 |
+| wtsjz3 | String | 问题升级至3 |
+| jhjjsj | Date | 计划解决时间（yyyy-MM-dd HH:mm:ss） |
+| tntpvy | Date | 问题解决时间（yyyy-MM-dd HH:mm:ss） |
+| processInstanceId | String | 流程实例ID |
+| approvalStatus | String | 审批状态 |
+| gzdw | String | 工作单位id |
+| gzdwName | String | 工作单位名称 |
+| gzdwCode | String | 工作单位编号 |
+| wtzrdw | String | 问题责任单位id |
+| wtzrdwName | String | 问题责任单位名称 |
+| wtzrdwCode | String | 问题责任单位编号 |
+| sz | String | 室组id |
+| szName | String | 室组名称 |
+| szCode | String | 室组编号 |
+| qy | String | 区域id |
+| qyName | String | 区域名称 |
+| qyCode | String | 区域编号 |
+| bz | String | 班组id |
+| bzName | String | 班组名称 |
+| bzCode | String | 班组编号 |
+| wttcr | String | 问题提出人id |
+| wttcrName | String | 问题提出人姓名 |
+| wtclr | String | 问题处理人id |
+| wtclrName | String | 问题处理人姓名 |
+| wtclzt | String | 问题处理状态编号 |
+| wtclztDesc | String | 问题处理状态中文描述 |
+
+**响应示例：**
+
+```json
+{
+  "success": true,
+  "message": "成功",
+  "data": [
+    {
+      "id": "p123",
+      "createdAt": "2026-09-15 09:00:00",
+      "wtbh": "WT202609001",
+      "wtms": "装配线设备故障",
+      "wtly": "#1#",
+      "wtlyDesc": "开班",
+      "wtssbk": "设备管理",
+      "wtlb": "#2#",
+      "wtlbDesc": "标准化作业",
+      "wtxz": "#1#",
+      "wtxzDesc": "无标准",
+      "sfl": "#6#",
+      "sflDesc": "安全",
+      "mbghlk": "#1#",
+      "mbghlkDesc": "1",
+      "rylb": "#1#",
+      "rylbDesc": "区长",
+      "wtsfgb": false,
+      "wtfj": "file001",
+      "wtzghfj": "file002",
+      "wtjjcs": "更换零件",
+      "wtclfs": "#1#",
+      "wtclfsDesc": "自己解决",
+      "gzap": "安排维修",
+      "wtsjz": "",
+      "wtclfs2": "",
+      "wtclfs2Desc": "",
+      "gzap2": "",
+      "wtsjz2": "",
+      "wtclfs3": "",
+      "wtclfs3Desc": "",
+      "gzap3": "",
+      "wtsjz3": "",
+      "jhjjsj": "2026-09-25 18:00:00",
+      "tntpvy": "2026-09-20 18:00:00",
+      "processInstanceId": "pi123",
+      "approvalStatus": "processing",
+      "gzdw": "workshop001",
+      "gzdwName": "总装车间",
+      "gzdwCode": "ZZ001",
+      "wtzrdw": "workshop002",
+      "wtzrdwName": "维修车间",
+      "wtzrdwCode": "WX001",
+      "sz": "rg001",
+      "szName": "装配一组",
+      "szCode": "SZ001",
+      "qy": "area001",
+      "qyName": "装配区域",
+      "qyCode": "QY001",
+      "bz": "team001",
+      "bzName": "装配一班",
+      "bzCode": "BZ001",
+      "wttcr": "user001",
+      "wttcrName": "张三",
+      "wtclr": "user002",
+      "wtclrName": "李四",
+      "wtclzt": "#2#",
+      "wtclztDesc": "处理中"
+    }
+  ]
+}
+```
+
+---
+
+### 3.4 根据创建时间范围汇总各问题来源对应的问题数
+
+**接口路径：** `GET /cpsProblem/summary/source`
+
+**接口说明：** 按创建时间范围查询问题记录，按问题来源维度汇总问题数。
+
+**请求参数：**
+
+| 参数名 | 类型 | 必传 | 说明 |
+|--------|------|------|------|
+| startTime | String | 否 | 开始时间，格式：yyyy-MM-dd [HH:mm:ss]，为空默认当前月1号 00:00:00 |
+| endTime | String | 否 | 结束时间，格式：yyyy-MM-dd [HH:mm:ss]，为空默认当前月最后一天 23:59:59 |
+
+**响应数据：** `List<CpsProblemSourceSummaryDTO>`
+
+**响应字段说明：**
+
+| 字段 | 类型 | 说明 |
+|------|------|------|
+| wtly | String | 问题来源编号 |
+| wtlyDesc | String | 问题来源中文名称 |
+| count | Integer | 该问题来源下的问题数 |
+
+**响应示例：**
+
+```json
+{
+  "success": true,
+  "message": "成功",
+  "data": [
+    {
+      "wtly": "#1#",
+      "wtlyDesc": "开班",
+      "count": 15
+    },
+    {
+      "wtly": "#2#",
+      "wtlyDesc": "过程验证",
+      "count": 8
+    },
+    {
+      "wtly": "#3#",
+      "wtlyDesc": "过程确认",
+      "count": 12
+    },
+    {
+      "wtly": "#4#",
+      "wtlyDesc": "体系健康体检",
+      "count": 5
+    },
+    {
+      "wtly": "#5#",
+      "wtlyDesc": "单位自检（单位牵头）",
+      "count": 3
+    }
+  ]
+}
+```
+
+---
+
+### 3.5 根据创建时间范围、问题来源查询问题记录明细
+
+**接口路径：** `GET /cpsProblem/list/detail/source`
+
+**接口说明：** 按创建时间范围、问题来源查询问题记录明细，包含关联实体名称。
+
+**请求参数：**
+
+| 参数名 | 类型 | 必传 | 说明 |
+|--------|------|------|------|
+| startTime | String | 否 | 开始时间，格式：yyyy-MM-dd [HH:mm:ss]，为空默认当前月1号 00:00:00 |
+| endTime | String | 否 | 结束时间，格式：yyyy-MM-dd [HH:mm:ss]，为空默认当前月最后一天 23:59:59 |
+| wtly | String | 是 | 问题来源编号（#1#-开班;#2#-过程验证;#3#-过程确认;#4#-体系健康体检;#5#-单位自检） |
+
+**响应数据：** `List<CpsProblemDetailDTO>`
+
+**响应字段说明：** 同 [3.3 根据计划解决时间范围、责任单位id、问题处理状态查询问题记录明细](#33-根据计划解决时间范围责任单位id问题处理状态查询问题记录明细)
+
+**响应示例：**
+
+```json
+{
+  "success": true,
+  "message": "成功",
+  "data": [
+    {
+      "id": "p123",
+      "createdAt": "2026-09-15 09:00:00",
+      "wtbh": "WT202609001",
+      "wtms": "装配线设备故障",
+      "wtly": "#1#",
+      "wtlyDesc": "开班",
+      "wtssbk": "设备管理",
+      "wtlb": "#2#",
+      "wtlbDesc": "标准化作业",
+      "wtxz": "#1#",
+      "wtxzDesc": "无标准",
+      "sfl": "#6#",
+      "sflDesc": "安全",
+      "mbghlk": "#1#",
+      "mbghlkDesc": "1",
+      "rylb": "#1#",
+      "rylbDesc": "区长",
+      "wtsfgb": false,
+      "wtfj": "file001",
+      "wtzghfj": "file002",
+      "wtjjcs": "更换零件",
+      "wtclfs": "#1#",
+      "wtclfsDesc": "自己解决",
+      "gzap": "安排维修",
+      "wtsjz": "",
+      "wtclfs2": "",
+      "wtclfs2Desc": "",
+      "gzap2": "",
+      "wtsjz2": "",
+      "wtclfs3": "",
+      "wtclfs3Desc": "",
+      "gzap3": "",
+      "wtsjz3": "",
+      "jhjjsj": "2026-09-25 18:00:00",
+      "tntpvy": "2026-09-20 18:00:00",
+      "processInstanceId": "pi123",
+      "approvalStatus": "processing",
+      "gzdw": "workshop001",
+      "gzdwName": "总装车间",
+      "gzdwCode": "ZZ001",
+      "wtzrdw": "workshop002",
+      "wtzrdwName": "维修车间",
+      "wtzrdwCode": "WX001",
+      "sz": "rg001",
+      "szName": "装配一组",
+      "szCode": "SZ001",
+      "qy": "area001",
+      "qyName": "装配区域",
+      "qyCode": "QY001",
+      "bz": "team001",
+      "bzName": "装配一班",
+      "bzCode": "BZ001",
+      "wttcr": "user001",
+      "wttcrName": "张三",
+      "wtclr": "user002",
+      "wtclrName": "李四",
+      "wtclzt": "#2#",
+      "wtclztDesc": "处理中"
+    }
+  ]
+}
+```

+接口示例
+AB类改善模块：
+
+C类改善模块：
+1、C类改善柱状图数据来源-根据季度获取每个室组的汇总统计信息；
+请求url:
+http://localhost:8090/cImprovement/summary/quarter?quarter=3
+出参示例：
+{
+  "success": true,
+  "data": [
+    {
+      "szxx": "lvRCTDE4V7qlUhLqHzS",
+      "szmc": "制造室2",
+      "szbh": "232",
+      "dwcj": "zTaXfHi1shF22hC8vnx",
+      "dwcjName": "分装车间",
+      "dwcjCode": "109",
+      "year": "2026",
+      "quarter": "3",
+      "quarterDesc": "第三季度",
+      "totalPersonnel": 2,
+      "improvementPersonnel": 1,
+      "improvementRate": 50,
+      "mb": 0.8
+    },
+    {
+      "szxx": "tMIdOMvQud8yjLXfLiG",
+      "szmc": "CPS体系室",
+      "szbh": "64",
+      "dwcj": "6AkMzM03wQflhjYqaRV",
+      "dwcjName": "制造运营处",
+      "dwcjCode": "106",
+      "year": "2026",
+      "quarter": "3",
+      "quarterDesc": "第三季度",
+      "totalPersonnel": 3,
+      "improvementPersonnel": 2,
+      "improvementRate": 66.67,
+      "mb": 0.6
+    }
+  ],
+  "msg": "成功",
+  "errCode": null
+}
+
+2、C类改善柱子下探数据来源-根据季度室组入参获取室组下人员指定季度发起的C类改善记录列表明细
+请求url:
+http://localhost:8090/cImprovement/list/detail?quarter=3&roomGroupId=lvRCTDE4V7qlUhLqHzS
+出参示例：
+{
+  "success": true,
+  "data": [
+    {
+      "id": "mBtSiChAlCeIM3HxWbW",
+      "createdAt": null,
+      "gsmc": "改善4397",
+      "wtbh": "345",
+      "lywt": "lgRDYJqHMS81zBdYfjg",
+      "wtsm": null,
+      "gshxg": null,
+      "zt": "#4#",
+      "ztDesc": "已确认",
+      "sfwtlg": null,
+      "sfscjb": true,
+      "sftsyxal": null,
+      "sftsjdz": null,
+      "processInstanceId": "31de43d8daa24cdea7baeea2b6c2ad46",
+      "approvalStatus": "#PASS#",
+      "szqymc": null,
+      "ygh": "18856914956",
+      "yh": null,
+      "yhName": null,
+      "fqr": "cyTZZMgy3WliwVfM3LT",
+      "fqrName": "周雪",
+      "bm": "zTaXfHi1shF22hC8vnx",
+      "bmName": null,
+      "szmc": "lvRCTDE4V7qlUhLqHzS",
+      "szmcName": "制造室2",
+      "szbh": "232",
+      "bz": "rLrKJmjkCcz7d8Jc3dd",
+      "bzName": "分装三班",
+      "dwcj": "zTaXfHi1shF22hC8vnx",
+      "dwcjName": "分装车间",
+      "dwcjCode": "109",
+      "szqy": null,
+      "szqyName": null,
+      "qzqr": "kf3xfAv2hEA8kkoDxrz",
+      "qzqrName": "许佩玉",
+      "gsyqr": "inSGohb1FwgLvJuP4Ct",
+      "gsyqrName": "檀玲玲"
+    },
+    {
+      "id": "PgYZCh3lz8SPpmeOFVH",
+      "createdAt": null,
+      "gsmc": "改善一二",
+      "wtbh": "92",
+      "lywt": "0y6Gls817Nktw4srkPH",
+      "wtsm": null,
+      "gshxg": null,
+      "zt": "#2#",
+      "ztDesc": "已提交",
+      "sfwtlg": null,
+      "sfscjb": null,
+      "sftsyxal": true,
+      "sftsjdz": null,
+      "processInstanceId": null,
+      "approvalStatus": "#DRAFT#",
+      "szqymc": null,
+      "ygh": "18856914956",
+      "yh": null,
+      "yhName": null,
+      "fqr": "cyTZZMgy3WliwVfM3LT",
+      "fqrName": "周雪",
+      "bm": "zTaXfHi1shF22hC8vnx",
+      "bmName": null,
+      "szmc": "lvRCTDE4V7qlUhLqHzS",
+      "szmcName": "制造室2",
+      "szbh": "232",
+      "bz": null,
+      "bzName": null,
+      "dwcj": "zTaXfHi1shF22hC8vnx",
+      "dwcjName": "分装车间",
+      "dwcjCode": "109",
+      "szqy": null,
+      "szqyName": null,
+      "qzqr": null,
+      "qzqrName": null,
+      "gsyqr": "cyTZZMgy3WliwVfM3LT",
+      "gsyqrName": "周雪"
+    }
+  ],
+  "msg": "成功",
+  "errCode": null
+}
+
+
+问题模块：
+1、问题超期未解决柱状图-根据开始结束时间获取计划解决时间这个范围内的各责任单位问题数汇总（各状态问题数汇总）;
+请求url:
+http://localhost:8090/cpsProblem/summary/status?startTime=2026-08-01&endTime=2026-09-30
+出参示例：
+{
+  "success": true,
+  "data": [
+    {
+      "wtzrdw": "GUGXUW77KKfQRu4BFgx",
+      "wtzrdwName": "冲压车间",
+      "wtzrdwCode": "102",
+      "totalCount": 1,
+      "statusCounts": [
+        {
+          "statusCode": "#1#",
+          "statusDesc": "待处理",
+          "count": 0
+        },
+        {
+          "statusCode": "#2#",
+          "statusDesc": "处理中",
+          "count": 0
+        },
+        {
+          "statusCode": "#3#",
+          "statusDesc": "已关闭",
+          "count": 0
+        },
+        {
+          "statusCode": "#4#",
+          "statusDesc": "已逾期",
+          "count": 1
+        }
+      ]
+    },
+    {
+      "wtzrdw": "ahImSLxXBuQkFtU8Ace",
+      "wtzrdwName": "总装车间",
+      "wtzrdwCode": "104",
+      "totalCount": 3,
+      "statusCounts": [
+        {
+          "statusCode": "#1#",
+          "statusDesc": "待处理",
+          "count": 0
+        },
+        {
+          "statusCode": "#2#",
+          "statusDesc": "处理中",
+          "count": 0
+        },
+        {
+          "statusCode": "#3#",
+          "statusDesc": "已关闭",
+          "count": 1
+        },
+        {
+          "statusCode": "#4#",
+          "statusDesc": "已逾期",
+          "count": 2
+        }
+      ]
+    },
+    {
+      "wtzrdw": "fajFKONK5pKiFcyzqDT",
+      "wtzrdwName": "焊装车间",
+      "wtzrdwCode": "105",
+      "totalCount": 1,
+      "statusCounts": [
+        {
+          "statusCode": "#1#",
+          "statusDesc": "待处理",
+          "count": 0
+        },
+        {
+          "statusCode": "#2#",
+          "statusDesc": "处理中",
+          "count": 0
+        },
+        {
+          "statusCode": "#3#",
+          "statusDesc": "已关闭",
+          "count": 1
+        },
+        {
+          "statusCode": "#4#",
+          "statusDesc": "已逾期",
+          "count": 0
+        }
+      ]
+    }
+  ],
+  "msg": "成功",
+  "errCode": null
+}
+
+
+2、问题超期未解决问题下探列表明细-根据开始结束时间、问题责任单位id、问题处理状态获取计划解决时间这个范围内的问题明细列表;
+请求url:
+http://localhost:8090/cpsProblem/list/detail?startTime=2026-08-01&endTime=2026-09-30&wtdwId=ahImSLxXBuQkFtU8Ace&status=4
+
+出参示例：
+{
+  "success": true,
+  "data": [
+    {
+      "id": "6cc5XQRD4EHdYGVr4Rm",
+      "createdAt": null,
+      "wtbh": "0001​",
+      "wtms": "12345",
+      "wtly": "#3#",
+      "wtlyDesc": "过程确认",
+      "wtssbk": "3Bd6p7ixQBb1OSF8gwE",
+      "wtlb": "#5#",
+      "wtlbDesc": "过程确认",
+      "wtxz": "#1#",
+      "wtxzDesc": "无标准",
+      "sfl": "#1#",
+      "sflDesc": "整理",
+      "mbghlk": "#1#",
+      "mbghlkDesc": "1",
+      "rylb": "#7#",
+      "rylbDesc": "一般员工",
+      "wtsfgb": null,
+      "wtfj": null,
+      "wtzghfj": null,
+      "wtjjcs": null,
+      "wtclfs": null,
+      "wtclfsDesc": null,
+      "gzap": null,
+      "wtsjz": null,
+      "wtclfs2": null,
+      "wtclfs2Desc": null,
+      "gzap2": null,
+      "wtsjz2": null,
+      "wtclfs3": null,
+      "wtclfs3Desc": null,
+      "gzap3": null,
+      "wtsjz3": null,
+      "jhjjsj": "2026-09-19 16:00:00",
+      "tntpvy": "2026-09-09 02:32:45",
+      "processInstanceId": null,
+      "approvalStatus": null,
+      "gzdw": "ahImSLxXBuQkFtU8Ace",
+      "gzdwName": "总装车间",
+      "gzdwCode": "104",
+      "wtzrdw": "ahImSLxXBuQkFtU8Ace",
+      "wtzrdwName": "总装车间",
+      "wtzrdwCode": "104",
+      "sz": "gjCsFTBShT36aQhnACN",
+      "szName": "制造室",
+      "szCode": "76",
+      "qy": "fmYCcdP0L8ABmx2cPo1",
+      "qyName": "区域1",
+      "qyCode": "111",
+      "bz": "6Lj0fH9rB5bXm19thta",
+      "bzName": "班组1",
+      "bzCode": "999",
+      "wttcr": "jU1pkX6iMiZjUPP19MP",
+      "wttcrName": "陈工",
+      "wtclr": "jU1pkX6iMiZjUPP19MP",
+      "wtclrName": "陈工",
+      "wtclzt": "#4#",
+      "wtclztDesc": "已逾期"
+    },
+    {
+      "id": "lgRDYJqHMS81zBdYfjg",
+      "createdAt": null,
+      "wtbh": "0007​",
+      "wtms": "260909",
+      "wtly": "#3#",
+      "wtlyDesc": "过程确认",
+      "wtssbk": "C4UyMlZruanCjNoRjpB",
+      "wtlb": "#5#",
+      "wtlbDesc": "过程确认",
+      "wtxz": "#1#",
+      "wtxzDesc": "无标准",
+      "sfl": "#6#",
+      "sflDesc": "安全",
+      "mbghlk": "#1#",
+      "mbghlkDesc": "1",
+      "rylb": "#7#",
+      "rylbDesc": "一般员工",
+      "wtsfgb": null,
+      "wtfj": null,
+      "wtzghfj": null,
+      "wtjjcs": null,
+      "wtclfs": null,
+      "wtclfsDesc": null,
+      "gzap": null,
+      "wtsjz": null,
+      "wtclfs2": null,
+      "wtclfs2Desc": null,
+      "gzap2": null,
+      "wtsjz2": null,
+      "wtclfs3": null,
+      "wtclfs3Desc": null,
+      "gzap3": null,
+      "wtsjz3": null,
+      "jhjjsj": "2026-09-09 16:00:00",
+      "tntpvy": "2026-09-09 13:00:03",
+      "processInstanceId": null,
+      "approvalStatus": null,
+      "gzdw": "ahImSLxXBuQkFtU8Ace",
+      "gzdwName": "总装车间",
+      "gzdwCode": "104",
+      "wtzrdw": "ahImSLxXBuQkFtU8Ace",
+      "wtzrdwName": "总装车间",
+      "wtzrdwCode": "104",
+      "sz": "gjCsFTBShT36aQhnACN",
+      "szName": "制造室",
+      "szCode": "76",
+      "qy": "NpZtfnU8FcGXCXPUhEr",
+      "qyName": "制造室",
+      "qyCode": "76",
+      "bz": "6Lj0fH9rB5bXm19thta",
+      "bzName": "班组1",
+      "bzCode": "999",
+      "wttcr": "jU1pkX6iMiZjUPP19MP",
+      "wttcrName": "陈工",
+      "wtclr": null,
+      "wtclrName": null,
+      "wtclzt": "#4#",
+      "wtclztDesc": "已逾期"
+    }
+  ],
+  "msg": "成功",
+  "errCode": null
+}
+
+
+3、问题来源环形图--根据开始结束时间获取创建时间这个范围内的各问题来源问题数汇总;
+请求url:
+http://localhost:8090/cpsProblem/summary/source?startTime=2026-08-01&endTime=2026-09-30
+出参示例：
+{
+  "success": true,
+  "data": [
+    {
+      "wtly": "#1#",
+      "wtlyDesc": "开班",
+      "count": 0
+    },
+    {
+      "wtly": "#2#",
+      "wtlyDesc": "过程验证",
+      "count": 1
+    },
+    {
+      "wtly": "#3#",
+      "wtlyDesc": "过程确认",
+      "count": 4
+    },
+    {
+      "wtly": "#4#",
+      "wtlyDesc": "体系健康体检",
+      "count": 0
+    },
+    {
+      "wtly": "#5#",
+      "wtlyDesc": "单位自检（单位牵头）",
+      "count": 0
+    }
+  ],
+  "msg": "成功",
+  "errCode": null
+}
+
+4、问题来源环形图下探明细-根据开始、结束时间、问题来源获取创建时间这个范围内的符合问题来源条件的问题明细列表;
+请求url:
+http://localhost:8090/cpsProblem/list/detail/source?startTime=2026-08-01&endTime=2026-09-30&wtly=3
+
+出参示例：{
+  "success": true,
+  "data": [
+    {
+      "id": "0y6Gls817Nktw4srkPH",
+      "createdAt": null,
+      "wtbh": "0011​",
+      "wtms": "问题一二三",
+      "wtly": "#3#",
+      "wtlyDesc": "过程确认",
+      "wtssbk": null,
+      "wtlb": null,
+      "wtlbDesc": null,
+      "wtxz": null,
+      "wtxzDesc": null,
+      "sfl": null,
+      "sflDesc": null,
+      "mbghlk": "#1#",
+      "mbghlkDesc": "1",
+      "rylb": "#7#",
+      "rylbDesc": "一般员工",
+      "wtsfgb": null,
+      "wtfj": null,
+      "wtzghfj": null,
+      "wtjjcs": null,
+      "wtclfs": null,
+      "wtclfsDesc": null,
+      "gzap": null,
+      "wtsjz": null,
+      "wtclfs2": null,
+      "wtclfs2Desc": null,
+      "gzap2": null,
+      "wtsjz2": null,
+      "wtclfs3": null,
+      "wtclfs3Desc": null,
+      "gzap3": null,
+      "wtsjz3": null,
+      "jhjjsj": "2026-08-24 16:00:00",
+      "tntpvy": "2026-09-10 09:37:39",
+      "processInstanceId": null,
+      "approvalStatus": null,
+      "gzdw": "Iv9y56sXFNZyuPFPQ85",
+      "gzdwName": "人力资源处",
+      "gzdwCode": "108",
+      "wtzrdw": "GUGXUW77KKfQRu4BFgx",
+      "wtzrdwName": "冲压车间",
+      "wtzrdwCode": "102",
+      "sz": "lvRCTDE4V7qlUhLqHzS",
+      "szName": "制造室2",
+      "szCode": "232",
+      "qy": "c3vxhnAwpekrWYoceWV",
+      "qyName": "总装2",
+      "qyCode": "313",
+      "bz": "rLrKJmjkCcz7d8Jc3dd",
+      "bzName": "分装三班",
+      "bzCode": "872",
+      "wttcr": "cyTZZMgy3WliwVfM3LT",
+      "wttcrName": "周雪",
+      "wtclr": "cyTZZMgy3WliwVfM3LT",
+      "wtclrName": "周雪",
+      "wtclzt": "#4#",
+      "wtclztDesc": "已逾期"
+    },
+    {
+      "id": "6cc5XQRD4EHdYGVr4Rm",
+      "createdAt": null,
+      "wtbh": "0001​",
+      "wtms": "12345",
+      "wtly": "#3#",
+      "wtlyDesc": "过程确认",
+      "wtssbk": "3Bd6p7ixQBb1OSF8gwE",
+      "wtlb": "#5#",
+      "wtlbDesc": "过程确认",
+      "wtxz": "#1#",
+      "wtxzDesc": "无标准",
+      "sfl": "#1#",
+      "sflDesc": "整理",
+      "mbghlk": "#1#",
+      "mbghlkDesc": "1",
+      "rylb": "#7#",
+      "rylbDesc": "一般员工",
+      "wtsfgb": null,
+      "wtfj": null,
+      "wtzghfj": null,
+      "wtjjcs": null,
+      "wtclfs": null,
+      "wtclfsDesc": null,
+      "gzap": null,
+      "wtsjz": null,
+      "wtclfs2": null,
+      "wtclfs2Desc": null,
+      "gzap2": null,
+      "wtsjz2": null,
+      "wtclfs3": null,
+      "wtclfs3Desc": null,
+      "gzap3": null,
+      "wtsjz3": null,
+      "jhjjsj": "2026-09-19 16:00:00",
+      "tntpvy": "2026-09-09 02:32:45",
+      "processInstanceId": null,
+      "approvalStatus": null,
+      "gzdw": "ahImSLxXBuQkFtU8Ace",
+      "gzdwName": "总装车间",
+      "gzdwCode": "104",
+      "wtzrdw": "ahImSLxXBuQkFtU8Ace",
+      "wtzrdwName": "总装车间",
+      "wtzrdwCode": "104",
+      "sz": "gjCsFTBShT36aQhnACN",
+      "szName": "制造室",
+      "szCode": "76",
+      "qy": "fmYCcdP0L8ABmx2cPo1",
+      "qyName": "区域1",
+      "qyCode": "111",
+      "bz": "6Lj0fH9rB5bXm19thta",
+      "bzName": "班组1",
+      "bzCode": "999",
+      "wttcr": "jU1pkX6iMiZjUPP19MP",
+      "wttcrName": "陈工",
+      "wtclr": "jU1pkX6iMiZjUPP19MP",
+      "wtclrName": "陈工",
+      "wtclzt": "#4#",
+      "wtclztDesc": "已逾期"
+    },
+    {
+      "id": "lgRDYJqHMS81zBdYfjg",
+      "createdAt": null,
+      "wtbh": "0007​",
+      "wtms": "260909",
+      "wtly": "#3#",
+      "wtlyDesc": "过程确认",
+      "wtssbk": "C4UyMlZruanCjNoRjpB",
+      "wtlb": "#5#",
+      "wtlbDesc": "过程确认",
+      "wtxz": "#1#",
+      "wtxzDesc": "无标准",
+      "sfl": "#6#",
+      "sflDesc": "安全",
+      "mbghlk": "#1#",
+      "mbghlkDesc": "1",
+      "rylb": "#7#",
+      "rylbDesc": "一般员工",
+      "wtsfgb": null,
+      "wtfj": null,
+      "wtzghfj": null,
+      "wtjjcs": null,
+      "wtclfs": null,
+      "wtclfsDesc": null,
+      "gzap": null,
+      "wtsjz": null,
+      "wtclfs2": null,
+      "wtclfs2Desc": null,
+      "gzap2": null,
+      "wtsjz2": null,
+      "wtclfs3": null,
+      "wtclfs3Desc": null,
+      "gzap3": null,
+      "wtsjz3": null,
+      "jhjjsj": "2026-09-09 16:00:00",
+      "tntpvy": "2026-09-09 13:00:03",
+      "processInstanceId": null,
+      "approvalStatus": null,
+      "gzdw": "ahImSLxXBuQkFtU8Ace",
+      "gzdwName": "总装车间",
+      "gzdwCode": "104",
+      "wtzrdw": "ahImSLxXBuQkFtU8Ace",
+      "wtzrdwName": "总装车间",
+      "wtzrdwCode": "104",
+      "sz": "gjCsFTBShT36aQhnACN",
+      "szName": "制造室",
+      "szCode": "76",
+      "qy": "NpZtfnU8FcGXCXPUhEr",
+      "qyName": "制造室",
+      "qyCode": "76",
+      "bz": "6Lj0fH9rB5bXm19thta",
+      "bzName": "班组1",
+      "bzCode": "999",
+      "wttcr": "jU1pkX6iMiZjUPP19MP",
+      "wttcrName": "陈工",
+      "wtclr": null,
+      "wtclrName": null,
+      "wtclzt": "#4#",
+      "wtclztDesc": "已逾期"
+    },
+    {
+      "id": "VnP3UBlwvExVy3ThQRx",
+      "createdAt": null,
+      "wtbh": "0021​",
+      "wtms": "222",
+      "wtly": "#3#",
+      "wtlyDesc": "过程确认",
+      "wtssbk": "D4TKppnh6cdNBbp3m75",
+      "wtlb": "#5#",
+      "wtlbDesc": "过程确认",
+      "wtxz": "#1#",
+      "wtxzDesc": "无标准",
+      "sfl": "#1#",
+      "sflDesc": "整理",
+      "mbghlk": "#0#",
+      "mbghlkDesc": "0",
+      "rylb": "#7#",
+      "rylbDesc": "一般员工",
+      "wtsfgb": null,
+      "wtfj": null,
+      "wtzghfj": null,
+      "wtjjcs": "899999",
+      "wtclfs": "#3#",
+      "wtclfsDesc": "问题升级至",
+      "gzap": null,
+      "wtsjz": "94kDpRJdCZeIwYvEdHo",
+      "wtclfs2": "#3#",
+      "wtclfs2Desc": "问题升级至",
+      "gzap2": null,
+      "wtsjz2": "jU1pkX6iMiZjUPP19MP",
+      "wtclfs3": "#1#",
+      "wtclfs3Desc": "自己解决",
+      "gzap3": null,
+      "wtsjz3": null,
+      "jhjjsj": "2026-09-21 16:00:00",
+      "tntpvy": null,
+      "processInstanceId": "626e55ca22e14a0f9c9748de891a64d0",
+      "approvalStatus": "#PASS#",
+      "gzdw": "ahImSLxXBuQkFtU8Ace",
+      "gzdwName": "总装车间",
+      "gzdwCode": "104",
+      "wtzrdw": "ahImSLxXBuQkFtU8Ace",
+      "wtzrdwName": "总装车间",
+      "wtzrdwCode": "104",
+      "sz": "6oektTxrhzFKLmaUIuU",
+      "szName": "完成区",
+      "szCode": "68",
+      "qy": "cIBCbwuP3H0U478Rdmd",
+      "qyName": "完成区",
+      "qyCode": "68",
+      "bz": "0UClE70jI0b6F3CuRoE",
+      "bzName": "完成一班",
+      "bzCode": "144",
+      "wttcr": "jU1pkX6iMiZjUPP19MP",
+      "wttcrName": "陈工",
+      "wtclr": null,
+      "wtclrName": null,
+      "wtclzt": "#3#",
+      "wtclztDesc": "已关闭"
+    }
+  ],
+  "msg": "成功",
+  "errCode": null
+}
\ No newline at end of file

+--组织用户信息表
+CREATE TABLE `t_apaas_uc_user`
+(
+    `id`                      varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID',
+    `corp_code`               varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '公司编号',
+    `created_at`              datetime                                                     NOT NULL COMMENT '创建时间',
+    `created_by`              varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID',
+    `updated_at`              datetime                                                     NOT NULL COMMENT '最后更新时间',
+    `updated_by`              varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '最后更新人',
+    `name`                    varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '姓名',
+    `name_spell`              varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '姓名全拼',
+    `mobile`                  varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT NULL,
+    `email`                   varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT NULL COMMENT '邮箱',
+    `id_card`                 varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '身份证号',
+    `leader_id`               varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT NULL,
+    `login_name`              varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '登录名',
+    `status`                  varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT NULL,
+    `pwd`                     varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '密码',
+    `type`                    varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT NULL,
+    `_d_10409_enabled_report` tinyint(1) DEFAULT NULL,
+    `portal_id`               varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT NULL,
+    `lflzvg`                  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT NULL,
+    `sex`                     varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT NULL,
+    `leader`                  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT NULL,
+    `birthday`                datetime(3) DEFAULT NULL,
+    `enabled_report`          varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT NULL,
+    `avatar`                  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT NULL,
+    `ref_type`                varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT NULL,
+    `ref_id`                  text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+--组织结构信息表
+CREATE TABLE `t_apaas_uc_org`
+(
+    `id`            varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID',
+    `corp_code`     varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '公司编号',
+    `created_at`    datetime                                                     NOT NULL COMMENT '创建时间',
+    `created_by`    varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID',
+    `updated_at`    datetime                                                     NOT NULL COMMENT '最后更新时间',
+    `updated_by`    varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '最后更新人',
+    `code`          varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '部门编码',
+    `name`          varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '部门名称',
+    `administrator` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '部门负责人',
+    `type`          varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '部门类型',
+    `parent_id`     varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+    `ref_type`      varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+    `ref_id`        text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+    `sorts` double (21,6) DEFAULT NULL,
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;