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 20:53:56 +08:00
parent ed07eaad43
commit 676e08cdce
5 changed files with 176 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,11 @@ public class SysContract extends BaseEntity {
@Excel(name = "客户姓名")
private String name;
/**
* 客户签名
*/
private String signName;
/**
* 客户身份证
*/
@ -66,6 +71,9 @@ public class SysContract extends BaseEntity {
*/
private String signDate;
/**
* 营养师
*/
private String tutor;
/**
@ -76,6 +84,14 @@ public class SysContract extends BaseEntity {
private String servePromise;
public String getSignName() {
return signName;
}
public void setSignName(String signName) {
this.signName = signName;
}
public String getTutor() {
return tutor;
}
@ -84,14 +100,14 @@ public class SysContract extends BaseEntity {
this.tutor = tutor;
}
public void setServePromise(String servePromise) {
this.servePromise = servePromise;
}
public String getServePromise() {
return servePromise;
}
public void setServePromise(String servePromise) {
this.servePromise = servePromise;
}
public Long getId() {
return id;
}
@ -128,6 +144,10 @@ public class SysContract extends BaseEntity {
return amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public String getAmountUpper() {
return amountUpper;
}
@ -136,10 +156,6 @@ public class SysContract extends BaseEntity {
this.amountUpper = amountUpper;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public String getPath() {
return path;
}

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

@ -1,54 +1,56 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.custom.mapper.SysContractMapper">
<resultMap type="SysContract" id="SysContractResult">
<result property="id" column="id" />
<result property="status" column="status" />
<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" />
<result property="path" column="path" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="id" column="id"/>
<result property="status" column="status"/>
<result property="name" column="name"/>
<result property="signName" column="sign_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"/>
<result property="path" column="path"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
</resultMap>
<sql id="selectSysContractVo">
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
select id, status, name, sign_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">
<include refid="selectSysContractVo"/>
<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>
<if test="id != null ">and id = #{id}</if>
<if test="status != null ">and status = #{status}</if>
<if test="tutor != null and tutor != '' ">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>
order by create_time desc
</select>
<select id="selectSysContractById" parameterType="Long" resultMap="SysContractResult">
<include refid="selectSysContractVo"/>
where id = #{id}
</select>
<insert id="insertSysContract" parameterType="SysContract" useGeneratedKeys="true" keyProperty="id">
insert into sys_contract
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="status != null">status,</if>
<if test="name != null and name != ''">name,</if>
<if test="signName != null and signName != ''">sign_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>
@ -61,12 +63,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<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="signName != null and signName != ''">#{signName},</if>
<if test="tutor != null and name != ''">#{tutor},</if>
<if test="cusId != null and cusId != ''">#{cusId},</if>
<if test="phone != null">#{phone},</if>
<if test="serveTime != null">#{serveTime},</if>
@ -78,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</trim>
</insert>
<update id="updateSysContract" parameterType="SysContract">
@ -86,7 +89,8 @@ 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="signName != null and signName != ''">sign_name = #{signName},</if>
<if test="tutor != null">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>
@ -107,10 +111,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteSysContractByIds" parameterType="String">
delete from sys_contract where id in
delete from sys_contract where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>