BUG修改

This commit is contained in:
yjf 2021-12-29 17:17:21 +08:00
parent 2bcdfd1c2d
commit a1d6e9139d
2 changed files with 28 additions and 22 deletions

View File

@ -1,29 +1,23 @@
package com.tenwa.reckon.executor;
import com.amarsoft.app.awe.config.InitDBType;
import com.amarsoft.are.jbo.*;
import com.amarsoft.are.lang.StringX;
import com.amarsoft.are.util.json.JSONEncoder;
import com.amarsoft.are.util.json.JSONObject;
import com.amarsoft.awe.util.Transaction;
import com.tenwa.reckon.util.Conn;
import com.tenwa.reckon.util.DateUtil;
import jbo.app.tenwa.calc.LC_CALC_CONDITION;
import jbo.app.tenwa.calc.LC_RENT_INCOME;
import jbo.app.tenwa.calc.LC_RENT_PLAN;
import jbo.com.tenwa.lease.comm.LC_CAR_DISPOSE;
import jbo.com.tenwa.lease.comm.LC_OCCUPY_RENT_LIST;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;
import jbo.app.tenwa.calc.LC_CALC_CONDITION;
import jbo.app.tenwa.calc.LC_RENT_INCOME;
import jbo.app.tenwa.calc.LC_RENT_PLAN;
import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
import jbo.com.tenwa.lease.comm.LC_CAR_DISPOSE;
import jbo.com.tenwa.lease.comm.LC_OCCUPY_RENT_LIST;
import com.amarsoft.app.awe.config.InitDBType;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
import com.amarsoft.are.jbo.BizObjectQuery;
import com.amarsoft.are.jbo.JBOException;
import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.are.jbo.JBOTransaction;
import com.amarsoft.are.util.json.JSONEncoder;
import com.amarsoft.are.util.json.JSONObject;
import com.tenwa.reckon.util.Conn;
import com.tenwa.reckon.util.DateUtil;
import com.tenwa.reckon.util.DateUtils;
/**
* 合同中途中止
* @author tenwapc
@ -414,6 +408,18 @@ public class RentCalHelper {
//校验合同是否有正在卡扣中
public String isAutoBuckleByPlanId() throws Exception{
String [] planIds = planId.split("@");
Transaction sqlCa = null;
try {
sqlCa= Transaction.createTransaction(JBOFactory.createJBOTransaction());
String num = sqlCa.getString("select count(1) as num from lb_card_buckle_status where status = 'Y'");
sqlCa.commit();
if(!StringX.isEmpty(num) && Integer.valueOf(num)>0){
return "false";
}
}catch (Exception e){
if (sqlCa != null) sqlCa.rollback();
throw e;
}
BizObjectManager lrpManage = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME);
for(int i= 0;i<planIds.length;i++){
List<BizObject> lrps = lrpManage.createQuery(" id=:planId AND batch_status='process' and (collect_status in ('代偿','未收款','部分收款','') or collect_status is null)").setParameter("planId", planIds[i]).getResultList(false);

View File

@ -244,8 +244,8 @@ public class OperateOfCGBController {
sb.append("<inaccadd>").append("").append("</inaccadd>"); //收款银行地址
sb.append("<bankCode>").append("").append("</bankCode>"); //联行号 跨行时 [必输] 广发自动根据银行名称匹配--技术回复
sb.append("<salary>").append(payObj.getAttribute("fact_money").getString()).append("</salary>"); //金额 单位 [必输]
sb.append("<remark>").append(remark).append("</remark>"); //备注 客户名+合作方合同号+安鹏合同号
sb.append("<comment>").append(payObj.getAttribute("id").getString()).append("</comment>"); //附言 绑定支付对象主键
sb.append("<remark>").append(payObj.getAttribute("id").getString()).append("</remark>"); //备注 绑定支付对象主键
sb.append("<comment>").append(remark).append("</comment>"); //附言 客户名+合作方合同号+安鹏合同号
sb.append("</record>");
payObj.setAttributeValue("CMB_PAY_NO", customerSalarySeq);
}