diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcButie.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcButie.java index 6197502..45c8d67 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcButie.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcButie.java @@ -7,9 +7,9 @@ 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; @@ -70,129 +86,165 @@ public class SzxcButie extends BaseEntity @Excel(name = "创建者ID") private Long userId; - public void setId(Long id) + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setType(String type) + public void setType(String type) { this.type = type; } - public String getType() + public String getType() { return type; } - public void setXmTitle(String xmTitle) + public void setXmTitle(String xmTitle) { this.xmTitle = xmTitle; } - public String getXmTitle() + public String getXmTitle() { return xmTitle; } - public void setXmId(Long xmId) + public void setXmId(Long xmId) { this.xmId = xmId; } - public Long getXmId() + public Long getXmId() { return xmId; } - public void setYear(String year) + public void setYear(String year) { this.year = year; } - public String getYear() + public String getYear() { return year; } - public void setMoney(String money) + public void setMoney(String money) { this.money = money; } - public String getMoney() + public String getMoney() { return money; } - public void setJmId(Long jmId) + public void setJmId(Long jmId) { this.jmId = jmId; } - public Long getJmId() + public Long getJmId() { return jmId; } - public void setName(String name) + public void setName(String name) { this.name = name; } - public String getName() + public String getName() { return name; } - public void setContent(String content) + public void setContent(String content) { this.content = content; } - public String getContent() + public String getContent() { return content; } - public void setZfStatus(String zfStatus) + public void setZfStatus(String zfStatus) { this.zfStatus = zfStatus; } - public String getZfStatus() + public String getZfStatus() { return zfStatus; } - public void setShRemark(String shRemark) + public void setShRemark(String shRemark) { this.shRemark = shRemark; } - public String getShRemark() + public String getShRemark() { return shRemark; } - public void setDeptId(Long deptId) + 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; } - public Long getDeptId() + public Long getDeptId() { return deptId; } - public void setDeptName(String deptName) + public void setDeptName(String deptName) { this.deptName = deptName; } - public String getDeptName() + public String getDeptName() { return deptName; } - public void setUserId(Long userId) + public void setUserId(Long userId) { this.userId = userId; } - public Long getUserId() + public Long getUserId() { return userId; } @@ -200,24 +252,28 @@ public class SzxcButie extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("type", getType()) - .append("xmTitle", getXmTitle()) - .append("xmId", getXmId()) - .append("year", getYear()) - .append("money", getMoney()) - .append("jmId", getJmId()) - .append("name", getName()) - .append("content", getContent()) - .append("zfStatus", getZfStatus()) - .append("shRemark", getShRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("deptId", getDeptId()) - .append("deptName", getDeptName()) - .append("userId", getUserId()) - .toString(); + .append("id", getId()) + .append("type", getType()) + .append("xmTitle", getXmTitle()) + .append("xmId", getXmId()) + .append("year", getYear()) + .append("money", getMoney()) + .append("jmId", getJmId()) + .append("name", getName()) + .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()) + .append("updateTime", getUpdateTime()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("userId", getUserId()) + .toString(); } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHelp.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHelp.java index d1e074c..6286c34 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHelp.java +++ b/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; @@ -61,102 +82,147 @@ public class SzxcHelp extends BaseEntity @Excel(name = "创建者ID") private Long userId; - public void setId(Long id) + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setSubName(String subName) + public void setSubName(String subName) { this.subName = subName; } - public String getSubName() + public String getSubName() { return subName; } - public void setSubDate(Date subDate) + public void setSubDate(Date subDate) { this.subDate = subDate; } - public Date getSubDate() + public Date getSubDate() { return subDate; } - public void setPhone(String phone) + public void setPhone(String phone) { this.phone = phone; } - public String getPhone() + public String getPhone() { return phone; } - public void setSbType(String sbType) + public void setSbType(String sbType) { this.sbType = sbType; } - public String getSbType() + public String getSbType() { return sbType; } - public void setTitle(String title) + public void setTitle(String title) { this.title = title; } - public String getTitle() + public String getTitle() { return title; } - public void setContent(String content) + public void setContent(String content) { this.content = content; } - public String getContent() + public String getContent() { return content; } - public void setHelpStatus(String helpStatus) + public void setHelpStatus(String helpStatus) { this.helpStatus = helpStatus; } - public String getHelpStatus() + public String getHelpStatus() { return helpStatus; } - public void setDeptId(Long deptId) + 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; } - public Long getDeptId() + public Long getDeptId() { return deptId; } - public void setDeptName(String deptName) + public void setDeptName(String deptName) { this.deptName = deptName; } - public String getDeptName() + public String getDeptName() { return deptName; } - public void setUserId(Long userId) + public void setUserId(Long userId) { this.userId = userId; } - public Long getUserId() + public Long getUserId() { return userId; } @@ -164,22 +230,27 @@ public class SzxcHelp extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("subName", getSubName()) - .append("subDate", getSubDate()) - .append("phone", getPhone()) - .append("sbType", getSbType()) - .append("title", getTitle()) - .append("content", getContent()) - .append("helpStatus", getHelpStatus()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("deptId", getDeptId()) - .append("deptName", getDeptName()) - .append("userId", getUserId()) - .toString(); + .append("id", getId()) + .append("subName", getSubName()) + .append("subDate", getSubDate()) + .append("phone", getPhone()) + .append("sbType", getSbType()) + .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()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("userId", getUserId()) + .toString(); } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVisitRecard.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVisitRecard.java index 287a27b..f082f30 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVisitRecard.java +++ b/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 */ @@ -87,156 +108,201 @@ public class SzxcVisitRecard extends BaseEntity @Excel(name = "创建者ID") private Long userId; - public void setId(Long id) + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setVisiterName(String visiterName) + public void setVisiterName(String visiterName) { this.visiterName = visiterName; } - public String getVisiterName() + public String getVisiterName() { return visiterName; } - public void setSubmitDate(Date submitDate) + public void setSubmitDate(Date submitDate) { this.submitDate = submitDate; } - public Date getSubmitDate() + public Date getSubmitDate() { return submitDate; } - public void setStartDate(Date startDate) + public void setStartDate(Date startDate) { this.startDate = startDate; } - public Date getStartDate() + public Date getStartDate() { return startDate; } - public void setEndDate(Date endDate) + public void setEndDate(Date endDate) { this.endDate = endDate; } - public Date getEndDate() + public Date getEndDate() { return endDate; } - public void setType(String type) + public void setType(String type) { this.type = type; } - public String getType() + public String getType() { return type; } - public void setJmId(Long jmId) + public void setJmId(Long jmId) { this.jmId = jmId; } - public Long getJmId() + public Long getJmId() { return jmId; } - public void setVisitObj(String visitObj) + public void setVisitObj(String visitObj) { this.visitObj = visitObj; } - public String getVisitObj() + public String getVisitObj() { return visitObj; } - public void setTitle(String title) + public void setTitle(String title) { this.title = title; } - public String getTitle() + public String getTitle() { return title; } - public void setPicture(String picture) + public void setPicture(String picture) { this.picture = picture; } - public String getPicture() + public String getPicture() { return picture; } - public void setContent(String content) + public void setContent(String content) { this.content = content; } - public String getContent() + public String getContent() { return content; } - public void setFlowPeople(String flowPeople) + public void setFlowPeople(String flowPeople) { this.flowPeople = flowPeople; } - public String getFlowPeople() + public String getFlowPeople() { return flowPeople; } - public void setZfStatus(String zfStatus) + public void setZfStatus(String zfStatus) { this.zfStatus = zfStatus; } - public String getZfStatus() + public String getZfStatus() { return zfStatus; } - public void setShRemark(String shRemark) + 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; } - public String getShRemark() + public String getShRemark() { return shRemark; } - public void setDeptId(Long deptId) + public void setDeptId(Long deptId) { this.deptId = deptId; } - public Long getDeptId() + public Long getDeptId() { return deptId; } - public void setDeptName(String deptName) + public void setDeptName(String deptName) { this.deptName = deptName; } - public String getDeptName() + public String getDeptName() { return deptName; } - public void setUserId(Long userId) + public void setUserId(Long userId) { this.userId = userId; } - public Long getUserId() + public Long getUserId() { return userId; } @@ -244,27 +310,32 @@ public class SzxcVisitRecard extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("visiterName", getVisiterName()) - .append("submitDate", getSubmitDate()) - .append("startDate", getStartDate()) - .append("endDate", getEndDate()) - .append("type", getType()) - .append("jmId", getJmId()) - .append("visitObj", getVisitObj()) - .append("title", getTitle()) - .append("picture", getPicture()) - .append("content", getContent()) - .append("flowPeople", getFlowPeople()) - .append("zfStatus", getZfStatus()) - .append("shRemark", getShRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("deptId", getDeptId()) - .append("deptName", getDeptName()) - .append("userId", getUserId()) - .toString(); + .append("id", getId()) + .append("visiterName", getVisiterName()) + .append("submitDate", getSubmitDate()) + .append("startDate", getStartDate()) + .append("endDate", getEndDate()) + .append("type", getType()) + .append("jmId", getJmId()) + .append("visitObj", getVisitObj()) + .append("title", getTitle()) + .append("picture", getPicture()) + .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()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("userId", getUserId()) + .toString(); } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcWorkRecard.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcWorkRecard.java index 1351348..0a28b8a 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcWorkRecard.java +++ b/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 */ @@ -75,129 +96,174 @@ public class SzxcWorkRecard extends BaseEntity @Excel(name = "创建者ID") private Long userId; - public void setId(Long id) + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setWorkerName(String workerName) + public void setWorkerName(String workerName) { this.workerName = workerName; } - public String getWorkerName() + public String getWorkerName() { return workerName; } - public void setSubmitDate(Date submitDate) + public void setSubmitDate(Date submitDate) { this.submitDate = submitDate; } - public Date getSubmitDate() + public Date getSubmitDate() { return submitDate; } - public void setStartDate(Date startDate) + public void setStartDate(Date startDate) { this.startDate = startDate; } - public Date getStartDate() + public Date getStartDate() { return startDate; } - public void setEndDate(Date endDate) + public void setEndDate(Date endDate) { this.endDate = endDate; } - public Date getEndDate() + public Date getEndDate() { return endDate; } - public void setType(String type) + public void setType(String type) { this.type = type; } - public String getType() + public String getType() { return type; } - public void setTitle(String title) + public void setTitle(String title) { this.title = title; } - public String getTitle() + public String getTitle() { return title; } - public void setPicture(String picture) + public void setPicture(String picture) { this.picture = picture; } - public String getPicture() + public String getPicture() { return picture; } - public void setContent(String content) + public void setContent(String content) { this.content = content; } - public String getContent() + public String getContent() { return content; } - public void setGzStatus(String gzStatus) + public void setGzStatus(String gzStatus) { this.gzStatus = gzStatus; } - public String getGzStatus() + public String getGzStatus() { return gzStatus; } - public void setShRemark(String shRemark) + 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; } - public String getShRemark() + public String getShRemark() { return shRemark; } - public void setDeptId(Long deptId) + public void setDeptId(Long deptId) { this.deptId = deptId; } - public Long getDeptId() + public Long getDeptId() { return deptId; } - public void setDeptName(String deptName) + public void setDeptName(String deptName) { this.deptName = deptName; } - public String getDeptName() + public String getDeptName() { return deptName; } - public void setUserId(Long userId) + public void setUserId(Long userId) { this.userId = userId; } - public Long getUserId() + public Long getUserId() { return userId; } @@ -205,24 +271,29 @@ public class SzxcWorkRecard extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("workerName", getWorkerName()) - .append("submitDate", getSubmitDate()) - .append("startDate", getStartDate()) - .append("endDate", getEndDate()) - .append("type", getType()) - .append("title", getTitle()) - .append("picture", getPicture()) - .append("content", getContent()) - .append("gzStatus", getGzStatus()) - .append("shRemark", getShRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("deptId", getDeptId()) - .append("deptName", getDeptName()) - .append("userId", getUserId()) - .toString(); + .append("id", getId()) + .append("workerName", getWorkerName()) + .append("submitDate", getSubmitDate()) + .append("startDate", getStartDate()) + .append("endDate", getEndDate()) + .append("type", getType()) + .append("title", getTitle()) + .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()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("userId", getUserId()) + .toString(); } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXcRecard.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXcRecard.java index 6254d32..112568e 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXcRecard.java +++ b/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 */ @@ -90,165 +111,210 @@ public class SzxcXcRecard extends BaseEntity @Excel(name = "创建者ID") private Long userId; - public void setId(Long id) + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setXcName(String xcName) + public void setXcName(String xcName) { this.xcName = xcName; } - public String getXcName() + public String getXcName() { return xcName; } - public void setSubmitDate(Date submitDate) + public void setSubmitDate(Date submitDate) { this.submitDate = submitDate; } - public Date getSubmitDate() + public Date getSubmitDate() { return submitDate; } - public void setXcDate(Date xcDate) + public void setXcDate(Date xcDate) { this.xcDate = xcDate; } - public Date getXcDate() + public Date getXcDate() { return xcDate; } - public void setType(String type) + public void setType(String type) { this.type = type; } - public String getType() + public String getType() { return type; } - public void setJmId(Long jmId) + public void setJmId(Long jmId) { this.jmId = jmId; } - public Long getJmId() + public Long getJmId() { return jmId; } - public void setXcObj(String xcObj) + public void setXcObj(String xcObj) { this.xcObj = xcObj; } - public String getXcObj() + public String getXcObj() { return xcObj; } - public void setTitle(String title) + public void setTitle(String title) { this.title = title; } - public String getTitle() + public String getTitle() { return title; } - public void setPicture(String picture) + public void setPicture(String picture) { this.picture = picture; } - public String getPicture() + public String getPicture() { return picture; } - public void setContent(String content) + public void setContent(String content) { this.content = content; } - public String getContent() + public String getContent() { return content; } - public void setFlowPeople(String flowPeople) + public void setFlowPeople(String flowPeople) { this.flowPeople = flowPeople; } - public String getFlowPeople() + public String getFlowPeople() { return flowPeople; } - public void setReform(String reform) + public void setReform(String reform) { this.reform = reform; } - public String getReform() + public String getReform() { return reform; } - public void setZgProgress(String zgProgress) + public void setZgProgress(String zgProgress) { this.zgProgress = zgProgress; } - public String getZgProgress() + public String getZgProgress() { return zgProgress; } - public void setXcStatus(String xcStatus) + public void setXcStatus(String xcStatus) { this.xcStatus = xcStatus; } - public String getXcStatus() + public String getXcStatus() { return xcStatus; } - public void setShRemark(String shRemark) + 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; } - public String getShRemark() + public String getShRemark() { return shRemark; } - public void setDeptId(Long deptId) + public void setDeptId(Long deptId) { this.deptId = deptId; } - public Long getDeptId() + public Long getDeptId() { return deptId; } - public void setDeptName(String deptName) + public void setDeptName(String deptName) { this.deptName = deptName; } - public String getDeptName() + public String getDeptName() { return deptName; } - public void setUserId(Long userId) + public void setUserId(Long userId) { this.userId = userId; } - public Long getUserId() + public Long getUserId() { return userId; } @@ -256,28 +322,33 @@ public class SzxcXcRecard extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("xcName", getXcName()) - .append("submitDate", getSubmitDate()) - .append("xcDate", getXcDate()) - .append("type", getType()) - .append("jmId", getJmId()) - .append("xcObj", getXcObj()) - .append("title", getTitle()) - .append("picture", getPicture()) - .append("content", getContent()) - .append("flowPeople", getFlowPeople()) - .append("reform", getReform()) - .append("zgProgress", getZgProgress()) - .append("xcStatus", getXcStatus()) - .append("shRemark", getShRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("deptId", getDeptId()) - .append("deptName", getDeptName()) - .append("userId", getUserId()) - .toString(); + .append("id", getId()) + .append("xcName", getXcName()) + .append("submitDate", getSubmitDate()) + .append("xcDate", getXcDate()) + .append("type", getType()) + .append("jmId", getJmId()) + .append("xcObj", getXcObj()) + .append("title", getTitle()) + .append("picture", getPicture()) + .append("content", getContent()) + .append("flowPeople", getFlowPeople()) + .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()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("userId", getUserId()) + .toString(); } } diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml index 09846ba..59bca86 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -16,6 +16,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -26,12 +30,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - + - + insert into szxc_butie @@ -66,6 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content, zf_status, sh_remark, + audit_name, + audit_result, + audit_reason, + audit_deptid, create_by, create_time, update_by, @@ -73,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id, dept_name, user_id, - + #{type}, #{xmTitle}, @@ -85,6 +97,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{content}, #{zfStatus}, #{shRemark}, + #{auditName}, + #{auditResult}, + #{auditReason}, + #{auditDeptid}, #{createBy}, #{createTime}, #{updateBy}, @@ -92,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deptId}, #{deptName}, #{userId}, - + @@ -108,6 +124,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content = #{content}, zf_status = #{zfStatus}, sh_remark = #{shRemark}, + audit_name = #{auditName}, + audit_result = #{auditResult}, + audit_reason = #{auditReason}, + audit_deptid = #{auditDeptid}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, @@ -124,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from szxc_butie where id in + delete from szxc_butie where id in #{id} diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml index 8c29771..64f71a7 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -13,6 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -24,12 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - + - + insert into szxc_help @@ -58,6 +68,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" title, content, help_status, + handle_dept, + handle__deptid, + handle__name, + handle__result, + handle__reason, remark, create_by, create_time, @@ -66,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id, dept_name, user_id, - + #{subName}, #{subDate}, @@ -75,6 +90,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{title}, #{content}, #{helpStatus}, + #{handleDept}, + #{handleDeptid}, + #{handleName}, + #{handleResult}, + #{handleReason}, #{remark}, #{createBy}, #{createTime}, @@ -83,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deptId}, #{deptName}, #{userId}, - + @@ -96,6 +116,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" title = #{title}, content = #{content}, help_status = #{helpStatus}, + handle_dept = #{handleDept}, + handle__deptid = #{handleDeptid}, + handle__name = #{handleName}, + handle__result = #{handleResult}, + handle__reason = #{handleReason}, remark = #{remark}, create_by = #{createBy}, create_time = #{createTime}, @@ -113,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from szxc_help where id in + delete from szxc_help where id in #{id} diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVisitRecardMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVisitRecardMapper.xml index 66f8fab..43b3ef7 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVisitRecardMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVisitRecardMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -18,6 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -29,12 +34,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - + - + insert into szxc_visit_recard @@ -74,6 +84,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content, flow_people, zf_status, + audit_dept, + audit_deptid, + audit_name, + audit_result, + audit_reason, sh_remark, create_by, create_time, @@ -82,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id, dept_name, user_id, - + #{visiterName}, #{submitDate}, @@ -96,6 +111,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{content}, #{flowPeople}, #{zfStatus}, + #{auditDept}, + #{auditDeptid}, + #{auditName}, + #{auditResult}, + #{auditReason}, #{shRemark}, #{createBy}, #{createTime}, @@ -104,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deptId}, #{deptName}, #{userId}, - + @@ -122,6 +142,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content = #{content}, flow_people = #{flowPeople}, zf_status = #{zfStatus}, + audit_dept = #{auditDept}, + audit_deptid = #{auditDeptid}, + audit_name = #{auditName}, + audit_result = #{auditResult}, + audit_reason = #{auditReason}, sh_remark = #{shRemark}, create_by = #{createBy}, create_time = #{createTime}, @@ -139,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from szxc_visit_recard where id in + delete from szxc_visit_recard where id in #{id} diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml index df35fa8..5c7575f 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -15,6 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -26,12 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - + - + insert into szxc_work_recard @@ -65,6 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" picture, content, gz_status, + audit_dept, + audit_deptid, + audit_name, + audit_result, + audit_reason, sh_remark, create_by, create_time, @@ -73,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id, dept_name, user_id, - + #{workerName}, #{submitDate}, @@ -84,6 +99,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{picture}, #{content}, #{gzStatus}, + #{auditDept}, + #{auditDeptid}, + #{auditName}, + #{auditResult}, + #{auditReason}, #{shRemark}, #{createBy}, #{createTime}, @@ -92,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deptId}, #{deptName}, #{userId}, - + @@ -107,6 +127,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" picture = #{picture}, content = #{content}, gz_status = #{gzStatus}, + audit_dept = #{auditDept}, + audit_deptid = #{auditDeptid}, + audit_name = #{auditName}, + audit_result = #{auditResult}, + audit_reason = #{auditReason}, sh_remark = #{shRemark}, create_by = #{createBy}, create_time = #{createTime}, @@ -124,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from szxc_work_recard where id in + delete from szxc_work_recard where id in #{id} diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXcRecardMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXcRecardMapper.xml index 34ede11..bc11a79 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXcRecardMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXcRecardMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -19,6 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -30,12 +35,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - + - + insert into szxc_xc_recard @@ -77,6 +87,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" reform, zg_progress, xc_status, + audit_dept, + audit_deptid, + audit_name, + audit_result, + audit_reason, sh_remark, create_by, create_time, @@ -85,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id, dept_name, user_id, - + #{xcName}, #{submitDate}, @@ -100,6 +115,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{reform}, #{zgProgress}, #{xcStatus}, + #{auditDept}, + #{auditDeptid}, + #{auditName}, + #{auditResult}, + #{auditReason}, #{shRemark}, #{createBy}, #{createTime}, @@ -108,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deptId}, #{deptName}, #{userId}, - + @@ -127,6 +147,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" reform = #{reform}, zg_progress = #{zgProgress}, xc_status = #{xcStatus}, + audit_dept = #{auditDept}, + audit_deptid = #{auditDeptid}, + audit_name = #{auditName}, + audit_result = #{auditResult}, + audit_reason = #{auditReason}, sh_remark = #{shRemark}, create_by = #{createBy}, create_time = #{createTime}, @@ -144,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from szxc_xc_recard where id in + delete from szxc_xc_recard where id in #{id}