Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

暂存

Browse Source
This commit is contained in:
huangdeliang
2020-11-04 10:00:57 +08:00
parent 1b6a654b8d
commit ed07eaad43
6 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysContract.java
View File

@@ -66,6 +66,8 @@ public class SysContract extends BaseEntity {
*/
private String signDate;
private String tutor;
/**
* 合同状态
* 0-未签订；1-已签订
@@ -74,6 +76,14 @@ public class SysContract extends BaseEntity {
private String servePromise;
public String getTutor() {
return tutor;
}
public void setTutor(String tutor) {
this.tutor = tutor;
}
public void setServePromise(String servePromise) {
this.servePromise = servePromise;
}
@@ -185,6 +195,7 @@ public class SysContract extends BaseEntity {
.append("signDate", getSignDate())
.append("path", getPath())
.append("createBy", getCreateBy())
.append("tutor", getTutor())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())

1
ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java
View File

@@ -125,6 +125,7 @@ public class SysContractServiceImpl implements ISysContractService {
form.setField("name", sysContract.getName(), true);
form.setField("time", sysContract.getServeTimeStr(), true);
form.setField("tutor", sysContract.getServeTimeStr(), true);
form.setField("moneyUpper", sysContract.getAmountUpper(), true);
form.setField("money", sysContract.getAmount().intValue() + "", true);
form.setField("phone", sysContract.getPhone(), true);

7
ruoyi-custom/src/main/resources/mapper/custom/SysContractMapper.xml
View File

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="name" column="name" />
<result property="cusId" column="cus_id" />
<result property="phone" column="phone" />
<result property="tutor" column="tutor" />
<result property="serveTime" column="serve_time" />
<result property="servePromise" column="serve_promise" />
<result property="amount" column="amount" />
@@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectSysContractVo">
select id, status, name, phone, cus_id, serve_time, serve_promise, amount, path, create_by, create_time, update_by, update_time, remark from sys_contract
select id, status, name, phone, cus_id, serve_time, tutor, serve_promise, amount, path, create_by, create_time, update_by, update_time, remark from sys_contract
</sql>
<select id="selectSysContractList" parameterType="SysContract" resultMap="SysContractResult">
@@ -30,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="id != null "> and id = #{id}</if>
<if test="status != null "> and status = #{status}</if>
<if test="tutor != null "> and tutor = #{tutor}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="phone != null and phone != ''"> and phone = #{phone}</if>
</where>
@@ -47,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">id,</if>
<if test="status != null">status,</if>
<if test="name != null and name != ''">name,</if>
<if test="tutor != null and tutor != ''">tutor,</if>
<if test="cusId != null and cusId != ''">cus_id,</if>
<if test="phone != null">phone,</if>
<if test="serveTime != null">serve_time,</if>
@@ -63,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">#{id},</if>
<if test="status != null">#{status},</if>
<if test="name != null and name != ''">#{name},</if>
<if test="tutor != null and tutor != ''">#{tutor},</if>
<if test="cusId != null and cusId != ''">#{cusId},</if>
<if test="phone != null">#{phone},</if>
<if test="serveTime != null">#{serveTime},</if>
@@ -82,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="status != null">status = #{status},</if>
<if test="name != null and name != ''">name = #{name},</if>
<if test="tutor != null and tutor != ''">tutor = #{tutor},</if>
<if test="cusId != null and cusId != ''">cus_id = #{cusId},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="serveTime != null">serve_time = #{serveTime},</if>