diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 0602324cd..f1927bc4e 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -5242,6 +5242,7 @@
+
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/VI_BUSINESS_AFFINFO.java b/src_jbo/jbo/com/tenwa/lease/comm/VI_BUSINESS_AFFINFO.java
index 266d85912..c964288c3 100644
--- a/src_jbo/jbo/com/tenwa/lease/comm/VI_BUSINESS_AFFINFO.java
+++ b/src_jbo/jbo/com/tenwa/lease/comm/VI_BUSINESS_AFFINFO.java
@@ -365,4 +365,8 @@ public interface VI_BUSINESS_AFFINFO{
* contract_stat STRING(20)
*/
public static final String contract_stat = "contract_stat";
+ /**
+ * contract_status_name STRING(20)
+ */
+ public static final String contract_status_name = "contract_status_name";
}
\ No newline at end of file
diff --git a/src_sql/view/vi_business_affinfo.sql b/src_sql/view/vi_business_affinfo.sql
index ab8e0d469..def2736d5 100644
--- a/src_sql/view/vi_business_affinfo.sql
+++ b/src_sql/view/vi_business_affinfo.sql
@@ -19,7 +19,7 @@ create view vi_business_affinfo as SELECT O.DISTRIBUTOR_ID
O.PROJECT_MANAGE AS PROJECT_MANAGE,
O.PROJECT_ASSIST AS PROJECT_ASSIST,
O.END_DATE AS END_DATE,
- O.START_DATE AS START_DATE,
+ lcc.START_DATE AS START_DATE,
O.ACTUAL_START_DATE AS ACTUAL_START_DATE,
O.ACTUAL_END_DATE AS ACTUAL_END_DATE,
O.ACCOUNTING_START_DATE AS ACCOUNTING_START_DATE,
@@ -85,8 +85,9 @@ create view vi_business_affinfo as SELECT O.DISTRIBUTOR_ID
LEC.VNDR_NAME AS VNDR_NAME,
LFI.APPLYPAY_DATE AS APPLYPAY_DATE,
(CASE WHEN (O.CONTRACT_STATUS = '21') THEN (LCC.START_DATE = NULL) ELSE LCC.START_DATE END) AS START_DATE_NEW,
- CLL.ITEMNAME AS CONTRACT_STAT
-FROM ((((((((((APZL.LB_CONTRACT_INFO O LEFT JOIN APZL.LB_PROJECT_INFO LPI ON ((convert(O.PROJECT_ID USING UTF8) = LPI.ID))) LEFT JOIN APZL.LB_UNION_LESSEE LUL ON ((O.PROJECT_ID = LUL.PROJECT_ID))) LEFT JOIN APZL.CUSTOMER_PERSON CP ON ((CP.CUSTOMERID = LUL.CUSTOMER_ID))) LEFT JOIN APZL.CUSTOMER_FAMILY CF ON (((O.PROJECT_ID = CF.PROJECT_ID) AND (CF.PARTNER_ = 'Y')))) LEFT JOIN APZL.LB_EQUIPMENT_CAR LEC ON ((convert(O.PROJECT_ID USING UTF8) = LEC.PROJECT_ID))) LEFT JOIN (
+ CLL.ITEMNAME AS CONTRACT_STAT,
+ lcs.status_name AS contract_status_name
+FROM ((((((((((APZL.LB_CONTRACT_INFO O left join lb_contract_status lcs ON o.contract_status=lcs.status_code LEFT JOIN APZL.LB_PROJECT_INFO LPI ON ((convert(O.PROJECT_ID USING UTF8) = LPI.ID))) LEFT JOIN APZL.LB_UNION_LESSEE LUL ON ((O.PROJECT_ID = LUL.PROJECT_ID))) LEFT JOIN APZL.CUSTOMER_PERSON CP ON ((CP.CUSTOMERID = LUL.CUSTOMER_ID))) LEFT JOIN APZL.CUSTOMER_FAMILY CF ON (((O.PROJECT_ID = CF.PROJECT_ID) AND (CF.PARTNER_ = 'Y')))) LEFT JOIN APZL.LB_EQUIPMENT_CAR LEC ON ((convert(O.PROJECT_ID USING UTF8) = LEC.PROJECT_ID))) LEFT JOIN (
SELECT APZL.LC_FUND_INCOME.CONTRACT_ID AS CONTRACT_ID,
min(APZL.LC_FUND_INCOME.PROJECT_ID) AS PROJECT_ID,
max(APZL.LC_FUND_INCOME.APPLYPAY_DATE) AS APPLYPAY_DATE,
diff --git a/src_sql/投产SQL/V20200206/tft_20200206.sql b/src_sql/投产SQL/V20200206/tft_20200206.sql
index b8c87425c..5d8d12b4f 100644
--- a/src_sql/投产SQL/V20200206/tft_20200206.sql
+++ b/src_sql/投产SQL/V20200206/tft_20200206.sql
@@ -46,4 +46,5 @@ insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `I
delete from select_catalog where selname='SelectOwnAccountForContract';
insert into `select_catalog` (`selname`, `seltype`, `seldescribe`, `seltablename`, `selprimarykey`, `selbrowsemode`, `selargs`, `selhidefield`, `selcode`, `selfieldname`, `selfielddisp`, `selreturnvalue`, `selfilterfield`, `isinuse`, `mutilorsingle`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('SelectOwnAccountForContract','Sql','²éѯ±¾·½ÕË»§',NULL,NULL,'Grid','String LessorId','account_purpose','select acc_number,acc_bank,acc_name,account_purpose from own_account where own_id=\'#LessorId\'','¿ª»§ÕʺÅ,¿ª»§ÒøÐÐ,¿ª»§»§Ãû,ÓÃ;','acc_number@style={width:300px;}@acc_name@style={width:300px;}','acc_number@acc_bank@acc_name@account_purpose',NULL,'1','Single',NULL,NULL,NULL,NULL,NULL,'SYS_Designer',NULL,'2017/08/15 13:45:07','SYS_Designer','2018/03/08 15:13:26',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 ('ViBusinessAffinfo','14080','14080','1','O','contract_status_name','contract_status_name','String','','ºÏͬ״̬','','1','Text','1','1','','','','20','1','0','0','1','0',0,'','','','SYS_Designer','2020/02/13 15:39:11','SYS_Designer','2020/02/13 15:39:11','','','1','','','','');