1、新增收付款模板模块接口。

This commit is contained in:
zhengyf 2025-09-03 23:22:34 +08:00
parent 35ebfff445
commit 4b21bf7efa
8 changed files with 243 additions and 104 deletions

View File

@ -116,69 +116,122 @@
<select id="entity_list_base" resultMap="get-FeClaimBillHEntity-result"
parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillHEntity">
select
CASE
WHEN bip_bill_id IS NOT NULL THEN '1'
WHEN bip_bill_id IS NULL THEN '0'
CASE
WHEN fe_claim_bill_h.bip_bill_id IS NOT NULL THEN '1'
WHEN fe_claim_bill_h.bip_bill_id IS NULL THEN '0'
END AS push_status,
bip_bill_code as downstream_system_bill_code,
<include refid="FeClaimBillHEntity_Base_Column_List"/>
fe_claim_bill_h.bip_bill_code AS downstream_system_bill_code,
fe_claim_bill_h.id,
fe_claim_bill_h.claim_type,
fe_claim_bill_h.business_type,
fe_claim_bill_h.bill_code,
fe_claim_bill_h.bill_data,
fe_claim_bill_h.source_id,
fe_claim_bill_h.bip_bill_id,
fe_claim_bill_h.bip_bill_code,
fe_claim_bill_h.business_flow,
fe_claim_bill_h.customer_id,
fe_claim_bill_h.customer_code,
fe_claim_bill_h.customer_name,
fe_claim_bill_h.dept_id,
fe_claim_bill_h.dept_code,
fe_claim_bill_h.dept_name,
fe_claim_bill_h.supplier_id,
fe_claim_bill_h.supplier_code,
fe_claim_bill_h.supplier_name,
fe_claim_bill_h.is_auto_claim,
fe_claim_bill_h.claim_user_id,
person.person_code as claim_user_code,
person.person_name as claim_user_name,
fe_claim_bill_h.bank_id,
fe_claim_bill_h.bank_code,
fe_claim_bill_h.bank_name,
fe_claim_bill_h.bank_num,
fe_claim_bill_h.finance_org_id,
fe_claim_bill_h.finance_org_code,
fe_claim_bill_h.finance_org_name,
fe_claim_bill_h.wldx_id,
fe_claim_bill_h.wldx_code,
fe_claim_bill_h.wldx_name,
fe_claim_bill_h.claim_sum,
fe_claim_bill_h.jsfs,
fe_claim_bill_h.fk_bank,
fe_claim_bill_h.sk_bank,
fe_claim_bill_h.xj_bank,
fe_claim_bill_h.remark,
fe_claim_bill_h.def1,
fe_claim_bill_h.def2,
fe_claim_bill_h.def3,
fe_claim_bill_h.def4,
fe_claim_bill_h.def5,
fe_claim_bill_h.def6,
fe_claim_bill_h.def7,
fe_claim_bill_h.def8,
fe_claim_bill_h.def9,
fe_claim_bill_h.def10,
fe_claim_bill_h.create_time,
fe_claim_bill_h.create_user,
fe_claim_bill_h.modify_time,
fe_claim_bill_h.modify_user,
fe_claim_bill_h.sts
from fe_claim_bill_h
LEFT JOIN sys_user user ON user.id=fe_claim_bill_h.claim_user_id
LEFT JOIN sys_person person ON person.id=user.person_id
<trim prefix="where" prefixOverrides="and">
<if test="id != null">and id = #{id}</if>
<if test="claimType != null and claimType != ''">and claim_type = #{claimType}</if>
<if test="businessType != null and businessType != ''">and business_type = #{businessType}</if>
<if test="billCode != null and billCode != ''">and bill_code = #{billCode}</if>
<if test="billData != null and billData != ''">and bill_data = #{billData}</if>
<if test="sourceId != null and sourceId != ''">and source_id = #{sourceId}</if>
<if test="bipBillId != null and bipBillId != ''">and bip_bill_id = #{bipBillId}</if>
<if test="bipBillCode != null and bipBillCode != ''">and bip_bill_code = #{bipBillCode}</if>
<if test="businessFlow != null and businessFlow != ''">and business_flow = #{businessFlow}</if>
<if test="customerId != null and customerId != ''">and customer_id = #{customerId}</if>
<if test="customerCode != null and customerCode != ''">and customer_code = #{customerCode}</if>
<if test="customerName != null and customerName != ''">and customer_name = #{customerName}</if>
<if test="deptId != null and deptId != ''">and dept_id = #{deptId}</if>
<if test="deptCode != null and deptCode != ''">and dept_code = #{deptCode}</if>
<if test="deptName != null and deptName != ''">and dept_name = #{deptName}</if>
<if test="supplierId != null and supplierId != ''">and supplier_id = #{supplierId}</if>
<if test="supplierCode != null and supplierCode != ''">and supplier_code = #{supplierCode}</if>
<if test="supplierName != null and supplierName != ''">and supplier_name = #{supplierName}</if>
<if test="isAutoClaim != null and isAutoClaim != ''">and is_auto_claim = #{isAutoClaim}</if>
<if test="claimUserId != null and claimUserId != ''">and claim_user_id = #{claimUserId}</if>
<if test="bankId != null and bankId != ''">and bank_id = #{bankId}</if>
<if test="bankCode != null and bankCode != ''">and bank_code = #{bankCode}</if>
<if test="bankName != null and bankName != ''">and bank_name = #{bankName}</if>
<if test="bankNum != null and bankNum != ''">and bank_num = #{bankNum}</if>
<if test="financeOrgId != null and financeOrgId != ''">and finance_org_id = #{financeOrgId}</if>
<if test="financeOrgCode != null and financeOrgCode != ''">and finance_org_code = #{financeOrgCode}</if>
<if test="financeOrgName != null and financeOrgName != ''">and finance_org_name = #{financeOrgName}</if>
<if test="wldxId != null and wldxId != ''">and wldx_id = #{wldxId}</if>
<if test="wldxCode != null and wldxCode != ''">and wldx_code = #{wldxCode}</if>
<if test="wldxName != null and wldxName != ''">and wldx_name = #{wldxName}</if>
<if test="claimSum != null and claimSum != ''">and claim_sum = #{claimSum}</if>
<if test="jsfs != null and jsfs != ''">and jsfs = #{jsfs}</if>
<if test="fkBank != null and fkBank != ''">and fk_bank = #{fkBank}</if>
<if test="skBank != null and skBank != ''">and sk_bank = #{skBank}</if>
<if test="xjBank != null and xjBank != ''">and xj_bank = #{xjBank}</if>
<if test="remark != null and remark != ''">and remark = #{remark}</if>
<if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
<if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
<if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
<if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
<if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
<if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
<if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
<if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
<if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
<if test="def10 != null and def10 != ''">and def10 = #{def10}</if>
<if test="create_time != null">and create_time = #{create_time}</if>
<if test="createUser != null and createUser != ''">and create_user = #{createUser}</if>
<if test="modify_time != null">and modify_time = #{modify_time}</if>
<if test="modifyUser != null and modifyUser != ''">and modify_user = #{modifyUser}</if>
<if test="sts != null and sts != ''">and sts = #{sts}</if>
and sts='Y'
<if test="id != null">and fe_claim_bill_h.id = #{id}</if>
<if test="claimType != null and claimType != ''">and fe_claim_bill_h.claim_type = #{claimType}</if>
<if test="businessType != null and businessType != ''">and fe_claim_bill_h.business_type = #{businessType}</if>
<if test="billCode != null and billCode != ''">and fe_claim_bill_h.bill_code like concat('%',#{billCode},'%')</if>
<if test="billData != null and billData != ''">and fe_claim_bill_h.bill_data = #{billData}</if>
<if test="sourceId != null and sourceId != ''">and fe_claim_bill_h.source_id = #{sourceId}</if>
<if test="bipBillId != null and bipBillId != ''">and fe_claim_bill_h.bip_bill_id = #{bipBillId}</if>
<if test="bipBillCode != null and bipBillCode != ''">and fe_claim_bill_h.bip_bill_code = #{bipBillCode}</if>
<if test="businessFlow != null and businessFlow != ''">and fe_claim_bill_h.business_flow = #{businessFlow}</if>
<if test="customerId != null and customerId != ''">and fe_claim_bill_h.customer_id = #{customerId}</if>
<if test="customerCode != null and customerCode != ''">and fe_claim_bill_h.customer_code = #{customerCode}</if>
<if test="customerName != null and customerName != ''">and fe_claim_bill_h.customer_name = #{customerName}</if>
<if test="deptId != null and deptId != ''">and fe_claim_bill_h.dept_id = #{deptId}</if>
<if test="deptCode != null and deptCode != ''">and fe_claim_bill_h.dept_code = #{deptCode}</if>
<if test="deptName != null and deptName != ''">and fe_claim_bill_h.dept_name = #{deptName}</if>
<if test="supplierId != null and supplierId != ''">and fe_claim_bill_h.supplier_id = #{supplierId}</if>
<if test="supplierCode != null and supplierCode != ''">and fe_claim_bill_h.supplier_code = #{supplierCode}</if>
<if test="supplierName != null and supplierName != ''">and fe_claim_bill_h.supplier_name = #{supplierName}</if>
<if test="isAutoClaim != null and isAutoClaim != ''">and fe_claim_bill_h.is_auto_claim = #{isAutoClaim}</if>
<if test="claimUserId != null and claimUserId != ''">and fe_claim_bill_h.claim_user_id = #{claimUserId}</if>
<if test="bankId != null and bankId != ''">and fe_claim_bill_h.bank_id = #{bankId}</if>
<if test="bankCode != null and bankCode != ''">and fe_claim_bill_h.bank_code = #{bankCode}</if>
<if test="bankName != null and bankName != ''">and fe_claim_bill_h.bank_name = #{bankName}</if>
<if test="bankNum != null and bankNum != ''">and fe_claim_bill_h.bank_num = #{bankNum}</if>
<if test="financeOrgId != null and financeOrgId != ''">and fe_claim_bill_h.finance_org_id = #{financeOrgId}</if>
<if test="financeOrgCode != null and financeOrgCode != ''">and fe_claim_bill_h.finance_org_code = #{financeOrgCode}</if>
<if test="financeOrgName != null and financeOrgName != ''">and fe_claim_bill_h.finance_org_name = #{financeOrgName}</if>
<if test="wldxId != null and wldxId != ''">and fe_claim_bill_h.wldx_id = #{wldxId}</if>
<if test="wldxCode != null and wldxCode != ''">and fe_claim_bill_h.wldx_code = #{wldxCode}</if>
<if test="wldxName != null and wldxName != ''">and fe_claim_bill_h.wldx_name = #{wldxName}</if>
<if test="claimSum != null and claimSum != ''">and fe_claim_bill_h.claim_sum = #{claimSum}</if>
<if test="jsfs != null and jsfs != ''">and fe_claim_bill_h.jsfs = #{jsfs}</if>
<if test="fkBank != null and fkBank != ''">and fe_claim_bill_h.fk_bank = #{fkBank}</if>
<if test="skBank != null and skBank != ''">and fe_claim_bill_h.sk_bank = #{skBank}</if>
<if test="xjBank != null and xjBank != ''">and fe_claim_bill_h.xj_bank = #{xjBank}</if>
<if test="remark != null and remark != ''">and fe_claim_bill_h.remark = #{remark}</if>
<if test="def1 != null and def1 != ''">and fe_claim_bill_h.def1 = #{def1}</if>
<if test="def2 != null and def2 != ''">and fe_claim_bill_h.def2 = #{def2}</if>
<if test="def3 != null and def3 != ''">and fe_claim_bill_h.def3 = #{def3}</if>
<if test="def4 != null and def4 != ''">and fe_claim_bill_h.def4 = #{def4}</if>
<if test="def5 != null and def5 != ''">and fe_claim_bill_h.def5 = #{def5}</if>
<if test="def6 != null and def6 != ''">and fe_claim_bill_h.def6 = #{def6}</if>
<if test="def7 != null and def7 != ''">and fe_claim_bill_h.def7 = #{def7}</if>
<if test="def8 != null and def8 != ''">and fe_claim_bill_h.def8 = #{def8}</if>
<if test="def9 != null and def9 != ''">and fe_claim_bill_h.def9 = #{def9}</if>
<if test="def10 != null and def10 != ''">and fe_claim_bill_h.def10 = #{def10}</if>
<if test="create_time != null">and fe_claim_bill_h.create_time = #{create_time}</if>
<if test="createUser != null and createUser != ''">and fe_claim_bill_h.create_user = #{createUser}</if>
<if test="modify_time != null">and fe_claim_bill_h.modify_time = #{modify_time}</if>
<if test="modifyUser != null and modifyUser != ''">and fe_claim_bill_h.modify_user = #{modifyUser}</if>
and fe_claim_bill_h.sts='Y'
</trim>
<if test="pushStatus != null and 1 == pushStatus">AND bip_bill_id IS NOT NULL</if>
<if test="pushStatus != null and 0 == pushStatus">AND bip_bill_id IS NULL</if>
<if test="pushStatus != null and 1 == pushStatus">AND fe_claim_bill_h.bip_bill_id IS NOT NULL</if>
<if test="pushStatus != null and 0 == pushStatus">AND fe_claim_bill_h.bip_bill_id IS NULL</if>
</select>
<!-- 查询符合条件的数量 -->

View File

@ -287,6 +287,9 @@ public class IClaimSKServiceImpl implements IClaimSKService {
String trantimep = kkBankflow.getTrantimep();
feClaimBillHEntity.setDef1(trandate + " " + trantimep);
//自动认领
feClaimBillHEntity.setIsAutoClaim("N");
}catch (Exception e){
e.printStackTrace();

View File

@ -108,6 +108,7 @@ public class IClaimServiceImpl implements IClaimService {
if("N".equals(claimBillHEntity.getPushStatus())){
claimBillHEntity.setPushStatusName("未推送");
}
}
PageInfo pageInfo = new PageInfo(claimBillHEntityList);
return pageInfo;

View File

@ -0,0 +1,71 @@
package com.hzya.frame.finance.conf.billtemplate.controller;
import com.hzya.frame.finance.conf.billtemplate.entity.FeConfBillTemplateEntity;
import com.hzya.frame.finance.conf.billtemplate.service.IFeConfBillTemplateService;
import com.hzya.frame.web.action.DefaultController;
import com.hzya.frame.web.entity.JsonResultEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* Created by zydd on 2025-08-29 17:48
* 收付款单据模板
*/
@RestController
@RequestMapping("/fe/conf/billtemplate")
public class BillTemplate extends DefaultController {
@Autowired
private IFeConfBillTemplateService billTemplateService;
@RequestMapping("/queryAll")
public JsonResultEntity queryAll(@RequestBody FeConfBillTemplateEntity billTemplateEntity){
try {
List<FeConfBillTemplateEntity> all = billTemplateService.queryAll(billTemplateEntity);
return getSuccessMessageEntity("你太棒了!",all);
}catch (Exception e){
e.printStackTrace();
return getFailureMessageEntity(e.getMessage());
}
}
@RequestMapping("/save")
public JsonResultEntity save(@RequestBody FeConfBillTemplateEntity billTemplateEntity){
try {
FeConfBillTemplateEntity entity = billTemplateService.saveEntity(billTemplateEntity);
return getSuccessMessageEntity("你太棒了!",entity);
}catch (Exception e){
e.printStackTrace();
return getFailureMessageEntity(e.getMessage());
}
}
@RequestMapping("/update")
public JsonResultEntity update(@RequestBody FeConfBillTemplateEntity billTemplateEntity){
try {
FeConfBillTemplateEntity entity = billTemplateService.updateEntity(billTemplateEntity);
return getSuccessMessageEntity("你太棒了!",entity);
}catch (Exception e){
e.printStackTrace();
return getFailureMessageEntity(e.getMessage());
}
}
@RequestMapping("/delete")
public JsonResultEntity delete(@RequestBody FeConfBillTemplateEntity billTemplateEntity){
try {
billTemplateService.deleteEntity(billTemplateEntity);
return getSuccessMessageEntity("你太棒了!",null);
}catch (Exception e){
e.printStackTrace();
return getFailureMessageEntity(e.getMessage());
}
}
}

View File

@ -39,6 +39,9 @@ public class FeConfBillTemplateEntity extends BaseEntity {
* 部门
*/
private String hDeptStr;
/**
* 客户
*/
private String hCustomerStr;
/**
* 币种

View File

@ -13,4 +13,10 @@ import java.util.List;
*/
public interface IFeConfBillTemplateService extends IBaseService<FeConfBillTemplateEntity, String>{
List<FeConfBillTemplateEntity> queryAll(FeConfBillTemplateEntity billTemplateEntity);
FeConfBillTemplateEntity saveEntity(FeConfBillTemplateEntity billTemplateEntity);
FeConfBillTemplateEntity updateEntity(FeConfBillTemplateEntity billTemplateEntity);
void deleteEntity(FeConfBillTemplateEntity billTemplateEntity);
}

View File

@ -1,11 +1,14 @@
package com.hzya.frame.finance.conf.billtemplate.service.impl;
import cn.hutool.core.lang.Assert;
import com.hzya.frame.finance.conf.billtemplate.entity.FeConfBillTemplateEntity;
import com.hzya.frame.finance.conf.billtemplate.dao.IFeConfBillTemplateDao;
import com.hzya.frame.finance.conf.billtemplate.service.IFeConfBillTemplateService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
import com.hzya.frame.basedao.service.impl.BaseService;
import java.util.List;
@ -22,14 +25,51 @@ public class FeConfBillTemplateServiceImpl extends BaseService<FeConfBillTemplat
private IFeConfBillTemplateDao feConfBillTemplateDao;
@Autowired
public void setFeConfBillTemplateDao(IFeConfBillTemplateDao dao) {
this.feConfBillTemplateDao = dao;
this.dao = dao;
}
public void setFeConfBillTemplateDao(IFeConfBillTemplateDao dao) {
this.feConfBillTemplateDao = dao;
this.dao = dao;
}
@Override
public List<FeConfBillTemplateEntity> queryAll(FeConfBillTemplateEntity billTemplateEntity) {
List<FeConfBillTemplateEntity> all = feConfBillTemplateDao.query(billTemplateEntity);
return all;
}
@Override
public FeConfBillTemplateEntity saveEntity(FeConfBillTemplateEntity billTemplateEntity) {
checkAssistNull("saveEntity",billTemplateEntity);
FeConfBillTemplateEntity save = feConfBillTemplateDao.save(billTemplateEntity);
return save;
}
@Override
public FeConfBillTemplateEntity updateEntity(FeConfBillTemplateEntity billTemplateEntity) {
checkAssistNull("updateEntity",billTemplateEntity);
feConfBillTemplateDao.update(billTemplateEntity);
return billTemplateEntity;
}
@Override
public void deleteEntity(FeConfBillTemplateEntity billTemplateEntity) {
checkAssistNull("deleteEntity",billTemplateEntity);
feConfBillTemplateDao.logicRemove(billTemplateEntity);
}
public void checkAssistNull(String type, FeConfBillTemplateEntity entity) {
switch (type) {
case "saveEntity":
Assert.notNull(entity.getName(),"收付款单据配置保存时,名称不能为空");
break;
case "updateEntity":
Assert.notNull(entity.getId(),"收付款单据配置更新时id不能为空");
Assert.notNull(entity.getName(),"收付款单据配置更新时,名称不能为空");
break;
case "deleteEntity":
Assert.notNull(entity.getId(),"收付款单据配置删除时id不能为空");
break;
}
}
}

View File

@ -1,38 +0,0 @@
package com.hzya.frame.finance.conf.controller;
import com.hzya.frame.finance.conf.billtemplate.entity.FeConfBillTemplateEntity;
import com.hzya.frame.finance.conf.billtemplate.service.IFeConfBillTemplateService;
import com.hzya.frame.web.action.DefaultController;
import com.hzya.frame.web.entity.JsonResultEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* Created by zydd on 2025-08-29 17:48
* 收付款单据模板
*/
@RestController
@RequestMapping("/fe/conf/billtemplate")
public class BillTemplate extends DefaultController {
@Autowired
private IFeConfBillTemplateService billTemplateService;
@RequestMapping("/queryAll")
public JsonResultEntity queryAll(@RequestBody FeConfBillTemplateEntity billTemplateEntity){
try {
List<FeConfBillTemplateEntity> all = billTemplateService.queryAll(billTemplateEntity);
return getSuccessMessageEntity("你太棒了!",all);
}catch (Exception e){
e.printStackTrace();
return getFailureMessageEntity(e.getMessage());
}
}
}