diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
index 5720735af..88e60b9f3 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
@@ -145,6 +145,9 @@
var liter = getItemValue(0,getRow(),"liter");//排量
var geartype = getItemValue(0,getRow(),"geartype");//档位
var newtype = getItemValue(0,getRow(),"newtype");//档位
+ var cartype = getItemValue(0,getRow(),"cartype");//车辆类型(乘用车/商用车)
+ var vehicletype = getItemValue(0,getRow(),"vehicletype");//商用车设备类型
+ var vehiclelevel = getItemValue(0,getRow(),"vehiclelevel");//商用车设备级别
var CustomerId="";
var ceckRes = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","checkNameAndCertId","certid="+certid+",certtype="+certtype);
CustomerId=ceckRes;
@@ -196,6 +199,7 @@
var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
sParams =sParams+",SubjectId="+SubjectId+",SubjectName="+message[1]+",ProductId="+productId+",ProductName="+productname+",CustomerType="+customerType+",carAttributes="+carAttributes+",leasehold="+leasehold+",carSystem="+carSystem+",custname="+custname+",certtype="+certtype+",certid="+certid+",CustomerId="+CustomerId+",productModel="+productModel+",carSeries="+carSeries+",versionid="+versionid+",modelid="+modelid+",businessType="+businessType+",price="+price+",liter="+liter+",geartype="+geartype+",sourcetype=web,operationType="+operationType+",newtype="+newtype;
+ sParams =sParams+",cartype="+cartype+",vehicletype="+vehicletype+",vehiclelevel="+vehiclelevel;//赋值新增的三个车型信息
//
if("BAIC_MOTOR"==operationType){
sParams = sParams+",distributorNo="+getItemValue(0,getRow(),"distributorNo")+",distributorName="+getItemValue(0,getRow(),"distributorName");
@@ -325,6 +329,10 @@
setItemValue(0,getRow(),"price",MyOjbect.price);
setItemValue(0,getRow(),"liter",sReturn[3]);
setItemValue(0,getRow(),"geartype",sReturn[4]);
+
+ setItemValue(0,getRow(),"cartype",sReturn[5]);
+ setItemValue(0,getRow(),"vehicletype",sReturn[6]);
+ setItemValue(0,getRow(),"vehiclelevel",sReturn[7]);
},"请选择车型",'');
}else{
alert("请先选择车系");
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_sys.xml b/WebContent/WEB-INF/etc/jbo/jbo_sys.xml
index 6d21ca6ae..64ba1a759 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_sys.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_sys.xml
@@ -1824,6 +1824,10 @@
+
+
+
+
diff --git a/src/com/tenwa/lease/app/quartzmession/ReportRentMonth.java b/src/com/tenwa/lease/app/quartzmession/ReportRentMonth.java
new file mode 100644
index 000000000..530b611e4
--- /dev/null
+++ b/src/com/tenwa/lease/app/quartzmession/ReportRentMonth.java
@@ -0,0 +1,84 @@
+package com.tenwa.lease.app.quartzmession;
+
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.awe.util.ASResultSet;
+import com.amarsoft.awe.util.SqlObject;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.dict.als.cache.CacheLoaderFactory;
+import com.tenwa.lease.app.quartzmession.audit.AuditOrderEnums;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 月度资金流入表
+ * @author xiezhiwen
+ */
+public class ReportRentMonth implements Job{
+ private static final Logger logger = LogManager.getLogger(ReportRentMonth.class);// 引入logger日志
+
+ public void execute(JobExecutionContext arg0) throws JobExecutionException {
+ logger.info("【月度资金流入表】【ReportRentMonth】【开始】<<<<<<<<<<<<<: 2020061222");
+ insertData();
+ logger.info("【月度资金流入表】【ReportRentMonth】【完成】<<<<<<<<<<<<<: ");
+ }
+
+ /**
+ * 添加审核流程记录明细
+ * @return
+ */
+ private void insertData(){
+ SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd");
+ String today=dayFormat.format(new Date());
+ String month=today.substring(0,7);
+ Transaction Sqlca=null;
+ try{
+ logger.info("【月度资金流入表】【ReportRentMonth】插入数据<<<<<<<<<<<<<");
+ Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+ //初始化信审考核明细表
+ String deleteSql="delete from report_rent_month where report_month='"+month+"'";
+ String insertSql="INSERT INTO report_rent_month ( report_month, report_date, rent, corpus, " +
+ "interest, all_remain_corpus, fact_rent, fact_corpus, fact_interest, fact_penalty, contract_count ) " +
+ "SELECT '"+month+"' as report_month,'"+today+"' as report_date," +
+ "sum(rrp.rent),sum( rrp.corpus ),sum( rrp.interest )," +
+ "sum( rrp.all_remain_corpus ),sum( rrp.fact_rent ),sum( rrp.fact_corpus )," +
+ "sum( rrp.fact_interest ),sum( rrp.fact_penalty ),count( rrp.contract_number ) " +
+ "FROM report_rent_plan rrp,lb_contract_info lci " +
+ "WHERE rrp.contract_number = lci.CONTRACT_NUMBER and lci.CONTRACT_STATUS>=31 and lci.CONTRACT_STATUS<100 " +
+ "and rrp.plan_date like '%"+month+"%'";
+ Sqlca.executeSQL(new SqlObject(deleteSql));
+ Sqlca.executeSQL(new SqlObject(insertSql));
+ Sqlca.commit();
+ }catch(Exception e){
+ logger.error("<<<<<<<<<<<<<<<<<<<<<<【月度资金流入表】【ReportRentMonth】插入数据>>>>>>>>>>>>>>>>>>>>>>>");
+ try {
+ Sqlca.rollback();
+ } catch (JBOException e1) {
+ e1.printStackTrace();
+ }
+ e.printStackTrace();
+ }finally {
+ if(Sqlca!=null) {
+ try {
+ Sqlca.commit();
+ Sqlca.disConnect();
+ } catch (JBOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
+ public static void main(String[] args){
+ SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy-MM-dd");
+ System.out.println("--"+dayFormat.format(new Date()).substring(0,7));
+ }
+}
diff --git a/src_jbo/jbo/sys/OVERDUE_DUNNING_RECORD.java b/src_jbo/jbo/sys/OVERDUE_DUNNING_RECORD.java
index 21a12475f..2297e8e2e 100644
--- a/src_jbo/jbo/sys/OVERDUE_DUNNING_RECORD.java
+++ b/src_jbo/jbo/sys/OVERDUE_DUNNING_RECORD.java
@@ -81,4 +81,16 @@ public interface OVERDUE_DUNNING_RECORD{
* 其他费用 STRING(32)
*/
public static final String other_fee = "other_fee";
+ /**
+ * 行动代码 STRING(32)
+ */
+ public static final String action_code = "action_code";
+ /**
+ * 电话状态 STRING(32)
+ */
+ public static final String phone_sts = "phone_sts";
+ /**
+ * 与客户关系 STRING(32)
+ */
+ public static final String relationship_type = "relationship_type";
}
\ No newline at end of file
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 5939fc2b7..5415ef8bc 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
@@ -304,6 +304,9 @@ 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("vehicletype",this.getAttribute("vehicletype"));
+ bmLEC.setAttributeValue("vehiclelevel",this.getAttribute("vehiclelevel"));
if(lbat!=null){
bmLEC.setAttributeValue("FRAME_NUMBER", lbat.getAttribute("frame_number")+"");//车架号
bmLEC.setAttributeValue("mile", lbat.getAttribute("mile")+"");//公里数