1.23新增功能

pom.xml

@@ -180,6 +180,7 @@
         <module>qianhe-quartz</module>
         <module>qianhe-quartz</module>
         <module>qianhe-generator</module>
         <module>qianhe-generator</module>
         <module>qianhe-common</module>
         <module>qianhe-common</module>
+        <module>qianhe-gzpt</module>
     </modules>
     </modules>
     <packaging>pom</packaging>
     <packaging>pom</packaging>
 
 

qianhe-admin/pom.xml

@@ -61,6 +61,13 @@
             <artifactId>qianhe-generator</artifactId>
             <artifactId>qianhe-generator</artifactId>
         </dependency>
         </dependency>
 
 
+        <!-- 工作平台-->
+        <dependency>
+            <groupId>com.qianhe</groupId>
+            <artifactId>qianhe-gzpt</artifactId>
+            <version>3.8.5</version>
+        </dependency>
+
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>

qianhe-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
         druid:
             # 主库数据源
             # 主库数据源
             master:
             master:
-                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://1.116.38.25:3986/qianhe_gzpt?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useOldAliasMetadataBehavior=true
                 username: root
                 username: root
-                password: password
+                password: qianhe2022
             # 从库数据源
             # 从库数据源
             slave:
             slave:
                 # 从数据源开关/默认关闭
                 # 从数据源开关/默认关闭

qianhe-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 # 开发环境配置
 server:
 server:
   # 服务器的HTTP端口，默认为8080
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 8899
   servlet:
   servlet:
     # 应用的访问路径
     # 应用的访问路径
     context-path: /
     context-path: /
@@ -36,7 +36,7 @@ server:
 # 日志配置
 # 日志配置
 logging:
 logging:
   level:
   level:
-    com.ruoyi: debug
+    com.qianhe: debug
     org.springframework: warn
     org.springframework: warn
 
 
 # 用户配置
 # 用户配置
@@ -69,14 +69,22 @@ spring:
       enabled: true
       enabled: true
   # redis 配置
   # redis 配置
   redis:
   redis:
+#    # 地址
+#    host: 127.0.0.1
+#    # 端口，默认为6379
+#    port: 6379
+#    # 数据库索引
+#    database: 0
+#    # 密码
+#    password:
     # 地址
     # 地址
-    host: localhost
+    host: 1.116.38.25
     # 端口，默认为6379
     # 端口，默认为6379
-    port: 6379
+    port: 7789
     # 数据库索引
     # 数据库索引
-    database: 0
+    database: 3
     # 密码
     # 密码
-    password:
+    password: qianheRedis2021
     # 连接超时时间
     # 连接超时时间
     timeout: 10s
     timeout: 10s
     lettuce:
     lettuce:

qianhe-admin/src/main/resources/mybatis/mybatis-config.xml

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
 		<!-- 指定 MyBatis 所用日志的具体实现 -->
 		<!-- 指定 MyBatis 所用日志的具体实现 -->
         <setting name="logImpl"                  value="SLF4J"  />
         <setting name="logImpl"                  value="SLF4J"  />
         <!-- 使用驼峰命名法转换字段 -->
         <!-- 使用驼峰命名法转换字段 -->
-		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
+		 <setting name="mapUnderscoreToCamelCase" value="true"/>
 	</settings>
 	</settings>
 
 
 </configuration>
 </configuration>

qianhe-common/pom.xml

@@ -126,6 +126,18 @@
             <artifactId>javax.servlet-api</artifactId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
         </dependency>
 
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!-- hutool -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.16</version>
+        </dependency>
+
     </dependencies>
     </dependencies>
 
 
 </project>
 </project>

qianhe-gzpt/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>qianhe</artifactId>
+        <groupId>com.qianhe</groupId>
+        <version>3.8.5</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>qianhe-gzpt</artifactId>
+
+    <description>
+        工作平台模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.qianhe</groupId>
+            <artifactId>qianhe-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.qianhe</groupId>
+            <artifactId>qianhe-system</artifactId>
+        </dependency>
+
+    </dependencies>
+
+
+</project>

qianhe-gzpt/src/main/java/com/qianhe/controller/WorkJdController.java

+package com.qianhe.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.qianhe.common.annotation.Log;
+import com.qianhe.common.core.controller.BaseController;
+import com.qianhe.common.core.domain.AjaxResult;
+import com.qianhe.common.enums.BusinessType;
+import com.qianhe.domain.WorkJd;
+import com.qianhe.service.IWorkJdService;
+import com.qianhe.common.utils.poi.ExcelUtil;
+import com.qianhe.common.core.page.TableDataInfo;
+
+/**
+ * 节点Controller
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+@RestController
+@RequestMapping("/work/jd")
+public class WorkJdController extends BaseController
+{
+    @Autowired
+    private IWorkJdService workJdService;
+
+    /**
+     * 查询节点列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(WorkJd workJd)
+    {
+        startPage();
+        List<WorkJd> list = workJdService.selectWorkJdList(workJd);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出节点列表
+     */
+    @Log(title = "节点", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, WorkJd workJd)
+    {
+        List<WorkJd> list = workJdService.selectWorkJdList(workJd);
+        ExcelUtil<WorkJd> util = new ExcelUtil<WorkJd>(WorkJd.class);
+        util.exportExcel(response, list, "节点数据");
+    }
+
+    /**
+     * 获取节点详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(workJdService.selectWorkJdById(id));
+    }
+
+    /**
+     * 新增节点
+     */
+    @Log(title = "节点", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody WorkJd workJd)
+    {
+        return toAjax(workJdService.insertWorkJd(workJd));
+    }
+
+    /**
+     * 修改节点
+     */
+    @Log(title = "节点", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody WorkJd workJd)
+    {
+        return toAjax(workJdService.updateWorkJd(workJd));
+    }
+
+    /**
+     * 删除节点
+     */
+    @Log(title = "节点", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(workJdService.deleteWorkJdByIds(ids));
+    }
+
+    /**
+     * 用户下拉框
+     */
+    @GetMapping("/getUserList")
+    public AjaxResult getUserList(){
+        return AjaxResult.success(workJdService.getUserList());
+    }
+
+}

qianhe-gzpt/src/main/java/com/qianhe/controller/WorkXmController.java

+package com.qianhe.controller;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+
+import com.qianhe.domain.WorkXmcb;
+import com.qianhe.service.IWorkXmcbService;
+import com.qianhe.vo.WorkXmTjVo;
+import com.qianhe.vo.WorkXmVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.qianhe.common.annotation.Log;
+import com.qianhe.common.core.controller.BaseController;
+import com.qianhe.common.core.domain.AjaxResult;
+import com.qianhe.common.enums.BusinessType;
+import com.qianhe.domain.WorkXm;
+import com.qianhe.service.IWorkXmService;
+import com.qianhe.common.utils.poi.ExcelUtil;
+import com.qianhe.common.core.page.TableDataInfo;
+
+/**
+ * 项目Controller
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+@RestController
+@RequestMapping("/work/xm")
+public class WorkXmController extends BaseController
+{
+    @Autowired
+    private IWorkXmService workXmService;
+    @Autowired
+    private IWorkXmcbService workXmcbService;
+
+    /**
+     * 查询项目列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(WorkXm workXm)
+    {
+        startPage();
+        List<WorkXm> list = workXmService.selectWorkXmList(workXm);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目列表
+     */
+    @Log(title = "项目", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, WorkXm workXm)
+    {
+        List<WorkXm> list = workXmService.selectWorkXmList(workXm);
+        ExcelUtil<WorkXm> util = new ExcelUtil<WorkXm>(WorkXm.class);
+        util.exportExcel(response, list, "项目数据");
+    }
+
+    /**
+     * 获取项目详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(workXmService.selectWorkXmById(id));
+    }
+
+    /**
+     * 新增项目
+     */
+    @Log(title = "项目", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody WorkXm workXm)
+    {
+        return toAjax(workXmService.insertWorkXm(workXm));
+    }
+
+    /**
+     * 修改项目
+     */
+    @Log(title = "项目", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody WorkXm workXm)
+    {
+        return toAjax(workXmService.updateWorkXm(workXm));
+    }
+
+    /**
+     * 删除项目
+     */
+    @Log(title = "项目", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(workXmService.deleteWorkXmByIds(ids));
+    }
+
+    /**
+     * 提交
+     */
+    @PutMapping("/submit/{id}")
+    public AjaxResult submit(@PathVariable Long id){
+        WorkXm workXm = new WorkXm();
+        workXm.setId(id);
+        return toAjax(workXmService.submit(workXm));
+    }
+
+    /**
+     * 项目进度查询列表
+     */
+    @GetMapping("/getXmJdList")
+    public TableDataInfo getXmJdList(WorkXm workXm){
+        //查询已提交的项目
+        workXm.setTjzt("1");
+        List<WorkXm> list = workXmService.selectWorkXmList(workXm);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询进度（分为三块，一块为项目信息，一块为审批历史，一块为进度查看）
+     */
+    @GetMapping("/xmjd/{id}")
+    public AjaxResult getXmInfo(@PathVariable("id") Long id){
+        AjaxResult ajaxResult = AjaxResult.success();
+        SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //查询项目详情
+        WorkXmVo workXmVo = workXmService.getXmInfo(id);
+        //查询审批历史
+        List<WorkXmcb> workXmcbs = workXmcbService.getspls(id);
+        List<Map<String,Object>> list = new ArrayList<>();
+        for (WorkXmcb workXmcb : workXmcbs) {
+            Map<String,Object> map = new HashMap<>();
+            map.put("jd",workXmcb.getShrlx());
+            map.put("shsj",dateFormat.format(workXmcb.getShsj()));
+            list.add(map);
+        }
+        ajaxResult.put("workXm",workXmVo);
+        ajaxResult.put("spls",workXmcbs);
+        ajaxResult.put("jdck",list);
+        return ajaxResult;
+    }
+
+    /**
+     * 工作量统计
+     */
+    @GetMapping("/getGzlTjList")
+    public TableDataInfo getGzlTjList(WorkXmVo workXmVo){
+        startPage();
+        List<WorkXmTjVo> list = workXmService.getGzlTjList(workXmVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出工作量统计
+     */
+    @Log(title = "工作量", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportGzl")
+    public void exportGzl(HttpServletResponse response, WorkXmVo workXmVo)
+    {
+        List<WorkXmTjVo> list = workXmService.getGzlTjList(workXmVo);
+        ExcelUtil<WorkXmTjVo> util = new ExcelUtil<WorkXmTjVo>(WorkXmTjVo.class);
+        util.exportExcel(response, list, "工作量统计");
+    }
+
+}

qianhe-gzpt/src/main/java/com/qianhe/controller/WorkXmcbController.java

+package com.qianhe.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.qianhe.service.IWorkXmService;
+import com.qianhe.vo.WorkXmVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.qianhe.common.annotation.Log;
+import com.qianhe.common.core.controller.BaseController;
+import com.qianhe.common.core.domain.AjaxResult;
+import com.qianhe.common.enums.BusinessType;
+import com.qianhe.domain.WorkXmcb;
+import com.qianhe.service.IWorkXmcbService;
+import com.qianhe.common.utils.poi.ExcelUtil;
+import com.qianhe.common.core.page.TableDataInfo;
+
+/**
+ * 项目从表Controller
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+@RestController
+@RequestMapping("/work/xmcb")
+public class WorkXmcbController extends BaseController
+{
+    @Autowired
+    private IWorkXmcbService workXmcbService;
+    @Autowired
+    private IWorkXmService workXmService;
+
+    /**
+     * 首页-待办已办
+     */
+    @GetMapping("/taskList/{state}")
+    public TableDataInfo taskList(@PathVariable("state") String state, WorkXmVo workXmVo){
+        List<WorkXmVo> list = workXmcbService.taskList(state,workXmVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询详情（分为两块，一块为项目信息，一块为审批历史）
+     */
+    @GetMapping("/xm/{id}")
+    public AjaxResult getXmInfo(@PathVariable("id") Long id){
+        AjaxResult ajaxResult = AjaxResult.success();
+        //查询项目详情
+        WorkXmVo workXmVo = workXmService.getXmInfo(id);
+        //查询审批历史
+        List<WorkXmcb> workXmcbs = workXmcbService.getspls(id);
+        ajaxResult.put("workXm",workXmVo);
+        ajaxResult.put("spls",workXmcbs);
+        return ajaxResult;
+    }
+
+    /**
+     * 办理审核按钮
+     */
+    @PostMapping("/handle")
+    public AjaxResult handle(@RequestBody WorkXmVo workXmVo){
+        return toAjax(workXmcbService.handle(workXmVo));
+    }
+
+    /**
+     * 查询项目从表列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(WorkXmcb workXmcb)
+    {
+        startPage();
+        List<WorkXmcb> list = workXmcbService.selectWorkXmcbList(workXmcb);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目从表列表
+     */
+    @Log(title = "项目从表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, WorkXmcb workXmcb)
+    {
+        List<WorkXmcb> list = workXmcbService.selectWorkXmcbList(workXmcb);
+        ExcelUtil<WorkXmcb> util = new ExcelUtil<WorkXmcb>(WorkXmcb.class);
+        util.exportExcel(response, list, "项目从表数据");
+    }
+
+    /**
+     * 获取项目从表详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(workXmcbService.selectWorkXmcbById(id));
+    }
+
+    /**
+     * 新增项目从表
+     */
+    @Log(title = "项目从表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody WorkXmcb workXmcb)
+    {
+        return toAjax(workXmcbService.insertWorkXmcb(workXmcb));
+    }
+
+    /**
+     * 修改项目从表
+     */
+    @Log(title = "项目从表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody WorkXmcb workXmcb)
+    {
+        return toAjax(workXmcbService.updateWorkXmcb(workXmcb));
+    }
+
+    /**
+     * 删除项目从表
+     */
+    @Log(title = "项目从表", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(workXmcbService.deleteWorkXmcbByIds(ids));
+    }
+}

qianhe-gzpt/src/main/java/com/qianhe/domain/WorkAccessory.java

+package com.qianhe.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.qianhe.common.annotation.Excel;
+import com.qianhe.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 附件信息对象 work_accessory
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+@Data
+public class WorkAccessory extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 业务id */
+    @Excel(name = "业务id")
+    private Long businessId;
+
+    /** 模块名称 */
+    @Excel(name = "模块名称")
+    private String moduleName;
+
+    /** 附件类型 */
+    @Excel(name = "附件类型")
+    private String accessoryType;
+
+    /** 附件路径 */
+    @Excel(name = "附件路径")
+    private String accessoryUrl;
+
+    /** 附件名称 */
+    @Excel(name = "附件名称")
+    private String accessoryName;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 删除状态 */
+    private String delFlag;
+}

qianhe-gzpt/src/main/java/com/qianhe/domain/WorkJd.java

+package com.qianhe.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import com.qianhe.common.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 节点对象 work_jd
+ *
+ * @author qianhe
+ * @date 2024-01-18
+ */
+@Data
+public class WorkJd
+{
+    /** 主键id */
+    private Long id;
+
+    /** 节点名称 */
+    @Excel(name = "节点名称")
+    private String jdmc;
+
+    /** 负责人id */
+    @Excel(name = "负责人id")
+    private Long fzrId;
+
+    /** 负责人 */
+    @Excel(name = "负责人")
+    private String fzr;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 删除状态 */
+    private String delFlag;
+}

qianhe-gzpt/src/main/java/com/qianhe/domain/WorkXm.java

+package com.qianhe.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import com.qianhe.common.annotation.Excel;
+
+/**
+ * 项目对象 work_xm
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+@Data
+public class WorkXm
+{
+    /** 主键id */
+    private Long id;
+
+    /** 井号 */
+    @Excel(name = "井号")
+    private String jh;
+
+    /** 负责人id */
+    private Long tbrId;
+
+    /** 负责人 */
+    @Excel(name = "负责人")
+    private String tbr;
+
+    /** 填写时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "填写时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date tbsj;
+
+    /** 流程状态(0压裂通知，1采集设计，2设计审核，3现场勘察) */
+    private String lczt;
+
+    /** 提交状态（0未提交，1已提交） */
+    @Excel(name = "提交状态", readConverterExp = "0=未提交,1=已提交")
+    private String tjzt;
+
+    /** 当前节点id */
+    private Long dqjdId;
+
+    /** 当前节点名称 */
+    private String dqjdmc;
+
+    /** 备注 */
+    private  String bz;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 删除状态 */
+    private String delFlag;
+}

qianhe-gzpt/src/main/java/com/qianhe/domain/WorkXmcb.java

+package com.qianhe.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.qianhe.common.annotation.Excel;
+import com.qianhe.common.core.domain.BaseEntity;
+
+/**
+ * 项目从表对象 work_xmcb
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+@Data
+public class WorkXmcb
+{
+    /** 主键id */
+    private Long id;
+
+    /** 项目主键id */
+    private Long yltzId;
+
+    /** 审核人id */
+    @Excel(name = "审核人id")
+    private Long shrId;
+
+    /** 审核人 */
+    @Excel(name = "审核人")
+    private String shr;
+
+    /** 审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date shsj;
+
+    /** 审核人类型(0压裂通知，1采集设计，2设计审核，3现场勘察) */
+    @Excel(name = "审核人类型(0压裂通知，1采集设计，2设计审核，3现场勘察)")
+    private String shrlx;
+
+    /** 审核状态（1同意，2退回） */
+    @Excel(name = "审核状态", readConverterExp = "1=同意，2退回")
+    private String shzt;
+
+    /** 意见 */
+    @Excel(name = "意见")
+    private String yj;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String bz;
+
+    /** 完成状态（0未完成，1已完成） */
+    @Excel(name = "完成状态", readConverterExp = "0=未完成，1已完成")
+    private String wczt;
+
+    /** 是否首次提交 */
+    private String sfsctj;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 删除状态 */
+    private String delFlag;
+}

qianhe-gzpt/src/main/java/com/qianhe/mapper/WorkAccessoryMapper.java

+package com.qianhe.mapper;
+
+import java.util.List;
+import com.qianhe.domain.WorkAccessory;
+
+/**
+ * 附件信息Mapper接口
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+public interface WorkAccessoryMapper
+{
+    /**
+     * 查询附件信息
+     *
+     * @param id 附件信息主键
+     * @return 附件信息
+     */
+    public WorkAccessory selectWorkAccessoryById(Long id);
+
+    /**
+     * 查询附件信息列表
+     *
+     * @param workAccessory 附件信息
+     * @return 附件信息集合
+     */
+    public List<WorkAccessory> selectWorkAccessoryList(WorkAccessory workAccessory);
+
+    /**
+     * 新增附件信息
+     *
+     * @param workAccessory 附件信息
+     * @return 结果
+     */
+    public int insertWorkAccessory(WorkAccessory workAccessory);
+
+    /**
+     * 修改附件信息
+     *
+     * @param workAccessory 附件信息
+     * @return 结果
+     */
+    public int updateWorkAccessory(WorkAccessory workAccessory);
+
+    /**
+     * 删除附件信息
+     *
+     * @param id 附件信息主键
+     * @return 结果
+     */
+    public int deleteWorkAccessoryById(Long id);
+
+    /**
+     * 批量删除附件信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteWorkAccessoryByIds(Long[] ids);
+}

qianhe-gzpt/src/main/java/com/qianhe/mapper/WorkJdMapper.java

+package com.qianhe.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.qianhe.domain.WorkJd;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 节点Mapper接口
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+public interface WorkJdMapper
+{
+    /**
+     * 查询节点
+     *
+     * @param id 节点主键
+     * @return 节点
+     */
+    public WorkJd selectWorkJdById(Long id);
+
+    /**
+     * 查询节点列表
+     *
+     * @param workJd 节点
+     * @return 节点集合
+     */
+    public List<WorkJd> selectWorkJdList(WorkJd workJd);
+
+    /**
+     * 新增节点
+     *
+     * @param workJd 节点
+     * @return 结果
+     */
+    public int insertWorkJd(WorkJd workJd);
+
+    /**
+     * 修改节点
+     *
+     * @param workJd 节点
+     * @return 结果
+     */
+    public int updateWorkJd(WorkJd workJd);
+
+    /**
+     * 删除节点
+     *
+     * @param id 节点主键
+     * @return 结果
+     */
+    public int deleteWorkJdById(Long id);
+
+    /**
+     * 批量删除节点
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteWorkJdByIds(Long[] ids);
+
+    /**
+     * 根据用户id查询节点名称
+     */
+    List<String> selectJdmcByUserId(@Param("userId") Long userId);
+
+    /**
+     * 获取用户下拉框
+     * @return
+     */
+    List<Map<String, Object>> getUserList();
+
+
+
+}

qianhe-gzpt/src/main/java/com/qianhe/mapper/WorkXmMapper.java

+package com.qianhe.mapper;
+
+import java.util.List;
+
+import com.qianhe.domain.WorkAccessory;
+import com.qianhe.domain.WorkXm;
+import com.qianhe.vo.WorkXmVo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 项目Mapper接口
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+public interface WorkXmMapper
+{
+    /**
+     * 查询项目
+     *
+     * @param id 项目主键
+     * @return 项目
+     */
+    public WorkXm selectWorkXmById(Long id);
+
+    /**
+     * 查询项目列表
+     *
+     * @param workXm 项目
+     * @return 项目集合
+     */
+    public List<WorkXm> selectWorkXmList(WorkXm workXm);
+
+    /**
+     * 查询项目列表
+     *
+     * @param workXmVo 项目
+     * @return 项目集合
+     */
+    public List<WorkXm> selectWorkXmGzlList(WorkXmVo workXmVo);
+
+    /**
+     * 新增项目
+     *
+     * @param workXm 项目
+     * @return 结果
+     */
+    public int insertWorkXm(WorkXm workXm);
+
+    /**
+     * 修改项目
+     *
+     * @param workXm 项目
+     * @return 结果
+     */
+    public int updateWorkXm(WorkXm workXm);
+
+    /**
+     * 删除项目
+     *
+     * @param id 项目主键
+     * @return 结果
+     */
+    public int deleteWorkXmById(Long id);
+
+    /**
+     * 批量删除项目
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteWorkXmByIds(Long[] ids);
+
+    /**
+     * 批量删除项目从表信息
+     *
+     * @return 结果
+     */
+    public int deleteWorkXmCbByYltzIds(Long[] ids);
+
+    /**
+     * 查询附件
+     * @param businessId
+     * @param moduleName
+     * @return
+     */
+    List<WorkAccessory> selectFile(@Param("businessId") Long businessId, @Param("moduleName") String moduleName);
+}

qianhe-gzpt/src/main/java/com/qianhe/mapper/WorkXmcbMapper.java

+package com.qianhe.mapper;
+
+import java.util.List;
+
+import com.qianhe.domain.WorkAccessory;
+import com.qianhe.domain.WorkXmcb;
+import com.qianhe.vo.WorkXmVo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 项目从表Mapper接口
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+public interface WorkXmcbMapper
+{
+    /**
+     * 查询项目从表
+     *
+     * @param id 项目从表主键
+     * @return 项目从表
+     */
+    public WorkXmcb selectWorkXmcbById(Long id);
+
+    /**
+     * 查询项目从表列表
+     *
+     * @param workXmcb 项目从表
+     * @return 项目从表集合
+     */
+    public List<WorkXmcb> selectWorkXmcbList(WorkXmcb workXmcb);
+
+    /**
+     * 新增项目从表
+     *
+     * @param workXmcb 项目从表
+     * @return 结果
+     */
+    public int insertWorkXmcb(WorkXmcb workXmcb);
+
+    /**
+     * 修改项目从表
+     *
+     * @param workXmcb 项目从表
+     * @return 结果
+     */
+    public int updateWorkXmcb(WorkXmcb workXmcb);
+
+    /**
+     * 删除项目从表
+     *
+     * @param id 项目从表主键
+     * @return 结果
+     */
+    public int deleteWorkXmcbById(Long id);
+
+    /**
+     * 批量删除项目从表
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteWorkXmcbByIds(Long[] ids);
+
+    /**
+     * 查询待办已办任务
+     * @param jdmc
+     * @param userId
+     * @param state
+     * @return
+     */
+    List<WorkXmVo> taskList(@Param("userId") Long userId,@Param("state") String state,@Param("jdmc") List<String> jdmc, @Param("jh") String jh);
+
+    /**
+     * 查询当前登录用户待办任务
+     * @param userId
+     * @return
+     */
+    List<WorkXmVo> userTaskList(@Param("userId") Long userId);
+
+    /**
+     * 批量新增附件
+     */
+    int insertFile(List<WorkAccessory> list);
+}

qianhe-gzpt/src/main/java/com/qianhe/service/IWorkAccessoryService.java

+package com.qianhe.service;
+
+import java.util.List;
+import com.qianhe.domain.WorkAccessory;
+
+/**
+ * 附件信息Service接口
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+public interface IWorkAccessoryService
+{
+    /**
+     * 查询附件信息
+     *
+     * @param id 附件信息主键
+     * @return 附件信息
+     */
+    public WorkAccessory selectWorkAccessoryById(Long id);
+
+    /**
+     * 查询附件信息列表
+     *
+     * @param workAccessory 附件信息
+     * @return 附件信息集合
+     */
+    public List<WorkAccessory> selectWorkAccessoryList(WorkAccessory workAccessory);
+
+    /**
+     * 新增附件信息
+     *
+     * @param workAccessory 附件信息
+     * @return 结果
+     */
+    public int insertWorkAccessory(WorkAccessory workAccessory);
+
+    /**
+     * 修改附件信息
+     *
+     * @param workAccessory 附件信息
+     * @return 结果
+     */
+    public int updateWorkAccessory(WorkAccessory workAccessory);
+
+    /**
+     * 批量删除附件信息
+     *
+     * @param ids 需要删除的附件信息主键集合
+     * @return 结果
+     */
+    public int deleteWorkAccessoryByIds(Long[] ids);
+
+    /**
+     * 删除附件信息信息
+     *
+     * @param id 附件信息主键
+     * @return 结果
+     */
+    public int deleteWorkAccessoryById(Long id);
+}

qianhe-gzpt/src/main/java/com/qianhe/service/IWorkJdService.java

+package com.qianhe.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.qianhe.domain.WorkJd;
+
+/**
+ * 节点Service接口
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+public interface IWorkJdService
+{
+    /**
+     * 查询节点
+     *
+     * @param id 节点主键
+     * @return 节点
+     */
+    public WorkJd selectWorkJdById(Long id);
+
+    /**
+     * 查询节点列表
+     *
+     * @param workJd 节点
+     * @return 节点集合
+     */
+    public List<WorkJd> selectWorkJdList(WorkJd workJd);
+
+    /**
+     * 新增节点
+     *
+     * @param workJd 节点
+     * @return 结果
+     */
+    public int insertWorkJd(WorkJd workJd);
+
+    /**
+     * 修改节点
+     *
+     * @param workJd 节点
+     * @return 结果
+     */
+    public int updateWorkJd(WorkJd workJd);
+
+    /**
+     * 批量删除节点
+     *
+     * @param ids 需要删除的节点主键集合
+     * @return 结果
+     */
+    public int deleteWorkJdByIds(Long[] ids);
+
+    /**
+     * 删除节点信息
+     *
+     * @param id 节点主键
+     * @return 结果
+     */
+    public int deleteWorkJdById(Long id);
+
+    /**
+     * 获取用户下拉框
+     * @return
+     */
+    List<Map<String,Object>> getUserList();
+
+}

qianhe-gzpt/src/main/java/com/qianhe/service/IWorkXmService.java

+package com.qianhe.service;
+
+import java.util.List;
+import com.qianhe.domain.WorkXm;
+import com.qianhe.vo.WorkXmTjVo;
+import com.qianhe.vo.WorkXmVo;
+
+/**
+ * 项目Service接口
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+public interface IWorkXmService
+{
+    /**
+     * 查询项目
+     *
+     * @param id 项目主键
+     * @return 项目
+     */
+    public WorkXm selectWorkXmById(Long id);
+
+    /**
+     * 查询项目列表
+     *
+     * @param workXm 项目
+     * @return 项目集合
+     */
+    public List<WorkXm> selectWorkXmList(WorkXm workXm);
+
+    /**
+     * 新增项目
+     *
+     * @param workXm 项目
+     * @return 结果
+     */
+    public int insertWorkXm(WorkXm workXm);
+
+    /**
+     * 修改项目
+     *
+     * @param workXm 项目
+     * @return 结果
+     */
+    public int updateWorkXm(WorkXm workXm);
+
+    /**
+     * 批量删除项目
+     *
+     * @param ids 需要删除的项目主键集合
+     * @return 结果
+     */
+    public int deleteWorkXmByIds(Long[] ids);
+
+    /**
+     * 删除项目信息
+     *
+     * @param id 项目主键
+     * @return 结果
+     */
+    public int deleteWorkXmById(Long id);
+
+    /**
+     * 提交
+     * @param workXm
+     * @return
+     */
+    int submit(WorkXm workXm);
+
+    /**
+     * 查询项目详情
+     * @param id
+     * @return
+     */
+    WorkXmVo getXmInfo(Long id);
+
+    /**
+     * 工作量统计
+     * @param workXmVo
+     * @return
+     */
+    List<WorkXmTjVo> getGzlTjList(WorkXmVo workXmVo);
+}

qianhe-gzpt/src/main/java/com/qianhe/service/IWorkXmcbService.java

+package com.qianhe.service;
+
+import java.util.List;
+import com.qianhe.domain.WorkXmcb;
+import com.qianhe.vo.WorkXmVo;
+
+/**
+ * 项目从表Service接口
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+public interface IWorkXmcbService
+{
+    /**
+     * 查询项目从表
+     *
+     * @param id 项目从表主键
+     * @return 项目从表
+     */
+    public WorkXmcb selectWorkXmcbById(Long id);
+
+    /**
+     * 查询项目从表列表
+     *
+     * @param workXmcb 项目从表
+     * @return 项目从表集合
+     */
+    public List<WorkXmcb> selectWorkXmcbList(WorkXmcb workXmcb);
+
+    /**
+     * 新增项目从表
+     *
+     * @param workXmcb 项目从表
+     * @return 结果
+     */
+    public int insertWorkXmcb(WorkXmcb workXmcb);
+
+    /**
+     * 修改项目从表
+     *
+     * @param workXmcb 项目从表
+     * @return 结果
+     */
+    public int updateWorkXmcb(WorkXmcb workXmcb);
+
+    /**
+     * 批量删除项目从表
+     *
+     * @param ids 需要删除的项目从表主键集合
+     * @return 结果
+     */
+    public int deleteWorkXmcbByIds(Long[] ids);
+
+    /**
+     * 删除项目从表信息
+     *
+     * @param id 项目从表主键
+     * @return 结果
+     */
+    public int deleteWorkXmcbById(Long id);
+
+    /**
+     * 首页-待办已办
+     * @param state
+     * @param workXmVo
+     * @return
+     */
+    List<WorkXmVo> taskList(String state, WorkXmVo workXmVo);
+
+    /**
+     * 查询审批历史
+     * @param id
+     * @return
+     */
+    List<WorkXmcb> getspls(Long id);
+
+    /**
+     * 办理审核按钮
+     * @param workXmVo
+     * @return
+     */
+    int handle(WorkXmVo workXmVo);
+}

qianhe-gzpt/src/main/java/com/qianhe/service/impl/WorkAccessoryServiceImpl.java

+package com.qianhe.service.impl;
+
+import java.util.List;
+import com.qianhe.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.qianhe.mapper.WorkAccessoryMapper;
+import com.qianhe.domain.WorkAccessory;
+import com.qianhe.service.IWorkAccessoryService;
+
+/**
+ * 附件信息Service业务层处理
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+@Service
+public class WorkAccessoryServiceImpl implements IWorkAccessoryService
+{
+    @Autowired
+    private WorkAccessoryMapper workAccessoryMapper;
+
+    /**
+     * 查询附件信息
+     *
+     * @param id 附件信息主键
+     * @return 附件信息
+     */
+    @Override
+    public WorkAccessory selectWorkAccessoryById(Long id)
+    {
+        return workAccessoryMapper.selectWorkAccessoryById(id);
+    }
+
+    /**
+     * 查询附件信息列表
+     *
+     * @param workAccessory 附件信息
+     * @return 附件信息
+     */
+    @Override
+    public List<WorkAccessory> selectWorkAccessoryList(WorkAccessory workAccessory)
+    {
+        return workAccessoryMapper.selectWorkAccessoryList(workAccessory);
+    }
+
+    /**
+     * 新增附件信息
+     *
+     * @param workAccessory 附件信息
+     * @return 结果
+     */
+    @Override
+    public int insertWorkAccessory(WorkAccessory workAccessory)
+    {
+        workAccessory.setCreateTime(DateUtils.getNowDate());
+        return workAccessoryMapper.insertWorkAccessory(workAccessory);
+    }
+
+    /**
+     * 修改附件信息
+     *
+     * @param workAccessory 附件信息
+     * @return 结果
+     */
+    @Override
+    public int updateWorkAccessory(WorkAccessory workAccessory)
+    {
+        workAccessory.setUpdateTime(DateUtils.getNowDate());
+        return workAccessoryMapper.updateWorkAccessory(workAccessory);
+    }
+
+    /**
+     * 批量删除附件信息
+     *
+     * @param ids 需要删除的附件信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWorkAccessoryByIds(Long[] ids)
+    {
+        return workAccessoryMapper.deleteWorkAccessoryByIds(ids);
+    }
+
+    /**
+     * 删除附件信息信息
+     *
+     * @param id 附件信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWorkAccessoryById(Long id)
+    {
+        return workAccessoryMapper.deleteWorkAccessoryById(id);
+    }
+}

qianhe-gzpt/src/main/java/com/qianhe/service/impl/WorkJdServiceImpl.java

+package com.qianhe.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.qianhe.mapper.WorkJdMapper;
+import com.qianhe.domain.WorkJd;
+import com.qianhe.service.IWorkJdService;
+
+/**
+ * 节点Service业务层处理
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+@Service
+public class WorkJdServiceImpl implements IWorkJdService
+{
+    @Autowired
+    private WorkJdMapper workJdMapper;
+
+    /**
+     * 查询节点
+     *
+     * @param id 节点主键
+     * @return 节点
+     */
+    @Override
+    public WorkJd selectWorkJdById(Long id)
+    {
+        return workJdMapper.selectWorkJdById(id);
+    }
+
+    /**
+     * 查询节点列表
+     *
+     * @param workJd 节点
+     * @return 节点
+     */
+    @Override
+    public List<WorkJd> selectWorkJdList(WorkJd workJd)
+    {
+        return workJdMapper.selectWorkJdList(workJd);
+    }
+
+    /**
+     * 新增节点
+     *
+     * @param workJd 节点
+     * @return 结果
+     */
+    @Override
+    public int insertWorkJd(WorkJd workJd)
+    {
+        workJd.setCreateBy(SecurityUtils.getUsername());
+        workJd.setCreateTime(DateUtils.getNowDate());
+        return workJdMapper.insertWorkJd(workJd);
+    }
+
+    /**
+     * 修改节点
+     *
+     * @param workJd 节点
+     * @return 结果
+     */
+    @Override
+    public int updateWorkJd(WorkJd workJd)
+    {
+        workJd.setUpdateBy(SecurityUtils.getUsername());
+        workJd.setUpdateTime(DateUtils.getNowDate());
+        return workJdMapper.updateWorkJd(workJd);
+    }
+
+    /**
+     * 批量删除节点
+     *
+     * @param ids 需要删除的节点主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWorkJdByIds(Long[] ids)
+    {
+        return workJdMapper.deleteWorkJdByIds(ids);
+    }
+
+    /**
+     * 删除节点信息
+     *
+     * @param id 节点主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWorkJdById(Long id)
+    {
+        return workJdMapper.deleteWorkJdById(id);
+    }
+
+    /**
+     * 获取用户下拉框
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getUserList() {
+        return workJdMapper.getUserList();
+    }
+}

qianhe-gzpt/src/main/java/com/qianhe/service/impl/WorkXmServiceImpl.java

+package com.qianhe.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
+import com.qianhe.domain.WorkXmcb;
+import com.qianhe.mapper.WorkXmcbMapper;
+import com.qianhe.vo.WorkXmTjVo;
+import com.qianhe.vo.WorkXmVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.qianhe.mapper.WorkXmMapper;
+import com.qianhe.domain.WorkXm;
+import com.qianhe.service.IWorkXmService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 项目Service业务层处理
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+@Service
+public class WorkXmServiceImpl implements IWorkXmService
+{
+    @Autowired
+    private WorkXmMapper workXmMapper;
+    @Autowired
+    private WorkXmcbMapper workXmcbMapper;
+
+    /**
+     * 查询项目
+     *
+     * @param id 项目主键
+     * @return 项目
+     */
+    @Override
+    public WorkXm selectWorkXmById(Long id)
+    {
+        return workXmMapper.selectWorkXmById(id);
+    }
+
+    /**
+     * 查询项目列表
+     *
+     * @param workXm 项目
+     * @return 项目
+     */
+    @Override
+    public List<WorkXm> selectWorkXmList(WorkXm workXm)
+    {
+        return workXmMapper.selectWorkXmList(workXm);
+    }
+
+    /**
+     * 新增项目
+     *
+     * @param workXm 项目
+     * @return 结果
+     */
+    @Override
+    public int insertWorkXm(WorkXm workXm)
+    {
+        workXm.setTbrId(SecurityUtils.getUserId());
+        workXm.setTbsj(DateUtils.getNowDate());
+        workXm.setDqjdmc("压裂通知");
+        workXm.setCreateBy(SecurityUtils.getUsername());
+        workXm.setCreateTime(DateUtils.getNowDate());
+        return workXmMapper.insertWorkXm(workXm);
+    }
+
+    /**
+     * 修改项目
+     *
+     * @param workXm 项目
+     * @return 结果
+     */
+    @Override
+    public int updateWorkXm(WorkXm workXm)
+    {
+        workXm.setUpdateBy(SecurityUtils.getUsername());
+        workXm.setUpdateTime(DateUtils.getNowDate());
+        return workXmMapper.updateWorkXm(workXm);
+    }
+
+    /**
+     * 批量删除项目
+     *
+     * @param ids 需要删除的项目主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWorkXmByIds(Long[] ids)
+    {
+        //批量删除项目从表信息
+        workXmMapper.deleteWorkXmCbByYltzIds(ids);
+        return workXmMapper.deleteWorkXmByIds(ids);
+    }
+
+    /**
+     * 删除项目信息
+     *
+     * @param id 项目主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWorkXmById(Long id)
+    {
+        return workXmMapper.deleteWorkXmById(id);
+    }
+
+    /**
+     * 提交
+     * @param workXm
+     * @return
+     */
+    @Override
+    @Transactional
+    public int submit(WorkXm workXm) {
+        workXm.setLczt("1");
+        workXm.setTjzt("1");
+        workXm.setDqjdmc("采集设计");
+        int i = workXmMapper.updateWorkXm(workXm);
+        //新增操作历史表
+        WorkXmcb workXmcb = new WorkXmcb();
+        workXmcb.setYltzId(workXm.getId());
+        workXmcb.setShrId(SecurityUtils.getUserId());
+        workXmcb.setShrlx("0");
+        workXmcb.setShsj(DateUtils.getNowDate());
+        workXmcb.setWczt("1");
+        workXmcb.setSfsctj("1");
+        workXmcb.setCreateBy(SecurityUtils.getUsername());
+        workXmcb.setCreateTime(DateUtils.getNowDate());
+        workXmcbMapper.insertWorkXmcb(workXmcb);
+        return i;
+    }
+
+    /**
+     * 查询项目详情
+     * @param id
+     * @return
+     */
+    @Override
+    public WorkXmVo getXmInfo(Long id) {
+        WorkXm workXm = workXmMapper.selectWorkXmById(id);
+        //转vo
+        WorkXmVo workXmVo = new WorkXmVo();
+        BeanUtils.copyProperties(workXm,workXmVo);
+        //查询监测设计图集合
+        workXmVo.setJcsjtList(workXmMapper.selectFile(id,"项目-监测设计图"));
+        //查询布设坐标集合
+        workXmVo.setBszbList(workXmMapper.selectFile(id,"项目-布设坐标"));
+        //查询试油工程设计集合
+        workXmVo.setSygcsjList(workXmMapper.selectFile(id,"项目-试油工程设计"));
+        //查询其他附件集合
+        workXmVo.setQtList(workXmMapper.selectFile(id,"项目-其他附件"));
+        return workXmVo;
+    }
+
+    /**
+     * 工作量统计
+     * @param workXmVo
+     * @return
+     */
+    @Override
+    public List<WorkXmTjVo> getGzlTjList(WorkXmVo workXmVo) {
+        //查询所有已提交的项目
+        workXmVo.setTjzt("1");
+        List<WorkXm> workXms = workXmMapper.selectWorkXmGzlList(workXmVo);
+        //查询所有审批历史
+        List<WorkXmcb> workXmcbs = workXmcbMapper.selectWorkXmcbList(new WorkXmcb());
+        List<WorkXmTjVo> list = new ArrayList<>();
+        for (WorkXm xm : workXms) {
+            WorkXmTjVo workXmTjVo1 = new WorkXmTjVo();
+            workXmTjVo1.setJh(xm.getJh());
+            for (WorkXmcb workXmcb : workXmcbs) {
+                if (xm.getId().equals(workXmcb.getYltzId())){
+                    switch (workXmcb.getShrlx()){
+                        case "0":
+                            workXmTjVo1.setYltz(workXmcb.getShr());
+                            break;
+                        case "1":
+                            workXmTjVo1.setCjsj(workXmcb.getShr());
+                            break;
+                        case "2":
+                            workXmTjVo1.setSjsh(workXmcb.getShr());
+                            break;
+                        case "3":
+                            workXmTjVo1.setXckc(workXmcb.getShr());
+                            break;
+                        default:break;
+                    }
+                }
+            }
+            list.add(workXmTjVo1);
+        }
+        return list;
+    }
+}

qianhe-gzpt/src/main/java/com/qianhe/vo/WorkXmTjVo.java

+package com.qianhe.vo;
+
+import com.qianhe.common.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 统计vo
+ */
+@Data
+public class WorkXmTjVo {
+
+    private Long id;
+
+    /** 井号 */
+    @Excel(name = "井号")
+    private String jh;
+
+    /** 压裂通知 */
+    @Excel(name = "压裂通知")
+    private String yltz;
+
+    /** 采集设计 */
+    @Excel(name = "采集设计")
+    private String cjsj;
+
+    /** 设计审核 */
+    @Excel(name = "设计审核")
+    private String sjsh;
+
+    /** 现场勘查 */
+    @Excel(name = "现场勘查")
+    private String xckc;
+
+    /** 设备充电 */
+    @Excel(name = "设备充电")
+    private String sbcd;
+
+    /** 设备部署 */
+    @Excel(name = "设备部署")
+    private String sbbs;
+
+}

qianhe-gzpt/src/main/java/com/qianhe/vo/WorkXmVo.java

+package com.qianhe.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.qianhe.common.annotation.Excel;
+import com.qianhe.domain.WorkAccessory;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 项目对象 work_xm
+ *
+ * @author qianhe
+ * @date 2024-01-17
+ */
+@Data
+public class WorkXmVo {
+
+    /** 主键id */
+    private Long id;
+
+    /** 井号 */
+    @Excel(name = "井号")
+    private String jh;
+
+    /** 负责人id */
+    private Long tbrId;
+
+    /** 负责人 */
+    @Excel(name = "负责人")
+    private String tbr;
+
+    /** 填写时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "填写时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date tbsj;
+
+    /** 流程状态(0压裂通知，1采集设计，2设计审核，3现场勘察) */
+    @Excel(name = "流程状态(0压裂通知，1采集设计，2设计审核，3现场勘察)")
+    private String lczt;
+
+    /** 提交状态（0未提交，1已提交） */
+    @Excel(name = "提交状态", readConverterExp = "0=未提交,1=已提交")
+    private String tjzt;
+
+    /** 当前节点id */
+    private Long dqjdId;
+
+    /** 当前节点名称 */
+    @Excel(name = "当前节点名称")
+    private String dqjdmc;
+
+    /** 备注 */
+    private String bz;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 删除状态 */
+    private String delFlag;
+
+    /** 监测设计图集合 */
+    private List<WorkAccessory> jcsjtList;
+    /** 布设坐标集合 */
+    private List<WorkAccessory> bszbList;
+    /** 试油工程设计集合 */
+    private List<WorkAccessory> sygcsjList;
+    /** 其他附件集合 */
+    private List<WorkAccessory> qtList;
+
+    /** 审核状态（1同意，2退回） */
+    private String shzt;
+    /** 意见 */
+    private String yj;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+    //当前审批历史id
+    private Long splsId;
+
+
+
+}

qianhe-gzpt/src/main/resources/mapper/WorkAccessoryMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qianhe.mapper.WorkAccessoryMapper">
+
+    <resultMap type="WorkAccessory" id="WorkAccessoryResult">
+        <result property="id"    column="id"    />
+        <result property="businessId"    column="business_id"    />
+        <result property="moduleName"    column="module_name"    />
+        <result property="accessoryType"    column="accessory_type"    />
+        <result property="accessoryUrl"    column="accessory_url"    />
+        <result property="accessoryName"    column="accessory_name"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectWorkAccessoryVo">
+        select id, business_id, module_name, accessory_type, accessory_url, accessory_name, create_by, create_time, update_by, update_time, del_flag from work_accessory
+    </sql>
+
+    <select id="selectWorkAccessoryList" parameterType="WorkAccessory" resultMap="WorkAccessoryResult">
+        <include refid="selectWorkAccessoryVo"/>
+        <where>
+            del_flag = '0'
+            <if test="businessId != null "> and business_id = #{businessId}</if>
+            <if test="moduleName != null  and moduleName != ''"> and module_name like concat('%', #{moduleName}, '%')</if>
+            <if test="accessoryType != null  and accessoryType != ''"> and accessory_type = #{accessoryType}</if>
+            <if test="accessoryUrl != null  and accessoryUrl != ''"> and accessory_url = #{accessoryUrl}</if>
+            <if test="accessoryName != null  and accessoryName != ''"> and accessory_name like concat('%', #{accessoryName}, '%')</if>
+        </where>
+        order by create_time DESC
+    </select>
+
+    <select id="selectWorkAccessoryById" parameterType="Long" resultMap="WorkAccessoryResult">
+        <include refid="selectWorkAccessoryVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertWorkAccessory" parameterType="WorkAccessory" useGeneratedKeys="true" keyProperty="id">
+        insert into work_accessory
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="businessId != null">business_id,</if>
+            <if test="moduleName != null and moduleName != ''">module_name,</if>
+            <if test="accessoryType != null and accessoryType != ''">accessory_type,</if>
+            <if test="accessoryUrl != null and accessoryUrl != ''">accessory_url,</if>
+            <if test="accessoryName != null and accessoryName != ''">accessory_name,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="delFlag != null">del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="businessId != null">#{businessId},</if>
+            <if test="moduleName != null and moduleName != ''">#{moduleName},</if>
+            <if test="accessoryType != null and accessoryType != ''">#{accessoryType},</if>
+            <if test="accessoryUrl != null and accessoryUrl != ''">#{accessoryUrl},</if>
+            <if test="accessoryName != null and accessoryName != ''">#{accessoryName},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateWorkAccessory" parameterType="WorkAccessory">
+        update work_accessory
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="businessId != null">business_id = #{businessId},</if>
+            <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
+            <if test="accessoryType != null and accessoryType != ''">accessory_type = #{accessoryType},</if>
+            <if test="accessoryUrl != null and accessoryUrl != ''">accessory_url = #{accessoryUrl},</if>
+            <if test="accessoryName != null and accessoryName != ''">accessory_name = #{accessoryName},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteWorkAccessoryById" parameterType="Long">
+        update work_accessory set del_flag = '1' where id = #{id}
+    </update>
+
+    <update id="deleteWorkAccessoryByIds" parameterType="String">
+        update work_accessory set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

qianhe-gzpt/src/main/resources/mapper/WorkJdMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qianhe.mapper.WorkJdMapper">
+
+    <resultMap type="WorkJd" id="WorkJdResult">
+        <result property="id"    column="id"    />
+        <result property="jdmc"    column="jdmc"    />
+        <result property="fzrId"    column="fzr_id"    />
+        <result property="fzr"    column="fzr"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectWorkJdVo">
+        select id, jdmc, fzr_id, fzr, create_by, create_time, update_by, update_time, del_flag from work_jd
+    </sql>
+
+    <select id="selectWorkJdList" parameterType="WorkJd" resultMap="WorkJdResult">
+        <include refid="selectWorkJdVo"/>
+        <where>
+            del_flag = '0'
+            <if test="jdmc != null  and jdmc != ''"> and jdmc = #{jdmc}</if>
+            <if test="fzrId != null "> and fzr_id = #{fzrId}</if>
+            <if test="fzr != null  and fzr != ''"> and fzr = #{fzr}</if>
+        </where>
+        order by create_time DESC
+    </select>
+
+    <select id="selectWorkJdById" parameterType="Long" resultMap="WorkJdResult">
+        <include refid="selectWorkJdVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertWorkJd" parameterType="WorkJd" useGeneratedKeys="true" keyProperty="id">
+        insert into work_jd
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jdmc != null">jdmc,</if>
+            <if test="fzrId != null">fzr_id,fzr,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jdmc != null">#{jdmc},</if>
+            <if test="fzrId != null">#{fzrId},(select nick_name from sys_user where del_flag = '0' and user_id = #{fzrId}),</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateWorkJd" parameterType="WorkJd">
+        update work_jd
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jdmc != null">jdmc = #{jdmc},</if>
+            <if test="fzrId != null">fzr_id = #{fzrId},</if>
+            <if test="fzr != null">fzr = #{fzr},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteWorkJdById" parameterType="Long">
+        update work_jd set del_flag = '1' where id = #{id}
+    </update>
+
+    <update id="deleteWorkJdByIds" parameterType="String">
+        update work_jd set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <select id="selectJdmcByUserId" parameterType="Long" resultType="String">
+        SELECT DISTINCT jdmc FROM work_jd WHERE del_flag = '0' and fzr_id = #{userId}
+    </select>
+
+    <select id="getUserList" resultType="Map">
+        select user_id as userId, nick_name as nickName from sys_user where del_flag = '0'
+    </select>
+</mapper>

qianhe-gzpt/src/main/resources/mapper/WorkXmMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qianhe.mapper.WorkXmMapper">
+
+    <resultMap type="WorkXm" id="WorkXmResult">
+        <result property="id"    column="id"    />
+        <result property="jh"    column="jh"    />
+        <result property="tbrId"    column="tbr_id"    />
+        <result property="tbr"    column="tbr"    />
+        <result property="tbsj"    column="tbsj"    />
+        <result property="lczt"    column="lczt"    />
+        <result property="tjzt"    column="tjzt"    />
+        <result property="dqjdId"    column="dqjd_id"    />
+        <result property="dqjdmc"    column="dqjdmc"    />
+        <result property="bz"    column="bz"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectWorkXmVo">
+        select id, jh, tbr_id, tbr, tbsj, lczt, tjzt, dqjd_id, dqjdmc, bz, create_by, create_time, update_by, update_time, del_flag from work_xm
+    </sql>
+
+    <select id="selectWorkXmList" parameterType="WorkXm" resultMap="WorkXmResult">
+        <include refid="selectWorkXmVo"/>
+        <where>
+            del_flag = '0'
+            <if test="jh != null  and jh != ''"> and jh = #{jh}</if>
+            <if test="tbrId != null "> and tbr_id = #{tbrId}</if>
+            <if test="tbr != null  and tbr != ''"> and tbr = #{tbr}</if>
+            <if test="tbsj != null "> and tbsj = #{tbsj}</if>
+            <if test="lczt != null  and lczt != ''"> and lczt = #{lczt}</if>
+            <if test="tjzt != null  and tjzt != ''"> and tjzt = #{tjzt}</if>
+            <if test="dqjdId != null "> and dqjd_id = #{dqjdId}</if>
+            <if test="dqjdmc != null  and dqjdmc != ''"> and dqjdmc = #{dqjdmc}</if>
+        </where>
+        order by create_time DESC
+    </select>
+
+    <select id="selectWorkXmGzlList" parameterType="com.qianhe.vo.WorkXmVo" resultMap="WorkXmResult">
+        <include refid="selectWorkXmVo"/>
+        <where>
+            del_flag = '0'
+            <if test="jh != null  and jh != ''"> and jh = #{jh}</if>
+            <if test="tbrId != null "> and tbr_id = #{tbrId}</if>
+            <if test="tbr != null  and tbr != ''"> and tbr = #{tbr}</if>
+            <if test="tbsj != null "> and tbsj = #{tbsj}</if>
+            <if test="lczt != null  and lczt != ''"> and lczt = #{lczt}</if>
+            <if test="tjzt != null  and tjzt != ''"> and tjzt = #{tjzt}</if>
+            <if test="dqjdId != null "> and dqjd_id = #{dqjdId}</if>
+            <if test="dqjdmc != null  and dqjdmc != ''"> and dqjdmc = #{dqjdmc}</if>
+            <if test="startTime != null and endTime != null">and DATE_FORMAT(tbsj,'%Y-%m-%d') between DATE_FORMAT(#{startTime},'%Y-%m-%d') and DATE_FORMAT(#{endTime},'%Y-%m-%d')</if>
+        </where>
+        order by create_time DESC
+    </select>
+
+    <select id="selectWorkXmById" parameterType="Long" resultMap="WorkXmResult">
+        <include refid="selectWorkXmVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertWorkXm" parameterType="WorkXm" useGeneratedKeys="true" keyProperty="id">
+        insert into work_xm
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jh != null">jh,</if>
+            <if test="tbrId != null">tbr_id,tbr,</if>
+            <if test="tbsj != null">tbsj,</if>
+            <if test="lczt != null">lczt,</if>
+            <if test="tjzt != null">tjzt,</if>
+            <if test="dqjdId != null">dqjd_id,</if>
+            <if test="dqjdmc != null">dqjdmc,</if>
+            <if test="bz != null">bz,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jh != null">#{jh},</if>
+            <if test="tbrId != null">#{tbrId},(select nick_name from sys_user where del_flag = '0' and user_id = #{tbrId}),</if>
+            <if test="tbsj != null">#{tbsj},</if>
+            <if test="lczt != null">#{lczt},</if>
+            <if test="tjzt != null">#{tjzt},</if>
+            <if test="dqjdId != null">#{dqjdId},</if>
+            <if test="dqjdmc != null">#{dqjdmc},</if>
+            <if test="bz != null">#{bz},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateWorkXm" parameterType="WorkXm">
+        update work_xm
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jh != null">jh = #{jh},</if>
+            <if test="tbrId != null">tbr_id = #{tbrId},tbr = (select nick_name from sys_user where del_flag = '0' and user_id = #{tbrId}),</if>
+            <if test="tbsj != null">tbsj = #{tbsj},</if>
+            <if test="lczt != null">lczt = #{lczt},</if>
+            <if test="tjzt != null">tjzt = #{tjzt},</if>
+            <if test="dqjdId != null">dqjd_id = #{dqjdId},</if>
+            <if test="dqjdmc != null">dqjdmc = #{dqjdmc},</if>
+            <if test="bz != null">bz = #{bz},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteWorkXmById" parameterType="Long">
+        update work_xm set del_flag = '1' where id = #{id}
+    </update>
+
+    <update id="deleteWorkXmByIds" parameterType="String">
+        update work_xm set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <update id="deleteWorkXmCbByYltzIds" parameterType="String">
+        update work_xmcb set del_flag = '1' where yltz_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <select id="selectFile" resultType="com.qianhe.domain.WorkAccessory">
+        select id, business_id, module_name, accessory_type, accessory_url, accessory_name, create_by, create_time, update_by, update_time, del_flag
+        from work_accessory where del_flag = '0' and business_id = #{businessId} and module_name = #{moduleName}
+    </select>
+</mapper>

qianhe-gzpt/src/main/resources/mapper/WorkXmcbMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qianhe.mapper.WorkXmcbMapper">
+
+    <resultMap type="WorkXmcb" id="WorkXmcbResult">
+        <result property="id"    column="id"    />
+        <result property="yltzId"    column="yltz_id"    />
+        <result property="shrId"    column="shr_id"    />
+        <result property="shr"    column="shr"    />
+        <result property="shsj"    column="shsj"    />
+        <result property="shrlx"    column="shrlx"    />
+        <result property="shzt"    column="shzt"    />
+        <result property="yj"    column="yj"    />
+        <result property="bz"    column="bz"    />
+        <result property="wczt"    column="wczt"    />
+        <result property="sfsctj"    column="sfsctj"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectWorkXmcbVo">
+        select id, yltz_id, shr_id, shr, shsj, shrlx, shzt, yj, bz, wczt, sfsctj, create_by, create_time, update_by, update_time, del_flag from work_xmcb
+    </sql>
+
+    <select id="selectWorkXmcbList" parameterType="com.qianhe.domain.WorkXmcb" resultMap="WorkXmcbResult">
+        <include refid="selectWorkXmcbVo"/>
+        <where>
+            del_flag = '0'
+            <if test="yltzId != null "> and yltz_id = #{yltzId}</if>
+            <if test="shrId != null "> and shr_id = #{shrId}</if>
+            <if test="shsj != null "> and shsj = #{shsj}</if>
+            <if test="shrlx != null  and shrlx != ''"> and shrlx = #{shrlx}</if>
+            <if test="shzt != null  and shzt != ''"> and shzt = #{shzt}</if>
+            <if test="yj != null  and yj != ''"> and yj = #{yj}</if>
+            <if test="bz != null  and bz != ''"> and bz = #{bz}</if>
+            <if test="wczt != null  and wczt != ''"> and wczt = #{wczt}</if>
+        </where>
+        order by create_time DESC
+    </select>
+
+    <select id="selectWorkXmcbById" parameterType="Long" resultMap="WorkXmcbResult">
+        <include refid="selectWorkXmcbVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertWorkXmcb" parameterType="WorkXmcb" useGeneratedKeys="true" keyProperty="id">
+        insert into work_xmcb
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="yltzId != null">yltz_id,</if>
+            <if test="shrId != null">shr_id,shr,</if>
+            <if test="shsj != null">shsj,</if>
+            <if test="shrlx != null">shrlx,</if>
+            <if test="shzt != null">shzt,</if>
+            <if test="yj != null">yj,</if>
+            <if test="bz != null">bz,</if>
+            <if test="wczt != null">wczt,</if>
+            <if test="sfsctj != null">sfsctj,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="yltzId != null">#{yltzId},</if>
+            <if test="shrId != null">#{shrId},(select nick_name from sys_user where del_flag = '0' and user_id = #{shrId}),</if>
+            <if test="shsj != null">#{shsj},</if>
+            <if test="shrlx != null">#{shrlx},</if>
+            <if test="shzt != null">#{shzt},</if>
+            <if test="yj != null">#{yj},</if>
+            <if test="bz != null">#{bz},</if>
+            <if test="wczt != null">#{wczt},</if>
+            <if test="sfsctj != null">#{sfsctj},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateWorkXmcb" parameterType="WorkXmcb">
+        update work_xmcb
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="yltzId != null">yltz_id = #{yltzId},</if>
+            <if test="shrId != null">shr_id = #{shrId},shr = (select nick_name from sys_user where del_flag = '0' and user_id = #{shrId}),</if>
+            <if test="shsj != null">shsj = #{shsj},</if>
+            <if test="shrlx != null">shrlx = #{shrlx},</if>
+            <if test="shzt != null">shzt = #{shzt},</if>
+            <if test="yj != null">yj = #{yj},</if>
+            <if test="bz != null">bz = #{bz},</if>
+            <if test="wczt != null">wczt = #{wczt},</if>
+            <if test="sfsctj != null">sfsctj = #{sfsctj},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteWorkXmcbById" parameterType="Long">
+        update work_xmcb set del_flag = '1' where id = #{id}
+    </update>
+
+    <update id="deleteWorkXmcbByIds" parameterType="String">
+        update work_xmcb set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <select id="taskList" resultType="com.qianhe.vo.WorkXmVo">
+        SELECT x.id, x.jh, x.tbr_id, x.tbr, x.tbsj, x.lczt, x.tjzt, x.dqjd_id, x.dqjdmc, x.create_by, x.create_time, x.update_by, x.update_time, x.del_flag
+        FROM work_xm x
+        LEFT JOIN work_xmcb w ON w.yltz_id = x.id
+        <where>
+            x.del_flag = '0' AND w.del_flag = '0'
+            <if test="userId != null"> and w.shr_id = #{userId}</if>
+            <if test="state != null and state != '' and state == 1"> and w.wczt = #{state} and w.sfsctj = '0'</if>
+            <if test="jh != null and jh != ''">and x.jh = #{jh}</if>
+            <if test="jdmc != null">
+                and x.lczt in
+                <foreach item="jdmc" collection="jdmc" open="(" separator="," close=")">
+                    #{jdmc}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="userTaskList" resultType="com.qianhe.vo.WorkXmVo" parameterType="Long">
+        SELECT x.id, x.jh, x.tbr_id, x.tbr, x.tbsj, x.lczt, x.tjzt, x.dqjd_id, x.dqjdmc, x.create_by, x.create_time, x.update_by, x.update_time, x.del_flag, w.id as splsId
+        FROM work_xm x
+        LEFT JOIN work_xmcb w ON w.yltz_id = x.id
+        where x.del_flag = '0' AND w.del_flag = '0' and w.sfsctj = '0' and w.wczt = '0' and w.shr_id = #{userId}
+    </select>
+
+    <insert id="insertFile" parameterType="com.qianhe.domain.WorkAccessory">
+        insert into work_accessory(id, business_id, module_name, accessory_url, accessory_name, create_by, create_time) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (0,#{item.businessId}, #{item.moduleName}, #{item.accessoryUrl}, #{item.accessoryName}, #{item.createBy}, #{item.createTime})
+        </foreach>
+    </insert>
+</mapper>