From 8be685b9b3c7e61ee2168b5758d7575a13393c01 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 3 Dec 2020 19:19:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E3=80=81=E6=8F=90?= =?UTF-8?q?=E5=89=8D=E7=BB=93=E6=B8=85=E7=BD=9A=E6=81=AF=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=87=8F=E7=BD=9A=E6=81=AF=E5=87=8F=E5=85=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=81app=E6=95=B0=E6=8D=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc/com/tenwa/reckon/executor/RentCalHelper.java | 5 +++-- .../change/center/service/impl/ApplyArchiveServiceImpl.java | 6 +++--- .../commbusiness/LBProjectIntoTempInitCarBusiness.java | 3 ++- .../lease/flow/project/commcheck/ApprovalOpinionCheck.java | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/calc/com/tenwa/reckon/executor/RentCalHelper.java b/calc/com/tenwa/reckon/executor/RentCalHelper.java index 9fb537a78..077a0ed13 100644 --- a/calc/com/tenwa/reckon/executor/RentCalHelper.java +++ b/calc/com/tenwa/reckon/executor/RentCalHelper.java @@ -217,7 +217,7 @@ public class RentCalHelper { + " IFNULL(t1.penalty,0)-ifnull(t2.sumincomepenalty,0) penalty," + " t1.plandate," + " t1.planlist,IFNULL(t2.planlist,0) cou," - + " getRentPenalty('"+this.getPaymentnumber()+"',t1.planlist,DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d'))-IFNULL(t2.sumincomepenalty,0) sumpenalty" + + " getRentPenalty('"+this.getPaymentnumber()+"',t1.planlist,DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d'))-IFNULL(t2.sumincomepenalty,0)-IFNULL(t2.sumincomepenaltyadjust,0) sumpenalty" + " from (" + " select cfrp.plan_date plandate," + " cfrp.plan_list planlist," @@ -235,7 +235,8 @@ public class RentCalHelper { + " (select sum( cfri.corpus ) sumincomecorpus" + " ,sum(cfri.interest ) sumincomeinterest," + " sum( cfri.rent ) sumincomerent," - + " sum( cfri.penalty ) sumincomepenalty," + + " sum( cfri.penalty ) sumincomepenalty, " + + " sum( cfri.penalty_adjust ) sumincomepenaltyadjust," + " min(cfri.contract_id) contractid," + " cfri.plan_list planlist " + " from LC_RENT_INCOME cfri " diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java index 85eb3022a..eba7f4804 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java @@ -347,7 +347,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); String globaltext = fieldMap.get("globaltext") == null ? "" : fieldMap.get("globaltext").toString(); String sql = ""; - sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lcc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP GROUP BY PRODUCT_ID) lpi ON lpi.PRODUCT_ID= bo.productId LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT project_id,model FROM LB_EQUIPMENT_CAR_temp GROUP BY project_id) lec ON lec.project_id=bo.proj_id LEFT JOIN LC_CALC_CONDITION_TEMP lcc ON lcc.flowunid=O.objectno LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') AND O.PhaseType='1010' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') AND O.UserID='"+userId+"' "; + sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lcc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP) lpi ON lpi.FLOWUNID= bo.FLOW_UNID LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT project_id,model FROM LB_EQUIPMENT_CAR_temp GROUP BY project_id) lec ON lec.project_id=bo.proj_id LEFT JOIN LC_CALC_CONDITION_TEMP lcc ON lcc.flowunid=O.objectno LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') AND O.PhaseType='1010' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') AND O.UserID='"+userId+"' "; //sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.objectNo,fl.taskNo,ft.serialNo,cpt.CUSTOMER_NAME,cpt.CUSTOMER_NAME AS CUSTOMERNAME,ci.customertype,ci.certtype,lpi.project_no AS FlowKey,bo.proj_id AS projectId,lpi.SUBJECTID,ps.leasform,lpi.CAR_TYPE AS carAttributes,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,O.SERIALNO,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.flow_unid AS flowUnid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lpc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN LB_PROJECT_INFO_TEMP lpi ON bo.flow_unid = lpi.FLOWUNID LEFT JOIN LB_UNION_LESSEE_TEMP cpt ON cpt.FLOWUNID = bo.flow_unid LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=bo.proj_id LEFT JOIN LC_PROJ_CONDITION lpc ON bo.proj_id=lpc.project_id LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN flow_task ft ON ft.objectno=o.objectno LEFT JOIN flow_log fl ON fl.flowunid=ft.objectno LEFT JOIN PRD_SPECIFIC_LIBRARY ps ON ps.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType = 'ProductDefaultObject' AND O.PhaseType='1010' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','ProjectApproalApply','BusinessChangeApply','BusinessCancelApply') AND O.UserID='"+userId+"' ORDER BY bo.InputTime DESC "; if(globaltext.length() ==0 ){ sql = sql+ " ORDER BY bo.InputTime DESC "; @@ -372,7 +372,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); String globaltext = fieldMap.get("globaltext") == null ? "" : fieldMap.get("globaltext").toString(); String sql = ""; - sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lcc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP GROUP BY PRODUCT_ID) lpi ON lpi.PRODUCT_ID= bo.productId LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT project_id,model FROM LB_EQUIPMENT_CAR_temp GROUP BY project_id) lec ON lec.project_id=bo.proj_id LEFT JOIN LC_CALC_CONDITION_TEMP lcc ON lcc.flowunid=O.objectno LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') AND O.PhaseType='1020' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') AND O.UserID='"+userId+"' "; + sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lcc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP ) lpi ON lpi.FLOWUNID= bo.FLOW_UNID LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT project_id,model FROM LB_EQUIPMENT_CAR_temp GROUP BY project_id) lec ON lec.project_id=bo.proj_id LEFT JOIN LC_CALC_CONDITION_TEMP lcc ON lcc.flowunid=O.objectno LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') AND O.PhaseType='1020' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') AND O.UserID='"+userId+"' "; if(globaltext.length() ==0 ){ sql = sql+ " ORDER BY bo.InputTime DESC "; }else{ @@ -396,7 +396,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); String globaltext = fieldMap.get("globaltext") == null ? "" : fieldMap.get("globaltext").toString(); String sql = ""; - sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) as InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' as ACTION,lpc.CLEAN_LEASE_MONEY,lec.MODEL,O.phasename FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP GROUP BY PRODUCT_ID) lpi ON lpi.PRODUCT_ID= bo.productId LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=bo.proj_id LEFT JOIN LC_PROJ_CONDITION lpc ON bo.proj_id=lpc.project_id LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 and O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') and O.PhaseType IN ('1040','1050') and O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') and O.UserID='"+userId+"' "; + sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) as InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' as ACTION,lpc.CLEAN_LEASE_MONEY,lec.MODEL,O.phasename FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP ) lpi ON lpi.FLOWUNID= bo.FLOW_UNID LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=bo.proj_id LEFT JOIN LC_PROJ_CONDITION lpc ON bo.proj_id=lpc.project_id LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 and O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') and O.PhaseType IN ('1040','1050') and O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') and O.UserID='"+userId+"' "; if(globaltext.length() ==0 ){ sql = sql+ " ORDER BY bo.InputTime DESC "; }else{ diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java index fd43c4c1c..c2ef49575 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java @@ -146,6 +146,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { //更新CUSTOMER_FAMILY MapfamilyProperty=new HashMap(); familyProperty.put("FLOWUNID", flowunid); + familyProperty.put("project_id", this.getAttribute("ProjectId").toString()); familyProperty.put(CUSTOMER_INFO_TEMP.customerid, customerId); //familyProperty.put("name", custName); //更新CUSTOMER_PERSON @@ -358,7 +359,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { bo.setAttributeValue("FLOWUNID", this.getAttribute("FlowUnid"));//流程ID bo.setAttributeValue("id", this.getAttribute("ProjectId"));//项目ID bo.setAttributeValue("PROJECT_NO",this.getAttribute("ProjectNo"));//申请编号 - bo.setAttributeValue("project_name",this.getAttribute("ProjectNo")+"-"+this.getAttribute("ProductName")); + bo.setAttributeValue("project_name",this.getAttribute("ProjectNo")+"-"+this.getAttribute("custname")); bo.setAttributeValue("CAR_TYPE",this.getAttribute("carAttributes"));//车辆属性 bo.setAttributeValue("LEAS_FORM", this.getAttribute("leasehold"));//租赁方式 bo.setAttributeValue("PRODUCT_ID",this.getAttribute("ProductId"));//产品ID diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/ApprovalOpinionCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/ApprovalOpinionCheck.java index 595145fef..7b4c21323 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commcheck/ApprovalOpinionCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/ApprovalOpinionCheck.java @@ -47,12 +47,12 @@ public class ApprovalOpinionCheck extends DefaultBussinessCheck{ break; case "0060": if(!"1".equals(phasechoice)){ - message = "复审意见未填写！"; flag = false; + message = "部门负责人意见未填写！"; flag = false; } break; case "0050": if(!"1".equals(phasechoice)){ - message = "部门负责人意见未填写！"; flag = false; + message = "复审意见未填写！"; flag = false; } break; // case "0050":