@ -539,31 +539,31 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
StringcreateViewSql="CREATE VIEW "+viewName;
createViewSql=createViewSql+" AS "+viewResourceSql.toString();
createViewSql=createViewSql+" FROM ("+
"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,rqlx, 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, bc, xm2," +ifNullFunction+"(sc2,0) FROM uf_jcl_kq_cqjg WHERE (xm2 IS NOT NULL) UNION ALL "
"SELECT id, fbid, bm, zw, ygid,rqlx, 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, bc, xm3," +ifNullFunction+"(sc3,0) FROM uf_jcl_kq_cqjg WHERE (xm3 IS NOT NULL) UNION ALL "
"SELECT id, fbid, bm, zw, ygid,rqlx, 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, bc, xm4," +ifNullFunction+"(sc4,0) FROM uf_jcl_kq_cqjg WHERE (xm4 IS NOT NULL) UNION ALL "
"SELECT id, fbid, bm, zw, ygid,rqlx, 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, bc, xm5," +ifNullFunction+"(sc5,0) FROM uf_jcl_kq_cqjg WHERE (xm5 IS NOT NULL) UNION ALL "
"SELECT id, fbid, bm, zw, ygid,rqlx, 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, bc, xm6," +ifNullFunction+"(sc6,0) FROM uf_jcl_kq_cqjg WHERE (xm6 IS NOT NULL) UNION ALL "
"SELECT id, fbid, bm, zw, ygid,rqlx, 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, bc, xm7," +ifNullFunction+"(sc7,0) FROM uf_jcl_kq_cqjg WHERE (xm7 IS NOT NULL) UNION ALL "
"SELECT id, fbid, bm, zw, ygid,rqlx, 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, bc, xm8," +ifNullFunction+"(sc8,0) FROM uf_jcl_kq_cqjg WHERE (xm8 IS NOT NULL) UNION ALL "
"SELECT id, fbid, bm, zw, ygid,rqlx, 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, bc, CASE WHEN cqzt = 0 THEN '1' ELSE '5' END, cqsc FROM uf_jcl_kq_cqjg UNION ALL "
"SELECT id, fbid, bm, zw, ygid,rqlx, rq, bc, CASE WHEN cqzt = 0 THEN '1' ELSE '5' 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 id, fbid, bm, zw, ygid,rqlx, 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, 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,rqlx, 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, 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 "
"SELECT T2.id, T2.fbid, T2.bm, T2.zw, T2.ygid,rqlx, 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, bc";
") ta GROUP BY id, ygid,rqlx, rq, fbid, bm, zw, bc";
Stringsql="select id,jqid,sxrq,ktsc,yxsc,wxsc,yqsxrq,ztsc from uf_jcl_kq_jqye where ygid=? and jqid=? and sxrq<=? and yqsxrq>=? order by yqsxrq, modedatacreatedate, modedatacreatetime";
Stringsql="select id,jqid,sxrq,ktsc,yxsc,wxsc,yqsxrq,ztsc from uf_jcl_kq_jqye where ygid=? and jqid=? and sxrq<=? and yqsxrq>=? order by yqsxrq, sxrq";
