anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改狮桥、联合租赁合同模板。租赁物添加牵引和挂车标识

Browse Source
This commit is contained in:
tangfutang 2020-09-24 19:40:29 +08:00
parent fc256b67fb
commit 53b219a904
16 changed files with 161 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
View File

@ -193,6 +193,12 @@
$("#FRAME_NUMBER").css("color","red");
} */
}
var carAttribute = getItemValue(0,0,"car_attribute");
if("head" != carAttribute){
setItemRequired(0,"FRAME_NUMBER",false);
setItemRequired(0,"CAR_COLOUR",false);
setItemRequired(0,"ENGINE_NUMBER",false);
}
<%--hideFrame("<%=vehiclelevel%>");--%>
});
@ -281,6 +287,12 @@
if(framNum != "0" && checkFrameNumber()==false){
return;
}
var id = getItemValue(0,0,"ID");
var projectId = "<%=projectId%>";
if(typeof(id) == "undefined" || id.length == 0){
setItemValue(0,0,"car_attribute","tail");//设置车辆属性
setItemValue(0,0,"project_id",projectId);//设置项目id
}
var ApplyType = "<%=ApplyType%>";
if(plate_number!=null&&plate_number!=""){

5
WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp
View File

@ -217,6 +217,11 @@ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.
/*~[Describe=ɾ³ý¼Ç¼;InputParam=ÎÞ;OutPutParam=ÎÞ;]~*/
function deleteRecord(){
var carAttribute = getItemValue(0,getRow(),"car_attribute");
if(carAttribute=="head"){
alert("牵引车不允许删除！");
return ;
}
var ID = getItemValue(0,getRow(),"ID");
if(typeof(ID) == "undefined" || ID.length == 0 )
{

3
WebContent/WEB-INF/etc/jbo/jbo_app.xml
View File

@ -4511,7 +4511,7 @@
<attribute name="frame_regdate" label="挂车上牌时间" type="STRING" length="32"/>
<attribute name="frame_guided_price" label="挂车指导价" type="STRING" length="32"/>
<attribute name="identify_code" label="狮桥车辆标识" type="STRING" length="50"/>
<attribute name="car_attribute" label="车辆属性" type="STRING" length="30"/>
</attributes>
<manager>
<managerProperties>
@ -4628,6 +4628,7 @@
<attribute name="frame_regdate" label="挂车上牌时间" type="STRING" length="32"/>
<attribute name="frame_guided_price" label="挂车指导价" type="STRING" length="32"/>
<attribute name="identify_code" label="狮桥车辆标识" type="STRING" length="50"/>
<attribute name="car_attribute" label="车辆属性" type="STRING" length="30"/>
</attributes>
<manager>
<managerProperties>

3
WebContent/WEB-INF/etc/jbo/jbo_lease.xml
View File

@ -1489,6 +1489,7 @@
<attribute name="frame_regdate" label="挂车上牌时间" type="STRING" length="32"/>
<attribute name="frame_guided_price" label="挂车指导价" type="STRING" length="32"/>
<attribute name="identify_code" label="狮桥车辆标识" type="STRING" length="50"/>
<attribute name="car_attribute" label="车辆属性" type="STRING" length="30"/>
</attributes>
<manager>
<managerProperties>
@ -2064,6 +2065,7 @@
<attribute name="frame_regdate" label="挂车上牌时间" type="STRING" length="32"/>
<attribute name="frame_guided_price" label="挂车指导价" type="STRING" length="32"/>
<attribute name="identify_code" label="狮桥车辆标识" type="STRING" length="50"/>
<attribute name="car_attribute" label="车辆属性" type="STRING" length="30"/>
</attributes>
<manager>
<managerProperties>
@ -3615,6 +3617,7 @@
<attribute name="frame_regdate" label="挂车上牌时间" type="STRING" length="32"/>
<attribute name="frame_guided_price" label="挂车指导价" type="STRING" length="32"/>
<attribute name="identify_code" label="狮桥车辆标识" type="STRING" length="50"/>
<attribute name="car_attribute" label="车辆属性" type="STRING" length="30"/>
</attributes>
<manager>
<managerProperties>

BIN
WebContent/fileTemplate/联合租赁——融资租赁合同-修订版-20200806.docx
View File

Binary file not shown.

18
src/com/amarsoft/dict/als/manage/DataConversionManage.java Normal file
View File

@ -0,0 +1,18 @@
package com.amarsoft.dict.als.manage;
import java.text.SimpleDateFormat;
import java.util.Date;
public class DataConversionManage {
public static String getTime(String seconds) throws Exception {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String time = "";
if(seconds!=null && seconds.matches("[0-9]+")){
time = sdf.format(new Date(Long.valueOf(seconds)));
}
return time;
}
}

2
src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
View File

@ -265,7 +265,7 @@ public class FileTemplateUtil {
public String CheckCar(JBOTransaction tx) throws Exception{
String message = "";
BizObjectManager lrct = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR_TEMP.CLASS_NAME);
BizObject lrc = lrct.createQuery("FLOWUNID=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
BizObject lrc = lrct.createQuery("FLOWUNID=:flowunid and car_attribute='head' ").setParameter("flowunid", flowunid).getSingleResult(false);
if(lrc!= null){
int length = lrc.getAttribute("FRAME_NUMBER").toString().length();
if(lrc.getAttribute("FRAME_NUMBER").toString().length()==0){

36
src/com/tenwa/app/manage/util/ContractSignActionTwoUtil.java
View File

@ -217,6 +217,16 @@ public class ContractSignActionTwoUtil {
personalStamper3.setOffsetX(-0.01);
personalStamper3.setOffsetY(-0.006);
stampers.add(personalStamper3);
//添加一个签署时间
Stamper personalStamper4 = new Stamper();
personalStamper4.setPage(0);
personalStamper4.setType("TIMESTAMP");
personalStamper4.setSignatoryId(personalSignatoryId);
personalStamper4.setDocumentId(documentId);
personalStamper4.setKeyword("租赁物已于");
personalStamper4.setOffsetX(0.025);
personalStamper4.setOffsetY(-0.006);
stampers.add(personalStamper4);
}else{
personalStamper.setKeyword("承租人（签字/盖章）：");
//personalStamper.setOffsetX(0.6);
@ -227,7 +237,7 @@ public class ContractSignActionTwoUtil {
if(contractName.indexOf("狮桥") > -1){
personalStamper.setKeyword("乙方（承租人）：");
personalStamper.setOffsetX(-0.05);
personalStamper.setOffsetY(-0.065);
personalStamper.setOffsetY(-0.075);
//共同申请人添加第二个签字位置
Stamper personalStamper2 = new Stamper();
personalStamper2.setPage(0);
@ -316,10 +326,34 @@ public class ContractSignActionTwoUtil {
sealStamper2.setOffsetX(-0.13);
sealStamper2.setOffsetY(-0.04);
stampers.add(sealStamper2);
//添加一个公司盖章时间
Stamper sealStamper3 = new Stamper();
sealStamper3.setPage(0);
sealStamper3.setType("TIMESTAMP");
sealStamper3.setActionId(companySealActionId);
sealStamper3.setSignatoryId(platformSignatoryId);
sealStamper3.setDocumentId(documentId);
sealStamper3.setKeyword("签署日期：");
//sealStamper3.setOffsetX(-0.13);
sealStamper3.setOffsetY(-0.006);
stampers.add(sealStamper3);
}else{
sealStamper.setKeyword("出租人2（盖章）");
sealStamper.setOffsetX(-0.08);
sealStamper.setOffsetY(-0.06);
//添加第二个盖章位置
Stamper sealStamper2 = new Stamper();
sealStamper2.setPage(0);
sealStamper2.setType("COMPANY");
sealStamper2.setActionId(companySealActionId);
sealStamper2.setSignatoryId(platformSignatoryId);
sealStamper2.setDocumentId(documentId);
sealStamper2.setKeyword("本合同一式三份，交抵押登记机关一份");
sealStamper2.setOffsetX(-0.18);
sealStamper2.setOffsetY(-0.10);
stampers.add(sealStamper2);
}
stampers.add(sealStamper);
} else {

4
src_jbo/jbo/app/LB_EQUIPMENT_CAR.java
View File

@ -445,4 +445,8 @@ public interface LB_EQUIPMENT_CAR{
* ʨÇųµÁ¾±êÊ STRING(50)<br>
*/
public static final String identify_code = "identify_code";
/**
* 车辆属性 STRING(30)<br>
*/
public static final String car_attribute = "car_attribute";
}

4
src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java
View File

@ -433,4 +433,8 @@ public interface LB_EQUIPMENT_CAR_TEMP{
* ʨÇųµÁ¾±êÊ STRING(50)<br>
*/
public static final String identify_code = "identify_code";
/**
* 车辆属性 STRING(30)<br>
*/
public static final String car_attribute = "car_attribute";
}

4
src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java
View File

@ -301,4 +301,8 @@ public interface LB_EQUIPMENT_CAR{
* ʨÇųµÁ¾±êÊ STRING(50)<br>
*/
public static final String identify_code = "identify_code";
/**
* 车辆属性 STRING(30)<br>
*/
public static final String car_attribute = "car_attribute";
}

4
src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java
View File

@ -297,4 +297,8 @@ public interface LB_EQUIPMENT_CAR_HIS{
* ʨÇųµÁ¾±êÊ STRING(50)<br>
*/
public static final String identify_code = "identify_code";
/**
* 车辆属性 STRING(30)<br>
*/
public static final String car_attribute = "car_attribute";
}

4
src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java
View File

@ -433,4 +433,8 @@ public interface LB_EQUIPMENT_CAR_TEMP{
* ʨÇųµÁ¾±êÊ STRING(50)<br>
*/
public static final String identify_code = "identify_code";
/**
* 车辆属性 STRING(30)<br>
*/
public static final String car_attribute = "car_attribute";
}

67
src_sql/投产SQL/v20200915/tft_20200915.sql
View File

@ -337,19 +337,16 @@ delete from BF_LABLECONFIG where id='975294b526544d83b806e3fc2f99cd16';
insert into `BF_LABLECONFIG` (`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) values('975294b526544d83b806e3fc2f99cd16','00010','customer_info','C端回租','tag_type2','value_type3','CONTRACT_NO,BRAND,MODEL,VNDR_NAME,CAR_COLOUR,FRAME_NUMBER,ENGINE_NUMBER,FULLNAME,CERTID,mobile,fulladdress','SELECT \r\n lcit.CONTRACT_NO CONTRACT_NO,\r\n lect.BRAND BRAND,\r\n lect.MODEL MODEL,\r\n lect.VNDR_NAME VNDR_NAME,\r\n lect.CAR_COLOUR CAR_COLOUR,\r\n lect.FRAME_NUMBER FRAME_NUMBER,\r\n lect.ENGINE_NUMBER ENGINE_NUMBER,\r\n lult.CUSTOMER_NAME FULLNAME,\r\n :{certid} CERTID,\r\n :{mobile} mobile,\r\n :{address} fulladdress\r\nFROM\r\n LB_CONTRACT_INFO_TEMP lcit \r\n LEFT JOIN lb_union_lessee_temp lult \r\n ON lcit.FlowUnid = lult.flowunid \r\n LEFT JOIN LB_EQUIPMENT_CAR_TEMP lect \r\n ON lcit.flowunid = lect.FLOWUNID \r\nWHERE lcit.FlowUnid =:{FLOW_UNID} order by lect.inputtime limit 0,1',NULL,'N',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'word_default_class');
-- 添加导出配置
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('03bfe750baf44391bd5db998456e4739','42223908127047f8ab57142dbb8d97a0','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('05d78a6c3dca4bf29e87f3eb18e5b09b','3eca9a300ba543eea8b6092a59d32e76','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('17ceb1904ad2440ab22004be904d3fee','bbe36e81f17542078489f223239e658a','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('20c694a539774d94b9ab692052185625','484815c4a7a14cf6bdbf69939e5b060e','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('62370924fef541259d7f10d8f9c3c322','975294b526544d83b806e3fc2f99cd16','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('752b439202894cf49aa73f2db293439e','9ba1a7844e4447fe9cb115323a37736f','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('f43c4d48ca2343f093900af881ba9a90','87e832695708478ead2acd3bcdb7a9a9','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('f5d8d2ba671e4e42a2f5e3937a3c8080','755698c1c27a43efa6c23310757c6163','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('f91300589f994439be7b8bee05906540','ced1455267d64183ba1b270a9eda6089','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
-- ´¦Àí¹Ò³µÀúÊ·Êý¾Ý
insert into LB_EQUIPMENT_CAR_TEMP(id,project_id,contract_id,BRAND,FRAME_NUMBER,CAR_COLOUR,flowunid,INPUTTIME,NOW_TOTAL) (select REPLACE(UUID(),'-',''),project_id,contract_id,FRAME_BRAND,FRAME_NUMBER2,FRAME_COLOR,flowunid,DATE_FORMAT (CURDATE(),'%Y/%m/%d'),0.00 from LB_EQUIPMENT_CAR_TEMP where FRAME_NUMBER2 is not null or FRAME_BRAND is not null or FRAME_COLOR is not null);
insert into LB_EQUIPMENT_CAR(id,project_id,contract_id,BRAND,FRAME_NUMBER,CAR_COLOUR,INPUTTIME,NOW_TOTAL) (select REPLACE(UUID(),'-',''),project_id,contract_id,FRAME_BRAND,FRAME_NUMBER2,FRAME_COLOR,DATE_FORMAT (CURDATE(),'%Y/%m/%d'),0.00 from LB_EQUIPMENT_CAR where FRAME_NUMBER2 is not null or FRAME_BRAND is not null or FRAME_COLOR is not null);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('13221d9b6ffd4c30a1bfe5b584895955','ced1455267d64183ba1b270a9eda6089','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('2ae855da5125446b864aec4f6e9b2282','755698c1c27a43efa6c23310757c6163','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('4ec82fb5b3114be6bd816f279d5c2885','42223908127047f8ab57142dbb8d97a0','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('5eae21169a0443c7993126ab9879b936','3eca9a300ba543eea8b6092a59d32e76','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('922cba95cac94feb8c45db6346c0bb57','975294b526544d83b806e3fc2f99cd16','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('9c7629433dd04378a53de67a86bc2d78','87e832695708478ead2acd3bcdb7a9a9','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('ae48ae0866124ddfb6dfc3c2185c4c9d','9ba1a7844e4447fe9cb115323a37736f','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('bf075115bcd44016b6b4decafa6c789b','cee12914b9cf49bfaf5abf838ccdb56f','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('c427a92c76144ceba43f57b1d3807969','484815c4a7a14cf6bdbf69939e5b060e','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('f69932f70fe64332b4f4439761bf5055','bbe36e81f17542078489f223239e658a','93e4194efb604c71b394d902b2060da8',NULL,NULL,NULL,NULL,NULL,NULL);
-- 修改批准函标签
delete from BF_LABLECONFIG where ID='fd46596832164f39afc5b47e6711d1bd';
@ -371,5 +368,49 @@ insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phased
delete from AWE_DO_CATALOG where dono='LbBeforeAppLicationList';
Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('LbBeforeAppLicationList','预审批列表',null,'30',null,'1','1','default','jbo.com.tenwa.entity.comm.serialutil.LB_BEFORE_APPLICATION','O','1=1','','inputtime desc','','','SYS_Designer','2020/08/17 09:45:32','SYS_Designer','2020/09/22 10:10:19','','1','');
-- =========================== 3
-- 修改短信模板调用时间展示格式
delete from awe_do_library where dono='MsgTempletList' and colindex='1022';
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('MsgTempletList','1022','1022','1','O','PREVIOUS_FIRE_TIME','PREVIOUS_FIRE_TIME','String','','调度上次执行时间','','1','Date','3','2','','','','255','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2017/08/09 10:28:24','SYS_Designer','2020/09/23 16:01:31','0','','1','','','','');
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('MsgTempletList','1023','1023','1','','DataConversionManage.getTime(PREVIOUS_FIRE_TIME)','PREVIOUSTIME','String','','调度上次执行时间','','1','Date','3','2','','','','255','1','0','0','1','0',1,'0','','','SYS_Designer','2020/09/23 15:43:22','SYS_Designer','2020/09/23 15:50:46','0','','1','','','','');
delete from awe_do_library where dono='MsgTempletList' and colindex='1024';
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('MsgTempletList','1024','1024','1','O','NEXT_FIRE_TIME','NEXT_FIRE_TIME','String','','调度下次执行时间','','1','Date','3','2','','','','255','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2017/08/09 10:28:24','SYS_Designer','2020/09/23 16:01:31','0','','1','','','','');
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('MsgTempletList','1025','1025','1','','DataConversionManage.getTime(NEXT_FIRE_TIME)','NEXTTIME','String','','调度下次执行时间','','1','Date','3','2','','','','255','1','0','0','1','0',1,'0','','','SYS_Designer','2020/09/23 15:56:29','SYS_Designer','2020/09/23 15:56:45','0','','1','','','','');
-- 租赁物中添加车辆属性字段 ;head 头. tail 尾
Alter table lb_equipment_car add column car_attribute varchar(30) NULL COMMENT '车辆属性' after identify_code;
Alter table lb_equipment_car_his add column car_attribute varchar(30) NULL COMMENT '车辆属性' after identify_code;
Alter table lb_equipment_car_temp add column car_attribute varchar(30) NULL COMMENT '车辆属性' after identify_code;
-- 修改历史数据
update LB_EQUIPMENT_CAR_TEMP set car_attribute='head';
update LB_EQUIPMENT_CAR set car_attribute='head';
-- 处理挂车历史数据
insert into LB_EQUIPMENT_CAR_TEMP(id,project_id,contract_id,BRAND,FRAME_NUMBER,CAR_COLOUR,flowunid,INPUTTIME,NOW_TOTAL,car_attribute) (select REPLACE(UUID(),'-',''),project_id,contract_id,FRAME_BRAND,FRAME_NUMBER2,FRAME_COLOR,flowunid,DATE_FORMAT (CURDATE(),'%Y/%m/%d'),0.00,'tail' from LB_EQUIPMENT_CAR_TEMP where FRAME_NUMBER2 is not null or FRAME_BRAND is not null or FRAME_COLOR is not null);
insert into LB_EQUIPMENT_CAR(id,project_id,contract_id,BRAND,FRAME_NUMBER,CAR_COLOUR,INPUTTIME,NOW_TOTAL,car_attribute) (select REPLACE(UUID(),'-',''),project_id,contract_id,FRAME_BRAND,FRAME_NUMBER2,FRAME_COLOR,DATE_FORMAT (CURDATE(),'%Y/%m/%d'),0.00,'tail' from LB_EQUIPMENT_CAR where FRAME_NUMBER2 is not null or FRAME_BRAND is not null or FRAME_COLOR is not null);
-- 租赁物列表添加车辆属性字段
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentListTemp_Cars','0640','0640','1','O','car_attribute','car_attribute','String','','车辆属性','','1','Text','1','1','','','','30','0','0','0','1','0',0,'','','','SYS_Designer','2020/09/24 17:21:10','SYS_Designer','2020/09/24 17:21:10','0','','1','','','','');
-- 租赁详情页面添加车辆属性字段
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1560','1560','1','O','car_attribute','car_attribute','String','','车辆属性','','1','Text','1','1','','','','30','0','0','0','1','0',0,'','','','SYS_Designer','2020/09/24 17:31:44','SYS_Designer','2020/09/24 17:31:44','0','','1','','','','');
-- 修改合同制作校验车架号风险预警
delete from SCENARIO_MODEL where scenarioid='合同制作流程' and modelid='030003';
Insert Into SCENARIO_MODEL (scenarioid,modelid,sortno,modelname,modeldescribe,modeltype,subtypeno,runcondition,status,nopassdeal,passdeal,passmessage,nopassmessage,executescript,remark,inputuser,inputorg,inputtime,updateuser,updatetime,groupid,modelkind,bizviewer) Values ('合同制作流程','030003','030003','租赁物信息','测试租赁物中的车架号','20','0300','','1','10','10','车架号已添加','请填写租赁物中的车架号','SELECT CASE WHEN FRAME_NUMBER IS NOT NULL THEN ''true'' ELSE ''false'' END FROM LB_EQUIPMENT_CAR_TEMP WHERE car_attribute=''head'' and flowunid=''#{ObjectNo}''','','administrator','8009001','2018/07/02 16:16:21','administrator','2018/07/02 16:20:16',null,null,null);
-- 添加租金总额标签
insert into `BF_LABLECONFIG` (`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) values('cee12914b9cf49bfaf5abf838ccdb56f','0030','rentData','租金总和','tag_type2','value_type3','sumrent,upsumrentrent,uprent,rent','select SUM(rent) sumrent,FUNC_CHANGETOCHINESEMONEY(SUM(rent)) upsumrentrent,FUNC_CHANGETOCHINESEMONEY(rent) uprent,rent rent from lc_rent_plan_temp where flowunid=:{FLOW_UNID}','','N','','','','','','','','word_default_class');
-- 修改联合租赁模板导出配置
delete from bf_templatelable where TEMPLATEID='7ae245ef8b644b62a4658069adab6c32';
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('1b022512c624434b944f47563e8a48a5','be101123ef74413eb0d8acad8b6b22b9','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('2d163b7bc7b042da83151c53d65f6676','9fd06315c45842699cabed15ed2ed7f9','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('68ee3251d36b4e6bb2a25115cb9638eb','755698c1c27a43efa6c23310757c6163','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('782861c28a53460e8babbc192308a216','9ba1a7844e4447fe9cb115323a37736f','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('87b11c0967a748808c4ea956f73f61ce','975294b526544d83b806e3fc2f99cd16','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('9687523ef1e04bbc809259d1bbc9fe68','bbe36e81f17542078489f223239e658a','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('981505dc548446c9acfdc99078048079','c901f36d5d4e48a89b66dd3bc736afac','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('c67f3d77ca5c41a3a7b2f4ab57f09fcc','ced1455267d64183ba1b270a9eda6089','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('cb87bf20fd7041a3be12a49635620457','484815c4a7a14cf6bdbf69939e5b060e','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('edf4b19d90694fd0a3290a8737342e5d','87e832695708478ead2acd3bcdb7a9a9','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL);

1
src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
View File

@ -318,6 +318,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
bmLEC.setAttributeValue("cartype",this.getAttribute("cartype"));
bmLEC.setAttributeValue("vehicletype",this.getAttribute("vehicletype"));
bmLEC.setAttributeValue("vehiclelevel",this.getAttribute("vehiclelevel"));
bmLEC.setAttributeValue("car_attribute","head");
if(lbat!=null){
bmLEC.setAttributeValue("FRAME_NUMBER", lbat.getAttribute("frame_number")+"");//车架号
bmLEC.setAttributeValue("mile", lbat.getAttribute("mile")+"");//公里数

12
src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java
View File

@ -288,16 +288,24 @@ public class MakeOneCodeAndContractModel {
if(filename.indexOf("联合")>=0){
//设置图片宽度和高度
img.scaleAbsolute(160, 18);
//设置图片水印的位置。
//设置图片水印的位置。第一个参：左右移动，小靠左。第二个参数上线移动：小的靠下
img.setAbsolutePosition(410, 815);
}else if(filename.indexOf("狮桥")>=0){
//设置图片宽度和高度
img.scaleAbsolute(160, 18);
//设置图片水印的位置。
img.setAbsolutePosition(380, 750);
}else{
img.scaleAbsolute(160, 22);
img.setAbsolutePosition(400, 785);
}
PdfContentByte under = stamp.getUnderContent(1);
under.addImage(img);
if(pages>2&&"02".equals(leasform)&&filename.indexOf("BJ90形式售后回租")<0 && filename.indexOf("联合")<0 && filename.indexOf("狮桥")<0){
if(pages>2&&"02".equals(leasform)&&filename.indexOf("BJ90形式售后回租")<0 && filename.indexOf("狮桥")<0){
PdfContentByte under2 = stamp.getUnderContent(3);
if(filename.indexOf("联合")>=0){
img.setAbsolutePosition(400, 785);
}
under2.addImage(img);
}