diff --git a/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java b/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java index f9461a040..dbf40a562 100644 --- a/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java +++ b/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java @@ -30,10 +30,12 @@ import com.tenwa.officetempalte.importcallback.ImportCallBack; import com.tenwa.officetempalte.util.ExcelImportUtil; import com.tenwa.officetempalte.util.FileOperatorUtil; import com.tenwa.officetempalte.util.PoiExcelUtil; +import com.tenwa.reckon.util.DateUtil; import com.tenwa.reckon.util.UUIDUtil; import jbo.app.tenwa.calc.LC_CARD_DEDUCT_DOC; import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; +import jbo.com.tenwa.lease.comm.LB_FILE_ARCHIVING_INFO; /** * 默认excel导入处理类 * */ @@ -534,7 +536,8 @@ public class BaseImportExcelCallBack extends ImportCallBack{ ASUser CurUser,Map model,ListimportObjects,Sheet sheet,JBOTransaction tx,Transaction Sqlca) throws Exception { BizObjectManager lciManage=JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME,Sqlca); - + BizObjectManager lfaiManage = JBOFactory.getBizObjectManager(LB_FILE_ARCHIVING_INFO.CLASS_NAME,Sqlca); + BizObject lfai = null; String importClass=FileOperatorUtil.nullToString(importConfig.getAttribute("relativeclass").getValue(),"");//导入对应的类 if(importClass.length()<2){ throw new BusinessException("导入没有"+importConfig.getAttribute("sheetname").getString()+"配置对应该的表或类"); @@ -611,7 +614,8 @@ public class BaseImportExcelCallBack extends ImportCallBack{ if("合同编号".equals(headername)){ BizObject lci = lciManage.createQuery(" contract_no=:contract_no ").setParameter("contract_no", value).getSingleResult(false); importObject.setAttributeValue("contract_id", lci==null?"":lci.getAttribute("id").toString()); - + lfai = lfaiManage.createQuery("CONTRACT_NUMBER=:CONTRACT_NUMBER ").setParameter("CONTRACT_NUMBER", value).getSingleResult(true); + } }else if(isImport.equals("yes")){ exceptionMessage.add("导入第"+(rowIndex+1)+"行中第"+(colIndex+1)+"列中没有数据！"); @@ -619,9 +623,27 @@ public class BaseImportExcelCallBack extends ImportCallBack{ } } - //设计归档人 - importObject.setAttributeValue("ARCHIVING_PERSON", CurUser.getUserName()); - //每列数据从据从前台取数并判断是否必填，和数据类型 + if(lfai != null ){ + String fileNumber = lfai.getAttribute("FILE_NUMBER") == null ? "":lfai.getAttribute("FILE_NUMBER").getString(); + if("null".equals(fileNumber) || fileNumber.length() <= 0 ) { + importObject.setAttributeValue("ARCHIVING_PERSON", lfai.getAttribute("ARCHIVING_PERSON")==null?"":lfai.getAttribute("ARCHIVING_PERSON").getString()); + importObject.setAttributeValue("INPUTUSERID", lfai.getAttribute("INPUTUSERID")==null?"":lfai.getAttribute("INPUTUSERID").getString()); + importObject.setAttributeValue("INPUTORGID", lfai.getAttribute("INPUTORGID")==null?"":lfai.getAttribute("INPUTORGID").getString()); + importObject.setAttributeValue("INPUTTIME", lfai.getAttribute("INPUTTIME")==null?"":lfai.getAttribute("INPUTTIME").getString()); + importObject.setAttributeValue("FILE_EFFECT_TIME", lfai.getAttribute("FILE_EFFECT_TIME")==null?"":lfai.getAttribute("FILE_EFFECT_TIME").getString()); + importObject.setAttributeValue("FILE_BORROWING_TIME", lfai.getAttribute("FILE_BORROWING_TIME")==null?"":lfai.getAttribute("FILE_BORROWING_TIME").getString()); + importObject.setAttributeValue("MORTGAGE_COMPLETION_TIME", lfai.getAttribute("MORTGAGE_COMPLETION_TIME")==null?"":lfai.getAttribute("MORTGAGE_COMPLETION_TIME").getString()); + + importObject.setAttributeValue("UPDATEUSERID",CurUser.getUserID()); + importObject.setAttributeValue("UPDATEORGID", CurUser.getOrgID()); + importObject.setAttributeValue("UPDATETIME", DateUtil.getSystemTimeByFormat("yyyy/MM/dd")); + } + }else{ + importObject.setAttributeValue("INPUTUSERID",CurUser.getUserID()); + importObject.setAttributeValue("INPUTORGID", CurUser.getOrgID()); + importObject.setAttributeValue("INPUTTIME", DateUtil.getSystemTimeByFormat("yyyy/MM/dd")); + } + //每列数据从据从前台取数并判断是否必填，和数据类型 exceptionMessage.addAll(ExcelImportUtil.setImportOjbectDataFromPageAndCheck(columnMap,importObject,model,rowIndex+1)); try{ //每导入一行的回调类用来远行自定义的方法 diff --git a/src_sql/view/vi_products_number.sql b/src_sql/view/vi_products_number.sql index 8dc23fa42..6c116223a 100644 --- a/src_sql/view/vi_products_number.sql +++ b/src_sql/view/vi_products_number.sql @@ -3,7 +3,7 @@ CREATE VIEW apzl.vi_products_number AS SELECT bt.TYPENO,bt.TYPENAME,psl.payType,psl.LeasForm,psl.equip_type,psl.EFFECTIVEDATE,num.INCOME_NUMBER,num.fact_money,num.fact_date,bt.Attribute2,di.distributor_name FROM BUSINESS_TYPE bt LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON bt.typeno=psl.PRODUCTID -LEFT JOIN (SELECT lcc.INCOME_NUMBER INCOME_NUMBER,lci.product_id product_id,SUM(lfi.fact_money) fact_money,MIN(lfi.fact_date) fact_date,lci.distributor_id AS distributor_id +LEFT JOIN (SELECT lcc.INCOME_NUMBER INCOME_NUMBER,lci.product_id product_id,SUM(lcc.CLEAN_LEASE_MONEY) fact_money,MIN(lfi.fact_date) fact_date,lci.distributor_id AS distributor_id FROM lb_contract_info lci LEFT JOIN LC_CALC_CONDITION lcc ON lci.id=lcc.contract_id LEFT JOIN lc_fund_income lfi ON lci.id=lfi.contract_id AND lfi.pay_type='pay_type_out' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' WHERE lci.contract_status >=31 AND lci.contract_status <=100 diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql index 393ead24c..c26d21627 100644 --- a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql +++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql @@ -141,7 +141,7 @@ Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn 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 ('LB_INVOICE_INFO_TEMP','1040','1040','1','O','Invoice_number','Invoice_number','String','','发票号码','','1','Text','1','1','','','','32','1','0','1','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','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 ('LB_INVOICE_INFO_TEMP','1050','1050','1','O','Invoice_date','Invoice_date','String','','开票日期','','1','Date','3','2','','','','100','1','0','1','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','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 ('LB_INVOICE_INFO_TEMP','1060','1060','1','O','Invoice_money','Invoice_money','String','','开票金额','','1','Text','2','1','','','','20','1','0','1','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','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 ('LB_INVOICE_INFO_TEMP','1070','1070','1','O','tax_due','tax_due','String','','税金','','1','Text','2','1','','','','20','1','0','1','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','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 ('LB_INVOICE_INFO_TEMP','1070','1070','1','O','tax_due','tax_due','String','','税金','','1','Text','2','1','','','','20','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/04/24 16:06:23','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 ('LB_INVOICE_INFO_TEMP','1080','1080','1','O','flow_unid','flow_unid','String','','流程id','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','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 ('LB_INVOICE_INFO_TEMP','1110','1110','1','O','inputuserid','inputuserid','String','','登记人','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','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 ('LB_INVOICE_INFO_TEMP','1120','1120','1','O','inputorgid','inputorgid','String','','登记部门','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','','');