工作记录、巡查记录等带审核的添加字段

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcButie.java

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 补贴管理对象 szxc_butie
  *
  * @author hs
- * @date 2024-03-20
+ * @date 2024-04-15
  */
 public class SzxcButie extends BaseEntity
 {
@@ -54,10 +54,26 @@ public class SzxcButie extends BaseEntity
     @Excel(name = "审核状态")
     private String zfStatus;
 
-    /** 审核备注 */
+    /** 备注 */
-    @Excel(name = "审核备注")
+    @Excel(name = "备注")
     private String shRemark;
 
+    /** 审核人 */
+    @Excel(name = "审核人")
+    private String auditName;
+
+    /** 审核结果 */
+    @Excel(name = "审核结果")
+    private String auditResult;
+
+    /** 审核原由 */
+    @Excel(name = "审核原由")
+    private String auditReason;
+
+    /** 审核部门id */
+    @Excel(name = "审核部门id")
+    private Long auditDeptid;
+
     /** 部门id */
     @Excel(name = "部门id")
     private Long deptId;
@@ -169,6 +185,42 @@ public class SzxcButie extends BaseEntity
     {
         return shRemark;
     }
+    public void setAuditName(String auditName)
+    {
+        this.auditName = auditName;
+    }
+
+    public String getAuditName()
+    {
+        return auditName;
+    }
+    public void setAuditResult(String auditResult)
+    {
+        this.auditResult = auditResult;
+    }
+
+    public String getAuditResult()
+    {
+        return auditResult;
+    }
+    public void setAuditReason(String auditReason)
+    {
+        this.auditReason = auditReason;
+    }
+
+    public String getAuditReason()
+    {
+        return auditReason;
+    }
+    public void setAuditDeptid(Long auditDeptid)
+    {
+        this.auditDeptid = auditDeptid;
+    }
+
+    public Long getAuditDeptid()
+    {
+        return auditDeptid;
+    }
     public void setDeptId(Long deptId)
     {
         this.deptId = deptId;
@@ -211,6 +263,10 @@ public class SzxcButie extends BaseEntity
                 .append("content", getContent())
                 .append("zfStatus", getZfStatus())
                 .append("shRemark", getShRemark())
+                .append("auditName", getAuditName())
+                .append("auditResult", getAuditResult())
+                .append("auditReason", getAuditReason())
+                .append("auditDeptid", getAuditDeptid())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHelp.java

@@ -1,17 +1,18 @@
 package com.ruoyi.szxc.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 帮办事对象 szxc_help
  *
  * @author hs
- * @date 2024-03-20
+ * @date 2024-04-15
  */
 public class SzxcHelp extends BaseEntity
 {
@@ -45,10 +46,30 @@ public class SzxcHelp extends BaseEntity
     @Excel(name = "事项描述")
     private String content;
 
-    /** 处理进度(字典审核状态) */
+    /** 处理进度(字典) */
-    @Excel(name = "处理进度(字典审核状态)")
+    @Excel(name = "处理进度(字典)")
     private String helpStatus;
 
+    /** 处理部门 */
+    @Excel(name = "处理部门")
+    private String handleDept;
+
+    /** 处理部门id */
+    @Excel(name = "处理部门id")
+    private Long handleDeptid;
+
+    /** 处理人 */
+    @Excel(name = "处理人")
+    private String handleName;
+
+    /** 处理结果 */
+    @Excel(name = "处理结果")
+    private String handleResult;
+
+    /** 处理原由 */
+    @Excel(name = "处理原由")
+    private String handleReason;
+
     /** 部门id */
     @Excel(name = "部门id")
     private Long deptId;
@@ -133,6 +154,51 @@ public class SzxcHelp extends BaseEntity
     {
         return helpStatus;
     }
+    public void setHandleDept(String handleDept)
+    {
+        this.handleDept = handleDept;
+    }
+
+    public String getHandleDept()
+    {
+        return handleDept;
+    }
+    public void setHandleDeptid(Long handleDeptid)
+    {
+        this.handleDeptid = handleDeptid;
+    }
+
+    public Long getHandleDeptid()
+    {
+        return handleDeptid;
+    }
+    public void setHandleName(String handleName)
+    {
+        this.handleName = handleName;
+    }
+
+    public String getHandleName()
+    {
+        return handleName;
+    }
+    public void setHandleResult(String handleResult)
+    {
+        this.handleResult = handleResult;
+    }
+
+    public String getHandleResult()
+    {
+        return handleResult;
+    }
+    public void setHandleReason(String handleReason)
+    {
+        this.handleReason = handleReason;
+    }
+
+    public String getHandleReason()
+    {
+        return handleReason;
+    }
     public void setDeptId(Long deptId)
     {
         this.deptId = deptId;
@@ -172,6 +238,11 @@ public class SzxcHelp extends BaseEntity
                 .append("title", getTitle())
                 .append("content", getContent())
                 .append("helpStatus", getHelpStatus())
+                .append("handleDept", getHandleDept())
+                .append("handleDeptid", getHandleDeptid())
+                .append("handleName", getHandleName())
+                .append("handleResult", getHandleResult())
+                .append("handleReason", getHandleReason())
                 .append("remark", getRemark())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVisitRecard.java

@@ -1,17 +1,18 @@
 package com.ruoyi.szxc.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 走访记录对象 szxc_visit_recard
  *
  * @author hs
- * @date 2024-03-20
+ * @date 2024-04-15
  */
 public class SzxcVisitRecard extends BaseEntity
 {
@@ -71,8 +72,28 @@ public class SzxcVisitRecard extends BaseEntity
     @Excel(name = "审核状态")
     private String zfStatus;
 
-    /** 审核备注 */
+    /** 审核部门 */
-    @Excel(name = "审核备注")
+    @Excel(name = "审核部门")
+    private String auditDept;
+
+    /** 审核部门id */
+    @Excel(name = "审核部门id")
+    private Long auditDeptid;
+
+    /** 审核人 */
+    @Excel(name = "审核人")
+    private String auditName;
+
+    /** 审核结果 */
+    @Excel(name = "审核结果")
+    private String auditResult;
+
+    /** 审核原由 */
+    @Excel(name = "审核原由")
+    private String auditReason;
+
+    /** 备注 */
+    @Excel(name = "备注")
     private String shRemark;
 
     /** 部门id */
@@ -204,6 +225,51 @@ public class SzxcVisitRecard extends BaseEntity
     {
         return zfStatus;
     }
+    public void setAuditDept(String auditDept)
+    {
+        this.auditDept = auditDept;
+    }
+
+    public String getAuditDept()
+    {
+        return auditDept;
+    }
+    public void setAuditDeptid(Long auditDeptid)
+    {
+        this.auditDeptid = auditDeptid;
+    }
+
+    public Long getAuditDeptid()
+    {
+        return auditDeptid;
+    }
+    public void setAuditName(String auditName)
+    {
+        this.auditName = auditName;
+    }
+
+    public String getAuditName()
+    {
+        return auditName;
+    }
+    public void setAuditResult(String auditResult)
+    {
+        this.auditResult = auditResult;
+    }
+
+    public String getAuditResult()
+    {
+        return auditResult;
+    }
+    public void setAuditReason(String auditReason)
+    {
+        this.auditReason = auditReason;
+    }
+
+    public String getAuditReason()
+    {
+        return auditReason;
+    }
     public void setShRemark(String shRemark)
     {
         this.shRemark = shRemark;
@@ -257,6 +323,11 @@ public class SzxcVisitRecard extends BaseEntity
                 .append("content", getContent())
                 .append("flowPeople", getFlowPeople())
                 .append("zfStatus", getZfStatus())
+                .append("auditDept", getAuditDept())
+                .append("auditDeptid", getAuditDeptid())
+                .append("auditName", getAuditName())
+                .append("auditResult", getAuditResult())
+                .append("auditReason", getAuditReason())
                 .append("shRemark", getShRemark())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcWorkRecard.java

@@ -1,17 +1,18 @@
 package com.ruoyi.szxc.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 工作记录对象 szxc_work_recard
  *
  * @author hs
- * @date 2024-03-20
+ * @date 2024-04-15
  */
 public class SzxcWorkRecard extends BaseEntity
 {
@@ -59,8 +60,28 @@ public class SzxcWorkRecard extends BaseEntity
     @Excel(name = "审核状态")
     private String gzStatus;
 
-    /** 审核备注 */
+    /** 审核部门 */
-    @Excel(name = "审核备注")
+    @Excel(name = "审核部门")
+    private String auditDept;
+
+    /** 审核部门id */
+    @Excel(name = "审核部门id")
+    private Long auditDeptid;
+
+    /** 审核人 */
+    @Excel(name = "审核人")
+    private String auditName;
+
+    /** 审核结果 */
+    @Excel(name = "审核结果")
+    private String auditResult;
+
+    /** 审核原由 */
+    @Excel(name = "审核原由")
+    private String auditReason;
+
+    /** 备注 */
+    @Excel(name = "备注")
     private String shRemark;
 
     /** 部门id */
@@ -165,6 +186,51 @@ public class SzxcWorkRecard extends BaseEntity
     {
         return gzStatus;
     }
+    public void setAuditDept(String auditDept)
+    {
+        this.auditDept = auditDept;
+    }
+
+    public String getAuditDept()
+    {
+        return auditDept;
+    }
+    public void setAuditDeptid(Long auditDeptid)
+    {
+        this.auditDeptid = auditDeptid;
+    }
+
+    public Long getAuditDeptid()
+    {
+        return auditDeptid;
+    }
+    public void setAuditName(String auditName)
+    {
+        this.auditName = auditName;
+    }
+
+    public String getAuditName()
+    {
+        return auditName;
+    }
+    public void setAuditResult(String auditResult)
+    {
+        this.auditResult = auditResult;
+    }
+
+    public String getAuditResult()
+    {
+        return auditResult;
+    }
+    public void setAuditReason(String auditReason)
+    {
+        this.auditReason = auditReason;
+    }
+
+    public String getAuditReason()
+    {
+        return auditReason;
+    }
     public void setShRemark(String shRemark)
     {
         this.shRemark = shRemark;
@@ -215,6 +281,11 @@ public class SzxcWorkRecard extends BaseEntity
                 .append("picture", getPicture())
                 .append("content", getContent())
                 .append("gzStatus", getGzStatus())
+                .append("auditDept", getAuditDept())
+                .append("auditDeptid", getAuditDeptid())
+                .append("auditName", getAuditName())
+                .append("auditResult", getAuditResult())
+                .append("auditReason", getAuditReason())
                 .append("shRemark", getShRemark())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXcRecard.java

@@ -1,17 +1,18 @@
 package com.ruoyi.szxc.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 巡查记录对象 szxc_xc_recard
  *
  * @author hs
- * @date 2024-03-20
+ * @date 2024-04-15
  */
 public class SzxcXcRecard extends BaseEntity
 {
@@ -74,8 +75,28 @@ public class SzxcXcRecard extends BaseEntity
     @Excel(name = "审核状态")
     private String xcStatus;
 
-    /** 审核备注 */
+    /** 审核部门 */
-    @Excel(name = "审核备注")
+    @Excel(name = "审核部门")
+    private String auditDept;
+
+    /** 审核部门id */
+    @Excel(name = "审核部门id")
+    private Long auditDeptid;
+
+    /** 审核人 */
+    @Excel(name = "审核人")
+    private String auditName;
+
+    /** 审核结果 */
+    @Excel(name = "审核结果")
+    private String auditResult;
+
+    /** 审核原由 */
+    @Excel(name = "审核原由")
+    private String auditReason;
+
+    /** 备注 */
+    @Excel(name = "备注")
     private String shRemark;
 
     /** 部门id */
@@ -216,6 +237,51 @@ public class SzxcXcRecard extends BaseEntity
     {
         return xcStatus;
     }
+    public void setAuditDept(String auditDept)
+    {
+        this.auditDept = auditDept;
+    }
+
+    public String getAuditDept()
+    {
+        return auditDept;
+    }
+    public void setAuditDeptid(Long auditDeptid)
+    {
+        this.auditDeptid = auditDeptid;
+    }
+
+    public Long getAuditDeptid()
+    {
+        return auditDeptid;
+    }
+    public void setAuditName(String auditName)
+    {
+        this.auditName = auditName;
+    }
+
+    public String getAuditName()
+    {
+        return auditName;
+    }
+    public void setAuditResult(String auditResult)
+    {
+        this.auditResult = auditResult;
+    }
+
+    public String getAuditResult()
+    {
+        return auditResult;
+    }
+    public void setAuditReason(String auditReason)
+    {
+        this.auditReason = auditReason;
+    }
+
+    public String getAuditReason()
+    {
+        return auditReason;
+    }
     public void setShRemark(String shRemark)
     {
         this.shRemark = shRemark;
@@ -270,6 +336,11 @@ public class SzxcXcRecard extends BaseEntity
                 .append("reform", getReform())
                 .append("zgProgress", getZgProgress())
                 .append("xcStatus", getXcStatus())
+                .append("auditDept", getAuditDept())
+                .append("auditDeptid", getAuditDeptid())
+                .append("auditName", getAuditName())
+                .append("auditResult", getAuditResult())
+                .append("auditReason", getAuditReason())
                 .append("shRemark", getShRemark())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.szxc.mapper.SzxcButieMapper">
 
     <resultMap type="SzxcButie" id="SzxcButieResult">
@@ -16,6 +16,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="content"    column="content"    />
         <result property="zfStatus"    column="zf_status"    />
         <result property="shRemark"    column="sh_remark"    />
+        <result property="auditName"    column="audit_name"    />
+        <result property="auditResult"    column="audit_result"    />
+        <result property="auditReason"    column="audit_reason"    />
+        <result property="auditDeptid"    column="audit_deptid"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -26,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSzxcButieVo">
-        select id, type, xm_title, xm_id, year, money, jm_id, name, content, zf_status, sh_remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_butie
+        select id, type, xm_title, xm_id, year, money, jm_id, name, content, zf_status, sh_remark, audit_name, audit_result, audit_reason, audit_deptid, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_butie
     </sql>
 
     <select id="selectSzxcButieList" parameterType="SzxcButie" resultMap="SzxcButieResult">
@@ -42,6 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="zfStatus != null  and zfStatus != ''"> and zf_status = #{zfStatus}</if>
             <if test="shRemark != null  and shRemark != ''"> and sh_remark = #{shRemark}</if>
+            <if test="auditName != null  and auditName != ''"> and audit_name like concat('%', #{auditName}, '%')</if>
+            <if test="auditResult != null  and auditResult != ''"> and audit_result = #{auditResult}</if>
+            <if test="auditReason != null  and auditReason != ''"> and audit_reason = #{auditReason}</if>
+            <if test="auditDeptid != null "> and audit_deptid = #{auditDeptid}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
@@ -66,6 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null">content,</if>
             <if test="zfStatus != null">zf_status,</if>
             <if test="shRemark != null">sh_remark,</if>
+            <if test="auditName != null">audit_name,</if>
+            <if test="auditResult != null">audit_result,</if>
+            <if test="auditReason != null">audit_reason,</if>
+            <if test="auditDeptid != null">audit_deptid,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -85,6 +97,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null">#{content},</if>
             <if test="zfStatus != null">#{zfStatus},</if>
             <if test="shRemark != null">#{shRemark},</if>
+            <if test="auditName != null">#{auditName},</if>
+            <if test="auditResult != null">#{auditResult},</if>
+            <if test="auditReason != null">#{auditReason},</if>
+            <if test="auditDeptid != null">#{auditDeptid},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -108,6 +124,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null">content = #{content},</if>
             <if test="zfStatus != null">zf_status = #{zfStatus},</if>
             <if test="shRemark != null">sh_remark = #{shRemark},</if>
+            <if test="auditName != null">audit_name = #{auditName},</if>
+            <if test="auditResult != null">audit_result = #{auditResult},</if>
+            <if test="auditReason != null">audit_reason = #{auditReason},</if>
+            <if test="auditDeptid != null">audit_deptid = #{auditDeptid},</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>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.szxc.mapper.SzxcHelpMapper">
 
     <resultMap type="SzxcHelp" id="SzxcHelpResult">
@@ -13,6 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="title"    column="title"    />
         <result property="content"    column="content"    />
         <result property="helpStatus"    column="help_status"    />
+        <result property="handleDept"    column="handle_dept"    />
+        <result property="handleDeptid"    column="handle__deptid"    />
+        <result property="handleName"    column="handle__name"    />
+        <result property="handleResult"    column="handle__result"    />
+        <result property="handleReason"    column="handle__reason"    />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -24,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSzxcHelpVo">
-        select id, sub_name, sub_date, phone, sb_type, title, content, help_status, remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_help
+        select id, sub_name, sub_date, phone, sb_type, title, content, help_status, handle_dept, handle__deptid, handle__name, handle__result, handle__reason, remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_help
     </sql>
 
     <select id="selectSzxcHelpList" parameterType="SzxcHelp" resultMap="SzxcHelpResult">
@@ -37,6 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null  and title != ''"> and title = #{title}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="helpStatus != null  and helpStatus != ''"> and help_status = #{helpStatus}</if>
+            <if test="handleDept != null  and handleDept != ''"> and handle_dept = #{handleDept}</if>
+            <if test="handleDeptid != null "> and handle__deptid = #{handleDeptid}</if>
+            <if test="handleName != null  and handleName != ''"> and handle__name like concat('%', #{handleName}, '%')</if>
+            <if test="handleResult != null  and handleResult != ''"> and handle__result = #{handleResult}</if>
+            <if test="handleReason != null  and handleReason != ''"> and handle__reason = #{handleReason}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
@@ -58,6 +68,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">title,</if>
             <if test="content != null">content,</if>
             <if test="helpStatus != null">help_status,</if>
+            <if test="handleDept != null">handle_dept,</if>
+            <if test="handleDeptid != null">handle__deptid,</if>
+            <if test="handleName != null">handle__name,</if>
+            <if test="handleResult != null">handle__result,</if>
+            <if test="handleReason != null">handle__reason,</if>
             <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -75,6 +90,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">#{title},</if>
             <if test="content != null">#{content},</if>
             <if test="helpStatus != null">#{helpStatus},</if>
+            <if test="handleDept != null">#{handleDept},</if>
+            <if test="handleDeptid != null">#{handleDeptid},</if>
+            <if test="handleName != null">#{handleName},</if>
+            <if test="handleResult != null">#{handleResult},</if>
+            <if test="handleReason != null">#{handleReason},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -96,6 +116,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">title = #{title},</if>
             <if test="content != null">content = #{content},</if>
             <if test="helpStatus != null">help_status = #{helpStatus},</if>
+            <if test="handleDept != null">handle_dept = #{handleDept},</if>
+            <if test="handleDeptid != null">handle__deptid = #{handleDeptid},</if>
+            <if test="handleName != null">handle__name = #{handleName},</if>
+            <if test="handleResult != null">handle__result = #{handleResult},</if>
+            <if test="handleReason != null">handle__reason = #{handleReason},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVisitRecardMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.szxc.mapper.SzxcVisitRecardMapper">
 
     <resultMap type="SzxcVisitRecard" id="SzxcVisitRecardResult">
@@ -18,6 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="content"    column="content"    />
         <result property="flowPeople"    column="flow_people"    />
         <result property="zfStatus"    column="zf_status"    />
+        <result property="auditDept"    column="audit_dept"    />
+        <result property="auditDeptid"    column="audit_deptid"    />
+        <result property="auditName"    column="audit_name"    />
+        <result property="auditResult"    column="audit_result"    />
+        <result property="auditReason"    column="audit_reason"    />
         <result property="shRemark"    column="sh_remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -29,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSzxcVisitRecardVo">
-        select id, visiter_name, submit_date, start_date, end_date, type, jm_id, visit_obj, title, picture, content, flow_people, zf_status, sh_remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_visit_recard
+        select id, visiter_name, submit_date, start_date, end_date, type, jm_id, visit_obj, title, picture, content, flow_people, zf_status, audit_dept, audit_deptid, audit_name, audit_result, audit_reason, sh_remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_visit_recard
     </sql>
 
     <select id="selectSzxcVisitRecardList" parameterType="SzxcVisitRecard" resultMap="SzxcVisitRecardResult">
@@ -47,6 +52,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="flowPeople != null  and flowPeople != ''"> and flow_people = #{flowPeople}</if>
             <if test="zfStatus != null  and zfStatus != ''"> and zf_status = #{zfStatus}</if>
+            <if test="auditDept != null  and auditDept != ''"> and audit_dept = #{auditDept}</if>
+            <if test="auditDeptid != null "> and audit_deptid = #{auditDeptid}</if>
+            <if test="auditName != null  and auditName != ''"> and audit_name like concat('%', #{auditName}, '%')</if>
+            <if test="auditResult != null  and auditResult != ''"> and audit_result = #{auditResult}</if>
+            <if test="auditReason != null  and auditReason != ''"> and audit_reason = #{auditReason}</if>
             <if test="shRemark != null  and shRemark != ''"> and sh_remark = #{shRemark}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
@@ -74,6 +84,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null">content,</if>
             <if test="flowPeople != null">flow_people,</if>
             <if test="zfStatus != null">zf_status,</if>
+            <if test="auditDept != null">audit_dept,</if>
+            <if test="auditDeptid != null">audit_deptid,</if>
+            <if test="auditName != null">audit_name,</if>
+            <if test="auditResult != null">audit_result,</if>
+            <if test="auditReason != null">audit_reason,</if>
             <if test="shRemark != null">sh_remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -96,6 +111,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null">#{content},</if>
             <if test="flowPeople != null">#{flowPeople},</if>
             <if test="zfStatus != null">#{zfStatus},</if>
+            <if test="auditDept != null">#{auditDept},</if>
+            <if test="auditDeptid != null">#{auditDeptid},</if>
+            <if test="auditName != null">#{auditName},</if>
+            <if test="auditResult != null">#{auditResult},</if>
+            <if test="auditReason != null">#{auditReason},</if>
             <if test="shRemark != null">#{shRemark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -122,6 +142,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null">content = #{content},</if>
             <if test="flowPeople != null">flow_people = #{flowPeople},</if>
             <if test="zfStatus != null">zf_status = #{zfStatus},</if>
+            <if test="auditDept != null">audit_dept = #{auditDept},</if>
+            <if test="auditDeptid != null">audit_deptid = #{auditDeptid},</if>
+            <if test="auditName != null">audit_name = #{auditName},</if>
+            <if test="auditResult != null">audit_result = #{auditResult},</if>
+            <if test="auditReason != null">audit_reason = #{auditReason},</if>
             <if test="shRemark != null">sh_remark = #{shRemark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.szxc.mapper.SzxcWorkRecardMapper">
 
     <resultMap type="SzxcWorkRecard" id="SzxcWorkRecardResult">
@@ -15,6 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="picture"    column="picture"    />
         <result property="content"    column="content"    />
         <result property="gzStatus"    column="gz_status"    />
+        <result property="auditDept"    column="audit_dept"    />
+        <result property="auditDeptid"    column="audit_deptid"    />
+        <result property="auditName"    column="audit_name"    />
+        <result property="auditResult"    column="audit_result"    />
+        <result property="auditReason"    column="audit_reason"    />
         <result property="shRemark"    column="sh_remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -26,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSzxcWorkRecardVo">
-        select id, worker_name, submit_date, start_date, end_date, type, title, picture, content, gz_status, sh_remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_work_recard
+        select id, worker_name, submit_date, start_date, end_date, type, title, picture, content, gz_status, audit_dept, audit_deptid, audit_name, audit_result, audit_reason, sh_remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_work_recard
     </sql>
 
     <select id="selectSzxcWorkRecardList" parameterType="SzxcWorkRecard" resultMap="SzxcWorkRecardResult">
@@ -41,6 +46,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="picture != null  and picture != ''"> and picture = #{picture}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="gzStatus != null  and gzStatus != ''"> and gz_status = #{gzStatus}</if>
+            <if test="auditDept != null  and auditDept != ''"> and audit_dept = #{auditDept}</if>
+            <if test="auditDeptid != null "> and audit_deptid = #{auditDeptid}</if>
+            <if test="auditName != null  and auditName != ''"> and audit_name like concat('%', #{auditName}, '%')</if>
+            <if test="auditResult != null  and auditResult != ''"> and audit_result = #{auditResult}</if>
+            <if test="auditReason != null  and auditReason != ''"> and audit_reason = #{auditReason}</if>
             <if test="shRemark != null  and shRemark != ''"> and sh_remark = #{shRemark}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
@@ -65,6 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="picture != null">picture,</if>
             <if test="content != null">content,</if>
             <if test="gzStatus != null">gz_status,</if>
+            <if test="auditDept != null">audit_dept,</if>
+            <if test="auditDeptid != null">audit_deptid,</if>
+            <if test="auditName != null">audit_name,</if>
+            <if test="auditResult != null">audit_result,</if>
+            <if test="auditReason != null">audit_reason,</if>
             <if test="shRemark != null">sh_remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -84,6 +99,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="picture != null">#{picture},</if>
             <if test="content != null">#{content},</if>
             <if test="gzStatus != null">#{gzStatus},</if>
+            <if test="auditDept != null">#{auditDept},</if>
+            <if test="auditDeptid != null">#{auditDeptid},</if>
+            <if test="auditName != null">#{auditName},</if>
+            <if test="auditResult != null">#{auditResult},</if>
+            <if test="auditReason != null">#{auditReason},</if>
             <if test="shRemark != null">#{shRemark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -107,6 +127,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="picture != null">picture = #{picture},</if>
             <if test="content != null">content = #{content},</if>
             <if test="gzStatus != null">gz_status = #{gzStatus},</if>
+            <if test="auditDept != null">audit_dept = #{auditDept},</if>
+            <if test="auditDeptid != null">audit_deptid = #{auditDeptid},</if>
+            <if test="auditName != null">audit_name = #{auditName},</if>
+            <if test="auditResult != null">audit_result = #{auditResult},</if>
+            <if test="auditReason != null">audit_reason = #{auditReason},</if>
             <if test="shRemark != null">sh_remark = #{shRemark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXcRecardMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.szxc.mapper.SzxcXcRecardMapper">
 
     <resultMap type="SzxcXcRecard" id="SzxcXcRecardResult">
@@ -19,6 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reform"    column="reform"    />
         <result property="zgProgress"    column="zg_progress"    />
         <result property="xcStatus"    column="xc_status"    />
+        <result property="auditDept"    column="audit_dept"    />
+        <result property="auditDeptid"    column="audit_deptid"    />
+        <result property="auditName"    column="audit_name"    />
+        <result property="auditResult"    column="audit_result"    />
+        <result property="auditReason"    column="audit_reason"    />
         <result property="shRemark"    column="sh_remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -30,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSzxcXcRecardVo">
-        select id, xc_name, submit_date, xc_date, type, jm_id, xc_obj, title, picture, content, flow_people, reform, zg_progress, xc_status, sh_remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_xc_recard
+        select id, xc_name, submit_date, xc_date, type, jm_id, xc_obj, title, picture, content, flow_people, reform, zg_progress, xc_status, audit_dept, audit_deptid, audit_name, audit_result, audit_reason, sh_remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_xc_recard
     </sql>
 
     <select id="selectSzxcXcRecardList" parameterType="SzxcXcRecard" resultMap="SzxcXcRecardResult">
@@ -49,6 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reform != null  and reform != ''"> and reform = #{reform}</if>
             <if test="zgProgress != null  and zgProgress != ''"> and zg_progress = #{zgProgress}</if>
             <if test="xcStatus != null  and xcStatus != ''"> and xc_status = #{xcStatus}</if>
+            <if test="auditDept != null  and auditDept != ''"> and audit_dept = #{auditDept}</if>
+            <if test="auditDeptid != null "> and audit_deptid = #{auditDeptid}</if>
+            <if test="auditName != null  and auditName != ''"> and audit_name like concat('%', #{auditName}, '%')</if>
+            <if test="auditResult != null  and auditResult != ''"> and audit_result = #{auditResult}</if>
+            <if test="auditReason != null  and auditReason != ''"> and audit_reason = #{auditReason}</if>
             <if test="shRemark != null  and shRemark != ''"> and sh_remark = #{shRemark}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
@@ -77,6 +87,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reform != null">reform,</if>
             <if test="zgProgress != null">zg_progress,</if>
             <if test="xcStatus != null">xc_status,</if>
+            <if test="auditDept != null">audit_dept,</if>
+            <if test="auditDeptid != null">audit_deptid,</if>
+            <if test="auditName != null">audit_name,</if>
+            <if test="auditResult != null">audit_result,</if>
+            <if test="auditReason != null">audit_reason,</if>
             <if test="shRemark != null">sh_remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -100,6 +115,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reform != null">#{reform},</if>
             <if test="zgProgress != null">#{zgProgress},</if>
             <if test="xcStatus != null">#{xcStatus},</if>
+            <if test="auditDept != null">#{auditDept},</if>
+            <if test="auditDeptid != null">#{auditDeptid},</if>
+            <if test="auditName != null">#{auditName},</if>
+            <if test="auditResult != null">#{auditResult},</if>
+            <if test="auditReason != null">#{auditReason},</if>
             <if test="shRemark != null">#{shRemark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -127,6 +147,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reform != null">reform = #{reform},</if>
             <if test="zgProgress != null">zg_progress = #{zgProgress},</if>
             <if test="xcStatus != null">xc_status = #{xcStatus},</if>
+            <if test="auditDept != null">audit_dept = #{auditDept},</if>
+            <if test="auditDeptid != null">audit_deptid = #{auditDeptid},</if>
+            <if test="auditName != null">audit_name = #{auditName},</if>
+            <if test="auditResult != null">audit_result = #{auditResult},</if>
+            <if test="auditReason != null">audit_reason = #{auditReason},</if>
             <if test="shRemark != null">sh_remark = #{shRemark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>