diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp index 1213efe59..428f586ce 100644 --- a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp +++ b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp @@ -39,7 +39,7 @@ String ros = "true"; if("业务申请分担".equals(soft)){ ros = "false"; - doTemp.appendJboWhere(" O.flow_name='业务申请流程' and O.PHASENAME='信审初审'"); + doTemp.appendJboWhere("( (O.flow_name='业务申请流程' and O.PHASENAME='信审初审') or ( O.flow_name='业务变更流程' and O.PHASENAME='信审专员初审') )"); }; if("付款业务分担".equals(soft)){ ros = "false"; diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index 2de1c494e..c117dfe68 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -83,8 +83,6 @@ CurPage.getCurComp().setAttribute("RightType", null); doTemp.setHtmlEvent("FRAME_NUMBER", "onChange", "checkFrameNumber");//校验车架号格式 doTemp.setHtmlEvent("FRAME_NUMBER2", "onChange", "checkFrameNumber2");//校验车架号格式 - doTemp.setHtmlEvent("FRAME_NUMBER3", "onChange", "checkFrameNumber3");//校验车架号格式 - doTemp.setHtmlEvent("FRAME_NUMBER4", "onChange", "checkFrameNumber4");//校验车架号格式 /* doTemp.setHtmlEvent("BRAND", "onChange", "selectCarType"); if((null!=RightType&& !RightType.equals("ReadOnly"))||(null!=ishistory&& !ishistory.equals("true"))){ @@ -240,12 +238,12 @@ if(!checkFrameNumber2()){ return; } - if(!checkFrameNumber3()){ - return; - } - if(!checkFrameNumber4()){ - return; - } + //if(!checkFrameNumber3()){ + // return; + //} + //if(!checkFrameNumber4()){ + // return; + //} if(!checkRepeat()){ return; } @@ -508,79 +506,15 @@ } } - function checkFrameNumber3(){ - var vin = getItemValue(0,getRow(0),"FRAME_NUMBER3"); - if((typeof(vin) == "undefined" || vin == "")){ - setErrorTips("FRAME_NUMBER3",""); - return true; - } - var projectId = "<%=projectId%>"; - var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","checkCarNumber","projectId="+projectId+",plate_number="+vin); - if("EROOR"==sResult){ - setErrorTips("FRAME_NUMBER3","车架号已存在!"); - return false; - } - if (!getCheckCode(vin)){ - setErrorTips("FRAME_NUMBER3","车架号格式有误！"); - return false; - }else{ - setErrorTips("FRAME_NUMBER3",""); - return true; - } - - } - function checkFrameNumber4(){ - var vin = getItemValue(0,getRow(0),"FRAME_NUMBER4"); - if((typeof(vin) == "undefined" || vin == "")){ - setErrorTips("FRAME_NUMBER4",""); - return true; - } - var projectId = "<%=projectId%>"; - var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","checkCarNumber","projectId="+projectId+",plate_number="+vin); - if("EROOR"==sResult){ - setErrorTips("FRAME_NUMBER4","车架号已存在!"); - return false; - } - if (!getCheckCode(vin)){ - setErrorTips("FRAME_NUMBER4","车架号格式有误！"); - return false; - }else{ - setErrorTips("FRAME_NUMBER4",""); - return true; - } - - } + //校验重复 function checkRepeat(){ var vin = getItemValue(0,getRow(0),"FRAME_NUMBER"); var vin2 = getItemValue(0,getRow(0),"FRAME_NUMBER2"); - var vin3 = getItemValue(0,getRow(0),"FRAME_NUMBER3"); - var vin4 = getItemValue(0,getRow(0),"FRAME_NUMBER4"); if((typeof(vin) != "undefined" && vin != "")){ if( vin==vin2 ){ alert("车架号1和车架号2重复"); return false; - }else if( vin==vin3 ){ - alert("车架号1和车架号3重复"); - return false; - }else if( vin==vin4 ){ - alert("车架号1和车架号4重复"); - return false; - } - } - if((typeof(vin2) != "undefined" && vin2 != "")){ - if( vin2==vin3 ){ - alert("车架号2和车架号3重复"); - return false; - }else if( vin2==vin4 ){ - alert("车架号2和车架号4重复"); - return false; - } - } - if((typeof(vin3) != "undefined" && vin3 != "")){ - if( vin3==vin4 ){ - alert("车架号3和车架号4重复"); - return false; } } return true; diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp index 9b2db6c68..9a0b796fc 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp @@ -67,7 +67,13 @@ var sparam=JSON.stringify(importCondition).replace(/,/g,"@");//生成模板的参数据 AsDialog.PopView("/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcel.jsp","importparam="+sparam, {width:"350px",height:"40px",title:"上传文件下载数据"},function(){ - reloadSelf();}); + updateContractId(); + }); + } + //更新对应的contractid + function updateContractId(){ + RunJavaMethodSqlca("com.tenwa.lease.function.ImportContractId","updateContractId",""); + reloadSelf(); } //模板下载 function DiscountDownload(){ diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp index 56d298aa6..eb9c15e02 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp @@ -10,9 +10,9 @@ String ishistory = CurPage.getParameter("IsHistory"); String sTempletNo = CurPage.getParameter("TempletNo");//模板号 ASObjectModel doTemp = new ASObjectModel("LCRentIncomeTempList"); - if(null!=ishistory&&ishistory.equals("true")){ + /* if(null!=ishistory&&ishistory.equals("true")){ doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory"); - } + } */ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); if("0030".equals(phaseNo)){ doTemp.setReadOnly("", true); diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml index d359a8b24..e4ba33394 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml @@ -4437,9 +4437,9 @@ - - - + + + @@ -4549,9 +4549,9 @@ - - - + + + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index af3e50dac..08ee008fe 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -1277,6 +1277,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 2fcc83888..3b103656c 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -1445,9 +1445,9 @@ - - - + + + @@ -2015,9 +2015,9 @@ - - - + + + @@ -3525,9 +3525,9 @@ - - - + + + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml index fb12414da..511512f54 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml @@ -191,7 +191,8 @@ - + + diff --git a/WebContent/report/creditAduit/creditHolidayInfo.jsp b/WebContent/report/creditAduit/creditHolidayInfo.jsp new file mode 100644 index 000000000..692d559b0 --- /dev/null +++ b/WebContent/report/creditAduit/creditHolidayInfo.jsp @@ -0,0 +1,78 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%> + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info00;Describe=注释区;]~*/%> +<% + /* + Author:lzb 2017-5-12 + Tester: + Content: 本方信息 + Input Param: + Output param: + History Log: + */ +%> +<%/*~END~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info01;Describe=定义页面属性;]~*/%> +<% + String PG_TITLE = "本方信息"; // 浏览器窗口标题 PG_TITLE +%> +<%/*~END~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info02;Describe=定义变量，获取参数;]~*/%> + + +<% + String rightType = CurPage.getParameter("rightType"); + if(rightType ==null)rightType=""; +%> +<%/*~END~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info03;Describe=定义数据对象;]~*/%> +<% + String sTempletNo = "creditHolidayInfo";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + if(rightType.equals("ReadOnly")){ + dwTemp.ReadOnly = "1";//只读模式 + } + dwTemp.genHTMLObjectWindow(CurPage.getParameter("id")); + CurPage.getCurComp().setAttribute("RightType", rightType); +%> +<%/*~END~*/%> + + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info04;Describe=定义按钮;]~*/%> +<% +//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + {"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"}, + {"true","","Button","返回","返回列表页面","parent.AsDialog.ClosePage()","","","","btn_icon_return"} + }; + sButtonPosition = "south"; +%> +<%/*~END~*/%> + + +<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=Info05;Describe=主体页面;]~*/%> +<%@ include file="/Frame/resources/include/ui/include_info.jspf"%> +<%/*~END~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info06;Describe=定义按钮事件-;]~*/%> + +<%/*~END~*/%> + + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/report/creditAduit/creditHolidayList.jsp b/WebContent/report/creditAduit/creditHolidayList.jsp new file mode 100644 index 000000000..ad06bb8c0 --- /dev/null +++ b/WebContent/report/creditAduit/creditHolidayList.jsp @@ -0,0 +1,154 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> + + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%> +<% + /* + Author:lzb 2017-05-12 + Tester: + Content: 本方信息 + Input Param: + Output param: + History Log: + */ +%> +<%/*~END~*/%> + + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%> +<% + String PG_TITLE = "本方信息"; // 浏览器窗口标题 PG_TITLE +%> +<%/*~END~*/%> + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量，获取参数;]~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%> +<% + ASObjectModel doTemp = new ASObjectModel("creditHolidayList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(30); + dwTemp.genHTMLObjectWindow(""); +%> +<%/*~END~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%> +<% + String sButtons[][] = { + {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"true","All","Button","修改","修改","edit()","","","","btn_icon_edit",""}, + {"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""}, + {"true","","Button","批量登记","批量登记","inExcel()","","","","btn_icon_detail",""}, + {"true","","Button","下载模板","下载模板","downLoad()","","","","btn_icon_down",""} + }; +%> +<%/*~END~*/%> + + + + +<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%> +<%@include file="/Frame/resources/include/ui/include_list.jspf"%> +<%/*~END~*/%> + +
+
+ +
+
+ +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%> + +<%/*~END~*/%> + + + + +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%> + +<%/*~END~*/%> + + + + +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时，进行初始化;]~*/%> + +<%/*~END~*/%> +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/report/creditAduit/creditHolidayMain.jsp b/WebContent/report/creditAduit/creditHolidayMain.jsp new file mode 100644 index 000000000..d175d8b66 --- /dev/null +++ b/WebContent/report/creditAduit/creditHolidayMain.jsp @@ -0,0 +1,11 @@ +<%@ page contentType="text/html; charset=GBK"%><%@ + include file="/IncludeBegin.jsp"%><% + String PG_TITLE = "隐藏左侧区域的Main页面"; // 浏览器窗口标题 PG_TITLE + String PG_CONTENT_TITLE = "本方信息"; //默认的内容区标题 + String PG_CONTNET_TEXT = "请点击左侧列表";//默认的内容区文字 + String PG_LEFT_WIDTH = "1";//默认的treeview宽度 +%><%@include file="/Resources/CodeParts/Main04.jsp"%> + +<%@ include file="/IncludeEnd.jsp"%> \ No newline at end of file diff --git a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java index 4ae5e41a9..89cc89d82 100644 --- a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java +++ b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java @@ -246,10 +246,10 @@ public class FundFundPlanExecutor { if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){ ffcp.setPayCust(custid); } - /*if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//需要判断是否融资 + if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//需要判断是否融资 if(con.getAttribute(entry.getKey() + "_FINA").getString().equals("finatype01")) { - FundPlanBean ffcp2 = new FundPlanBean(); + /*FundPlanBean ffcp2 = new FundPlanBean(); ffcp2.setFeeType(item.getItemNo());//费用类型 ffcp2.setPlanList("1"); ffcp2.setSettleMethod("payfund6"); @@ -259,14 +259,15 @@ public class FundFundPlanExecutor { if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){ ffcp2.setPayCust(custid); } - fundPlanBeans.add(ffcp2); + fundPlanBeans.add(ffcp2);*/ fundPlanBeans.add(ffcp); } } else { fundPlanBeans.add(ffcp); - }*/ + } //不管是否参与融资,都生成租金计划 by K 2018/08/10 - fundPlanBeans.add(ffcp); + //参与融资不生成资金计划（张文竹提出） + //fundPlanBeans.add(ffcp); } } return fundPlanBeans; diff --git a/src_core/com/tenwa/holiday/handler/CreditAuditHolidayHandler.java b/src_core/com/tenwa/holiday/handler/CreditAuditHolidayHandler.java new file mode 100644 index 000000000..dcba59b4a --- /dev/null +++ b/src_core/com/tenwa/holiday/handler/CreditAuditHolidayHandler.java @@ -0,0 +1,59 @@ +package com.tenwa.holiday.handler; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.dw.handler.impl.CommonHandler; +import jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY; +import jbo.com.tenwa.entity.comm.holiday.BT_HOLIDAY; + +public class CreditAuditHolidayHandler extends CommonHandler{ + + @Override + protected void beforeInsert(JBOTransaction tx, BizObject bo) + throws Exception { + // TODO Auto-generated method stub + String cdate=bo.getAttribute("c_date").getString(); + String[] vDate=cdate.split("/"); + bo.setAttributeValue("c_year", vDate[0]); + bo.setAttributeValue("c_month", vDate[1]); + bo.setAttributeValue("c_day", vDate[2]); + super.beforeInsert(tx, bo); + } + @Override + protected void beforeUpdate(JBOTransaction tx, BizObject bo)throws Exception { + String cdate=bo.getAttribute("c_date").getString(); + String[] vDate=cdate.split("/"); + bo.setAttributeValue("c_year", vDate[0]); + bo.setAttributeValue("c_month", vDate[1]); + bo.setAttributeValue("c_day", vDate[2]); + super.beforeUpdate(tx, bo); + } + @Override + protected boolean validityCheck(BizObject bo, boolean isInsert) { + try{ + if(isInsert){ + BizObject bx=JBOFactory.createBizObjectQuery(ST_CREDIT_AUDIT_HOLIDAY.CLASS_NAME, "c_date=:c_date").setParameter("c_date", bo.getAttribute("c_date").getString()).getSingleResult(false); + if(bx!=null) + { + this.errors="日期重复"; + return false; + } + }else{ + BizObject bx=JBOFactory.createBizObjectQuery(ST_CREDIT_AUDIT_HOLIDAY.CLASS_NAME, "c_date=:c_date and id<>'"+bo.getAttribute("id").getString()+"'").setParameter("c_date", bo.getAttribute("c_date").getString()).getSingleResult(false); + if(bx!=null) + { + this.errors="日期重复"; + return false; + } + } + }catch(Exception e){ + e.printStackTrace(); + } + + + return super.validityCheck(bo, isInsert); + } + + +} diff --git a/src_core/com/tenwa/officetempalte/importcallback/impl/CreditAuditHolidayCallBack.java b/src_core/com/tenwa/officetempalte/importcallback/impl/CreditAuditHolidayCallBack.java new file mode 100644 index 000000000..91ea6277b --- /dev/null +++ b/src_core/com/tenwa/officetempalte/importcallback/impl/CreditAuditHolidayCallBack.java @@ -0,0 +1,59 @@ +package com.tenwa.officetempalte.importcallback.impl; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.context.ASUser; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * + * Author: guoshanglei 2017年5月11日 + * Tester: + * Describe: + * History Log: + */ +public class CreditAuditHolidayCallBack extends BaseImportExcelCallBack{ + //读取数据运行run方法 + @Override + public void run(ASUser CurUser, BizObject importObject, + Map model, Integer rowIndex, JBOTransaction tx, + Transaction Sqlca) throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss"); + + + String INPUTUSERID = CurUser.getUserID();//获取登记人 + String INPUTORGID = CurUser.getOrgID();//获取登记部门 + String INPUTTIME = sdf.format(new Date()).toString();//格式化登记时间 + + String cdate=importObject.getAttribute("c_date").getString(); + String strSplit=cdate.indexOf("/")>0?"/":"-"; + String[] vDate=cdate.split(strSplit); + importObject.setAttributeValue("c_year", vDate[0]); + importObject.setAttributeValue("c_month", vDate[1]); + importObject.setAttributeValue("c_day", vDate[2]); + + importObject.setAttributeValue("c_date", cdate.replaceAll("-", "/"));//初始化登记人 + importObject.setAttributeValue("INPUTUSERID", INPUTUSERID);//初始化登记人 + importObject.setAttributeValue("INPUTORGID", INPUTORGID);//初始化登记部门 + importObject.setAttributeValue("INPUTTIME", INPUTTIME);//初始化登记时间 + } + + //数据保存进数据库前runBefor运行 + @Override + public void runBefore(ASUser CurUser, Map model,List importObjects, + JBOTransaction tx, Transaction Sqlca) throws Exception { + + } + + //数据保存进数据库后runAfter运行 + @Override + public void runAfter(ASUser CurUser, Map model,List importObjects, + JBOTransaction tx, Transaction Sqlca) throws Exception { + + } +} \ No newline at end of file diff --git a/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java b/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java index 2906f35af..163470176 100644 --- a/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java +++ b/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java @@ -146,17 +146,17 @@ public interface LB_EQUIPMENT_CAR{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** - * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; /** - * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/ - public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + public static final String FRAME_BRAND = "FRAME_BRAND"; /** - * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/ - public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + public static final String FRAME_COLOR = "FRAME_COLOR"; /** * 发动机号 STRING(100)
*/ diff --git a/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java b/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java index d195a1e29..8e86eeb79 100644 --- a/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java +++ b/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java @@ -146,17 +146,17 @@ public interface LB_EQUIPMENT_CAR_TEMP{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** - * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; /** - * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/ - public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + public static final String FRAME_BRAND = "FRAME_BRAND"; /** - * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/ - public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + public static final String FRAME_COLOR = "FRAME_COLOR"; /** * 发动机号 STRING(100)
*/ diff --git a/src_jbo/jbo/com/tenwa/entity/comm/credit/ST_CREDIT_AUDIT_HOLIDAY.java b/src_jbo/jbo/com/tenwa/entity/comm/credit/ST_CREDIT_AUDIT_HOLIDAY.java new file mode 100644 index 000000000..6768f9f68 --- /dev/null +++ b/src_jbo/jbo/com/tenwa/entity/comm/credit/ST_CREDIT_AUDIT_HOLIDAY.java @@ -0,0 +1,64 @@ +package jbo.com.tenwa.entity.comm.credit; + +import java.lang.String; + +/** +* 工作日节假日维护test - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface ST_CREDIT_AUDIT_HOLIDAY{ + /** + * 工作日节假日维护test

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY"; + /** + * 编号 STRING(32)
+ */ + public static final String id = "id"; + /** + * 年 INT(10)
+ */ + public static final String c_year = "c_year"; + /** + * 月 INT(10)
+ */ + public static final String c_month = "c_month"; + /** + * 日 INT(10)
+ */ + public static final String c_day = "c_day"; + /** + * 当前日期 STRING(32)
+ */ + public static final String c_date = "c_date"; + /** + * 班/休 STRING(21)
+ */ + public static final String otype = "otype"; + /** + * 登记人 STRING(32)
+ */ + public static final String INPUTUSERID = "INPUTUSERID"; + /** + * 登记部门 STRING(32)
+ */ + public static final String INPUTORGID = "INPUTORGID"; + /** + * 登记时间 STRING(32)
+ */ + public static final String INPUTTIME = "INPUTTIME"; + /** + * 更新人 STRING(32)
+ */ + public static final String UPDATEUSERID = "UPDATEUSERID"; + /** + * 更新部门 STRING(32)
+ */ + public static final String UPDATEORGID = "UPDATEORGID"; + /** + * 更新时间 STRING(32)
+ */ + public static final String UPDATETIME = "UPDATETIME"; +} \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java index 098b2cf26..440179e74 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java @@ -142,17 +142,17 @@ public interface LB_EQUIPMENT_CAR{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** - * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; /** - * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/ - public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + public static final String FRAME_BRAND = "FRAME_BRAND"; /** - * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/ - public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + public static final String FRAME_COLOR = "FRAME_COLOR"; /** * 发动机号 STRING(100)
*/ diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java index d6ec4a4b0..f00966e3a 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java @@ -146,17 +146,17 @@ public interface LB_EQUIPMENT_CAR_HIS{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** - * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; /** - * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/ - public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + public static final String FRAME_BRAND = "FRAME_BRAND"; /** - * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/ - public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + public static final String FRAME_COLOR = "FRAME_COLOR"; /** * 发动机号 STRING(100)
*/ diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java index e05f7aa5a..05bae9f21 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java @@ -146,17 +146,17 @@ public interface LB_EQUIPMENT_CAR_TEMP{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** - * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; /** - * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/ - public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + public static final String FRAME_BRAND = "FRAME_BRAND"; /** - * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/ - public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + public static final String FRAME_COLOR = "FRAME_COLOR"; /** * 发动机号 STRING(100)
*/ diff --git a/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java b/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java index 6c2fabe8f..784476461 100644 --- a/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java +++ b/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java @@ -53,4 +53,8 @@ public interface VI_PRODUCTS_NUMBER{ * 产品类型 STRING(20)
*/ public static final String Attribute2 = "Attribute2"; + /** + * 经销商名称 STRING(20)
+ */ + public static final String distributor_name = "distributor_name"; } \ No newline at end of file diff --git a/src_sql/view/vi_products_number.sql b/src_sql/view/vi_products_number.sql index 27d201e24..8dc23fa42 100644 --- a/src_sql/view/vi_products_number.sql +++ b/src_sql/view/vi_products_number.sql @@ -1,12 +1,11 @@ - 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 +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 +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 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 -GROUP BY lci.product_id,lcc.INCOME_NUMBER) num ON num.product_id=bt.typeno +GROUP BY lci.product_id,lcc.INCOME_NUMBER,lci.distributor_id) num ON num.product_id=bt.typeno LEFT JOIN distributor_info di ON di.distributor_no=num.distributor_id ); \ No newline at end of file diff --git a/src_sql/鎶曚骇SQL/V20200404/customer(zhanglei)_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/customer(zhanglei)_20200404.sql new file mode 100644 index 000000000..0e0752f80 --- /dev/null +++ b/src_sql/鎶曚骇SQL/V20200404/customer(zhanglei)_20200404.sql @@ -0,0 +1,136 @@ +-- 添加直租合同模板，已更新生产环境 +INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('operationType', 'CDZZ', 'C端直租', '', '0120', '1', '', '', '', '', '', '', '', '', '', '', '', 'SYS_Designer', NULL, '2020/03/31 15:08:56', 'SYS_Designer', '2020/03/31 15:08:56', '', ''); + +INSERT INTO `apzl`.`bf_template` (`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('59f109e144c347d1b0d61da63a4fe822', NULL, '', 'C端直租', '融资租赁合同-C端直租.doc', '融资租赁合同-C端直租-定稿版.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '', 'administrator', '8009001', '2020/03/31 14:02:27', 'admin', '8009001', '2020/03/31 02:18:46', '', ''); + +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('25fff44b316c42d397cc8e2c214f2b20', '975294b526544d83b806e3fc2f99cd16', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('31eccaf2a04c471ea341f7ef7a760961', 'bbe36e81f17542078489f223239e658a', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('5952afc7c09044ab9a8966d75bcd7e19', 'ced1455267d64183ba1b270a9eda6089', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('801e60bfebd649e09d673b7fa0f7fc23', '484815c4a7a14cf6bdbf69939e5b060e', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('9d3b561076b74fca88e50e92d51413ef', 'cc67cd6da08745329d0723f5f6fda25d', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('aba1e85d33b5444bb35357f837100335', 'db5b1632a6b44e7ea99e0dd0b2193ef3', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('bd605c45dc554628ae5094c58a270b26', 'be101123ef74413eb0d8acad8b6b22b9', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('f921be5522b14cf38d04320165696a74', '755698c1c27a43efa6c23310757c6163', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); + +-- --------------------------------------修改信审考核统计报表 +-- ------------------------------【新增SQL】---------------------------------------- +CREATE TABLE `st_credit_audit_order_detail` ( + `id` varchar(32) NOT NULL COMMENT 'id', + `serialno` varchar(32) NOT NULL COMMENT '流水号', + `objectno` varchar(32) NOT NULL COMMENT '订单流程编号', + `userid` varchar(32) DEFAULT NULL COMMENT '承办人编号', + `username` varchar(80) DEFAULT NULL COMMENT '承办人姓名', + `auditFlowType` varchar(32) DEFAULT NULL COMMENT '审核流程阶段类型', + `auditFlowTypeDes` varchar(80) DEFAULT NULL COMMENT '审核流程阶段类型解释', + `createtime` varchar(32) DEFAULT NULL COMMENT '订单流程创建时间', + `begintime` varchar(32) DEFAULT NULL COMMENT '开始执行时间', + `endtime` varchar(32) DEFAULT NULL COMMENT '完成执行时间', + `create_day` varchar(32) DEFAULT NULL COMMENT '跳过节假日-跳过节假日之后流程创建日期', + `audit_day` varchar(32) DEFAULT NULL COMMENT '跳过节假日-跳过节假日之后流程审核日期', + `jump_createtime` varchar(32) DEFAULT NULL COMMENT '跳过节假日-订单流程创建时间', + `jump_begintime` varchar(32) DEFAULT NULL COMMENT '跳过节假日-开始执行时间', + `jump_endtime` varchar(32) DEFAULT NULL COMMENT '跳过节假日-完成执行时间', + `nextAuditFlowType` varchar(250) DEFAULT NULL COMMENT '下阶段审核流程：【任意退回】', + `auditResSts` varchar(255) DEFAULT NULL COMMENT '审核结果状态', + `auditResStsDes` varchar(255) DEFAULT NULL COMMENT '审核结果状态解释', + `remark` varchar(255) DEFAULT NULL COMMENT '备注信息', + `INPUTTIME` varchar(32) DEFAULT NULL COMMENT '登记时间', + `UPDATETIME` varchar(32) DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='信审考核统计订单-明细'; + +CREATE TABLE `st_credit_audit_order` ( + `id` varchar(32) NOT NULL COMMENT 'id', + `every_day` varchar(20) DEFAULT NULL COMMENT '当前日期', + `userid` varchar(32) DEFAULT NULL COMMENT '承办人编号', + `username` varchar(80) DEFAULT NULL COMMENT '承办人姓名', + `auditFlowType` varchar(32) DEFAULT NULL COMMENT '审核流程阶段类型', + `auditFlowTypeDes` varchar(80) DEFAULT NULL COMMENT '审核流程阶段类型解释', + `order_count` int(11) DEFAULT NULL COMMENT '当日进单数量', + `count_audit` int(11) DEFAULT NULL COMMENT '当日审批数量', + `count_audit_pass` int(11) DEFAULT NULL COMMENT '当日审批通过数量', + `count_audit_refuse` int(11) DEFAULT NULL COMMENT '当日审批拒绝数量', + `count_audit_refuse1` int(11) DEFAULT NULL COMMENT '当日审批拒绝数量-分类1：信用不良', + `count_audit_refuse2` int(11) DEFAULT NULL COMMENT '当日审批拒绝数量-分类2：法院执行', + `count_audit_refuse3` int(11) DEFAULT NULL COMMENT '当日审批拒绝数量-分类3：虚假信息', + `count_audit_refuse4` int(11) DEFAULT NULL COMMENT '当日审批拒绝数量-分类4：身份核实异常', + `count_audit_refuse5` int(11) DEFAULT NULL COMMENT '当日审批拒绝数量-分类5：购车目的异常', + `count_audit_refuse6` int(11) DEFAULT NULL COMMENT '当日审批拒绝数量-分类6：综合评分不足', + `begintime` varchar(32) DEFAULT NULL COMMENT '开始执行时间', + `endtime` varchar(32) DEFAULT NULL COMMENT '完成执行时间', + `audittime` varchar(32) DEFAULT NULL COMMENT '审核使用时间', + `remark` varchar(255) DEFAULT NULL COMMENT '备注信息', + `INPUTTIME` varchar(32) DEFAULT NULL COMMENT '登记时间', + `UPDATETIME` varchar(32) DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='信审考核统计订单'; + +CREATE TABLE `st_credit_audit_holiday` ( + `id` varchar(32) NOT NULL COMMENT '编号', + `c_year` int(11) DEFAULT NULL COMMENT '年', + `c_month` int(11) DEFAULT NULL COMMENT '月', + `c_day` int(11) DEFAULT NULL COMMENT '日', + `c_date` varchar(32) DEFAULT NULL COMMENT '当前日期', + `otype` varchar(21) DEFAULT NULL COMMENT '班/休', + `INPUTUSERID` varchar(32) DEFAULT NULL COMMENT '登记人', + `INPUTORGID` varchar(32) DEFAULT NULL COMMENT '登记部门', + `INPUTTIME` varchar(32) DEFAULT NULL COMMENT '登记时间', + `UPDATEUSERID` varchar(32) DEFAULT NULL COMMENT '更新人', + `UPDATEORGID` varchar(32) DEFAULT NULL COMMENT '更新部门', + `UPDATETIME` varchar(32) DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='信审考核-工作日和休息日维护'; + +-- ------------------------------【新增记录-信审节假日维护】---------------------------------------- + +INSERT INTO `apzl`.`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 ('creditHolidayList', '审核节假日维护', NULL, '30', NULL, '1', '1', 'default', 'jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY', 'O', NULL, NULL, 'c_date', NULL, NULL, 'SYS_Designer', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/12 17:38:59', NULL, '1', NULL); + +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910001', '910001', '1', 'O', 'id', 'id', 'String', null, '编号', null, '1', 'Text', '1', '3', null, null, null, '0', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/13 09:32:31', '0', null, '0', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910002', '910002', '1', 'O', 'c_year', 'c_year', 'String', null, '年', null, '1', 'Text', '2', '3', null, null, null, '0', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/13 09:32:31', '0', null, '0', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910003', '910003', '1', 'O', 'c_month', 'c_month', 'String', null, '月', null, '1', 'Text', '2', '3', null, null, null, '0', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/12 16:43:57', '0', null, '0', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910004', '910004', '1', 'O', 'c_day', 'c_day', 'String', null, '日', null, '1', 'Text', '2', '3', null, null, null, '0', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/12 16:43:57', '0', null, '0', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910005', '910005', '1', 'O', 'c_date', 'c_date', 'String', null, '当前日期', null, '1', 'Date', '3', '2', null, null, null, '32', '1', '0', '0', '1', '1', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2018/08/14 15:45:14', '0', null, '1', null, null, null, 'BigThan,LessThan,Area'); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910006', '910006', '1', 'O', 'otype', 'otype', 'String', null, '班/休', null, '1', 'Text', '1', '1', null, null, null, '21', '1', '0', '0', '1', '1', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2018/08/14 15:45:14', '0', null, '1', null, null, null, 'Like,Equals'); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910007', '910007', '1', 'O', 'INPUTUSERID', 'INPUTUSERID', 'String', null, '登记人', null, '1', 'Text', '1', '1', null, null, null, '32', '1', '0', '0', '1', '1', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2018/08/14 15:45:14', '0', null, '1', null, null, null, 'Like,Equals'); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910008', '910008', '1', 'O', 'INPUTORGID', 'INPUTORGID', 'String', null, '登记部门ID', null, '1', 'Text', '1', '1', null, null, null, '32', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910009', '910009', '1', null, 'NameManager.getOrgName(INPUTORGID)', 'INPUTORGIDName', 'String', null, '登记部门', null, '1', 'Text', '1', '1', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_Designer', '2017/09/13 09:17:36', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910010', '910010', '1', 'O', 'INPUTTIME', 'INPUTTIME', 'String', null, '登记时间', null, '1', 'Date', '3', '2', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910011', '910011', '1', 'O', 'UPDATEUSERID', 'UPDATEUSERID', 'String', null, '更新人', null, '1', 'Text', '1', '1', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:56', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910012', '910012', '1', 'O', 'UPDATEORGID', 'UPDATEORGID', 'String', null, '更新部门ID', null, '1', 'Text', '1', '1', null, null, null, '32', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:56', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910013', '910013', '1', 'O', 'UPDATETIME', 'UPDATETIME', 'String', null, '更新时间', null, '1', 'Date', '3', '2', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:56', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910014', '910014', '1', null, 'NameManager.getOrgName(UPDATEORGID)', 'UPDATEORGIDName', 'String', null, '更新部门', null, '1', 'Text', '1', '1', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_Designer', '2017/09/13 09:26:10', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null); + + + +INSERT INTO `apzl`.`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 ('creditHolidayInfo', '审核节假日维护', NULL, '30020', NULL, '1', '1', 'default', 'jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY', 'O', 'id=:id', NULL, NULL, 'com.tenwa.holiday.handler.CreditAuditHolidayHandler', NULL, 'SYS_Designer', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/12 16:59:52', NULL, '1', NULL); + +INSERT INTO `apzl`.`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 ('creditHolidayInfo', '910015', '910015', '1', 'O', 'id', 'id', 'Number', NULL, '编号', NULL, '1', 'Text', '2', '3', NULL, NULL, NULL, '0', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`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 ('creditHolidayInfo', '910016', '910016', '1', 'O', 'c_year', 'c_year', 'Number', NULL, '年', NULL, '1', 'Text', '2', '3', NULL, NULL, NULL, '0', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', NULL, '0', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`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 ('creditHolidayInfo', '910017', '910017', '1', 'O', 'c_month', 'c_month', 'Number', NULL, '月', NULL, '1', 'Text', '2', '3', NULL, NULL, NULL, '0', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`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 ('creditHolidayInfo', '910018', '910018', '1', 'O', 'c_day', 'c_day', 'Number', NULL, '日', NULL, '1', 'Text', '2', '3', NULL, NULL, NULL, '0', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`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 ('creditHolidayInfo', '910019', '910019', '1', 'O', 'c_date', 'c_date', 'String', NULL, '当前日期', NULL, '1', 'Date', '3', '2', NULL, NULL, NULL, '32', '1', '0', '1', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/12 17:22:34', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`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 ('creditHolidayInfo', '910020', '910020', '1', 'O', 'otype', 'otype', 'String', NULL, '班/休', NULL, '1', 'Select', '1', '1', 'CodeTable', '班,班,休,休', NULL, '21', '1', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`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 ('creditHolidayInfo', '910021', '910021', '1', 'O', 'INPUTUSERID', 'INPUTUSERID', 'String', NULL, '登记人ID', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '1', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`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 ('creditHolidayInfo', '910022', '910022', '1', 'O', 'INPUTORGID', 'INPUTORGID', 'String', NULL, '登记部门ID', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`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 ('creditHolidayInfo', '910023', '910023', '1', 'O', 'INPUTTIME', 'INPUTTIME', 'String', NULL, '登记时间', NULL, '1', 'Text', '1', '2', NULL, NULL, NULL, '32', '0', '1', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`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 ('creditHolidayInfo', '910024', '910024', '1', 'O', 'UPDATEUSERID', 'UPDATEUSERID', 'String', NULL, '更新人ID', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '1', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`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 ('creditHolidayInfo', '910025', '910025', '1', 'O', 'UPDATEORGID', 'UPDATEORGID', 'String', NULL, '更新部门ID', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`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 ('creditHolidayInfo', '910026', '910026', '1', 'O', 'UPDATETIME', 'UPDATETIME', 'String', NULL, '更新时间', NULL, '1', 'Text', '1', '2', NULL, NULL, NULL, '32', '0', '1', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', NULL, '1', NULL, NULL, NULL, NULL); + + + +INSERT INTO `apzl`.`bf_template` (`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) +VALUES ('da670c357a4f11eaae2500163e0ad612', NULL, NULL, '信审考核节假日维护', '信审考核节假日维护.xlsx', '信审考核节假日维护导入.xlsx', 'excel', 'upload', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', NULL, '维护当年中因法定节假日 工作日改为休息日，或休息日调整为节假日', 'admin', '80009000200010001', '2020/03/13 10:07:19', 'admin', '80009000200010001', '2020/03/13 11:02:17', NULL, NULL); + +INSERT INTO `apzl`.`bf_importconfig` (`ID`, `IMPORTTABLE`, `ROWLINE`, `DATEINDEX`, `SHEETNAME`, `ISDELDATE`, `DELCONDITION`, `IMPORTCLASS`, `CENOTE`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `RELATIVECLASS`, `TEMPLATEID`, `ISSAVE`) +VALUES ('e6c678657a4f11eaae2500163e0ad612', 'ST_CREDIT_AUDIT_HOLIDAY', '1', '2', NULL, 'yes', 'c_date=:{c_date}', 'com.tenwa.officetempalte.importcallback.impl.CreditAuditHolidayCallBack', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY', 'da670c357a4f11eaae2500163e0ad612', NULL); + + + +-- ------------------------------【新增记录--定时任务】配置为每天早上5点----------------------------- +INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) +VALUES ('MissionName', 'com.tenwa.lease.app.quartzmession.CreditAuditHolidayBatch', '信审考核统计处理', '5101001', '5101001', '1', '信审考核统计处理', '', '', '', '', '', '', '', '', '', '', 'SYS_Designer', NULL, '2019/12/26 10:13:04', 'SYS_Designer', '2019/12/26 10:14:07', '', ''); + + diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql index 45dac18ed..393ead24c 100644 --- a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql +++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql @@ -1,14 +1,14 @@ -- 在租赁物表中添加车架号字段 -ALTER TABLE lb_equipment_car ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3; -ALTER TABLE lb_equipment_car_temp ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3; -ALTER TABLE lb_equipment_car_his ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3; +ALTER TABLE lb_equipment_car ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '挂车车架号' AFTER FRAME_NUMBER, ADD COLUMN FRAME_BRAND VARCHAR(50) NULL COMMENT '挂车品牌' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_COLOR VARCHAR(20) NULL COMMENT '挂车颜色' AFTER FRAME_BRAND; +ALTER TABLE lb_equipment_car_his ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '挂车车架号' AFTER FRAME_NUMBER, ADD COLUMN FRAME_BRAND VARCHAR(50) NULL COMMENT '挂车品牌' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_COLOR VARCHAR(20) NULL COMMENT '挂车颜色' AFTER FRAME_BRAND; +ALTER TABLE lb_equipment_car_temp ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '挂车车架号' AFTER FRAME_NUMBER, ADD COLUMN FRAME_BRAND VARCHAR(50) NULL COMMENT '挂车品牌' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_COLOR VARCHAR(20) NULL COMMENT '挂车颜色' AFTER FRAME_BRAND; -- 模板添加字段 DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1081'; -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','1081','1081','1','O','FRAME_NUMBER2','FRAME_NUMBER2','String','','挂车车架号1','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/13 08:59:43','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','1081','1081','1','O','FRAME_NUMBER2','FRAME_NUMBER2','String','','挂车车架号','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','0','','1','','','',''); DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1082'; -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','1082','1082','1','O','FRAME_NUMBER3','FRAME_NUMBER3','String','','挂车车架号2','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/13 08:59:43','','','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','1082','1082','1','O','FRAME_BRAND','FRAME_BRAND','String','','挂车品牌','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/22 16:01:19','0','','1','','','',''); DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1083'; -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','1083','1083','1','O','FRAME_NUMBER4','FRAME_NUMBER4','String','','挂车车架号3','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/13 08:59:43','','','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','1083','1083','1','O','FRAME_COLOR','FRAME_COLOR','String','','挂车颜色','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/22 16:01:19','0','','1','','','',''); -- 创建业务申请初审记录表 CREATE TABLE business_apply_userinfo ( @@ -265,23 +265,15 @@ 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 ('ProductsBusinessList','1310','1310','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductISIncidental(TYPENO)','ISincidentals','String','','杂费（是否参融）','','1','Select','1','1','Code','DeleteFlag','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/15 11:02:26','SYS_Designer','2020/04/15 11:08:53','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 ('ProductsBusinessList','1320','1320','1','O','EFFECTIVEDATE','EFFECTIVEDATE','String','','生效日期','','1','Text','1','1','','','','10','1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:39:35','SYS_Designer','2020/04/15 10:54:41','','','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 ('ProductsBusinessList','1340','1340','1','O','fact_date','fact_date','String','','初次投放时间','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 10:55:02','','','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 ('ProductsBusinessList','1350','1350','1','O','distributor_name','distributor_name','String','','经销商名称','','1','Text','1','1','','','','20','1','0','0','1','0',0,'','','','SYS_Designer','2020/04/21 21:32:54','SYS_Designer','2020/04/21 21:33:32','','','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 ('ProductsBusinessList','1360','1360','1','O','fact_money','fact_money','String','','产品投放金额','','1','Text','2','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 10:56:41','0','','1','','','',''); -- 添加对应的菜单 Insert Into AWE_MENU_INFO (menuid,menuname,displayname,sortno,url,urlparam,target,style,isinuse,remark,inputorgid,inputuserid,inputtime,updateorgid,updateuserid,updatetime,accesstype,icon,appicon) Values ('9600100313','产品管理报表','产品管理报表','9600100313','/ProductManage/ProductsBusinessList.jsp','','_self','','1','',null,'SYS_Designer','2020/04/12 16:09:26',null,'SYS_Designer','2020/04/12 16:09:26','10','',''); Insert Into AWE_Role_Menu (roleid,menuid) Values ('099','9600100313'); --- 客户张磊修改内容 -INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('operationType', 'CDZZ', 'C端直租', '', '0120', '1', '', '', '', '', '', '', '', '', '', '', '', 'SYS_Designer', NULL, '2020/03/31 15:08:56', 'SYS_Designer', '2020/03/31 15:08:56', '', ''); -INSERT INTO `apzl`.`bf_template` (`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('59f109e144c347d1b0d61da63a4fe822', NULL, '', 'C端直租', '融资租赁合同-C端直租.doc', '融资租赁合同-C端直租-定稿版.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '', 'administrator', '8009001', '2020/03/31 14:02:27', 'admin', '8009001', '2020/03/31 02:18:46', '', ''); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('25fff44b316c42d397cc8e2c214f2b20', '975294b526544d83b806e3fc2f99cd16', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('31eccaf2a04c471ea341f7ef7a760961', 'bbe36e81f17542078489f223239e658a', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('5952afc7c09044ab9a8966d75bcd7e19', 'ced1455267d64183ba1b270a9eda6089', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('801e60bfebd649e09d673b7fa0f7fc23', '484815c4a7a14cf6bdbf69939e5b060e', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('9d3b561076b74fca88e50e92d51413ef', 'cc67cd6da08745329d0723f5f6fda25d', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('aba1e85d33b5444bb35357f837100335', 'db5b1632a6b44e7ea99e0dd0b2193ef3', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('bd605c45dc554628ae5094c58a270b26', 'be101123ef74413eb0d8acad8b6b22b9', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('f921be5522b14cf38d04320165696a74', '755698c1c27a43efa6c23310757c6163', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); + + diff --git a/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java b/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java index 6e19f08b5..36a975808 100644 --- a/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java +++ b/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java @@ -1,18 +1,17 @@ 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 jbo.com.tenwa.lease.comm.LB_FILE_ARCHIVING_INFO; import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; -import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; import com.amarsoft.context.ASUser; -import com.amarsoft.dict.als.cache.CacheLoaderFactory; import com.tenwa.comm.exception.BusinessException; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.officetempalte.importcallback.impl.BaseImportExcelCallBack; @@ -23,19 +22,15 @@ public class MailingContainerNumberImport extends BaseImportExcelCallBack{ } @Override public void runBefore(ASUser CurUser, Map model, List importObjects, JBOTransaction tx,Transaction Sqlca) throws Exception { - Transaction Sqlca1 = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); /** * 定义全局变量 */ - String error=""; // 错误描述 boolean flag=false; // 错误描述 String CONTRACT_NUMBER=null; String sql1=""; // 原有的数据 /** * 校验本次导入数据在导入表是否已有 */ - List> list = new ArrayList>(); - Map map = new HashMap(); List arrayList = new ArrayList(); //所有申请合同 List exclarrayList = new ArrayList(); //申请编号不在系统中的集合 List exclarrayExist = new ArrayList(); //申请编号在系统中已存在 @@ -54,7 +49,7 @@ public class MailingContainerNumberImport extends BaseImportExcelCallBack{ // 通过本次excel中的数据是否在系统中 //sql1="SELECT ARCHIVING_CABINET_NO,CONTRACT_NUMBER FROM LB_FILE_ARCHIVING_INFO WHERE ARCHIVING_CABINET_NO='"+CONTRACT_NUMBER+"'"; - sql1="select id from lb_contract_info where contract_no='"+CONTRACT_NUMBER+"'"; + sql1="select id from lb_contract_info where contract_status>=31 and contract_status<100 and contract_no='"+CONTRACT_NUMBER+"'"; List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); // 无结果，说明不在系统中 if(dataList.size()<=0){ @@ -63,14 +58,24 @@ public class MailingContainerNumberImport extends BaseImportExcelCallBack{ } flag=true; } - sql1="select id from LB_FILE_ARCHIVING_INFO where CONTRACT_NUMBER='"+CONTRACT_NUMBER+"'"; - dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); + //sql1="select FILE_NUMBER from LB_FILE_ARCHIVING_INFO where CONTRACT_NUMBER='"+CONTRACT_NUMBER+"'"; + //dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); + BizObjectManager lfaiManage = JBOFactory.getBizObjectManager(LB_FILE_ARCHIVING_INFO.CLASS_NAME,Sqlca); + BizObject lfai = lfaiManage.createQuery("CONTRACT_NUMBER=:CONTRACT_NUMBER ").setParameter("CONTRACT_NUMBER", CONTRACT_NUMBER).getSingleResult(true); // 无结果，说明不在系统中 - if(dataList.size()>0){ - if(! exclarrayExist.contains(CONTRACT_NUMBER) ){ - exclarrayExist.add(CONTRACT_NUMBER); + if(lfai != null){ + String fileNumber = lfai.getAttribute("FILE_NUMBER") == null ? "":lfai.getAttribute("FILE_NUMBER").getString(); + if(fileNumber != null && !"null".equals(fileNumber) && fileNumber.length()>0 ) { + if(! exclarrayExist.contains(CONTRACT_NUMBER) ){ + exclarrayExist.add(CONTRACT_NUMBER); + } + flagExist=true; + }else { + if(!flagExist){ + lfaiManage.deleteObject(lfai); + } + } - flagExist=true; } } diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java new file mode 100644 index 000000000..8761887a9 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java @@ -0,0 +1,771 @@ +package com.tenwa.lease.app.quartzmession; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.awe.util.ASResultSet; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import java.sql.SQLException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.UUID; + +/** + * 初始化信审考核报表数据跑批 + * @author xiezhiwen + */ +public class CreditAuditHolidayBatch implements Job{ + private static final Logger logger = LogManager.getLogger(CreditAuditHolidayBatch.class);// 引入logger日志 + + public void execute(JobExecutionContext arg0) throws JobExecutionException { + logger.info("【信审考核统计】【CreditAuditHolidayBatch】【开始】<<<<<<<<<<<<<: "); + deleteCreditAudit(); + initDetail(); + updateDetail(); + initOrderAuditDay(); + saveOrderAuditDay(); + updateOrderAuditDay(); + logger.info("【信审考核统计】【CreditAuditHolidayBatch】【完成】<<<<<<<<<<<<<: "); + } + + /** + * 添加审核流程记录明细 + * @return + */ + private void deleteCreditAudit(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String delSql="truncate table st_credit_audit_order_detail"; + String delSql2="truncate table st_credit_audit_order"; + Sqlca.executeSQL(new SqlObject(delSql)); + Sqlca.executeSQL(new SqlObject(delSql2)); + Sqlca.commit(); + logger.info("【信审考核统计】【deleteCreditAudit】数据清空执行完成<<<<<<<<<<<<<: "); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【deleteCreditAudit】数据清空执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【deleteCreditAudit】数据清空执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【deleteCreditAudit】数据清空执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 添加审核流程记录明细 + * @return + */ + private void initDetail(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = initDetail(Sqlca); + Sqlca.commit(); + logger.info("【信审考核统计】【initDetail】初始化订单明细记录<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【initDetail】初始化订单明细记录>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【initDetail】初始化订单明细记录>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【initDetail】初始化订单明细记录>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 修改审核明细的创建时间 + * @return + */ + private void updateDetail(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = updateDetail(Sqlca); + Sqlca.commit(); + logger.info("【信审考核统计】【updateDetail】修改订单明细中的创建时间执行完成<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【updateDetail】修改订单明细中的创建时间执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【updateDetail】修改订单明细中的创建时间执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【updateDetail】修改订单明细中的创建时间执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 初始化审核统计报表-根据进单日期 + * @return + */ + private void initOrderAuditDay(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = initOrderAuditDay(Sqlca); + Sqlca.commit(); + logger.info("【信审考核统计】【initOrderAuditDay】初始化订单表审核数据统计执行完成<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【initOrderAuditDay】初始化订单表审核数据统计执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【initOrderAuditDay】初始化订单表审核数据统计执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【initOrderAuditDay】初始化订单表审核数据统计执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 初始化或者修改审核统计报表-根据审单日期 + * @return + */ + private void saveOrderAuditDay(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = saveOrderCreateDay(Sqlca); + Sqlca.commit(); + logger.info("【信审考核统计】【saveOrderAuditDay】根据进单时间新增和修改订单统计表执行完成<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【saveOrderAuditDay】根据进单时间新增和修改订单统计表执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【saveOrderAuditDay】根据进单时间新增和修改订单统计表执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【saveOrderAuditDay】根据进单时间新增和修改订单统计表执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 初始化或者修改审核统计报表-根据审单日期 + * @return + */ + private void updateOrderAuditDay(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = updateOrderAuditDay(Sqlca); + Sqlca.commit(); + logger.info("【信审考核统计】【updateOrderAuditDay】计算信审考核统计表审核时间执行完成<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【updateOrderAuditDay】计算信审考核统计表审核时间执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【updateOrderAuditDay】计算信审考核统计表审核时间执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【updateOrderAuditDay】计算信审考核统计表审核时间执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + + /** + * 添加审核流程记录明细 + * @return + * @throws Exception + */ + public String initDetail(Transaction Sqlca) throws Exception { + // 定义全局对象 + String uuidDetail = ""; // 业务id + String userid = ""; // 用户id + String username = ""; // 用户姓名 + String objectno = ""; // 流程编号 + String serialno = ""; // 流程处理流水 + String auditFlowType = ""; // 流程审核类型 + String auditFlowTypeDes = ""; // 流程审核类型说明 + String createtime = ""; // 流程创建时间 + String begintime = ""; // 流程开始时间 + String endtime = ""; // 流程结束时间 + String jump_createtime = ""; // 跳过节假日之后流程创建时间 + String create_day = ""; // 跳过节假日之后流程创建日期 + String audit_day = ""; // 跳过节假日之后流程审核日期 + String jump_begintime = ""; // 跳过节假日之后流程开始时间 + String jump_endtime = ""; // 跳过节假日之后流程结束时间 + String nextAuditFlowType = ""; // 下阶段流程审核类型 + String auditResSts = ""; // 流程审核结果 + String auditResStsDes = ""; // 流程审核结果说明 + String remark = ""; + String insertSql = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); + int con=0; + // 查询所有需要发送还款提醒的数据 + String selSql="SELECT \n" + + " FT.userid,\n" + + " FT.username,\n" + + " FT.objectno,\n" + + " FT.serialno,\n" + + " FT.phaseno AS auditFlowType,\n" + + " FT.phasename AS auditFlowTypeDes,\n" + + " FT.begintime,\n" + + " FT.endtime,\n" + + " FT.phaseopinion1 AS nextAuditFlowType,\n" + + " fob.phaseopinion AS auditResSts,\n" + + " (SELECT itemname from code_library WHERE codeno='disagreeOP' AND itemno=fob.phaseopinion) AS auditResStsDes\n" + + "FROM FLOW_TASK FT\n" + + "LEFT JOIN FLOW_OPINION_BUSINESS FOB ON FT.SERIALNO=FOB.SERIALNO \n" + + "WHERE FT.flowname = '业务申请流程' \n" + + "AND FT.phaseno='0030' \n" + + "AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'')"; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + while(rs.next()) { + // 获取接口推送所需数据 + con++; + uuidDetail = UUID.randomUUID().toString().replace("-", ""); + userid = rs.getString("userid"); // 用户id + username = rs.getString("username"); // 用户姓名 + objectno = rs.getString("objectno"); // 流程编号 + serialno = rs.getString("serialno"); // 流程处理流水 + auditFlowType = rs.getString("auditFlowType"); // 流程审核类型 + auditFlowTypeDes = rs.getString("auditFlowTypeDes"); // 流程审核类型说明 + createtime = rs.getString("begintime"); // 流程创建时间 + begintime = rs.getString("begintime"); // 流程开始时间 + endtime = rs.getString("endtime"); // 流程结束时间 + nextAuditFlowType = rs.getString("nextAuditFlowType"); // 下阶段流程审核类型 + auditResSts = rs.getString("auditResSts"); // 流程审核结果 + auditResStsDes = rs.getString("auditResStsDes"); // 流程审核结果说明 + if("任意退回".equals(nextAuditFlowType)){ + continue; + } + if(StringUtils.isNotEmpty(createtime)){//开始时间不为空 + jump_createtime = resJumpHoliday(Sqlca, rs.getString("begintime")); // 跳过节假日之后流程创建时间 + create_day = dayFormat.format(simpleDateFormat.parse(jump_createtime)); + jump_createtime = sdf.format(simpleDateFormat.parse(jump_createtime)); + jump_begintime = jump_createtime; // 跳过节假日之后流程开始时间 + createtime = sdf.format(simpleDateFormat.parse(createtime)); + begintime = createtime; + } + if (StringUtils.isNotEmpty(endtime)){//结束时间不为空 + jump_endtime = resJumpHoliday(Sqlca, rs.getString("endtime")); // 跳过节假日之后流程结束时间 + audit_day = dayFormat.format(simpleDateFormat.parse(jump_endtime)); + endtime = sdf.format(simpleDateFormat.parse(endtime)); + jump_endtime = sdf.format(simpleDateFormat.parse(jump_endtime)); + } + insertSql="INSERT INTO st_credit_audit_order_detail(id,serialno,objectno,userid,username, " + + "auditFlowType," + + "auditFlowTypeDes," + + "createtime," + + "begintime," + + "endtime," + + "create_day," + + "audit_day," + + "jump_createtime," + + "jump_begintime," + + "jump_endtime," + + "nextAuditFlowType," + + "auditResSts," + + "auditResStsDes," + + "remark," + + "INPUTTIME, " + + "UPDATETIME " + + ") " + + "VALUES ( " + + "'"+uuidDetail+"', " + + "'"+serialno+"', " + + "'"+objectno+"', " + + "'"+userid+"', " + + "'"+username+"', " + + "'"+auditFlowType+"', " + + "'"+auditFlowTypeDes+"', " + + " '"+createtime+"', " + + " '"+begintime+"', " + + " '"+endtime+"', " + + " '"+create_day+"', " + + " '"+audit_day+"', " + + " '"+jump_createtime+"', " + + " '"+jump_begintime+"', " + + " '"+jump_endtime+"', " + + "'"+nextAuditFlowType+"', " + + "'"+auditResSts+"', " + + "'"+auditResStsDes+"', " + + "'"+remark+"', " + + "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'), " + + "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') " + + ")"; + Sqlca.executeSQL(new SqlObject(insertSql)); + + } + return String.valueOf(con); + } + + + /** + * 查询最小创建时间更改明细记录中对应的创建时间 + * @return + * @throws Exception + */ + public String updateDetail(Transaction Sqlca) throws Exception { + // 定义全局对象 + String objectno = ""; // 流程编号 + String begintime = ""; // 流程创建时间 + String createtime = ""; // 跳过节假日之后流程创建时间 + String create_day = ""; // 跳过节假日之后流程创建日期 + String updSql = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); + int con=0; + // 查询所有需要发送还款提醒的数据 + // 查询所有需要发送还款提醒的数据 + String selSql="SELECT \n" + + " FT.userid,\n" + + " FT.objectno,\n" + + " min(FT.begintime) AS begintime\n" + + "FROM FLOW_TASK FT\n" + + "LEFT JOIN FLOW_OPINION_BUSINESS FOB ON FT.SERIALNO=FOB.SERIALNO \n" + + "WHERE FT.flowname = '业务申请流程' \n" + + "AND FT.phaseno='0030' \n" + + "AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') group by FT.objectno"; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + while(rs.next()) { + // 获取接口推送所需数据 + con++; + begintime = rs.getString("begintime"); // 流程编号 + objectno = rs.getString("objectno"); // 流程创建时间 + createtime = sdf.format(simpleDateFormat.parse(begintime)); + create_day = dayFormat.format(simpleDateFormat.parse(resJumpHoliday(Sqlca, begintime))); + updSql="UPDATE st_credit_audit_order_detail SET create_day='"+create_day+"', createtime='"+createtime+"'," + + "UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE objectno='"+objectno+"' "; + Sqlca.executeSQL(new SqlObject(updSql)); + objectno = ""; + begintime = ""; + createtime = ""; + create_day = ""; + updSql = ""; + } + return String.valueOf(con); + } + + /** + * 初始化审核统计报表-保存审核日期相关订单 + * @return + * @throws Exception + */ + public String initOrderAuditDay(Transaction Sqlca) throws Exception { + String insertSql="INSERT INTO st_credit_audit_order(\n" + + " id,\n" + + " every_day,\n" + + " userid,\n" + + " username,\n" + + " auditFlowType,\n" + + " auditFlowTypeDes,\n" + + " count_audit,\n" + + " count_audit_pass,\n" + + " count_audit_refuse,\n" + + " count_audit_refuse1,\n" + + " count_audit_refuse2,\n" + + " count_audit_refuse3,\n" + + " count_audit_refuse4,\n" + + " count_audit_refuse5,\n" + + " count_audit_refuse6\n" + + " )\n" + + " SELECT \n" + + " replace(uuid(),'-',''),\n" + + " st2.every_day,\n" + + " st2.userid,\n" + + " st2.username,\n" + + " st2.auditFlowType,\n" + + " st2.auditFlowTypeDes,\n" + + " st2.count_audit,\n" + + " st3.count_audit_pass,\n" + + " st4.count_audit_refuse,\n" + + " st5.count_audit_refuse1,\n" + + " st6.count_audit_refuse2,\n" + + " st7.count_audit_refuse3,\n" + + " st8.count_audit_refuse4,\n" + + " st9.count_audit_refuse5,\n" + + " st10.count_audit_refuse6\n" + + " from\n" + + " (SELECT COUNT(1) AS count_audit,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts != 'null'AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st2 \n" + + " left join (SELECT COUNT(1) AS count_audit_pass,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0070'AND (endtime is not null or endtime != '')GROUP BY audit_day, userid) as st3 on st3.every_day = st2.every_day AND st3.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts != '0070' AND auditResSts != 'null' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st4 on st4.every_day = st2.every_day AND st4.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse1,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0010' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st5 on st5.every_day = st2.every_day AND st5.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse2,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0020' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st6 on st6.every_day = st2.every_day AND st6.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse3,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0030' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st7 on st7.every_day = st2.every_day AND st7.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse4,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0040' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st8 on st8.every_day = st2.every_day AND st8.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse5,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0050' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st9 on st9.every_day = st2.every_day AND st9.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse6,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0060' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st10 on st10.every_day = st2.every_day AND st10.userid=st2.userid \n"; + Sqlca.executeSQL(new SqlObject(insertSql)); + return "-1"; + } + + /** + * 根据查询进单统计数据，添加或者更新统计订单数据 + * @return + * @throws Exception + */ + public String saveOrderCreateDay(Transaction Sqlca) throws Exception { + // 定义全局对象 + String id = ""; // 流程编号 + String order_count = ""; // 流程编号 + String userid = ""; // 流程编号 + String every_day = ""; // 流程编号 + String username = ""; // 流程创建时间 + String auditFlowType = ""; // 流程创建时间 + String auditFlowTypeDes = ""; // 跳过节假日之后流程创建时间 + String updSql = ""; + String selSql2 = ""; + int con=0; + // 查询所有需要发送还款提醒的数据 + String selSql="SELECT count(1) as order_count,std1.every_day,std1.userid,std1.username,std1.auditFlowType,std1.auditFlowTypeDes \n" + + " from (SELECT min(create_day) AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail GROUP BY objectno) AS std1 \n" + + " GROUP BY std1.every_day "; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + while(rs.next()) { + id = UUID.randomUUID().toString().replace("-", ""); + // 获取接口推送所需数据 + con++; + every_day = rs.getString("every_day"); // 流程编号 + order_count = rs.getString("order_count"); // 流程创建时间 + userid = rs.getString("userid"); // 流程创建时间 + username = rs.getString("username"); // 流程创建时间 + auditFlowType = rs.getString("auditFlowType"); // 流程创建时间 + auditFlowTypeDes = rs.getString("auditFlowTypeDes"); // 流程创建时间 + + selSql2="SELECT count(1) as countNum FROM st_credit_audit_order WHERE every_day ='" + every_day +"'"; + ASResultSet rs2 = Sqlca.getASResultSet(new SqlObject(selSql2)); + if(rs2.next()) { + if(rs2.getInt("countNum") > 0){ + updSql="UPDATE st_credit_audit_order SET order_count='"+order_count+"', " + + "UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE every_day='"+every_day+"' "; + Sqlca.executeSQL(new SqlObject(updSql)); + }else { + String insertSql = "INSERT INTO st_credit_audit_order(\n" + + " id,\n" + + " every_day,\n" + + " userid,\n" + + " username,\n" + + " auditFlowType,\n" + + " auditFlowTypeDes,\n" + + " order_count,\n" + + " INPUTTIME, " + + " UPDATETIME " + + " ) " + + " VALUES ( " + + " '" + id + "', " + + " '" + every_day + "', " + + " '" + userid + "', " + + " '" + userid + "', " + + " '" + username + "', " + + " '" + auditFlowType + "', " + + " '" + auditFlowTypeDes + "', " + + "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'), " + + "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') " + + ")"; + } + } + id = ""; + order_count = ""; + userid = ""; + every_day = ""; + username = ""; + auditFlowType = ""; + auditFlowTypeDes = ""; + updSql = ""; + selSql2 = ""; + } + return String.valueOf(con); + } + + /** + * 更改主表信审考核时间 + * @return + * @throws Exception + */ + public String updateOrderAuditDay(Transaction Sqlca) throws Exception { + // 定义全局对象 + String id = ""; // 流程编号 + String userid = ""; // 流程编号 + String every_day = ""; // 流程编号 + String begintime = ""; // 流程创建时间 + String endtime = ""; // 流程创建时间 + String audittime = "0"; // 跳过节假日之后流程创建时间 + String updSql = ""; + String selSql2 = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + int con=0; + // 查询所有需要发送还款提醒的数据 + String selSql="SELECT id, every_day, userid FROM st_credit_audit_order "; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + while(rs.next()) { + // 获取接口推送所需数据 + con++; + id = rs.getString("id"); // 流程编号 + every_day = rs.getString("every_day"); // 流程编号 + userid = rs.getString("userid"); // 流程创建时间 + + selSql2="SELECT \n" + + " jump_begintime,\n" + + " jump_endtime \n" + + " FROM st_credit_audit_order_detail \n" + + " WHERE userid = '" + userid +"'" + + " AND audit_day ='" + every_day +"'" + + " AND auditResSts != 'null'" + + " AND (endtime is not null or endtime != '')" ; + ASResultSet rs2 = Sqlca.getASResultSet(new SqlObject(selSql2)); + begintime = ""; // 流程创建时间 + endtime = ""; + while(rs2.next()) { + String jump_begintime = rs2.getString("jump_begintime"); // 流程创建时间 + String jump_endtime = rs2.getString("jump_endtime"); // 流程创建时间 + if(StringUtils.isEmpty(begintime) || sdf.parse(begintime).getTime() > sdf.parse(jump_begintime).getTime()){ + begintime = jump_begintime; + } + if(StringUtils.isEmpty(endtime) || sdf.parse(jump_endtime).getTime() > sdf.parse(endtime).getTime()){ + endtime = jump_endtime; + } + //信审考核时间累加 + String tmpStr = resDiffJumpHoliday(Sqlca, simpleDateFormat.format(sdf.parse(jump_begintime)), simpleDateFormat.format(sdf.parse(jump_endtime))); + if("0".equals(tmpStr)){//审核时间不足一分钟，按一分钟算 + tmpStr = "1"; + } + int tmpTime = Integer.parseInt(audittime) + Integer.parseInt(tmpStr); + audittime = String.valueOf(tmpTime); + } + updSql="UPDATE st_credit_audit_order SET begintime='"+begintime+"', " + + " endtime='"+endtime+"', " + + " audittime='"+audittime+"', " + + "UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE id='"+id+"' "; + Sqlca.executeSQL(new SqlObject(updSql)); + id = ""; + userid = ""; + every_day = ""; + begintime = ""; + endtime = ""; + audittime = "0"; + updSql = ""; + selSql2 = ""; + } + return String.valueOf(con); + } + + + + /** + * 0010 信用不良 + * 0020 法院执行 + * 0030 虚假信息 + * 0040 身份核实异常 + * 0050 购车目的异常 + * 0060 综合评分不足 + * 0070 同意 + * 0080 附条件通过 + */ + /** + * 根据当前时间获得跳过节假日的工作日时间 + * @param date + * @return + */ + private String resJumpHoliday(Transaction Sqlca, String date) throws SQLException, ParseException { + //查询当前时间是否在工作时间 + SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + int hour = Integer.parseInt(date.substring(11, 13)); + int minute = Integer.parseInt(date.substring(14, 16)); + if(hour < 9){//时间小于当天9点，则调整时间为上午九点 + date = date.substring(0, 11) + "09:00:00"; + }else if((hour == 17 && minute > 30) || (hour > 17)){//时间小于当天17:30点，则调整时间为第二天的上午九点 + Date time = simpleDateFormat.parse(date); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(time); + calendar.add(Calendar.DAY_OF_MONTH, 1); + date = simpleDateFormat.format(calendar.getTime()).substring(0, 11) + "09:00:00"; + } + //查询当前时间是否在节假日时间 + String day = date.substring(0, 10); + int count = 0; + while (count < 15){ + count ++; + String selSql="SELECT count(1) as countNum " + + " FROM st_credit_audit_holiday st" + + " WHERE st.c_date='" + day +"'" + + " AND st.otype='休'" ; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + int countNum = 0; + if(rs.next()){ + countNum = rs.getInt("countNum"); + } + if(countNum > 0){ + Date time = simpleDateFormat.parse(date); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(time); + calendar.add(Calendar.DAY_OF_MONTH, 1); + date = simpleDateFormat.format(calendar.getTime()).substring(0, 11) + "09:00:00"; + day = date.substring(0, 10); + }else { + break; + } + } + return date; + } + + /** + * 根据时间段相差时间获得跳过节假日的工作日时间 + * @param begintime 开始时间 + * @param endtime 结束时间 + * @return + */ + private String resDiffJumpHoliday(Transaction Sqlca, String begintime, String endtime) throws SQLException, ParseException { + //获取开始时间、结束时间跳过节假日的时间 + begintime = resJumpHoliday(Sqlca, begintime); + endtime = resJumpHoliday(Sqlca, endtime); + //确认开始时间，到结束时间，中间隔的时间，并排除节假日时间 + //如果结束时间小于或者等于开始时间 + SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + Date beginDate = simpleDateFormat.parse(begintime); + Date endDate = simpleDateFormat.parse(endtime); + long diff = 0; + if(beginDate.getTime() >= endDate.getTime()){ + return "0"; + }else if (begintime.substring(0, 10).equals(endtime.substring(0, 10))){ + diff = diffMinute(beginDate.getTime(), endDate.getTime()); + return String.valueOf(diff); + }else { + long diffBeginAfter = diffBeginDateAfter(begintime, beginDate); + long diffEndDateBefore = diffEndDateBefore(endtime, endDate); + diff = diffBeginAfter + diffEndDateBefore; + //得到相差的天数 betweenDate + + beginDate = dayFormat.parse(dayFormat.format(beginDate)); + endDate = dayFormat.parse(dayFormat.format(endDate)); + long betweenDate = (endDate.getTime() - beginDate.getTime())/(60*60*24*1000); + if (betweenDate == 1){ + return String.valueOf(diff); + }else {//中间相隔大于一天查询数据库相隔天数中有几天是假期， + begintime = dayFormat.format(beginDate); + endtime = dayFormat.format(endDate); + String selSql="SELECT COUNT(1) as countNum FROM (\n" + + " SELECT c_date\n" + + " FROM st_credit_audit_holiday st\n" + + " WHERE st.c_date BETWEEN '"+begintime+"' AND '"+endtime+"'\n" + + " AND st.otype='休'\n" + + " GROUP BY st.c_date\n" + + " ) AS s" ; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + int countNum = 0; + if(rs.next()){ + countNum = rs.getInt("countNum"); + } + diff += (betweenDate - countNum - 1)*8*60; + return String.valueOf(diff); + } + } + } + + private long diffEndDateBefore(String endTime, Date endDate) throws ParseException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + String endtimeBefore = endTime.substring(0, 11) + "09:00:00"; + Date endDateBefore = simpleDateFormat.parse(endtimeBefore); + return diffMinute(endDateBefore.getTime(), endDate.getTime()); + } + + private long diffBeginDateAfter(String beginTime, Date beginDate) throws ParseException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + String begintimeAfter = beginTime.substring(0, 11) + "17:30:00"; + Date beginDateAfter = simpleDateFormat.parse(begintimeAfter); + return diffMinute(beginDate.getTime(), beginDateAfter.getTime()); + } + + private long diffMinute(long begin, long end){ + if(begin > end){ + return -1; + } + return (end - begin)/1000/60; + } +} diff --git a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/GenerateBackOpinionLog.java b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/GenerateBackOpinionLog.java index e7e012afd..bddf32e2b 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/GenerateBackOpinionLog.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/GenerateBackOpinionLog.java @@ -57,8 +57,10 @@ public class GenerateBackOpinionLog extends BaseBussiness{ laolbo.setAttributeValue("PROCESS_NODE","CONTRACT_CHANGES"); }else if("FundPaymentCarApply".equals(applyType)){//放款申请 laolbo.setAttributeValue("PROCESS_NODE","FINANCE_AUDIT"); - }else if("FileReturnApply".equals(applyType)){//归档申请 + }else if("MortgageFileApply".equals(applyType)){//放款后督 laolbo.setAttributeValue("PROCESS_NODE","DATA_ARCHIVE"); + }else if("MortgageFileMailApply".equals(applyType)){//邮寄归档 + laolbo.setAttributeValue("PROCESS_NODE","MAIL_ARCHIVE"); } laolBm.saveObject(laolbo); diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java index 33c0cafc8..49d29b643 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java @@ -229,8 +229,8 @@ public class BusinessApproveManager { public String checkCarNumber(JBOTransaction tx) throws Exception{ BizObjectManager lecManger = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR.CLASS_NAME, tx); BizObject lec = lecManger.createQuery("select O.id from O left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci on O.contract_id=lci.id " - + " where ( O.FRAME_NUMBER=:prameNumber or O.FRAME_NUMBER2=:prameNumber2 or O.FRAME_NUMBER3=:prameNumber3 or O.FRAME_NUMBER4=:prameNumber4 ) and project_id<>:projectid and lci.contract_status BETWEEN 21 AND 103") - .setParameter("prameNumber", plate_number).setParameter("prameNumber2", plate_number).setParameter("prameNumber3", plate_number).setParameter("prameNumber4", plate_number).setParameter("projectid", projectId).getSingleResult(false); + + " where ( O.FRAME_NUMBER=:prameNumber or O.FRAME_NUMBER2=:prameNumber2 ) and project_id<>:projectid and lci.contract_status BETWEEN 21 AND 103") + .setParameter("prameNumber", plate_number).setParameter("prameNumber2", plate_number).setParameter("projectid", projectId).getSingleResult(false); if(lec !=null){ /*if(lec.getAttribute("ID").getString().equals(phaseNo)){ return "SUCCESS"; diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java index c096542c6..900bcfeaa 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java @@ -95,7 +95,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { String custName=""; String customerId = ""; if("cust_type.cust".equals(custType)){ - if("BAIC_MOTOR".equals(this.getAttribute("operationType").toString())){ + if(this.getAttribute("operationType") != null && "BAIC_MOTOR".equals(this.getAttribute("operationType").toString())){ distributoIid=this.getAttribute("distributorNo").toString(); vndrName=this.getAttribute("distributorName").toString(); }else{ @@ -161,7 +161,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { this.saveUnionLessee(bmLULT,tx,customerId,asUser); this.saveBusinessStatus(bsbom, tx, asUser);//项目进度表 }else{ - if("BAIC_MOTOR".equals(this.getAttribute("operationType").toString())){ + if(this.getAttribute("operationType") != null && "BAIC_MOTOR".equals(this.getAttribute("operationType").toString())){ distributoIid=this.getAttribute("distributorNo").toString(); vndrName=this.getAttribute("distributorName").toString(); }else{ diff --git a/src_tenwa/com/tenwa/lease/function/ImportContractId.java b/src_tenwa/com/tenwa/lease/function/ImportContractId.java new file mode 100644 index 000000000..01d7426f6 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/function/ImportContractId.java @@ -0,0 +1,32 @@ +package com.tenwa.lease.function; + +import java.util.List; + +import org.omg.CORBA.Object; + +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; +import jbo.com.tenwa.lease.comm.LB_FILE_ARCHIVING_INFO; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; + +public class ImportContractId { + + public void updateContractId(Transaction Sqlca ) throws Exception{ + BizObjectManager lfaiManage=JBOFactory.getBizObjectManager(LB_FILE_ARCHIVING_INFO.CLASS_NAME,Sqlca); + BizObjectManager lciManage=JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME,Sqlca); + List lfais = lfaiManage.createQuery(" (contract_id is null) and (contract_number is not null) ").getResultList(true); + for (int i=0;i - 2c9c81b66e5d8b8b016eacb3adb80196 + 2c9c81b969188a33016f371d6341014c 鐢ㄦ埛缁戝畾淇℃伅琛 Wechat_user_buinding_report - true 0 REPORT - 2c9c81b66e5d8b8b016eacb10d170195 + 2c9c81b969188a33016f371cc4f2012a - 2c9c81b66f1cf0bd016f37f08b2f001d + 2c9c81b969188a33016f473dd1b301d5 - 2c9c81b66e5d8b8b016eacb4b11f0197 + 2c9c81b969188a33016f371d633b014b寰俊鐢ㄦ埛缁戝畾淇℃伅琛Wechat_user_buinding_report2c9023815726a036015726a496b00001COMPLEXSQLSELECT +WUI.openid, CI.CUSTOMERNAME, WUI.MOBILE_, WUI.CERTID_, WUI.WECHAT_NAME, - LCI.CONTRACT_NUMBER, + LCI.CONTRACT_NUMBER, + CONCAT('姣忔湀',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'鏃') AS PLAN_DATE, + IFNULL(LRP.RENT, 0.00) AS RENT, LCS.STATUS_NAME, LPI.PRODUCT_NAME, DI.DISTRIBUTOR_NAME, LPI.AFFILIATEDNAME, - LEC.FRAME_NUMBER + LEC.FRAME_NUMBER, +case when WUI.attention_status='N' then '鍚' + else '鏄' + end as attention_status, + WUI.binding_time FROM WECHAT_USER_INFO WUI LEFT JOIN @@ -57,6 +63,7 @@ LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID 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 LEFT JOIN @@ -67,109 +74,13 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b66f1cf0bd016f37f08b320027 + 2c9c81b969188a33016f473dd1b401d6 CUSTOMERNAME STRING CUSTOMERNAME 100 - 10 - true - - false - false - false - false - - - - - - 2c9c81b66f1cf0bd016f37f08b310021 - MOBILE_ - STRING - - - MOBILE_ - 100 - 11 - true - - false - false - false - false - - - - - - 2c9c81b66f1cf0bd016f37f08b320025 - CERTID_ - STRING - - - CERTID_ - 150 - 12 - true - - false - false - false - false - - - - - - 2c9c81b66f1cf0bd016f37f08b310023 - CONTRACT_NUMBER - STRING - - - CONTRACT_NUMBER - 150 - 13 - true - - false - false - false - false - - - - - - 2c9c81b66f1cf0bd016f37f08b310020 - STATUS_NAME - STRING - - - STATUS_NAME - 100 - 14 - true - - false - false - false - false - CENTER - - - - - - 2c9c81b66f1cf0bd016f37f08b320026 - PRODUCT_NAME - STRING - - - PRODUCT_NAME - 200 15 true @@ -182,13 +93,13 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b66f1cf0bd016f37f08b31001f - DISTRIBUTOR_NAME + 2c9c81b6710c46490171148b10680002 + PLAN_DATE STRING - - DISTRIBUTOR_NAME - 200 + + PLAN_DATE + 100 16 true @@ -201,13 +112,13 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b66f1cf0bd016f37f08b31001e - AFFILIATEDNAME - STRING + 2c9c81b6710c46490171148b10680003 + RENT + NUMBER - - AFFILIATEDNAME - 200 + + RENT + 100 17 true @@ -220,13 +131,13 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b66f1cf0bd016f37f08b310022 - FRAME_NUMBER + 2c9c81b969188a33016f473dd1b401db + MOBILE_ STRING - - FRAME_NUMBER - 150 + + MOBILE_ + 100 18 true @@ -239,14 +150,205 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b66f1cf0bd016f37f08b310024 + 2c9c81b969188a33016f473dd1b401d8 + CERTID_ + STRING + + + CERTID_ + 150 + 19 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016f473dd1b401dd + CONTRACT_NUMBER + STRING + + + CONTRACT_NUMBER + 150 + 20 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016f473dd1b401df + STATUS_NAME + STRING + + + STATUS_NAME + 100 + 21 + true + + false + false + false + false + CENTER + + + + + + 2c9c81b969188a33016f473dd1b401d9 + PRODUCT_NAME + STRING + + + PRODUCT_NAME + 200 + 22 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016f473dd1b401de + DISTRIBUTOR_NAME + STRING + + + DISTRIBUTOR_NAME + 200 + 23 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016f473dd1b401da + AFFILIATEDNAME + STRING + + + AFFILIATEDNAME + 200 + 24 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016f473dd1b401dc + FRAME_NUMBER + STRING + + + FRAME_NUMBER + 150 + 25 + true + + false + false + false + false + + + + + + 2c9c81b6710c46490171148b10680004 + attention_status + STRING + + + attention_status + 100 + 26 + true + + false + false + false + false + + + + + + 2c9c81b6710c46490171148b105c0001 + openid + STRING + + + openid + 100 + 27 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016f473dd1b401d7 WECHAT_NAME STRING WECHAT_NAME 100 - 19 + 28 + true + + false + false + false + false + + + + + + 2c9c81b6710c46490171148b10680005 + binding_time + STRING + + + binding_time + 200 + 29 true false @@ -263,7 +365,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b66f1cf0bd016f37f08b320028 + 2c9c81b969188a33016f473dd1b401e0 CUSTOMERNAME CUSTOMERNAME @@ -273,7 +375,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI 0 - 2c9c81b66f1cf0bd016f37f08b320029 + 2c9c81b969188a33016f473dd1b401e1 CERTID_ CERTID_ @@ -296,12 +398,12 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b66f1cf0bd016f37f08b2f001d + 2c9c81b969188a33016f473dd1b301d5 0 0 0 - TABLE#2c9c81b66e5d8b8b016eacb4b11f0197 - 2c9c81b66e5d8b8b016eacb3adb80196 + TABLE#2c9c81b969188a33016f371d633b014b + 2c9c81b969188a33016f371d6341014c TABLE diff --git a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/淇″鑰冩牳缁熻鎶ヨ〃.xml b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/淇″鑰冩牳缁熻鎶ヨ〃.xml index 38da0f7e5..b245835c3 100644 --- a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/淇″鑰冩牳缁熻鎶ヨ〃.xml +++ b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/淇″鑰冩牳缁熻鎶ヨ〃.xml @@ -37,46 +37,26 @@ xskhtj 2c9023815726a036015726a496b00001 COMPLEXSQL - SELECT VED.EVERY_DAY AS every_day,IFNULL(CONCAT(FT1.PHASENAME,'/',FT1.USERNAME),'') AS phseanduser,IFNULL(ROUND(FT2.SPSJ/FT3.SP_NUM,2),'') AS spxl,IFNULL(FT1.INPUT_NUM,'') AS inputnum,IFNULL(FT3.SP_NUM,'') AS spjnum,IFNULL(CONCAT(ROUND(IFNULL(FT3.SP_NUM,0)/IFNULL(FT1.INPUT_NUM,0)*100,2),'%'),'') spl,IFNULL(FT4.SP_PASS_NUM,'') AS tgnum,IFNULL(CONCAT(ROUND(IFNULL(FT4.SP_PASS_NUM,0)/IFNULL(FT3.SP_NUM,0)*100,2),'%'),'') AS tgl,IFNULL(FT5.SP_REFUSE_NUM,'') AS thnum,IFNULL(CONCAT(ROUND(IFNULL(FT5.SP_REFUSE_NUM,0)/IFNULL(FT3.SP_NUM,0)*100,2),'%'),'') AS thl,IFNULL(REFUSE1.REFUSE_NUM,'') AS xynum,IFNULL(REFUSE2.REFUSE_NUM,'') AS fynum,IFNULL(REFUSE3.REFUSE_NUM,'') AS xjnum,IFNULL(REFUSE4.REFUSE_NUM,'') AS sfnum,IFNULL(REFUSE5.REFUSE_NUM,'') AS gcnum,IFNULL(REFUSE6.REFUSE_NUM,'') AS zhnum -FROM VI_EVERY_DAY VED -LEFT JOIN (SELECT CASE WHEN FT.begintime BETWEEN DATE_FORMAT( FT.begintime, '%Y/%m/%d 17:30:59' ) AND DATE_FORMAT( FT.begintime, '%Y/%m/%d 23:59:59' ) THEN LEFT(DATE_FORMAT(DATE_ADD(FT.begintime, INTERVAL 1 DAY ),'%Y/%m/%d'), 10 ) ELSE LEFT( FT.begintime,10 ) END SP_TIME,MAX(FT.PHASENAME) AS PHASENAME,FT.USERNAME,COUNT(FT.BEGINTIME) INPUT_NUM FROM FLOW_TASK FT WHERE FT.flowname = '涓氬姟鐢宠娴佺▼' AND FT.phaseno='0030' AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND FT.BEGINTIME=(SELECT MIN(BEGINTIME) AS BEGINTIME FROM FLOW_TASK WHERE flowname = '涓氬姟鐢宠娴佺▼' AND phaseno='0030' AND (USERNAME IS NOT NULL OR USERNAME <>'') AND OBJECTNO=FT.OBJECTNO GROUP BY OBJECTNO) GROUP BY SP_TIME,FT.USERNAME)FT1 ON FT1.SP_TIME=VED.EVERY_DAY -LEFT JOIN (SELECT LEFT(FT.ENDTIME,10) AS SP_TIME,SUM(CASE WHEN FT.begintime < DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59' ) AND FT.endtime <DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59' ) THEN TIMESTAMPDIFF( SECOND, FT.begintime, FT.endtime ) WHEN FT.begintime < DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59' ) AND (FT.endtime BETWEEN DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59' ) AND DATE_FORMAT( DATE_ADD(FT.begintime, INTERVAL 1 DAY ), '%Y/%m/%d 09:00:00' ) ) THEN TIMESTAMPDIFF( SECOND, FT.begintime, DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59' ) ) WHEN FT.begintime < DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59' ) AND FT.endtime > DATE_FORMAT( DATE_ADD(FT.begintime, INTERVAL 1 DAY ), '%Y/%m/%d 09:00:00' ) THEN TIMESTAMPDIFF( SECOND,FT.begintime, DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59')) +((TIMESTAMPDIFF(DAY,DATE_FORMAT(FT.begintime,'%Y/%m/%d'),DATE_FORMAT(FT.endtime,'%Y/%m/%d'))-1)*8.5*60*60)+(CASE WHEN (FT.endtime BETWEEN DATE_FORMAT(FT.endtime,'%Y/%m/%d 09:00:00' ) AND DATE_FORMAT(FT.endtime,'%Y/%m/%d 17:30:59' )) THEN TIMESTAMPDIFF(SECOND,DATE_FORMAT(FT.endtime,'%Y/%m/%d 09:00:00' ),FT.endtime) ELSE 0 END) WHEN (FT.begintime BETWEEN DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59' ) AND DATE_FORMAT( DATE_ADD(FT.begintime, INTERVAL 1 DAY ), '%Y/%m/%d 09:00:00' ) ) THEN (CASE WHEN TIMESTAMPDIFF(DAY,DATE_FORMAT(FT.begintime,'%Y/%m/%d'),DATE_FORMAT(FT.endtime,'%Y/%m/%d')) >0 THEN ((TIMESTAMPDIFF(DAY,DATE_FORMAT(FT.begintime,'%Y/%m/%d'),DATE_FORMAT(FT.endtime,'%Y/%m/%d'))-1)*8.5*60*60) ELSE 0 END)+(CASE WHEN FT.endtime BETWEEN DATE_FORMAT(FT.endtime,'%Y/%m/%d 09:00:00' ) AND DATE_FORMAT(FT.endtime,'%Y/%m/%d 17:30:59' ) THEN TIMESTAMPDIFF(SECOND,DATE_FORMAT(FT.endtime,'%Y/%m/%d 09:00:00' ),FT.endtime) ELSE 0 END) ELSE TIMESTAMPDIFF( SECOND, FT.begintime, FT.endtime ) END)/60 SPSJ,FT.USERNAME FROM FLOW_TASK FT WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND FT.phaseno='0030' AND FT.endtime IS NOT NULL AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND FT.ENDTIME=(SELECT MAX(ENDTIME) AS ENDTIME FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phaseno='0030' AND endtime IS NOT NULL AND (USERNAME IS NOT NULL OR USERNAME <>'') AND OBJECTNO=FT.OBJECTNO GROUP BY OBJECTNO) AND NOT EXISTS(SELECT 1 FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phasename IN('缁忛攢鍟嗗彂璧','淇″涓撳憳鍒濆','淇″鍒濆') AND (ENDTIME IS NULL OR ENDTIME='') AND OBJECTNO=FT.OBJECTNO) GROUP BY LEFT(FT.endtime,10),FT.USERNAME)FT2 ON FT2.SP_TIME=FT1.SP_TIME AND FT1.USERNAME=FT2.USERNAME -LEFT JOIN (SELECT LEFT(FT.ENDTIME,10) AS SP_TIME,COUNT(FT.ENDTIME) AS SP_NUM,FT.USERNAME FROM FLOW_TASK FT WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND FT.ENDTIME IS NOT NULL AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND FT.PHASENO = '0030' AND FT.ENDTIME=(SELECT MIN(ENDTIME) AS ENDTIME FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND ENDTIME IS NOT NULL AND (USERNAME IS NOT NULL OR USERNAME <>'') AND PHASENO = '0030' AND OBJECTNO=FT.OBJECTNO GROUP BY OBJECTNO) AND EXISTS(SELECT 1 FROM FLOW_OBJECT FO WHERE FO.FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND (FO.PHASENO='1000' OR FO.PHASENO='8000'))GROUP BY LEFT(FT.ENDTIME,10),FT.USERNAME)FT3 ON FT3.SP_TIME=FT1.SP_TIME AND FT3.USERNAME=FT1.USERNAME -LEFT JOIN (SELECT LEFT(FT.ENDTIME,10) AS SP_TIME,COUNT(FT.ENDTIME) AS SP_PASS_NUM,FT.USERNAME FROM FLOW_TASK FT WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND FT.ENDTIME IS NOT NULL AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND FT.PHASENO = '0030' AND FT.ENDTIME=(SELECT MIN(ENDTIME) AS ENDTIME FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND ENDTIME IS NOT NULL AND (USERNAME IS NOT NULL OR USERNAME <>'') AND PHASENO = '0030' AND OBJECTNO=FT.OBJECTNO GROUP BY OBJECTNO) AND EXISTS(SELECT 1 FROM FLOW_OBJECT FO WHERE FO.FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='1000')GROUP BY LEFT(FT.ENDTIME,10),FT.USERNAME)FT4 ON FT4.SP_TIME=FT1.SP_TIME AND FT4.USERNAME=FT1.USERNAME -LEFT JOIN (SELECT LEFT(ENDTIME,10) AS SP_TIME,FT.PHASENAME,COUNT(ENDTIME) AS SP_REFUSE_NUM,FT.USERNAME FROM FLOW_TASK FT WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND FT.ENDTIME IS NOT NULL AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND FT.PHASENO = '0030' AND FT.ENDTIME=(SELECT MAX(ENDTIME) AS ENDTIME FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND ENDTIME IS NOT NULL AND (USERNAME IS NOT NULL OR USERNAME <>'') AND PHASENO = '0030' AND OBJECTNO = FT.OBJECTNO GROUP BY OBJECTNO) AND EXISTS(SELECT 1 FROM FLOW_OBJECT FO WHERE FO.FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='8000')GROUP BY LEFT(FT.ENDTIME,10),FT.USERNAME)FT5 ON FT5.SP_TIME=FT1.SP_TIME AND FT5.USERNAME=FT1.USERNAME -LEFT JOIN (SELECT xin.SP_TIME AS SP_TIME,COUNT(xin.phaseopinion) REFUSE_NUM,us.username FROM ( -SELECT LEFT(ft.endtime,10) AS SP_TIME,FT.PHASENAME,fob.phaseopinion AS phaseopinion -,ft.objectno,ft.endtime FROM FLOW_OPINION_BUSINESS FOB LEFT JOIN FLOW_TASK FT ON FT.RELATIVEOBJECTNO=FOB.SERIALNO WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND (ft.phaseno='0040' OR ft.phaseno='0060') AND FOB.PHASEOPINION='0010' AND EXISTS(SELECT 1 FROM flow_object fo WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='8000') ) xin LEFT JOIN (SELECT username,objectno FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phaseno='0030' GROUP BY objectno - ) us ON us.objectno=xin.objectno -GROUP BY LEFT(xin.endtime,10) )REFUSE1 ON REFUSE1.SP_TIME=FT1.SP_TIME AND REFUSE1.username=FT1.USERNAME -LEFT JOIN (SELECT xin.SP_TIME AS SP_TIME,COUNT(xin.phaseopinion) REFUSE_NUM,us.username FROM ( -SELECT LEFT(ft.endtime,10) AS SP_TIME,FT.PHASENAME,fob.phaseopinion AS phaseopinion -,ft.objectno,ft.endtime FROM FLOW_OPINION_BUSINESS FOB LEFT JOIN FLOW_TASK FT ON FT.RELATIVEOBJECTNO=FOB.SERIALNO WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND (ft.phaseno='0040' OR ft.phaseno='0060') AND FOB.PHASEOPINION='0020' AND EXISTS(SELECT 1 FROM flow_object fo WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='8000') ) xin LEFT JOIN (SELECT username,objectno FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phaseno='0030' GROUP BY objectno - ) us ON us.objectno=xin.objectno -GROUP BY LEFT(xin.endtime,10))REFUSE2 ON REFUSE2.SP_TIME=FT1.SP_TIME AND REFUSE2.username=FT1.USERNAME -LEFT JOIN (SELECT xin.SP_TIME AS SP_TIME,COUNT(xin.phaseopinion) REFUSE_NUM,us.username FROM ( -SELECT LEFT(ft.endtime,10) AS SP_TIME,FT.PHASENAME,fob.phaseopinion AS phaseopinion -,ft.objectno,ft.endtime FROM FLOW_OPINION_BUSINESS FOB LEFT JOIN FLOW_TASK FT ON FT.RELATIVEOBJECTNO=FOB.SERIALNO WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND (ft.phaseno='0040' OR ft.phaseno='0060') AND FOB.PHASEOPINION='0030' AND EXISTS(SELECT 1 FROM flow_object fo WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='8000') ) xin LEFT JOIN (SELECT username,objectno FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phaseno='0030' GROUP BY objectno - ) us ON us.objectno=xin.objectno -GROUP BY LEFT(xin.endtime,10))REFUSE3 ON REFUSE3.SP_TIME=FT1.SP_TIME AND REFUSE3.username=FT1.USERNAME -LEFT JOIN (SELECT xin.SP_TIME AS SP_TIME,COUNT(xin.phaseopinion) REFUSE_NUM,us.username FROM ( -SELECT LEFT(ft.endtime,10) AS SP_TIME,FT.PHASENAME,fob.phaseopinion AS phaseopinion -,ft.objectno,ft.endtime FROM FLOW_OPINION_BUSINESS FOB LEFT JOIN FLOW_TASK FT ON FT.RELATIVEOBJECTNO=FOB.SERIALNO WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND (ft.phaseno='0040' OR ft.phaseno='0060') AND FOB.PHASEOPINION='0040' AND EXISTS(SELECT 1 FROM flow_object fo WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='8000') ) xin LEFT JOIN (SELECT username,objectno FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phaseno='0030' GROUP BY objectno - ) us ON us.objectno=xin.objectno -GROUP BY LEFT(xin.endtime,10))REFUSE4 ON REFUSE4.SP_TIME=FT1.SP_TIME AND REFUSE4.username=FT1.USERNAME -LEFT JOIN ( -SELECT xin.SP_TIME AS SP_TIME,COUNT(xin.phaseopinion) REFUSE_NUM,us.username FROM ( -SELECT LEFT(ft.endtime,10) AS SP_TIME,FT.PHASENAME,fob.phaseopinion AS phaseopinion -,ft.objectno,ft.endtime FROM FLOW_OPINION_BUSINESS FOB LEFT JOIN FLOW_TASK FT ON FT.RELATIVEOBJECTNO=FOB.SERIALNO WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND (ft.phaseno='0040' OR ft.phaseno='0060') AND FOB.PHASEOPINION='0050' AND EXISTS(SELECT 1 FROM flow_object fo WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='8000') ) xin LEFT JOIN (SELECT username,objectno FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phaseno='0030' GROUP BY objectno - ) us ON us.objectno=xin.objectno -GROUP BY LEFT(xin.endtime,10) -)REFUSE5 ON REFUSE5.SP_TIME=FT1.SP_TIME AND REFUSE5.username=FT1.USERNAME -LEFT JOIN (SELECT xin.SP_TIME AS SP_TIME,COUNT(xin.phaseopinion) REFUSE_NUM,us.username FROM ( -SELECT LEFT(ft.endtime,10) AS SP_TIME,FT.PHASENAME,fob.phaseopinion AS phaseopinion -,ft.objectno,ft.endtime FROM FLOW_OPINION_BUSINESS FOB LEFT JOIN FLOW_TASK FT ON FT.RELATIVEOBJECTNO=FOB.SERIALNO WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND (ft.phaseno='0040' OR ft.phaseno='0060') AND FOB.PHASEOPINION='0060' AND EXISTS(SELECT 1 FROM flow_object fo WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='8000') ) xin LEFT JOIN (SELECT username,objectno FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phaseno='0030' GROUP BY objectno - ) us ON us.objectno=xin.objectno -GROUP BY LEFT(xin.endtime,10))REFUSE6 ON REFUSE6.SP_TIME=FT1.SP_TIME AND REFUSE6.username=FT1.USERNAME -ORDER BY ved.every_day DESC + SELECT +VED.EVERY_DAY AS every_day, +IFNULL(CONCAT(st.auditFlowTypeDes,'/',st.username),'') AS phseanduser, +IFNULL(ROUND(st.audittime/st.count_audit,2),'') AS spxl, +IFNULL(st.order_count,'') AS inputnum, +IFNULL(st.count_audit,'') AS spjnum, +IFNULL(CONCAT(ROUND(IFNULL(st.count_audit,0)/IFNULL(st.order_count,0)*100,2),'%'),'') spl, +IFNULL(st.count_audit_pass,'') AS tgnum, +IFNULL(CONCAT(ROUND(IFNULL(st.count_audit_pass,0)/IFNULL(st.count_audit,0)*100,2),'%'),'') AS tgl, +IFNULL(st.count_audit_refuse,'') AS thnum, +IFNULL(CONCAT(ROUND(IFNULL(st.count_audit_refuse,0)/IFNULL(st.count_audit,0)*100,2),'%'),'') AS thl, +IFNULL(st.count_audit_refuse1,'') AS xynum, +IFNULL(st.count_audit_refuse2,'') AS fynum, +IFNULL(st.count_audit_refuse3,'') AS xjnum, +IFNULL(st.count_audit_refuse4,'') AS sfnum, +IFNULL(st.count_audit_refuse5,'') AS gcnum, +IFNULL(st.count_audit_refuse6,'') AS zhnum +FROM VI_EVERY_DAY VED +LEFT JOIN st_credit_audit_order st ON st.every_day = VED.EVERY_DAY +ORDER BY ved.every_day DESC