hansha
/
szxc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
main 11
hansha 2 years ago
parent ef6d7cb76d
commit 4bcde21b7f
10 changed files with 790 additions and 330 deletions
Show Stats Download Patch File Download Diff File

158
ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcButie.java
Unescape View File

@ -7,9 +7,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 补贴管理对象 szxc_butie * 补贴管理对象 szxc_butie
* *
* @author hs * @author hs
* @date 2024-03-20 * @date 2024-04-15
*/ */
public class SzxcButie extends BaseEntity public class SzxcButie extends BaseEntity
{ {
@ -54,10 +54,26 @@ public class SzxcButie extends BaseEntity
@Excel(name = "审核状态") @Excel(name = "审核状态")
private String zfStatus; private String zfStatus;
/** 审核备注 */ /** 备注 */
@Excel(name = "审核备注") @Excel(name = "备注")
private String shRemark; 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 */ /** 部门id */
@Excel(name = "部门id") @Excel(name = "部门id")
private Long deptId; private Long deptId;
@ -70,129 +86,165 @@ public class SzxcButie extends BaseEntity
@Excel(name = "创建者ID") @Excel(name = "创建者ID")
private Long userId; private Long userId;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
public Long getId() public Long getId()
{ {
return id; return id;
} }
public void setType(String type) public void setType(String type)
{ {
this.type = type; this.type = type;
} }
public String getType() public String getType()
{ {
return type; return type;
} }
public void setXmTitle(String xmTitle) public void setXmTitle(String xmTitle)
{ {
this.xmTitle = xmTitle; this.xmTitle = xmTitle;
} }
public String getXmTitle() public String getXmTitle()
{ {
return xmTitle; return xmTitle;
} }
public void setXmId(Long xmId) public void setXmId(Long xmId)
{ {
this.xmId = xmId; this.xmId = xmId;
} }
public Long getXmId() public Long getXmId()
{ {
return xmId; return xmId;
} }
public void setYear(String year) public void setYear(String year)
{ {
this.year = year; this.year = year;
} }
public String getYear() public String getYear()
{ {
return year; return year;
} }
public void setMoney(String money) public void setMoney(String money)
{ {
this.money = money; this.money = money;
} }
public String getMoney() public String getMoney()
{ {
return money; return money;
} }
public void setJmId(Long jmId) public void setJmId(Long jmId)
{ {
this.jmId = jmId; this.jmId = jmId;
} }
public Long getJmId() public Long getJmId()
{ {
return jmId; return jmId;
} }
public void setName(String name) public void setName(String name)
{ {
this.name = name; this.name = name;
} }
public String getName() public String getName()
{ {
return name; return name;
} }
public void setContent(String content) public void setContent(String content)
{ {
this.content = content; this.content = content;
} }
public String getContent() public String getContent()
{ {
return content; return content;
} }
public void setZfStatus(String zfStatus) public void setZfStatus(String zfStatus)
{ {
this.zfStatus = zfStatus; this.zfStatus = zfStatus;
} }
public String getZfStatus() public String getZfStatus()
{ {
return zfStatus; return zfStatus;
} }
public void setShRemark(String shRemark) public void setShRemark(String shRemark)
{ {
this.shRemark = shRemark; this.shRemark = shRemark;
} }
public String getShRemark() public String getShRemark()
{ {
return shRemark; 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; this.deptId = deptId;
} }
public Long getDeptId() public Long getDeptId()
{ {
return deptId; return deptId;
} }
public void setDeptName(String deptName) public void setDeptName(String deptName)
{ {
this.deptName = deptName; this.deptName = deptName;
} }
public String getDeptName() public String getDeptName()
{ {
return deptName; return deptName;
} }
public void setUserId(Long userId) public void setUserId(Long userId)
{ {
this.userId = userId; this.userId = userId;
} }
public Long getUserId() public Long getUserId()
{ {
return userId; return userId;
} }
@ -200,24 +252,28 @@ public class SzxcButie extends BaseEntity
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId()) .append("id", getId())
.append("type", getType()) .append("type", getType())
.append("xmTitle", getXmTitle()) .append("xmTitle", getXmTitle())
.append("xmId", getXmId()) .append("xmId", getXmId())
.append("year", getYear()) .append("year", getYear())
.append("money", getMoney()) .append("money", getMoney())
.append("jmId", getJmId()) .append("jmId", getJmId())
.append("name", getName()) .append("name", getName())
.append("content", getContent()) .append("content", getContent())
.append("zfStatus", getZfStatus()) .append("zfStatus", getZfStatus())
.append("shRemark", getShRemark()) .append("shRemark", getShRemark())
.append("createBy", getCreateBy()) .append("auditName", getAuditName())
.append("createTime", getCreateTime()) .append("auditResult", getAuditResult())
.append("updateBy", getUpdateBy()) .append("auditReason", getAuditReason())
.append("updateTime", getUpdateTime()) .append("auditDeptid", getAuditDeptid())
.append("deptId", getDeptId()) .append("createBy", getCreateBy())
.append("deptName", getDeptName()) .append("createTime", getCreateTime())
.append("userId", getUserId()) .append("updateBy", getUpdateBy())
.toString(); .append("updateTime", getUpdateTime())
.append("deptId", getDeptId())
.append("deptName", getDeptName())
.append("userId", getUserId())
.toString();
} }
} }

163
ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHelp.java
Unescape View File

@ -1,17 +1,18 @@
package com.ruoyi.szxc.domain; package com.ruoyi.szxc.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; 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.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; 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 * 帮办事对象 szxc_help
* *
* @author hs * @author hs
* @date 2024-03-20 * @date 2024-04-15
*/ */
public class SzxcHelp extends BaseEntity public class SzxcHelp extends BaseEntity
{ {
@ -45,10 +46,30 @@ public class SzxcHelp extends BaseEntity
@Excel(name = "事项描述") @Excel(name = "事项描述")
private String content; private String content;
/** 处理进度(字典审核状态) */ /** 处理进度(字典) */
@Excel(name = "处理进度(字典审核状态)") @Excel(name = "处理进度(字典)")
private String helpStatus; 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 */ /** 部门id */
@Excel(name = "部门id") @Excel(name = "部门id")
private Long deptId; private Long deptId;
@ -61,102 +82,147 @@ public class SzxcHelp extends BaseEntity
@Excel(name = "创建者ID") @Excel(name = "创建者ID")
private Long userId; private Long userId;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
public Long getId() public Long getId()
{ {
return id; return id;
} }
public void setSubName(String subName) public void setSubName(String subName)
{ {
this.subName = subName; this.subName = subName;
} }
public String getSubName() public String getSubName()
{ {
return subName; return subName;
} }
public void setSubDate(Date subDate) public void setSubDate(Date subDate)
{ {
this.subDate = subDate; this.subDate = subDate;
} }
public Date getSubDate() public Date getSubDate()
{ {
return subDate; return subDate;
} }
public void setPhone(String phone) public void setPhone(String phone)
{ {
this.phone = phone; this.phone = phone;
} }
public String getPhone() public String getPhone()
{ {
return phone; return phone;
} }
public void setSbType(String sbType) public void setSbType(String sbType)
{ {
this.sbType = sbType; this.sbType = sbType;
} }
public String getSbType() public String getSbType()
{ {
return sbType; return sbType;
} }
public void setTitle(String title) public void setTitle(String title)
{ {
this.title = title; this.title = title;
} }
public String getTitle() public String getTitle()
{ {
return title; return title;
} }
public void setContent(String content) public void setContent(String content)
{ {
this.content = content; this.content = content;
} }
public String getContent() public String getContent()
{ {
return content; return content;
} }
public void setHelpStatus(String helpStatus) public void setHelpStatus(String helpStatus)
{ {
this.helpStatus = helpStatus; this.helpStatus = helpStatus;
} }
public String getHelpStatus() public String getHelpStatus()
{ {
return helpStatus; 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; this.deptId = deptId;
} }
public Long getDeptId() public Long getDeptId()
{ {
return deptId; return deptId;
} }
public void setDeptName(String deptName) public void setDeptName(String deptName)
{ {
this.deptName = deptName; this.deptName = deptName;
} }
public String getDeptName() public String getDeptName()
{ {
return deptName; return deptName;
} }
public void setUserId(Long userId) public void setUserId(Long userId)
{ {
this.userId = userId; this.userId = userId;
} }
public Long getUserId() public Long getUserId()
{ {
return userId; return userId;
} }
@ -164,22 +230,27 @@ public class SzxcHelp extends BaseEntity
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId()) .append("id", getId())
.append("subName", getSubName()) .append("subName", getSubName())
.append("subDate", getSubDate()) .append("subDate", getSubDate())
.append("phone", getPhone()) .append("phone", getPhone())
.append("sbType", getSbType()) .append("sbType", getSbType())
.append("title", getTitle()) .append("title", getTitle())
.append("content", getContent()) .append("content", getContent())
.append("helpStatus", getHelpStatus()) .append("helpStatus", getHelpStatus())
.append("remark", getRemark()) .append("handleDept", getHandleDept())
.append("createBy", getCreateBy()) .append("handleDeptid", getHandleDeptid())
.append("createTime", getCreateTime()) .append("handleName", getHandleName())
.append("updateBy", getUpdateBy()) .append("handleResult", getHandleResult())
.append("updateTime", getUpdateTime()) .append("handleReason", getHandleReason())
.append("deptId", getDeptId()) .append("remark", getRemark())
.append("deptName", getDeptName()) .append("createBy", getCreateBy())
.append("userId", getUserId()) .append("createTime", getCreateTime())
.toString(); .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("deptId", getDeptId())
.append("deptName", getDeptName())
.append("userId", getUserId())
.toString();
} }
} }

197
ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVisitRecard.java
Unescape View File

@ -1,17 +1,18 @@
package com.ruoyi.szxc.domain; package com.ruoyi.szxc.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; 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.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; 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 * 走访记录对象 szxc_visit_recard
* *
* @author hs * @author hs
* @date 2024-03-20 * @date 2024-04-15
*/ */
public class SzxcVisitRecard extends BaseEntity public class SzxcVisitRecard extends BaseEntity
{ {
@ -71,8 +72,28 @@ public class SzxcVisitRecard extends BaseEntity
@Excel(name = "审核状态") @Excel(name = "审核状态")
private String zfStatus; 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; private String shRemark;
/** 部门id */ /** 部门id */
@ -87,156 +108,201 @@ public class SzxcVisitRecard extends BaseEntity
@Excel(name = "创建者ID") @Excel(name = "创建者ID")
private Long userId; private Long userId;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
public Long getId() public Long getId()
{ {
return id; return id;
} }
public void setVisiterName(String visiterName) public void setVisiterName(String visiterName)
{ {
this.visiterName = visiterName; this.visiterName = visiterName;
} }
public String getVisiterName() public String getVisiterName()
{ {
return visiterName; return visiterName;
} }
public void setSubmitDate(Date submitDate) public void setSubmitDate(Date submitDate)
{ {
this.submitDate = submitDate; this.submitDate = submitDate;
} }
public Date getSubmitDate() public Date getSubmitDate()
{ {
return submitDate; return submitDate;
} }
public void setStartDate(Date startDate) public void setStartDate(Date startDate)
{ {
this.startDate = startDate; this.startDate = startDate;
} }
public Date getStartDate() public Date getStartDate()
{ {
return startDate; return startDate;
} }
public void setEndDate(Date endDate) public void setEndDate(Date endDate)
{ {
this.endDate = endDate; this.endDate = endDate;
} }
public Date getEndDate() public Date getEndDate()
{ {
return endDate; return endDate;
} }
public void setType(String type) public void setType(String type)
{ {
this.type = type; this.type = type;
} }
public String getType() public String getType()
{ {
return type; return type;
} }
public void setJmId(Long jmId) public void setJmId(Long jmId)
{ {
this.jmId = jmId; this.jmId = jmId;
} }
public Long getJmId() public Long getJmId()
{ {
return jmId; return jmId;
} }
public void setVisitObj(String visitObj) public void setVisitObj(String visitObj)
{ {
this.visitObj = visitObj; this.visitObj = visitObj;
} }
public String getVisitObj() public String getVisitObj()
{ {
return visitObj; return visitObj;
} }
public void setTitle(String title) public void setTitle(String title)
{ {
this.title = title; this.title = title;
} }
public String getTitle() public String getTitle()
{ {
return title; return title;
} }
public void setPicture(String picture) public void setPicture(String picture)
{ {
this.picture = picture; this.picture = picture;
} }
public String getPicture() public String getPicture()
{ {
return picture; return picture;
} }
public void setContent(String content) public void setContent(String content)
{ {
this.content = content; this.content = content;
} }
public String getContent() public String getContent()
{ {
return content; return content;
} }
public void setFlowPeople(String flowPeople) public void setFlowPeople(String flowPeople)
{ {
this.flowPeople = flowPeople; this.flowPeople = flowPeople;
} }
public String getFlowPeople() public String getFlowPeople()
{ {
return flowPeople; return flowPeople;
} }
public void setZfStatus(String zfStatus) public void setZfStatus(String zfStatus)
{ {
this.zfStatus = zfStatus; this.zfStatus = zfStatus;
} }
public String getZfStatus() public String getZfStatus()
{ {
return zfStatus; 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; this.shRemark = shRemark;
} }
public String getShRemark() public String getShRemark()
{ {
return shRemark; return shRemark;
} }
public void setDeptId(Long deptId) public void setDeptId(Long deptId)
{ {
this.deptId = deptId; this.deptId = deptId;
} }
public Long getDeptId() public Long getDeptId()
{ {
return deptId; return deptId;
} }
public void setDeptName(String deptName) public void setDeptName(String deptName)
{ {
this.deptName = deptName; this.deptName = deptName;
} }
public String getDeptName() public String getDeptName()
{ {
return deptName; return deptName;
} }
public void setUserId(Long userId) public void setUserId(Long userId)
{ {
this.userId = userId; this.userId = userId;
} }
public Long getUserId() public Long getUserId()
{ {
return userId; return userId;
} }
@ -244,27 +310,32 @@ public class SzxcVisitRecard extends BaseEntity
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId()) .append("id", getId())
.append("visiterName", getVisiterName()) .append("visiterName", getVisiterName())
.append("submitDate", getSubmitDate()) .append("submitDate", getSubmitDate())
.append("startDate", getStartDate()) .append("startDate", getStartDate())
.append("endDate", getEndDate()) .append("endDate", getEndDate())
.append("type", getType()) .append("type", getType())
.append("jmId", getJmId()) .append("jmId", getJmId())
.append("visitObj", getVisitObj()) .append("visitObj", getVisitObj())
.append("title", getTitle()) .append("title", getTitle())
.append("picture", getPicture()) .append("picture", getPicture())
.append("content", getContent()) .append("content", getContent())
.append("flowPeople", getFlowPeople()) .append("flowPeople", getFlowPeople())
.append("zfStatus", getZfStatus()) .append("zfStatus", getZfStatus())
.append("shRemark", getShRemark()) .append("auditDept", getAuditDept())
.append("createBy", getCreateBy()) .append("auditDeptid", getAuditDeptid())
.append("createTime", getCreateTime()) .append("auditName", getAuditName())
.append("updateBy", getUpdateBy()) .append("auditResult", getAuditResult())
.append("updateTime", getUpdateTime()) .append("auditReason", getAuditReason())
.append("deptId", getDeptId()) .append("shRemark", getShRemark())
.append("deptName", getDeptName()) .append("createBy", getCreateBy())
.append("userId", getUserId()) .append("createTime", getCreateTime())
.toString(); .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("deptId", getDeptId())
.append("deptName", getDeptName())
.append("userId", getUserId())
.toString();
} }
} }

179
ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcWorkRecard.java
Unescape View File

@ -1,17 +1,18 @@
package com.ruoyi.szxc.domain; package com.ruoyi.szxc.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; 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.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; 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 * 工作记录对象 szxc_work_recard
* *
* @author hs * @author hs
* @date 2024-03-20 * @date 2024-04-15
*/ */
public class SzxcWorkRecard extends BaseEntity public class SzxcWorkRecard extends BaseEntity
{ {
@ -59,8 +60,28 @@ public class SzxcWorkRecard extends BaseEntity
@Excel(name = "审核状态") @Excel(name = "审核状态")
private String gzStatus; 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; private String shRemark;
/** 部门id */ /** 部门id */
@ -75,129 +96,174 @@ public class SzxcWorkRecard extends BaseEntity
@Excel(name = "创建者ID") @Excel(name = "创建者ID")
private Long userId; private Long userId;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
public Long getId() public Long getId()
{ {
return id; return id;
} }
public void setWorkerName(String workerName) public void setWorkerName(String workerName)
{ {
this.workerName = workerName; this.workerName = workerName;
} }
public String getWorkerName() public String getWorkerName()
{ {
return workerName; return workerName;
} }
public void setSubmitDate(Date submitDate) public void setSubmitDate(Date submitDate)
{ {
this.submitDate = submitDate; this.submitDate = submitDate;
} }
public Date getSubmitDate() public Date getSubmitDate()
{ {
return submitDate; return submitDate;
} }
public void setStartDate(Date startDate) public void setStartDate(Date startDate)
{ {
this.startDate = startDate; this.startDate = startDate;
} }
public Date getStartDate() public Date getStartDate()
{ {
return startDate; return startDate;
} }
public void setEndDate(Date endDate) public void setEndDate(Date endDate)
{ {
this.endDate = endDate; this.endDate = endDate;
} }
public Date getEndDate() public Date getEndDate()
{ {
return endDate; return endDate;
} }
public void setType(String type) public void setType(String type)
{ {
this.type = type; this.type = type;
} }
public String getType() public String getType()
{ {
return type; return type;
} }
public void setTitle(String title) public void setTitle(String title)
{ {
this.title = title; this.title = title;
} }
public String getTitle() public String getTitle()
{ {
return title; return title;
} }
public void setPicture(String picture) public void setPicture(String picture)
{ {
this.picture = picture; this.picture = picture;
} }
public String getPicture() public String getPicture()
{ {
return picture; return picture;
} }
public void setContent(String content) public void setContent(String content)
{ {
this.content = content; this.content = content;
} }
public String getContent() public String getContent()
{ {
return content; return content;
} }
public void setGzStatus(String gzStatus) public void setGzStatus(String gzStatus)
{ {
this.gzStatus = gzStatus; this.gzStatus = gzStatus;
} }
public String getGzStatus() public String getGzStatus()
{ {
return gzStatus; 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; this.shRemark = shRemark;
} }
public String getShRemark() public String getShRemark()
{ {
return shRemark; return shRemark;
} }
public void setDeptId(Long deptId) public void setDeptId(Long deptId)
{ {
this.deptId = deptId; this.deptId = deptId;
} }
public Long getDeptId() public Long getDeptId()
{ {
return deptId; return deptId;
} }
public void setDeptName(String deptName) public void setDeptName(String deptName)
{ {
this.deptName = deptName; this.deptName = deptName;
} }
public String getDeptName() public String getDeptName()
{ {
return deptName; return deptName;
} }
public void setUserId(Long userId) public void setUserId(Long userId)
{ {
this.userId = userId; this.userId = userId;
} }
public Long getUserId() public Long getUserId()
{ {
return userId; return userId;
} }
@ -205,24 +271,29 @@ public class SzxcWorkRecard extends BaseEntity
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId()) .append("id", getId())
.append("workerName", getWorkerName()) .append("workerName", getWorkerName())
.append("submitDate", getSubmitDate()) .append("submitDate", getSubmitDate())
.append("startDate", getStartDate()) .append("startDate", getStartDate())
.append("endDate", getEndDate()) .append("endDate", getEndDate())
.append("type", getType()) .append("type", getType())
.append("title", getTitle()) .append("title", getTitle())
.append("picture", getPicture()) .append("picture", getPicture())
.append("content", getContent()) .append("content", getContent())
.append("gzStatus", getGzStatus()) .append("gzStatus", getGzStatus())
.append("shRemark", getShRemark()) .append("auditDept", getAuditDept())
.append("createBy", getCreateBy()) .append("auditDeptid", getAuditDeptid())
.append("createTime", getCreateTime()) .append("auditName", getAuditName())
.append("updateBy", getUpdateBy()) .append("auditResult", getAuditResult())
.append("updateTime", getUpdateTime()) .append("auditReason", getAuditReason())
.append("deptId", getDeptId()) .append("shRemark", getShRemark())
.append("deptName", getDeptName()) .append("createBy", getCreateBy())
.append("userId", getUserId()) .append("createTime", getCreateTime())
.toString(); .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("deptId", getDeptId())
.append("deptName", getDeptName())
.append("userId", getUserId())
.toString();
} }
} }

203
ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXcRecard.java
Unescape View File

@ -1,17 +1,18 @@
package com.ruoyi.szxc.domain; package com.ruoyi.szxc.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; 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.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; 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 * 巡查记录对象 szxc_xc_recard
* *
* @author hs * @author hs
* @date 2024-03-20 * @date 2024-04-15
*/ */
public class SzxcXcRecard extends BaseEntity public class SzxcXcRecard extends BaseEntity
{ {
@ -74,8 +75,28 @@ public class SzxcXcRecard extends BaseEntity
@Excel(name = "审核状态") @Excel(name = "审核状态")
private String xcStatus; 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; private String shRemark;
/** 部门id */ /** 部门id */
@ -90,165 +111,210 @@ public class SzxcXcRecard extends BaseEntity
@Excel(name = "创建者ID") @Excel(name = "创建者ID")
private Long userId; private Long userId;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
public Long getId() public Long getId()
{ {
return id; return id;
} }
public void setXcName(String xcName) public void setXcName(String xcName)
{ {
this.xcName = xcName; this.xcName = xcName;
} }
public String getXcName() public String getXcName()
{ {
return xcName; return xcName;
} }
public void setSubmitDate(Date submitDate) public void setSubmitDate(Date submitDate)
{ {
this.submitDate = submitDate; this.submitDate = submitDate;
} }
public Date getSubmitDate() public Date getSubmitDate()
{ {
return submitDate; return submitDate;
} }
public void setXcDate(Date xcDate) public void setXcDate(Date xcDate)
{ {
this.xcDate = xcDate; this.xcDate = xcDate;
} }
public Date getXcDate() public Date getXcDate()
{ {
return xcDate; return xcDate;
} }
public void setType(String type) public void setType(String type)
{ {
this.type = type; this.type = type;
} }
public String getType() public String getType()
{ {
return type; return type;
} }
public void setJmId(Long jmId) public void setJmId(Long jmId)
{ {
this.jmId = jmId; this.jmId = jmId;
} }
public Long getJmId() public Long getJmId()
{ {
return jmId; return jmId;
} }
public void setXcObj(String xcObj) public void setXcObj(String xcObj)
{ {
this.xcObj = xcObj; this.xcObj = xcObj;
} }
public String getXcObj() public String getXcObj()
{ {
return xcObj; return xcObj;
} }
public void setTitle(String title) public void setTitle(String title)
{ {
this.title = title; this.title = title;
} }
public String getTitle() public String getTitle()
{ {
return title; return title;
} }
public void setPicture(String picture) public void setPicture(String picture)
{ {
this.picture = picture; this.picture = picture;
} }
public String getPicture() public String getPicture()
{ {
return picture; return picture;
} }
public void setContent(String content) public void setContent(String content)
{ {
this.content = content; this.content = content;
} }
public String getContent() public String getContent()
{ {
return content; return content;
} }
public void setFlowPeople(String flowPeople) public void setFlowPeople(String flowPeople)
{ {
this.flowPeople = flowPeople; this.flowPeople = flowPeople;
} }
public String getFlowPeople() public String getFlowPeople()
{ {
return flowPeople; return flowPeople;
} }
public void setReform(String reform) public void setReform(String reform)
{ {
this.reform = reform; this.reform = reform;
} }
public String getReform() public String getReform()
{ {
return reform; return reform;
} }
public void setZgProgress(String zgProgress) public void setZgProgress(String zgProgress)
{ {
this.zgProgress = zgProgress; this.zgProgress = zgProgress;
} }
public String getZgProgress() public String getZgProgress()
{ {
return zgProgress; return zgProgress;
} }
public void setXcStatus(String xcStatus) public void setXcStatus(String xcStatus)
{ {
this.xcStatus = xcStatus; this.xcStatus = xcStatus;
} }
public String getXcStatus() public String getXcStatus()
{ {
return xcStatus; 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; this.shRemark = shRemark;
} }
public String getShRemark() public String getShRemark()
{ {
return shRemark; return shRemark;
} }
public void setDeptId(Long deptId) public void setDeptId(Long deptId)
{ {
this.deptId = deptId; this.deptId = deptId;
} }
public Long getDeptId() public Long getDeptId()
{ {
return deptId; return deptId;
} }
public void setDeptName(String deptName) public void setDeptName(String deptName)
{ {
this.deptName = deptName; this.deptName = deptName;
} }
public String getDeptName() public String getDeptName()
{ {
return deptName; return deptName;
} }
public void setUserId(Long userId) public void setUserId(Long userId)
{ {
this.userId = userId; this.userId = userId;
} }
public Long getUserId() public Long getUserId()
{ {
return userId; return userId;
} }
@ -256,28 +322,33 @@ public class SzxcXcRecard extends BaseEntity
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId()) .append("id", getId())
.append("xcName", getXcName()) .append("xcName", getXcName())
.append("submitDate", getSubmitDate()) .append("submitDate", getSubmitDate())
.append("xcDate", getXcDate()) .append("xcDate", getXcDate())
.append("type", getType()) .append("type", getType())
.append("jmId", getJmId()) .append("jmId", getJmId())
.append("xcObj", getXcObj()) .append("xcObj", getXcObj())
.append("title", getTitle()) .append("title", getTitle())
.append("picture", getPicture()) .append("picture", getPicture())
.append("content", getContent()) .append("content", getContent())
.append("flowPeople", getFlowPeople()) .append("flowPeople", getFlowPeople())
.append("reform", getReform()) .append("reform", getReform())
.append("zgProgress", getZgProgress()) .append("zgProgress", getZgProgress())
.append("xcStatus", getXcStatus()) .append("xcStatus", getXcStatus())
.append("shRemark", getShRemark()) .append("auditDept", getAuditDept())
.append("createBy", getCreateBy()) .append("auditDeptid", getAuditDeptid())
.append("createTime", getCreateTime()) .append("auditName", getAuditName())
.append("updateBy", getUpdateBy()) .append("auditResult", getAuditResult())
.append("updateTime", getUpdateTime()) .append("auditReason", getAuditReason())
.append("deptId", getDeptId()) .append("shRemark", getShRemark())
.append("deptName", getDeptName()) .append("createBy", getCreateBy())
.append("userId", getUserId()) .append("createTime", getCreateTime())
.toString(); .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("deptId", getDeptId())
.append("deptName", getDeptName())
.append("userId", getUserId())
.toString();
} }
} }

40
ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!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"> <mapper namespace="com.ruoyi.szxc.mapper.SzxcButieMapper">
<resultMap type="SzxcButie" id="SzxcButieResult"> <resultMap type="SzxcButie" id="SzxcButieResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="type" column="type" /> <result property="type" column="type" />
@ -16,6 +16,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="content" column="content" /> <result property="content" column="content" />
<result property="zfStatus" column="zf_status" /> <result property="zfStatus" column="zf_status" />
<result property="shRemark" column="sh_remark" /> <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="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
@ -26,12 +30,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectSzxcButieVo"> <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> </sql>
<select id="selectSzxcButieList" parameterType="SzxcButie" resultMap="SzxcButieResult"> <select id="selectSzxcButieList" parameterType="SzxcButie" resultMap="SzxcButieResult">
<include refid="selectSzxcButieVo"/> <include refid="selectSzxcButieVo"/>
<where> <where>
<if test="type != null and type != ''"> and type = #{type}</if> <if test="type != null and type != ''"> and type = #{type}</if>
<if test="xmTitle != null and xmTitle != ''"> and xm_title = #{xmTitle}</if> <if test="xmTitle != null and xmTitle != ''"> and xm_title = #{xmTitle}</if>
<if test="xmId != null "> and xm_id = #{xmId}</if> <if test="xmId != null "> and xm_id = #{xmId}</if>
@ -42,17 +46,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="content != null and content != ''"> and content = #{content}</if> <if test="content != null and content != ''"> and content = #{content}</if>
<if test="zfStatus != null and zfStatus != ''"> and zf_status = #{zfStatus}</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="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="deptId != null "> and dept_id = #{deptId}</if>
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if> <if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="userId != null "> and user_id = #{userId}</if> <if test="userId != null "> and user_id = #{userId}</if>
</where> </where>
</select> </select>
<select id="selectSzxcButieById" parameterType="Long" resultMap="SzxcButieResult"> <select id="selectSzxcButieById" parameterType="Long" resultMap="SzxcButieResult">
<include refid="selectSzxcButieVo"/> <include refid="selectSzxcButieVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertSzxcButie" parameterType="SzxcButie" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSzxcButie" parameterType="SzxcButie" useGeneratedKeys="true" keyProperty="id">
insert into szxc_butie insert into szxc_butie
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -66,6 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="content != null">content,</if> <if test="content != null">content,</if>
<if test="zfStatus != null">zf_status,</if> <if test="zfStatus != null">zf_status,</if>
<if test="shRemark != null">sh_remark,</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="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
@ -73,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">dept_id,</if> <if test="deptId != null">dept_id,</if>
<if test="deptName != null">dept_name,</if> <if test="deptName != null">dept_name,</if>
<if test="userId != null">user_id,</if> <if test="userId != null">user_id,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="type != null">#{type},</if> <if test="type != null">#{type},</if>
<if test="xmTitle != null">#{xmTitle},</if> <if test="xmTitle != null">#{xmTitle},</if>
@ -85,6 +97,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="content != null">#{content},</if> <if test="content != null">#{content},</if>
<if test="zfStatus != null">#{zfStatus},</if> <if test="zfStatus != null">#{zfStatus},</if>
<if test="shRemark != null">#{shRemark},</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="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
@ -92,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">#{deptId},</if> <if test="deptId != null">#{deptId},</if>
<if test="deptName != null">#{deptName},</if> <if test="deptName != null">#{deptName},</if>
<if test="userId != null">#{userId},</if> <if test="userId != null">#{userId},</if>
</trim> </trim>
</insert> </insert>
<update id="updateSzxcButie" parameterType="SzxcButie"> <update id="updateSzxcButie" parameterType="SzxcButie">
@ -108,6 +124,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="content != null">content = #{content},</if> <if test="content != null">content = #{content},</if>
<if test="zfStatus != null">zf_status = #{zfStatus},</if> <if test="zfStatus != null">zf_status = #{zfStatus},</if>
<if test="shRemark != null">sh_remark = #{shRemark},</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="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
@ -124,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteSzxcButieByIds" parameterType="String"> <delete id="deleteSzxcButieByIds" parameterType="String">
delete from szxc_butie where id in delete from szxc_butie where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>

45
ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!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"> <mapper namespace="com.ruoyi.szxc.mapper.SzxcHelpMapper">
<resultMap type="SzxcHelp" id="SzxcHelpResult"> <resultMap type="SzxcHelp" id="SzxcHelpResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="subName" column="sub_name" /> <result property="subName" column="sub_name" />
@ -13,6 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="title" column="title" /> <result property="title" column="title" />
<result property="content" column="content" /> <result property="content" column="content" />
<result property="helpStatus" column="help_status" /> <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="remark" column="remark" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
@ -24,12 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectSzxcHelpVo"> <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> </sql>
<select id="selectSzxcHelpList" parameterType="SzxcHelp" resultMap="SzxcHelpResult"> <select id="selectSzxcHelpList" parameterType="SzxcHelp" resultMap="SzxcHelpResult">
<include refid="selectSzxcHelpVo"/> <include refid="selectSzxcHelpVo"/>
<where> <where>
<if test="subName != null and subName != ''"> and sub_name like concat('%', #{subName}, '%')</if> <if test="subName != null and subName != ''"> and sub_name like concat('%', #{subName}, '%')</if>
<if test="subDate != null "> and sub_date = #{subDate}</if> <if test="subDate != null "> and sub_date = #{subDate}</if>
<if test="phone != null and phone != ''"> and phone = #{phone}</if> <if test="phone != null and phone != ''"> and phone = #{phone}</if>
@ -37,17 +42,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="title != null and title != ''"> and title = #{title}</if> <if test="title != null and title != ''"> and title = #{title}</if>
<if test="content != null and content != ''"> and content = #{content}</if> <if test="content != null and content != ''"> and content = #{content}</if>
<if test="helpStatus != null and helpStatus != ''"> and help_status = #{helpStatus}</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="deptId != null "> and dept_id = #{deptId}</if>
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if> <if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="userId != null "> and user_id = #{userId}</if> <if test="userId != null "> and user_id = #{userId}</if>
</where> </where>
</select> </select>
<select id="selectSzxcHelpById" parameterType="Long" resultMap="SzxcHelpResult"> <select id="selectSzxcHelpById" parameterType="Long" resultMap="SzxcHelpResult">
<include refid="selectSzxcHelpVo"/> <include refid="selectSzxcHelpVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertSzxcHelp" parameterType="SzxcHelp" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSzxcHelp" parameterType="SzxcHelp" useGeneratedKeys="true" keyProperty="id">
insert into szxc_help insert into szxc_help
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -58,6 +68,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="title != null and title != ''">title,</if> <if test="title != null and title != ''">title,</if>
<if test="content != null">content,</if> <if test="content != null">content,</if>
<if test="helpStatus != null">help_status,</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="remark != null">remark,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
@ -66,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">dept_id,</if> <if test="deptId != null">dept_id,</if>
<if test="deptName != null">dept_name,</if> <if test="deptName != null">dept_name,</if>
<if test="userId != null">user_id,</if> <if test="userId != null">user_id,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="subName != null and subName != ''">#{subName},</if> <if test="subName != null and subName != ''">#{subName},</if>
<if test="subDate != null">#{subDate},</if> <if test="subDate != null">#{subDate},</if>
@ -75,6 +90,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="title != null and title != ''">#{title},</if> <if test="title != null and title != ''">#{title},</if>
<if test="content != null">#{content},</if> <if test="content != null">#{content},</if>
<if test="helpStatus != null">#{helpStatus},</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="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
@ -83,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">#{deptId},</if> <if test="deptId != null">#{deptId},</if>
<if test="deptName != null">#{deptName},</if> <if test="deptName != null">#{deptName},</if>
<if test="userId != null">#{userId},</if> <if test="userId != null">#{userId},</if>
</trim> </trim>
</insert> </insert>
<update id="updateSzxcHelp" parameterType="SzxcHelp"> <update id="updateSzxcHelp" parameterType="SzxcHelp">
@ -96,6 +116,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="title != null and title != ''">title = #{title},</if> <if test="title != null and title != ''">title = #{title},</if>
<if test="content != null">content = #{content},</if> <if test="content != null">content = #{content},</if>
<if test="helpStatus != null">help_status = #{helpStatus},</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="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
@ -113,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteSzxcHelpByIds" parameterType="String"> <delete id="deleteSzxcHelpByIds" parameterType="String">
delete from szxc_help where id in delete from szxc_help where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>

45
ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVisitRecardMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!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"> <mapper namespace="com.ruoyi.szxc.mapper.SzxcVisitRecardMapper">
<resultMap type="SzxcVisitRecard" id="SzxcVisitRecardResult"> <resultMap type="SzxcVisitRecard" id="SzxcVisitRecardResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="visiterName" column="visiter_name" /> <result property="visiterName" column="visiter_name" />
@ -18,6 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="content" column="content" /> <result property="content" column="content" />
<result property="flowPeople" column="flow_people" /> <result property="flowPeople" column="flow_people" />
<result property="zfStatus" column="zf_status" /> <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="shRemark" column="sh_remark" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
@ -29,12 +34,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectSzxcVisitRecardVo"> <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> </sql>
<select id="selectSzxcVisitRecardList" parameterType="SzxcVisitRecard" resultMap="SzxcVisitRecardResult"> <select id="selectSzxcVisitRecardList" parameterType="SzxcVisitRecard" resultMap="SzxcVisitRecardResult">
<include refid="selectSzxcVisitRecardVo"/> <include refid="selectSzxcVisitRecardVo"/>
<where> <where>
<if test="visiterName != null and visiterName != ''"> and visiter_name like concat('%', #{visiterName}, '%')</if> <if test="visiterName != null and visiterName != ''"> and visiter_name like concat('%', #{visiterName}, '%')</if>
<if test="submitDate != null "> and submit_date = #{submitDate}</if> <if test="submitDate != null "> and submit_date = #{submitDate}</if>
<if test="startDate != null "> and start_date = #{startDate}</if> <if test="startDate != null "> and start_date = #{startDate}</if>
@ -47,18 +52,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="content != null and content != ''"> and content = #{content}</if> <if test="content != null and content != ''"> and content = #{content}</if>
<if test="flowPeople != null and flowPeople != ''"> and flow_people = #{flowPeople}</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="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="shRemark != null and shRemark != ''"> and sh_remark = #{shRemark}</if>
<if test="deptId != null "> and dept_id = #{deptId}</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="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="userId != null "> and user_id = #{userId}</if> <if test="userId != null "> and user_id = #{userId}</if>
</where> </where>
</select> </select>
<select id="selectSzxcVisitRecardById" parameterType="Long" resultMap="SzxcVisitRecardResult"> <select id="selectSzxcVisitRecardById" parameterType="Long" resultMap="SzxcVisitRecardResult">
<include refid="selectSzxcVisitRecardVo"/> <include refid="selectSzxcVisitRecardVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertSzxcVisitRecard" parameterType="SzxcVisitRecard" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSzxcVisitRecard" parameterType="SzxcVisitRecard" useGeneratedKeys="true" keyProperty="id">
insert into szxc_visit_recard insert into szxc_visit_recard
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -74,6 +84,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="content != null">content,</if> <if test="content != null">content,</if>
<if test="flowPeople != null">flow_people,</if> <if test="flowPeople != null">flow_people,</if>
<if test="zfStatus != null">zf_status,</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="shRemark != null">sh_remark,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
@ -82,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">dept_id,</if> <if test="deptId != null">dept_id,</if>
<if test="deptName != null">dept_name,</if> <if test="deptName != null">dept_name,</if>
<if test="userId != null">user_id,</if> <if test="userId != null">user_id,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="visiterName != null and visiterName != ''">#{visiterName},</if> <if test="visiterName != null and visiterName != ''">#{visiterName},</if>
<if test="submitDate != null">#{submitDate},</if> <if test="submitDate != null">#{submitDate},</if>
@ -96,6 +111,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="content != null">#{content},</if> <if test="content != null">#{content},</if>
<if test="flowPeople != null">#{flowPeople},</if> <if test="flowPeople != null">#{flowPeople},</if>
<if test="zfStatus != null">#{zfStatus},</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="shRemark != null">#{shRemark},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
@ -104,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">#{deptId},</if> <if test="deptId != null">#{deptId},</if>
<if test="deptName != null">#{deptName},</if> <if test="deptName != null">#{deptName},</if>
<if test="userId != null">#{userId},</if> <if test="userId != null">#{userId},</if>
</trim> </trim>
</insert> </insert>
<update id="updateSzxcVisitRecard" parameterType="SzxcVisitRecard"> <update id="updateSzxcVisitRecard" parameterType="SzxcVisitRecard">
@ -122,6 +142,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="content != null">content = #{content},</if> <if test="content != null">content = #{content},</if>
<if test="flowPeople != null">flow_people = #{flowPeople},</if> <if test="flowPeople != null">flow_people = #{flowPeople},</if>
<if test="zfStatus != null">zf_status = #{zfStatus},</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="shRemark != null">sh_remark = #{shRemark},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
@ -139,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteSzxcVisitRecardByIds" parameterType="String"> <delete id="deleteSzxcVisitRecardByIds" parameterType="String">
delete from szxc_visit_recard where id in delete from szxc_visit_recard where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>

45
ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!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"> <mapper namespace="com.ruoyi.szxc.mapper.SzxcWorkRecardMapper">
<resultMap type="SzxcWorkRecard" id="SzxcWorkRecardResult"> <resultMap type="SzxcWorkRecard" id="SzxcWorkRecardResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="workerName" column="worker_name" /> <result property="workerName" column="worker_name" />
@ -15,6 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="picture" column="picture" /> <result property="picture" column="picture" />
<result property="content" column="content" /> <result property="content" column="content" />
<result property="gzStatus" column="gz_status" /> <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="shRemark" column="sh_remark" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
@ -26,12 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectSzxcWorkRecardVo"> <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> </sql>
<select id="selectSzxcWorkRecardList" parameterType="SzxcWorkRecard" resultMap="SzxcWorkRecardResult"> <select id="selectSzxcWorkRecardList" parameterType="SzxcWorkRecard" resultMap="SzxcWorkRecardResult">
<include refid="selectSzxcWorkRecardVo"/> <include refid="selectSzxcWorkRecardVo"/>
<where> <where>
<if test="workerName != null and workerName != ''"> and worker_name like concat('%', #{workerName}, '%')</if> <if test="workerName != null and workerName != ''"> and worker_name like concat('%', #{workerName}, '%')</if>
<if test="submitDate != null "> and submit_date = #{submitDate}</if> <if test="submitDate != null "> and submit_date = #{submitDate}</if>
<if test="startDate != null "> and start_date = #{startDate}</if> <if test="startDate != null "> and start_date = #{startDate}</if>
@ -41,18 +46,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="picture != null and picture != ''"> and picture = #{picture}</if> <if test="picture != null and picture != ''"> and picture = #{picture}</if>
<if test="content != null and content != ''"> and content = #{content}</if> <if test="content != null and content != ''"> and content = #{content}</if>
<if test="gzStatus != null and gzStatus != ''"> and gz_status = #{gzStatus}</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="shRemark != null and shRemark != ''"> and sh_remark = #{shRemark}</if>
<if test="deptId != null "> and dept_id = #{deptId}</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="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="userId != null "> and user_id = #{userId}</if> <if test="userId != null "> and user_id = #{userId}</if>
</where> </where>
</select> </select>
<select id="selectSzxcWorkRecardById" parameterType="Long" resultMap="SzxcWorkRecardResult"> <select id="selectSzxcWorkRecardById" parameterType="Long" resultMap="SzxcWorkRecardResult">
<include refid="selectSzxcWorkRecardVo"/> <include refid="selectSzxcWorkRecardVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertSzxcWorkRecard" parameterType="SzxcWorkRecard" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSzxcWorkRecard" parameterType="SzxcWorkRecard" useGeneratedKeys="true" keyProperty="id">
insert into szxc_work_recard insert into szxc_work_recard
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -65,6 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="picture != null">picture,</if> <if test="picture != null">picture,</if>
<if test="content != null">content,</if> <if test="content != null">content,</if>
<if test="gzStatus != null">gz_status,</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="shRemark != null">sh_remark,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
@ -73,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">dept_id,</if> <if test="deptId != null">dept_id,</if>
<if test="deptName != null">dept_name,</if> <if test="deptName != null">dept_name,</if>
<if test="userId != null">user_id,</if> <if test="userId != null">user_id,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="workerName != null and workerName != ''">#{workerName},</if> <if test="workerName != null and workerName != ''">#{workerName},</if>
<if test="submitDate != null">#{submitDate},</if> <if test="submitDate != null">#{submitDate},</if>
@ -84,6 +99,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="picture != null">#{picture},</if> <if test="picture != null">#{picture},</if>
<if test="content != null">#{content},</if> <if test="content != null">#{content},</if>
<if test="gzStatus != null">#{gzStatus},</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="shRemark != null">#{shRemark},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
@ -92,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">#{deptId},</if> <if test="deptId != null">#{deptId},</if>
<if test="deptName != null">#{deptName},</if> <if test="deptName != null">#{deptName},</if>
<if test="userId != null">#{userId},</if> <if test="userId != null">#{userId},</if>
</trim> </trim>
</insert> </insert>
<update id="updateSzxcWorkRecard" parameterType="SzxcWorkRecard"> <update id="updateSzxcWorkRecard" parameterType="SzxcWorkRecard">
@ -107,6 +127,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="picture != null">picture = #{picture},</if> <if test="picture != null">picture = #{picture},</if>
<if test="content != null">content = #{content},</if> <if test="content != null">content = #{content},</if>
<if test="gzStatus != null">gz_status = #{gzStatus},</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="shRemark != null">sh_remark = #{shRemark},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
@ -124,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteSzxcWorkRecardByIds" parameterType="String"> <delete id="deleteSzxcWorkRecardByIds" parameterType="String">
delete from szxc_work_recard where id in delete from szxc_work_recard where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>

45
ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXcRecardMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!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"> <mapper namespace="com.ruoyi.szxc.mapper.SzxcXcRecardMapper">
<resultMap type="SzxcXcRecard" id="SzxcXcRecardResult"> <resultMap type="SzxcXcRecard" id="SzxcXcRecardResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="xcName" column="xc_name" /> <result property="xcName" column="xc_name" />
@ -19,6 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="reform" column="reform" /> <result property="reform" column="reform" />
<result property="zgProgress" column="zg_progress" /> <result property="zgProgress" column="zg_progress" />
<result property="xcStatus" column="xc_status" /> <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="shRemark" column="sh_remark" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
@ -30,12 +35,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectSzxcXcRecardVo"> <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> </sql>
<select id="selectSzxcXcRecardList" parameterType="SzxcXcRecard" resultMap="SzxcXcRecardResult"> <select id="selectSzxcXcRecardList" parameterType="SzxcXcRecard" resultMap="SzxcXcRecardResult">
<include refid="selectSzxcXcRecardVo"/> <include refid="selectSzxcXcRecardVo"/>
<where> <where>
<if test="xcName != null and xcName != ''"> and xc_name like concat('%', #{xcName}, '%')</if> <if test="xcName != null and xcName != ''"> and xc_name like concat('%', #{xcName}, '%')</if>
<if test="submitDate != null "> and submit_date = #{submitDate}</if> <if test="submitDate != null "> and submit_date = #{submitDate}</if>
<if test="xcDate != null "> and xc_date = #{xcDate}</if> <if test="xcDate != null "> and xc_date = #{xcDate}</if>
@ -49,18 +54,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="reform != null and reform != ''"> and reform = #{reform}</if> <if test="reform != null and reform != ''"> and reform = #{reform}</if>
<if test="zgProgress != null and zgProgress != ''"> and zg_progress = #{zgProgress}</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="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="shRemark != null and shRemark != ''"> and sh_remark = #{shRemark}</if>
<if test="deptId != null "> and dept_id = #{deptId}</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="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="userId != null "> and user_id = #{userId}</if> <if test="userId != null "> and user_id = #{userId}</if>
</where> </where>
</select> </select>
<select id="selectSzxcXcRecardById" parameterType="Long" resultMap="SzxcXcRecardResult"> <select id="selectSzxcXcRecardById" parameterType="Long" resultMap="SzxcXcRecardResult">
<include refid="selectSzxcXcRecardVo"/> <include refid="selectSzxcXcRecardVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertSzxcXcRecard" parameterType="SzxcXcRecard" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSzxcXcRecard" parameterType="SzxcXcRecard" useGeneratedKeys="true" keyProperty="id">
insert into szxc_xc_recard insert into szxc_xc_recard
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -77,6 +87,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="reform != null">reform,</if> <if test="reform != null">reform,</if>
<if test="zgProgress != null">zg_progress,</if> <if test="zgProgress != null">zg_progress,</if>
<if test="xcStatus != null">xc_status,</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="shRemark != null">sh_remark,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
@ -85,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">dept_id,</if> <if test="deptId != null">dept_id,</if>
<if test="deptName != null">dept_name,</if> <if test="deptName != null">dept_name,</if>
<if test="userId != null">user_id,</if> <if test="userId != null">user_id,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="xcName != null and xcName != ''">#{xcName},</if> <if test="xcName != null and xcName != ''">#{xcName},</if>
<if test="submitDate != null">#{submitDate},</if> <if test="submitDate != null">#{submitDate},</if>
@ -100,6 +115,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="reform != null">#{reform},</if> <if test="reform != null">#{reform},</if>
<if test="zgProgress != null">#{zgProgress},</if> <if test="zgProgress != null">#{zgProgress},</if>
<if test="xcStatus != null">#{xcStatus},</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="shRemark != null">#{shRemark},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
@ -108,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">#{deptId},</if> <if test="deptId != null">#{deptId},</if>
<if test="deptName != null">#{deptName},</if> <if test="deptName != null">#{deptName},</if>
<if test="userId != null">#{userId},</if> <if test="userId != null">#{userId},</if>
</trim> </trim>
</insert> </insert>
<update id="updateSzxcXcRecard" parameterType="SzxcXcRecard"> <update id="updateSzxcXcRecard" parameterType="SzxcXcRecard">
@ -127,6 +147,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="reform != null">reform = #{reform},</if> <if test="reform != null">reform = #{reform},</if>
<if test="zgProgress != null">zg_progress = #{zgProgress},</if> <if test="zgProgress != null">zg_progress = #{zgProgress},</if>
<if test="xcStatus != null">xc_status = #{xcStatus},</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="shRemark != null">sh_remark = #{shRemark},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
@ -144,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteSzxcXcRecardByIds" parameterType="String"> <delete id="deleteSzxcXcRecardByIds" parameterType="String">
delete from szxc_xc_recard where id in delete from szxc_xc_recard where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>

Write Preview
Loading…
Cancel
Save