diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
index 9c79f7c4d..c8a3b291b 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
@@ -82,6 +82,10 @@
doTemp.setDefaultValue("equip_type", sEquipType);
CurPage.getCurComp().setAttribute("RightType", null);
doTemp.setHtmlEvent("FRAME_NUMBER", "onChange", "checkFrameNumber");//校验车架号格式
+ doTemp.setHtmlEvent("FRAME_NUMBER2", "onChange", "checkFrameNumber2");//校验车架号格式
+ doTemp.setHtmlEvent("FRAME_NUMBER3", "onChange", "checkFrameNumber3");//校验车架号格式
+ doTemp.setHtmlEvent("FRAME_NUMBER4", "onChange", "checkFrameNumber4");//校验车架号格式
+
/* doTemp.setHtmlEvent("BRAND", "onChange", "selectCarType");
if((null!=RightType&& !RightType.equals("ReadOnly"))||(null!=ishistory&& !ishistory.equals("true"))){
doTemp.setColumnAttribute(doTemp.getColumnIndex("BRAND"), "COLUNIT", "");
@@ -214,7 +218,6 @@
setItemValue(0,getRow(),"zone","");
}else{
if(typeof(sAreaCodeInfo) != "undefined" && sAreaCodeInfo != ""){
- debugger;
sAreaCodeInfo = sAreaCodeInfo.split('@');
sAreaCodeValue = sAreaCodeInfo[0].substring(0,4);//-- 行政区划代码
sAreaCodeName = sAreaCodeInfo[1];//--行政区划名称
@@ -231,6 +234,18 @@
if(checkCarNumber()){
return;
}
+ if(!checkFrameNumber2()){
+ return;
+ }
+ if(!checkFrameNumber3()){
+ return;
+ }
+ if(!checkFrameNumber4()){
+ return;
+ }
+ if(!checkRepeat()){
+ return;
+ }
var sFlowUnid = "<%=sFlowUnid%>";
setItemValue(0,getRow(),"FlowUnid",sFlowUnid);//初始化流程编号
var framNum = getItemValue(0,getRow(0),"FRAME_NUMBER").length;
@@ -468,7 +483,106 @@
}
}
-
+
+ function checkFrameNumber2(){
+ var vin = getItemValue(0,getRow(0),"FRAME_NUMBER2");
+ if((typeof(vin) == "undefined" || vin == "")){
+ setErrorTips("FRAME_NUMBER2","");
+ return true;
+ }
+ var projectId = "<%=projectId%>";
+ var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","checkCarNumber","projectId="+projectId+",plate_number="+vin);
+ if("EROOR"==sResult){
+ setErrorTips("FRAME_NUMBER2","车架号已存在!");
+ return false;
+ }
+ if (!getCheckCode(vin)){
+ setErrorTips("FRAME_NUMBER2","车架号格式有误！");
+ return false;
+ }else{
+ setErrorTips("FRAME_NUMBER2","");
+ return true;
+ }
+
+ }
+ function checkFrameNumber3(){
+ var vin = getItemValue(0,getRow(0),"FRAME_NUMBER3");
+ if((typeof(vin) == "undefined" || vin == "")){
+ setErrorTips("FRAME_NUMBER3","");
+ return true;
+ }
+ var projectId = "<%=projectId%>";
+ var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","checkCarNumber","projectId="+projectId+",plate_number="+vin);
+ if("EROOR"==sResult){
+ setErrorTips("FRAME_NUMBER3","车架号已存在!");
+ return false;
+ }
+ if (!getCheckCode(vin)){
+ setErrorTips("FRAME_NUMBER3","车架号格式有误！");
+ return false;
+ }else{
+ setErrorTips("FRAME_NUMBER3","");
+ return true;
+ }
+
+ }
+ function checkFrameNumber4(){
+ var vin = getItemValue(0,getRow(0),"FRAME_NUMBER4");
+ if((typeof(vin) == "undefined" || vin == "")){
+ setErrorTips("FRAME_NUMBER4","");
+ return true;
+ }
+ var projectId = "<%=projectId%>";
+ var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","checkCarNumber","projectId="+projectId+",plate_number="+vin);
+ if("EROOR"==sResult){
+ setErrorTips("FRAME_NUMBER4","车架号已存在!");
+ return false;
+ }
+ if (!getCheckCode(vin)){
+ setErrorTips("FRAME_NUMBER4","车架号格式有误！");
+ return false;
+ }else{
+ setErrorTips("FRAME_NUMBER4","");
+ return true;
+ }
+
+ }
+ //校验重复
+ function checkRepeat(){
+ var vin = getItemValue(0,getRow(0),"FRAME_NUMBER");
+ var vin2 = getItemValue(0,getRow(0),"FRAME_NUMBER2");
+ var vin3 = getItemValue(0,getRow(0),"FRAME_NUMBER3");
+ var vin4 = getItemValue(0,getRow(0),"FRAME_NUMBER4");
+ if((typeof(vin) != "undefined" && vin != "")){
+ if( vin==vin2 ){
+ alert("车架号1和车架号2重复");
+ return false;
+ }else if( vin==vin3 ){
+ alert("车架号1和车架号3重复");
+ return false;
+ }else if( vin==vin4 ){
+ alert("车架号1和车架号4重复");
+ return false;
+ }
+ }
+ if((typeof(vin2) != "undefined" && vin2 != "")){
+ if( vin2==vin3 ){
+ alert("车架号2和车架号3重复");
+ return false;
+ }else if( vin2==vin4 ){
+ alert("车架号2和车架号4重复");
+ return false;
+ }
+ }
+ if((typeof(vin3) != "undefined" && vin3 != "")){
+ if( vin3==vin4 ){
+ alert("车架号3和车架号4重复");
+ return false;
+ }
+ }
+ return true;
+
+ }
<%/*~END~*/%>
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
index cde657581..d359a8b24 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
@@ -4437,6 +4437,9 @@
+
+
+
@@ -4546,6 +4549,9 @@
+
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
index 3a0ba8c08..212d1d122 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
@@ -812,7 +812,32 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 19f31bc42..091aa8e90 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -1445,6 +1445,9 @@
+
+
+
@@ -2012,6 +2015,9 @@
+
+
+
@@ -3519,6 +3525,9 @@
+
+
+
diff --git a/calc/com/tenwa/flow/BusinessApplyUserinfo.java b/calc/com/tenwa/flow/BusinessApplyUserinfo.java
new file mode 100644
index 000000000..65b1d3c26
--- /dev/null
+++ b/calc/com/tenwa/flow/BusinessApplyUserinfo.java
@@ -0,0 +1,57 @@
+package com.tenwa.flow;
+
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import jbo.com.tenwa.entity.comm.flow.BUSINESS_APPLY_USERINFO;
+import jbo.sys.FLOW_TASK;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+
+/*
+ * 业务申请初审信息记录
+ */
+public class BusinessApplyUserinfo extends BaseBussiness{
+
+ @Override
+ public Object run(Transaction Sqlca) throws Exception {
+ this.initBussinessParam(Sqlca);
+ String flowunid = this.getAttribute("ObjectNo").toString();
+ String ProjectId = this.getAttribute("ProjectId").toString();
+ String FlowName = this.getAttribute("FlowName").toString();
+ String FlowNo = this.getAttribute("ApplyType").toString();
+ BizObjectManager ftMange = JBOFactory.getBizObjectManager(FLOW_TASK.CLASS_NAME,Sqlca);
+ BizObject ft = ftMange.createQuery(" O.objectno=:flowunid AND begintime = (SELECT MAX(ft.begintime) FROM jbo.sys.FLOW_TASK ft WHERE O.objectno=ft.objectno AND ft.phaseno='0030') ").setParameter("flowunid", flowunid).getSingleResult(false);
+ String userId = ft==null?"":ft.getAttribute("userid").toString();
+ String userName = ft==null?"":ft.getAttribute("username").toString();
+ String begintime = ft==null?"":ft.getAttribute("begintime").toString();
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); //日期格式
+ String date = sdf.format(new Date()); //将系统时间转换成上方指定类型
+
+ BizObjectManager bauMange = JBOFactory.getBizObjectManager(BUSINESS_APPLY_USERINFO.CLASS_NAME,Sqlca);
+ BizObject bau = bauMange.createQuery(" flow_unid=:flow_unid and flow_phase_no='0030' ").setParameter("flow_unid", flowunid).getSingleResult(true);
+ if(bau == null){
+ bau = bauMange.newObject();
+ bau.setAttributeValue("userid", userId);
+ bau.setAttributeValue("username", userName);
+ bau.setAttributeValue("lb_project_id", ProjectId);
+ bau.setAttributeValue("flow_unid", flowunid);
+ bau.setAttributeValue("flow_name", FlowName);
+ bau.setAttributeValue("flow_phase_no", "0030");
+ bau.setAttributeValue("flow_no", FlowNo);
+ bau.setAttributeValue("inputtime", date);
+ }else{
+ bau.setAttributeValue("userid", userId);
+ bau.setAttributeValue("username", userName);
+ bau.setAttributeValue("updatetime", date);
+ }
+ bauMange.saveObject(bau);
+ return "true";
+ }
+}
diff --git a/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java b/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java
index f75918030..2906f35af 100644
--- a/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java
+++ b/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java
@@ -146,6 +146,18 @@ public interface LB_EQUIPMENT_CAR{
*/
public static final String FRAME_NUMBER = "FRAME_NUMBER";
/**
+ * 车架号2 STRING(100)
+ */
+ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2";
+ /**
+ * 车架号3 STRING(100)
+ */
+ public static final String FRAME_NUMBER3 = "FRAME_NUMBER3";
+ /**
+ * 车架号4 STRING(100)
+ */
+ public static final String FRAME_NUMBER4 = "FRAME_NUMBER4";
+ /**
* 发动机号 STRING(100)
*/
public static final String ENGINE_NUMBER = "ENGINE_NUMBER";
diff --git a/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java b/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java
index fc85cf345..d195a1e29 100644
--- a/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java
+++ b/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java
@@ -146,6 +146,18 @@ public interface LB_EQUIPMENT_CAR_TEMP{
*/
public static final String FRAME_NUMBER = "FRAME_NUMBER";
/**
+ * 车架号2 STRING(100)
+ */
+ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2";
+ /**
+ * 车架号3 STRING(100)
+ */
+ public static final String FRAME_NUMBER3 = "FRAME_NUMBER3";
+ /**
+ * 车架号4 STRING(100)
+ */
+ public static final String FRAME_NUMBER4 = "FRAME_NUMBER4";
+ /**
* 发动机号 STRING(100)
*/
public static final String ENGINE_NUMBER = "ENGINE_NUMBER";
diff --git a/src_jbo/jbo/com/tenwa/entity/comm/flow/BUSINESS_APPLY_USERINFO.java b/src_jbo/jbo/com/tenwa/entity/comm/flow/BUSINESS_APPLY_USERINFO.java
new file mode 100644
index 000000000..d5d46b68a
--- /dev/null
+++ b/src_jbo/jbo/com/tenwa/entity/comm/flow/BUSINESS_APPLY_USERINFO.java
@@ -0,0 +1,76 @@
+package jbo.com.tenwa.entity.comm.flow;
+
+import java.lang.String;
+
+/**
+* 业务审批记录表 - JBO命名常量类
+* Note: This file is generated by ADE tools, dont modify it.
+
+*/
+public interface BUSINESS_APPLY_USERINFO{
+ /**
+ * 业务审批记录表
+ * 代表本类映射的BizObjectClass
+ */
+ public static final String CLASS_NAME = "jbo.com.tenwa.entity.comm.flow.BUSINESS_APPLY_USERINFO";
+ /**
+ * 唯一标识 STRING(32)
+ */
+ public static final String id = "id";
+ /**
+ * 用户id STRING(32)
+ */
+ public static final String userid = "userid";
+ /**
+ * 用户名称 STRING(50)
+ */
+ public static final String username = "username";
+ /**
+ * 项目id STRING(32)
+ */
+ public static final String lb_project_id = "lb_project_id";
+ /**
+ * 合同id STRING(32)
+ */
+ public static final String lb_contract_id = "lb_contract_id";
+ /**
+ * 流程id STRING(32)
+ */
+ public static final String flow_unid = "flow_unid";
+ /**
+ * 流程名称 STRING(100)
+ */
+ public static final String flow_name = "flow_name";
+ /**
+ * 流程节点 STRING(20)
+ */
+ public static final String flow_phase_no = "flow_phase_no";
+ /**
+ * 流程节点 STRING(20)
+ */
+ public static final String flow_no = "flow_no";
+ /**
+ * 备注 STRING(100)
+ */
+ public static final String remarks = "remarks";
+ /**
+ * 备用 STRING(100)
+ */
+ public static final String standby = "standby";
+ /**
+ * 登记时间 STRING(100)
+ */
+ public static final String inputtime = "inputtime";
+ /**
+ * 更新人 STRING(100)
+ */
+ public static final String updateuserid = "updateuserid";
+ /**
+ * 更新部门 STRING(100)
+ */
+ public static final String updateorgid = "updateorgid";
+ /**
+ * 更新时间 STRING(100)
+ */
+ public static final String updatetime = "updatetime";
+}
\ No newline at end of file
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java
index 5f81ac464..098b2cf26 100644
--- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java
+++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java
@@ -142,6 +142,18 @@ public interface LB_EQUIPMENT_CAR{
*/
public static final String FRAME_NUMBER = "FRAME_NUMBER";
/**
+ * 车架号2 STRING(100)
+ */
+ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2";
+ /**
+ * 车架号3 STRING(100)
+ */
+ public static final String FRAME_NUMBER3 = "FRAME_NUMBER3";
+ /**
+ * 车架号4 STRING(100)
+ */
+ public static final String FRAME_NUMBER4 = "FRAME_NUMBER4";
+ /**
* 发动机号 STRING(100)
*/
public static final String ENGINE_NUMBER = "ENGINE_NUMBER";
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java
index 361c63c89..d6ec4a4b0 100644
--- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java
+++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java
@@ -146,6 +146,18 @@ public interface LB_EQUIPMENT_CAR_HIS{
*/
public static final String FRAME_NUMBER = "FRAME_NUMBER";
/**
+ * 车架号2 STRING(100)
+ */
+ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2";
+ /**
+ * 车架号3 STRING(100)
+ */
+ public static final String FRAME_NUMBER3 = "FRAME_NUMBER3";
+ /**
+ * 车架号4 STRING(100)
+ */
+ public static final String FRAME_NUMBER4 = "FRAME_NUMBER4";
+ /**
* 发动机号 STRING(100)
*/
public static final String ENGINE_NUMBER = "ENGINE_NUMBER";
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java
index 19378a5ca..e05f7aa5a 100644
--- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java
+++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java
@@ -146,6 +146,18 @@ public interface LB_EQUIPMENT_CAR_TEMP{
*/
public static final String FRAME_NUMBER = "FRAME_NUMBER";
/**
+ * 车架号2 STRING(100)
+ */
+ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2";
+ /**
+ * 车架号3 STRING(100)
+ */
+ public static final String FRAME_NUMBER3 = "FRAME_NUMBER3";
+ /**
+ * 车架号4 STRING(100)
+ */
+ public static final String FRAME_NUMBER4 = "FRAME_NUMBER4";
+ /**
* 发动机号 STRING(100)
*/
public static final String ENGINE_NUMBER = "ENGINE_NUMBER";
diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql
new file mode 100644
index 000000000..de372cf4b
--- /dev/null
+++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql
@@ -0,0 +1,39 @@
+-- 在租赁物表中添加车架号字段
+ALTER TABLE lb_equipment_car ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3;
+ALTER TABLE lb_equipment_car_temp ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3;
+ALTER TABLE lb_equipment_car_his ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3;
+
+-- 创建业务申请初审记录表
+CREATE TABLE Business_Apply_userinfo (
+ id VARCHAR(32) NOT NULL COMMENT '唯一标识',
+ userid VARCHAR(32) DEFAULT NULL COMMENT '用户id',
+ username VARCHAR(50) DEFAULT NULL COMMENT '用户名称',
+ lb_project_id VARCHAR(32) DEFAULT NULL COMMENT '项目id',
+ flow_unid VARCHAR(32) DEFAULT NULL COMMENT '流程id',
+ flow_name VARCHAR(100) DEFAULT NULL COMMENT '流程名称',
+ flow_phase_no VARCHAR(20) DEFAULT NULL COMMENT '流程节点',
+ remarks VARCHAR(100) DEFAULT NULL COMMENT '备注',
+ standby VARCHAR(100) DEFAULT NULL COMMENT '备用',
+ inputtime VARCHAR(100) DEFAULT NULL COMMENT '登记时间',
+ updateuserid VARCHAR(100) DEFAULT NULL COMMENT '更新人',
+ updateorgid VARCHAR(100) DEFAULT NULL COMMENT '更新部门',
+ updatetime VARCHAR(100) DEFAULT NULL COMMENT '更新时间',
+ PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=gbk;
+
+-- 添加方法
+insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('审批流程','记录业务申请初审信息','Bizlet','记录业务申请初审信息','String','String ObjectNo','com.tenwa.flow.BusinessApplyUserinfo','','','','','','');
+
+-- 在业务申请添加处理人信息
+delete from FLOW_MODEL where FlowNo='BusinessApplyFlow' AND PhaseNo='0040';
+insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('BusinessApplyFlow','0040','1020','信审复审',NULL,NULL,'!审批流程.记录业务申请初审信息(#ObjectNo)','toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'selectroute',NULL,'[{usertype:\"根据SQL语句\",userinfo:\"SELECT O.userid, O.username FROM USER_INFO O WHERE O.UserID IN (SELECT CASE WHEN ft.userid = \'8009011U00000003\' OR ft.userid = \'8009011U00000004\' OR ft.userid = \'800901U00000003\' THEN \'800U00090004\' WHEN ft.userid = \'8009011U00000005\' OR ft.userid = \'8009011U00000006\' OR ft.userid = \'8009011U00000007\' THEN \'8009011U00000002\' ELSE \'800U00090004\' END FROM flow_task ft WHERE ft.phaseno = \'0030\' AND ft.taskstate=0 AND ft.OBJECTNO =:{ObjectNo})\"}]','#PhaseOpinion1','closePage,doSubmit,backStep,signOpinion,circulate',NULL,'all_except','BusinessApplyFlow',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'262','556','100','50','1',NULL,'TASK',NULL,'Y','N',NULL,'TreeView.moveTreeItem(\"租赁车辆基本信息\", \"商务条件\");\r\nTreeView.moveTreeItemToLast(\"资料清单\");\r\nTreeView.addFirstNodeByCode(\"11541\");\r\nMap paramMap=new HashMap();\r\nparamMap.put(\"calType\", \"proj_process\");\r\nTreeView.AddNodeUrlParamByNode(\"11060\", paramMap);\r\nTreeView.addBeforeNodeByCode(\"租赁车辆基本信息\", \"11042\");\r\nif(!\"401\".equals(fixedParam.get(\"RoleId\"))){\r\nif(\"used_car\".equals(fixedParam.get(\"carAttributes\"))){\r\nTreeView.addLastNodeByCode(\"11620\");\r\n}\r\nTreeView.addLastNodeByCode(\"11640\");\r\nTreeView.addLastNodeByCode(\"900001\");\r\nTreeView.addLastNodeByCode(\"900002\");\r\nTreeView.addLastNodeByCode(\"11630\");\r\nTreeView.addLastNodeByCode(\"11645\");\r\nTreeView.addLastNodeByCode(\"01301\");\r\n}\r\nTreeView.updateNodeSetReadOnly(\"商务条件\", \"ReadOnly\");\r\nTreeView.updateNodeSetReadOnly(\"租赁车辆基本信息\", \"ReadOnly\");\r\nif(\"BAIC_MOTOR\".equals(fixedParam.get(\"operationType\"))){\r\nTreeView.addFirstNodeByCode(\"21000\");\r\nTreeView.addChildrenNodeByCode(\"北汽财务意见\", \"21100\");\r\n}\r\nTreeView.updateNodeSetReadOnly(\"北汽财务意见\", \"ReadOnly\");\r\nTreeView.addBeforeNodeByCode(\"经销商信息\", \"00160\");','TreeView.deleteCheckItemByCode(\"0039\");\r\nTreeView.deleteCheckItemByCode(\"0034\");\r\nTreeView.deleteCheckItemByCode(\"0031\");\r\nTreeView.deleteCheckItemByCode(\"0032\");\rTreeView.deleteCheckItemByCode(\"0283\");','backnextstep',NULL,NULL,NULL,NULL,'Y','[{stepno:\"否决(8000)\",stepcondition:\"提交给否决\"},{stepno:\"结束(1000)\",stepcondition:\"提交给结束\"}]',NULL,NULL,NULL,NULL,NULL);
+delete from FLOW_MODEL where FlowNo='BusinessApplyFlow' AND PhaseNo='0050';
+insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('BusinessApplyFlow','0050','1020','信审复审',NULL,NULL,'!审批流程.记录业务申请初审信息(#ObjectNo)','toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'commroute',NULL,'[{usertype:\"根据SQL语句\",userinfo:\"SELECT O.userid, O.username FROM USER_INFO O WHERE O.UserID IN (SELECT CASE WHEN ft.userid = \'8009011U00000003\' OR ft.userid = \'8009011U00000004\' OR ft.userid = \'800901U00000003\' THEN \'800U00090004\' WHEN ft.userid = \'8009011U00000005\' OR ft.userid = \'8009011U00000006\' OR ft.userid = \'8009011U00000007\' THEN \'8009011U00000002\' ELSE \'800U00090004\' END FROM flow_task ft WHERE ft.phaseno = \'0030\' AND ft.taskstate=0 AND ft.OBJECTNO =:{ObjectNo})\"}]','#PhaseOpinion1','closePage,doSubmit,backStep,signOpinion',NULL,'all_except','BusinessApplyFlow',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'597','550','100','50','1',NULL,'TASK',NULL,'Y','N',NULL,'TreeView.moveTreeItem(\"租赁车辆基本信息\", \"商务条件\");\r\nTreeView.moveTreeItemToLast(\"资料清单\");\r\nTreeView.addFirstNodeByCode(\"11541\");\r\nMap paramMap=new HashMap();\r\nparamMap.put(\"calType\", \"proj_process\");\r\nTreeView.AddNodeUrlParamByNode(\"11060\", paramMap);\r\nTreeView.addBeforeNodeByCode(\"租赁车辆基本信息\", \"11042\");\r\nif(!\"401\".equals(fixedParam.get(\"RoleId\"))){\r\nif(\"used_car\".equals(fixedParam.get(\"carAttributes\"))){\r\nTreeView.addLastNodeByCode(\"11620\");\r\n}\r\nTreeView.addLastNodeByCode(\"11640\");\r\nTreeView.addLastNodeByCode(\"900001\");\r\nTreeView.addLastNodeByCode(\"900002\");\r\nTreeView.addLastNodeByCode(\"11630\");\r\nTreeView.addLastNodeByCode(\"11645\");\r\nTreeView.addLastNodeByCode(\"01301\");\r\n}\r\nTreeView.updateNodeSetReadOnly(\"商务条件\", \"ReadOnly\");\r\nTreeView.updateNodeSetReadOnly(\"租赁车辆基本信息\", \"ReadOnly\");\r\nif(\"BAIC_MOTOR\".equals(fixedParam.get(\"operationType\"))){\r\nTreeView.addFirstNodeByCode(\"21000\");\r\nTreeView.addChildrenNodeByCode(\"北汽财务意见\", \"21100\");\r\n}\r\nTreeView.updateNodeSetReadOnly(\"北汽财务意见\", \"ReadOnly\");\r\nTreeView.addBeforeNodeByCode(\"经销商信息\", \"00160\");','TreeView.deleteCheckItemByCode(\"0039\");\r\nTreeView.deleteCheckItemByCode(\"0034\");\r\nTreeView.deleteCheckItemByCode(\"0031\");\r\nTreeView.deleteCheckItemByCode(\"0032\");\rTreeView.deleteCheckItemByCode(\"0283\");','backnextstep',NULL,NULL,NULL,NULL,'Y','信审负责人(0060)',NULL,NULL,NULL,NULL,NULL);
+-- 修改业务变更处理人
+delete from FLOW_MODEL where FlowNo='BusinessChangeFlow' AND PhaseNo='0030';
+insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('BusinessChangeFlow','0030','1020','信审专员初审',NULL,NULL,'!基础操作.接口平台业务变更流程租金测算(#ObjectNo)','toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'conditionroute',NULL,'[{usertype:\"根据SQL语句\",userinfo:\"SELECT userid,username FROM business_apply_userinfo O WHERE O.lb_project_id =(SELECT fbo.proj_id FROM flow_bussiness_object fbo WHERE fbo.flow_unid=:{ObjectNo}) \"}]','#PhaseOpinion1','closePage,doSubmit,backStep,signOpinion',NULL,'all_except','BusinessChangeFlow',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'406','402','100','50','1',NULL,'TASK',NULL,'Y','N',NULL,'TreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.moveTreeItem(\"租赁车辆基本信息\", \"商务条件\");\r\nTreeView.moveTreeItemToLast(\"资料清单\");\r\nMap paramMap=new HashMap();\r\nparamMap.put(\"calType\", \"proj_process\");\r\nTreeView.AddNodeUrlParamByNode(\"11060\", paramMap);\r\nTreeView.addBeforeNodeByCode(\"租赁车辆基本信息\", \"11042\");\r\nif(!\"401\".equals(fixedParam.get(\"RoleId\"))){\r\nif(\"used_car\".equals(fixedParam.get(\"carAttributes\"))){\r\nTreeView.addLastNodeByCode(\"11620\");\r\n}\r\nTreeView.addFirstNodeByCode(\"11541\");\r\nTreeView.addLastNodeByCode(\"900001\");\r\nTreeView.addLastNodeByCode(\"900002\");\r\nTreeView.addLastNodeByCode(\"11640\");\r\nTreeView.addLastNodeByCode(\"11630\");\r\nTreeView.addLastNodeByCode(\"11645\");\r\nTreeView.addLastNodeByCode(\"01301\");\r\nTreeView.addLastNodeByCode(\"11800\");\r\n};\r\nif(\"BAIC_MOTOR\".equals(fixedParam.get(\"operationType\"))){\r\nTreeView.addFirstNodeByCode(\"21000\");\r\nTreeView.addChildrenNodeByCode(\"北汽财务意见\", \"21100\");\r\n}\r\nTreeView.updateNodeSetReadOnly(\"北汽财务意见\", \"ReadOnly\");\r\nTreeView.addBeforeNodeByCode(\"经销商信息\", \"00160\");','TreeView.deleteCheckItemByCode(\"0015\");\r\nTreeView.deleteCheckItemByCode(\"0034\");\r\nTreeView.deleteCheckItemByCode(\"0283\");','backnextstep',NULL,'!基础操作.接口平台业务退回审批意见推送入表(#ObjectNo)',NULL,NULL,'Y','[{stepno:\"信审经理终审(0040)\",stepcondition:\"!基础操作.判断业务申请融资额小于20万(#ObjectNo)\"},{stepno:\"信审经理终审(0050)\",stepcondition:\"!基础操作.判断业务申请融资额大于20万(#ObjectNo)\"}]',NULL,NULL,NULL,NULL,NULL);
+
+
+
+
+
diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404sql
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
index b1516c422..33c0cafc8 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
@@ -229,8 +229,8 @@ public class BusinessApproveManager {
public String checkCarNumber(JBOTransaction tx) throws Exception{
BizObjectManager lecManger = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR.CLASS_NAME, tx);
BizObject lec = lecManger.createQuery("select O.id from O left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci on O.contract_id=lci.id "
- + " where O.FRAME_NUMBER=:prameNumber and project_id<>:projectid and lci.contract_status BETWEEN 21 AND 103")
- .setParameter("prameNumber", plate_number).setParameter("projectid", projectId).getSingleResult(false);
+ + " where ( O.FRAME_NUMBER=:prameNumber or O.FRAME_NUMBER2=:prameNumber2 or O.FRAME_NUMBER3=:prameNumber3 or O.FRAME_NUMBER4=:prameNumber4 ) and project_id<>:projectid and lci.contract_status BETWEEN 21 AND 103")
+ .setParameter("prameNumber", plate_number).setParameter("prameNumber2", plate_number).setParameter("prameNumber3", plate_number).setParameter("prameNumber4", plate_number).setParameter("projectid", projectId).getSingleResult(false);
if(lec !=null){
/*if(lec.getAttribute("ID").getString().equals(phaseNo)){
return "SUCCESS";