Browse Source

完善结清管理申请增加单据编号

master
fanzongzhe 9 months ago
parent
commit
3e334a0e02
  1. 1
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java
  2. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApply.java
  3. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java
  4. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java
  5. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml
  6. 26
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

1
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@ -42,6 +42,7 @@ public enum BillTypeEnum {
YQZF("YQZF", "逾期对账申请资方"),
YQCW("YQCW", "逾期对账申请财务"),
AJBH("AJBH", "案件进程编号"),
JQSQ("JQSQ", "结清申请"),
DDQYBA("DDQYBA", "定点企业备案编号");

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApply.java

@ -18,6 +18,8 @@ public class LoanSettleApply extends BaseEntity {
private static final long serialVersionUID = -7535762549485962120L;
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请部门sid")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java

@ -20,6 +20,8 @@ public class LoanSettleApplyDetailsVo {
private String sid;
@ApiModelProperty("bankSid")
private String bankSid;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("申请部门")

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java

@ -74,4 +74,6 @@ public interface LoanSettleApplyMapper extends BaseMapper<LoanSettleApply> {
List<LoanRepaymentPlanDetails> selectPlanListByBusVinSid(@Param("busVinSid") String busVinSid);
void updatePaymentStateByBusVinSid(@Param("busVinSid") String busVinSid);
int selectNum(String bill);
}

5
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml

@ -347,4 +347,9 @@ FROM (
resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
select * from loan_repayment_plan_details where busVinSid = #{busVinSid}
</select>
<select id="selectNum" resultType="java.lang.Integer">
select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
from loan_settle_apply
where billNo LIKE concat(#{bill}, '%')
</select>
</mapper>

26
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@ -6,6 +6,9 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery;
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
@ -251,6 +254,25 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
return p;
}
/**
* 生成申请单单据编号
*
* @param orgSid
* @return
*/
public String getApplyCode(String orgSid) {
//获取分公司sid
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
String orgCode = resultBean1.getData().getOrgCode();
BillNo b = new BillNo();
b.setOrgCode(orgCode);
b.setBillType(BillTypeEnum.JQSQ.getBillType());
String bill = Rule.getBill(b);
int i = baseMapper.selectNum(bill);
String billNo = Rule.getBillNo(bill, i);
return billNo;
}
public ResultBean<String> saveOrUpdateSettleApply(LoanSettleApplyDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid();
@ -281,6 +303,10 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
loanSettleApply.setTypeStateValue("正常结清");
}
loanSettleApply.setTrueReduction(dto.isTrueReduction() ? 1 : 0);
if (StringUtils.isNotBlank(dto.getUseOrgSid())) {
String billNo = getApplyCode(dto.getUseOrgSid());
loanSettleApply.setBillNo(billNo);
}
baseMapper.insert(loanSettleApply);
} else {//修改
LoanSettleApply loanSettleApply = fetchBySid(sid);

Loading…
Cancel
Save