From 6d3ad4ac15ca72be11cb66262f2d361b3513ff8c Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 20 Mar 2020 20:57:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=9A=E6=81=AF=E5=87=8F?= =?UTF-8?q?=E5=85=8D=E6=B5=81=E7=A8=8B=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_sql/投产SQL/V20200404/tft_20200404.sql | 8 + .../com/tenwa/apzl/comm/BillstopayImport.java | 19 +- .../JudgmentPenaltyAdjustMoneyGreater.java | 33 +++ .../JudgmentPenaltyAdjustMoneyLess.java | 32 +++ 报表/资产处置报表/入池资产报表.xml | 212 +++++++++++++----- 5 files changed, 246 insertions(+), 58 deletions(-) create mode 100644 src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyGreater.java create mode 100644 src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyLess.java diff --git a/src_sql/投产SQL/V20200404/tft_20200404.sql b/src_sql/投产SQL/V20200404/tft_20200404.sql index c439bd615..a745d127a 100644 --- a/src_sql/投产SQL/V20200404/tft_20200404.sql +++ b/src_sql/投产SQL/V20200404/tft_20200404.sql @@ -156,5 +156,13 @@ insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddesc delete from FLOW_MODEL where FlowNo='FundPaymentCarFlow' AND PhaseNo='1000'; 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('FundPaymentCarFlow','1000','1040','ͨ',NULL,NULL,'!.ͶŲʽ𸶿ʱʽ(#ObjectNo)+!.ͬϢʱʽ(#ObjectNo)+!̲ͨ.Ŀ״̬(#ObjectNo,21)+!.ӿƽ̨ҵͨ(#ObjectNo)+!.ƱϢʱʽ(#ObjectNo)','{\"system\"}',NULL,'commroute',NULL,NULL,NULL,NULL,NULL,NULL,NULL,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,'287','472','50','50','1',NULL,'END',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +-- ӷƱϢķԤ +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 ('()','0040','0040','ƱϢǷд','','20','','','1','10',NULL,'ƱϢд','дƱϢ','SELECT CASE WHEN id IS NOT NULL THEN ''true'' ELSE ''false'' END FROM lb_Invoice_info_temp WHERE flow_unid=''#{ObjectNo}''','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +INSERT INTO SCENARIO_RELATIVE (scenarioid,groupid,modelid) VALUES ('()','0020','0040'); + +-- ӷϢж +insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('','Ϣжϴ100Ԫ','Bizlet','Ϣжϴ100Ԫ','String','String ObjectNo','com.tenwa.lease.flow.project.businessapply.JudgmentPenaltyAdjustMoneyGreater','','','','','',''); +insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('','ϢжСڵ100Ԫ','Bizlet','ϢжСڵ100Ԫ','String','String ObjectNo','com.tenwa.lease.flow.project.businessapply.JudgmentPenaltyAdjustMoneyLess','','','','','',''); + diff --git a/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java b/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java index c96d834fa..9ea733061 100644 --- a/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java +++ b/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java @@ -2,8 +2,10 @@ package com.tenwa.apzl.comm; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.JBOTransaction; @@ -40,9 +42,10 @@ public class BillstopayImport extends BaseImportExcelCallBack{ */ List> list = new ArrayList>(); Map map = new HashMap(); + List arrayList = new ArrayList(); for(BizObject bo:importObjects){ WX_order_number=bo.getAttribute("WX_order_number").getString(); - + arrayList.add(WX_order_number); // ͨexcelеݲѯı, жǷظ sql1="SELECT WX_order_number FROM wx_pay_the_bills WHERE WX_order_number='"+WX_order_number+"'"; List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); @@ -56,5 +59,19 @@ public class BillstopayImport extends BaseImportExcelCallBack{ error = error.substring(1); throw new BusinessException(error+"Ѵ "); } + long count = arrayList.stream().distinct().count(); + boolean isRepeat = count < arrayList.size(); + if(isRepeat){ + Set set = new HashSet<>(); + Set exist = new HashSet<>(); + for (String s : arrayList) { + if (set.contains(s)) { + exist.add(s); + } else { + set.add(s); + } + } + throw new BusinessException("exclе΢Ŷ:"+String.join(", ", exist)+"ظ"); + } } } diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyGreater.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyGreater.java new file mode 100644 index 000000000..d444e3451 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyGreater.java @@ -0,0 +1,33 @@ +package com.tenwa.lease.flow.project.businessapply; + + +import java.util.List; +import java.util.Map; + +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.baseBussion.BaseBussiness; + + +public class JudgmentPenaltyAdjustMoneyGreater extends BaseBussiness { + + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String flowUnid=this.getAttribute("ObjectNo").toString(); + String sql = "SELECT SUM(PENALTY_ADJUST) penaltyAdjustMoney FROM LC_RENT_INCOME_TEMP WHERE FLOWUNID='"+flowUnid+"'"; + List> penaltyAdjustMoney = DataOperatorUtil.getDataBySql(Sqlca, sql , null ); + + String sMessage=""; + Double money = 0.0; + if(penaltyAdjustMoney.size() > 0){ + money=Double.parseDouble(penaltyAdjustMoney.get(0).get("penaltyAdjustMoney")); + } + if(money > 100){//100 + sMessage="true"; + }else { + sMessage="false"; + } + return sMessage; + } +} \ No newline at end of file diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyLess.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyLess.java new file mode 100644 index 000000000..f6dfdef1d --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyLess.java @@ -0,0 +1,32 @@ +package com.tenwa.lease.flow.project.businessapply; + + +import java.util.List; +import java.util.Map; + +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.baseBussion.BaseBussiness; + +public class JudgmentPenaltyAdjustMoneyLess extends BaseBussiness { + + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String flowUnid=this.getAttribute("ObjectNo").toString(); + String sql = "SELECT SUM(PENALTY_ADJUST) penaltyAdjustMoney FROM LC_RENT_INCOME_TEMP WHERE FLOWUNID='"+flowUnid+"'"; + List> penaltyAdjustMoney = DataOperatorUtil.getDataBySql(Sqlca, sql , null ); + + String sMessage=""; + Double money = 0.0; + if(penaltyAdjustMoney.size() > 0){ + money=Double.parseDouble(penaltyAdjustMoney.get(0).get("penaltyAdjustMoney")); + } + if(money <= 100){//С100 + sMessage="true"; + }else { + sMessage="false"; + } + return sMessage; + } +} \ No newline at end of file diff --git a/报表/资产处置报表/入池资产报表.xml b/报表/资产处置报表/入池资产报表.xml index 1f2498aa4..8a7c4d6a4 100644 --- a/报表/资产处置报表/入池资产报表.xml +++ b/报表/资产处置报表/入池资产报表.xml @@ -36,6 +36,7 @@ 2c9023815726a036015726a496b00001 COMPLEXSQL SELECT +lpi.subjectname, LPI.PROJECT_NO, LCI.CONTRACT_NUMBER, DI.DISTRIBUTOR_NAME, @@ -90,7 +91,8 @@ LEC.MODEL AS MODEL2, '' AS '是否有保险', '' 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 FROM (SELECT ID,DISTRIBUTOR_ID,CONTRACT_NUMBER FROM LB_CONTRACT_INFO WHERE BUSINESSTYPE='1' AND CONTRACT_STATUS='31')LCI LEFT JOIN @@ -132,9 +134,29 @@ LEFT JOIN LEFT JOIN VI_OVERDUE_CONTRACT2 VVC ON VVC.CONTRACT_ID=LFI.CONTRACT_ID LEFT JOIN - LB_CAR_LICENSE_PLATE_INFO LCLPI ON LCLPI.CONTRACT_ID=LCI.ID + LB_CAR_LICENSE_PLATE_INFO LCLPI ON LCLPI.CONTRACT_ID=LCI.ID +LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID + + 2c9c81b670f702ed0170f7fd7b910004 + subjectname + STRING + + + subjectname + 100 + 0 + true + + false + false + false + false + + + + 2c9c81b969188a33016f12e544190119 PROJECT_NO @@ -143,7 +165,7 @@ LEFT JOIN PROJECT_NO 100 - 55 + 1 true false @@ -162,7 +184,7 @@ LEFT JOIN CONTRACT_NUMBER 100 - 56 + 2 true false @@ -181,7 +203,7 @@ LEFT JOIN DISTRIBUTOR_NAME 100 - 57 + 3 true false @@ -200,7 +222,7 @@ LEFT JOIN JXS_PROVINCE 100 - 58 + 4 true false @@ -219,7 +241,7 @@ LEFT JOIN CUSTOMERNAME 100 - 59 + 5 true false @@ -238,7 +260,7 @@ LEFT JOIN SEX 100 - 60 + 6 true false @@ -257,7 +279,7 @@ LEFT JOIN CERTTYPE 100 - 61 + 7 true false @@ -276,7 +298,7 @@ LEFT JOIN CERTID 100 - 62 + 8 true false @@ -295,7 +317,7 @@ LEFT JOIN AGE 100 - 63 + 9 true false @@ -314,7 +336,7 @@ LEFT JOIN MARITAL_STATUS 100 - 64 + 10 true false @@ -333,7 +355,7 @@ LEFT JOIN YEAR_MONEY 100 - 65 + 11 true false @@ -352,7 +374,7 @@ LEFT JOIN JZ_PROVINCE 100 - 66 + 12 true false @@ -371,7 +393,7 @@ LEFT JOIN JZ_CITY 100 - 67 + 13 true false @@ -390,7 +412,7 @@ LEFT JOIN HJ_PROVINCE 100 - 68 + 14 true false @@ -409,7 +431,7 @@ LEFT JOIN HJ_CITY 100 - 69 + 15 true false @@ -428,7 +450,7 @@ LEFT JOIN FK_MONEY 100 - 70 + 16 true false @@ -447,7 +469,7 @@ LEFT JOIN FK_DATE 100 - 71 + 17 true false @@ -466,7 +488,7 @@ LEFT JOIN PRODUCT_NAME 100 - 72 + 18 true false @@ -485,7 +507,7 @@ LEFT JOIN YEAR_RATE 100 - 73 + 19 true false @@ -504,7 +526,7 @@ LEFT JOIN LEASE_TERM 100 - 74 + 20 true false @@ -523,7 +545,7 @@ LEFT JOIN FIRST_PAYMENT_RATIO 100 - 75 + 21 true false @@ -542,7 +564,7 @@ LEFT JOIN CAUTION_MONEY_RATIO 100 - 76 + 22 true false @@ -561,7 +583,7 @@ LEFT JOIN REFUND_BANK 100 - 77 + 23 true false @@ -580,7 +602,7 @@ LEFT JOIN REFUND_ACC_NUMBER 100 - 78 + 24 true false @@ -599,7 +621,7 @@ LEFT JOIN REFUND_FREQUENCY 100 - 79 + 25 true false @@ -618,7 +640,7 @@ LEFT JOIN REFUND_WAY 100 - 80 + 26 true false @@ -637,7 +659,7 @@ LEFT JOIN BRAND 100 - 81 + 27 true false @@ -656,7 +678,7 @@ LEFT JOIN CAR_TYPE 100 - 82 + 28 true false @@ -675,7 +697,7 @@ LEFT JOIN MODEL 100 - 83 + 29 true false @@ -694,7 +716,7 @@ LEFT JOIN USED_CAR_DEADLINE 100 - 84 + 30 true false @@ -713,7 +735,7 @@ LEFT JOIN EXPIRE_DATE 100 - 85 + 31 true false @@ -732,7 +754,7 @@ LEFT JOIN REFUND_DATE 100 - 86 + 32 true false @@ -751,7 +773,7 @@ LEFT JOIN SPOUSE_NAME 100 - 87 + 33 true false @@ -770,7 +792,7 @@ LEFT JOIN IS_NO_ASSURE 100 - 88 + 34 true false @@ -789,7 +811,7 @@ LEFT JOIN ASSURE_NAME 100 - 89 + 35 true false @@ -808,7 +830,7 @@ LEFT JOIN USED_ASSESS_MONEY 100 - 90 + 36 true false @@ -827,7 +849,7 @@ LEFT JOIN WC_CORPUS 100 - 91 + 37 true false @@ -846,7 +868,7 @@ LEFT JOIN OVERDUE_DAYS 100 - 92 + 38 true false @@ -865,7 +887,7 @@ LEFT JOIN YQ_CORPUS 100 - 93 + 39 true false @@ -884,7 +906,7 @@ LEFT JOIN YQ_INTEREST 100 - 94 + 40 true false @@ -903,7 +925,7 @@ LEFT JOIN YQ_HANDLING_CHARGE 100 - 95 + 41 true false @@ -922,7 +944,7 @@ LEFT JOIN YQ_PENALTY 100 - 96 + 42 true false @@ -941,7 +963,7 @@ LEFT JOIN OVERDUE_CON 100 - 97 + 43 true false @@ -960,7 +982,7 @@ LEFT JOIN MAX_OVERDUE_DAYS 100 - 98 + 44 true false @@ -979,7 +1001,7 @@ LEFT JOIN APPLY_MONEY 100 - 99 + 45 true false @@ -998,7 +1020,7 @@ LEFT JOIN IS_NO_PLEDGE 100 - 100 + 46 true false @@ -1017,7 +1039,7 @@ LEFT JOIN RENT 100 - 101 + 47 true false @@ -1036,7 +1058,7 @@ LEFT JOIN WC_RENT 100 - 102 + 48 true false @@ -1055,7 +1077,7 @@ LEFT JOIN WC_INTEREST 100 - 103 + 49 true false @@ -1074,7 +1096,7 @@ LEFT JOIN FRAME_NUMBER 100 - 104 + 50 true false @@ -1093,7 +1115,7 @@ LEFT JOIN ENGINE_NUMBER 100 - 105 + 51 true false @@ -1112,7 +1134,7 @@ LEFT JOIN MODEL2 100 - 106 + 52 true false @@ -1131,7 +1153,7 @@ LEFT JOIN 是否有保险 100 - 107 + 53 true false @@ -1150,7 +1172,7 @@ LEFT JOIN 保险公司名称 100 - 108 + 54 true false @@ -1169,7 +1191,83 @@ LEFT JOIN 保险到期日 100 - 109 + 55 + true + + false + false + false + false + + + + + + 2c9c81b670f702ed0170f7fd7b910003 + LICENSE_PLATE_NUMBER + STRING + + + LICENSE_PLATE_NUMBER + 100 + 56 + true + + false + false + false + false + + + + + + 2c9c81b670f702ed0170f7fd7b920005 + Invoice_number + STRING + + + Invoice_number + 100 + 57 + true + + false + false + false + false + + + + + + 2c9c81b670f702ed0170f7fd7b910002 + Invoice_money + STRING + + + Invoice_money + 100 + 58 + true + + false + false + false + false + + + + + + 2c9c81b670f702ed0170f7fd7b530001 + Invoice_date + STRING + + + Invoice_date + 100 + 59 true false