md
This commit is contained in:
linfso
parent
51164a0fb9
commit
f776024f02
@ -38,12 +38,11 @@ public class EmisSettleInvoiceRecord extends BaseEntity
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/* id */
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Long id;
|
||||
/* 申请序号 */
|
||||
private String applySeqNo;
|
||||
/* 申请时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date applyDate;
|
||||
/* 审核人 */
|
||||
private String applyManCode;
|
||||
@ -95,6 +94,10 @@ public class EmisSettleInvoiceRecord extends BaseEntity
|
||||
private BigDecimal openMoney;
|
||||
/* 发票号 */
|
||||
private String invoiceNo;
|
||||
/* 已收款金额 */
|
||||
private BigDecimal recedMoney;
|
||||
/* 付款状态 0-未付款 1-已付款 2-部分付款 */
|
||||
private String paymentStatus;
|
||||
/* 开票状态 0-待开票 1-已开票 2-拒绝开票 */
|
||||
private String invoiceStatus;
|
||||
/* 开票状态描述 */
|
||||
@ -108,7 +111,7 @@ public class EmisSettleInvoiceRecord extends BaseEntity
|
||||
/* 审核状态 0-未审核 1-已审核 */
|
||||
private String blAudit;
|
||||
/* 审核日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date auditDate;
|
||||
/* 审核人 */
|
||||
private String auditManCode;
|
||||
@ -119,7 +122,7 @@ public class EmisSettleInvoiceRecord extends BaseEntity
|
||||
/* 操作人 */
|
||||
private String opManCode;
|
||||
/* 操作时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date opDate;
|
||||
/* 操作站点 */
|
||||
private String opSiteCode;
|
||||
|
||||
@ -72,6 +72,9 @@ public interface EmisSettleInvoiceRecordMapper extends BaseMapper<EmisSettleInvo
|
||||
|
||||
public int insertInvoiceRecordBillRel(@Param("applySeqNo") String applySeqNo,@Param("settleBillNo") String settleBillNo);
|
||||
|
||||
|
||||
public int updateHasPayByApplySeqNo(@Param("applySeqNo") String applySeqNo);
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
|
||||
@ -59,6 +59,9 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
|
||||
private IEmisSettleBillService emisSettleBillService;
|
||||
|
||||
|
||||
@Autowired
|
||||
private EmisSettleInvoiceRecordMapper emisSettleInvoiceRecordMapper;
|
||||
|
||||
@Autowired
|
||||
private EmisSettlePayInvoiceRelMapper emisSettlePayInvoiceRelMapper;
|
||||
|
||||
@ -170,6 +173,8 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
|
||||
for (EmisSettlePayInvoiceRel itemSettlePayInvoiceRel:emisSettlePayRecord.getPayInvoiceRelList()) {
|
||||
itemSettlePayInvoiceRel.setPayId(payId);
|
||||
emisSettlePayInvoiceRelMapper.insertEmisSettlePayInvoiceRel(itemSettlePayInvoiceRel);
|
||||
// 更新收款状态
|
||||
emisSettleInvoiceRecordMapper.updateHasPayByApplySeqNo(itemSettlePayInvoiceRel.getApplySeqNo());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -33,6 +33,8 @@
|
||||
<result property="openMoneyMax" column="open_money_max" />
|
||||
<result property="openMoney" column="open_money" />
|
||||
<result property="invoiceNo" column="invoice_no" />
|
||||
<result property="recedMoney" column="reced_money" />
|
||||
<result property="paymentStatus" column="payment_status" />
|
||||
<result property="invoiceStatus" column="invoice_status" />
|
||||
<result property="invoiceStatusDesc" column="invoice_status_desc" />
|
||||
<result property="recieveAddress" column="recieve_address" />
|
||||
@ -64,12 +66,12 @@
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectEmisSettleInvoiceRecordVo">
|
||||
select id, apply_seq_no, apply_date, apply_man_code, apply_site_code, customer_code, customer_name, settle_bill_no, settle_bill_name, apply_money, invoice_type, openbill_scope, company_name, company_tax_no, company_tel, company_address, invioce_remark, bank_name, bank_acc_no, contact, phone, real_tax_type, orig_open_money, add_tax_rate, add_open_money, open_money_max, open_money, invoice_no, invoice_status, invoice_status_desc, recieve_address, email, file_path, remark, bl_audit, audit_date, audit_man_code, audit_site_code, audit_note, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_invoice_record
|
||||
select id, apply_seq_no, apply_date, apply_man_code, apply_site_code, customer_code, customer_name, settle_bill_no, settle_bill_name, apply_money, invoice_type, openbill_scope, company_name, company_tax_no, company_tel, company_address, invioce_remark, bank_name, bank_acc_no, contact, phone, real_tax_type, orig_open_money, add_tax_rate, add_open_money, open_money_max, open_money, invoice_no, reced_money, payment_status, invoice_status, invoice_status_desc, recieve_address, email, file_path, remark, bl_audit, audit_date, audit_man_code, audit_site_code, audit_note, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_invoice_record
|
||||
</sql>
|
||||
|
||||
<select id="selectEmisSettleInvoiceRecordList" parameterType="EmisSettleInvoiceRecord" resultMap="EmisSettleInvoiceRecordResult">
|
||||
|
||||
select id, apply_seq_no, apply_date, apply_man_code, apply_site_code, customer_code, customer_name, settle_bill_no, settle_bill_name, apply_money, invoice_type, openbill_scope, company_name, company_tax_no, company_tel, company_address, invioce_remark, bank_name, bank_acc_no, contact, phone, real_tax_type, orig_open_money, add_tax_rate, add_open_money, open_money_max, open_money, invoice_no, invoice_status, invoice_status_desc, recieve_address, email, file_path, remark, bl_audit, audit_date, audit_man_code, audit_site_code, audit_note, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
select id, apply_seq_no, apply_date, apply_man_code, apply_site_code, customer_code, customer_name, settle_bill_no, settle_bill_name, apply_money, invoice_type, openbill_scope, company_name, company_tax_no, company_tel, company_address, invioce_remark, bank_name, bank_acc_no, contact, phone, real_tax_type, orig_open_money, add_tax_rate, add_open_money, open_money_max, open_money, invoice_no, reced_money, payment_status, invoice_status, invoice_status_desc, recieve_address, email, file_path, remark, bl_audit, audit_date, audit_man_code, audit_site_code, audit_note, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
from emis_settle_invoice_record a
|
||||
|
||||
<where>
|
||||
@ -83,6 +85,7 @@
|
||||
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
|
||||
<if test="settleBillName != null and settleBillName != ''"> and settle_bill_name like concat('%', #{settleBillName}, '%')</if>
|
||||
<if test="applyMoney != null "> and apply_money = #{applyMoney}</if>
|
||||
<if test="paymentStatus != null and paymentStatus != ''"> and payment_status=#{paymentStatus}</if>
|
||||
<if test="invoiceType != null and invoiceType != ''"> and invoice_type = #{invoiceType}</if>
|
||||
<if test="companyName != null and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
|
||||
<if test="companyTaxNo != null and companyTaxNo != ''"> and company_tax_no = #{companyTaxNo}</if>
|
||||
@ -419,6 +422,7 @@
|
||||
</insert>
|
||||
|
||||
|
||||
|
||||
<update id="updateEmisSettleInvoiceRecord" parameterType="EmisSettleInvoiceRecord">
|
||||
update emis_settle_invoice_record
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
@ -487,6 +491,12 @@
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<update id="updateHasPayByApplySeqNo" parameterType="string">
|
||||
update emis_settle_invoice_record
|
||||
set payment_status='1'
|
||||
where apply_seq_no = #{applySeqNo}
|
||||
</update>
|
||||
|
||||
<update id="auditCenterNoPass" parameterType="EmisSettleInvoiceRecord">
|
||||
update emis_settle_invoice_record
|
||||
set bl_audit='2',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user