From c4ebefd8bdeb0883badc7378fc64f053cf41e3d2 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 15 Jun 2024 00:05:24 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisSiteAccount.java      |  42 ++-
 .../erp/emis/domain/EmisSiteSettleRecord.java |  66 ++---
 .../mapper/EmisSiteAccountMapper.xml          | 177 +++++++-----
 .../mapper/EmisSiteSettleRecordMapper.xml     | 262 +++++++++---------
 4 files changed, 276 insertions(+), 271 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java
index ed4bf6802..e749bbfdd 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisSiteAccount.java
  * @author linfso
- * @date 2024-03-07 10:48:12
+ * @date 2024-06-14 11:49:19
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> 网点结算账户 实体类 </p>
  */
 
@@ -26,9 +26,9 @@ import lombok.Data;
  * @ClassName EmisSiteAccount
  * @Description 网点结算账户
  * @author linfso
- * @date 2024-03-07 10:48:12
+ * @date 2024-06-14 11:49:19
  */
- @Data
+@Data
 public class EmisSiteAccount extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -37,30 +37,27 @@ public class EmisSiteAccount extends BaseEntity
     private Long id;
     /* 账户编号 */
     private String accCode;
-    /* 站点名称 */
-    private String siteNameCode;
-    /* 站点代码 */
-    private String siteName;
-    /* 财务中心名称 */
-    private String centerName;
+    /* 站点 */
+    private String siteCode;
     /* 财务中心代码 */
-    private String centerNameCode;
+    private String centerCode;
     /* 当前余额 */
-    private String curMoney;
+    private BigDecimal curMoney;
     /* 冻结余额 */
-    private String frozenMoney;
+    private BigDecimal frozenMoney;
     /* 确认金额 */
-    private String confirmMoney;
+    private BigDecimal confirmMoney;
     /* 警戒余额 */
-    private String watchMoney;
+    private BigDecimal watchMoney;
     /* 关闭金额 */
-    private String closeMoney;
+    private BigDecimal closeMoney;
     /* 保证金 */
-    private String earnestMoney;
+    private BigDecimal earnestMoney;
     /* 币种 */
     private String currency;
     /* 开户日期 */
-    private String startDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startDate;
     /* 是否启用 1-启用 0-未启用 */
     private String blOpen;
     /* 是否锁定 0-否 1-是 */
@@ -70,12 +67,9 @@ public class EmisSiteAccount extends BaseEntity
     /* 清理站点代码 */
     private String clearSiteCode;
     /* 清理日期 */
-    private String clearDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date clearDate;
     /* 清理人编号 */
     private String clearManCode;
-    /* 创建站点代码 */
-    private String createSiteCode;
-    /* 修改站点代码 */
-    private String modifySiteCode;
 
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java
index 78fd88ef2..e1f0b7efe 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisSiteSettleRecord.java
  * @author linfso
- * @date 2024-03-07 10:48:13
+ * @date 2024-06-14 11:49:53
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> 网点账户结算记录 实体类 </p>
  */
 
@@ -26,9 +26,9 @@ import lombok.Data;
  * @ClassName EmisSiteSettleRecord
  * @Description 网点账户结算记录
  * @author linfso
- * @date 2024-03-07 10:48:13
+ * @date 2024-06-14 11:49:53
  */
- @Data
+@Data
 public class EmisSiteSettleRecord extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -44,69 +44,57 @@ public class EmisSiteSettleRecord extends BaseEntity
     /* 结算类型: 充值等 */
     private String settleType;
     /* 前余额 */
-    private String preBalance;
+    private BigDecimal preBalance;
     /* 前确认余额 */
-    private String preConfirmBalance;
+    private BigDecimal preConfirmBalance;
     /* 当前操作金额 */
-    private String curMoney;
+    private BigDecimal curMoney;
     /* 当前确认金额 */
-    private String curConfirmMoney;
+    private BigDecimal curConfirmMoney;
     /* 变动后余额 */
-    private String backBalance;
+    private BigDecimal backBalance;
     /* 变动后确认余额 */
-    private String backConfirmBalance;
+    private BigDecimal backConfirmBalance;
     /* 币种 */
     private String currency;
     /* 改变类型 加,减 */
     private String changeType;
     /* 改变时间 */
-    private String changeDate;
-    /* 财务中心 */
-    private String centerName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date changeDate;
     /* 财务中心代码 */
-    private String centerNameCode;
-    /* 站点 */
-    private String siteName;
+    private String centerCode;
     /* 站点名称 */
-    private String siteNameCode;
+    private String siteCode;
     /* 来源 */
     private String sourceType;
     /* 财务操作时间 */
-    private String financeDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date financeDate;
     /* 网点操作时间 */
-    private String operataDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date operataDate;
     /* 是否确认 */
     private String blConfirm;
-    /* 确认人 */
-    private String confirmMan;
     /* 确认人代码 */
     private String confirmManCode;
-    /* 确认站点 */
-    private String confirmSite;
     /* 确认站点代码 */
     private String confirmSiteCode;
-    /* 结算人 */
-    private String settleMan;
     /* 结算人代码 */
     private String settleManCode;
-    /* 结算站点 */
-    private String settleSite;
     /* 结算站点代码 */
     private String settleSiteCode;
     /* 是否中心审核 */
     private String blCenter;
-    /* 中心人 */
-    private String centerMan;
     /* 中心人代码 */
     private String centerManCode;
     /* 是否站点审核 */
     private String blSite;
-    /* 站点人 */
-    private String siteMan;
     /* 站点人代码 */
     private String siteManCode;
     /* 站点日期 */
-    private String siteDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date siteDate;
     /* 是否改变费用 */
     private String blChargeFee;
     /* 转发单号 */
@@ -114,16 +102,12 @@ public class EmisSiteSettleRecord extends BaseEntity
     /* 结算ebr代码 */
     private String settleEbrCode;
     /* 结算ebr日期 */
-    private String settleEbrDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date settleEbrDate;
     /* 客户代码 */
     private String customerCode;
-    /* 客户名称 */
-    private String customerName;
     /* 中心日期 */
-    private String centerDate;
-    /* 创建站点代码 */
-    private String createSiteCode;
-    /* 修改站点代码 */
-    private String modifySiteCode;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date centerDate;
 
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
index e7b63f918..f01507d64 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
@@ -1,16 +1,14 @@
 <?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.xdadan.erp.emis.mapper.EmisSiteAccountMapper">
-    
-    <resultMap type="EmisSiteAccount" id="EmisSiteAccountResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+
+    <resultMap type="EmisSiteAccount" id="EmisSiteAccountResult">
         <result property="id"    column="id"    />
         <result property="accCode"    column="acc_code"    />
-        <result property="siteNameCode"    column="site_name_code"    />
-        <result property="siteName"    column="site_name"    />
-        <result property="centerName"    column="center_name"    />
-        <result property="centerNameCode"    column="center_name_code"    />
+        <result property="siteCode"    column="site_code"    />
+        <result property="centerCode"    column="center_code"    />
         <result property="curMoney"    column="cur_money"    />
         <result property="frozenMoney"    column="frozen_money"    />
         <result property="confirmMoney"    column="confirm_money"    />
@@ -28,144 +26,169 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisSiteAccountVo">
-        select id, acc_code, site_name_code, site_name, center_name, center_name_code, cur_money, frozen_money, confirm_money, watch_money, close_money, earnest_money, currency, start_date, bl_open, bl_lock, bl_clear, clear_site_code, clear_date, clear_man_code, create_site_code, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_site_account
+        select id, acc_code, site_code, center_code, cur_money, frozen_money, confirm_money, watch_money, close_money, earnest_money, currency, start_date, bl_open, bl_lock, bl_clear, clear_site_code, clear_date, clear_man_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_site_account
     </sql>
 
     <select id="selectEmisSiteAccountList" parameterType="EmisSiteAccount" resultMap="EmisSiteAccountResult">
         <include refid="selectEmisSiteAccountVo"/>
-        <where>  
+        <where>
+            del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="accCode != null  and accCode != ''"> and acc_code like concat('%', #{accCode}, '%')</if>
-            <if test="siteNameCode != null  and siteNameCode != ''"> and site_name_code like concat('%', #{siteNameCode}, '%')</if>
-            <if test="siteName != null  and siteName != ''"> and site_name like concat('%', #{siteName}, '%')</if>
-            <if test="centerName != null  and centerName != ''"> and center_name like concat('%', #{centerName}, '%')</if>
-            <if test="centerNameCode != null  and centerNameCode != ''"> and center_name_code like concat('%', #{centerNameCode}, '%')</if>
-            <if test="curMoney != null  and curMoney != ''"> and cur_money like concat('%', #{curMoney}, '%')</if>
-            <if test="frozenMoney != null  and frozenMoney != ''"> and frozen_money like concat('%', #{frozenMoney}, '%')</if>
-            <if test="confirmMoney != null  and confirmMoney != ''"> and confirm_money like concat('%', #{confirmMoney}, '%')</if>
-            <if test="watchMoney != null  and watchMoney != ''"> and watch_money like concat('%', #{watchMoney}, '%')</if>
-            <if test="closeMoney != null  and closeMoney != ''"> and close_money like concat('%', #{closeMoney}, '%')</if>
-            <if test="earnestMoney != null  and earnestMoney != ''"> and earnest_money like concat('%', #{earnestMoney}, '%')</if>
+            <if test="siteCode != null  and siteCode != ''"> and site_code like concat('%', #{siteCode}, '%')</if>
+            <if test="centerCode != null  and centerCode != ''"> and center_code like concat('%', #{centerCode}, '%')</if>
+            <if test="curMoney != null "> and cur_money = #{curMoney}</if>
+            <if test="frozenMoney != null "> and frozen_money = #{frozenMoney}</if>
+            <if test="confirmMoney != null "> and confirm_money = #{confirmMoney}</if>
+            <if test="watchMoney != null "> and watch_money = #{watchMoney}</if>
+            <if test="closeMoney != null "> and close_money = #{closeMoney}</if>
+            <if test="earnestMoney != null "> and earnest_money = #{earnestMoney}</if>
             <if test="currency != null  and currency != ''"> and currency like concat('%', #{currency}, '%')</if>
-            <if test="startDate != null  and startDate != ''"> and start_date like concat('%', #{startDate}, '%')</if>
+            <if test="startDate != null "> and start_date = #{startDate}</if>
             <if test="blOpen != null  and blOpen != ''"> and bl_open like concat('%', #{blOpen}, '%')</if>
             <if test="blLock != null  and blLock != ''"> and bl_lock like concat('%', #{blLock}, '%')</if>
             <if test="blClear != null  and blClear != ''"> and bl_clear like concat('%', #{blClear}, '%')</if>
             <if test="clearSiteCode != null  and clearSiteCode != ''"> and clear_site_code like concat('%', #{clearSiteCode}, '%')</if>
-            <if test="clearDate != null  and clearDate != ''"> and clear_date like concat('%', #{clearDate}, '%')</if>
+            <if test="clearDate != null "> and clear_date = #{clearDate}</if>
             <if test="clearManCode != null  and clearManCode != ''"> and clear_man_code like concat('%', #{clearManCode}, '%')</if>
-            <if test="createSiteCode != null  and createSiteCode != ''"> and create_site_code like concat('%', #{createSiteCode}, '%')</if>
-            <if test="modifySiteCode != null  and modifySiteCode != ''"> and modify_site_code like concat('%', #{modifySiteCode}, '%')</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
             <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
             <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
-            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
+            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
+            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
         </where>
         order by create_time desc
     </select>
-  
+
+    <select id="checkUnique" parameterType="EmisSiteAccount"  resultType="int">
+		select count(1) from  emis_site_account
+		where del_flag='0'
+           and id = #{id}
+           and acc_code = #{accCode}
+           and site_code = #{siteCode}
+           and center_code = #{centerCode}
+           and cur_money = #{curMoney}
+           and frozen_money = #{frozenMoney}
+           and confirm_money = #{confirmMoney}
+           and watch_money = #{watchMoney}
+           and close_money = #{closeMoney}
+           and earnest_money = #{earnestMoney}
+           and currency = #{currency}
+           and start_date = #{startDate}
+           and bl_open = #{blOpen}
+           and bl_lock = #{blLock}
+           and bl_clear = #{blClear}
+           and clear_site_code = #{clearSiteCode}
+           and clear_date = #{clearDate}
+           and clear_man_code = #{clearManCode}
+           and remark = #{remark}
+           and del_flag = #{delFlag}
+           and create_by = #{createBy}
+           and create_time = #{createTime}
+           and update_by = #{updateBy}
+           and update_time = #{updateTime}
+           and create_site = #{createSite}
+           and update_site = #{updateSite}
+		limit 1
+	</select>
+
     <select id="selectEmisSiteAccountById" parameterType="Long" resultMap="EmisSiteAccountResult">
-        select id, acc_code, site_name_code, site_name, center_name, center_name_code, cur_money, frozen_money, confirm_money, watch_money, close_money, earnest_money, currency, start_date, bl_open, bl_lock, bl_clear, clear_site_code, clear_date, clear_man_code, create_site_code, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark 
+        select id, acc_code, site_code, center_code, cur_money, frozen_money, confirm_money, watch_money, close_money, earnest_money, currency, start_date, bl_open, bl_lock, bl_clear, clear_site_code, clear_date, clear_man_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_site_account a
         where a.id = #{id}
     </select>
-        
-    <insert id="insertEmisSiteAccount" parameterType="EmisSiteAccount">
+
+    <insert id="insertEmisSiteAccount" parameterType="EmisSiteAccount" useGeneratedKeys="true" keyProperty="id">
         insert into emis_site_account
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="accCode != null and accCode != ''">acc_code,</if>
-            <if test="siteNameCode != null and siteNameCode != ''">site_name_code,</if>
-            <if test="siteName != null and siteName != ''">site_name,</if>
-            <if test="centerName != null and centerName != ''">center_name,</if>
-            <if test="centerNameCode != null and centerNameCode != ''">center_name_code,</if>
-            <if test="curMoney != null and curMoney != ''">cur_money,</if>
-            <if test="frozenMoney != null and frozenMoney != ''">frozen_money,</if>
-            <if test="confirmMoney != null and confirmMoney != ''">confirm_money,</if>
-            <if test="watchMoney != null and watchMoney != ''">watch_money,</if>
-            <if test="closeMoney != null and closeMoney != ''">close_money,</if>
-            <if test="earnestMoney != null and earnestMoney != ''">earnest_money,</if>
+            <if test="siteCode != null and siteCode != ''">site_code,</if>
+            <if test="centerCode != null and centerCode != ''">center_code,</if>
+            <if test="curMoney != null">cur_money,</if>
+            <if test="frozenMoney != null">frozen_money,</if>
+            <if test="confirmMoney != null">confirm_money,</if>
+            <if test="watchMoney != null">watch_money,</if>
+            <if test="closeMoney != null">close_money,</if>
+            <if test="earnestMoney != null">earnest_money,</if>
             <if test="currency != null and currency != ''">currency,</if>
-            <if test="startDate != null and startDate != ''">start_date,</if>
+            <if test="startDate != null">start_date,</if>
             <if test="blOpen != null and blOpen != ''">bl_open,</if>
             <if test="blLock != null and blLock != ''">bl_lock,</if>
             <if test="blClear != null and blClear != ''">bl_clear,</if>
             <if test="clearSiteCode != null and clearSiteCode != ''">clear_site_code,</if>
-            <if test="clearDate != null and clearDate != ''">clear_date,</if>
+            <if test="clearDate != null">clear_date,</if>
             <if test="clearManCode != null and clearManCode != ''">clear_man_code,</if>
-            <if test="createSiteCode != null and createSiteCode != ''">create_site_code,</if>
-            <if test="modifySiteCode != null and modifySiteCode != ''">modify_site_code,</if>
+            <if test="remark != null and remark != ''">remark,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="remark != null and remark != ''">remark,</if>
-         </trim>
+            <if test="createSite != null and createSite != ''">create_site,</if>
+            <if test="updateSite != null and updateSite != ''">update_site,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="accCode != null and accCode != ''">#{accCode},</if>
-            <if test="siteNameCode != null and siteNameCode != ''">#{siteNameCode},</if>
-            <if test="siteName != null and siteName != ''">#{siteName},</if>
-            <if test="centerName != null and centerName != ''">#{centerName},</if>
-            <if test="centerNameCode != null and centerNameCode != ''">#{centerNameCode},</if>
-            <if test="curMoney != null and curMoney != ''">#{curMoney},</if>
-            <if test="frozenMoney != null and frozenMoney != ''">#{frozenMoney},</if>
-            <if test="confirmMoney != null and confirmMoney != ''">#{confirmMoney},</if>
-            <if test="watchMoney != null and watchMoney != ''">#{watchMoney},</if>
-            <if test="closeMoney != null and closeMoney != ''">#{closeMoney},</if>
-            <if test="earnestMoney != null and earnestMoney != ''">#{earnestMoney},</if>
+            <if test="siteCode != null and siteCode != ''">#{siteCode},</if>
+            <if test="centerCode != null and centerCode != ''">#{centerCode},</if>
+            <if test="curMoney != null">#{curMoney},</if>
+            <if test="frozenMoney != null">#{frozenMoney},</if>
+            <if test="confirmMoney != null">#{confirmMoney},</if>
+            <if test="watchMoney != null">#{watchMoney},</if>
+            <if test="closeMoney != null">#{closeMoney},</if>
+            <if test="earnestMoney != null">#{earnestMoney},</if>
             <if test="currency != null and currency != ''">#{currency},</if>
-            <if test="startDate != null and startDate != ''">#{startDate},</if>
+            <if test="startDate != null">#{startDate},</if>
             <if test="blOpen != null and blOpen != ''">#{blOpen},</if>
             <if test="blLock != null and blLock != ''">#{blLock},</if>
             <if test="blClear != null and blClear != ''">#{blClear},</if>
             <if test="clearSiteCode != null and clearSiteCode != ''">#{clearSiteCode},</if>
-            <if test="clearDate != null and clearDate != ''">#{clearDate},</if>
+            <if test="clearDate != null">#{clearDate},</if>
             <if test="clearManCode != null and clearManCode != ''">#{clearManCode},</if>
-            <if test="createSiteCode != null and createSiteCode != ''">#{createSiteCode},</if>
-            <if test="modifySiteCode != null and modifySiteCode != ''">#{modifySiteCode},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null and remark != ''">#{remark},</if>
-         </trim>
+            <if test="createSite != null and createSite != ''">#{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
+        </trim>
     </insert>
 
     <update id="updateEmisSiteAccount" parameterType="EmisSiteAccount">
         update emis_site_account
         <trim prefix="SET" suffixOverrides=",">
             <if test="accCode != null and accCode != ''">acc_code = #{accCode},</if>
-            <if test="siteNameCode != null and siteNameCode != ''">site_name_code = #{siteNameCode},</if>
-            <if test="siteName != null and siteName != ''">site_name = #{siteName},</if>
-            <if test="centerName != null and centerName != ''">center_name = #{centerName},</if>
-            <if test="centerNameCode != null and centerNameCode != ''">center_name_code = #{centerNameCode},</if>
-            <if test="curMoney != null and curMoney != ''">cur_money = #{curMoney},</if>
-            <if test="frozenMoney != null and frozenMoney != ''">frozen_money = #{frozenMoney},</if>
-            <if test="confirmMoney != null and confirmMoney != ''">confirm_money = #{confirmMoney},</if>
-            <if test="watchMoney != null and watchMoney != ''">watch_money = #{watchMoney},</if>
-            <if test="closeMoney != null and closeMoney != ''">close_money = #{closeMoney},</if>
-            <if test="earnestMoney != null and earnestMoney != ''">earnest_money = #{earnestMoney},</if>
+            <if test="siteCode != null and siteCode != ''">site_code = #{siteCode},</if>
+            <if test="centerCode != null and centerCode != ''">center_code = #{centerCode},</if>
+            <if test="curMoney != null">cur_money = #{curMoney},</if>
+            <if test="frozenMoney != null">frozen_money = #{frozenMoney},</if>
+            <if test="confirmMoney != null">confirm_money = #{confirmMoney},</if>
+            <if test="watchMoney != null">watch_money = #{watchMoney},</if>
+            <if test="closeMoney != null">close_money = #{closeMoney},</if>
+            <if test="earnestMoney != null">earnest_money = #{earnestMoney},</if>
             <if test="currency != null and currency != ''">currency = #{currency},</if>
-            <if test="startDate != null and startDate != ''">start_date = #{startDate},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
             <if test="blOpen != null and blOpen != ''">bl_open = #{blOpen},</if>
             <if test="blLock != null and blLock != ''">bl_lock = #{blLock},</if>
             <if test="blClear != null and blClear != ''">bl_clear = #{blClear},</if>
             <if test="clearSiteCode != null and clearSiteCode != ''">clear_site_code = #{clearSiteCode},</if>
-            <if test="clearDate != null and clearDate != ''">clear_date = #{clearDate},</if>
+            <if test="clearDate != null">clear_date = #{clearDate},</if>
             <if test="clearManCode != null and clearManCode != ''">clear_man_code = #{clearManCode},</if>
-            <if test="createSiteCode != null and createSiteCode != ''">create_site_code = #{createSiteCode},</if>
-            <if test="modifySiteCode != null and modifySiteCode != ''">modify_site_code = #{modifySiteCode},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
         </trim>
         where id = #{id}
     </update>
@@ -175,7 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEmisSiteAccountByIds" parameterType="String">
-        delete from emis_site_account where id in 
+        delete from emis_site_account where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml
index 071d9b6b8..50a7c1dc7 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml
@@ -1,10 +1,10 @@
 <?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.xdadan.erp.emis.mapper.EmisSiteSettleRecordMapper">
-    
-    <resultMap type="EmisSiteSettleRecord" id="EmisSiteSettleRecordResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+
+    <resultMap type="EmisSiteSettleRecord" id="EmisSiteSettleRecordResult">
         <result property="id"    column="id"    />
         <result property="accCode"    column="acc_code"    />
         <result property="billCode"    column="bill_code"    />
@@ -19,27 +19,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="currency"    column="currency"    />
         <result property="changeType"    column="change_type"    />
         <result property="changeDate"    column="change_date"    />
-        <result property="centerName"    column="center_name"    />
-        <result property="centerNameCode"    column="center_name_code"    />
-        <result property="siteName"    column="site_name"    />
-        <result property="siteNameCode"    column="site_name_code"    />
+        <result property="centerCode"    column="center_code"    />
+        <result property="siteCode"    column="site_code"    />
         <result property="sourceType"    column="source_type"    />
         <result property="financeDate"    column="finance_date"    />
         <result property="operataDate"    column="operata_date"    />
         <result property="blConfirm"    column="bl_confirm"    />
-        <result property="confirmMan"    column="confirm_man"    />
         <result property="confirmManCode"    column="confirm_man_code"    />
-        <result property="confirmSite"    column="confirm_site"    />
         <result property="confirmSiteCode"    column="confirm_site_code"    />
-        <result property="settleMan"    column="settle_man"    />
         <result property="settleManCode"    column="settle_man_code"    />
-        <result property="settleSite"    column="settle_site"    />
         <result property="settleSiteCode"    column="settle_site_code"    />
         <result property="blCenter"    column="bl_center"    />
-        <result property="centerMan"    column="center_man"    />
         <result property="centerManCode"    column="center_man_code"    />
         <result property="blSite"    column="bl_site"    />
-        <result property="siteMan"    column="site_man"    />
         <result property="siteManCode"    column="site_man_code"    />
         <result property="siteDate"    column="site_date"    />
         <result property="blChargeFee"    column="bl_charge_fee"    />
@@ -47,81 +39,120 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="settleEbrCode"    column="settle_ebr_code"    />
         <result property="settleEbrDate"    column="settle_ebr_date"    />
         <result property="customerCode"    column="customer_code"    />
-        <result property="customerName"    column="customer_name"    />
         <result property="centerDate"    column="center_date"    />
-
     </resultMap>
 
     <sql id="selectEmisSiteSettleRecordVo">
-        select id, acc_code, bill_code, rec_pay_type, settle_type, pre_balance, pre_confirm_balance, cur_money, cur_confirm_money, back_balance, back_confirm_balance, currency, change_type, change_date, center_name, center_name_code, site_name, site_name_code, source_type, finance_date, operata_date, bl_confirm, confirm_man, confirm_man_code, confirm_site, confirm_site_code, settle_man, settle_man_code, settle_site, settle_site_code, bl_center, center_man, center_man_code, bl_site, site_man, site_man_code, site_date, bl_charge_fee, transfer_code, settle_ebr_code, settle_ebr_date, customer_code, customer_name, center_date, create_site_code, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_site_settle_record
+        select id, acc_code, bill_code, rec_pay_type, settle_type, pre_balance, pre_confirm_balance, cur_money, cur_confirm_money, back_balance, back_confirm_balance, currency, change_type, change_date, center_code, site_code, source_type, finance_date, operata_date, bl_confirm, confirm_man_code, confirm_site_code, settle_man_code, settle_site_code, bl_center, center_man_code, bl_site, site_man_code, site_date, bl_charge_fee, transfer_code, settle_ebr_code, settle_ebr_date, customer_code, center_date, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_site_settle_record
     </sql>
 
     <select id="selectEmisSiteSettleRecordList" parameterType="EmisSiteSettleRecord" resultMap="EmisSiteSettleRecordResult">
         <include refid="selectEmisSiteSettleRecordVo"/>
-        <where>  
+        <where>
+            del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="accCode != null  and accCode != ''"> and acc_code like concat('%', #{accCode}, '%')</if>
             <if test="billCode != null  and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
             <if test="recPayType != null  and recPayType != ''"> and rec_pay_type like concat('%', #{recPayType}, '%')</if>
             <if test="settleType != null  and settleType != ''"> and settle_type like concat('%', #{settleType}, '%')</if>
-            <if test="preBalance != null  and preBalance != ''"> and pre_balance like concat('%', #{preBalance}, '%')</if>
-            <if test="preConfirmBalance != null  and preConfirmBalance != ''"> and pre_confirm_balance like concat('%', #{preConfirmBalance}, '%')</if>
-            <if test="curMoney != null  and curMoney != ''"> and cur_money like concat('%', #{curMoney}, '%')</if>
-            <if test="curConfirmMoney != null  and curConfirmMoney != ''"> and cur_confirm_money like concat('%', #{curConfirmMoney}, '%')</if>
-            <if test="backBalance != null  and backBalance != ''"> and back_balance like concat('%', #{backBalance}, '%')</if>
-            <if test="backConfirmBalance != null  and backConfirmBalance != ''"> and back_confirm_balance like concat('%', #{backConfirmBalance}, '%')</if>
+            <if test="preBalance != null "> and pre_balance = #{preBalance}</if>
+            <if test="preConfirmBalance != null "> and pre_confirm_balance = #{preConfirmBalance}</if>
+            <if test="curMoney != null "> and cur_money = #{curMoney}</if>
+            <if test="curConfirmMoney != null "> and cur_confirm_money = #{curConfirmMoney}</if>
+            <if test="backBalance != null "> and back_balance = #{backBalance}</if>
+            <if test="backConfirmBalance != null "> and back_confirm_balance = #{backConfirmBalance}</if>
             <if test="currency != null  and currency != ''"> and currency like concat('%', #{currency}, '%')</if>
             <if test="changeType != null  and changeType != ''"> and change_type like concat('%', #{changeType}, '%')</if>
-            <if test="changeDate != null  and changeDate != ''"> and change_date like concat('%', #{changeDate}, '%')</if>
-            <if test="centerName != null  and centerName != ''"> and center_name like concat('%', #{centerName}, '%')</if>
-            <if test="centerNameCode != null  and centerNameCode != ''"> and center_name_code like concat('%', #{centerNameCode}, '%')</if>
-            <if test="siteName != null  and siteName != ''"> and site_name like concat('%', #{siteName}, '%')</if>
-            <if test="siteNameCode != null  and siteNameCode != ''"> and site_name_code like concat('%', #{siteNameCode}, '%')</if>
+            <if test="changeDate != null "> and change_date = #{changeDate}</if>
+            <if test="centerCode != null  and centerCode != ''"> and center_code like concat('%', #{centerCode}, '%')</if>
+            <if test="siteCode != null  and siteCode != ''"> and site_code like concat('%', #{siteCode}, '%')</if>
             <if test="sourceType != null  and sourceType != ''"> and source_type like concat('%', #{sourceType}, '%')</if>
-            <if test="financeDate != null  and financeDate != ''"> and finance_date like concat('%', #{financeDate}, '%')</if>
-            <if test="operataDate != null  and operataDate != ''"> and operata_date like concat('%', #{operataDate}, '%')</if>
+            <if test="financeDate != null "> and finance_date = #{financeDate}</if>
+            <if test="operataDate != null "> and operata_date = #{operataDate}</if>
             <if test="blConfirm != null  and blConfirm != ''"> and bl_confirm like concat('%', #{blConfirm}, '%')</if>
-            <if test="confirmMan != null  and confirmMan != ''"> and confirm_man like concat('%', #{confirmMan}, '%')</if>
             <if test="confirmManCode != null  and confirmManCode != ''"> and confirm_man_code like concat('%', #{confirmManCode}, '%')</if>
-            <if test="confirmSite != null  and confirmSite != ''"> and confirm_site like concat('%', #{confirmSite}, '%')</if>
             <if test="confirmSiteCode != null  and confirmSiteCode != ''"> and confirm_site_code like concat('%', #{confirmSiteCode}, '%')</if>
-            <if test="settleMan != null  and settleMan != ''"> and settle_man like concat('%', #{settleMan}, '%')</if>
             <if test="settleManCode != null  and settleManCode != ''"> and settle_man_code like concat('%', #{settleManCode}, '%')</if>
-            <if test="settleSite != null  and settleSite != ''"> and settle_site like concat('%', #{settleSite}, '%')</if>
             <if test="settleSiteCode != null  and settleSiteCode != ''"> and settle_site_code like concat('%', #{settleSiteCode}, '%')</if>
             <if test="blCenter != null  and blCenter != ''"> and bl_center like concat('%', #{blCenter}, '%')</if>
-            <if test="centerMan != null  and centerMan != ''"> and center_man like concat('%', #{centerMan}, '%')</if>
             <if test="centerManCode != null  and centerManCode != ''"> and center_man_code like concat('%', #{centerManCode}, '%')</if>
             <if test="blSite != null  and blSite != ''"> and bl_site like concat('%', #{blSite}, '%')</if>
-            <if test="siteMan != null  and siteMan != ''"> and site_man like concat('%', #{siteMan}, '%')</if>
             <if test="siteManCode != null  and siteManCode != ''"> and site_man_code like concat('%', #{siteManCode}, '%')</if>
-            <if test="siteDate != null  and siteDate != ''"> and site_date like concat('%', #{siteDate}, '%')</if>
+            <if test="siteDate != null "> and site_date = #{siteDate}</if>
             <if test="blChargeFee != null  and blChargeFee != ''"> and bl_charge_fee like concat('%', #{blChargeFee}, '%')</if>
             <if test="transferCode != null  and transferCode != ''"> and transfer_code like concat('%', #{transferCode}, '%')</if>
             <if test="settleEbrCode != null  and settleEbrCode != ''"> and settle_ebr_code like concat('%', #{settleEbrCode}, '%')</if>
-            <if test="settleEbrDate != null  and settleEbrDate != ''"> and settle_ebr_date like concat('%', #{settleEbrDate}, '%')</if>
+            <if test="settleEbrDate != null "> and settle_ebr_date = #{settleEbrDate}</if>
             <if test="customerCode != null  and customerCode != ''"> and customer_code like concat('%', #{customerCode}, '%')</if>
-            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
-            <if test="centerDate != null  and centerDate != ''"> and center_date like concat('%', #{centerDate}, '%')</if>
-            <if test="createSiteCode != null  and createSiteCode != ''"> and create_site_code like concat('%', #{createSiteCode}, '%')</if>
-            <if test="modifySiteCode != null  and modifySiteCode != ''"> and modify_site_code like concat('%', #{modifySiteCode}, '%')</if>
+            <if test="centerDate != null "> and center_date = #{centerDate}</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
             <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
             <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
-            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
+            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
+            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
         </where>
         order by create_time desc
     </select>
-  
+
+    <select id="checkUnique" parameterType="EmisSiteSettleRecord"  resultType="int">
+		select count(1) from  emis_site_settle_record
+		where del_flag='0'
+           and id = #{id}
+           and acc_code = #{accCode}
+           and bill_code = #{billCode}
+           and rec_pay_type = #{recPayType}
+           and settle_type = #{settleType}
+           and pre_balance = #{preBalance}
+           and pre_confirm_balance = #{preConfirmBalance}
+           and cur_money = #{curMoney}
+           and cur_confirm_money = #{curConfirmMoney}
+           and back_balance = #{backBalance}
+           and back_confirm_balance = #{backConfirmBalance}
+           and currency = #{currency}
+           and change_type = #{changeType}
+           and change_date = #{changeDate}
+           and center_code = #{centerCode}
+           and site_code = #{siteCode}
+           and source_type = #{sourceType}
+           and finance_date = #{financeDate}
+           and operata_date = #{operataDate}
+           and bl_confirm = #{blConfirm}
+           and confirm_man_code = #{confirmManCode}
+           and confirm_site_code = #{confirmSiteCode}
+           and settle_man_code = #{settleManCode}
+           and settle_site_code = #{settleSiteCode}
+           and bl_center = #{blCenter}
+           and center_man_code = #{centerManCode}
+           and bl_site = #{blSite}
+           and site_man_code = #{siteManCode}
+           and site_date = #{siteDate}
+           and bl_charge_fee = #{blChargeFee}
+           and transfer_code = #{transferCode}
+           and settle_ebr_code = #{settleEbrCode}
+           and settle_ebr_date = #{settleEbrDate}
+           and customer_code = #{customerCode}
+           and center_date = #{centerDate}
+           and remark = #{remark}
+           and del_flag = #{delFlag}
+           and create_by = #{createBy}
+           and create_time = #{createTime}
+           and update_by = #{updateBy}
+           and update_time = #{updateTime}
+           and create_site = #{createSite}
+           and update_site = #{updateSite}
+		limit 1
+	</select>
+
     <select id="selectEmisSiteSettleRecordById" parameterType="Long" resultMap="EmisSiteSettleRecordResult">
-        select id, acc_code, bill_code, rec_pay_type, settle_type, pre_balance, pre_confirm_balance, cur_money, cur_confirm_money, back_balance, back_confirm_balance, currency, change_type, change_date, center_name, center_name_code, site_name, site_name_code, source_type, finance_date, operata_date, bl_confirm, confirm_man, confirm_man_code, confirm_site, confirm_site_code, settle_man, settle_man_code, settle_site, settle_site_code, bl_center, center_man, center_man_code, bl_site, site_man, site_man_code, site_date, bl_charge_fee, transfer_code, settle_ebr_code, settle_ebr_date, customer_code, customer_name, center_date, create_site_code, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark 
+        select id, acc_code, bill_code, rec_pay_type, settle_type, pre_balance, pre_confirm_balance, cur_money, cur_confirm_money, back_balance, back_confirm_balance, currency, change_type, change_date, center_code, site_code, source_type, finance_date, operata_date, bl_confirm, confirm_man_code, confirm_site_code, settle_man_code, settle_site_code, bl_center, center_man_code, bl_site, site_man_code, site_date, bl_charge_fee, transfer_code, settle_ebr_code, settle_ebr_date, customer_code, center_date, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_site_settle_record a
         where a.id = #{id}
     </select>
-        
-    <insert id="insertEmisSiteSettleRecord" parameterType="EmisSiteSettleRecord">
+
+    <insert id="insertEmisSiteSettleRecord" parameterType="EmisSiteSettleRecord" useGeneratedKeys="true" keyProperty="id">
         insert into emis_site_settle_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -129,108 +160,90 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="billCode != null and billCode != ''">bill_code,</if>
             <if test="recPayType != null and recPayType != ''">rec_pay_type,</if>
             <if test="settleType != null and settleType != ''">settle_type,</if>
-            <if test="preBalance != null and preBalance != ''">pre_balance,</if>
-            <if test="preConfirmBalance != null and preConfirmBalance != ''">pre_confirm_balance,</if>
-            <if test="curMoney != null and curMoney != ''">cur_money,</if>
-            <if test="curConfirmMoney != null and curConfirmMoney != ''">cur_confirm_money,</if>
-            <if test="backBalance != null and backBalance != ''">back_balance,</if>
-            <if test="backConfirmBalance != null and backConfirmBalance != ''">back_confirm_balance,</if>
+            <if test="preBalance != null">pre_balance,</if>
+            <if test="preConfirmBalance != null">pre_confirm_balance,</if>
+            <if test="curMoney != null">cur_money,</if>
+            <if test="curConfirmMoney != null">cur_confirm_money,</if>
+            <if test="backBalance != null">back_balance,</if>
+            <if test="backConfirmBalance != null">back_confirm_balance,</if>
             <if test="currency != null and currency != ''">currency,</if>
             <if test="changeType != null and changeType != ''">change_type,</if>
-            <if test="changeDate != null and changeDate != ''">change_date,</if>
-            <if test="centerName != null and centerName != ''">center_name,</if>
-            <if test="centerNameCode != null and centerNameCode != ''">center_name_code,</if>
-            <if test="siteName != null and siteName != ''">site_name,</if>
-            <if test="siteNameCode != null and siteNameCode != ''">site_name_code,</if>
+            <if test="changeDate != null">change_date,</if>
+            <if test="centerCode != null and centerCode != ''">center_code,</if>
+            <if test="siteCode != null and siteCode != ''">site_code,</if>
             <if test="sourceType != null and sourceType != ''">source_type,</if>
-            <if test="financeDate != null and financeDate != ''">finance_date,</if>
-            <if test="operataDate != null and operataDate != ''">operata_date,</if>
+            <if test="financeDate != null">finance_date,</if>
+            <if test="operataDate != null">operata_date,</if>
             <if test="blConfirm != null and blConfirm != ''">bl_confirm,</if>
-            <if test="confirmMan != null and confirmMan != ''">confirm_man,</if>
             <if test="confirmManCode != null and confirmManCode != ''">confirm_man_code,</if>
-            <if test="confirmSite != null and confirmSite != ''">confirm_site,</if>
             <if test="confirmSiteCode != null and confirmSiteCode != ''">confirm_site_code,</if>
-            <if test="settleMan != null and settleMan != ''">settle_man,</if>
             <if test="settleManCode != null and settleManCode != ''">settle_man_code,</if>
-            <if test="settleSite != null and settleSite != ''">settle_site,</if>
             <if test="settleSiteCode != null and settleSiteCode != ''">settle_site_code,</if>
             <if test="blCenter != null and blCenter != ''">bl_center,</if>
-            <if test="centerMan != null and centerMan != ''">center_man,</if>
             <if test="centerManCode != null and centerManCode != ''">center_man_code,</if>
             <if test="blSite != null and blSite != ''">bl_site,</if>
-            <if test="siteMan != null and siteMan != ''">site_man,</if>
             <if test="siteManCode != null and siteManCode != ''">site_man_code,</if>
-            <if test="siteDate != null and siteDate != ''">site_date,</if>
+            <if test="siteDate != null">site_date,</if>
             <if test="blChargeFee != null and blChargeFee != ''">bl_charge_fee,</if>
             <if test="transferCode != null and transferCode != ''">transfer_code,</if>
             <if test="settleEbrCode != null and settleEbrCode != ''">settle_ebr_code,</if>
-            <if test="settleEbrDate != null and settleEbrDate != ''">settle_ebr_date,</if>
+            <if test="settleEbrDate != null">settle_ebr_date,</if>
             <if test="customerCode != null and customerCode != ''">customer_code,</if>
-            <if test="customerName != null and customerName != ''">customer_name,</if>
-            <if test="centerDate != null and centerDate != ''">center_date,</if>
-            <if test="createSiteCode != null and createSiteCode != ''">create_site_code,</if>
-            <if test="modifySiteCode != null and modifySiteCode != ''">modify_site_code,</if>
+            <if test="centerDate != null">center_date,</if>
+            <if test="remark != null and remark != ''">remark,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="remark != null and remark != ''">remark,</if>
-         </trim>
+            <if test="createSite != null and createSite != ''">create_site,</if>
+            <if test="updateSite != null and updateSite != ''">update_site,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="accCode != null and accCode != ''">#{accCode},</if>
             <if test="billCode != null and billCode != ''">#{billCode},</if>
             <if test="recPayType != null and recPayType != ''">#{recPayType},</if>
             <if test="settleType != null and settleType != ''">#{settleType},</if>
-            <if test="preBalance != null and preBalance != ''">#{preBalance},</if>
-            <if test="preConfirmBalance != null and preConfirmBalance != ''">#{preConfirmBalance},</if>
-            <if test="curMoney != null and curMoney != ''">#{curMoney},</if>
-            <if test="curConfirmMoney != null and curConfirmMoney != ''">#{curConfirmMoney},</if>
-            <if test="backBalance != null and backBalance != ''">#{backBalance},</if>
-            <if test="backConfirmBalance != null and backConfirmBalance != ''">#{backConfirmBalance},</if>
+            <if test="preBalance != null">#{preBalance},</if>
+            <if test="preConfirmBalance != null">#{preConfirmBalance},</if>
+            <if test="curMoney != null">#{curMoney},</if>
+            <if test="curConfirmMoney != null">#{curConfirmMoney},</if>
+            <if test="backBalance != null">#{backBalance},</if>
+            <if test="backConfirmBalance != null">#{backConfirmBalance},</if>
             <if test="currency != null and currency != ''">#{currency},</if>
             <if test="changeType != null and changeType != ''">#{changeType},</if>
-            <if test="changeDate != null and changeDate != ''">#{changeDate},</if>
-            <if test="centerName != null and centerName != ''">#{centerName},</if>
-            <if test="centerNameCode != null and centerNameCode != ''">#{centerNameCode},</if>
-            <if test="siteName != null and siteName != ''">#{siteName},</if>
-            <if test="siteNameCode != null and siteNameCode != ''">#{siteNameCode},</if>
+            <if test="changeDate != null">#{changeDate},</if>
+            <if test="centerCode != null and centerCode != ''">#{centerCode},</if>
+            <if test="siteCode != null and siteCode != ''">#{siteCode},</if>
             <if test="sourceType != null and sourceType != ''">#{sourceType},</if>
-            <if test="financeDate != null and financeDate != ''">#{financeDate},</if>
-            <if test="operataDate != null and operataDate != ''">#{operataDate},</if>
+            <if test="financeDate != null">#{financeDate},</if>
+            <if test="operataDate != null">#{operataDate},</if>
             <if test="blConfirm != null and blConfirm != ''">#{blConfirm},</if>
-            <if test="confirmMan != null and confirmMan != ''">#{confirmMan},</if>
             <if test="confirmManCode != null and confirmManCode != ''">#{confirmManCode},</if>
-            <if test="confirmSite != null and confirmSite != ''">#{confirmSite},</if>
             <if test="confirmSiteCode != null and confirmSiteCode != ''">#{confirmSiteCode},</if>
-            <if test="settleMan != null and settleMan != ''">#{settleMan},</if>
             <if test="settleManCode != null and settleManCode != ''">#{settleManCode},</if>
-            <if test="settleSite != null and settleSite != ''">#{settleSite},</if>
             <if test="settleSiteCode != null and settleSiteCode != ''">#{settleSiteCode},</if>
             <if test="blCenter != null and blCenter != ''">#{blCenter},</if>
-            <if test="centerMan != null and centerMan != ''">#{centerMan},</if>
             <if test="centerManCode != null and centerManCode != ''">#{centerManCode},</if>
             <if test="blSite != null and blSite != ''">#{blSite},</if>
-            <if test="siteMan != null and siteMan != ''">#{siteMan},</if>
             <if test="siteManCode != null and siteManCode != ''">#{siteManCode},</if>
-            <if test="siteDate != null and siteDate != ''">#{siteDate},</if>
+            <if test="siteDate != null">#{siteDate},</if>
             <if test="blChargeFee != null and blChargeFee != ''">#{blChargeFee},</if>
             <if test="transferCode != null and transferCode != ''">#{transferCode},</if>
             <if test="settleEbrCode != null and settleEbrCode != ''">#{settleEbrCode},</if>
-            <if test="settleEbrDate != null and settleEbrDate != ''">#{settleEbrDate},</if>
+            <if test="settleEbrDate != null">#{settleEbrDate},</if>
             <if test="customerCode != null and customerCode != ''">#{customerCode},</if>
-            <if test="customerName != null and customerName != ''">#{customerName},</if>
-            <if test="centerDate != null and centerDate != ''">#{centerDate},</if>
-            <if test="createSiteCode != null and createSiteCode != ''">#{createSiteCode},</if>
-            <if test="modifySiteCode != null and modifySiteCode != ''">#{modifySiteCode},</if>
+            <if test="centerDate != null">#{centerDate},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null and remark != ''">#{remark},</if>
-         </trim>
+            <if test="createSite != null and createSite != ''">#{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
+        </trim>
     </insert>
 
     <update id="updateEmisSiteSettleRecord" parameterType="EmisSiteSettleRecord">
@@ -240,53 +253,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
             <if test="recPayType != null and recPayType != ''">rec_pay_type = #{recPayType},</if>
             <if test="settleType != null and settleType != ''">settle_type = #{settleType},</if>
-            <if test="preBalance != null and preBalance != ''">pre_balance = #{preBalance},</if>
-            <if test="preConfirmBalance != null and preConfirmBalance != ''">pre_confirm_balance = #{preConfirmBalance},</if>
-            <if test="curMoney != null and curMoney != ''">cur_money = #{curMoney},</if>
-            <if test="curConfirmMoney != null and curConfirmMoney != ''">cur_confirm_money = #{curConfirmMoney},</if>
-            <if test="backBalance != null and backBalance != ''">back_balance = #{backBalance},</if>
-            <if test="backConfirmBalance != null and backConfirmBalance != ''">back_confirm_balance = #{backConfirmBalance},</if>
+            <if test="preBalance != null">pre_balance = #{preBalance},</if>
+            <if test="preConfirmBalance != null">pre_confirm_balance = #{preConfirmBalance},</if>
+            <if test="curMoney != null">cur_money = #{curMoney},</if>
+            <if test="curConfirmMoney != null">cur_confirm_money = #{curConfirmMoney},</if>
+            <if test="backBalance != null">back_balance = #{backBalance},</if>
+            <if test="backConfirmBalance != null">back_confirm_balance = #{backConfirmBalance},</if>
             <if test="currency != null and currency != ''">currency = #{currency},</if>
             <if test="changeType != null and changeType != ''">change_type = #{changeType},</if>
-            <if test="changeDate != null and changeDate != ''">change_date = #{changeDate},</if>
-            <if test="centerName != null and centerName != ''">center_name = #{centerName},</if>
-            <if test="centerNameCode != null and centerNameCode != ''">center_name_code = #{centerNameCode},</if>
-            <if test="siteName != null and siteName != ''">site_name = #{siteName},</if>
-            <if test="siteNameCode != null and siteNameCode != ''">site_name_code = #{siteNameCode},</if>
+            <if test="changeDate != null">change_date = #{changeDate},</if>
+            <if test="centerCode != null and centerCode != ''">center_code = #{centerCode},</if>
+            <if test="siteCode != null and siteCode != ''">site_code = #{siteCode},</if>
             <if test="sourceType != null and sourceType != ''">source_type = #{sourceType},</if>
-            <if test="financeDate != null and financeDate != ''">finance_date = #{financeDate},</if>
-            <if test="operataDate != null and operataDate != ''">operata_date = #{operataDate},</if>
+            <if test="financeDate != null">finance_date = #{financeDate},</if>
+            <if test="operataDate != null">operata_date = #{operataDate},</if>
             <if test="blConfirm != null and blConfirm != ''">bl_confirm = #{blConfirm},</if>
-            <if test="confirmMan != null and confirmMan != ''">confirm_man = #{confirmMan},</if>
             <if test="confirmManCode != null and confirmManCode != ''">confirm_man_code = #{confirmManCode},</if>
-            <if test="confirmSite != null and confirmSite != ''">confirm_site = #{confirmSite},</if>
             <if test="confirmSiteCode != null and confirmSiteCode != ''">confirm_site_code = #{confirmSiteCode},</if>
-            <if test="settleMan != null and settleMan != ''">settle_man = #{settleMan},</if>
             <if test="settleManCode != null and settleManCode != ''">settle_man_code = #{settleManCode},</if>
-            <if test="settleSite != null and settleSite != ''">settle_site = #{settleSite},</if>
             <if test="settleSiteCode != null and settleSiteCode != ''">settle_site_code = #{settleSiteCode},</if>
             <if test="blCenter != null and blCenter != ''">bl_center = #{blCenter},</if>
-            <if test="centerMan != null and centerMan != ''">center_man = #{centerMan},</if>
             <if test="centerManCode != null and centerManCode != ''">center_man_code = #{centerManCode},</if>
             <if test="blSite != null and blSite != ''">bl_site = #{blSite},</if>
-            <if test="siteMan != null and siteMan != ''">site_man = #{siteMan},</if>
             <if test="siteManCode != null and siteManCode != ''">site_man_code = #{siteManCode},</if>
-            <if test="siteDate != null and siteDate != ''">site_date = #{siteDate},</if>
+            <if test="siteDate != null">site_date = #{siteDate},</if>
             <if test="blChargeFee != null and blChargeFee != ''">bl_charge_fee = #{blChargeFee},</if>
             <if test="transferCode != null and transferCode != ''">transfer_code = #{transferCode},</if>
             <if test="settleEbrCode != null and settleEbrCode != ''">settle_ebr_code = #{settleEbrCode},</if>
-            <if test="settleEbrDate != null and settleEbrDate != ''">settle_ebr_date = #{settleEbrDate},</if>
+            <if test="settleEbrDate != null">settle_ebr_date = #{settleEbrDate},</if>
             <if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
-            <if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
-            <if test="centerDate != null and centerDate != ''">center_date = #{centerDate},</if>
-            <if test="createSiteCode != null and createSiteCode != ''">create_site_code = #{createSiteCode},</if>
-            <if test="modifySiteCode != null and modifySiteCode != ''">modify_site_code = #{modifySiteCode},</if>
+            <if test="centerDate != null">center_date = #{centerDate},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
         </trim>
         where id = #{id}
     </update>
@@ -296,7 +300,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEmisSiteSettleRecordByIds" parameterType="String">
-        delete from emis_site_settle_record where id in 
+        delete from emis_site_settle_record where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>