Browse Source

优化

zhanglei
dimengzhe 2 years ago
parent
commit
41336e9a7f
  1. 3
      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/loandiff/LoanDiffsDto.java
  3. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java
  4. 8
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml
  5. 27
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java

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

@ -35,7 +35,8 @@ public enum BillTypeEnum {
XXTHS("XXTHS", "销售退货单"),
JCZLQRD("JCZLQRD", "交车资料确认单"),
JCECQRD("JCECQRD", "交车资料二次确认单"),
HKSQ("HKSQ", "划扣申请单据编号");
HKSQ("HKSQ", "划扣申请单据编号"),
FKCEQRSQ("HKSQ", "放款差额确认申请");
private String billType;

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loandiff/LoanDiffsDto.java

@ -27,6 +27,8 @@ public class LoanDiffsDto implements Dto {
private String createDept;
@ApiModelProperty("申请部门sid")
private String createDeptSid;
@ApiModelProperty("orgPath")
private String orgSidPath;
private List<LoanDiffDetailssDto> loanDiffDetailssDtos;

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java

@ -27,4 +27,6 @@ public interface LoanDiffMapper extends BaseMapper<LoanDiff> {
BusSalesOrderVehicle selectByBusVinSid(String busVinSid);
BusSalesOrder selectByOrderSid(String salesOrderSid);
String selectNum(String bill);
}

8
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml

@ -44,4 +44,12 @@
<select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
select * from anrui_buscenter.bus_sales_order where sid = #{salesOrderSid}
</select>
<select id="selectNum" resultType="java.lang.String">
select RIGHT(billNo, 4)
from loan_diff
where billNo LIKE concat(#{bill}, '%')
order by id desc
limit 1
</select>
</mapper>

27
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java

@ -9,6 +9,9 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo;
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.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@ -26,6 +29,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loandiff.*;
@ -89,6 +93,8 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
private BasePurchaseSystemFeign basePurchaseSystemFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
/**
* 判断提交的流程是否被允许
@ -563,6 +569,8 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
BeanUtil.copyProperties(dto, loanDiff);
List<LoanDiffDetailssDto> loanDiffDetailssDtos = dto.getLoanDiffDetailssDtos();
loanDiffDetailssDtos.removeAll(Collections.singleton(null));
String billNo =getApplyCode(loanDiff.getOrgSidPath());
loanDiff.setBillNo(billNo);
if (!loanDiffDetailssDtos.isEmpty()) {
for (int i = 0; i < loanDiffDetailssDtos.size(); i++) {
LoanDiffDetailssDto loanDiffDetailssDto = loanDiffDetailssDtos.get(i);
@ -576,6 +584,25 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
return rb.success();
}
public String getApplyCode(String orgSidPath) {
//获取分公司sid
ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(orgSidPath);
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
String orgCode = resultBean1.getData().getOrgCode();
BillNo b = new BillNo();
b.setOrgCode(orgCode);
b.setBillType(BillTypeEnum.FKCEQRSQ.getBillType());
String bill = Rule.getBill(b);
String i = baseMapper.selectNum(bill);
String billNo = "";
if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
} else {
billNo = Rule.getBillNo(bill, 0);
}
return billNo;
}
public ResultBean updateDiff(LoanDiffDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = dto.getSid();

Loading…
Cancel
Save