From 86fdd4989005aaf712542138b01ee77c066e5f35 Mon Sep 17 00:00:00 2001
From: maliang <maliang@ap-leasing.com.cn>
Date: Wed, 16 Mar 2022 15:22:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E8=AE=A2=E5=8D=95=E5=90=84=E7=8E=AF?=
 =?UTF-8?q?=E8=8A=82=E6=8F=90=E4=BA=A4=E6=97=B6=E9=97=B4=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/quartzmession/ProjectProcessTime.java | 285 ++++++++
 报表/汽车类报表一/订单各环节提交时间报表.xml  | 616 ++++++++++++++++++
 2 files changed, 901 insertions(+)
 create mode 100644 src/com/tenwa/lease/app/quartzmession/ProjectProcessTime.java
 create mode 100644 报表/汽车类报表一/订单各环节提交时间报表.xml

diff --git a/src/com/tenwa/lease/app/quartzmession/ProjectProcessTime.java b/src/com/tenwa/lease/app/quartzmession/ProjectProcessTime.java
new file mode 100644
index 000000000..766cba1af
--- /dev/null
+++ b/src/com/tenwa/lease/app/quartzmession/ProjectProcessTime.java
@@ -0,0 +1,285 @@
+package com.tenwa.lease.app.quartzmession;
+
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.awe.util.SqlObject;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.dict.als.cache.CacheLoaderFactory;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * �������������ύʱ�䱨��
+ * @author maliang
+ */
+public class ProjectProcessTime implements Job {
+    private static final Logger logger = LogManager.getLogger(ProjectProcessTime.class);// ����logger��־
+
+    public void execute(JobExecutionContext arg0) throws JobExecutionException {
+        logger.info("���������������ύʱ�䱨������ProjectProcessTime������ʼ��<<<<<<<<<<<<<:");
+        insertData();
+        logger.info("���������������ύʱ�䱨������ProjectProcessTime������ɡ�<<<<<<<<<<<<<: ");
+    }
+
+    /**
+     * ����������̼�¼��ϸ
+     * @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("���������������ύʱ�䱨������ProjectProcessTime����������<<<<<<<<<<<<<");
+            Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+
+            String lastMonthFirstDay=getLastMonthFirstDay();//��ǰʱ�����µ�һ���Ӧ������
+            //������������
+            String insertSql="insert into project_process_time(project_id,subjectname,provinces,distributor_name,project_no,specificname,car_type,customer_name)\n" +
+                    "select p.id,a.subjectname,a.provinces,a.distributor_name,a.project_no,a.specificname,a.car_type,a.customer_name from approval_ledger a,lb_project_info p\n" +
+                    "where a.project_no=p.project_no and not EXISTS (select 1 from project_process_time t where t.project_no=a.project_no)";
+            //ҵ������ʱ�� ��������ͨ��ʱ��
+            String update1="update project_process_time t\n" +
+                    " JOIN(SELECT\n" +
+                    "  vf.proj_id,\n" +
+                    "\tfl.TJTIME,\n" +
+                    "\tvf.ENDTIME \n" +
+                    "FROM\n" +
+                    "\tVI_FLOW_MONITORING vf,(\n" +
+                    "\tSELECT\n" +
+                    "\t\tFLOWUNID,\n" +
+                    "\t\tmin( INPUTTIME ) TJTIME \n" +
+                    "\tFROM\n" +
+                    "\t\tFLOW_LOG \n" +
+                    "\tWHERE\n" +
+                    "\t\tlogcontent LIKE '%�ύ����%' \n" +
+                    "\tGROUP BY\n" +
+                    "\t\tFLOWUNID \n" +
+                    "\t) fl \n" +
+                    "WHERE\n" +
+                    "\tvf.FLOW_NAME = 'ҵ����������'\n" +
+                    "  AND str_to_date( REPLACE ( LEFT ( vf.ENDTIME, 10 ), '/', '-' ), '%Y-%m-%d' ) >= str_to_date( '"+lastMonthFirstDay+"', '%Y-%m-%d' ) \t\n" +
+                    "\tAND vf.OBJECTNO = fl.FLOWUNID\n" +
+                    "\tand vf.phasename in ('����','���')\n" +
+                    "\t) a  on t.project_id= a.proj_id\n" +
+                    "\tset t.business_apply_submit_time= a.TJTIME,t.business_apply_end_time=a.ENDTIME\n" +
+                    "\tWHERE t.project_id = a.proj_id";
+            //��������˻�ʱ�� �����ۼ��˻ش���
+            String update2="update project_process_time t\n" +
+                    " JOIN(SELECT\n" +
+                    "  vf.proj_id,\n" +
+                    "\tfl.TJTIME,\n" +
+                    "\tfl.thcs \n" +
+                    "FROM\n" +
+                    "\tVI_FLOW_MONITORING vf,(\n" +
+                    "\tSELECT\n" +
+                    "\t\tFLOWUNID,\n" +
+                    "\t\tmax( INPUTTIME ) TJTIME,\n" +
+                    "\t\tcount(1) thcs\n" +
+                    "\tFROM\n" +
+                    "\t\tFLOW_LOG \n" +
+                    "\tWHERE\n" +
+                    "\t\tlogcontent LIKE '%�˻�����%' \n" +
+                    "\tGROUP BY\n" +
+                    "\t\tFLOWUNID \n" +
+                    "\t) fl \n" +
+                    "WHERE\n" +
+                    "\tvf.FLOW_NAME = 'ҵ����������' \n" +
+                    "\tAND vf.OBJECTNO = fl.FLOWUNID\n" +
+                    "\tand vf.phasename in ('����','���')\n" +
+                    "\t) a  on t.project_id= a.proj_id\n" +
+                    "\tset t.business_apply_back_time= a.TJTIME,t.business_apply_back_number=a.thcs\n" +
+                    "\tWHERE t.project_id = a.proj_id ";
+            //ҵ�������ʱ�䡢ҵ��������
+            String update3="update project_process_time t\n" +
+                    " JOIN(SELECT\n" +
+                    "  vf.proj_id,\n" +
+                    "\tmax(vf.ENDTIME)  ENDTIME,\n" +
+                    "\tcount(1) bgcs\n" +
+                    "FROM\n" +
+                    "\tVI_FLOW_MONITORING vf\n" +
+                    "WHERE\n" +
+                    "\tvf.FLOW_NAME = 'ҵ��������' \n" +
+                    "\tand vf.phasename in ('����','���')\n" +
+                    "\tgroup by vf.proj_id\n" +
+                    "\t) a  on t.project_id= a.proj_id\n" +
+                    "\tset t.business_change_end_time= a.ENDTIME,t.business_change_number=a.bgcs\n" +
+                    "\tWHERE t.project_id = a.proj_id ";
+
+            //��ͬǩԼ���ʱ�䣨����ǩ��\	��ͬ��������ʱ��
+            String update4="update project_process_time t\n" +
+                    " JOIN(SELECT\n" +
+                    "  vf.proj_id,\n" +
+                    "\tvf.ENDTIME,\n" +
+                    "\tl.INPUTTIME\n" +
+                    "FROM\n" +
+                    "\tVI_FLOW_MONITORING vf\n" +
+                    "\tleft join VI_CONTRACTMAKEPRINTLIST vc on vf.OBJECTNO=vc.flowunid\n" +
+                    "\tleft join LB_DOCATTRIBUTE l on vc.ATTRIBUTE_ID=l.id and filename like '%����%' \n" +
+                    "WHERE\n" +
+                    "\tvf.FLOW_NAME = '��ͬ��������' \n" +
+                    "\t AND str_to_date( REPLACE ( LEFT ( vf.ENDTIME, 10 ), '/', '-' ), '%Y-%m-%d' ) >= str_to_date( '"+lastMonthFirstDay+"', '%Y-%m-%d' ) \t\n" +
+                    "\tand vf.phasename in ('����','���')\n" +
+                    "\t) a  on t.project_id= a.proj_id\n" +
+                    "\tset t.contract_approve_dzq_time= a.INPUTTIME,t.contract_approve_end_time=a.ENDTIME\n" +
+                    "\tWHERE t.project_id = a.proj_id";
+
+            //��ͬ������ʱ�䡢��ͬ�������
+            String update5="update project_process_time t\n" +
+                    " JOIN(SELECT\n" +
+                    "  vf.proj_id,\n" +
+                    "\tmax(vf.ENDTIME)  ENDTIME,\n" +
+                    "\tcount(1) bgcs\n" +
+                    "FROM\n" +
+                    "\tVI_FLOW_MONITORING vf\n" +
+                    "WHERE\n" +
+                    "\tvf.FLOW_NAME = '��ͬ�������' \n" +
+                    "\tand vf.phasename in ('����','���')\n" +
+                    "\tgroup by vf.proj_id\n" +
+                    "\t) a  on t.project_id= a.proj_id\n" +
+                    "\tset t.contract_change_end_time= a.ENDTIME,t.contract_change_number=a.bgcs\n" +
+                    "\tWHERE t.project_id = a.proj_id ";
+
+            //�������������ύʱ�䡢������ύʱ��
+            String update6="update project_process_time t\n" +
+                    " JOIN(SELECT\n" +
+                    "  vf.proj_id,\n" +
+                    "\tfl.TJTIME,\n" +
+                    "\tvf.ENDTIME \n" +
+                    "FROM\n" +
+                    "\tVI_FLOW_MONITORING vf,(\n" +
+                    "\tSELECT\n" +
+                    "\t\tFLOWUNID,\n" +
+                    "\t\tmin( INPUTTIME ) TJTIME \n" +
+                    "\tFROM\n" +
+                    "\t\tFLOW_LOG \n" +
+                    "\tWHERE\n" +
+                    "\t\tlogcontent LIKE '%�ύ����%' \n" +
+                    "\tGROUP BY\n" +
+                    "\t\tFLOWUNID \n" +
+                    "\t) fl \n" +
+                    "WHERE\n" +
+                    "\tvf.FLOW_NAME = '��������(����)' \n" +
+                    "\t AND str_to_date( REPLACE ( LEFT ( vf.ENDTIME, 10 ), '/', '-' ), '%Y-%m-%d' ) >= str_to_date( '"+lastMonthFirstDay+"', '%Y-%m-%d' ) \t\n" +
+                    "\tAND vf.OBJECTNO = fl.FLOWUNID\n" +
+                    "\tand vf.phasename in ('����','���','ͨ��')\n" +
+                    "\t) a  on t.project_id= a.proj_id\n" +
+                    "\tset t.fund_payment_submit_time= a.TJTIME,t.fund_payment_end_time=a.ENDTIME\n" +
+                    "\tWHERE t.project_id = a.proj_id";
+
+            //������������˻�ʱ�� ���������ۼ��˻ش���
+            String update7="update project_process_time t\n" +
+                    " JOIN(SELECT\n" +
+                    "  vf.proj_id,\n" +
+                    "\tfl.TJTIME,\n" +
+                    "\tfl.thcs \n" +
+                    "FROM\n" +
+                    "\tVI_FLOW_MONITORING vf,(\n" +
+                    "\tSELECT\n" +
+                    "\t\tFLOWUNID,\n" +
+                    "\t\tmax( INPUTTIME ) TJTIME,\n" +
+                    "\t\tcount(1) thcs\n" +
+                    "\tFROM\n" +
+                    "\t\tFLOW_LOG \n" +
+                    "\tWHERE\n" +
+                    "\t\tlogcontent LIKE '%�˻�����%' \n" +
+                    "\tGROUP BY\n" +
+                    "\t\tFLOWUNID \n" +
+                    "\t) fl \n" +
+                    "WHERE\n" +
+                    "\tvf.FLOW_NAME = '��������(����)' \n" +
+                    "\t AND str_to_date( REPLACE ( LEFT ( vf.ENDTIME, 10 ), '/', '-' ), '%Y-%m-%d' ) >= str_to_date( '"+lastMonthFirstDay+"', '%Y-%m-%d' ) \t\n" +
+                    "\tAND vf.OBJECTNO = fl.FLOWUNID\n" +
+                    "\tand vf.phasename in ('����','���','ͨ��')\n" +
+                    "\t) a  on t.project_id= a.proj_id\n" +
+                    "\tset t.fund_payment_back_time= a.TJTIME,t.fund_payment_back_number=a.thcs\n" +
+                    "\tWHERE t.project_id = a.proj_id";
+
+            //ʵ�ʸ��������ύʱ��	���̳ɹ��ύʱ��
+            String update8="update project_process_time t\n" +
+                    " JOIN(SELECT\n" +
+                    "  lf.PROJECT_ID proj_id,\n" +
+                    "\tmin(fl.TJTIME) TJTIME,\n" +
+                    "\tmax(vf.ENDTIME) ENDTIME\n" +
+                    "FROM\n" +
+                    "\tVI_FLOW_MONITORING vf,(\n" +
+                    "\tSELECT\n" +
+                    "\t\tFLOWUNID,\n" +
+                    "\t\tmin( INPUTTIME ) TJTIME \n" +
+                    "\tFROM\n" +
+                    "\t\tFLOW_LOG \n" +
+                    "\tWHERE\n" +
+                    "\t\tlogcontent LIKE '%�ύ����%' \n" +
+                    "\tGROUP BY\n" +
+                    "\t\tFLOWUNID \n" +
+                    "\t) fl ,LC_FUND_INCOME_temp lft,LC_FUND_INCOME lf\n" +
+                    "WHERE\n" +
+                    "\tvf.FLOW_NAME = 'ʵ�ʸ�������(����)' \n" +
+                    "\t AND str_to_date( REPLACE ( LEFT ( vf.ENDTIME, 10 ), '/', '-' ), '%Y-%m-%d' ) >= str_to_date( '"+lastMonthFirstDay+"', '%Y-%m-%d' ) \t\n" +
+                    "\tAND vf.OBJECTNO = fl.FLOWUNID\n" +
+                    "\tand vf.OBJECTNO = lft.FLOWUNID\n" +
+                    "\tand lft.income_id=lf.id and lft.EBANK_STATUS='05' \n" +
+                    "\tand vf.phasename in ('����','���')\n" +
+                    "\tgroup by lf.PROJECT_ID\n" +
+                    "\t) a  on t.project_id= a.proj_id\n" +
+                    "\tset t.actual_payment_submit_time= a.TJTIME,t.actual_payment_end_time=a.ENDTIME\n" +
+                    "\tWHERE t.project_id = a.proj_id ";
+
+
+            Sqlca.executeSQL(new SqlObject(insertSql));
+            Sqlca.executeSQL(new SqlObject(update1));
+            Sqlca.executeSQL(new SqlObject(update2));
+            Sqlca.executeSQL(new SqlObject(update3));
+            Sqlca.executeSQL(new SqlObject(update4));
+            Sqlca.executeSQL(new SqlObject(update5));
+            Sqlca.executeSQL(new SqlObject(update6));
+            Sqlca.executeSQL(new SqlObject(update7));
+            Sqlca.executeSQL(new SqlObject(update8));
+            Sqlca.commit();
+        }catch(Exception e){
+            logger.error("<<<<<<<<<<<<<<<<<<<<<<���������������ύʱ�䱨������ProjectProcessTime����������>>>>>>>>>>>>>>>>>>>>>>>");
+            try {
+                Sqlca.rollback();
+            } catch (JBOException e1) {
+                e1.printStackTrace();
+            }
+            e.printStackTrace();
+        }finally {
+            if(Sqlca!=null) {
+                try {
+                    Sqlca.commit();
+                    Sqlca.disConnect();
+                } catch (JBOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * ������µĵ�һ�� ��ʽyyyy/MM/dd
+     * @return
+     */
+    public static String getLastMonthFirstDay(){
+        SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = new Date();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.DAY_OF_MONTH,1);
+        calendar.add(Calendar.MONTH, -1);
+        return dayFormat.format(calendar.getTime());
+    }
+    public static void main(String[] args){
+        SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy-MM-dd");
+        System.out.println("--"+dayFormat.format(new Date()).substring(0,7));
+
+        System.out.println("--"+getLastMonthFirstDay());
+    }
+}
diff --git a/报表/汽车类报表一/订单各环节提交时间报表.xml b/报表/汽车类报表一/订单各环节提交时间报表.xml
new file mode 100644
index 000000000..378754c63
--- /dev/null
+++ b/报表/汽车类报表一/订单各环节提交时间报表.xml
@@ -0,0 +1,616 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<TenwaReport>
+    <datasources>
+        <datasource>
+            <id>2c9023815726a036015726a496b00001</id>
+            <dataSourceName>eleasing_mysql</dataSourceName>
+            <dataSourceType>SPRING</dataSourceType>
+            <jndi>dataSourceJDBC</jndi>
+            <url></url>
+            <username></username>
+            <driverName></driverName>
+            <password></password>
+            <dialect>com.tenwa.report.query.dialect.MysqlDialect</dialect>
+            <dialectName>Mysql</dialectName>
+        </datasource>
+        <datasource>
+            <id>2c9c81b978433095017844cff87b0002</id>
+            <dataSourceName>clms_oracle</dataSourceName>
+            <dataSourceType>SPRING</dataSourceType>
+            <jndi>dataSourceJDBC</jndi>
+            <dialect>com.tenwa.report.query.dialect.OracleDialect</dialect>
+            <dialectName>Oracle</dialectName>
+        </datasource>
+    </datasources>
+    <reports>
+        <report>
+            <id>ff8080817dc7ced3017f8409331f013d</id>
+            <name>订单各个环节提交时间报表</name>
+            <enname>project_process_time</enname>
+            <code>REPORT_CODE_1647187669791</code>
+            <isActived>true</isActived>
+            <position>37</position>
+            <reportType>REPORT</reportType>
+            <parentReport>2c9c81b7685efbbc016931c675a50006</parentReport>
+            <children/>
+            <layouts>
+                <layout>ff8080817dc7ced3017f840a4ca7013f</layout>
+            </layouts>
+        </report>
+    </reports>
+    <tables>
+        <table>
+            <id>ff8080817dc7ced3017f840a13f0013e</id>
+            <name>订单各个环节提交时间报表</name>
+            <enname>project_process_time</enname>
+            <reportDataSource>2c9023815726a036015726a496b00001</reportDataSource>
+            <queryType>SIMPLESQL</queryType>
+            <sql>select * from project_process_time</sql>
+            <sqlParamValue></sqlParamValue>
+            <columns>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e500151</id>
+                    <name>subjectname</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>主体名称</label>
+                    <enLabel>subjectname</enLabel>
+                    <width>100</width>
+                    <position>0</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e500155</id>
+                    <name>provinces</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>省份</label>
+                    <enLabel>provinces</enLabel>
+                    <width>100</width>
+                    <position>1</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e500150</id>
+                    <name>distributor_name</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>经销商名称</label>
+                    <enLabel>distributor_name</enLabel>
+                    <width>100</width>
+                    <position>2</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e50014e</id>
+                    <name>project_no</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>申请编号</label>
+                    <enLabel>project_no</enLabel>
+                    <width>100</width>
+                    <position>3</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e4f0144</id>
+                    <name>specificname</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>产品名称</label>
+                    <enLabel>specificname</enLabel>
+                    <width>100</width>
+                    <position>4</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e500146</id>
+                    <name>car_type</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>车辆属性</label>
+                    <enLabel>car_type</enLabel>
+                    <width>100</width>
+                    <position>5</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e4f0140</id>
+                    <name>customer_name</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>承租人名称</label>
+                    <enLabel>customer_name</enLabel>
+                    <width>100</width>
+                    <position>6</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e500145</id>
+                    <name>business_apply_submit_time</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>业务申请时间</label>
+                    <enLabel>business_apply_submit_time</enLabel>
+                    <width>100</width>
+                    <position>7</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e4f0141</id>
+                    <name>business_apply_back_time</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>信审最后退回时间</label>
+                    <enLabel>business_apply_back_time</enLabel>
+                    <width>100</width>
+                    <position>8</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e500154</id>
+                    <name>business_apply_back_number</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>信审累计退回次数</label>
+                    <enLabel>business_apply_back_number</enLabel>
+                    <width>100</width>
+                    <position>9</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e500157</id>
+                    <name>business_apply_end_time</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>信审终审通过时间</label>
+                    <enLabel>business_apply_end_time</enLabel>
+                    <width>100</width>
+                    <position>10</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e50014a</id>
+                    <name>business_change_end_time</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>业务变更完成时间</label>
+                    <enLabel>business_change_end_time</enLabel>
+                    <width>100</width>
+                    <position>11</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e50014c</id>
+                    <name>business_change_number</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>业务变更次数</label>
+                    <enLabel>business_change_number</enLabel>
+                    <width>100</width>
+                    <position>12</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e500147</id>
+                    <name>contract_approve_dzq_time</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>合同签约完成时间（电子签）</label>
+                    <enLabel>contract_approve_dzq_time</enLabel>
+                    <width>100</width>
+                    <position>13</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e500156</id>
+                    <name>contract_approve_end_time</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>合同制作结束时间</label>
+                    <enLabel>contract_approve_end_time</enLabel>
+                    <width>100</width>
+                    <position>14</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e50014f</id>
+                    <name>contract_change_end_time</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>合同变更完成时间</label>
+                    <enLabel>contract_change_end_time</enLabel>
+                    <width>100</width>
+                    <position>15</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e50014b</id>
+                    <name>contract_change_number</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>合同变更次数</label>
+                    <enLabel>contract_change_number</enLabel>
+                    <width>100</width>
+                    <position>16</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e500148</id>
+                    <name>fund_payment_submit_time</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>渠道付款申请提交时间</label>
+                    <enLabel>fund_payment_submit_time</enLabel>
+                    <width>100</width>
+                    <position>17</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e500149</id>
+                    <name>fund_payment_back_time</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>付款申请最后退回时间</label>
+                    <enLabel>fund_payment_back_time</enLabel>
+                    <width>100</width>
+                    <position>18</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e500153</id>
+                    <name>fund_payment_back_number</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>付款申请累计退回次数</label>
+                    <enLabel>fund_payment_back_number</enLabel>
+                    <width>100</width>
+                    <position>19</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e500152</id>
+                    <name>fund_payment_end_time</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>付款复审提交时间</label>
+                    <enLabel>fund_payment_end_time</enLabel>
+                    <width>100</width>
+                    <position>20</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e4f0143</id>
+                    <name>actual_payment_submit_time</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>实际付款申请提交时间</label>
+                    <enLabel>actual_payment_submit_time</enLabel>
+                    <width>100</width>
+                    <position>21</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>ff8080817dc7ced3017f840b5e50014d</id>
+                    <name>actual_payment_end_time</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>回盘成功提交时间</label>
+                    <enLabel>actual_payment_end_time</enLabel>
+                    <width>100</width>
+                    <position>22</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+            </columns>
+            <controls/>
+            <searchs/>
+            <searchExpress></searchExpress>
+            <filters>
+                <filter>
+                    <id>ff8080817dc7ced3017f842941430158</id>
+                    <name>subjectname</name>
+                    <enname>subjectname</enname>
+                    <label>主体名称</label>
+                    <filterType>FILTER</filterType>
+                    <dbType>STRING</dbType>
+                    <htmlType>TEXT</htmlType>
+                    <position>0</position>
+                </filter>
+                <filter>
+                    <id>ff8080817dc7ced3017f8429b3a00159</id>
+                    <name>distributor_name</name>
+                    <enname>distributor_name</enname>
+                    <label>经销商名称</label>
+                    <filterType>FILTER</filterType>
+                    <dbType>STRING</dbType>
+                    <htmlType>TEXT</htmlType>
+                    <position>1</position>
+                </filter>
+                <filter>
+                    <id>ff8080817dc7ced3017f842dd93e015a</id>
+                    <name>specificname</name>
+                    <enname>specificname</enname>
+                    <label>产品名称</label>
+                    <filterType>FILTER</filterType>
+                    <dbType>STRING</dbType>
+                    <htmlType>TEXT</htmlType>
+                    <position>2</position>
+                </filter>
+                <filter>
+                    <id>ff8080817dc7ced3017f842fd44f015b</id>
+                    <name>business_apply_submit_time</name>
+                    <enname>business_apply_submit_time</enname>
+                    <label>业务申请时间</label>
+                    <filterType>FILTER</filterType>
+                    <dbType>DATE</dbType>
+                    <htmlType>DATERANGE</htmlType>
+                    <position>3</position>
+                </filter>
+                <filter>
+                    <id>ff8080817dc7ced3017f84305b75015c</id>
+                    <name>business_apply_end_time</name>
+                    <enname>business_apply_end_time</enname>
+                    <label>信审终审通过时间</label>
+                    <filterType>FILTER</filterType>
+                    <dbType>DATE</dbType>
+                    <htmlType>DATERANGE</htmlType>
+                    <position>4</position>
+                </filter>
+                <filter>
+                    <id>ff8080817dc7ced3017f84309857015d</id>
+                    <name>business_apply_back_number</name>
+                    <enname>business_apply_back_number</enname>
+                    <label>信审累计退回次数</label>
+                    <filterType>FILTER</filterType>
+                    <dbType>NUMBER</dbType>
+                    <htmlType>NUMBERRANGE</htmlType>
+                    <position>5</position>
+                </filter>
+                <filter>
+                    <id>ff8080817dc7ced3017f84316eb4015e</id>
+                    <name>fund_payment_end_time</name>
+                    <enname>fund_payment_end_time</enname>
+                    <label>付款复审提交时间</label>
+                    <filterType>FILTER</filterType>
+                    <dbType>DATE</dbType>
+                    <htmlType>DATERANGE</htmlType>
+                    <position>6</position>
+                </filter>
+                <filter>
+                    <id>ff8080817dc7ced3017f84316eb4015f</id>
+                    <name>fund_payment_back_number</name>
+                    <enname>fund_payment_back_number</enname>
+                    <label>付款申请累计退回次数</label>
+                    <filterType>FILTER</filterType>
+                    <dbType>NUMBER</dbType>
+                    <htmlType>NUMBERRANGE</htmlType>
+                    <position>7</position>
+                </filter>
+                <filter>
+                    <id>ff8080817dc7ced3017f84316eb40160</id>
+                    <name>business_change_number</name>
+                    <enname>business_change_number</enname>
+                    <label>业务变更次数</label>
+                    <filterType>FILTER</filterType>
+                    <dbType>NUMBER</dbType>
+                    <htmlType>NUMBERRANGE</htmlType>
+                    <position>8</position>
+                </filter>
+                <filter>
+                    <id>ff8080817dc7ced3017f843207680161</id>
+                    <name>contract_change_number</name>
+                    <enname>contract_change_number</enname>
+                    <label>合同变更次数</label>
+                    <filterType>FILTER</filterType>
+                    <dbType>NUMBER</dbType>
+                    <htmlType>NUMBERRANGE</htmlType>
+                    <position>9</position>
+                </filter>
+            </filters>
+            <filterExpress></filterExpress>
+            <pageSize>20</pageSize>
+            <showRowNumber>false</showRowNumber>
+            <showTotalTitle>false</showTotalTitle>
+            <isScale>false</isScale>
+            <isCache>false</isCache>
+            <isExcel>false</isExcel>
+        </table>
+    </tables>
+    <charts/>
+    <pages/>
+    <layouts>
+        <layout>
+            <id>ff8080817dc7ced3017f840a4ca7013f</id>
+            <divHeight>0</divHeight>
+            <divWidth>0</divWidth>
+            <position>0</position>
+            <contentId>TABLE#ff8080817dc7ced3017f840a13f0013e</contentId>
+            <report>ff8080817dc7ced3017f8409331f013d</report>
+            <contentType>TABLE</contentType>
+        </layout>
+    </layouts>
+</TenwaReport>

From c007b4e30abb53efb13267f55e2233a9541547b9 Mon Sep 17 00:00:00 2001
From: "zhanglei@ap-leasing.com.cn" <zhanglei@ap-leasing.com.cn>
Date: Mon, 21 Mar 2022 13:07:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=EF=BC=8C=E5=BD=93=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8F=AA=E5=89=A9=E4=B8=80=E4=BA=BA=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Common/WorkFlow/FlowSubmitDialog.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp
index dd6367e1c..262397018 100644
--- a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp
+++ b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp
@@ -219,9 +219,9 @@
 		    			}else{
 		    				actionSet.hide();
 		    			}*/
-		    			if(vUser.length==1){
+		    			/*if(vUser.length==1){
 		    				actionSet.hide();
-		    			}
+		    			}*/
 				    }
 			   }else{
 				   actionSet.html("");

From 89dd7199e20e67a99782f4ec211b7aea830d6140 Mon Sep 17 00:00:00 2001
From: maliang <maliang@ap-leasing.com.cn>
Date: Wed, 1 Jun 2022 10:57:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:2022=E5=B9=B4=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=AD=BE=E7=BA=A6=E7=9A=84=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E8=B0=83=E6=95=B4=E5=90=88=E5=90=8C=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0=E7=9A=84=E6=98=BE=E7=A4=BA=E9=A1=B5=E7=A0=81=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../util/MakeOneCodeAndContractModel.java     | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java b/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java
index 5353de626..06411a646 100644
--- a/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java
+++ b/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java
@@ -346,8 +346,8 @@ public class MakeOneCodeAndContractModel {
 			under10.addImage(img);
 		}
 
-		if(pages>10&&"02".equals(leasform)&&("���ó���ǩ".equals(docName)||"���ó���ǩ".equals(docName)
-				||"���ó�����ǩԼ".equals(docName)||"���ó�����ǩԼ".equals(docName))){
+		if(pages>10&&"02".equals(leasform)&&("���ó���ǩ".equals(docName)||"���ó���ǩ".equals(docName))){
+				//||"���ó�����ǩԼ".equals(docName)||"���ó�����ǩԼ".equals(docName))){
 			//�������ӵ�ˮӡ
 			PdfContentByte under5 = stamp.getUnderContent(5);
 			img.scaleAbsolute(180, 32);
@@ -365,23 +365,23 @@ public class MakeOneCodeAndContractModel {
 			under9.addImage(img);
 		}
 
-//        if(pages>7&&"02".equals(leasform)&&("���ó�����ǩԼ".equals(docName)||"���ó�����ǩԼ".equals(docName))){
-//            //�������ӵ�ˮӡ
-//            PdfContentByte under5 = stamp.getUnderContent(5);
-//            img.scaleAbsolute(180, 32);
-//            img.setAbsolutePosition(400, 800);
-//            under5.addImage(img);
-//
-//            PdfContentByte under7 = stamp.getUnderContent(6);
-//            img.scaleAbsolute(180, 32);
-//            img.setAbsolutePosition(400, 800);
-//            under7.addImage(img);
-//            //���֧����ˮӡ
-//            PdfContentByte under9 = stamp.getUnderContent(8);
-//            img.scaleAbsolute(180, 32);
-//            img.setAbsolutePosition(400, 800);
-//            under9.addImage(img);
-//        }
+        if(pages>6&&"02".equals(leasform)&&("���ó�����ǩԼ".equals(docName)||"���ó�����ǩԼ".equals(docName))){
+            //�������ӵ�ˮӡ
+            PdfContentByte under5 = stamp.getUnderContent(4);
+            img.scaleAbsolute(180, 32);
+            img.setAbsolutePosition(400, 800);
+            under5.addImage(img);
+
+            PdfContentByte under7 = stamp.getUnderContent(5);
+            img.scaleAbsolute(180, 32);
+            img.setAbsolutePosition(400, 800);
+            under7.addImage(img);
+            //���֧����ˮӡ
+            PdfContentByte under9 = stamp.getUnderContent(7);
+            img.scaleAbsolute(180, 32);
+            img.setAbsolutePosition(400, 800);
+            under9.addImage(img);
+        }
 		stamp.close();// �ر�
 		File tempfile = new File(InPdfFile);
 		//ɾ��ԭ�ļ�