diff --git a/src_sql/投产SQL/v20201022/maliang20201217_提前结清.sql b/src_sql/投产SQL/v20201022/maliang20201217_提前结清.sql
new file mode 100644
index 000000000..6e06f90d7
--- /dev/null
+++ b/src_sql/投产SQL/v20201022/maliang20201217_提前结清.sql
@@ -0,0 +1,23 @@
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '0010', '1010', 'ǰԱ', NULL, NULL, '!.ͬϢʽʱ(#ObjectNo)+!.ʽʱ(#ObjectNo)+!.ʱ(#ObjectNo)+!.ƻʽʷ(#ObjectNo)+!.ύϢ״̬(#ObjectNo)', '{#UserID}', NULL, 'commroute', NULL, '', '#PhaseOpinion1', 'closePage,doSubmit,signOpinion', NULL, 'all_except', 'ContractTerminate', NULL, NULL, '01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 483, 134, '100', '50', '1', NULL, 'TASK', NULL, 'N', 'Y', NULL, 'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.updateNodeSetReadOnly(\"Ϣ\",null);\r\nTreeView.updateNodeSetReadOnly(\"ǰֹ\",null);\r\nTreeView.updateNodeSetReadOnly(\"һ\",null);\r\nTreeView.updateNodeSetReadOnly(\"\",null);\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"˵\",\"ǰ˵\");\r\nTreeView.addBeforeNodeByCode(\"ǰֹ\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"ǰ\", \"11610\");', NULL, 'backnextstep', NULL, NULL, 'TreeView.addDeleteCallBackSql(\"jbo.com.tenwa.lease.comm.LC_OCCUPY_RENT_LIST\",\"delete from o where o.flowunid=:FlowUnid\");\r\nTreeView.addDeleteCallBackSql(\"jbo.app.tenwa.calc.LC_EBANK_PROCESS\",\"delete from O where flowunid=:FlowUnid\");+!.ۿϢ̷ȡ(#ObjectNo)', NULL, 'N', 'ʲ(0020)', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '0020', '1020', 'ʲ', NULL, NULL, NULL, 'toStringArray(\"#PhaseAction\",\",\",\" \",1)', NULL, 'conditionroute', NULL, '[{usertype:\"ָɫ\",userinfo:\"800R00000017,ʲ\"}]', '#PhaseOpinion1', 'closePage,doSubmit,backStep,signOpinion,circulate', NULL, 'all_except', 'ContractTerminate', NULL, NULL, '01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 484, 220, '100', '50', '1', NULL, 'TASK', NULL, 'Y', 'Y', NULL, 'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"˵\",\"ǰ˵\");\r\nTreeView.addBeforeNodeByCode(\"ǰֹ\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"ǰ\", \"11610\");', NULL, 'backnextstep', 'ǰԱ(0010)', NULL, NULL, NULL, 'N', '[{stepno:\"ҵܼ(0030)\",stepcondition:\"!.ǰøı(#ObjectNo)\"},{stepno:\"C˲(0040)\",stepcondition:\"!.ǰδı(#ObjectNo)\"}]', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '0030', '1020', 'ҵܼ', NULL, NULL, NULL, 'toStringArray(\"#PhaseAction\",\",\",\" \",1)', NULL, 'conditionroute', NULL, '[{usertype:\"ָɫ\",userinfo:\"800R00000011,ҵܼ\"}]', '#PhaseOpinion1', 'closePage,doSubmit,backStep,signOpinion,circulate', NULL, 'all_except', 'ContractTerminate', NULL, NULL, '01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 479, 398, '100', '50', '1', NULL, 'FORK', NULL, 'Y', 'Y', NULL, 'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"˵\",\"ǰ˵\");\r\nTreeView.addBeforeNodeByCode(\"ǰֹ\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"ǰ\", \"11610\");', NULL, 'backnextstep', 'ʲ(0020)', NULL, NULL, NULL, 'N', '[{stepno:\"ܾ(0050)\",stepcondition:\"!.ǰսͻ100(#ObjectNo)\"},{stepno:\"C˲(0040)\",stepcondition:\"!.ǰսͻСڵ100(#ObjectNo)\"}]', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '0040', '1020', 'C˲', NULL, NULL, NULL, 'toStringArray(\"#PhaseAction\",\",\",\" \",1)', NULL, 'selectroute', NULL, '[{usertype:\"ѡָؽɫ\",userinfo:\"800R00000021,C˲\"}]', '#PhaseOpinion1', 'closePage,doSubmit,backStep,signOpinion', NULL, 'all_except', 'ContractTerminate', NULL, NULL, '01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 479, 695, '100', '50', '1', NULL, 'TASK', NULL, 'Y', 'Y', NULL, 'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"˵\",\"ǰ˵\");\r\nTreeView.addBeforeNodeByCode(\"ǰֹ\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"ǰ\", \"11610\");', NULL, 'backnextstep', NULL, NULL, NULL, NULL, 'N', '[{stepno:\"(1000)\",stepcondition:\"ύ\"},{stepno:\"(8000)\",stepcondition:\"ύ\"}]', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '0050', '1020', 'ܾ', NULL, NULL, NULL, 'toStringArray(\"#PhaseAction\",\",\",\" \",1)', NULL, 'commroute', NULL, '[{usertype:\"ָɫ\",userinfo:\"800R00000039,ܾ\"}]', '#PhaseOpinion1', 'closePage,doSubmit,backStep,signOpinion,circulate', NULL, 'all_except', 'ContractTerminate', NULL, NULL, '01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 480, 578, '100', '50', '1', NULL, 'TASK', NULL, 'Y', 'Y', NULL, 'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"˵\",\"ǰ˵\");\r\nTreeView.addBeforeNodeByCode(\"ǰֹ\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"ǰ\", \"11610\");', NULL, 'backnextstep', 'ҵܼ(0030)', NULL, NULL, NULL, 'N', 'C˲(0040)', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '1000', '1040', '', NULL, NULL, '!.Ϣʱʽ(#ObjectNo)+!.ǰ洢(#ObjectNo)+!.ʱ(#ObjectNo)+!.Ϣʱʽ(#ObjectNo)+!.Ϣɾ(#ObjectNo)+!.ƾ֤--ǰ(#ObjectNo)+!̲ͨ.Ŀ״̬(#ObjectNo,52)+!.̽ɾӦƻռ(#ObjectNo)+!.ǰϢʱʽ(#ObjectNo)+!.ºͬ״̬(#ObjectNo,100)+!.ύϢͨ(#ObjectNo)', '{\"system\"}', NULL, 'commroute', NULL, NULL, NULL, 'closePage', NULL, 'all_except', 'ContractApproval', NULL, NULL, '01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 456, 817, '50', '50', '1', NULL, 'END', NULL, 'N', 'Y', NULL, 'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");', NULL, NULL, NULL, NULL, NULL, NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '8000', '1050', '', NULL, NULL, '!.ύϢ̷(#ObjectNo)', '{\"system\"}', NULL, 'commroute', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 542, 809, '50', '50', '1', NULL, 'END', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+select * from FLOW_MODEL where FlowNo='ContractTerminateFlow';
+---ǰĵ---
+delete from FLOW_MODEL where FlowNo='ContractTerminateFlow';
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '0010', '1010', 'ǰԱ', NULL, NULL, '!.ͬϢʽʱ(#ObjectNo)+!.ʽʱ(#ObjectNo)+!.ʱ(#ObjectNo)+!.ƻʽʷ(#ObjectNo)+!.ύϢ״̬(#ObjectNo)', '{#UserID}', NULL, 'conditionroute', NULL, '', '#PhaseOpinion1', 'closePage,doSubmit,signOpinion', NULL, 'all_except', 'ContractTerminate', NULL, NULL, '01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 483, 134, '100', '50', '1', NULL, 'TASK', NULL, 'N', 'Y', NULL, 'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.updateNodeSetReadOnly(\"Ϣ\",null);\r\nTreeView.updateNodeSetReadOnly(\"ǰֹ\",null);\r\nTreeView.updateNodeSetReadOnly(\"һ\",null);\r\nTreeView.updateNodeSetReadOnly(\"\",null);\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"˵\",\"ǰ˵\");\r\nTreeView.addBeforeNodeByCode(\"ǰֹ\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"ǰ\", \"11610\");', NULL, 'backnextstep', NULL, NULL, 'TreeView.addDeleteCallBackSql(\"jbo.com.tenwa.lease.comm.LC_OCCUPY_RENT_LIST\",\"delete from o where o.flowunid=:FlowUnid\");\r\nTreeView.addDeleteCallBackSql(\"jbo.app.tenwa.calc.LC_EBANK_PROCESS\",\"delete from O where flowunid=:FlowUnid\");+!.ۿϢ̷ȡ(#ObjectNo)', NULL, 'N', '[{stepno:\"ʲ(0020)\",stepcondition:\"!.ǰøı(#ObjectNo)\"},{stepno:\"ʲ1(0021)\",stepcondition:\"!.ǰδı(#ObjectNo)\"}]', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '0020', '1020', 'ʲ', NULL, NULL, NULL, 'toStringArray(\"#PhaseAction\",\",\",\" \",1)', NULL, 'conditionroute', NULL, '[{usertype:\"ָɫ\",userinfo:\"800R00000017,ʲ\"}]', '#PhaseOpinion1', 'closePage,doSubmit,backStep,signOpinion,circulate', NULL, 'all_except', 'ContractTerminate', NULL, NULL, '01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 623, 255, '100', '50', '1', NULL, 'FORK', NULL, 'Y', 'Y', NULL, 'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"˵\",\"ǰ˵\");\r\nTreeView.addBeforeNodeByCode(\"ǰֹ\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"ǰ\", \"11610\");', NULL, 'backnextstep', 'ǰԱ(0010)', NULL, NULL, NULL, 'N', '[{stepno:\"ҵܼ(0030)\",stepcondition:\"!.ǰսͻ100(#ObjectNo)\"},{stepno:\"ҵܼ1(0031)\",stepcondition:\"!.ǰսͻСڵ100(#ObjectNo)\"}]', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '0021', '1020', 'ʲ1', NULL, NULL, NULL, 'toStringArray(\"#PhaseAction\",\",\",\" \",1)', NULL, 'selectroute', NULL, '[{usertype:\"ָɫ\",userinfo:\"800R00000017,ʲ\"}]', '#PhaseOpinion1', 'closePage,doSubmit,backStep,signOpinion,circulate', NULL, 'all_except', 'ContractTerminate', NULL, NULL, '01', NULL, NULL, '[{usertype:\"ָɫ\",userinfo:\"800R00000021,C˲\"}]', NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 326, 273, '100', '50', '1', NULL, 'TASK', NULL, 'Y', 'Y', NULL, 'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"˵\",\"ǰ˵\");\r\nTreeView.addBeforeNodeByCode(\"ǰֹ\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"ǰ\", \"11610\");', NULL, 'backnextstep', 'ǰԱ(0010)', NULL, NULL, NULL, 'N', '[{stepno:\"(1000)\",stepcondition:\"\"},{stepno:\"(8000)\",stepcondition:\"\"}]', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '0030', '1020', 'ҵܼ', NULL, NULL, NULL, 'toStringArray(\"#PhaseAction\",\",\",\" \",1)', NULL, 'commroute', NULL, '[{usertype:\"ָɫ\",userinfo:\"800R00000011,ҵܼ\"}]', '#PhaseOpinion1', 'closePage,doSubmit,backStep,signOpinion,circulate', NULL, 'all_except', 'ContractTerminate', NULL, NULL, '01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 486, 423, '100', '50', '1', NULL, 'TASK', NULL, 'Y', 'Y', NULL, 'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"˵\",\"ǰ˵\");\r\nTreeView.addBeforeNodeByCode(\"ǰֹ\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"ǰ\", \"11610\");', NULL, 'backnextstep', 'ʲ(0020)', NULL, NULL, NULL, 'N', 'ܾ(0050)', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '0031', '1020', 'ҵܼ1', NULL, NULL, NULL, 'toStringArray(\"#PhaseAction\",\",\",\" \",1)', NULL, 'selectroute', NULL, '[{usertype:\"ָɫ\",userinfo:\"800R00000011,ҵܼ\"}]', '#PhaseOpinion1', 'closePage,doSubmit,backStep,signOpinion,circulate', NULL, 'all_except', 'ContractTerminate', NULL, NULL, '01', NULL, NULL, '[{usertype:\"ָɫ\",userinfo:\"800R00000021,C˲\"}]', NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 765, 428, '100', '50', '1', NULL, 'TASK', NULL, 'Y', 'Y', NULL, 'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"˵\",\"ǰ˵\");\r\nTreeView.addBeforeNodeByCode(\"ǰֹ\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"ǰ\", \"11610\");', NULL, 'backnextstep', 'ʲ(0020)', NULL, NULL, NULL, 'N', '[{stepno:\"(1000)\",stepcondition:\"ύ\"},{stepno:\"(8000)\",stepcondition:\"ύ\"}]', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '0040', '1020', 'C˲', NULL, NULL, NULL, 'toStringArray(\"#PhaseAction\",\",\",\" \",1)', NULL, 'selectroute', NULL, '[{usertype:\"ѡָؽɫ\",userinfo:\"800R00000021,C˲\"}]', '#PhaseOpinion1', 'closePage,doSubmit,backStep,signOpinion', NULL, 'all_except', 'ContractTerminate', NULL, NULL, '01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 611, 789, '100', '50', '1', NULL, 'TASK', NULL, 'Y', 'Y', NULL, 'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"˵\",\"ǰ˵\");\r\nTreeView.addBeforeNodeByCode(\"ǰֹ\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"ǰ\", \"11610\");', NULL, 'backnextstep', NULL, NULL, NULL, NULL, 'N', '[{stepno:\"(1000)\",stepcondition:\"ύ\"},{stepno:\"(8000)\",stepcondition:\"ύ\"}]', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '0050', '1020', 'ܾ', NULL, NULL, NULL, 'toStringArray(\"#PhaseAction\",\",\",\" \",1)', NULL, 'selectroute', NULL, '[{usertype:\"ָɫ\",userinfo:\"800R00000039,ܾ\"}]', '#PhaseOpinion1', 'closePage,doSubmit,backStep,signOpinion,circulate', NULL, 'all_except', 'ContractTerminate', NULL, NULL, '01', NULL, NULL, '[{usertype:\"ָɫ\",userinfo:\"800R00000021,C˲\"}]', NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 483, 540, '100', '50', '1', NULL, 'TASK', NULL, 'Y', 'Y', NULL, 'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"˵\",\"ǰ˵\");\r\nTreeView.addBeforeNodeByCode(\"ǰֹ\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"ǰ\", \"11610\");', NULL, 'backnextstep', 'ҵܼ(0030)', NULL, NULL, NULL, 'N', '[{stepno:\"(1000)\",stepcondition:\"ύ\"},{stepno:\"(8000)\",stepcondition:\"ύ\"}]', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '1000', '1040', '', NULL, NULL, '!.Ϣʱʽ(#ObjectNo)+!.ǰ洢(#ObjectNo)+!.ʱ(#ObjectNo)+!.Ϣʱʽ(#ObjectNo)+!.Ϣɾ(#ObjectNo)+!.ƾ֤--ǰ(#ObjectNo)+!̲ͨ.Ŀ״̬(#ObjectNo,52)+!.̽ɾӦƻռ(#ObjectNo)+!.ǰϢʱʽ(#ObjectNo)+!.ºͬ״̬(#ObjectNo,100)+!.ύϢͨ(#ObjectNo)', '{\"system\"}', NULL, 'commroute', NULL, NULL, NULL, 'closePage', NULL, 'all_except', 'ContractApproval', NULL, NULL, '01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 300, 384, '50', '50', '1', NULL, 'END', NULL, 'N', 'Y', NULL, 'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");', NULL, NULL, NULL, NULL, NULL, NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`flow_model`(`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) VALUES ('ContractTerminateFlow', '8000', '1050', '', NULL, NULL, '!.ύϢ̷(#ObjectNo)', '{\"system\"}', NULL, 'commroute', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 391, 384, '50', '50', '1', NULL, 'END', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+
+
diff --git a/报表/汽车类报表一/经销商月度资金统计表.xml b/报表/汽车类报表一/经销商月度资金统计表.xml
index 1bf72897c..b26459ee1 100644
--- a/报表/汽车类报表一/经销商月度资金统计表.xml
+++ b/报表/汽车类报表一/经销商月度资金统计表.xml
@@ -19,14 +19,13 @@
2c9c81b97520309601754a8707d10042
经销商月度资金统计表
supplier_fund_month_report
- REPORT_CODE_1603273164753
true
32
REPORT
2c9c81b7685efbbc016931c675a50006
- 2c9c81b97520309601754a87e2070044
+ 2c9c81b975e496a90176650d873b0068
@@ -39,15 +38,26 @@
COMPLEXSQL
select t1.orgname ,
t1.svrentover ,
- t2.cc ,
- t2.srent ,
+ t1.clrentover,
+ t4.cc ,
+ t4.srent ,
t2.soverrent ,
t3.rents ,
- t3.cover
+ t3.cover ,
+ concat(round(t1.clrentover/t1.svrentover*100,2),'%') rate
from (SELECT sum(csc.`vrentover`) svrentover,
- csc.`orgname`
+ sum(case when csc.contract_number in (
+ select distinct rrp.`contract_number`
+ from report_rent_plan rrp
+ LEFT JOIN lb_contract_info bci on rrp.contract_number = bci.CONTRACT_NUMBER
+ where bci.BUSINESSTYPE = '1' and rrp.`batch_status` = "未完成"
+ and rrp.`over_days` >= 0 ) then csc.`vrentover` else 0 end
+ ) clrentover,
+ di.DISTRIBUTOR_NAME orgname
FROM `contract_statis_car` csc
- GROUP BY csc.`orgname`) t1
+ LEFT JOIN LB_CONTRACT_INFO lci ON csc.contract_number = lci.contract_number
+ LEFT JOIN distributor_info di ON di.distributor_no = lci.distributor_id
+ GROUP BY di.DISTRIBUTOR_NAME) t1
left join
(select left(rrp.plan_date, 7),
rrp.distributor_name,
@@ -72,55 +82,29 @@ from (SELECT sum(csc.`vrentover`) svrentover,
and rrp.`batch_status` = "未完成"
/~enddate:and str_to_date(replace(left(rrp.PLAN_DATE, 10), '/', '-'), '%Y-%m-%d') <= str_to_date('{enddate}', '%Y/%m/%d')~/
group by rrp.`distributor_name`
- HAVING MAX(rrp.`over_days`) >= 0) t3 on t1.orgname = t3.distributor_name
- startdate|enddate|enddate
+ HAVING MAX(rrp.`over_days`) >= 0) t3 on t1.orgname = t3.distributor_name
+left join
+ (select left(rrp.plan_date, 7),
+ rrp.distributor_name,
+ COUNT(case when rrp.COLLECT_STATUS in ('提前结清') then null ELSE 1 END) cc,
+ SUM(case when rrp.COLLECT_STATUS in ('提前结清') then 0 ELSE rrp.`rent` END) srent,
+ sum(case when rrp.batch_status = '未完成' then rrp.RENT ELSE 0 END) soverrent
+ from report_rent_plan rrp
+ left join code_library cl on cl.codeno = 'charge_way' and cl.itemno = rrp.collect_msg
+ LEFT JOIN lb_contract_info bci on rrp.contract_number = bci.CONTRACT_NUMBER
+ where bci.BUSINESSTYPE = '1'
+ /~enddate:and rrp.PLAN_DATE like CONCAT('%',left('{enddate}', 7),'%')~/
+ group by rrp.distributor_name) t4 on t1.orgname = t4.distributor_name
+ startdate|enddate|enddate|enddate
- 2c9c81b97520309601754a882710004a
+ 2c9c81b975e496a90176650d873d006b
orgname
STRING
orgname
100
- 7
- true
-
- false
- false
- false
- false
-
-
-
-
-
- 2c9c81b97520309601754a882710004b
- svrentover
- NUMBER
- #,##0.00
-
- svrentover
- 100
- 8
- true
-
- false
- false
- false
- false
-
-
-
-
-
- 2c9c81b97520309601754a8827100048
- cc
- NUMBER
-
-
- cc
- 100
9
true
@@ -133,12 +117,12 @@ from (SELECT sum(csc.`vrentover`) svrentover,
- 2c9c81b97520309601754a8827100045
- srent
+ 2c9c81b975e496a90176650d873d006f
+ svrentover
NUMBER
#,##0.00
-
- srent
+
+ svrentover
100
10
true
@@ -152,12 +136,12 @@ from (SELECT sum(csc.`vrentover`) svrentover,
- 2c9c81b97520309601754a8827100049
- soverrent
+ 2c9c81b975e496a90176650d873c0069
+ cc
NUMBER
- #,##0.00
-
- soverrent
+
+
+ cc
100
11
true
@@ -171,12 +155,12 @@ from (SELECT sum(csc.`vrentover`) svrentover,
- 2c9c81b97520309601754a8827100047
- rents
+ 2c9c81b975e496a90176650d873d0070
+ srent
NUMBER
#,##0.00
-
- rents
+
+ srent
100
12
true
@@ -190,14 +174,90 @@ from (SELECT sum(csc.`vrentover`) svrentover,
- 2c9c81b97520309601754a8827100046
+ 2c9c81b975e496a90176650d873d0071
+ soverrent
+ NUMBER
+ #,##0.00
+
+ soverrent
+ 100
+ 13
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 2c9c81b975e496a90176650d873d006c
cover
NUMBER
cover
100
- 13
+ 14
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 2c9c81b975e496a90176650d873d006d
+ rents
+ NUMBER
+ #,##0.00
+
+ rents
+ 100
+ 15
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 2c9c81b975e496a90176650d873d006e
+ clrentover
+ NUMBER
+ #,##0.00
+
+ clrentover
+ 100
+ 16
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 2c9c81b975e496a90176650d873d006a
+ rate
+ NUMBER
+
+
+ rate
+ 100
+ 17
true
false
@@ -214,7 +274,7 @@ from (SELECT sum(csc.`vrentover`) svrentover,
- 2c9c81b97520309601754a8a6ae8004c
+ 2c9c81b975e496a90176650d873d0072
startdate
startdate
@@ -224,7 +284,7 @@ from (SELECT sum(csc.`vrentover`) svrentover,
0
- 2c9c81b97520309601754a8a6ae8004d
+ 2c9c81b975e496a90176650d873d0073
enddate
enddate
@@ -247,7 +307,7 @@ from (SELECT sum(csc.`vrentover`) svrentover,
- 2c9c81b97520309601754a87e2070044
+ 2c9c81b975e496a90176650d873b0068
0
0
0
diff --git a/报表/汽车类报表二/档案归档报表新.xml b/报表/汽车类报表二/档案归档报表新.xml
index ace797820..644842bc0 100644
--- a/报表/汽车类报表二/档案归档报表新.xml
+++ b/报表/汽车类报表二/档案归档报表新.xml
@@ -36,18 +36,18 @@
archive
2c9023815726a036015726a496b00001
COMPLEXSQL
- SELECT lci.subjectname,di.distributor_name,lci.contract_number,lcs.itemname AS status_name,LUL.CUSTOMER_NAME,lec.frame_number,lfi.fact_date,lcl.PLATE_NUMBER,LEC.REGDATE,
+ SELECT lci.subjectname,di.distributor_name,lci.contract_number,lcs.itemname AS status_name,LUL.CUSTOMER_NAME,lec.frame_number,lfi.fact_date,lcl.PLATE_NUMBER1,CASE WHEN lcl.nm>1 then lcl.PLATE_NUMBER2 else '' end PLATE_NUMBER2,LEC.REGDATE,
CASE WHEN lcl.is_pledge='Y'THEN '完成' ELSE '未完成' END AS is_pledge,
lcl.pledge_date,lfa.ARCHIVING_PERSON,lfa.ARCHIVING_CABINET_NO asarchivingCabinetNo ,lfa.FILE_NUMBER as fileNumber,DATEDIFF(lcl.pledge_date,lfi.fact_date) AS pledge_plan,
CASE WHEN lcl.is_delay='Y' THEN '提交延迟申请' WHEN lcl.is_delay='N' THEN '未提交延迟申请' ELSE lcl.is_delay END AS is_delay,
lcl.delay_date,DATEDIFF(lcl.delay_date,lfi.fact_date) AS delay_plan,
IFNULL(cl.itemname,'未归档') AS is_ARCHIVING,
-LEFT(en.endtime,10) AS ARCHIVING_TIME,CASE WHEN (lfm.ALLHANDOVERSTATUS='all' OR lfm.ALLHANDOVERSTATUS='系统归档' or lfm.ALLHANDOVERSTATUS='part' ) THEN lfm.ARCHIVING_TIME ELSE '' END AS times,lfm.opinion_comments
+en.endtime AS ARCHIVING_TIME,CASE WHEN (lfm.ALLHANDOVERSTATUS='all' OR lfm.ALLHANDOVERSTATUS='系统归档' or lfm.ALLHANDOVERSTATUS='part' ) THEN lfm.ARCHIVING_TIME ELSE '' END AS times,lfm.opinion_comments
FROM lb_contract_info lci
LEFT JOIN LB_FILE_ARCHIVING_INFO lfa ON lci.id=lfa.contract_id
-LEFT JOIN lb_equipment_car lec ON lec.contract_id=lci.id and lec.car_attribute='head'
+LEFT JOIN lb_equipment_car lec ON lec.contract_id=lci.id and car_attribute='head'
LEFT JOIN distributor_info di ON di.distributor_no=lci.distributor_id
-LEFT JOIN lb_car_license_plate_info lcl ON lcl.contract_id=lci.id
+LEFT JOIN (SELECT contract_id,max(PLATE_NUMBER) PLATE_NUMBER1,min(PLATE_NUMBER) PLATE_NUMBER2,pledge_date,is_pledge,is_delay,delay_date,count(1) nm FROM lb_car_license_plate_info lcl group by contract_id) lcl ON lcl.contract_id=lci.id
LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.fee_type='feetype10' AND lfi.settle_method<>'settlemethod11' AND lfi.pay_status='have_paid' LEFT JOIN lb_union_lessee lul ON lul.PROJECT_ID = lci.PROJECT_ID
LEFT JOIN (SELECT bs.contract_number,cl.itemname
FROM business_status AS bs,
@@ -57,7 +57,8 @@ LEFT JOIN (SELECT bs.contract_number,cl.itemname
WHERE bs.inputtime=bb.inputtime AND bb.contract_number = bs.contract_number AND bs.business_status=cl.itemno AND cl.codeno='BusinessStatus'
) lcs ON lcs.contract_number=lci.contract_no
LEFT JOIN LB_FILE_MAILARCHIVING_INFO lfm ON lfm.contract_id=lci.id LEFT JOIN code_library cl ON cl.codeno='allHandOverStatus' AND cl.itemno=lfm.ALLHANDOVERSTATUS LEFT JOIN (SELECT ft.UPDATETIME AS endtime,ft.contract_id AS contract_id
- FROM LB_FILE_ARCHIVING_INFO_TEMP ft ) en ON en.contract_id=lci.id
+ FROM LB_FILE_ARCHIVING_INFO_TEMP ft ) en2 ON en2.contract_id=lci.id
+left join (select contract_id,endtime from VI_FLOW_MONITORING where FLOWNO='MortgageFileFlow' ) en on en.contract_id = lci.id
WHERE lci.businesstype='1' AND (lci.contract_status='31' OR lci.contract_status='100')
ORDER BY lfi.fact_date DESC
@@ -70,7 +71,7 @@ ORDER BY lfi.fact_date DESC
subjectname
210
- 22
+ 23
true
false
@@ -89,7 +90,7 @@ ORDER BY lfi.fact_date DESC
distributor_name
100
- 23
+ 24
true
false
@@ -108,7 +109,7 @@ ORDER BY lfi.fact_date DESC
contract_number
150
- 24
+ 25
true
false
@@ -127,7 +128,7 @@ ORDER BY lfi.fact_date DESC
status_name
100
- 25
+ 26
true
false
@@ -146,7 +147,7 @@ ORDER BY lfi.fact_date DESC
CUSTOMER_NAME
100
- 26
+ 27
true
false
@@ -165,7 +166,45 @@ ORDER BY lfi.fact_date DESC
frame_number
150
- 27
+ 28
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 2c9c81b975e496a9017665635bba0075
+ PLATE_NUMBER1
+ STRING
+
+
+ PLATE_NUMBER1
+ 100
+ 29
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 2c9c81b975e496a9017665635bba0074
+ PLATE_NUMBER2
+ STRING
+
+
+ PLATE_NUMBER2
+ 100
+ 30
true
false
@@ -184,26 +223,7 @@ ORDER BY lfi.fact_date DESC
fact_date
100
- 28
- true
-
- false
- false
- false
- false
-
-
-
-
-
- 2c9c81b9719762ea0174351eb78d0393
- PLATE_NUMBER
- STRING
-
-
- PLATE_NUMBER
- 100
- 29
+ 31
true
false
@@ -222,7 +242,7 @@ ORDER BY lfi.fact_date DESC
REGDATE
100
- 30
+ 33
true
false
@@ -241,7 +261,7 @@ ORDER BY lfi.fact_date DESC
is_pledge
100
- 31
+ 34
true
false
@@ -260,7 +280,7 @@ ORDER BY lfi.fact_date DESC
pledge_date
100
- 32
+ 35
true
false
@@ -276,10 +296,10 @@ ORDER BY lfi.fact_date DESC
ARCHIVING_PERSON
STRING
-
+
ARCHIVING_PERSON
100
- 33
+ 36
true
false
@@ -298,7 +318,7 @@ ORDER BY lfi.fact_date DESC
asarchivingCabinetNo
100
- 34
+ 37
true
false
@@ -317,7 +337,7 @@ ORDER BY lfi.fact_date DESC
fileNumber
100
- 35
+ 38
true
false
@@ -336,7 +356,7 @@ ORDER BY lfi.fact_date DESC
pledge_plan
180
- 36
+ 39
true
false
@@ -355,7 +375,7 @@ ORDER BY lfi.fact_date DESC
is_delay
120
- 37
+ 40
true
false
@@ -374,7 +394,7 @@ ORDER BY lfi.fact_date DESC
delay_date
120
- 38
+ 41
true
false
@@ -393,7 +413,7 @@ ORDER BY lfi.fact_date DESC
delay_plan
220
- 39
+ 42
true
false
@@ -409,10 +429,10 @@ ORDER BY lfi.fact_date DESC
ARCHIVING_TIME
STRING
-
+
ARCHIVING_TIME
100
- 40
+ 43
true
false
@@ -431,7 +451,7 @@ ORDER BY lfi.fact_date DESC
is_ARCHIVING
100
- 41
+ 44
true
false
@@ -450,7 +470,7 @@ ORDER BY lfi.fact_date DESC
times
100
- 42
+ 45
true
false
@@ -469,7 +489,7 @@ ORDER BY lfi.fact_date DESC
opinion_comments
100
- 43
+ 46
true
false