From de1fd1bed313106483b78845ff5b784d1bba87e0 Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 24 Jun 2024 17:43:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=80=83=E5=8B=A4=EF=BC=8C=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=97=A5=E6=8A=A5=E7=9B=B8=E5=85=B3=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=8A=9F=E8=83=BD=E4=B8=AD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=8F=AD=E6=AC=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AttendanceSummaryServiceImpl.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java b/src/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java index ff42ecb..a2be1db 100644 --- a/src/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java +++ b/src/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java @@ -505,29 +505,29 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS String createViewSql = "CREATE VIEW " + viewName; createViewSql = createViewSql + " AS " + viewResourceSql.toString(); createViewSql = createViewSql + " FROM (" + - "SELECT id, fbid, bm, zw, ygid, rq, xm1 AS xm," + ifNullFunction + "(sc1,0) AS sc FROM uf_jcl_kq_cqjg WHERE (xm1 IS NOT NULL) UNION ALL " + "SELECT id, fbid, bm, zw, ygid, rq, bc, xm1 AS xm," + ifNullFunction + "(sc1,0) AS sc FROM uf_jcl_kq_cqjg WHERE (xm1 IS NOT NULL) UNION ALL " + - "SELECT id, fbid, bm, zw, ygid, rq, xm2," + ifNullFunction + "(sc2,0) FROM uf_jcl_kq_cqjg WHERE (xm2 IS NOT NULL) UNION ALL " + "SELECT id, fbid, bm, zw, ygid, rq, bc, xm2," + ifNullFunction + "(sc2,0) FROM uf_jcl_kq_cqjg WHERE (xm2 IS NOT NULL) UNION ALL " + - "SELECT id, fbid, bm, zw, ygid, rq, xm3," + ifNullFunction + "(sc3,0) FROM uf_jcl_kq_cqjg WHERE (xm3 IS NOT NULL) UNION ALL " + "SELECT id, fbid, bm, zw, ygid, rq, bc, xm3," + ifNullFunction + "(sc3,0) FROM uf_jcl_kq_cqjg WHERE (xm3 IS NOT NULL) UNION ALL " + - "SELECT id, fbid, bm, zw, ygid, rq, xm4," + ifNullFunction + "(sc4,0) FROM uf_jcl_kq_cqjg WHERE (xm4 IS NOT NULL) UNION ALL " + "SELECT id, fbid, bm, zw, ygid, rq, bc, xm4," + ifNullFunction + "(sc4,0) FROM uf_jcl_kq_cqjg WHERE (xm4 IS NOT NULL) UNION ALL " + - "SELECT id, fbid, bm, zw, ygid, rq, xm5," + ifNullFunction + "(sc5,0) FROM uf_jcl_kq_cqjg WHERE (xm5 IS NOT NULL) UNION ALL " + "SELECT id, fbid, bm, zw, ygid, rq, bc, xm5," + ifNullFunction + "(sc5,0) FROM uf_jcl_kq_cqjg WHERE (xm5 IS NOT NULL) UNION ALL " + - "SELECT id, fbid, bm, zw, ygid, rq, xm6," + ifNullFunction + "(sc6,0) FROM uf_jcl_kq_cqjg WHERE (xm6 IS NOT NULL) UNION ALL " + "SELECT id, fbid, bm, zw, ygid, rq, bc, xm6," + ifNullFunction + "(sc6,0) FROM uf_jcl_kq_cqjg WHERE (xm6 IS NOT NULL) UNION ALL " + - "SELECT id, fbid, bm, zw, ygid, rq, xm7," + ifNullFunction + "(sc7,0) FROM uf_jcl_kq_cqjg WHERE (xm7 IS NOT NULL) UNION ALL " + "SELECT id, fbid, bm, zw, ygid, rq, bc, xm7," + ifNullFunction + "(sc7,0) FROM uf_jcl_kq_cqjg WHERE (xm7 IS NOT NULL) UNION ALL " + - "SELECT id, fbid, bm, zw, ygid, rq, xm8," + ifNullFunction + "(sc8,0) FROM uf_jcl_kq_cqjg WHERE (xm8 IS NOT NULL) UNION ALL " + "SELECT id, fbid, bm, zw, ygid, rq, bc, xm8," + ifNullFunction + "(sc8,0) FROM uf_jcl_kq_cqjg WHERE (xm8 IS NOT NULL) UNION ALL " + - "SELECT id, fbid, bm, zw, ygid, rq, CASE WHEN cqzt = 0 THEN '1' ELSE '5' END, CASE WHEN cqzt = 0 THEN cqsc ELSE 0 END FROM uf_jcl_kq_cqjg UNION ALL " + "SELECT id, fbid, bm, zw, ygid, rq, bc, CASE WHEN cqzt = 0 THEN '1' ELSE '5' END, CASE WHEN cqzt = 0 THEN cqsc ELSE 0 END FROM uf_jcl_kq_cqjg UNION ALL " + - "SELECT id, fbid, bm, zw, ygid, rq, CASE WHEN rqlx = 0 OR rqlx = 4 THEN '2' WHEN rqlx = 2 OR rqlx = 3 THEN '3' WHEN rqlx = 1 THEN '4' ELSE '0' END ,cqsc FROM uf_jcl_kq_cqjg UNION ALL " + "SELECT id, fbid, bm, zw, ygid, rq, bc, CASE WHEN rqlx = 0 OR rqlx = 4 THEN '2' WHEN rqlx = 2 OR rqlx = 3 THEN '3' WHEN rqlx = 1 THEN '4' ELSE '0' END ,cqsc FROM uf_jcl_kq_cqjg UNION ALL " + - "SELECT T2.id, T2.fbid, T2.bm, T2.zw, T2.ygid, T2.rq, T1.jtlx, " + ifNullFunction + "(T1.sc,0) FROM uf_jcl_kq_cqjt T1 LEFT JOIN uf_jcl_kq_cqjg T2 ON T1.yg = T2.ygid AND T1.rq = T2.rq WHERE T1.zt = 1 UNION ALL " + "SELECT T2.id, T2.fbid, T2.bm, T2.zw, T2.ygid, T2.rq, T2.bc, T1.jtlx, " + ifNullFunction + "(T1.sc,0) FROM uf_jcl_kq_cqjt T1 LEFT JOIN uf_jcl_kq_cqjg T2 ON T1.yg = T2.ygid AND T1.rq = T2.rq WHERE T1.zt = 1 UNION ALL " + - "SELECT T2.id, T2.fbid, T2.bm, T2.zw, T2.ygid, T2.rq, T1.bdklx, 1 FROM uf_jcl_kq_bdkjl T1 LEFT JOIN uf_jcl_kq_cqjg T2 ON T1.bdkry = T2.ygid AND T1.dkrq = T2.rq WHERE T1.jlzt = 1 AND T2.id IS NOT NULL " + "SELECT T2.id, T2.fbid, T2.bm, T2.zw, T2.ygid, T2.rq, T2.bc, T1.bdklx, 1 FROM uf_jcl_kq_bdkjl T1 LEFT JOIN uf_jcl_kq_cqjg T2 ON T1.bdkry = T2.ygid AND T1.dkrq = T2.rq WHERE T1.jlzt = 1 AND T2.id IS NOT NULL " + ") ta GROUP BY id, ygid, rq, fbid, bm, zw"; From 3b08141f04ac2cac52746d105dc0f78a91f9dc6f Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 24 Jun 2024 17:50:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=80=83=E5=8B=A4=EF=BC=8C=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=97=A5=E6=8A=A5=E7=9B=B8=E5=85=B3=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=8A=9F=E8=83=BD=E4=B8=AD=E7=94=9F=E6=88=90?= =?UTF-8?q?sql=E5=88=86=E7=BB=84=E9=80=BB=E8=BE=91=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=8F=AD=E6=AC=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AttendanceSummaryServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java b/src/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java index a2be1db..1ff9458 100644 --- a/src/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java +++ b/src/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java @@ -529,7 +529,7 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS + "SELECT T2.id, T2.fbid, T2.bm, T2.zw, T2.ygid, T2.rq, T2.bc, T1.bdklx, 1 FROM uf_jcl_kq_bdkjl T1 LEFT JOIN uf_jcl_kq_cqjg T2 ON T1.bdkry = T2.ygid AND T1.dkrq = T2.rq WHERE T1.jlzt = 1 AND T2.id IS NOT NULL " + - ") ta GROUP BY id, ygid, rq, fbid, bm, zw"; + ") ta GROUP BY id, ygid, rq, fbid, bm, zw, bc"; boolean createSign = DbTools.update(createViewSql); bs.writeLog("创建视图结果：" + createSign); From dce81e8d7eccab9931780f2eec6aa6917289bbe1 Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 24 Jun 2024 17:55:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=80=83=E5=8B=A4=EF=BC=8C=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=97=A5=E6=8A=A5=E7=9B=B8=E5=85=B3=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=8A=9F=E8=83=BD=E4=B8=AD=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=A2=9E=E5=8A=A0=E7=8F=AD=E6=AC=A1=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AttendanceSummaryServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java b/src/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java index 1ff9458..cfb3d4b 100644 --- a/src/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java +++ b/src/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java @@ -457,9 +457,9 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS String kqxmSql = "select * from uf_jcl_kq_kqxm"; List> kqxmList = DbTools.getSqlToList(kqxmSql); //收集视图列头 - StringBuilder viewColumn = new StringBuilder("id,ygid,rq,fbid,bm,zw"); + StringBuilder viewColumn = new StringBuilder("id,ygid,rq,fbid,bm,zw,bc"); //拼接视图内容sql - StringBuilder viewResourceSql = new StringBuilder("SELECT id, ygid, rq, fbid, bm, zw"); + StringBuilder viewResourceSql = new StringBuilder("SELECT id, ygid, rq, fbid, bm, zw, bc"); //考勤项目核算单位、id、名称 String hsdw = ""; String kqxmId = "";