Merge remote-tracking branch 'origin/release20210831' into release20210831
This commit is contained in:
maliang
commit
e25349b84f
@ -209,8 +209,8 @@
|
||||
|
||||
var ifd = getItemValue( 0, i, 'IS_FIXED_DISCOUNT' );
|
||||
if(ifd =="Y"){
|
||||
$("input[id*=DISCOUNT_"+i+"]").attr('readonly',true);
|
||||
$("input[id*=DISCOUNT_"+i+"]").css('border','0');
|
||||
$("input[id*=DISCOUNT_INTEREST_"+i+"]").attr('readonly',true);
|
||||
$("input[id*=DISCOUNT_INTEREST_"+i+"]").css('border','0');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
|
||||
dwTemp.Style="1"; //设置DW风格 1:Grid 2:Freeform
|
||||
dwTemp.ReadOnly = "1"; //设置是否只读 1:只读 0:可写
|
||||
dwTemp.setPageSize(20);
|
||||
dwTemp.setPageSize(pageSize == null ? 20 : Integer.parseInt(pageSize));
|
||||
//生成HTMLDataWindow
|
||||
dwTemp.genHTMLObjectWindow(sSortNo+"%");
|
||||
System.out.println(CurUser.getRoleTable().toString());
|
||||
|
||||
@ -66,14 +66,17 @@ $(function(){
|
||||
//组织机构验证码的的校验
|
||||
function Checkfield(){
|
||||
var businessLicenseNo = getItemValue(0,getRow(0),"BUSINESS_LICENSE_NO");
|
||||
if(businessLicenseNo==""){
|
||||
//alert("组织机构代码不能为空!");
|
||||
return true;
|
||||
}
|
||||
if(checkORGRight(businessLicenseNo)){
|
||||
return true;
|
||||
var sReturnInfo = RunJavaMethodTrans("com.tenwa.customer.controller.group.CustomerGroupCompanyController","checkBusinessLicenseNo","businessLicenseNo="+businessLicenseNo+",id="+getItemValue(0,0,'ID'));
|
||||
if("false" ==sReturnInfo){
|
||||
setErrorTips("BUSINESS_LICENSE_NO","统一社会信用代码已存在!");;
|
||||
return false;
|
||||
}else{
|
||||
setErrorTips("BUSINESS_LICENSE_NO","");
|
||||
return true;
|
||||
}
|
||||
}else{
|
||||
setErrorTips("BUSINESS_LICENSE_NO","组织机构代码格式不正确!");
|
||||
setErrorTips("BUSINESS_LICENSE_NO","统一社会信用代码格式不正确!");
|
||||
//AsDebug.alert("提示","组织机构代码格式不正确!");
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -415,6 +415,11 @@
|
||||
setItemValue(0,getRow(),"gears","");
|
||||
|
||||
setItemValue(0,getRow(),"car_typea",sReturn[3]);
|
||||
if("SYC"==sReturn[3]){
|
||||
setItemValue(0,getRow(), "cartype" , "商用车" );
|
||||
}else if ("CYC"==sReturn[3]){
|
||||
setItemValue(0,getRow(), "cartype" , "乘用车" );
|
||||
}
|
||||
carReadonly(sReturn[3]);
|
||||
},"ÇëÑ¡Ôñ³µÆ·ÅÆ",'');
|
||||
}
|
||||
|
||||
@ -62,7 +62,7 @@ public class AllinpayPaymentRun implements Runnable {
|
||||
try {
|
||||
BizObject object = JBOFactory.getBizObjectManager("jbo.com.tenwa.lease.comm.LB_PROJECT_INFO").createQuery("O.id=:id").setParameter("id", map.get("PROJECT_ID")).getSingleResult(false);
|
||||
allinpay = new AllinpayProperties(object.getAttribute("subjectid").toString());
|
||||
BizObject result = JBOFactory.getBizObjectManager("jbo.app.tenwa.calc.LC_CARD_TLSIGN").createQuery("O.PROJECT_ID=:projectId and SIGN_STATUS='sign_status2'").setParameter("projectId", map.get("PROJECT_ID")).getSingleResult(false);
|
||||
BizObject result = JBOFactory.getBizObjectManager("jbo.app.tenwa.calc.LC_CARD_TLSIGN").createQuery("O.PROJECT_ID=:projectId ").setParameter("projectId", map.get("PROJECT_ID")).getSingleResult(false);
|
||||
logger.info(">>>>>>>>>>>繫젬엥왱葵累連마>>>>>>>>PROJECT_ID=" + map.get("PROJECT_ID"));
|
||||
sqlMap.put("SUBMITTIME", time);
|
||||
sqlMap.put("AGRMNO", result.getAttribute("AGRMNO").toString());
|
||||
|
||||
@ -92,8 +92,7 @@ public class BusinessDocUploadServiceImpl implements BusinessDocUploadService {
|
||||
.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME);
|
||||
BizObject library = libraryManage
|
||||
.createQuery(
|
||||
"RELATIVE_ID=:RELATIVE_ID AND DOC_NAME=:DOC_NAME").setParameter("RELATIVE_ID", relaId).setParameter("DOC_NAME", docName)
|
||||
.getSingleResult(true);
|
||||
"RELATIVE_ID=:RELATIVE_ID AND DOC_NAME like '%身份证%' ").setParameter("RELATIVE_ID", relaId).getSingleResult(true);
|
||||
String libraryId = "";
|
||||
if (null == library) {
|
||||
ReturnMapUtil.setReturnMap(null,
|
||||
|
||||
@ -74,6 +74,8 @@ public class BusinessBO implements Serializable {
|
||||
private String distributor_no;
|
||||
private String distributorType;
|
||||
|
||||
private String cartypea; //车辆类型，CYC:乘用车；SYC：商用车
|
||||
|
||||
public void setParam(Map<String, Object> fieldMap, String param, Object obj) {
|
||||
obj = fieldMap.get(param.toLowerCase()) == null ? null : fieldMap.get(
|
||||
param.toLowerCase()).toString();
|
||||
@ -202,6 +204,8 @@ public class BusinessBO implements Serializable {
|
||||
this.SubjectName = MultiSubjectUtil.TJSUBJECTNAME;
|
||||
}
|
||||
}
|
||||
//获取车辆类型字段
|
||||
this.cartypea = fieldMap.get("cartypea".toLowerCase()) == null ? "": fieldMap.get("cartypea".toLowerCase()).toString();
|
||||
|
||||
|
||||
CustomerInfoCheck CustomerInfoCheck = new CustomerInfoCheck();
|
||||
@ -280,6 +284,9 @@ public class BusinessBO implements Serializable {
|
||||
map.put("distributorNo", distributor_no);
|
||||
map.put("distributorName", distributor_name);
|
||||
}
|
||||
//添加车型字段
|
||||
map.put("cartypea", cartypea);
|
||||
|
||||
|
||||
JSONObject jsonObject = JSONObject.fromObject(map);
|
||||
this.fixedFlowParam = jsonObject.toString();
|
||||
@ -650,6 +657,15 @@ public class BusinessBO implements Serializable {
|
||||
public void setDistributorType(String distributorType) {
|
||||
this.distributorType = distributorType;
|
||||
}
|
||||
|
||||
|
||||
public String getCartypea() {
|
||||
return cartypea;
|
||||
}
|
||||
|
||||
public void setCartypea(String cartypea) {
|
||||
this.cartypea = cartypea;
|
||||
}
|
||||
|
||||
public void sethaveCommission(String haveCommission) {
|
||||
haveCommission = haveCommission;
|
||||
|
||||
@ -85,7 +85,7 @@ public class FlowDataServiceImpl implements FlowDataService{
|
||||
|
||||
}
|
||||
//获取扣款文件id
|
||||
String fileSql = "select * from (select * from (select lda.inputtime,lda.id as fileid ,case locate('front', FILENAME) when 0 then 'back' else 'front'end identify,FILENAME from LB_DOCRELATIVE ldra left join LB_DOCLIBRARY ldc on ldc.RELATIVE_ID=ldra.id and ldc.DOC_NAME='»¹¿î¿¨£¨Õý·´Ã棩' left join LB_DOCATTRIBUTE lda on lda.library_id=ldc.id where ldra.objecttype='BusinessApplyFlow' and ldra.proj_id='"+dataList.get(0).get("project_id")+"' and lda.deleteed is null ORDER BY lda.inputtime DESC) tmp where tmp.identify = 'front' limit 1) t1 union all select * from (select * from (select lda.inputtime,lda.id as fileid ,case locate('front', FILENAME) when 0 then 'back' else 'front'end identify,FILENAME from LB_DOCRELATIVE ldra left join LB_DOCLIBRARY ldc on ldc.RELATIVE_ID=ldra.id and ldc.DOC_NAME='»¹¿î¿¨£¨Õý·´Ã棩' left join LB_DOCATTRIBUTE lda on lda.library_id=ldc.id where ldra.objecttype='BusinessApplyFlow' and ldra.proj_id='"+dataList.get(0).get("project_id")+"' and lda.deleteed is null ORDER BY lda.inputtime DESC) tmp where tmp.identify = 'back' limit 1) t2; ";
|
||||
String fileSql = "select * from (select * from (select lda.inputtime,lda.id as fileid ,case locate('front', FILENAME) when 0 then 'back' else 'front'end identify,FILENAME from LB_DOCRELATIVE ldra left join LB_DOCLIBRARY ldc on ldc.RELATIVE_ID=ldra.id and ( ldc.DOC_NAME like '%还款卡%' or ldc.DOC_NAME like '%银行卡%' ) left join LB_DOCATTRIBUTE lda on lda.library_id=ldc.id where ldra.objecttype='BusinessApplyFlow' and ldra.proj_id='"+dataList.get(0).get("project_id")+"' and lda.deleteed is null ORDER BY lda.inputtime DESC) tmp where tmp.identify = 'front' limit 1) t1 union all select * from (select * from (select lda.inputtime,lda.id as fileid ,case locate('front', FILENAME) when 0 then 'back' else 'front'end identify,FILENAME from LB_DOCRELATIVE ldra left join LB_DOCLIBRARY ldc on ldc.RELATIVE_ID=ldra.id and ( ldc.DOC_NAME like '%还款卡%' or ldc.DOC_NAME like '%银行卡%' ) left join LB_DOCATTRIBUTE lda on lda.library_id=ldc.id where ldra.objecttype='BusinessApplyFlow' and ldra.proj_id='"+dataList.get(0).get("project_id")+"' and lda.deleteed is null ORDER BY lda.inputtime DESC) tmp where tmp.identify = 'back' limit 1) t2; ";
|
||||
//String fileSql = "select lda.id as fileid,case locate('front', FILENAME) when 0 then 'reverse' else 'front' end identify from LB_DOCRELATIVE ldra left join LB_DOCLIBRARY ldc on ldc.RELATIVE_ID=ldra.id and ldc.DOC_NAME='还款卡（正反面）' left join LB_DOCATTRIBUTE lda on lda.library_id=ldc.id where ldra.objecttype='BusinessApplyFlow' and ldra.proj_id='"+dataList.get(0).get("project_id")+"' and lda.deleteed is null limit 0,2 ";
|
||||
List<Map<String, String>> fileList = DataOperatorUtil.getDataBySql(fileSql);
|
||||
body.put("attributeid", fileList);
|
||||
@ -824,7 +824,7 @@ public class FlowDataServiceImpl implements FlowDataService{
|
||||
}
|
||||
|
||||
BizObjectManager libraryManage = JBOFactory.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME);
|
||||
BizObject library = libraryManage.createQuery("RELATIVE_ID=:RELATIVE_ID AND DOC_NAME='»¹¿î¿¨£¨Õý·´Ã棩' ").setParameter("RELATIVE_ID", relaId).getSingleResult(true);
|
||||
BizObject library = libraryManage.createQuery("RELATIVE_ID=:RELATIVE_ID AND (DOC_NAME like '%还款卡%' or DOC_NAME like '%银行卡%' ) ").setParameter("RELATIVE_ID", relaId).getSingleResult(true);
|
||||
String libraryId = "";
|
||||
if (null == library) {
|
||||
return ;
|
||||
|
||||
@ -9,6 +9,7 @@ import java.util.StringTokenizer;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import jbo.app.LB_EQUIPMENT_CAR_TEMP;
|
||||
import jbo.sys.SELECT_CATALOG;
|
||||
import apx.com.amarsoft.als.base.cache.instance.AppCodeCache;
|
||||
|
||||
@ -29,6 +30,7 @@ public class SelectCatalogWin {
|
||||
private String sSelName;
|
||||
private boolean loadSelectflag = true;
|
||||
private Map<String, Object> param;
|
||||
private String flowunid;
|
||||
|
||||
public boolean isLoadSelectflag() {
|
||||
return loadSelectflag;
|
||||
@ -81,6 +83,7 @@ public class SelectCatalogWin {
|
||||
}
|
||||
}
|
||||
}
|
||||
this.flowunid = param.get("flowunid") == null ? "" : param.get("flowunid").toString();
|
||||
this.sSelName = sSelName;
|
||||
try {
|
||||
BizObjectManager bom = JBOFactory
|
||||
@ -230,12 +233,14 @@ public class SelectCatalogWin {
|
||||
.substring(sTableName.lastIndexOf(",") + 1);
|
||||
if (i > 0) {
|
||||
sql2 += " or ";
|
||||
}else {
|
||||
sql2 += " ( ";
|
||||
}
|
||||
sql2 += "A." + sSelectFilter + " like '%" + sGlobalText
|
||||
sql2 += " A." + sSelectFilter + " like '%" + sGlobalText
|
||||
+ "%'";
|
||||
i++;
|
||||
}
|
||||
// sql2 += ")";
|
||||
sql2 += " ) ";
|
||||
// if (sql2.length() > 0) {
|
||||
// if (sqlWhere.toLowerCase().contains("where")
|
||||
// || sql2.toLowerCase().contains("where")) {
|
||||
@ -245,6 +250,20 @@ public class SelectCatalogWin {
|
||||
// }
|
||||
// }
|
||||
}
|
||||
if(this.flowunid!=null && this.flowunid.length() > 0) {
|
||||
BizObjectManager lectm = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR_TEMP.CLASS_NAME);
|
||||
BizObject lect = lectm.createQuery("FLOWUNID=:FLOWUNID").setParameter("FLOWUNID", this.flowunid).getSingleResult(false);
|
||||
if(lect!=null) {
|
||||
if(sql2!=null && sql2.length() > 0) {
|
||||
sql2 += " and (A.cartypea='"+lect.getAttribute("car_typea").toString()+"') ";
|
||||
}else {
|
||||
sql2 += " (A.cartypea='"+lect.getAttribute("car_typea").toString()+"') ";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
if (!StringX.isSpace(sOtherWhere)) {
|
||||
String[] array = sOtherWhere.split("&");
|
||||
sql = sql.replace(array[0], array[1]);
|
||||
|
||||
@ -141,4 +141,22 @@ public class SelectCarAttributeController {
|
||||
return ReturnMapUtil.rollback(e);
|
||||
}
|
||||
}
|
||||
|
||||
//»ñÈ¡Í·³µÐÅÏ¢
|
||||
@Path("/headcar/info")
|
||||
@POST
|
||||
public Map<String, Object> selectHeadCarInfo(
|
||||
@Context HttpServletRequest request, @Context Transaction sqlca,
|
||||
@Context JBOTransaction tx) throws Exception {
|
||||
ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
|
||||
ARE.getLog()
|
||||
.info("[CONTROLLER] SelectCarAttributeController run .................");
|
||||
ARE.getLog().info("[Path] /select/headcar/info run .................");
|
||||
try {
|
||||
return service
|
||||
.selectHeadCarInfo(request, sqlca, tx, ReturnMapUtil);
|
||||
} catch (Exception e) {
|
||||
return ReturnMapUtil.rollback(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -28,4 +28,7 @@ public interface SelectCarAttributeService {
|
||||
|
||||
Map<String, Object> SubDistributionName(HttpServletRequest request,
|
||||
Transaction sqlca, JBOTransaction tx, ReturnMapUtil returnMapUtil) throws Exception;
|
||||
|
||||
Map<String, Object> selectHeadCarInfo(HttpServletRequest request, Transaction sqlca, JBOTransaction tx,
|
||||
ReturnMapUtil returnMapUtil) throws Exception;
|
||||
}
|
||||
|
||||
@ -97,4 +97,18 @@ public class SelectCarAttributeServiceImpl implements SelectCarAttributeService{
|
||||
return ReturnMapUtil.getReturnMap();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> selectHeadCarInfo(HttpServletRequest request, Transaction sqlca, JBOTransaction tx,
|
||||
ReturnMapUtil ReturnMapUtil) throws Exception {
|
||||
Map<String, Object> testMap = (Map<String, Object>) MultipartDataUtil.readRequestParam(request, "UTF-8");
|
||||
Map<String, Object> fieldMap = (Map<String, Object>) testMap.get("fieldMap");
|
||||
String flowunid = fieldMap.get("flowunid") == null ? "" : fieldMap.get("flowunid").toString();
|
||||
List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql("SELECT UU_ID,BRAND,CAR_SERIES,MODEL,NOW_TOTAL FROM LB_EQUIPMENT_CAR_TEMP WHERE car_attribute='head' AND flowunid='"+flowunid+"' ");
|
||||
Map<String, Object> body = new HashMap<String, Object>();
|
||||
body.put("headCarInfo", dataList);
|
||||
ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(),
|
||||
"²éѯ³É¹¦");
|
||||
return ReturnMapUtil.getReturnMap();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -30,6 +30,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness {
|
||||
String MONEYNOTAX = null;
|
||||
String MONEYTAX = null;
|
||||
String CORPUS_ADD_INTEREST_TAX = null;
|
||||
String INTERESTNOTAX = null;
|
||||
String DEDITMONEY_NOTAX = null;
|
||||
String CORPUS = null;
|
||||
String INTEREST = null;
|
||||
@ -52,7 +53,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness {
|
||||
|
||||
// 保证金抵扣
|
||||
if("PZ2018072100000053".equals(VOUCHERNO) || "PZ2019070100000026".equals(VOUCHERNO)){
|
||||
sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'±¾½ð',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,IFNULL(LFIT.FACT_MONEY, 0) AS MONEY,IFNULL(ROUND(LRIT.PENALTY / getTax (LCI.LEAS_FORM,'±¾½ð',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LRIT.PENALTY - ROUND(LRIT.PENALTY / getTax (LCI.LEAS_FORM,'±¾½ð',LCCT.START_DATE),2)),0) AS MONEYTAX,'0.00' AS DEDITMONEY_NOTAX,IFNULL(LRIT.CORPUS, 0) AS CORPUS,IFNULL(LRIT.INTEREST, 0) AS INTEREST,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_CALC_CONDITION LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT SUM(LRIT.CORPUS) CORPUS,SUM(LRIT.INTEREST) INTEREST,SUM(LRIT.PENALTY) PENALTY,LRIT.FLOWUNID,LRIT.CONTRACT_ID FROM LC_RENT_INCOME_TEMP LRIT WHERE LRIT.SETTLE_METHOD = 'settlemethod7' GROUP BY lrit.FLOWUNID,LRIT.CONTRACT_ID) LRIT ON LRIT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT SUM(LFIT.FACT_MONEY) FACT_MONEY,lfit.contract_id FROM LC_FUND_INCOME_TEMP LFIT WHERE LFIT.FEE_TYPE = 'feetype16' AND LFIT.SETTLE_METHOD = 'settlemethod7' GROUP BY lfit.contract_id) LFIT ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE lul.IS_MAIN='Y' AND LCI.BUSINESSTYPE='1' AND LUL.IS_MAIN = 'Y' AND LRIT.FLOWUNID = :FLOWUNID ";
|
||||
sql = "SELECT ROUND((getTax (lci.LEAS_FORM,'±¾½ð',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM, IFNULL(LFIT.FACT_MONEY, 0) AS MONEY, IFNULL(ROUND(LRIT.PENALTY / getTax (LCI.LEAS_FORM,'±¾½ð',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL((LRIT.PENALTY - ROUND(LRIT.PENALTY / getTax (LCI.LEAS_FORM,'±¾½ð',LCCT.START_DATE),2)),0)+IFNULL(IFNULL(LRIT.INTEREST, 0)-ROUND(IFNULL(LRIT.INTEREST, 0)/GETTAX(LCI.LEAS_FORM,'×âÏ¢',LCCT.START_DATE),2),0) AS MONEYTAX, '0.00' AS DEDITMONEY_NOTAX, IFNULL(LRIT.CORPUS, 0) AS CORPUS, IFNULL(LRIT.INTEREST, 0) AS INTEREST, IFNULL(ROUND(IFNULL(LRIT.INTEREST, 0)/GETTAX(LCI.LEAS_FORM,'×âÏ¢',LCCT.START_DATE),2),0) AS INTEREST_NOTAX, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCCT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM LC_CALC_CONDITION LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT SUM(LRIT.CORPUS) CORPUS, SUM(LRIT.INTEREST) INTEREST, SUM(LRIT.PENALTY) PENALTY, LRIT.FLOWUNID, LRIT.CONTRACT_ID FROM LC_RENT_INCOME_TEMP LRIT WHERE LRIT.SETTLE_METHOD = 'settlemethod7' GROUP BY lrit.FLOWUNID, LRIT.CONTRACT_ID) LRIT ON LRIT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT SUM(LFIT.FACT_MONEY) FACT_MONEY, lfit.contract_id FROM LC_FUND_INCOME_TEMP LFIT WHERE LFIT.FEE_TYPE = 'feetype16' AND LFIT.SETTLE_METHOD = 'settlemethod7' GROUP BY lfit.contract_id) LFIT ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE lul.IS_MAIN = 'Y' AND LCI.BUSINESSTYPE = '1' AND LUL.IS_MAIN = 'Y' AND LRIT.FLOWUNID = :FLOWUNID";
|
||||
// 确认未实现利息收入-抵扣租金利息
|
||||
}else if("PZ2019070100000027".equals(VOUCHERNO)){
|
||||
sql = "SELECT ROUND((getTax (lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,IFNULL(ROUND(LRIT.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL((LRIT.CORPUS - ROUND(LRIT.CORPUS / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)),0) AS MONEYTAX,((IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM (SELECT SUM(LRIT.CORPUS) CORPUS,SUM(LRIT.INTEREST) INTEREST,SUM(LRIT.PENALTY) PENALTY,LRIT.FLOWUNID,LRIT.CONTRACT_ID,LRIT.PLAN_LIST FROM LC_RENT_INCOME_TEMP LRIT WHERE LRIT.SETTLE_METHOD = 'settlemethod7' GROUP BY LRIT.FLOWUNID,LRIT.CONTRACT_ID,LRIT.PLAN_LIST) LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRIT.CONTRACT_ID AND LRP.PLAN_LIST=LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LRP.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE lul.IS_MAIN = 'Y' AND LCI.BUSINESSTYPE = '1' AND LUL.IS_MAIN = 'Y' AND DATE_FORMAT(NOW(),'%Y%m')=DATE_FORMAT(LRP.PLAN_DATE,'%Y%m') AND LRIT.FLOWUNID = :FLOWUNID ";
|
||||
@ -74,6 +75,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness {
|
||||
DEDITMONEY_NOTAX = dataList.get(i).get("DEDITMONEY_NOTAX");
|
||||
CORPUS = dataList.get(i).get("CORPUS");
|
||||
INTEREST = dataList.get(i).get("INTEREST");
|
||||
INTERESTNOTAX = dataList.get(i).get("INTEREST_NOTAX");
|
||||
ACCOUNT_DATE = dataList.get(i).get("ACCOUNT_DATE").toString();
|
||||
FACT_DATE = dataList.get(i).get("FACT_DATE").toString();
|
||||
CONTRACT_ID = dataList.get(i).get("CONTRACT_ID");
|
||||
@ -100,6 +102,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness {
|
||||
param.put("DEDITMONEY_NOTAX", DEDITMONEY_NOTAX);
|
||||
param.put("CORPUS", CORPUS);
|
||||
param.put("INTEREST", INTEREST);
|
||||
param.put("INTERESTNOTAX", INTERESTNOTAX);
|
||||
param.put("ACCOUNT_DATE", ACCOUNT_DATE);
|
||||
param.put("FACT_DATE", FACT_DATE);
|
||||
param.put("CONTRACT_ID", CONTRACT_ID);
|
||||
@ -111,6 +114,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness {
|
||||
param.put("CUSTID", CUSTID);
|
||||
param.put("CUSTNAME", CUSTNAME);
|
||||
param.put("CUSTOMERTYPE", CUSTOMERTYPE);
|
||||
param.put("VOUCHERNO", VOUCHERNO);
|
||||
param.put("BUSINESSTYPE", "0603");
|
||||
param.put("FlowUnid", FlowUnid);
|
||||
if(TAX_CODES!=null) {
|
||||
|
||||
@ -0,0 +1,131 @@
|
||||
package com.tenwa.voucher.CreateVoucherProcess;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import jbo.voucher.LV_VOUCHER_CONFIG;
|
||||
import jbo.voucher.TAX_CODE;
|
||||
import com.amarsoft.are.jbo.BizObject;
|
||||
import com.amarsoft.are.jbo.JBOFactory;
|
||||
import com.amarsoft.awe.util.Transaction;
|
||||
import com.tenwa.comm.util.jboutil.DataOperatorUtil;
|
||||
import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
|
||||
|
||||
public class CreateVoucherDepositDeductionToMoney2 {
|
||||
|
||||
public String CreateVoucher(String VOUCHERNO,String userid,Transaction Sqlca,String DEDUCTION_ID) throws Exception {
|
||||
|
||||
Map<String, String> map = new HashMap<String, String>();
|
||||
Map<String, String> param = new HashMap<String, String>();
|
||||
CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl();
|
||||
String VOUCHER_TYPE = "1";
|
||||
|
||||
String F58=null;
|
||||
String MONEY = null;
|
||||
String MONEYNOTAX = null;
|
||||
String MONEYTAX = null;
|
||||
String CORPUS_ADD_INTEREST_TAX = null;
|
||||
String INTERESTNOTAX = null;
|
||||
String DEDITMONEY_NOTAX = null;
|
||||
String CORPUS = null;
|
||||
String INTEREST = null;
|
||||
String ACCOUNT_DATE = null;
|
||||
String FACT_DATE = null;
|
||||
String CONTRACT_ID = null;
|
||||
String CONTRACT_NUMBER = null;
|
||||
String PROJECT_NAME = null;
|
||||
String leas_form = null;
|
||||
String DISTRIBUTOR_ID = null;
|
||||
String DISTRIBUTOR_NAME = null;
|
||||
String CUSTID = null;
|
||||
String CUSTNAME = null;
|
||||
String CUSTOMERTYPE = null;
|
||||
String TAX_NUM = null;
|
||||
String sql = "";
|
||||
param.clear();
|
||||
map.put("DEDUCTION_ID", DEDUCTION_ID);
|
||||
|
||||
// 保证金自动抵扣
|
||||
if("PZ2021091700000031".equals(VOUCHERNO) || "PZ2021091700000032".equals(VOUCHERNO)){
|
||||
sql = "SELECT LRI.ID AS F58,ROUND((getTax (lci.LEAS_FORM,'本金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM, IFNULL(LRI.RENT, 0)+IFNULL(LRI.PENALTY , 0) AS MONEY, IFNULL(IFNULL(LRI.INTEREST, 0) - ROUND(IFNULL(LRI.INTEREST, 0) / GETTAX (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS MONEYTAX, IFNULL(LRI.CORPUS, 0) AS CORPUS, IFNULL(LRI.INTEREST, 0) AS INTEREST, IFNULL(ROUND(IFNULL(LRI.INTEREST, 0) / GETTAX (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS INTEREST_NOTAX, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCCT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM LC_RENT_INCOME LRI LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER=LRI.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE lul.IS_MAIN = 'Y' AND LCI.BUSINESSTYPE = '1' AND LUL.IS_MAIN = 'Y' AND LRI.DEDUCTION_ID=:DEDUCTION_ID";
|
||||
}
|
||||
|
||||
// 查询sql, 将结果集封装到list集合中
|
||||
List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map);
|
||||
|
||||
//遍历获取结果集, 将结果写入map中
|
||||
for (int i = 0; i < dataList.size(); i++) {
|
||||
MONEY = dataList.get(i).get("MONEY").toString();
|
||||
if ("".equals(MONEY)||MONEY == null)MONEY = "0.00";
|
||||
double mon = Double.parseDouble(MONEY);
|
||||
// 判断有金额, 封装值到map中
|
||||
if (Math.abs(mon) > 0) {
|
||||
MONEYNOTAX = dataList.get(i).get("MONEYNOTAX");
|
||||
MONEYTAX = dataList.get(i).get("MONEYTAX");
|
||||
CORPUS_ADD_INTEREST_TAX = dataList.get(i).get("CORPUS_ADD_INTEREST_TAX");
|
||||
DEDITMONEY_NOTAX = dataList.get(i).get("DEDITMONEY_NOTAX");
|
||||
CORPUS = dataList.get(i).get("CORPUS");
|
||||
INTEREST = dataList.get(i).get("INTEREST");
|
||||
INTERESTNOTAX = dataList.get(i).get("INTEREST_NOTAX");
|
||||
ACCOUNT_DATE = dataList.get(i).get("ACCOUNT_DATE").toString();
|
||||
FACT_DATE = dataList.get(i).get("FACT_DATE").toString();
|
||||
CONTRACT_ID = dataList.get(i).get("CONTRACT_ID");
|
||||
CONTRACT_NUMBER = dataList.get(i).get("CONTRACT_NUMBER");
|
||||
PROJECT_NAME = dataList.get(i).get("PROJECT_NAME");
|
||||
leas_form = dataList.get(i).get("LEAS_FORM");
|
||||
DISTRIBUTOR_ID = dataList.get(i).get("DISTRIBUTOR_ID");
|
||||
DISTRIBUTOR_NAME = dataList.get(i).get("DISTRIBUTOR_NAME");
|
||||
CUSTID = dataList.get(i).get("CUSTOMERID");
|
||||
CUSTNAME = dataList.get(i).get("CUSTOMERNAME");
|
||||
CUSTOMERTYPE = dataList.get(i).get("CUSTOMERTYPE");
|
||||
TAX_NUM = dataList.get(i).get("TAX_NUM");
|
||||
F58 = dataList.get(i).get("F58");
|
||||
// 通过税率获取编码
|
||||
BizObject TAX_CODES=null;
|
||||
if(TAX_NUM!=null && !"".equals(TAX_NUM)) {
|
||||
TAX_CODES=JBOFactory.createBizObjectQuery(TAX_CODE.CLASS_NAME,"TAX_NUMBER='"+TAX_NUM+"'").getSingleResult(false);
|
||||
}
|
||||
|
||||
param.put("FACT_MONEY", MONEY);
|
||||
param.put("INTERESTNOTAX", MONEYNOTAX);
|
||||
param.put("TAX", MONEYTAX);
|
||||
param.put("CORPUS_ADD_INTEREST_TAX", CORPUS_ADD_INTEREST_TAX);
|
||||
param.put("DEDITMONEY_NOTAX", DEDITMONEY_NOTAX);
|
||||
param.put("CORPUS", CORPUS);
|
||||
param.put("INTEREST", INTEREST);
|
||||
param.put("INTERESTNOTAX", INTERESTNOTAX);
|
||||
param.put("ACCOUNT_DATE", ACCOUNT_DATE);
|
||||
param.put("FACT_DATE", FACT_DATE);
|
||||
param.put("CONTRACT_ID", CONTRACT_ID);
|
||||
param.put("CONTRACT_NUMBER", CONTRACT_NUMBER);
|
||||
param.put("PROJECT_NAME", PROJECT_NAME);
|
||||
param.put("LEAS_FORM", leas_form);
|
||||
param.put("DISTRIBUTOR_ID", DISTRIBUTOR_ID);
|
||||
param.put("DISTRIBUTOR_NAME", DISTRIBUTOR_NAME);
|
||||
param.put("CUSTID", CUSTID);
|
||||
param.put("CUSTNAME", CUSTNAME);
|
||||
param.put("CUSTOMERTYPE", CUSTOMERTYPE);
|
||||
param.put("VOUCHERNO", VOUCHERNO);
|
||||
param.put("BUSINESSTYPE", "0603");
|
||||
param.put("F58", F58);
|
||||
if(TAX_CODES!=null) {
|
||||
param.put("TAX_CODE",TAX_CODES.getAttribute("TAX_CODES").getString());
|
||||
}
|
||||
|
||||
map.clear();
|
||||
map.put("PROJ_TYPE", leas_form);
|
||||
map.put("VOUCHER_NO", VOUCHERNO);
|
||||
// 根据map中的参数, 查询LV_VOUCHER_CONFIG表数据
|
||||
BizObject vouch = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
|
||||
// 如果结果不为空,
|
||||
if (vouch != null) {
|
||||
//将创建凭证的参数传入在下一层
|
||||
vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
String sMessage = "true";
|
||||
return sMessage;
|
||||
}
|
||||
}
|
||||
@ -502,6 +502,26 @@ public class CreateVoucherServiceImpl {
|
||||
subData.putAll(this.getAuxiliaryData(tx, param,subData,sub.getAttribute("AUXILIARY_TYPE").getString()));
|
||||
}
|
||||
|
||||
/**
|
||||
* 保证金抵扣业务类型配置
|
||||
*/
|
||||
if("PZ2018072100000053".equals(VOUCHERNO) || "PZ2019070100000026".equals(VOUCHERNO)) {
|
||||
if("3".equals(SORT_NUMBER)) {
|
||||
subData.put("BUSINESSTYPE", "0604");
|
||||
}
|
||||
if("4".equals(SORT_NUMBER)) {
|
||||
subData.put("BUSINESSTYPE", "0602");
|
||||
}
|
||||
if("5".equals(SORT_NUMBER)) {
|
||||
subData.put("BUSINESSTYPE", "0603");
|
||||
}
|
||||
}
|
||||
if("PZ2021091700000031".equals(VOUCHERNO) || "PZ2021091700000032".equals(VOUCHERNO)) {
|
||||
if("3".equals(SORT_NUMBER)) {
|
||||
subData.put("BUSINESSTYPE", "0604");
|
||||
}
|
||||
}
|
||||
|
||||
/*// 需要带经销商编码的在此匹配
|
||||
if("PZ2018092500000156".equals(VOUCHERNO) || "PZ2019072000000074".equals(VOUCHERNO) || "PZ2018092500000164".equals(VOUCHERNO) || "PZ2019072000000079".equals(VOUCHERNO) || "PZ2019072200000108".equals(VOUCHERNO) || "PZ2019072200000114".equals(VOUCHERNO)) {
|
||||
if("2".equals(SORT_NUMBER)) {
|
||||
|
||||
@ -36,6 +36,7 @@ public class CustomerGroupCompanyController {
|
||||
private String OLDITEMNO = "";
|
||||
private String inputUserId = "";
|
||||
private String inputOrgId = "";
|
||||
private String businessLicenseNo = "";
|
||||
|
||||
public String getITEMNO() {
|
||||
return ITEMNO;
|
||||
@ -131,6 +132,15 @@ public class CustomerGroupCompanyController {
|
||||
public void setInputOrgId(String inputOrgId) {
|
||||
this.inputOrgId = inputOrgId;
|
||||
}
|
||||
|
||||
|
||||
public String getBusinessLicenseNo() {
|
||||
return businessLicenseNo;
|
||||
}
|
||||
|
||||
public void setBusinessLicenseNo(String businessLicenseNo) {
|
||||
this.businessLicenseNo = businessLicenseNo;
|
||||
}
|
||||
|
||||
/**
|
||||
* <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
@ -364,4 +374,16 @@ public class CustomerGroupCompanyController {
|
||||
}
|
||||
return "success";
|
||||
}
|
||||
//校验经销商审核社会统一信用代码是否已经存在
|
||||
public String checkBusinessLicenseNo(JBOTransaction tx) throws Exception{
|
||||
List<Map<String, String>> dataBySql = DataOperatorUtil.getDataBySql("select id from distributor_info_temp where id<>'"+id+"' and BUSINESS_LICENSE_NO='"+businessLicenseNo+"' ");
|
||||
if(dataBySql!=null && dataBySql.size() > 0) {
|
||||
return "false";
|
||||
}
|
||||
dataBySql = DataOperatorUtil.getDataBySql("select id from distributor_info where BUSINESS_LICENSE_NO='"+businessLicenseNo+"' ");
|
||||
if(dataBySql!=null && dataBySql.size() > 0) {
|
||||
return "false";
|
||||
}
|
||||
return "true";
|
||||
}
|
||||
}
|
||||
@ -9,6 +9,8 @@ import java.util.UUID;
|
||||
|
||||
import com.base.util.DateUtil;
|
||||
import com.tenwa.comm.util.jboutil.DataOperatorUtil;
|
||||
import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherDepositDeductionToMoney2;
|
||||
|
||||
import org.quartz.Job;
|
||||
import org.quartz.JobExecutionContext;
|
||||
import org.quartz.JobExecutionException;
|
||||
@ -143,6 +145,13 @@ public class MarginDeduction implements Job{
|
||||
lrp.setAttributeValue("COLLECT_MSG","±£Ö¤½ðµÖ¿Û");
|
||||
lrpBm.saveObject(lrp);
|
||||
}
|
||||
|
||||
/**
|
||||
* Éú³Éƾ֤
|
||||
*/
|
||||
CreateVoucherDepositDeductionToMoney2 cddm = new CreateVoucherDepositDeductionToMoney2();
|
||||
cddm.CreateVoucher("PZ2021091700000031", "admin", Sqlca,fundIncomeId);
|
||||
cddm.CreateVoucher("PZ2021091700000032", "admin", Sqlca,fundIncomeId);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -326,7 +326,13 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
|
||||
bmLEC.setAttributeValue("INPUTUSERID", asUser.getUserID());//登记人
|
||||
bmLEC.setAttributeValue("INPUTORGID", asUser.getOrgID());//登记部门
|
||||
bmLEC.setAttributeValue("INPUTTIME", StringFunction.getTodayNow());//登记时间,系统当前时间
|
||||
bmLEC.setAttributeValue("cartype",this.getAttribute("cartype"));
|
||||
// bmLEC.setAttributeValue("cartype",this.getAttribute("cartype"));
|
||||
String cartypea = this.getAttribute("cartypea") == null ? "" : this.getAttribute("cartypea").toString() ;
|
||||
if(cartypea.equals("SYC")) {
|
||||
bmLEC.setAttributeValue("cartype","商用车");
|
||||
}else if(cartypea.equals("CYC")){
|
||||
bmLEC.setAttributeValue("cartype","乘用车");
|
||||
}
|
||||
bmLEC.setAttributeValue("vehicletype",this.getAttribute("vehicletype"));
|
||||
bmLEC.setAttributeValue("vehiclelevel",this.getAttribute("vehiclelevel"));
|
||||
bmLEC.setAttributeValue("car_attribute","head");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user