diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java index 055026a05..0676d6d65 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java @@ -441,7 +441,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ ASUser asUser = new ASUser(userId); String orgID = asUser.getOrgID(); String sql = ""; - sql = "SELECT ved.every_day,IFNULL(t1.inputnum, 0) AS inputnum,IFNULL(t1.spnum, 0) AS spnum,IFNULL(t1.cspnum, 0) AS cspnum,IFNULL(t1.ginputnum, 0) AS ginputnum,IFNULL(t1.gspnum, 0) AS gspnum FROM vi_every_day ved LEFT JOIN (SELECT MAX(inputdate) AS inputdate ,MAX(ONE) AS inputnum ,MAX(two) AS spnum ,MAX(three) AS cspnum,MAX(four) AS ginputnum,MAX(five) AS gspnum FROM (SELECT inputdate,COUNT(1) AS ONE,0 AS two,0 AS three ,0 AS four,0 AS five FROM flow_object WHERE flowno = 'BusinessApplyFlow' AND phaseno NOT IN('1000','8000','0010') AND orgid = '"+orgID+"' GROUP BY inputdate UNION ALL SELECT inputdate,0,COUNT(1),0,0,0 FROM flow_object WHERE flowno = 'BusinessApplyFlow' AND phaseno IN('1000','8000') AND orgid = '"+orgID+"' GROUP BY inputdate UNION ALL SELECT inputdate ,0,0,COUNT(1),0,0 FROM flow_object WHERE flowno = 'BContractApproveFlow' AND phaseno IN('1000','8000') AND orgid = '"+orgID+"' GROUP BY inputdate UNION ALL SELECT inputdate,0,0,0,COUNT(1),0 FROM flow_object WHERE flowno = 'FundPaymentCarFlow' AND phaseno = '0020' AND orgid = '"+orgID+"' GROUP BY inputdate UNION ALL SELECT inputdate ,0,0,0,0,COUNT(1) FROM flow_object WHERE flowno = 'FundPaymentCarFlow' AND phaseno = '1000' AND orgid = '"+orgID+"' GROUP BY inputdate) t GROUP BY t.inputdate) t1 ON ved.every_day = t1.inputdate WHERE DATE(ved.every_day) BETWEEN DATE(DATE_ADD(NOW(), INTERVAL -30 DAY)) AND DATE(NOW()) ORDER BY ved.every_day DESC; "; + sql = "SELECT ved.every_day,IFNULL(t1.inputnum, 0) AS inputnum,IFNULL(t1.spnum, 0) AS spnum,IFNULL(t1.cspnum, 0) AS cspnum,IFNULL(t1.ginputnum, 0) AS ginputnum,IFNULL(t1.gspnum, 0) AS gspnum FROM vi_every_day ved LEFT JOIN (SELECT MAX(inputdate) AS inputdate ,MAX(ONE) AS inputnum ,MAX(two) AS spnum ,MAX(three) AS cspnum,MAX(four) AS ginputnum,MAX(five) AS gspnum FROM (SELECT inputdate,COUNT(1) AS ONE,0 AS two,0 AS three ,0 AS four,0 AS five FROM flow_object WHERE flowno = 'BusinessApplyFlow' AND phaseno NOT IN('1000','8000','0010') AND orgid = '"+orgID+"' GROUP BY inputdate UNION ALL SELECT inputdate,0,COUNT(1),0,0,0 FROM flow_object WHERE flowno = 'BusinessApplyFlow' AND phaseno IN('1000','8000') AND orgid = '"+orgID+"' GROUP BY inputdate UNION ALL SELECT inputdate ,0,0,COUNT(1),0,0 FROM flow_object WHERE flowno = 'BContractApproveFlow' AND phaseno IN('1000','8000') AND orgid = '"+orgID+"' GROUP BY inputdate UNION ALL SELECT inputdate,0,0,0,COUNT(1),0 FROM flow_object WHERE flowno = 'FundPaymentCarFlow' AND phaseno = '0020' AND orgid = '"+orgID+"' GROUP BY inputdate UNION ALL SELECT inputdate ,0,0,0,0,COUNT(1) FROM flow_object WHERE flowno = 'FundPaymentCarFlow' AND phaseno = '1000' AND orgid = '"+orgID+"' GROUP BY inputdate) t GROUP BY t.inputdate) t1 ON ved.every_day = t1.inputdate WHERE DATE(ved.every_day) BETWEEN DATE(DATE_ADD(NOW(), INTERVAL -30 DAY)) AND DATE(NOW()) ORDER BY ved.every_day ASC; "; //sql = "SELECT ved.every_day,IFNULL(FBO1.INPUT_NUM ,0) as inputnum,IFNULL(FT1.SP_NUM,0) spnum,IFNULL(FT2.SP_NUM,0) as cspnum,IFNULL(FBO2.INPUT_NUM ,0) AS ginputnum,IFNULL(FT3.SP_NUM,0) AS gspnum FROM vi_every_day ved LEFT JOIN (SELECT DATE_FORMAT(ft.begintime,'%Y/%m/%d') TIME_DAY,COUNT(FBO.INPUTTIME) AS INPUT_NUM FROM FLOW_BUSSINESS_OBJECT FBO LEFT JOIN (SELECT MIN(begintime) AS begintime, objectno, phaseno FROM flow_task WHERE flowname='业务申请流程' AND phaseno ='0030' GROUP BY objectno) AS ft ON FBO.flow_unid=ft.objectno WHERE FBO.FLOW_NAME='业务申请流程' AND ft.phaseno ='0030' GROUP BY TIME_DAY)FBO1 ON FBO1.TIME_DAY=VED.EVERY_DAY LEFT JOIN (SELECT LEFT(ENDTIME,10) AS ENDTIME ,COUNT(ENDTIME) SP_NUM FROM FLOW_TASK WHERE FLOWNAME='业务申请流程' AND (PHASENAME='否决' OR PHASENAME='结束') GROUP BY LEFT(ENDTIME,10))FT1 ON FT1.ENDTIME=VED.EVERY_DAY LEFT JOIN (SELECT LEFT(ENDTIME,10) AS ENDTIME ,COUNT(ENDTIME) SP_NUM FROM FLOW_TASK WHERE FLOWNAME='合同制作流程' AND (PHASENAME='否决' OR PHASENAME='结束') GROUP BY LEFT(ENDTIME,10)) FT2 ON FT2.ENDTIME=VED.EVERY_DAY LEFT JOIN (SELECT DATE_FORMAT(ft.begintime,'%Y/%m/%d') TIME_DAY,COUNT(FBO.INPUTTIME) AS INPUT_NUM FROM FLOW_BUSSINESS_OBJECT FBO LEFT JOIN (SELECT MIN(begintime) AS begintime, objectno, phaseno FROM flow_task WHERE flowname='付款申请(汽车)' AND phaseno ='0020' GROUP BY objectno) AS ft ON FBO.flow_unid=ft.objectno WHERE FBO.FLOW_NAME='付款申请(汽车)' AND ft.phaseno ='0020' GROUP BY TIME_DAY) FBO2 ON FBO2.TIME_DAY=VED.EVERY_DAY LEFT JOIN (SELECT LEFT(ENDTIME,10) AS ENDTIME ,COUNT(ENDTIME) SP_NUM FROM FLOW_TASK WHERE FLOWNAME='付款申请(汽车)' AND PHASENAME='通过' GROUP BY LEFT(ENDTIME,10))FT3 ON FT3.ENDTIME=VED.EVERY_DAY WHERE every_day BETWEEN DATE_ADD(NOW(),INTERVAL -30 DAY ) AND NOW() ORDER BY ved.every_day DESC; "; //sql = "select ved.every_day,IFNULL(FBO1.INPUT_NUM ,0) inputnum,IFNULL(FT1.SP_NUM,0) spnum FROM vi_every_day ved LEFT JOIN (SELECT DATE_FORMAT(ft.begintime,'%Y/%m/%d') TIME_DAY,COUNT(FBO.INPUTTIME) AS INPUT_NUM FROM FLOW_BUSSINESS_OBJECT FBO LEFT JOIN (SELECT MIN(begintime) as begintime, objectno, phaseno FROM flow_task WHERE flowname='业务申请流程' AND phaseno ='0030' GROUP BY objectno) as ft ON FBO.flow_unid=ft.objectno WHERE FBO.FLOW_NAME='业务申请流程' AND ft.phaseno ='0030' GROUP BY TIME_DAY)FBO1 ON FBO1.TIME_DAY=VED.EVERY_DAY LEFT JOIN (SELECT LEFT(ENDTIME,10) AS ENDTIME ,COUNT(ENDTIME) SP_NUM FROM FLOW_TASK WHERE FLOWNAME='业务申请流程' AND (PHASENAME='否决' OR PHASENAME='结束') GROUP BY LEFT(ENDTIME,10))FT1 ON FT1.ENDTIME=VED.EVERY_DAY where every_day between DATE_ADD(now(),INTERVAL -30 DAY ) and now() ORDER BY ved.every_day DESC; "; List> dataList = DataOperatorUtil.getDataBySql(sql); diff --git a/src_sql/鎶曚骇SQL/v20200915/zhj_20200915.sql b/src_sql/鎶曚骇SQL/v20200915/zhj_20200915.sql new file mode 100644 index 000000000..a3dfae9bc --- /dev/null +++ b/src_sql/鎶曚骇SQL/v20200915/zhj_20200915.sql @@ -0,0 +1,9 @@ +-- APP逾期提醒租金计划数据字典 +delete from CODE_CATALOG where codeno='cash_type'; +delete from Code_Library where codeno='cash_type'; +Insert Into CODE_CATALOG (codeno,sortno,codetypeone,codetypetwo,codename,codedescribe,codeattribute,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('cash_type','00216390','1.基础配置','立项管理','设备交付情况','','','SYS_Designer',null,'2020/08/14 18:18:57','SYS_Designer','2020/08/14 18:18:57','app逾期提醒租金计划首付状态显示'); +Insert Into 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 ('cash_type','','未还','','0030','1','','','','','','','','','','','','SYS_Designer',null,'2020/08/14 18:18:57','SYS_Designer','2020/08/14 18:18:57','',''); +Insert Into 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 ('cash_type','未结清','未还','','0020','1','','','','','','','','','','','','SYS_Designer',null,'2020/08/14 18:18:57','SYS_Designer','2020/08/14 18:18:57','',''); +Insert Into 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 ('cash_type','已结清','宸茶繕','','0010','1','','','','','','','','','','','','SYS_Designer',null,'2020/08/14 18:18:57','SYS_Designer','2020/08/14 18:18:57','',''); + +