Browse Source

更改

zhanglei
ligaode 5 months ago
parent
commit
6c7ead2d04
  1. 12
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java
  2. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java
  3. 24
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java
  4. 44
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java
  5. 38
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java
  6. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java
  7. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java
  8. 9
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml
  9. 143
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java

12
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java

@ -52,17 +52,17 @@ public class FinPaymentDto implements Dto {
private String sid; // sid
private String remarks;
@ApiModelProperty("单位编码")
@ApiModelProperty("单位编码")
private String companyCode; // 单位编码
@ApiModelProperty("单位名称")
@ApiModelProperty("单位名称")
private String companyName; // 单位名称
@ApiModelProperty("开户行")
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("收款银行账号")
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("业务类型key")
@ApiModelProperty("业务类型key")
private String businessTypeKey; // 业务类型key
@ApiModelProperty("业务类型value")
@ApiModelProperty("业务类型value")
private String businessTypeValue; // 业务类型value
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java

@ -67,4 +67,8 @@ public class FinPaymentapplyDetailsBelowEve extends BaseEntity {
private String exePayDate;
@ApiModelProperty("平仓付款金额")
private BigDecimal exePayPrice;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
}

24
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java

@ -55,32 +55,38 @@ public class FinPaymentapplyDetailsBelowEveDto implements Dto {
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("创建人sid")
private String createBySid;
@ApiModelProperty("平仓款名称")
private String costTitleValue;
@ApiModelProperty("款项类别,数据字典")
private String costTypeKey;
@ApiModelProperty("款项类别")
private String costTypeValue;
@ApiModelProperty("付款申请明细的明细sid")
@ApiModelProperty("付款申请明细的明细sid")
private String detailSid; // 付款申请明细的明细sid
@ApiModelProperty("融资付款开通日期")
@ApiModelProperty("融资付款开通日期")
private String openDate; // 融资付款开通日期
@ApiModelProperty("期数")
@ApiModelProperty("期数")
private String period; // 期数
@ApiModelProperty("付款单位sid")
@ApiModelProperty("付款单位sid")
private String payCompanySid; // 付款单位sid
@ApiModelProperty("付款单位名称")
@ApiModelProperty("付款单位名称")
private String payCompany; // 付款单位名称
@ApiModelProperty("收款单位名称")
@ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
@ApiModelProperty("收款单位sid")
@ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
@ApiModelProperty("收款银行账号")
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("开户行")
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("平仓付款日期")
private String exePayDate;
@ApiModelProperty("平仓付款金额")
private BigDecimal exePayPrice;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
}

44
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java

@ -51,32 +51,26 @@ import java.math.BigDecimal;
@ApiModel(value = "付款申请明细-明细-平仓 查询条件", description = "付款申请明细-明细-平仓 查询条件")
public class FinPaymentapplyDetailsBelowEveQuery implements Query {
@ApiModelProperty("付款单位名称")
private String payCompany;
@ApiModelProperty("融资付款开通日期")
private String openStartDate;
private String openEndDate;
@ApiModelProperty("平仓款名称")
private String costTitleValue;
@ApiModelProperty("款项类别,数据字典")
private String costTypeKey;
@ApiModelProperty("款项类别")
private String costTypeValue;
@ApiModelProperty("付款申请明细的明细sid")
private String detailSid; // 付款申请明细的明细sid
@ApiModelProperty("融资付款开通日期")
private String openDate; // 融资付款开通日期
@ApiModelProperty("期数")
private String period; // 期数
@ApiModelProperty("付款单位sid")
private String payCompanySid; // 付款单位sid
@ApiModelProperty("付款单位名称")
private String payCompany; // 付款单位名称
@ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
@ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("收款单位名称")
private String receiveCompany;
@ApiModelProperty("平仓付款日期")
private String exePayDate;
@ApiModelProperty("平仓付款金额")
private BigDecimal exePayPrice;
private String exePayStartDate;
private String exePayEndDate;
@ApiModelProperty("期数")
private String period;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("支付状态")
private String state;
private String orgPath;
private String userSid;
private String menuUrl;
}

38
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java

@ -53,32 +53,26 @@ public class FinPaymentapplyDetailsBelowEveVo implements Vo {
private String sid; // sid
@ApiModelProperty("支付状态")
private String state;
@ApiModelProperty("平仓款名称")
private String costTitleValue;
@ApiModelProperty("款项类别,数据字典")
private String costTypeKey;
@ApiModelProperty("款项类别")
private String costTypeValue;
@ApiModelProperty("付款申请明细的明细sid")
private String detailSid; // 付款申请明细的明细sid
@ApiModelProperty("融资付款开通日期")
private String openDate; // 融资付款开通日期
@ApiModelProperty("期数")
private String period; // 期数
@ApiModelProperty("付款单位sid")
private String payCompanySid; // 付款单位sid
@ApiModelProperty("付款单位名称")
private String payCompany; // 付款单位名称
@ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
@ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("融资付款开通日期")
private String openDate;
@ApiModelProperty("期数")
private String period;
@ApiModelProperty("付款单位名称")
private String payCompany;
@ApiModelProperty("收款单位名称")
private String receiveCompany;
@ApiModelProperty("开户行")
private String bank;
@ApiModelProperty("收款银行账号")
private String receivingAccount;
@ApiModelProperty("平仓付款日期")
private String exePayDate;
@ApiModelProperty("平仓付款金额")
private BigDecimal exePayPrice;
@ApiModelProperty("备注")
private String remarks;
}

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java

@ -111,13 +111,13 @@ public class FinPaymentService extends MybatisBaseService<FinPaymentMapper, FinP
}
}
if (StringUtils.isNotBlank(query.getCompanyName())) {
qw.like("fp.companyName", query.getCompanyName());
qw.like("companyName", query.getCompanyName());
}
if (StringUtils.isNotBlank(query.getReceivingAccount())) {
qw.like("fp.receivingAccount", query.getReceivingAccount());
qw.like("receivingAccount", query.getReceivingAccount());
}
if (StringUtils.isNotBlank(query.getBusinessTypeValue())) {
qw.like("fp.businessTypeValue", query.getBusinessTypeValue());
qw.like("businessTypeValue", query.getBusinessTypeValue());
}
IPage<FinPayment> page = PagerUtil.queryToPage(pq);
IPage<FinPaymentVo> pagging = baseMapper.selectPageVo(page, qw);

8
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java

@ -54,16 +54,8 @@ import java.util.List;
@Mapper
public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper<FinPaymentapplyDetailsBelowEve> {
//@Update("update fin_paymentapply_details_below_eve set name=#{msg} where id=#{id}")
//IPage<FinPaymentapplyDetailsBelowEveVo> voPage(IPage<FinPaymentapplyDetailsBelowEve> page, @Param(Constants.WRAPPER) QueryWrapper<FinPaymentapplyDetailsBelowEve> qw);
IPage<FinPaymentapplyDetailsBelowEveVo> selectPageVo(IPage<FinPaymentapplyDetailsBelowEve> page, @Param(Constants.WRAPPER) Wrapper<FinPaymentapplyDetailsBelowEve> qw);
List<FinPaymentapplyDetailsBelowEveVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPaymentapplyDetailsBelowEve> qw);
@Select("select * from fin_paymentapply_details_below_eve")
List<FinPaymentapplyDetailsBelowEveVo> selectListVo();
@Select("select * from fin_paymentapply_details_below_eve where detailSid = #{mainSid}")
List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid);
}

9
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml

@ -4,10 +4,9 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo">
SELECT * FROM fin_paymentapply_details_below_eve <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo">
SELECT * FROM fin_paymentapply_details_below_eve <where> ${ew.sqlSegment} </where>
SELECT * FROM fin_paymentapply_details_below_eve
<!--LEFT JOIN anrui_portal.sys_organization as s ON ab.deptSid = s.sid-->
<where> ${ew.sqlSegment} </where>
ORDER BY createTime DESC
</select>
</mapper>

143
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java

@ -28,6 +28,9 @@ package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -41,6 +44,7 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetai
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@ -60,55 +64,120 @@ import java.util.List;
*/
@Service
public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService<FinPaymentapplyDetailsBelowEveMapper, FinPaymentapplyDetailsBelowEve> {
private QueryWrapper<FinPaymentapplyDetailsBelowEve> createQueryWrapper(FinPaymentapplyDetailsBelowEveQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<FinPaymentapplyDetailsBelowEve> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<FinPaymentapplyDetailsBelowEveVo> listPageVo(PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq) {
FinPaymentapplyDetailsBelowEveQuery query = pq.getParams();
QueryWrapper<FinPaymentapplyDetailsBelowEve> qw = createQueryWrapper(query);
IPage<FinPaymentapplyDetailsBelowEve> page = PagerUtil.queryToPage(pq);
IPage<FinPaymentapplyDetailsBelowEveVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<FinPaymentapplyDetailsBelowEveVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
@Autowired
private SysUserFeign sysUserFeign;
public void saveOrUpdateDto(FinPaymentapplyDetailsBelowEveDto dto){
public PagerVo<FinPaymentapplyDetailsBelowEveVo> listPageVo(PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq) {
FinPaymentapplyDetailsBelowEveQuery query = pq.getParams();
QueryWrapper<FinPaymentapplyDetailsBelowEve> qw = new QueryWrapper<>();
//========================================数据授权开始
/*if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("fp.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("fp.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("fp.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("fp.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("fp.createBySid", query.getUserSid());
} else {
PagerVo<FinPaymentapplyDetailsBelowEveVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<FinPaymentapplyDetailsBelowEveVo> p = new PagerVo<>();
return p;
}
}*/
if (StringUtils.isNotBlank(query.getPayCompany())) {
qw.like("payCompany", query.getPayCompany());
}
if (StringUtils.isNotBlank(query.getCostTitleValue())) {
qw.like("costTitleValue", query.getCostTitleValue());
}
if (StringUtils.isNotBlank(query.getReceiveCompany())) {
qw.like("receiveCompany", query.getReceiveCompany());
}
if (StringUtils.isNotBlank(query.getPeriod())) {
qw.like("period", query.getPeriod());
}
if (StringUtils.isNotBlank(query.getRemarks())) {
qw.eq("remarks", query.getRemarks());
}
if (StringUtils.isNotBlank(query.getPayCompany())) {
qw.like("fp.payCompany", query.getPayCompany());
}
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("fp.state", query.getState());
}
//融资付款开通日期
qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')"
);
//平仓付款日期
qw.apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (exePayDate,'%Y-%m-%d') >= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (exePayDate,'%Y-%m-%d') <= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')"
);
IPage<FinPaymentapplyDetailsBelowEve> page = PagerUtil.queryToPage(pq);
IPage<FinPaymentapplyDetailsBelowEveVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<FinPaymentapplyDetailsBelowEveVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(FinPaymentapplyDetailsBelowEveDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
this.updateByDto(dto);
}
public void insertByDto(FinPaymentapplyDetailsBelowEveDto dto){
FinPaymentapplyDetailsBelowEve entity = new FinPaymentapplyDetailsBelowEve();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void insertByDto(FinPaymentapplyDetailsBelowEveDto dto) {
FinPaymentapplyDetailsBelowEve entity = new FinPaymentapplyDetailsBelowEve();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(FinPaymentapplyDetailsBelowEveDto dto){
String dtoSid = dto.getSid();
public void updateByDto(FinPaymentapplyDetailsBelowEveDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
FinPaymentapplyDetailsBelowEve entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
FinPaymentapplyDetailsBelowEve entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public FinPaymentapplyDetailsBelowEveDetailsVo fetchDetailsVoBySid(String sid){
FinPaymentapplyDetailsBelowEve entity = fetchBySid(sid);
FinPaymentapplyDetailsBelowEveDetailsVo vo = new FinPaymentapplyDetailsBelowEveDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public FinPaymentapplyDetailsBelowEveDetailsVo fetchDetailsVoBySid(String sid) {
FinPaymentapplyDetailsBelowEve entity = fetchBySid(sid);
FinPaymentapplyDetailsBelowEveDetailsVo vo = new FinPaymentapplyDetailsBelowEveDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid) {
return baseMapper.selByMainSid(mainSid);
}
public List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid) {
return baseMapper.selByMainSid(mainSid);
}
}
Loading…
Cancel
Save