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: 网点结算账户 实体类
*/
@@ -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: 网点账户结算记录 实体类
*/
@@ -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 @@
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-
+
+
-
-
-
-
+
+
@@ -28,144 +26,169 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- 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
-
+
+
+
-
-
+
+
insert into emis_site_account
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,
+ site_code,
+ center_code,
+ cur_money,
+ frozen_money,
+ confirm_money,
+ watch_money,
+ close_money,
+ earnest_money,
currency,
- start_date,
+ start_date,
bl_open,
bl_lock,
bl_clear,
clear_site_code,
- clear_date,
+ clear_date,
clear_man_code,
- create_site_code,
- modify_site_code,
+ remark,
del_flag,
create_by,
create_time,
update_by,
update_time,
- remark,
-
+ create_site,
+ update_site,
+
#{id},
#{accCode},
- #{siteNameCode},
- #{siteName},
- #{centerName},
- #{centerNameCode},
- #{curMoney},
- #{frozenMoney},
- #{confirmMoney},
- #{watchMoney},
- #{closeMoney},
- #{earnestMoney},
+ #{siteCode},
+ #{centerCode},
+ #{curMoney},
+ #{frozenMoney},
+ #{confirmMoney},
+ #{watchMoney},
+ #{closeMoney},
+ #{earnestMoney},
#{currency},
- #{startDate},
+ #{startDate},
#{blOpen},
#{blLock},
#{blClear},
#{clearSiteCode},
- #{clearDate},
+ #{clearDate},
#{clearManCode},
- #{createSiteCode},
- #{modifySiteCode},
+ #{remark},
#{delFlag},
#{createBy},
#{createTime},
#{updateBy},
#{updateTime},
- #{remark},
-
+ #{createSite},
+ #{updateSite},
+
update emis_site_account
acc_code = #{accCode},
- site_name_code = #{siteNameCode},
- site_name = #{siteName},
- center_name = #{centerName},
- center_name_code = #{centerNameCode},
- cur_money = #{curMoney},
- frozen_money = #{frozenMoney},
- confirm_money = #{confirmMoney},
- watch_money = #{watchMoney},
- close_money = #{closeMoney},
- earnest_money = #{earnestMoney},
+ site_code = #{siteCode},
+ center_code = #{centerCode},
+ cur_money = #{curMoney},
+ frozen_money = #{frozenMoney},
+ confirm_money = #{confirmMoney},
+ watch_money = #{watchMoney},
+ close_money = #{closeMoney},
+ earnest_money = #{earnestMoney},
currency = #{currency},
- start_date = #{startDate},
+ start_date = #{startDate},
bl_open = #{blOpen},
bl_lock = #{blLock},
bl_clear = #{blClear},
clear_site_code = #{clearSiteCode},
- clear_date = #{clearDate},
+ clear_date = #{clearDate},
clear_man_code = #{clearManCode},
- create_site_code = #{createSiteCode},
- modify_site_code = #{modifySiteCode},
+ remark = #{remark},
del_flag = #{delFlag},
create_by = #{createBy},
create_time = #{createTime},
update_by = #{updateBy},
update_time = #{updateTime},
- remark = #{remark},
+ create_site = #{createSite},
+ update_site = #{updateSite},
where id = #{id}
@@ -175,7 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from emis_site_account where id in
+ delete from emis_site_account where id in
#{id}
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 @@
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-
+
+
@@ -19,27 +19,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
-
-
+
+
-
-
-
-
-
-
@@ -47,81 +39,120 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
- 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
-
+
+
+
-
-
+
+
insert into emis_site_settle_record
id,
@@ -129,108 +160,90 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bill_code,
rec_pay_type,
settle_type,
- pre_balance,
- pre_confirm_balance,
- cur_money,
- cur_confirm_money,
- back_balance,
- back_confirm_balance,
+ 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,
+ change_date,
+ center_code,
+ site_code,
source_type,
- finance_date,
- operata_date,
+ 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,
+ site_date,
bl_charge_fee,
transfer_code,
settle_ebr_code,
- settle_ebr_date,
+ settle_ebr_date,
customer_code,
- customer_name,
- center_date,
- create_site_code,
- modify_site_code,
+ center_date,
+ remark,
del_flag,
create_by,
create_time,
update_by,
update_time,
- remark,
-
+ create_site,
+ update_site,
+
#{id},
#{accCode},
#{billCode},
#{recPayType},
#{settleType},
- #{preBalance},
- #{preConfirmBalance},
- #{curMoney},
- #{curConfirmMoney},
- #{backBalance},
- #{backConfirmBalance},
+ #{preBalance},
+ #{preConfirmBalance},
+ #{curMoney},
+ #{curConfirmMoney},
+ #{backBalance},
+ #{backConfirmBalance},
#{currency},
#{changeType},
- #{changeDate},
- #{centerName},
- #{centerNameCode},
- #{siteName},
- #{siteNameCode},
+ #{changeDate},
+ #{centerCode},
+ #{siteCode},
#{sourceType},
- #{financeDate},
- #{operataDate},
+ #{financeDate},
+ #{operataDate},
#{blConfirm},
- #{confirmMan},
#{confirmManCode},
- #{confirmSite},
#{confirmSiteCode},
- #{settleMan},
#{settleManCode},
- #{settleSite},
#{settleSiteCode},
#{blCenter},
- #{centerMan},
#{centerManCode},
#{blSite},
- #{siteMan},
#{siteManCode},
- #{siteDate},
+ #{siteDate},
#{blChargeFee},
#{transferCode},
#{settleEbrCode},
- #{settleEbrDate},
+ #{settleEbrDate},
#{customerCode},
- #{customerName},
- #{centerDate},
- #{createSiteCode},
- #{modifySiteCode},
+ #{centerDate},
+ #{remark},
#{delFlag},
#{createBy},
#{createTime},
#{updateBy},
#{updateTime},
- #{remark},
-
+ #{createSite},
+ #{updateSite},
+
@@ -240,53 +253,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bill_code = #{billCode},
rec_pay_type = #{recPayType},
settle_type = #{settleType},
- pre_balance = #{preBalance},
- pre_confirm_balance = #{preConfirmBalance},
- cur_money = #{curMoney},
- cur_confirm_money = #{curConfirmMoney},
- back_balance = #{backBalance},
- back_confirm_balance = #{backConfirmBalance},
+ pre_balance = #{preBalance},
+ pre_confirm_balance = #{preConfirmBalance},
+ cur_money = #{curMoney},
+ cur_confirm_money = #{curConfirmMoney},
+ back_balance = #{backBalance},
+ back_confirm_balance = #{backConfirmBalance},
currency = #{currency},
change_type = #{changeType},
- change_date = #{changeDate},
- center_name = #{centerName},
- center_name_code = #{centerNameCode},
- site_name = #{siteName},
- site_name_code = #{siteNameCode},
+ change_date = #{changeDate},
+ center_code = #{centerCode},
+ site_code = #{siteCode},
source_type = #{sourceType},
- finance_date = #{financeDate},
- operata_date = #{operataDate},
+ finance_date = #{financeDate},
+ operata_date = #{operataDate},
bl_confirm = #{blConfirm},
- confirm_man = #{confirmMan},
confirm_man_code = #{confirmManCode},
- confirm_site = #{confirmSite},
confirm_site_code = #{confirmSiteCode},
- settle_man = #{settleMan},
settle_man_code = #{settleManCode},
- settle_site = #{settleSite},
settle_site_code = #{settleSiteCode},
bl_center = #{blCenter},
- center_man = #{centerMan},
center_man_code = #{centerManCode},
bl_site = #{blSite},
- site_man = #{siteMan},
site_man_code = #{siteManCode},
- site_date = #{siteDate},
+ site_date = #{siteDate},
bl_charge_fee = #{blChargeFee},
transfer_code = #{transferCode},
settle_ebr_code = #{settleEbrCode},
- settle_ebr_date = #{settleEbrDate},
+ settle_ebr_date = #{settleEbrDate},
customer_code = #{customerCode},
- customer_name = #{customerName},
- center_date = #{centerDate},
- create_site_code = #{createSiteCode},
- modify_site_code = #{modifySiteCode},
+ center_date = #{centerDate},
+ remark = #{remark},
del_flag = #{delFlag},
create_by = #{createBy},
create_time = #{createTime},
update_by = #{updateBy},
update_time = #{updateTime},
- remark = #{remark},
+ create_site = #{createSite},
+ update_site = #{updateSite},
where id = #{id}
@@ -296,7 +300,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from emis_site_settle_record where id in
+ delete from emis_site_settle_record where id in
#{id}