diff --git a/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp b/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp index c9dc1068d..8f16a469e 100644 --- a/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp +++ b/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp @@ -15,7 +15,7 @@ String PhaseNo = CurPage.getParameter("PhaseNo"); String flowunid = CurPage.getParameter("ObjectNo"); String compClientID = request.getParameter("CompClientID"); - String frameNumber = Sqlca.getString("select FRAME_NUMBER from LB_EQUIPMENT_CAR_TEMP where FLOWUNID='"+flowunid+"'"); + String frameNumber = Sqlca.getString("select FRAME_NUMBER from LB_EQUIPMENT_CAR_TEMP where FLOWUNID='"+flowunid+"' and car_attribute='head' "); String id = Sqlca.getString("select id from LM_GPS_ORDER_TEMP where APPLY_NO='"+ProjectNo+"'"); String contact_name = Sqlca.getString("select CONTACT_NAME from GPS_config_info where isenable='1' ");//派工联系人 diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index a782902b8..6c0f6f429 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -122,6 +122,7 @@ doTemp.setColInnerBtEvent("MODEL", ""); doTemp.setColInnerBtEvent("zone", ""); }*/ + doTemp.appendJboWhere(" and O.ID='"+ID+"'"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform if(((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true")))&&!("合同变更流程".equals(flowName))){ @@ -131,7 +132,7 @@ if("flow_contract_sum_car".equals(showtype)){ dwTemp.genHTMLObjectWindow(contractid); }else{ - dwTemp.genHTMLObjectWindow(ID); + dwTemp.genHTMLObjectWindow(sFlowUnid); } String vehiclelevel = Sqlca.getString("select vehiclelevel from LB_EQUIPMENT_CAR_TEMP where FLOWUNID ='"+FlowUnid+"'"); // CurPage.getCurComp().setAttribute("RightType", RightType); diff --git a/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql b/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql new file mode 100644 index 000000000..1c755a3bd --- /dev/null +++ b/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql @@ -0,0 +1,10 @@ +-- 修改租赁物详情页面的where条件 +delete from AWE_DO_CATALOG where dono='LBEquipmentInfoTemp_Cars'; +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 ('LBEquipmentInfoTemp_Cars','租赁物件临时表信息',null,'30030',null,'1','2','default','jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP','O','O.flowunid=:flowunid','','','com.amarsoft.awe.dw.handler.impl.CommonHandler',null,'SYS_Designer','2017/05/23 09:23:48','SYS_Designer','2020/09/27 11:42:01','','1',''); + + + + +-- 归档报表数据重新已更新 + +-- ---------------以上生产环境已执行--------------------------------------- diff --git a/鎶ヨ〃/鍑嵎绉熻祦鎶ヨ〃/鍑嵎缁撴竻鏁版嵁琛.xml b/鎶ヨ〃/鍑嵎绉熻祦鎶ヨ〃/鍑嵎缁撴竻鏁版嵁琛.xml index b24582767..e9a964865 100644 --- a/鎶ヨ〃/鍑嵎绉熻祦鎶ヨ〃/鍑嵎缁撴竻鏁版嵁琛.xml +++ b/鎶ヨ〃/鍑嵎绉熻祦鎶ヨ〃/鍑嵎缁撴竻鏁版嵁琛.xml @@ -62,12 +62,12 @@ LEFT JOIN lb_union_lessee lul ON o.PROJECT_ID = lul.PROJECT_ID LEFT JOIN customer_info ci ON ci.CUSTOMERID = lul.CUSTOMER_ID LEFT JOIN CUSTOMER_PERSON cp ON cp.CUSTOMERID = lul.CUSTOMER_ID LEFT JOIN customer_company cc ON cc.CUSTOMERID = lul.CUSTOMER_ID -LEFT JOIN LB_EQUIPMENT_CAR lec ON o.id = lec.contract_id +LEFT JOIN LB_EQUIPMENT_CAR lec ON o.id = lec.contract_id and lec.car_attribute='head' LEFT JOIN lb_project_info lpi ON o.PROJECT_ID = lpi.id LEFT JOIN distributor_info di ON di.distributor_no = lpi.distributor_id left join (SELECT contract_id,MAX(hire_date) hire_date FROM lc_rent_income GROUP BY contract_id) lri on lri.contract_id= o.id LEFT JOIN code_library clsz ON clsz.sortno = LEFT(di.DISTRIBUTOR_ADDRESS, 2) AND clsz.CodeNO = 'AreaCode' -LEFT JOIN code_library clcj ON clcj.sortno = LEFT(di.DISTRIBUTOR_ADDRESS, 4) AND clsz.CodeNO = 'AreaCode' +LEFT JOIN code_library clcj ON clcj.sortno = LEFT(di.DISTRIBUTOR_ADDRESS, 4) AND clcj.CodeNO = 'AreaCode' WHERE (lpi.project_manage IN (SELECT userid FROM user_info WHERE belongorg = (SELECT belongorg FROM user_info WHERE userid = '{_TENWA_USERID}')) OR '{_TENWA_USERID}' IN (SELECT userid FROM user_info WHERE belongorg = (SELECT belongorg FROM user_info WHERE userid = 'administrator'))) diff --git a/鎶ヨ〃/鍖楁苯璐㈠姟鎶ヨ〃/鍌敹涓氬姟琛.xml b/鎶ヨ〃/鍖楁苯璐㈠姟鎶ヨ〃/鍌敹涓氬姟琛.xml index 2ce9e150d..a644cd557 100644 --- a/鎶ヨ〃/鍖楁苯璐㈠姟鎶ヨ〃/鍌敹涓氬姟琛.xml +++ b/鎶ヨ〃/鍖楁苯璐㈠姟鎶ヨ〃/鍌敹涓氬姟琛.xml @@ -37,199 +37,199 @@ CollectionBusiness 2c9023815726a036015726a496b00001 COMPLEXSQL - SELECT - t.project_no, - t.CONTRACT_NO, - t.FULLNAME, - t.mobile, - t. NAME, - t.tel, - t.FULLNAME1, - t.mobile1, - t.FULLNAME2, - t.mobile2, - t.FULLNAME3, - t.mobile3, - t.over_Principal, - t.over_interest, - t.over_penalty, - t.over_money + t.over_penalty as over_money , - t.corpus_overs, - t.interest_overs, - t.rent_overs, - t.distributor_name, - t.LICENSE_PLATE_NUMBER, - t.over_days, - t.return_period, - t.over_list, - t.over_num, - t.CERTID, - t.certid1, - t.certid2, - t.certid3, - t.certid4 -FROM -( - - SELECT - o.project_manage, - lpi.project_no, - o.CONTRACT_NO, - cp.FULLNAME AS FULLNAME, - cp.mobile AS mobile, - cf.`name` AS NAME, - cf.tel, - a1.fullname AS FULLNAME1, - a1.mobile AS mobile1, - a2.fullname AS FULLNAME2, - a2.mobile AS mobile2, - a3.fullname AS FULLNAME3, - a3.mobile AS mobile3, - ( - vo.over_money - vo.over_interest - ) AS over_Principal, - vo.over_interest, - vo.over_penalty, - vo.over_money, - z.corpus_overs, - z.interest_overs, - z.rent_overs, - di.distributor_name, - lec.LICENSE_PLATE_NUMBER, - vo.over_days, -(q.over_list-1) - AS return_period, - ( - lcc.INCOME_NUMBER - q.over_list+1 - ) AS over_list, - q.over_num, - cp.CERTID, - cf.certid AS certid1, - a1.CERTID AS certid2, - a2.CERTID AS certid3, - a3.CERTID AS certid4, - cf.Partner_ - FROM - lb_contract_info o - LEFT JOIN lb_project_info lpi ON o.PROJECT_ID = lpi.ID - LEFT JOIN lb_union_lessee lul ON o.PROJECT_ID = lul.PROJECT_ID - LEFT JOIN CUSTOMER_PERSON cp ON cp.CUSTOMERID = lul.CUSTOMER_ID - LEFT JOIN CUSTOMER_FAMILY cf ON o.PROJECT_ID = cf.PROJECT_ID AND cf.Partner_='Y' - LEFT JOIN distributor_info di ON di.distributor_no = o.distributor_id - LEFT JOIN LB_EQUIPMENT_CAR lec ON o.FLOWUNID = lec.FLOWUNID - LEFT JOIN VI_OVERDUE_RENT_PLAN_SUM vo ON vo.contract_id = O.id - LEFT JOIN LC_CALC_CONDITION lcc ON o.id = lcc.contract_id - LEFT JOIN ( - SELECT - contract_id, - SUM(corpus_over) AS corpus_overs, - SUM(interest_over) AS interest_overs, - SUM(rent_over) AS rent_overs - FROM - vi_lc_rent_plan - GROUP BY - contract_id - ) z ON z.contract_id = o.ID - LEFT JOIN ( - SELECT - contract_id, - COUNT(plan_list) AS over_num, -MAX(PLAN_LIST) AS over_list - FROM - vi_overdue_rent_plan - WHERE - Overdue_days > 0 - GROUP BY - contract_id - ) q ON q.contract_id = o.ID - LEFT JOIN ( - SELECT - ( - @i := CASE - WHEN @pre_parent_code = project_id THEN - @i + 1 - ELSE - 1 - END - ) rownum, - lb_guarantee_unit.*, ( - @pre_parent_code := project_id - ) - FROM - lb_guarantee_unit, - ( - SELECT - @i := 0, - @pre_parent_code := '' - ) AS a - GROUP BY - project_id, - id - ORDER BY - project_id - ) a1 ON a1.project_id = o.project_id - AND a1.rownum = 1 - LEFT JOIN ( - SELECT - ( - @i := CASE - WHEN @pre_parent_code = project_id THEN - @i + 1 - ELSE - 1 - END - ) rownum, - lb_guarantee_unit.*, ( - @pre_parent_code := project_id - ) - FROM - lb_guarantee_unit, - ( - SELECT - @i := 0, - @pre_parent_code := '' - ) AS a - GROUP BY - project_id, - id - ORDER BY - project_id - ) a2 ON a2.project_id = o.project_id - AND a2.rownum = 2 - LEFT JOIN ( - SELECT - ( - @i := CASE - WHEN @pre_parent_code = project_id THEN - @i + 1 - ELSE - 1 - END - ) rownum, - lb_guarantee_unit.*, ( - @pre_parent_code := project_id - ) - FROM - lb_guarantee_unit, - ( - SELECT - @i := 0, - @pre_parent_code := '' - ) AS a - GROUP BY - project_id, - id - ORDER BY - project_id - ) a3 ON a3.project_id = o.project_id - AND a3.rownum = 3 -WHERE vo.over_money>0 AND o.CONTRACT_STATUS='31' -AND o.PROJECT_MANAGE IN (SELECT - userid - FROM - user_role - WHERE - roleid = '800R00000044') + SELECT + t.project_no, + t.CONTRACT_NO, + t.FULLNAME, + t.mobile, + t. NAME, + t.tel, + t.FULLNAME1, + t.mobile1, + t.FULLNAME2, + t.mobile2, + t.FULLNAME3, + t.mobile3, + t.over_Principal, + t.over_interest, + t.over_penalty, + t.over_money + t.over_penalty as over_money , + t.corpus_overs, + t.interest_overs, + t.rent_overs, + t.distributor_name, + t.LICENSE_PLATE_NUMBER, + t.over_days, + t.return_period, + t.over_list, + t.over_num, + t.CERTID, + t.certid1, + t.certid2, + t.certid3, + t.certid4 +FROM +( + + SELECT + o.project_manage, + lpi.project_no, + o.CONTRACT_NO, + cp.FULLNAME AS FULLNAME, + cp.mobile AS mobile, + cf.`name` AS NAME, + cf.tel, + a1.fullname AS FULLNAME1, + a1.mobile AS mobile1, + a2.fullname AS FULLNAME2, + a2.mobile AS mobile2, + a3.fullname AS FULLNAME3, + a3.mobile AS mobile3, + ( + vo.over_money - vo.over_interest + ) AS over_Principal, + vo.over_interest, + vo.over_penalty, + vo.over_money, + z.corpus_overs, + z.interest_overs, + z.rent_overs, + di.distributor_name, + lec.LICENSE_PLATE_NUMBER, + vo.over_days, +(q.over_list-1) + AS return_period, + ( + lcc.INCOME_NUMBER - q.over_list+1 + ) AS over_list, + q.over_num, + cp.CERTID, + cf.certid AS certid1, + a1.CERTID AS certid2, + a2.CERTID AS certid3, + a3.CERTID AS certid4, + cf.Partner_ + FROM + lb_contract_info o + LEFT JOIN lb_project_info lpi ON o.PROJECT_ID = lpi.ID + LEFT JOIN lb_union_lessee lul ON o.PROJECT_ID = lul.PROJECT_ID + LEFT JOIN CUSTOMER_PERSON cp ON cp.CUSTOMERID = lul.CUSTOMER_ID + LEFT JOIN CUSTOMER_FAMILY cf ON o.PROJECT_ID = cf.PROJECT_ID AND cf.Partner_='Y' + LEFT JOIN distributor_info di ON di.distributor_no = o.distributor_id + LEFT JOIN LB_EQUIPMENT_CAR lec ON o.FLOWUNID = lec.FLOWUNID and lec.car_attribute='head' + LEFT JOIN VI_OVERDUE_RENT_PLAN_SUM vo ON vo.contract_id = O.id + LEFT JOIN LC_CALC_CONDITION lcc ON o.id = lcc.contract_id + LEFT JOIN ( + SELECT + contract_id, + SUM(corpus_over) AS corpus_overs, + SUM(interest_over) AS interest_overs, + SUM(rent_over) AS rent_overs + FROM + vi_lc_rent_plan + GROUP BY + contract_id + ) z ON z.contract_id = o.ID + LEFT JOIN ( + SELECT + contract_id, + COUNT(plan_list) AS over_num, +MAX(PLAN_LIST) AS over_list + FROM + vi_overdue_rent_plan + WHERE + Overdue_days > 0 + GROUP BY + contract_id + ) q ON q.contract_id = o.ID + LEFT JOIN ( + SELECT + ( + @i := CASE + WHEN @pre_parent_code = project_id THEN + @i + 1 + ELSE + 1 + END + ) rownum, + lb_guarantee_unit.*, ( + @pre_parent_code := project_id + ) + FROM + lb_guarantee_unit, + ( + SELECT + @i := 0, + @pre_parent_code := '' + ) AS a + GROUP BY + project_id, + id + ORDER BY + project_id + ) a1 ON a1.project_id = o.project_id + AND a1.rownum = 1 + LEFT JOIN ( + SELECT + ( + @i := CASE + WHEN @pre_parent_code = project_id THEN + @i + 1 + ELSE + 1 + END + ) rownum, + lb_guarantee_unit.*, ( + @pre_parent_code := project_id + ) + FROM + lb_guarantee_unit, + ( + SELECT + @i := 0, + @pre_parent_code := '' + ) AS a + GROUP BY + project_id, + id + ORDER BY + project_id + ) a2 ON a2.project_id = o.project_id + AND a2.rownum = 2 + LEFT JOIN ( + SELECT + ( + @i := CASE + WHEN @pre_parent_code = project_id THEN + @i + 1 + ELSE + 1 + END + ) rownum, + lb_guarantee_unit.*, ( + @pre_parent_code := project_id + ) + FROM + lb_guarantee_unit, + ( + SELECT + @i := 0, + @pre_parent_code := '' + ) AS a + GROUP BY + project_id, + id + ORDER BY + project_id + ) a3 ON a3.project_id = o.project_id + AND a3.rownum = 3 +WHERE vo.over_money>0 AND o.CONTRACT_STATUS='31' +AND o.PROJECT_MANAGE IN (SELECT + userid + FROM + user_role + WHERE + roleid = '800R00000044') ) t diff --git a/鎶ヨ〃/鍖楁苯璐㈠姟鎶ヨ〃/缁撴竻鏁版嵁琛.xml b/鎶ヨ〃/鍖楁苯璐㈠姟鎶ヨ〃/缁撴竻鏁版嵁琛.xml index bf5a375dd..20d5a29a0 100644 --- a/鎶ヨ〃/鍖楁苯璐㈠姟鎶ヨ〃/缁撴竻鏁版嵁琛.xml +++ b/鎶ヨ〃/鍖楁苯璐㈠姟鎶ヨ〃/缁撴竻鏁版嵁琛.xml @@ -62,12 +62,12 @@ LEFT JOIN lb_union_lessee lul ON o.PROJECT_ID = lul.PROJECT_ID LEFT JOIN customer_info ci ON ci.CUSTOMERID = lul.CUSTOMER_ID LEFT JOIN CUSTOMER_PERSON cp ON cp.CUSTOMERID = lul.CUSTOMER_ID LEFT JOIN customer_company cc ON cc.CUSTOMERID = lul.CUSTOMER_ID -LEFT JOIN LB_EQUIPMENT_CAR lec ON o.id = lec.contract_id +LEFT JOIN LB_EQUIPMENT_CAR lec ON o.id = lec.contract_id and lec.car_attribute='head' LEFT JOIN lb_project_info lpi ON o.PROJECT_ID = lpi.id LEFT JOIN distributor_info di ON di.distributor_no = lpi.distributor_id left join (SELECT contract_id,MAX(hire_date) hire_date FROM lc_rent_income GROUP BY contract_id) lri on lri.contract_id= o.id LEFT JOIN code_library clsz ON clsz.sortno = LEFT(di.DISTRIBUTOR_ADDRESS, 2) AND clsz.CodeNO = 'AreaCode' -LEFT JOIN code_library clcj ON clcj.sortno = LEFT(di.DISTRIBUTOR_ADDRESS, 4) AND clsz.CodeNO = 'AreaCode' +LEFT JOIN code_library clcj ON clcj.sortno = LEFT(di.DISTRIBUTOR_ADDRESS, 4) AND clcj.CodeNO = 'AreaCode' WHERE (lpi.project_manage IN (SELECT userid FROM user_info WHERE belongorg = (SELECT belongorg FROM user_info WHERE userid = '{_TENWA_USERID}')) OR '{_TENWA_USERID}' IN (SELECT userid FROM user_info WHERE belongorg = (SELECT belongorg FROM user_info WHERE userid = 'administrator'))) diff --git a/鎶ヨ〃/寰俊鍏紬鍙锋姤琛/鐢ㄦ埛缁戝畾淇℃伅琛.xml b/鎶ヨ〃/寰俊鍏紬鍙锋姤琛/鐢ㄦ埛缁戝畾淇℃伅琛.xml index 43e02ed8f..bd98399ae 100644 --- a/鎶ヨ〃/寰俊鍏紬鍙锋姤琛/鐢ㄦ埛缁戝畾淇℃伅琛.xml +++ b/鎶ヨ〃/寰俊鍏紬鍙锋姤琛/鐢ㄦ埛缁戝畾淇℃伅琛.xml @@ -24,7 +24,7 @@ 2c9c81b969188a33016f371cc4f2012a - 2c9c81b969188a33016f473dd1b301d5 + 2c9c81b9719762ea0171c0a88c0b0013 @@ -65,7 +65,7 @@ LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LUL.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(RENT) AS RENT,MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN WHERE PLAN_LIST = 1 GROUP BY CONTRACT_ID) LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN - LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID + LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID and LEC.car_attribute='head' LEFT JOIN LB_CONTRACT_STATUS LCS ON LCS.STATUS_CODE=LCI.CONTRACT_STATUS LEFT JOIN @@ -74,7 +74,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b969188a33016f473dd1b401d6 + 2c9c81b9719762ea0171c0a88c0d001f CUSTOMERNAME STRING @@ -93,7 +93,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b6710c46490171148b10680002 + 2c9c81b9719762ea0171c0a88c0d0021 PLAN_DATE STRING @@ -112,7 +112,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b6710c46490171148b10680003 + 2c9c81b9719762ea0171c0a88c0d001e RENT NUMBER @@ -131,7 +131,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b969188a33016f473dd1b401db + 2c9c81b9719762ea0171c0a88c0d001c MOBILE_ STRING @@ -150,7 +150,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b969188a33016f473dd1b401d8 + 2c9c81b9719762ea0171c0a88c0d0018 CERTID_ STRING @@ -169,7 +169,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b969188a33016f473dd1b401dd + 2c9c81b9719762ea0171c0a88c0c0014 CONTRACT_NUMBER STRING @@ -188,7 +188,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b969188a33016f473dd1b401df + 2c9c81b9719762ea0171c0a88c0d001a STATUS_NAME STRING @@ -208,7 +208,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b969188a33016f473dd1b401d9 + 2c9c81b9719762ea0171c0a88c0d0019 PRODUCT_NAME STRING @@ -227,7 +227,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b969188a33016f473dd1b401de + 2c9c81b9719762ea0171c0a88c0d001d DISTRIBUTOR_NAME STRING @@ -246,7 +246,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b969188a33016f473dd1b401da + 2c9c81b9719762ea0171c0a88c0d0022 AFFILIATEDNAME STRING @@ -265,7 +265,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b969188a33016f473dd1b401dc + 2c9c81b9719762ea0171c0a88c0d0017 FRAME_NUMBER STRING @@ -284,7 +284,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b6710c46490171148b10680004 + 2c9c81b9719762ea0171c0a88c0c0016 attention_status STRING @@ -303,7 +303,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b6710c46490171148b105c0001 + 2c9c81b9719762ea0171c0a88c0d0020 openid STRING @@ -322,7 +322,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b969188a33016f473dd1b401d7 + 2c9c81b9719762ea0171c0a88c0c0015 WECHAT_NAME STRING @@ -341,7 +341,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b6710c46490171148b10680005 + 2c9c81b9719762ea0171c0a88c0d001b binding_time STRING @@ -365,7 +365,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b969188a33016f473dd1b401e0 + 2c9c81b9719762ea0171c0a88c0d0023 CUSTOMERNAME CUSTOMERNAME @@ -375,7 +375,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI 0 - 2c9c81b969188a33016f473dd1b401e1 + 2c9c81b9719762ea0171c0a88c0d0024 CERTID_ CERTID_ @@ -398,7 +398,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b969188a33016f473dd1b301d5 + 2c9c81b9719762ea0171c0a88c0b0013 0 0 0 diff --git a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/褰掓。淇℃伅鎶ヨ〃.xml b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/褰掓。淇℃伅鎶ヨ〃.xml index d4d5aaa5a..7860e1a8a 100644 --- a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/褰掓。淇℃伅鎶ヨ〃.xml +++ b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/褰掓。淇℃伅鎶ヨ〃.xml @@ -37,7 +37,7 @@ archive_info 2c9023815726a036015726a496b00001 COMPLEXSQL - SELECT lci.contract_number, + SELECT lci.subjectname,lci.contract_number, lpi.project_no, lul.CUSTOMER_NAME, di.distributor_name, @@ -59,7 +59,7 @@ LEFT JOIN lb_union_lessee lul ON lul.CONTRACT_ID=lci.ID LEFT JOIN distributor_info di ON di.distributor_no=lci.distributor_id LEFT JOIN lb_file_archiving_info lfa ON lfa.contract_id=lci.id LEFT JOIN user_info ui ON ui.userid=lfa.inputuserid -LEFT JOIN lb_equipment_car lec ON lec.contract_id=lul.contract_id +LEFT JOIN lb_equipment_car lec ON lec.contract_id=lul.contract_id and lec.car_attribute='head' LEFT JOIN lb_car_license_plate_info lcl ON lcl.frame_number=lec.frame_number LEFT JOIN LB_REGISTER_GPS_INFO lrg ON lrg.frame_number=lec.frame_number LEFT JOIN lc_fund_income lfi ON lfi.CONTRACT_ID=lci.ID AND lfi.fee_type='feetype10' AND lfi.ROLL_BACK=0 AND lfi.PAY_STATUS='have_paid' @@ -87,6 +87,25 @@ WHERE lci.businesstype='1' AND lci.contract_status='31' order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc + + 2c9c81b969188a33016fa446242704b2 + subjectname + STRING + + + subjectname + 210 + 17 + true + + false + false + false + false + + + + 2c9c81b56753d5c10167979aa0ec0059 contract_number @@ -95,7 +114,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc contract_number 100 - 16 + 18 true false @@ -114,7 +133,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc project_no 100 - 17 + 19 true false @@ -133,7 +152,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc CUSTOMER_NAME 100 - 18 + 20 true false @@ -152,7 +171,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc distributor_name 100 - 19 + 21 true false @@ -171,7 +190,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc LINKMAN 100 - 20 + 22 true false @@ -190,7 +209,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc frame_number 100 - 21 + 23 true false @@ -209,7 +228,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc plate_number 100 - 22 + 24 true false @@ -228,7 +247,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc platetime 100 - 23 + 25 true false @@ -247,7 +266,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc pledge_date 100 - 24 + 26 true false @@ -266,7 +285,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc applyDate 100 - 25 + 27 true false @@ -285,7 +304,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc contract_status 100 - 26 + 28 true false @@ -304,7 +323,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc FACT_DATE 100 - 27 + 29 true false @@ -323,7 +342,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc days 100 - 28 + 30 true false @@ -342,7 +361,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc ARCHIVING_TIME 100 - 29 + 31 false false @@ -361,7 +380,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc inputtime 100 - 30 + 32 false false @@ -380,7 +399,7 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc inputuserid 100 - 31 + 33 true false @@ -436,6 +455,16 @@ order by (TO_DAYS(NOW()) - TO_DAYS(lfi.FACT_DATE)) desc TEXT 3 + + 2c9c81b969188a33016fa446242604b1 + subjectname + subjectname + + FILTER + STRING + TEXT + 4 + 20 diff --git a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/妗f褰掓。鎶ヨ〃鏂.xml b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/妗f褰掓。鎶ヨ〃鏂.xml index 60c8d4915..ace797820 100644 --- a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/妗f褰掓。鎶ヨ〃鏂.xml +++ b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/妗f褰掓。鎶ヨ〃鏂.xml @@ -25,7 +25,7 @@ 2c9c81b7685efbbc016931c6eff50007 - 2c9c81b969188a33016ce6c61e6e00cc + 2c9c81b9719762ea0174351eb78d038b @@ -42,10 +42,10 @@ lcl.pledge_date,lfa.ARCHIVING_PERSON,lfa.ARCHIVING_CABINET_NO asarchivingCabinet CASE WHEN lcl.is_delay='Y' THEN '鎻愪氦寤惰繜鐢宠' WHEN lcl.is_delay='N' THEN '鏈彁浜ゅ欢杩熺敵璇' ELSE lcl.is_delay END AS is_delay, lcl.delay_date,DATEDIFF(lcl.delay_date,lfi.fact_date) AS delay_plan, IFNULL(cl.itemname,'鏈綊妗') AS is_ARCHIVING, -LEFT(en.endtime,10) AS ARCHIVING_TIME,CASE WHEN (lfm.ALLHANDOVERSTATUS='all' OR lfm.ALLHANDOVERSTATUS='绯荤粺褰掓。') THEN lfm.ARCHIVING_TIME ELSE '' END AS times +LEFT(en.endtime,10) AS ARCHIVING_TIME,CASE WHEN (lfm.ALLHANDOVERSTATUS='all' OR lfm.ALLHANDOVERSTATUS='绯荤粺褰掓。' or lfm.ALLHANDOVERSTATUS='part' ) THEN lfm.ARCHIVING_TIME ELSE '' END AS times,lfm.opinion_comments FROM lb_contract_info lci LEFT JOIN LB_FILE_ARCHIVING_INFO lfa ON lci.id=lfa.contract_id -LEFT JOIN lb_equipment_car lec ON lec.contract_id=lci.id +LEFT JOIN lb_equipment_car lec ON lec.contract_id=lci.id and lec.car_attribute='head' LEFT JOIN distributor_info di ON di.distributor_no=lci.distributor_id LEFT JOIN lb_car_license_plate_info lcl ON lcl.contract_id=lci.id LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.fee_type='feetype10' AND lfi.settle_method<>'settlemethod11' AND lfi.pay_status='have_paid' LEFT JOIN lb_union_lessee lul ON lul.PROJECT_ID = lci.PROJECT_ID @@ -56,14 +56,14 @@ LEFT JOIN (SELECT bs.contract_number,cl.itemname ) AS bb,code_library cl WHERE bs.inputtime=bb.inputtime AND bb.contract_number = bs.contract_number AND bs.business_status=cl.itemno AND cl.codeno='BusinessStatus' ) lcs ON lcs.contract_number=lci.contract_no -LEFT JOIN LB_FILE_MAILARCHIVING_INFO lfm ON lfm.contract_id=lci.id LEFT JOIN code_library cl ON cl.codeno='allHandOverStatus' AND cl.itemno=lfm.ALLHANDOVERSTATUS LEFT JOIN (SELECT ft.endtime AS endtime,fbo.contract_id AS contract_id - FROM flow_task ft LEFT JOIN flow_bussiness_object fbo ON fbo.flow_unid=ft.objectno WHERE ft.flowno='MortgageFileFlow' AND ft.phaseno='1000' GROUP BY fbo.contract_id) en ON en.contract_id=lci.id +LEFT JOIN LB_FILE_MAILARCHIVING_INFO lfm ON lfm.contract_id=lci.id LEFT JOIN code_library cl ON cl.codeno='allHandOverStatus' AND cl.itemno=lfm.ALLHANDOVERSTATUS LEFT JOIN (SELECT ft.UPDATETIME AS endtime,ft.contract_id AS contract_id + FROM LB_FILE_ARCHIVING_INFO_TEMP ft ) en ON en.contract_id=lci.id WHERE lci.businesstype='1' AND (lci.contract_status='31' OR lci.contract_status='100') ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016fa447da2e04b4 + 2c9c81b9719762ea0174351eb78d0392 subjectname STRING @@ -82,7 +82,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00dc + 2c9c81b9719762ea0174351eb78d039f distributor_name STRING @@ -101,7 +101,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00da + 2c9c81b9719762ea0174351eb78d039b contract_number STRING @@ -120,7 +120,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00cf + 2c9c81b9719762ea0174351eb78d03a0 status_name STRING @@ -139,7 +139,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00d5 + 2c9c81b9719762ea0174351eb78d0399 CUSTOMER_NAME STRING @@ -158,7 +158,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00de + 2c9c81b9719762ea0174351eb78d0394 frame_number STRING @@ -177,7 +177,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00ce + 2c9c81b9719762ea0174351eb78d038e fact_date STRING @@ -196,7 +196,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00d6 + 2c9c81b9719762ea0174351eb78d0393 PLATE_NUMBER STRING @@ -215,7 +215,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00d7 + 2c9c81b9719762ea0174351eb78d039d REGDATE STRING @@ -234,7 +234,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00d2 + 2c9c81b9719762ea0174351eb78d0398 is_pledge STRING @@ -253,7 +253,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00db + 2c9c81b9719762ea0174351eb78d0391 pledge_date STRING @@ -272,7 +272,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00dd + 2c9c81b9719762ea0174351eb78d038d ARCHIVING_PERSON STRING @@ -291,7 +291,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b671a16ace01723e0266980004 + 2c9c81b9719762ea0174351eb78d039c asarchivingCabinetNo STRING @@ -310,7 +310,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b671a16ace01723e0266980005 + 2c9c81b9719762ea0174351eb78d038f fileNumber STRING @@ -329,7 +329,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00d8 + 2c9c81b9719762ea0174351eb78d0390 pledge_plan NUMBER @@ -348,7 +348,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00d4 + 2c9c81b9719762ea0174351eb78d0395 is_delay STRING @@ -367,7 +367,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00d0 + 2c9c81b9719762ea0174351eb78d0396 delay_date STRING @@ -386,7 +386,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00d3 + 2c9c81b9719762ea0174351eb78d039a delay_plan NUMBER @@ -405,7 +405,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00d1 + 2c9c81b9719762ea0174351eb78d038c ARCHIVING_TIME STRING @@ -424,7 +424,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00d9 + 2c9c81b9719762ea0174351eb78d039e is_ARCHIVING STRING @@ -443,7 +443,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00cd + 2c9c81b9719762ea0174351eb78d0397 times STRING @@ -461,13 +461,32 @@ ORDER BY lfi.fact_date DESC + + 2c9c81b9744cea15017453f3e9850001 + opinion_comments + STRING + + + opinion_comments + 100 + 43 + true + + false + false + false + false + + + + - 2c9c81b969188a33016ce6c61e6e00e0 + 2c9c81b9719762ea0174351eb78d03a4 contract_number contract_number @@ -477,7 +496,7 @@ ORDER BY lfi.fact_date DESC 0 - 2c9c81b969188a33016ce6c61e6e00e1 + 2c9c81b9719762ea0174351eb78d03a3 distributor_name distributor_name @@ -487,7 +506,7 @@ ORDER BY lfi.fact_date DESC 1 - 2c9c81b969188a33016ce6c61e6e00df + 2c9c81b9719762ea0174351eb78d03a5 fact_date fact_date @@ -497,7 +516,7 @@ ORDER BY lfi.fact_date DESC 2 - 2c9c81b969188a33016ce6c61e6e00e3 + 2c9c81b9719762ea0174351eb78d03a1 ARCHIVING_TIME ARCHIVING_TIME @@ -507,7 +526,7 @@ ORDER BY lfi.fact_date DESC 3 - 2c9c81b969188a33016ce6c61e6e00e2 + 2c9c81b9719762ea0174351eb78d03a2 CUSTOMER_NAME CUSTOMER_NAME @@ -517,7 +536,7 @@ ORDER BY lfi.fact_date DESC 4 - 2c9c81b969188a33016fa447da2e04b3 + 2c9c81b9719762ea0174351eb78d03a6 subjectname subjectname @@ -540,7 +559,7 @@ ORDER BY lfi.fact_date DESC - 2c9c81b969188a33016ce6c61e6e00cc + 2c9c81b9719762ea0174351eb78d038b 0 0 0 diff --git a/鎶ヨ〃/璧勪骇澶勭疆鎶ヨ〃/鍏ユ睜璧勪骇鎶ヨ〃.xml b/鎶ヨ〃/璧勪骇澶勭疆鎶ヨ〃/鍏ユ睜璧勪骇鎶ヨ〃.xml index 8a7c4d6a4..24384e6ee 100644 --- a/鎶ヨ〃/璧勪骇澶勭疆鎶ヨ〃/鍏ユ睜璧勪骇鎶ヨ〃.xml +++ b/鎶ヨ〃/璧勪骇澶勭疆鎶ヨ〃/鍏ユ睜璧勪骇鎶ヨ〃.xml @@ -24,7 +24,7 @@ 4028877d6eb1b449016eb4ceabe30169 - 2c9c81b969188a33016f12e5441a0129 + 2c9c81b9719762ea0173ecaceb550315 @@ -92,9 +92,9 @@ lpi.subjectname, '' AS '鏄惁鏈変繚闄', '' AS '淇濋櫓鍏徃鍚嶇О', '' AS '淇濋櫓鍒版湡鏃' , - LEC.LICENSE_PLATE_NUMBER AS LICENSE_PLATE_NUMBER,lii.Invoice_number AS Invoice_number,lii.Invoice_money AS Invoice_money,lii.Invoice_date AS Invoice_date + LEC.LICENSE_PLATE_NUMBER AS LICENSE_PLATE_NUMBER,lii.Invoice_number AS Invoice_number,lii.Invoice_money AS Invoice_money,lii.Invoice_date AS Invoice_date ,LCI.ASSETTRANSFERER,LCI.TRANSFERDATE,LCI.TURNOUTREMARKS,vcd.cartype FROM - (SELECT ID,DISTRIBUTOR_ID,CONTRACT_NUMBER FROM LB_CONTRACT_INFO WHERE BUSINESSTYPE='1' AND CONTRACT_STATUS='31')LCI + (SELECT ID,DISTRIBUTOR_ID,CONTRACT_NUMBER,ASSETTRANSFERER,TRANSFERDATE,TURNOUTREMARKS FROM LB_CONTRACT_INFO WHERE BUSINESSTYPE='1' AND CONTRACT_STATUS='31')LCI LEFT JOIN (SELECT CONTRACT_ID,SUM(FACT_MONEY) AS FACT_MONEY,MAX(FACT_DATE) AS FACT_DATE FROM LC_FUND_INCOME WHERE FEE_TYPE = 'feetype10' AND EBANK_STATUS = '05' GROUP BY CONTRACT_ID)LFI ON LFI.CONTRACT_ID=LCI.ID LEFT JOIN @@ -104,7 +104,8 @@ LEFT JOIN LEFT JOIN LC_CALC_CONDITION LCC ON LCC.CONTRACT_ID=LFI.CONTRACT_ID LEFT JOIN - LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LFI.CONTRACT_ID + LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LFI.CONTRACT_ID and LEC.car_attribute='head' +LEFT JOIN vi_car_data vcd on LEC.modelId=vcd.modelId LEFT JOIN (SELECT CI.CUSTOMERID,MAX(CI.CUSTOMERNAME) AS CUSTOMERNAME,MAX(CI2.CERTID) AS CERTID,MAX(CI2.FAMILYMONTHINCOME) AS FAMILYMONTHINCOME,MAX(CA.FULLADDRESS) AS FULLADDRESS,MAX(CA2.BANK_NAME) AS BANK_NAME,MAX(CA2.ACC_NUMBER) AS ACC_NUMBER,MAX(CI2.NATIVEPLACE) AS NATIVEPLACE,MAX(CI2.SEX) AS SEX,MAX(CI2.CERTTYPE) AS CERTTYPE,MAX(CI2.MARRIAGE) AS MARRIAGE,MAX(CF.NAME) AS NAME FROM CUSTOMER_INFO CI LEFT JOIN CUSTOMER_PERSON CI2 ON CI2.CUSTOMERID=CI.CUSTOMERID LEFT JOIN CUSTOMER_ADDRESS CA ON CA.CUSTOMERID=CI.CUSTOMERID LEFT JOIN CUSTOMER_ACCOUNT CA2 ON CA2.CUSTOMERID=CI.CUSTOMERID LEFT JOIN CUSTOMER_FAMILY CF ON CF.CUSTOMERID=CI.CUSTOMERID AND CF.SPOUSE_='Y' GROUP BY CI.CUSTOMERID)CI ON CI.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN @@ -139,14 +140,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b670f702ed0170f7fd7b910004 + 2c9c81b9719762ea0173ecaceb560337 subjectname STRING subjectname 100 - 0 + 64 true false @@ -158,14 +159,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190119 + 2c9c81b9719762ea0173ecaceb56031e PROJECT_NO STRING PROJECT_NO 100 - 1 + 65 true false @@ -177,14 +178,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e54419011e + 2c9c81b9719762ea0173ecaceb560351 CONTRACT_NUMBER STRING CONTRACT_NUMBER 100 - 2 + 66 true false @@ -196,14 +197,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900f0 + 2c9c81b9719762ea0173ecaceb560340 DISTRIBUTOR_NAME STRING DISTRIBUTOR_NAME 100 - 3 + 67 true false @@ -215,14 +216,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190107 + 2c9c81b9719762ea0173ecaceb56032d JXS_PROVINCE STRING JXS_PROVINCE 100 - 4 + 68 true false @@ -234,14 +235,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190106 + 2c9c81b9719762ea0173ecaceb56033b CUSTOMERNAME STRING CUSTOMERNAME 100 - 5 + 69 true false @@ -253,14 +254,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900f3 + 2c9c81b9719762ea0173ecaceb56031f SEX STRING SEX 100 - 6 + 70 true false @@ -272,14 +273,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e54419010b + 2c9c81b9719762ea0173ecaceb56031c CERTTYPE STRING CERTTYPE 100 - 7 + 71 true false @@ -291,14 +292,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190115 + 2c9c81b9719762ea0173ecaceb56034c CERTID STRING CERTID 100 - 8 + 72 true false @@ -310,14 +311,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190105 + 2c9c81b9719762ea0173ecaceb560341 AGE STRING AGE 100 - 9 + 73 true false @@ -329,14 +330,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900fc + 2c9c81b9719762ea0173ecaceb560349 MARITAL_STATUS STRING MARITAL_STATUS 100 - 10 + 74 true false @@ -348,14 +349,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900fd + 2c9c81b9719762ea0173ecaceb560347 YEAR_MONEY NUMBER YEAR_MONEY 100 - 11 + 75 true false @@ -367,14 +368,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900f6 + 2c9c81b9719762ea0173ecaceb560321 JZ_PROVINCE STRING JZ_PROVINCE 100 - 12 + 76 true false @@ -386,14 +387,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190120 + 2c9c81b9719762ea0173ecaceb56032b JZ_CITY STRING JZ_CITY 100 - 13 + 77 true false @@ -405,14 +406,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190110 + 2c9c81b9719762ea0173ecaceb560353 HJ_PROVINCE STRING HJ_PROVINCE 100 - 14 + 78 true false @@ -424,14 +425,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900fe + 2c9c81b9719762ea0173ecaceb56032a HJ_CITY STRING HJ_CITY 100 - 15 + 79 true false @@ -443,14 +444,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190117 + 2c9c81b9719762ea0173ecaceb56033c FK_MONEY NUMBER - + FK_MONEY 100 - 16 + 80 true false @@ -462,14 +463,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190116 + 2c9c81b9719762ea0173ecaceb56034d FK_DATE STRING FK_DATE 100 - 17 + 81 true false @@ -481,14 +482,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190101 + 2c9c81b9719762ea0173ecaceb560342 PRODUCT_NAME STRING PRODUCT_NAME 100 - 18 + 82 true false @@ -500,14 +501,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190109 + 2c9c81b9719762ea0173ecaceb56033f YEAR_RATE NUMBER YEAR_RATE 100 - 19 + 83 true false @@ -519,14 +520,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190114 + 2c9c81b9719762ea0173ecaceb56034a LEASE_TERM NUMBER LEASE_TERM 100 - 20 + 84 true false @@ -538,14 +539,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e54419010f + 2c9c81b9719762ea0173ecaceb56032e FIRST_PAYMENT_RATIO NUMBER FIRST_PAYMENT_RATIO 100 - 21 + 85 true false @@ -557,14 +558,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190102 + 2c9c81b9719762ea0173ecaceb560348 CAUTION_MONEY_RATIO NUMBER CAUTION_MONEY_RATIO 100 - 22 + 86 true false @@ -576,14 +577,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e54419010a + 2c9c81b9719762ea0173ecaceb56034e REFUND_BANK STRING REFUND_BANK 100 - 23 + 87 true false @@ -595,14 +596,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190103 + 2c9c81b9719762ea0173ecaceb560331 REFUND_ACC_NUMBER STRING REFUND_ACC_NUMBER 100 - 24 + 88 true false @@ -614,14 +615,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900f1 + 2c9c81b9719762ea0173ecaceb56033d REFUND_FREQUENCY STRING REFUND_FREQUENCY 100 - 25 + 89 true false @@ -633,14 +634,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190118 + 2c9c81b9719762ea0173ecaceb56032f REFUND_WAY STRING REFUND_WAY 100 - 26 + 90 true false @@ -652,14 +653,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190124 + 2c9c81b9719762ea0173ecaceb560319 BRAND STRING BRAND 100 - 27 + 91 true false @@ -671,14 +672,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900f4 + 2c9c81b9719762ea0173ecaceb560326 CAR_TYPE STRING CAR_TYPE 100 - 28 + 92 true false @@ -690,14 +691,33 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900f2 + 2c9c81b974571fbf0174965a50240006 + cartype + STRING + + + cartype + 100 + 93 + true + + false + false + false + false + + + + + + 2c9c81b9719762ea0173ecaceb560324 MODEL STRING MODEL 100 - 29 + 94 true false @@ -709,14 +729,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190111 + 2c9c81b9719762ea0173ecaceb560333 USED_CAR_DEADLINE STRING USED_CAR_DEADLINE 100 - 30 + 95 true false @@ -728,14 +748,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190121 + 2c9c81b9719762ea0173ecaceb560327 EXPIRE_DATE STRING EXPIRE_DATE 100 - 31 + 96 true false @@ -747,14 +767,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190104 + 2c9c81b9719762ea0173ecaceb560346 REFUND_DATE STRING REFUND_DATE 100 - 32 + 97 true false @@ -766,14 +786,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190122 + 2c9c81b9719762ea0173ecaceb56033a SPOUSE_NAME STRING SPOUSE_NAME 100 - 33 + 98 true false @@ -785,14 +805,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900fb + 2c9c81b9719762ea0173ecaceb560332 IS_NO_ASSURE STRING IS_NO_ASSURE 100 - 34 + 99 true false @@ -804,14 +824,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441a0125 + 2c9c81b9719762ea0173ecaceb560335 ASSURE_NAME STRING ASSURE_NAME 100 - 35 + 100 true false @@ -823,14 +843,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900f7 + 2c9c81b9719762ea0173ecaceb560336 USED_ASSESS_MONEY STRING USED_ASSESS_MONEY 100 - 36 + 101 true false @@ -842,14 +862,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e54419011c + 2c9c81b9719762ea0173ecaceb560350 WC_CORPUS NUMBER WC_CORPUS 100 - 37 + 102 true false @@ -861,14 +881,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900f8 + 2c9c81b9719762ea0173ecaceb560352 OVERDUE_DAYS NUMBER OVERDUE_DAYS 100 - 38 + 103 true false @@ -880,14 +900,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e54419011d + 2c9c81b9719762ea0173ecaceb560322 YQ_CORPUS NUMBER YQ_CORPUS 100 - 39 + 104 true false @@ -899,14 +919,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e54419010d + 2c9c81b9719762ea0173ecaceb560338 YQ_INTEREST NUMBER YQ_INTEREST 100 - 40 + 105 true false @@ -918,14 +938,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190123 + 2c9c81b9719762ea0173ecaceb560343 YQ_HANDLING_CHARGE STRING YQ_HANDLING_CHARGE 100 - 41 + 106 true false @@ -937,14 +957,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900f9 + 2c9c81b9719762ea0173ecaceb560328 YQ_PENALTY NUMBER YQ_PENALTY 100 - 42 + 107 true false @@ -956,14 +976,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e54419011f + 2c9c81b9719762ea0173ecaceb560316 OVERDUE_CON NUMBER OVERDUE_CON 100 - 43 + 108 true false @@ -975,14 +995,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900f5 + 2c9c81b9719762ea0173ecaceb560339 MAX_OVERDUE_DAYS NUMBER MAX_OVERDUE_DAYS 100 - 44 + 109 true false @@ -994,14 +1014,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e54419010e + 2c9c81b9719762ea0173ecaceb56031b APPLY_MONEY STRING APPLY_MONEY 100 - 45 + 110 true false @@ -1013,14 +1033,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190100 + 2c9c81b9719762ea0173ecaceb560317 IS_NO_PLEDGE STRING IS_NO_PLEDGE 100 - 46 + 111 true false @@ -1032,14 +1052,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900fa + 2c9c81b9719762ea0173ecaceb56034b RENT NUMBER RENT 100 - 47 + 112 true false @@ -1051,14 +1071,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e54419011b + 2c9c81b9719762ea0173ecaceb560329 WC_RENT NUMBER WC_RENT 100 - 48 + 113 true false @@ -1070,14 +1090,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190112 + 2c9c81b9719762ea0173ecaceb56031a WC_INTEREST NUMBER WC_INTEREST 100 - 49 + 114 true false @@ -1089,14 +1109,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441900ff + 2c9c81b9719762ea0173ecaceb56032c FRAME_NUMBER STRING FRAME_NUMBER 100 - 50 + 115 true false @@ -1108,14 +1128,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441a0126 + 2c9c81b9719762ea0173ecaceb560334 ENGINE_NUMBER STRING ENGINE_NUMBER 100 - 51 + 116 true false @@ -1127,14 +1147,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e54419011a + 2c9c81b9719762ea0173ecaceb560344 MODEL2 STRING MODEL2 100 - 52 + 117 true false @@ -1146,14 +1166,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190113 + 2c9c81b9719762ea0173ecaceb560345 鏄惁鏈変繚闄 STRING 鏄惁鏈変繚闄 100 - 53 + 118 true false @@ -1165,14 +1185,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e544190108 + 2c9c81b9719762ea0173ecaceb560325 淇濋櫓鍏徃鍚嶇О STRING 淇濋櫓鍏徃鍚嶇О 100 - 54 + 119 true false @@ -1184,14 +1204,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e54419010c + 2c9c81b9719762ea0173ecaceb560320 淇濋櫓鍒版湡鏃 STRING 淇濋櫓鍒版湡鏃 100 - 55 + 120 true false @@ -1203,14 +1223,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b670f702ed0170f7fd7b910003 + 2c9c81b9719762ea0173ecaceb560330 LICENSE_PLATE_NUMBER STRING LICENSE_PLATE_NUMBER 100 - 56 + 121 true false @@ -1222,14 +1242,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b670f702ed0170f7fd7b920005 + 2c9c81b9719762ea0173ecaceb560323 Invoice_number STRING Invoice_number 100 - 57 + 122 true false @@ -1241,14 +1261,14 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b670f702ed0170f7fd7b910002 + 2c9c81b9719762ea0173ecaceb56034f Invoice_money STRING Invoice_money 100 - 58 + 123 true false @@ -1260,14 +1280,71 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b670f702ed0170f7fd7b530001 + 2c9c81b9719762ea0173ecaceb560318 Invoice_date STRING Invoice_date 100 - 59 + 124 + true + + false + false + false + false + + + + + + 2c9c81b9719762ea0173ecaceb56033e + ASSETTRANSFERER + STRING + + + ASSETTRANSFERER + 100 + 125 + true + + false + false + false + false + + + + + + 2c9c81b9719762ea0173ecaceb56031d + TRANSFERDATE + STRING + + + TRANSFERDATE + 100 + 126 + true + + false + false + false + false + + + + + + 2c9c81b9719762ea0173fb4f14e20356 + TURNOUTREMARKS + STRING + + + TURNOUTREMARKS + 100 + 127 true false @@ -1284,7 +1361,7 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441a0127 + 2c9c81b9719762ea0173ecaceb560354 PROJECT_NO PROJECT_NO @@ -1294,7 +1371,7 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID 0 - 2c9c81b969188a33016f12e5441a0128 + 2c9c81b9719762ea0173ecaceb560355 CONTRACT_NUMBER CONTRACT_NUMBER @@ -1317,7 +1394,7 @@ LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID - 2c9c81b969188a33016f12e5441a0129 + 2c9c81b9719762ea0173ecaceb550315 0 0 0 diff --git a/鎶ヨ〃/璧勪骇澶勭疆鎶ヨ〃/閫炬湡绉熼噾浠e伩璁板綍琛.xml b/鎶ヨ〃/璧勪骇澶勭疆鎶ヨ〃/閫炬湡绉熼噾浠e伩璁板綍琛.xml index 5b703e630..b51082abf 100644 --- a/鎶ヨ〃/璧勪骇澶勭疆鎶ヨ〃/閫炬湡绉熼噾浠e伩璁板綍琛.xml +++ b/鎶ヨ〃/璧勪骇澶勭疆鎶ヨ〃/閫炬湡绉熼噾浠e伩璁板綍琛.xml @@ -16,7 +16,7 @@ - 4028877d6eb1b449016eb4cf3c0a016b + 2c9c81b969188a33016f4bffc88101ed 閫炬湡绉熼噾浠e伩璁板綍琛 OVERDUE_RENT_COMPENSATORY_REPORT 52 @@ -24,13 +24,13 @@ 4028877d6eb1b449016eb4ceabe30169 - 4028877d6edfa990016ef46f96320006 + 2c9c81b969188a33016f4bffc88301fb - 4028877d6eb1b449016eb4cf3c01016a + 2c9c81b969188a33016f4bffc87b01ec閫炬湡绉熼噾浠e伩璁板綍琛OVERDUE_RENT_COMPENSATORY_REPORT2c9023815726a036015726a496b00001 @@ -52,7 +52,7 @@ FROM LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=DDI.CONTRACT_ID LEFT JOIN - LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID + LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID and LEC.car_attribute='head' LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN @@ -68,7 +68,7 @@ LEFT JOIN - 4028877d6edfa990016ef46f96360009 + 2c9c81b969188a33016f4bffc88301f6 DISTRIBUTOR_NAME STRING @@ -87,7 +87,7 @@ LEFT JOIN - 4028877d6edfa990016ef46f96360008 + 2c9c81b969188a33016f4bffc88301f1 CUST_INFO STRING @@ -106,7 +106,7 @@ LEFT JOIN - 4028877d6edfa990016ef46f9636000c + 2c9c81b969188a33016f4bffc88301f4 CONTRACT_NUMBER STRING @@ -125,7 +125,7 @@ LEFT JOIN - 4028877d6edfa990016ef46f96360011 + 2c9c81b969188a33016f4bffc88301f7 FRAME_NUMBER STRING @@ -144,7 +144,7 @@ LEFT JOIN - 4028877d6edfa990016ef46f9636000a + 2c9c81b969188a33016f4bffc88301f8 SUM_LIST NUMBER @@ -163,7 +163,7 @@ LEFT JOIN - 4028877d6edfa990016ef46f9636000d + 2c9c81b969188a33016f4bffc88301f3 YHK_LIST NUMBER @@ -182,7 +182,7 @@ LEFT JOIN - 4028877d6edfa990016ef46f9636000f + 2c9c81b969188a33016f4bffc88301f2 ZZHK_LIST NUMBER @@ -201,7 +201,7 @@ LEFT JOIN - 4028877d6edfa990016ef46f9636000e + 2c9c81b969188a33016f4bffc88301ee LJ_LIST NUMBER @@ -220,7 +220,7 @@ LEFT JOIN - 4028877d6edfa990016ef46f96360007 + 2c9c81b969188a33016f4bffc88301ef LXDC_LIST NUMBER @@ -239,7 +239,7 @@ LEFT JOIN - 4028877d6edfa990016ef46f96360010 + 2c9c81b969188a33016f4bffc88301f5 YES_NO_3 STRING @@ -258,7 +258,7 @@ LEFT JOIN - 4028877d6edfa990016ef46f9636000b + 2c9c81b969188a33016f4bffc88301f0 YES_NO_6 STRING @@ -282,7 +282,7 @@ LEFT JOIN - 4028877d6edfa990016ef46f96360013 + 2c9c81b969188a33016f4bffc88301f9 DISTRIBUTOR_NAME DISTRIBUTOR_NAME @@ -292,7 +292,7 @@ LEFT JOIN 0 - 4028877d6edfa990016ef46f96360012 + 2c9c81b969188a33016f4bffc88301fa CONTRACT_NUMBER CONTRACT_NUMBER @@ -315,12 +315,12 @@ LEFT JOIN - 4028877d6edfa990016ef46f96320006 + 2c9c81b969188a33016f4bffc88301fb 0 0 0 - TABLE#4028877d6eb1b449016eb4cf3c01016a - 4028877d6eb1b449016eb4cf3c0a016b + TABLE#2c9c81b969188a33016f4bffc87b01ec + 2c9c81b969188a33016f4bffc88101ed TABLE