Commit f55cfbe9 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/develop' into develop

parents 138578ef a4812b95
...@@ -185,12 +185,12 @@ public class TPaymentInfo extends BaseEntity { ...@@ -185,12 +185,12 @@ public class TPaymentInfo extends BaseEntity {
private String socialCreateMonth; private String socialCreateMonth;
/** /**
* 锁定状态 0 未锁定 1 锁定 * 确认无误状态 0 未确认 1 已确认
*/ */
@ExcelAttribute(name = "锁定状态 0 未锁定 1 锁定" ) @ExcelAttribute(name = "确认无误状态 0 未确认 1 已确认" )
@Schema(description ="锁定状态 0 未锁定 1 锁定") @Schema(description ="确认无误状态 0 未确认 1 已确认")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("锁定状态 0 未锁定 1 锁定") @ExcelProperty("确认无误状态 0 未确认 1 已确认")
private String lockStatus; private String lockStatus;
/** /**
......
...@@ -631,7 +631,28 @@ ...@@ -631,7 +631,28 @@
<!--tPaymentInfo简单分页查询--> <!--tPaymentInfo简单分页查询-->
<select id="getTPaymentInfoPage" resultMap="tPaymentInfoMap"> <select id="getTPaymentInfoPage" resultMap="tPaymentInfoMap">
SELECT SELECT
<include refid="Base_Column_List"/> a.ID,
a.EMP_NAME,
a.EMP_NO,
a.EMP_IDCARD,
a.UNIT_NAME,
a.SETTLE_DOMAIN_NAME,
a.SOCIAL_HOUSEHOLD,
a.SOCIAL_SECURITY_NO,
a.SOCIAL_PAY_ADDR,
a.SOCIAL_PAY_MONTH,
a.SOCIAL_CREATE_MONTH,
a.LOCK_STATUS,
a.PUSH_STATUS,
a.SUM_ALL,
a.PROVIDENT_PAY_MONTH,
a.PROVIDENT_CREATE_MONTH,
a.PROVIDENT_HOUSEHOLD,
a.PROVIDENT_PAY_ADDR,
a.SOCIAL_SUM,
a.PROVIDENT_SUM,
a.CREATE_NAME,
a.CREATE_TIME
FROM t_payment_info a FROM t_payment_info a
<where> <where>
1=1 1=1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment