CPS相关实体类、服务、接口添加

+/target/
+/src/test/
+/logs/
+/.idea/

@@ -9,7 +9,7 @@
     <version>1.0.0-SNAPSHOT</version>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <packaging>jar</packaging>
     <name>qx-apaas-sync</name>
     <name>qx-apaas-sync</name>
-    <description>简道云 -> 启效 独立同步工具（无中间件依赖，java -jar 运行）</description>
+    <description>changan-custom,合肥长安自定义工程，负责相关三方系统对接，驾驶舱接口数据查询</description>
 
 
     <parent>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <groupId>org.springframework.boot</groupId>
@@ -25,13 +25,64 @@
         <fastjson.version>2.0.6</fastjson.version>
         <fastjson.version>2.0.6</fastjson.version>
         <httpclient.version>4.5.14</httpclient.version>
         <httpclient.version>4.5.14</httpclient.version>
         <poi.version>4.1.2</poi.version>
         <poi.version>4.1.2</poi.version>
+        <commons.collections4.version>4.4</commons.collections4.version>
+        <maven.test.skip>true</maven.test.skip>
     </properties>
     </properties>
 
 
     <dependencies>
     <dependencies>
-        <!-- Web：提供内嵌 Tomcat 容器 + Spring MVC（REST 触发接口），非外部中间件 -->
         <dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <groupId>com.qgutech.qgyun.framework</groupId>
+            <artifactId>qgyun-core-mybatis</artifactId>
+            <version>2.1.5-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.qgutech.qgyun.framework</groupId>
+                    <artifactId>qgyun-core-starter-redis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.qgutech.qgyun.framework</groupId>
+            <artifactId>qgyun-core-starter-web</artifactId>
+            <version>2.1.5-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>asm</artifactId>
+                    <groupId>org.ow2.asm</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.24</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.10</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>2.0.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.5</version>
+        </dependency>
+
+        <!-- ================= Apache Commons（原框架传递引入） ================= -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>${commons.collections4.version}</version>
         </dependency>
         </dependency>
 
 
         <!-- JSON 处理 -->
         <!-- JSON 处理 -->
@@ -70,6 +121,18 @@
             <scope>provided</scope>
             <scope>provided</scope>
         </dependency>
         </dependency>
 
 
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4.7</version>
+        </dependency>
+
         <!-- 测试 -->
         <!-- 测试 -->
         <dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>
@@ -78,6 +141,17 @@
         </dependency>
         </dependency>
     </dependencies>
     </dependencies>
 
 
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <build>
     <build>
         <plugins>
         <plugins>
             <plugin>
             <plugin>

@@ -2,13 +2,17 @@ package com.qgutech.qgyun.apaas.sync;
 
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import tk.mybatis.spring.annotation.MapperScan;
 
 
 /**
 /**
  * 简道云 -> 启效 独立同步工具启动类。
  * 简道云 -> 启效 独立同步工具启动类。
  * <p>
  * <p>
  * 无中间件依赖：单 jar（内嵌 Tomcat）+ 仅 Java 环境即可运行。配置在 application.yml（jdy-sync.*）。
  * 无中间件依赖：单 jar（内嵌 Tomcat）+ 仅 Java 环境即可运行。配置在 application.yml（jdy-sync.*）。
  */
  */
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = "com.qgutech")
+@MapperScan({"com.qgutech.qgyun.apaas.sync.**.mapper"})
+@EnableScheduling
 public class QxApaasSyncApplication {
 public class QxApaasSyncApplication {
 
 
     public static void main(String[] args) {
     public static void main(String[] args) {

+package com.qgutech.qgyun.apaas.sync.base;
+
+public enum BoErrorCode {
+    SYSTEM_EXCEPTION("系统异常"),
+    DATA_ERROR("数据异常"),
+    PARAM_ERROR("参数异常"),
+    USER_NOT_EXIST("用户不存在");
+
+    private final String text;
+
+    BoErrorCode(String text) {
+        this.text = text;
+    }
+
+    public String getText() {
+        return text;
+    }
+}

+package com.qgutech.qgyun.apaas.sync.base;
+
+import com.qgutech.qgyun.framework.common.exception.BaseException;
+
+public class BoException extends BaseException {
+    public BoException(String errorCode, String message) {
+        super(errorCode, message);
+    }
+
+    public BoException(String errorCode, String message, Throwable cause) {
+        super(errorCode, message, cause);
+    }
+
+    public BoException(BoErrorCode boErrorCode) {
+        this(boErrorCode.name(), boErrorCode.getText());
+    }
+
+    public BoException(BoErrorCode boErrorCode, String message) {
+        this(boErrorCode.name(), message);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+@Configuration
+public class CorsConfig {
+
+    @Value("${qgyun.cors.allowedOrigin:*}")
+    private String allowedOrigin;
+
+    @Bean
+    public FilterRegistrationBean corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        CorsConfiguration config = new CorsConfiguration();
+        config.setAllowCredentials(true);
+        config.addAllowedOrigin(allowedOrigin);
+        config.addAllowedHeader("*");
+        config.addAllowedMethod("*");
+        source.registerCorsConfiguration("/**", config);
+        FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
+        bean.setOrder(0);
+        return bean;
+    }
+}

+package com.qgutech.qgyun.apaas.sync.constant;
+
+public interface Constant {
+
+    String SUCCESS = "SUCCESS";
+    String ERROR = "ERROR";
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.dto.AbImprovementSummaryDTO;
+import com.qgutech.qgyun.apaas.sync.cps.model.AbImprovement;
+import com.qgutech.qgyun.apaas.sync.cps.service.AbImprovementService;
+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;
+import java.util.List;
+
+/**
+ * AB类改善接�?
+ */
+@Slf4j
+@RestController
+@RequestMapping("/abImprovement")
+public class AbImprovementController {
+
+    @Resource
+    private AbImprovementService abImprovementService;
+
+    /**
+     * 获取所有AB类改善列�?
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<AbImprovement> abImprovementList = abImprovementService.listAll();
+        return new JsonResult<>(true, "成功", abImprovementList);
+    }
+
+    /**
+     * 根据年份查询AB类改善汇总（按单位车间分组）
+     * <p>
+     * 年份为空时默认查询当前年
+     *
+     * @param year 年份，格式：yyyy，可为空
+     * @return AB类改善汇总列表
+     */
+    @GetMapping("/summary/year")
+    public JsonResult summaryByYear(@RequestParam(required = false) String year) {
+        List<AbImprovementSummaryDTO> summaryList = abImprovementService.summaryByYear(year);
+        return new JsonResult<>(true, "成功", summaryList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.Area;
+import com.qgutech.qgyun.apaas.sync.cps.service.AreaService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 区域信息接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/area")
+public class AreaController {
+
+    @Resource
+    private AreaService areaService;
+
+    /**
+     * 获取所有区域信息列�?
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<Area> areaList = areaService.listAll();
+        return new JsonResult<>(true, "成功", areaList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+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;
+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;
+import java.util.List;
+
+/**
+ * C类改善接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/cImprovement")
+public class CImprovementController {
+
+    @Resource
+    private CImprovementService cImprovementService;
+
+    /**
+     * 获取所有C类改善列表
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<CImprovement> cImprovementList = cImprovementService.listAll();
+        return new JsonResult<>(true, "成功", cImprovementList);
+    }
+
+    /**
+     * 根据年份和季度查询C类改善发起率汇总（按单位车间分组）
+     * <p>
+     * 年份为空时默认查询当前年，季度必传
+     *
+     * @param year    年份，格式：yyyy，可为空
+     * @param quarter 季度枚举值（#1#-#4#），必传
+     * @return 单位车间C类改善发起率信息列表（含目标值）
+     */
+    @GetMapping("/summary/quarter")
+    public JsonResult summaryByQuarter(@RequestParam(required = false) String year,
+                                       @RequestParam String quarter) {
+        List<CImprovementSummaryDTO> summaryList = cImprovementService.summaryByYearAndQuarter(year, quarter);
+        return new JsonResult<>(true, "成功", summaryList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * CPS问题接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/cpsProblem")
+public class CpsProblemController {
+
+    @Resource
+    private CpsProblemService cpsProblemService;
+
+    /**
+     * 获取所有CPS问题列表
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<CpsProblem> cpsProblemList = cpsProblemService.listAll();
+        return new JsonResult<>(true, "成功", cpsProblemList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.Personnel;
+import com.qgutech.qgyun.apaas.sync.cps.service.PersonnelService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 人员信息接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/personnel")
+public class PersonnelController {
+
+    @Resource
+    private PersonnelService personnelService;
+
+    /**
+     * 获取所有人员信息列�?
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<Personnel> personnelList = personnelService.listAll();
+        return new JsonResult<>(true, "成功", personnelList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.PjoBatch;
+import com.qgutech.qgyun.apaas.sync.cps.service.PjoBatchService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * PjoBatch接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/pjoBatch")
+public class PjoBatchController {
+
+    @Resource
+    private PjoBatchService pjoBatchService;
+
+    /**
+     * 获取所有PjoBatch列表
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<PjoBatch> pjoBatchList = pjoBatchService.listAll();
+        return new JsonResult<>(true, "成功", pjoBatchList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.PjoExec;
+import com.qgutech.qgyun.apaas.sync.cps.service.PjoExecService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * PjoExec接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/pjoExec")
+public class PjoExecController {
+
+    @Resource
+    private PjoExecService pjoExecService;
+
+    /**
+     * 获取所有PjoExec列表
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<PjoExec> pjoExecList = pjoExecService.listAll();
+        return new JsonResult<>(true, "成功", pjoExecList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.PjoWorkstationExec;
+import com.qgutech.qgyun.apaas.sync.cps.service.PjoWorkstationExecService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * PjoWorkstationExec接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/pjoWorkstationExec")
+public class PjoWorkstationExecController {
+
+    @Resource
+    private PjoWorkstationExecService pjoWorkstationExecService;
+
+    /**
+     * 获取所有PjoWorkstationExec列表
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<PjoWorkstationExec> pjoWorkstationExecList = pjoWorkstationExecService.listAll();
+        return new JsonResult<>(true, "成功", pjoWorkstationExecList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.ProcessConfirmExec;
+import com.qgutech.qgyun.apaas.sync.cps.service.ProcessConfirmExecService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * ProcessConfirmExec接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/processConfirmExec")
+public class ProcessConfirmExecController {
+
+    @Resource
+    private ProcessConfirmExecService processConfirmExecService;
+
+    /**
+     * 获取所有ProcessConfirmExec列表
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<ProcessConfirmExec> processConfirmExecList = processConfirmExecService.listAll();
+        return new JsonResult<>(true, "成功", processConfirmExecList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.ProcessConfirmPersonnel;
+import com.qgutech.qgyun.apaas.sync.cps.service.ProcessConfirmPersonnelService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * ProcessConfirmPersonnel接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/processConfirmPersonnel")
+public class ProcessConfirmPersonnelController {
+
+    @Resource
+    private ProcessConfirmPersonnelService processConfirmPersonnelService;
+
+    /**
+     * 获取所有ProcessConfirmPersonnel列表
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<ProcessConfirmPersonnel> processConfirmPersonnelList = processConfirmPersonnelService.listAll();
+        return new JsonResult<>(true, "成功", processConfirmPersonnelList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.QuarterPersonnel;
+import com.qgutech.qgyun.apaas.sync.cps.service.QuarterPersonnelService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * QuarterPersonnel接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/quarterPersonnel")
+public class QuarterPersonnelController {
+
+    @Resource
+    private QuarterPersonnelService quarterPersonnelService;
+
+    /**
+     * 获取所有QuarterPersonnel列表
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<QuarterPersonnel> quarterPersonnelList = quarterPersonnelService.listAll();
+        return new JsonResult<>(true, "成功", quarterPersonnelList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.RoomGroup;
+import com.qgutech.qgyun.apaas.sync.cps.service.RoomGroupService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 室组信息接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/roomGroup")
+public class RoomGroupController {
+
+    @Resource
+    private RoomGroupService roomGroupService;
+
+    /**
+     * 获取所有室组信息列�?
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<RoomGroup> roomGroupList = roomGroupService.listAll();
+        return new JsonResult<>(true, "成功", roomGroupList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.Shift;
+import com.qgutech.qgyun.apaas.sync.cps.service.ShiftService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 班次信息接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/shift")
+public class ShiftController {
+
+    @Resource
+    private ShiftService shiftService;
+
+    /**
+     * 获取所有班次信息列�?
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<Shift> shiftList = shiftService.listAll();
+        return new JsonResult<>(true, "成功", shiftList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.StdActivityCase;
+import com.qgutech.qgyun.apaas.sync.cps.service.StdActivityCaseService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * StdActivityCase接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/stdActivityCase")
+public class StdActivityCaseController {
+
+    @Resource
+    private StdActivityCaseService stdActivityCaseService;
+
+    /**
+     * 获取所有StdActivityCase列表
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<StdActivityCase> stdActivityCaseList = stdActivityCaseService.listAll();
+        return new JsonResult<>(true, "成功", stdActivityCaseList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.Team;
+import com.qgutech.qgyun.apaas.sync.cps.service.TeamService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 班组信息接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/team")
+public class TeamController {
+
+    @Resource
+    private TeamService teamService;
+
+    /**
+     * 获取所有班组信息列�?
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<Team> teamList = teamService.listAll();
+        return new JsonResult<>(true, "成功", teamList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.Workshop;
+import com.qgutech.qgyun.apaas.sync.cps.service.WorkshopService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 单位（车间）信息接口
+ *
+ * @Author cq
+ * @Since 2026-09-21
+ */
+@Slf4j
+@RestController
+@RequestMapping("/workshop")
+public class WorkshopController {
+
+
+    @Resource
+    private WorkshopService workshopService;
+
+    /**
+     * 获取所有单位车间信息列表
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<Workshop> workshopList = workshopService.listAll();
+        return new JsonResult<>(true, "成功", workshopList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.Workstation;
+import com.qgutech.qgyun.apaas.sync.cps.service.WorkstationService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 工位信息接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/workstation")
+public class WorkstationController {
+
+    @Resource
+    private WorkstationService workstationService;
+
+    /**
+     * 获取所有工位信息列�?
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<Workstation> workstationList = workstationService.listAll();
+        return new JsonResult<>(true, "成功", workstationList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.controller;
+
+import com.qgutech.qgyun.apaas.sync.cps.model.XtLine;
+import com.qgutech.qgyun.apaas.sync.cps.service.XtLineService;
+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.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 线体信息接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/xtLine")
+public class XtLineController {
+
+    @Resource
+    private XtLineService xtLineService;
+
+    /**
+     * 获取所有线体信息列�?
+     *
+     * @return
+     */
+    @GetMapping("/list/all")
+    public JsonResult listAll() {
+        List<XtLine> xtLineList = xtLineService.listAll();
+        return new JsonResult<>(true, "成功", xtLineList);
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * AB类改善汇总结果
+ */
+@Getter
+@Setter
+@ToString
+public class AbImprovementSummaryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位车间编码
+     */
+    private String dwcj;
+
+    /**
+     * 单位车间名称
+     */
+    private String dwcjName;
+    /**
+     * 单位车间编号
+     */
+    private String dwcjCode;
+
+    /**
+     * 年份
+     */
+    private String year;
+
+    /**
+     * 节约价值汇总
+     */
+    private Double totalQnjyjz;
+
+    /**
+     * 目标值
+     */
+    private Double mb;
+
+    /**
+     * 完成率（%）
+     */
+    private Double completionRate;
+}

+package com.qgutech.qgyun.apaas.sync.cps.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * C类改善汇总结果（按室组维度分组）
+ */
+@Getter
+@Setter
+@ToString
+@ApiModel(value = "CImprovementSummary", description = "C类改善汇总结果")
+public class CImprovementSummaryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 室组编码
+     */
+    @ApiModelProperty(value = "室组编码")
+    private String szxx;
+
+    /**
+     * 室组名称
+     */
+    @ApiModelProperty(value = "室组名称")
+    private String szmc;
+
+    /**
+     * 所属单位车间编码
+     */
+    @ApiModelProperty(value = "所属单位车间编码")
+    private String dwcj;
+
+    /**
+     * 所属单位车间名称
+     */
+    @ApiModelProperty(value = "所属单位车间名称")
+    private String dwcjName;
+
+    /**
+     * 年份
+     */
+    @ApiModelProperty(value = "年份")
+    private String year;
+
+    /**
+     * 季度
+     */
+    @ApiModelProperty(value = "季度")
+    private String quarter;
+
+    /**
+     * 季度描述
+     */
+    @ApiModelProperty(value = "季度描述")
+    private String quarterDesc;
+
+    /**
+     * 室组总人数
+     */
+    @ApiModelProperty(value = "室组总人数")
+    private Integer totalPersonnel;
+
+    /**
+     * 有C类改善记录的人数（同一人多条记录算一次）
+     */
+    @ApiModelProperty(value = "有C类改善记录的人数")
+    private Integer improvementPersonnel;
+
+    /**
+     * C类改善发起率（%）
+     */
+    @ApiModelProperty(value = "C类改善发起率（%）")
+    private Double improvementRate;
+
+    /**
+     * 目标值
+     */
+    @ApiModelProperty(value = "目标值")
+    private Double mb;
+}

+package com.qgutech.qgyun.apaas.sync.cps.enums;
+
+import lombok.Getter;
+
+/**
+ * 季度枚举
+ */
+@Getter
+public enum QuarterEnum {
+
+    /**
+     * 第一季度
+     */
+    Q1("#1#", "第一季度", "01-01", "03-31"),
+
+    /**
+     * 第二季度
+     */
+    Q2("#2#", "第二季度", "04-01", "06-30"),
+
+    /**
+     * 第三季度
+     */
+    Q3("#3#", "第三季度", "07-01", "09-30"),
+
+    /**
+     * 第四季度
+     */
+    Q4("#4#", "第四季度", "10-01", "12-31");
+
+    /**
+     * 数据库存储的值
+     */
+    private final String code;
+
+    /**
+     * 中文描述
+     */
+    private final String desc;
+
+    /**
+     * 季度开始日期（MM-dd）
+     */
+    private final String startDate;
+
+    /**
+     * 季度结束日期（MM-dd）
+     */
+    private final String endDate;
+
+    QuarterEnum(String code, String desc, String startDate, String endDate) {
+        this.code = code;
+        this.desc = desc;
+        this.startDate = startDate;
+        this.endDate = endDate;
+    }
+
+    /**
+     * 根据code获取枚举
+     *
+     * @param code 数据库存储的值
+     * @return 枚举实例，未找到返回 null
+     */
+    public static QuarterEnum fromCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (QuarterEnum quarter : values()) {
+            if (quarter.code.equals(code)) {
+                return quarter;
+            }
+        }
+        return null;
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.Getter;
+
+/**
+ * 车间状态枚举
+ * <p>
+ * 数据库字段 ieiblp 存储编号：1-草稿，2-启用，3-停用
+ * 返回给前端时转换为中文描述
+ */
+@Getter
+public enum WorkshopStatusEnum {
+
+    /**
+     * 草稿
+     */
+    DRAFT("#1#", "草稿"),
+
+    /**
+     * 启用
+     */
+    ENABLED("#2#", "启用"),
+
+    /**
+     * 停用
+     */
+    DISABLED("#3#", "停用");
+
+    /**
+     * 数据库中存储的编号
+     */
+    private final String code;
+
+    /**
+     * 中文描述，返回给前端显示
+     */
+    @JsonValue
+    private final String desc;
+
+    WorkshopStatusEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    /**
+     * 根据编号获取枚举
+     *
+     * @param code 编号
+     * @return 枚举实例，未找到返回 null
+     */
+    public static WorkshopStatusEnum fromCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (WorkshopStatusEnum status : values()) {
+            if (status.code.equals(code)) {
+                return status;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 根据编号获取中文描述
+     *
+     * @param code 编号
+     * @return 中文描述，未找到返回原编号
+     */
+    public static String getDescByCode(String code) {
+        WorkshopStatusEnum status = fromCode(code);
+        return status != null ? status.getDesc() : code;
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+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;
+
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.Date;
+
+/**
+ * AB类改善
+ */
+@Getter
+@Setter
+@ToString
+@Table(name = "t_auto_hfca_ixzvok_sfikan")
+public class AbImprovement extends BaseCorpModel {
+
+    public static final String DWCJ = "dwcj";
+    public static final String SQRQ = "sqrq";
+
+    /*
+     * 流程实例名称
+     */
+    private String lcslmc;
+
+    /*
+     * 单位车间
+     */
+    private String dwcj;
+
+    /*
+     * 申请人
+     */
+    private String sqr;
+
+    /*
+     * 申请部门
+     */
+    private String sqbm;
+
+    /*
+     * 申请日期
+     */
+    private Date sqrq;
+
+    /*
+     * 立项人
+     */
+    private String lxr;
+
+    /*
+     * 全年节约价值
+     */
+    private Double qnjyjz;
+
+    /*
+     * 改善类型
+     */
+    private String gslx;
+
+    /*
+     * 团队人数
+     */
+    private Double tdrs;
+
+    /**********非持久化字段*********/
+    //单位车间名称
+    @Transient
+    private String dwcjName;
+    //目标值
+    @Transient
+    private Double mb;
+    //年份-yyyy
+    @Transient
+    private String year;
+}

+package com.qgutech.qgyun.apaas.sync.cps.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.Table;
+import java.util.Date;
+
+/**
+ * AB类改善目标
+ */
+@Getter
+@Setter
+@ToString
+@Table(name = "t_auto_hfca_ixzvok_dwmonj")
+public class AbImprovementTarget extends BaseCorpModel {
+
+    public static final String DWCJ = "dwcj";
+    public static final String YEAR = "year";
+
+    /*
+     * 年份
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date year;
+
+    /*
+     * 单位车间
+     */
+    private String dwcj;
+
+    /*
+     * 目标值
+     */
+    private Double mb;
+}

+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;
+
+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;
+
+import javax.persistence.Table;
+
+/**
+ * C类改善
+ */
+@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;
+
+   /*
+    * 员工号
+    */
+    private String ygh;
+
+    /*
+     * 来源问题记录id
+     */
+    private String lywt;
+
+    /*
+     * 问题编号
+     */
+    private String wtbh;
+
+    /*
+     * 部门id
+     */
+    private String bm;
+
+    @ApiModelProperty(value = "szqymc")
+    private String szqymc;
+
+    /*
+     *是否问题类改善
+     */
+    private Boolean sfwtlg;
+
+    /*
+     * 是否是车间班组
+     */
+    private Boolean sfscjb;
+
+    /*
+     * 班组信息id
+     */
+    private String bz;
+
+    /*
+     * 改善名称
+     */
+    private String gsmc;
+
+    /*
+     * 区长确认-组织用户id
+     */
+    private String qzqr;
+
+    /*
+     *改善员确认-组织用户id
+     */
+    private String gsyqr;
+
+    /*
+     * 是否推送优秀案例
+     */
+    private Boolean sftsyxal;
+
+    /*
+     * 状态
+     */
+    private String zt;
+
+    /*
+     * 问题说明
+     */
+    private String wtsm;
+
+    /*
+     * 改善后效果
+     */
+    private String gshxg;
+
+    /*
+     * 发起人
+     */
+    private String fqr;
+
+    /*
+     * 室组信息id
+     */
+    private String szmc;
+
+    @ApiModelProperty(value = "流程实例ID")
+    private String processInstanceId;
+
+    @ApiModelProperty(value = "审批状态")
+    private String approvalStatus;
+
+    /*
+     * 是否推送金点子
+     */
+    private Boolean sftsjdz;
+}

+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;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.Table;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * C类改善目标
+ */
+@Getter
+@Setter
+@ToString
+@Table(name = "t_auto_hfca_ixzvok_jhzvno")
+public class CImprovementTarget extends BaseCorpModel {
+
+    /*
+     * 年份
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date year;
+
+    /*
+     * 单位车间
+     */
+    private String dwcj;
+
+    /*
+     * 室组
+     */
+    private String szxx;
+
+    /*
+     * 目标值
+     */
+    private Double mb;
+}

+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;
+
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * CPS体系问题记录信息
+ */
+@Getter
+@Setter
+@ToString
+@ApiModel(value = "CpsProblem", description = "CPS体系问题记录信息")
+@Table(name = "t_auto_hfca_ixzvok_cpstxw")
+public class CpsProblem extends BaseCorpModel {
+
+    @ApiModelProperty(value = "问题编号")
+    private String wtbh;
+
+    @ApiModelProperty(value = "问题来源")
+    private String wtly;
+
+    @ApiModelProperty(value = "问题提出人")
+    private String wttcr;
+
+    @ApiModelProperty(value = "工作单位")
+    private String gzdw;
+
+    @ApiModelProperty(value = "所在区域名称")
+    private String szqymc;
+
+    @ApiModelProperty(value = "人员类别")
+    private String rylb;
+
+    @ApiModelProperty(value = "问题描述")
+    private String wtms;
+
+    @ApiModelProperty(value = "问题单位")
+    private String wtdw;
+
+    @ApiModelProperty(value = "问题附件")
+    private String wtfj;
+
+    @ApiModelProperty(value = "问题所属板块")
+    private String wtssbk;
+
+    @ApiModelProperty(value = "问题类别")
+    private String wtlb;
+
+    @ApiModelProperty(value = "问题性质")
+    private String wtxz;
+
+    @ApiModelProperty(value = "sfl")
+    private String sfl;
+
+    @ApiModelProperty(value = "问题是否关闭")
+    private Boolean wtsfgb;
+
+    @ApiModelProperty(value = "室组")
+    private String sz;
+
+    @ApiModelProperty(value = "mbghlk")
+    private String mbghlk;
+
+    @ApiModelProperty(value = "问题处理方式")
+    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")
+    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")
+    private String wtclfs2;
+
+    @ApiModelProperty(value = "gzap2")
+    private String gzap2;
+
+    @ApiModelProperty(value = "wtsjz2")
+    private String wtsjz2;
+
+    @ApiModelProperty(value = "wtclfs3")
+    private String wtclfs3;
+
+    @ApiModelProperty(value = "gzap3")
+    private String gzap3;
+
+    @ApiModelProperty(value = "wtsjz3")
+    private String wtsjz3;
+
+    @ApiModelProperty(value = "流程实例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;
+
+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 = "所属班组")
+    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;
+
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * PJO计划批次信息
+ */
+@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;
+
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * PJO计划执行信息
+ */
+@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")
+    private Date qkxdwk;
+
+    @ApiModelProperty(value = "PJO执行人")
+    private String pjozxr;
+
+    @ApiModelProperty(value = "PJO批次")
+    private String pjopc;
+
+    @ApiModelProperty(value = "车间")
+    private String cj;
+
+    @ApiModelProperty(value = "产线")
+    private String cx;
+
+    @ApiModelProperty(value = "CPS区域")
+    private String cpsqy;
+
+    @ApiModelProperty(value = "班组")
+    private String bz;
+
+    @ApiModelProperty(value = "PJO观察人姓名")
+    private String pjogcrxm;
+
+    @ApiModelProperty(value = "工位信息")
+    private String gwxx;
+
+    @ApiModelProperty(value = "所属批次")
+    private String sspc;
+
+    @ApiModelProperty(value = "工位性质")
+    private String gwxz;
+
+    @ApiModelProperty(value = "PJO是否正常开展")
+    private Boolean pjosfzckz;
+
+    @ApiModelProperty(value = "gchtxzyyc")
+    private String gchtxzyyc;
+
+    @ApiModelProperty(value = "gchtxcyyc")
+    private String gchtxcyyc;
+
+    @ApiModelProperty(value = "gcdwt")
+    private String gcdwt;
+
+    @ApiModelProperty(value = "gcgjjh")
+    private String gcgjjh;
+
+    @ApiModelProperty(value = "lfwkuc")
+    private String lfwkuc;
+
+    @ApiModelProperty(value = "zyczdwt")
+    private String zyczdwt;
+
+    @ApiModelProperty(value = "zdbgwdgsjy")
+    private String zdbgwdgsjy;
+
+    @ApiModelProperty(value = "lvqwyc")
+    private String lvqwyc;
+
+    @ApiModelProperty(value = "zyqm")
+    private String zyqm;
+
+    @ApiModelProperty(value = "zysfyjy")
+    private Boolean zysfyjy;
+
+    @ApiModelProperty(value = "cyjy")
+    private String cyjy;
+
+    @ApiModelProperty(value = "zyjy")
+    private String zyjy;
+
+    @ApiModelProperty(value = "状态")
+    private String zt;
+
+    @ApiModelProperty(value = "区域")
+    private String qy;
+
+    @ApiModelProperty(value = "gwxx2")
+    private String gwxx2;
+
+    @ApiModelProperty(value = "zyqmb")
+    private String zyqmb;
+
+    @ApiModelProperty(value = "gwzx1")
+    private String gwzx1;
+
+    @ApiModelProperty(value = "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;
+
+import javax.persistence.Table;
+
+/**
+ * PJO计划工位执行情况信息
+ */
+@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批次")
+    private String pjopc;
+
+    @ApiModelProperty(value = "工位")
+    private String gw;
+
+    @ApiModelProperty(value = "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;
+}

+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;
+
+/**
+ * 过程确认计划执行记录信息
+ */
+@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;
+
+import javax.persistence.Table;
+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")
+    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.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 javax.persistence.Table;
+
+/**
+ * 季度人员信息
+ */
+@Getter
+@Setter
+@ToString
+@ApiModel(value = "QuarterPersonnel", description = "季度人员信息")
+@Table(name = "t_auto_hfca_ixzvok_wltctp")
+public class QuarterPersonnel extends BaseCorpModel {
+
+    @ApiModelProperty(value = "季度信息")
+    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;
+
+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;
+
+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;
+
+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")
+    private String hdzxr;
+
+    @ApiModelProperty(value = "ygbh")
+    private String ygbh;
+
+    @ApiModelProperty(value = "gzdw")
+    private String gzdw;
+
+    @ApiModelProperty(value = "szqymc")
+    private String szqymc;
+
+    @ApiModelProperty(value = "xt")
+    private String xt;
+
+    @ApiModelProperty(value = "wtbm")
+    private String wtbm;
+
+    @ApiModelProperty(value = "tjalfj")
+    private String tjalfj;
+
+    @ApiModelProperty(value = "qz")
+    private String qz;
+
+    @ApiModelProperty(value = "bdwcps")
+    private String bdwcps;
+
+    @ApiModelProperty(value = "dwldsh")
+    private String dwldsh;
+
+    @ApiModelProperty(value = "_c_sftscp")
+    private String cSftscp;
+
+    @ApiModelProperty(value = "sftscp")
+    private Boolean sftscp;
+
+    @ApiModelProperty(value = "sz")
+    private String sz;
+
+    @ApiModelProperty(value = "bdwcpstxy")
+    private String bdwcpstxy;
+
+    @ApiModelProperty(value = "sftscps")
+    private String sftscps;
+
+    @ApiModelProperty(value = "zt")
+    private String zt;
+
+    @ApiModelProperty(value = "流程实例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;
+
+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")
+    private String iytfgx;
+
+    @ApiModelProperty(value = "班组成员")
+    private String bzcy;
+
+    @ApiModelProperty(value = "所属组织")
+    private String sszz;
+
+    @ApiModelProperty(value = "状态")
+    private String zt;
+}

+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;
+
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * 单位（车间）信息
+ */
+@Getter
+@Setter
+@ToString
+@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;
+
+    /**
+     * 获取状态中文描述
+     *
+     * @return 状态中文描述
+     */
+    public String getStatusDesc() {
+        return WorkshopStatusEnum.getDescByCode(this.ieiblp);
+    }
+
+}

+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;
+
+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")
+    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;
+
+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")
+    private String amoigs;
+}

+package com.qgutech.qgyun.apaas.sync.cps.service;
+
+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.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;
+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.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * AbImprovement 服务
+ */
+@Service
+public class AbImprovementService extends BaseServiceImpl<AbImprovement> {
+
+    @Resource
+    private AbImprovementMapper abImprovementMapper;
+
+    @Resource
+    private AbImprovementTargetService abImprovementTargetService;
+
+    @Resource
+    private WorkshopService workshopService;
+
+    @Transactional(readOnly = true)
+    public AbImprovement getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(AbImprovement.ID, id);
+        AbImprovement abImprovement = abImprovementMapper.selectOneByExample(example);
+        if (null == abImprovement) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return abImprovement;
+    }
+
+    @Transactional(readOnly = true)
+    public List<AbImprovement> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(AbImprovement.ID, ids);
+        List<AbImprovement> abImprovementList = abImprovementMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(abImprovementList)) {
+            return new ArrayList<>(0);
+        }
+        return abImprovementList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, AbImprovement> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<AbImprovement> abImprovementList = listByIds(ids);
+        if (CollectionUtils.isEmpty(abImprovementList)) {
+            return new HashMap<>(0);
+        }
+
+        return abImprovementList.stream().collect(Collectors.toMap(AbImprovement::getId, abImprovement -> abImprovement));
+    }
+
+    @Transactional(readOnly = true)
+    public List<AbImprovement> listAll() {
+
+        return abImprovementMapper.selectAll();
+    }
+
+    /**
+     * 根据年份查询AB类改善汇总（按单位车间分组）
+     * <p>
+     * 年份为空时默认查询当前年
+     *
+     * @param year 年份，格式：yyyy，可为空
+     * @return AB类改善汇总列表
+     */
+    @Transactional(readOnly = true)
+    public List<AbImprovementSummaryDTO> summaryByYear(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. 查询该年份的所有AB类改善记录
+        Example example = new Example(AbImprovement.class);
+        example.createCriteria()
+                .andBetween(AbImprovement.CREATED_AT, startTime, endTime);
+        List<AbImprovement> abImprovementList = abImprovementMapper.selectByExample(example);
+
+        if (CollectionUtils.isEmpty(abImprovementList)) {
+            return new ArrayList<>(0);
+        }
+
+        // 4. 按单位车间（dwcj存Workshop主键id）分组，汇总节约价值（qnjyjz为空按0计入，避免丢失单位）
+        Map<String, Double> dwcjSummaryMap = abImprovementList.stream()
+                .filter(item -> item.getDwcj() != null)
+                .collect(Collectors.groupingBy(
+                        AbImprovement::getDwcj,
+                        Collectors.summingDouble(item -> item.getQnjyjz() == null ? 0.0D : item.getQnjyjz())
+                ));
+
+        if (dwcjSummaryMap.isEmpty()) {
+            return new ArrayList<>(0);
+        }
+
+        // 5. 查询该年份的AB类目标信息
+        List<AbImprovementTarget> targetList = abImprovementTargetService.listByYear(queryYear);
+
+        // 构建目标值映射Map：dwcj -> mb
+        Map<String, Double> targetMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(targetList)) {
+            targetMap = targetList.stream()
+                    .filter(item -> item.getDwcj() != null && item.getMb() != null)
+                    .collect(Collectors.toMap(
+                            AbImprovementTarget::getDwcj,
+                            AbImprovementTarget::getMb,
+                            (v1, v2) -> v1
+                    ));
+        }
+
+        // 6. 根据分组得到的单位车间id集合，查询单位车间详细信息
+        Set<String> dwcjIds = dwcjSummaryMap.keySet();
+        Map<String, Workshop> workshopMap = workshopService.mapByIds(dwcjIds);
+
+        // 7. 组装汇总结果（每个单位车间一条记录）
+        Map<String, Double> finalTargetMap = targetMap;
+        return dwcjSummaryMap.entrySet().stream()
+                .map(entry -> {
+                    String dwcj = entry.getKey();
+                    AbImprovementSummaryDTO dto = new AbImprovementSummaryDTO();
+                    dto.setDwcj(dwcj);
+                    dto.setYear(queryYear);
+                    dto.setTotalQnjyjz(entry.getValue());
+                    dto.setMb(finalTargetMap.get(dwcj));
+                    // 设置单位车间名称
+                    Workshop workshop = workshopMap.get(dwcj);
+                    if (workshop != null) {
+                        dto.setDwcjName(workshop.getDwmc());
+                        dto.setDwcjCode(workshop.getDwbh());
+                    }
+                    // 计算完成率
+                    if (dto.getMb() != null && dto.getMb() > 0) {
+                        dto.setCompletionRate(Math.round(entry.getValue() / dto.getMb() * 10000) / 100.0);
+                    }
+                    return dto;
+                })
+                .collect(Collectors.toList());
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.service;
+
+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.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;
+
+/**
+ * AbImprovementTarget 服务
+ */
+@Service
+public class AbImprovementTargetService extends BaseServiceImpl<AbImprovementTarget> {
+
+    @Resource
+    private AbImprovementTargetMapper abImprovementTargetMapper;
+
+
+    @Transactional(readOnly = true)
+    public List<AbImprovementTarget> 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);
+
+        // 5. 查询该年份的AB类目标信息
+        Example targetExample = new Example(entityClass);
+        targetExample.createCriteria()
+                .andBetween(AbImprovementTarget.YEAR, startTime, endTime);
+        List<AbImprovementTarget> targetList = abImprovementTargetMapper.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.mapper.AreaMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.Area;
+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;
+
+/**
+ * Area 服务
+ */
+@Service
+public class AreaService extends BaseServiceImpl<Area> {
+
+    @Resource
+    private AreaMapper areaMapper;
+
+    @Transactional(readOnly = true)
+    public Area getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(Area.ID, id);
+        Area area = areaMapper.selectOneByExample(example);
+        if (null == area) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return area;
+    }
+
+    @Transactional(readOnly = true)
+    public List<Area> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(Area.ID, ids);
+        List<Area> areaList = areaMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(areaList)) {
+            return new ArrayList<>(0);
+        }
+        return areaList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, Area> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<Area> areaList = listByIds(ids);
+        if (CollectionUtils.isEmpty(areaList)) {
+            return new HashMap<>(0);
+        }
+
+        return areaList.stream().collect(Collectors.toMap(Area::getId, area -> area));
+    }
+
+    @Transactional(readOnly = true)
+    public List<Area> listAll() {
+
+        return areaMapper.selectAll();
+    }
+}

+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.CImprovementSummaryDTO;
+import com.qgutech.qgyun.apaas.sync.cps.enums.QuarterEnum;
+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.CImprovement;
+import com.qgutech.qgyun.apaas.sync.cps.model.CImprovementTarget;
+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.Workshop;
+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.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * CImprovement 服务
+ */
+@Service
+public class CImprovementService extends BaseServiceImpl<CImprovement> {
+
+    @Resource
+    private CImprovementMapper cImprovementMapper;
+
+    @Resource
+    private CImprovementTargetMapper cImprovementTargetMapper;
+
+    @Resource
+    private QuarterPersonnelService quarterPersonnelService;
+
+    @Resource
+    private RoomGroupService roomGroupService;
+
+    @Resource
+    private WorkshopService workshopService;
+
+    @Transactional(readOnly = true)
+    public CImprovement getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(CImprovement.ID, id);
+        CImprovement cImprovement = cImprovementMapper.selectOneByExample(example);
+        if (null == cImprovement) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return cImprovement;
+    }
+
+    @Transactional(readOnly = true)
+    public List<CImprovement> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(CImprovement.ID, ids);
+        List<CImprovement> cImprovementList = cImprovementMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(cImprovementList)) {
+            return new ArrayList<>(0);
+        }
+        return cImprovementList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, CImprovement> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<CImprovement> cImprovementList = listByIds(ids);
+        if (CollectionUtils.isEmpty(cImprovementList)) {
+            return new HashMap<>(0);
+        }
+
+        return cImprovementList.stream().collect(Collectors.toMap(CImprovement::getId, cImprovement -> cImprovement));
+    }
+
+    @Transactional(readOnly = true)
+    public List<CImprovement> listAll() {
+
+        return cImprovementMapper.selectAll();
+    }
+
+    /**
+     * 根据年份和季度查询C类改善汇总（按单位车间分组）
+     * <p>
+     * 年份为空时默认查询当前年，季度必传
+     *
+     * @param year    年份，格式：yyyy，可为空
+     * @param quarter 季度枚举值（#1#-#4#），必传
+     * @return C类改善汇总列表
+     */
+    @Transactional(readOnly = true)
+    public List<CImprovementSummaryDTO> summaryByYearAndQuarter(String year, String quarter) {
+        // 1. 校验季度参数
+        Assert.hasLength(quarter, "quarter is empty!");
+        QuarterEnum quarterEnum = QuarterEnum.fromCode(quarter);
+        Assert.notNull(quarterEnum, "quarter format is invalid!");
+
+        // 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!");
+
+        // 3. 计算季度的开始时间和结束时间
+        Date startTime = parseQuarterStartTime(queryYear, quarterEnum);
+        Date endTime = parseQuarterEndTime(queryYear, quarterEnum);
+
+        // 4. 查询该季度时间范围内的C类改善记录
+        Example example = new Example(CImprovement.class);
+        example.createCriteria()
+                .andBetween("createTime", startTime, endTime);
+        List<CImprovement> cImprovementList = cImprovementMapper.selectByExample(example);
+
+        // 5. 查询该年份季度的季度人员信息
+        Date yearStartTime = parseYearStartTime(queryYear);
+        List<QuarterPersonnel> quarterPersonnelList = quarterPersonnelService.listByYearAndQuarter(yearStartTime, quarter);
+
+        if (CollectionUtils.isEmpty(quarterPersonnelList)) {
+            return new ArrayList<>(0);
+        }
+
+        // 6. 构建人员工号到季度人员信息的映射
+        Map<String, QuarterPersonnel> personnelMap = quarterPersonnelList.stream()
+                .filter(item -> item.getRygh() != null)
+                .collect(Collectors.toMap(
+                        QuarterPersonnel::getRygh,
+                        item -> item,
+                        (v1, v2) -> v1
+                ));
+
+        // 7. 按室组分组统计总人数
+        Map<String, Long> roomGroupPersonnelCountMap = quarterPersonnelList.stream()
+                .filter(item -> item.getShsz() != null)
+                .collect(Collectors.groupingBy(
+                        QuarterPersonnel::getShsz,
+                        Collectors.counting()
+                ));
+
+        // 8. 统计每个室组有C类改善记录的人数（同一人多条记录算一次）
+        // 先获取有改善记录的发起人工号集合
+        Set<String> improvementFqrSet = 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);
+            if (personnel != null && personnel.getShsz() != null) {
+                roomGroupImprovementPersonnelMap.computeIfAbsent(personnel.getShsz(), k -> new HashSet<>()).add(fqr);
+            }
+        }
+
+        // 9. 查询该年份的C类目标信息（按室组维度）
+        Example targetExample = new Example(CImprovementTarget.class);
+        targetExample.createCriteria()
+                .andEqualTo("year", yearStartTime);
+        List<CImprovementTarget> targetList = cImprovementTargetMapper.selectByExample(targetExample);
+
+        // 构建目标值映射Map：szxx（室组） -> mb
+        Map<String, Double> targetMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(targetList)) {
+            targetMap = targetList.stream()
+                    .filter(item -> item.getSzxx() != null && item.getMb() != null)
+                    .collect(Collectors.toMap(
+                            CImprovementTarget::getSzxx,
+                            CImprovementTarget::getMb,
+                            (v1, v2) -> v1
+                    ));
+        }
+
+        // 10. 查询室组详细信息（室组名称、所属单位）
+        Set<String> roomGroupIds = roomGroupPersonnelCountMap.keySet();
+        Map<String, RoomGroup> roomGroupMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(roomGroupIds)) {
+            roomGroupMap = roomGroupService.mapByIds(roomGroupIds);
+        }
+
+        // 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);
+        }
+
+        // 12. 组装汇总结果（按室组维度）
+        Map<String, Double> finalTargetMap = targetMap;
+        Map<String, RoomGroup> finalRoomGroupMap = roomGroupMap;
+        Map<String, Workshop> finalWorkshopMap = workshopMap;
+        String finalQueryYear = queryYear;
+        return roomGroupPersonnelCountMap.entrySet().stream()
+                .map(entry -> {
+                    String szxx = entry.getKey();
+                    int totalPersonnel = entry.getValue().intValue();
+                    int improvementPersonnel = roomGroupImprovementPersonnelMap.getOrDefault(szxx, Collections.emptySet()).size();
+
+                    CImprovementSummaryDTO dto = new CImprovementSummaryDTO();
+                    dto.setSzxx(szxx);
+                    dto.setYear(finalQueryYear);
+                    dto.setQuarter(quarter);
+                    dto.setQuarterDesc(quarterEnum.getDesc());
+                    dto.setTotalPersonnel(totalPersonnel);
+                    dto.setImprovementPersonnel(improvementPersonnel);
+                    // 目标值按室组维度匹配
+                    dto.setMb(finalTargetMap.get(szxx));
+
+                    // 设置室组名称及所属单位车间信息
+                    RoomGroup roomGroup = finalRoomGroupMap.get(szxx);
+                    if (roomGroup != null) {
+                        dto.setSzmc(roomGroup.getSzmc());
+                        String dwcj = roomGroup.getSsdw();
+                        dto.setDwcj(dwcj);
+                        Workshop workshop = finalWorkshopMap.get(dwcj);
+                        if (workshop != null) {
+                            dto.setDwcjName(workshop.getDwmc());
+                        }
+                    }
+
+                    // 计算发起率
+                    if (totalPersonnel > 0) {
+                        dto.setImprovementRate(Math.round((double) improvementPersonnel / totalPersonnel * 10000) / 100.0);
+                    }
+
+                    return dto;
+                })
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 解析年份开始时间
+     */
+    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, "年份格式错误");
+        }
+    }
+
+    /**
+     * 解析季度开始时间
+     */
+    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, "季度日期格式错误");
+        }
+    }
+
+    /**
+     * 解析季度结束时间
+     */
+    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, "季度日期格式错误");
+        }
+    }
+}

+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.mapper.CpsProblemMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.CpsProblem;
+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;
+
+/**
+ * CpsProblem 服务
+ */
+@Service
+public class CpsProblemService extends BaseServiceImpl<CpsProblem> {
+
+    @Resource
+    private CpsProblemMapper cpsProblemMapper;
+
+    @Transactional(readOnly = true)
+    public CpsProblem getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(CpsProblem.ID, id);
+        CpsProblem cpsProblem = cpsProblemMapper.selectOneByExample(example);
+        if (null == cpsProblem) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return cpsProblem;
+    }
+
+    @Transactional(readOnly = true)
+    public List<CpsProblem> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(CpsProblem.ID, ids);
+        List<CpsProblem> cpsProblemList = cpsProblemMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(cpsProblemList)) {
+            return new ArrayList<>(0);
+        }
+        return cpsProblemList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, CpsProblem> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<CpsProblem> cpsProblemList = listByIds(ids);
+        if (CollectionUtils.isEmpty(cpsProblemList)) {
+            return new HashMap<>(0);
+        }
+
+        return cpsProblemList.stream().collect(Collectors.toMap(CpsProblem::getId, cpsProblem -> cpsProblem));
+    }
+
+    @Transactional(readOnly = true)
+    public List<CpsProblem> listAll() {
+
+        return cpsProblemMapper.selectAll();
+    }
+}

+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.mapper.PersonnelMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.Personnel;
+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;
+
+/**
+ * Personnel 服务
+ */
+@Service
+public class PersonnelService extends BaseServiceImpl<Personnel> {
+
+    @Resource
+    private PersonnelMapper personnelMapper;
+
+    @Transactional(readOnly = true)
+    public Personnel getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(Personnel.ID, id);
+        Personnel personnel = personnelMapper.selectOneByExample(example);
+        if (null == personnel) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return personnel;
+    }
+
+    @Transactional(readOnly = true)
+    public List<Personnel> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(Personnel.ID, ids);
+        List<Personnel> personnelList = personnelMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(personnelList)) {
+            return new ArrayList<>(0);
+        }
+        return personnelList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, Personnel> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<Personnel> personnelList = listByIds(ids);
+        if (CollectionUtils.isEmpty(personnelList)) {
+            return new HashMap<>(0);
+        }
+
+        return personnelList.stream().collect(Collectors.toMap(Personnel::getId, personnel -> personnel));
+    }
+
+    @Transactional(readOnly = true)
+    public List<Personnel> listAll() {
+
+        return personnelMapper.selectAll();
+    }
+}

+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.mapper.PjoBatchMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.PjoBatch;
+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;
+
+/**
+ * PjoBatch 服务
+ */
+@Service
+public class PjoBatchService extends BaseServiceImpl<PjoBatch> {
+
+    @Resource
+    private PjoBatchMapper pjoBatchMapper;
+
+    @Transactional(readOnly = true)
+    public PjoBatch getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(PjoBatch.ID, id);
+        PjoBatch pjoBatch = pjoBatchMapper.selectOneByExample(example);
+        if (null == pjoBatch) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return pjoBatch;
+    }
+
+    @Transactional(readOnly = true)
+    public List<PjoBatch> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(PjoBatch.ID, ids);
+        List<PjoBatch> pjoBatchList = pjoBatchMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(pjoBatchList)) {
+            return new ArrayList<>(0);
+        }
+        return pjoBatchList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, PjoBatch> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<PjoBatch> pjoBatchList = listByIds(ids);
+        if (CollectionUtils.isEmpty(pjoBatchList)) {
+            return new HashMap<>(0);
+        }
+
+        return pjoBatchList.stream().collect(Collectors.toMap(PjoBatch::getId, pjoBatch -> pjoBatch));
+    }
+
+    @Transactional(readOnly = true)
+    public List<PjoBatch> listAll() {
+
+        return pjoBatchMapper.selectAll();
+    }
+}

+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.mapper.PjoExecMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.PjoExec;
+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;
+
+/**
+ * PjoExec 服务
+ */
+@Service
+public class PjoExecService extends BaseServiceImpl<PjoExec> {
+
+    @Resource
+    private PjoExecMapper pjoExecMapper;
+
+    @Transactional(readOnly = true)
+    public PjoExec getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(PjoExec.ID, id);
+        PjoExec pjoExec = pjoExecMapper.selectOneByExample(example);
+        if (null == pjoExec) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return pjoExec;
+    }
+
+    @Transactional(readOnly = true)
+    public List<PjoExec> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(PjoExec.ID, ids);
+        List<PjoExec> pjoExecList = pjoExecMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(pjoExecList)) {
+            return new ArrayList<>(0);
+        }
+        return pjoExecList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, PjoExec> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<PjoExec> pjoExecList = listByIds(ids);
+        if (CollectionUtils.isEmpty(pjoExecList)) {
+            return new HashMap<>(0);
+        }
+
+        return pjoExecList.stream().collect(Collectors.toMap(PjoExec::getId, pjoExec -> pjoExec));
+    }
+
+    @Transactional(readOnly = true)
+    public List<PjoExec> listAll() {
+
+        return pjoExecMapper.selectAll();
+    }
+}

+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.mapper.PjoWorkstationExecMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.PjoWorkstationExec;
+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;
+
+/**
+ * PjoWorkstationExec 服务
+ */
+@Service
+public class PjoWorkstationExecService extends BaseServiceImpl<PjoWorkstationExec> {
+
+    @Resource
+    private PjoWorkstationExecMapper pjoWorkstationExecMapper;
+
+    @Transactional(readOnly = true)
+    public PjoWorkstationExec getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(PjoWorkstationExec.ID, id);
+        PjoWorkstationExec pjoWorkstationExec = pjoWorkstationExecMapper.selectOneByExample(example);
+        if (null == pjoWorkstationExec) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return pjoWorkstationExec;
+    }
+
+    @Transactional(readOnly = true)
+    public List<PjoWorkstationExec> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(PjoWorkstationExec.ID, ids);
+        List<PjoWorkstationExec> pjoWorkstationExecList = pjoWorkstationExecMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(pjoWorkstationExecList)) {
+            return new ArrayList<>(0);
+        }
+        return pjoWorkstationExecList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, PjoWorkstationExec> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<PjoWorkstationExec> pjoWorkstationExecList = listByIds(ids);
+        if (CollectionUtils.isEmpty(pjoWorkstationExecList)) {
+            return new HashMap<>(0);
+        }
+
+        return pjoWorkstationExecList.stream().collect(Collectors.toMap(PjoWorkstationExec::getId, pjoWorkstationExec -> pjoWorkstationExec));
+    }
+
+    @Transactional(readOnly = true)
+    public List<PjoWorkstationExec> listAll() {
+
+        return pjoWorkstationExecMapper.selectAll();
+    }
+}

+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.mapper.ProcessConfirmExecMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.ProcessConfirmExec;
+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;
+
+/**
+ * ProcessConfirmExec 服务
+ */
+@Service
+public class ProcessConfirmExecService extends BaseServiceImpl<ProcessConfirmExec> {
+
+    @Resource
+    private ProcessConfirmExecMapper processConfirmExecMapper;
+
+    @Transactional(readOnly = true)
+    public ProcessConfirmExec getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(ProcessConfirmExec.ID, id);
+        ProcessConfirmExec processConfirmExec = processConfirmExecMapper.selectOneByExample(example);
+        if (null == processConfirmExec) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return processConfirmExec;
+    }
+
+    @Transactional(readOnly = true)
+    public List<ProcessConfirmExec> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(ProcessConfirmExec.ID, ids);
+        List<ProcessConfirmExec> processConfirmExecList = processConfirmExecMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(processConfirmExecList)) {
+            return new ArrayList<>(0);
+        }
+        return processConfirmExecList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, ProcessConfirmExec> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<ProcessConfirmExec> processConfirmExecList = listByIds(ids);
+        if (CollectionUtils.isEmpty(processConfirmExecList)) {
+            return new HashMap<>(0);
+        }
+
+        return processConfirmExecList.stream().collect(Collectors.toMap(ProcessConfirmExec::getId, processConfirmExec -> processConfirmExec));
+    }
+
+    @Transactional(readOnly = true)
+    public List<ProcessConfirmExec> listAll() {
+
+        return processConfirmExecMapper.selectAll();
+    }
+}

+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.mapper.ProcessConfirmPersonnelMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.ProcessConfirmPersonnel;
+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;
+
+/**
+ * ProcessConfirmPersonnel 服务
+ */
+@Service
+public class ProcessConfirmPersonnelService extends BaseServiceImpl<ProcessConfirmPersonnel> {
+
+    @Resource
+    private ProcessConfirmPersonnelMapper processConfirmPersonnelMapper;
+
+    @Transactional(readOnly = true)
+    public ProcessConfirmPersonnel getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(ProcessConfirmPersonnel.ID, id);
+        ProcessConfirmPersonnel processConfirmPersonnel = processConfirmPersonnelMapper.selectOneByExample(example);
+        if (null == processConfirmPersonnel) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return processConfirmPersonnel;
+    }
+
+    @Transactional(readOnly = true)
+    public List<ProcessConfirmPersonnel> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(ProcessConfirmPersonnel.ID, ids);
+        List<ProcessConfirmPersonnel> processConfirmPersonnelList = processConfirmPersonnelMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(processConfirmPersonnelList)) {
+            return new ArrayList<>(0);
+        }
+        return processConfirmPersonnelList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, ProcessConfirmPersonnel> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<ProcessConfirmPersonnel> processConfirmPersonnelList = listByIds(ids);
+        if (CollectionUtils.isEmpty(processConfirmPersonnelList)) {
+            return new HashMap<>(0);
+        }
+
+        return processConfirmPersonnelList.stream().collect(Collectors.toMap(ProcessConfirmPersonnel::getId, processConfirmPersonnel -> processConfirmPersonnel));
+    }
+
+    @Transactional(readOnly = true)
+    public List<ProcessConfirmPersonnel> listAll() {
+
+        return processConfirmPersonnelMapper.selectAll();
+    }
+}

+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.mapper.QuarterPersonnelMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.QuarterPersonnel;
+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;
+
+/**
+ * QuarterPersonnel 服务
+ */
+@Service
+public class QuarterPersonnelService extends BaseServiceImpl<QuarterPersonnel> {
+
+    @Resource
+    private QuarterPersonnelMapper quarterPersonnelMapper;
+
+    @Transactional(readOnly = true)
+    public QuarterPersonnel getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(QuarterPersonnel.ID, id);
+        QuarterPersonnel quarterPersonnel = quarterPersonnelMapper.selectOneByExample(example);
+        if (null == quarterPersonnel) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return quarterPersonnel;
+    }
+
+    @Transactional(readOnly = true)
+    public List<QuarterPersonnel> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(QuarterPersonnel.ID, ids);
+        List<QuarterPersonnel> quarterPersonnelList = quarterPersonnelMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(quarterPersonnelList)) {
+            return new ArrayList<>(0);
+        }
+        return quarterPersonnelList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, QuarterPersonnel> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<QuarterPersonnel> quarterPersonnelList = listByIds(ids);
+        if (CollectionUtils.isEmpty(quarterPersonnelList)) {
+            return new HashMap<>(0);
+        }
+
+        return quarterPersonnelList.stream().collect(Collectors.toMap(QuarterPersonnel::getId, quarterPersonnel -> quarterPersonnel));
+    }
+
+    @Transactional(readOnly = true)
+    public List<QuarterPersonnel> listAll() {
+
+        return quarterPersonnelMapper.selectAll();
+    }
+
+    /**
+     * 根据年份和季度查询季度人员信息
+     *
+     * @param yearStartTime 年份开始时间
+     * @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!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria()
+                .andEqualTo("year", yearStartTime)
+                .andEqualTo("jdxx", quarter);
+        List<QuarterPersonnel> quarterPersonnelList = quarterPersonnelMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(quarterPersonnelList)) {
+            return new ArrayList<>(0);
+        }
+        return quarterPersonnelList;
+    }
+}

+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.mapper.RoomGroupMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.RoomGroup;
+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;
+
+/**
+ * RoomGroup 服务
+ */
+@Service
+public class RoomGroupService extends BaseServiceImpl<RoomGroup> {
+
+    @Resource
+    private RoomGroupMapper roomGroupMapper;
+
+    @Transactional(readOnly = true)
+    public RoomGroup getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(RoomGroup.ID, id);
+        RoomGroup roomGroup = roomGroupMapper.selectOneByExample(example);
+        if (null == roomGroup) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return roomGroup;
+    }
+
+    @Transactional(readOnly = true)
+    public List<RoomGroup> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(RoomGroup.ID, ids);
+        List<RoomGroup> roomGroupList = roomGroupMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(roomGroupList)) {
+            return new ArrayList<>(0);
+        }
+        return roomGroupList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, RoomGroup> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<RoomGroup> roomGroupList = listByIds(ids);
+        if (CollectionUtils.isEmpty(roomGroupList)) {
+            return new HashMap<>(0);
+        }
+
+        return roomGroupList.stream().collect(Collectors.toMap(RoomGroup::getId, roomGroup -> roomGroup));
+    }
+
+    @Transactional(readOnly = true)
+    public List<RoomGroup> listAll() {
+
+        return roomGroupMapper.selectAll();
+    }
+}

+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.mapper.ShiftMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.Shift;
+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;
+
+/**
+ * Shift 服务
+ */
+@Service
+public class ShiftService extends BaseServiceImpl<Shift> {
+
+    @Resource
+    private ShiftMapper shiftMapper;
+
+    @Transactional(readOnly = true)
+    public Shift getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(Shift.ID, id);
+        Shift shift = shiftMapper.selectOneByExample(example);
+        if (null == shift) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return shift;
+    }
+
+    @Transactional(readOnly = true)
+    public List<Shift> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(Shift.ID, ids);
+        List<Shift> shiftList = shiftMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(shiftList)) {
+            return new ArrayList<>(0);
+        }
+        return shiftList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, Shift> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<Shift> shiftList = listByIds(ids);
+        if (CollectionUtils.isEmpty(shiftList)) {
+            return new HashMap<>(0);
+        }
+
+        return shiftList.stream().collect(Collectors.toMap(Shift::getId, shift -> shift));
+    }
+
+    @Transactional(readOnly = true)
+    public List<Shift> listAll() {
+
+        return shiftMapper.selectAll();
+    }
+}

+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.mapper.StdActivityCaseMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.StdActivityCase;
+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;
+
+/**
+ * StdActivityCase 服务
+ */
+@Service
+public class StdActivityCaseService extends BaseServiceImpl<StdActivityCase> {
+
+    @Resource
+    private StdActivityCaseMapper stdActivityCaseMapper;
+
+    @Transactional(readOnly = true)
+    public StdActivityCase getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(StdActivityCase.ID, id);
+        StdActivityCase stdActivityCase = stdActivityCaseMapper.selectOneByExample(example);
+        if (null == stdActivityCase) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return stdActivityCase;
+    }
+
+    @Transactional(readOnly = true)
+    public List<StdActivityCase> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(StdActivityCase.ID, ids);
+        List<StdActivityCase> stdActivityCaseList = stdActivityCaseMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(stdActivityCaseList)) {
+            return new ArrayList<>(0);
+        }
+        return stdActivityCaseList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, StdActivityCase> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<StdActivityCase> stdActivityCaseList = listByIds(ids);
+        if (CollectionUtils.isEmpty(stdActivityCaseList)) {
+            return new HashMap<>(0);
+        }
+
+        return stdActivityCaseList.stream().collect(Collectors.toMap(StdActivityCase::getId, stdActivityCase -> stdActivityCase));
+    }
+
+    @Transactional(readOnly = true)
+    public List<StdActivityCase> listAll() {
+
+        return stdActivityCaseMapper.selectAll();
+    }
+}

+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.mapper.TeamMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.Team;
+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;
+
+/**
+ * Team 服务
+ */
+@Service
+public class TeamService extends BaseServiceImpl<Team> {
+
+    @Resource
+    private TeamMapper teamMapper;
+
+    @Transactional(readOnly = true)
+    public Team getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(Team.ID, id);
+        Team team = teamMapper.selectOneByExample(example);
+        if (null == team) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return team;
+    }
+
+    @Transactional(readOnly = true)
+    public List<Team> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(Team.ID, ids);
+        List<Team> teamList = teamMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(teamList)) {
+            return new ArrayList<>(0);
+        }
+        return teamList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, Team> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<Team> teamList = listByIds(ids);
+        if (CollectionUtils.isEmpty(teamList)) {
+            return new HashMap<>(0);
+        }
+
+        return teamList.stream().collect(Collectors.toMap(Team::getId, team -> team));
+    }
+
+    @Transactional(readOnly = true)
+    public List<Team> listAll() {
+
+        return teamMapper.selectAll();
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.service;
+
+import com.qgutech.qgyun.apaas.sync.base.BoErrorCode;
+import com.qgutech.qgyun.apaas.sync.base.BoException;
+import com.qgutech.qgyun.apaas.sync.cps.mapper.WorkshopMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.Workshop;
+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 WorkshopService extends BaseServiceImpl<Workshop> {
+
+    @Resource
+    private WorkshopMapper workshopMapper;
+
+    @Transactional(readOnly = true)
+    public Workshop getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(Workshop.ID, id);
+        Workshop workshop = workshopMapper.selectOneByExample(example);
+        if (null == workshop) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return workshop;
+    }
+
+    @Transactional(readOnly = true)
+    public List<Workshop> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(Workshop.ID, ids);
+        List<Workshop> workshopList = workshopMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(workshopList)) {
+            return new ArrayList<>(0);
+        }
+        return workshopList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, Workshop> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<Workshop> workshopList = listByIds(ids);
+        if (CollectionUtils.isEmpty(workshopList)) {
+            return new HashMap<>(0);
+        }
+
+        return workshopList.stream().collect(Collectors.toMap(Workshop::getId, workshop -> workshop));
+    }
+
+    @Transactional(readOnly = true)
+    public List<Workshop> listAll() {
+
+        return workshopMapper.selectAll();
+    }
+}

+package com.qgutech.qgyun.apaas.sync.cps.service;
+
+import com.qgutech.qgyun.apaas.sync.base.BoErrorCode;
+import com.qgutech.qgyun.apaas.sync.base.BoException;
+import com.qgutech.qgyun.apaas.sync.cps.mapper.WorkstationMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.Workstation;
+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;
+
+/**
+ * Workstation 服务
+ */
+@Service
+public class WorkstationService extends BaseServiceImpl<Workstation> {
+
+    @Resource
+    private WorkstationMapper workstationMapper;
+
+    @Transactional(readOnly = true)
+    public Workstation getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(Workstation.ID, id);
+        Workstation workstation = workstationMapper.selectOneByExample(example);
+        if (null == workstation) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return workstation;
+    }
+
+    @Transactional(readOnly = true)
+    public List<Workstation> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(Workstation.ID, ids);
+        List<Workstation> workstationList = workstationMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(workstationList)) {
+            return new ArrayList<>(0);
+        }
+        return workstationList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, Workstation> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<Workstation> workstationList = listByIds(ids);
+        if (CollectionUtils.isEmpty(workstationList)) {
+            return new HashMap<>(0);
+        }
+
+        return workstationList.stream().collect(Collectors.toMap(Workstation::getId, workstation -> workstation));
+    }
+
+    @Transactional(readOnly = true)
+    public List<Workstation> listAll() {
+
+        return workstationMapper.selectAll();
+    }
+}

+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.mapper.XtLineMapper;
+import com.qgutech.qgyun.apaas.sync.cps.model.XtLine;
+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;
+
+/**
+ * XtLine 服务
+ */
+@Service
+public class XtLineService extends BaseServiceImpl<XtLine> {
+
+    @Resource
+    private XtLineMapper xtLineMapper;
+
+    @Transactional(readOnly = true)
+    public XtLine getById(String id) {
+        Assert.hasLength(id, "id is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andEqualTo(XtLine.ID, id);
+        XtLine xtLine = xtLineMapper.selectOneByExample(example);
+        if (null == xtLine) {
+            throw new BoException(BoErrorCode.DATA_ERROR);
+        }
+        return xtLine;
+    }
+
+    @Transactional(readOnly = true)
+    public List<XtLine> listByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        Example example = new Example(entityClass);
+        example.createCriteria().andIn(XtLine.ID, ids);
+        List<XtLine> xtLineList = xtLineMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(xtLineList)) {
+            return new ArrayList<>(0);
+        }
+        return xtLineList;
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, XtLine> mapByIds(Collection<String> ids) {
+        Assert.notEmpty(ids, "ids is empty!");
+
+        List<XtLine> xtLineList = listByIds(ids);
+        if (CollectionUtils.isEmpty(xtLineList)) {
+            return new HashMap<>(0);
+        }
+
+        return xtLineList.stream().collect(Collectors.toMap(XtLine::getId, xtLine -> xtLine));
+    }
+
+    @Transactional(readOnly = true)
+    public List<XtLine> listAll() {
+
+        return xtLineMapper.selectAll();
+    }
+}

+package com.qgutech.qgyun.apaas.sync.filter;
+
+import com.qgutech.qgyun.framework.common.context.ContextHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Slf4j
+@Component
+@WebFilter(urlPatterns = {"/*"})
+@Order(value = 1)
+public class ExecutionContextFilter implements Filter {
+    @Value("${qx-apaas-sync.env:dev}")
+    private String env;
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException {
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        HttpServletResponse response = (HttpServletResponse) servletResponse;
+        String userId = request.getParameter("userId");
+
+        ContextHandler.setCorpCode("hfca");
+        ContextHandler.setUserId("");
+        if (StringUtils.isNotBlank(userId)) {
+            ContextHandler.setUserId(userId);
+        }
+
+        chain.doFilter(request, response);
+    }
+
+    @Override
+    public void destroy() {
+    }
+}

+package com.qgutech.qgyun.apaas.sync.filter;
+
+import com.qgutech.qgyun.framework.common.context.ContextHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Slf4j
+public class MyInterceptor implements HandlerInterceptor {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        if (StringUtils.isBlank(ContextHandler.getUserId())) {
+            String userId = request.getParameter("userId");
+            if (StringUtils.isNotBlank(userId)) {
+                ContextHandler.setUserId(userId);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+    }
+}

+package com.qgutech.qgyun.apaas.sync.filter;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new MyInterceptor()).addPathPatterns("/**").excludePathPatterns("/static/**");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+}

+package com.qgutech.qgyun.apaas.sync.utils;
+
+import com.qgutech.qgyun.apaas.sync.base.BoErrorCode;
+import com.qgutech.qgyun.apaas.sync.base.BoException;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateDealUtils {
+
+    /**
+     * 解析年份开始时间
+     */
+    public static 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, "年份格式错误");
+        }
+    }
+
+    /**
+     * 解析年份结束时间
+     */
+    public static Date parseYearEndTime(String year) {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            return sdf.parse(year + "-12-31 23:59:59");
+        } catch (ParseException e) {
+            throw new BoException(BoErrorCode.PARAM_ERROR, "年份格式错误");
+        }
+    }
+}

@@ -4,6 +4,35 @@ server:
 spring:
 spring:
   application:
   application:
     name: qx-apaas-sync
     name: qx-apaas-sync
+  datasource:
+    url: jdbc:mysql://10.9.0.128:3306/qixiao-apaas?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    username: guohao
+    password: Guohao@2026.com
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.mysql.jdbc.Driver
+    initialSize: 5
+    minIdle: 5
+    maxActive: 20
+    maxWait: 60000
+    filters: stat,wall,log4j
+    useGlobalDataSourceStat: true
+
+mybatis:
+  type-aliases-package: com.qgutech.qgyun.apaas.sync.cps.model
+  handler:
+    enable: true
+    rootPath: com/qgutech
+    locationPattern: /**/cenum
+mapper:
+  enumAsSimpleType: true
+
+busi.base:
+  cropCode: hfca
+  createBy: admin
+  superAdminId: admin
+
+qx-apaas-sync:
+  env: dev
 
 
 logging:
 logging:
   path: ./logs
   path: ./logs