修改bug

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml

@@ -89,13 +89,15 @@
 
     <select id="getBarlist" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
         select a.dwjc as dwmc, round(sjtkcs / ytkcs,2) as ytkcs from (
-        select d.dwjc,sum(a.ytkcs) as ytkcs,count(c.upuserid) as sjtkcs from kc_export_config_tpkwcqkjzglx  a
+        select d.dwjc,d.dwbh,sum(a.ytkcs) as ytkcs,count(c.upuserid) as sjtkcs from kc_export_config_tpkwcqkjzglx  a
         LEFT JOIN kc_xqxn_history b on a.xqxn = b.title
         LEFT JOIN kc_evaluation c on a.gh = c.upuserid and c.up_date BETWEEN b.start_time and b.end_time
         LEFT JOIN kc_kkdw d on a.dwmc = d.kkdw
         where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) and tklx in (${code}) and dwjc is not null
         GROUP BY d.dwjc
         ) a
+        left join kc_kkdw21_view b on a.dwbh = b.dwbh
+        order by b.id asc
     </select>
 
     <update id="updateJzgzzzt">

jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java

@@ -257,6 +257,7 @@ public class KcEvaluationsStat implements Serializable {
     private java.lang.String col57;
     private java.lang.String col58;
     private java.lang.String col59;
+    private java.lang.String col60;
 
     @TableField(exist = false)
     private java.lang.String xqxn;

jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml

@@ -94,7 +94,8 @@
         YBTK.COL56,
         YBTK.COL57,
         YBTK.COL58,
-        YBTK.COL59
+        YBTK.COL59,
+        YBTK.COL60
         FROM (SELECT EVS.EVALUATIONID AS COL00,
         XQXN.TITLE AS COL01, -- 一般听课表(3)
         KT.KCMC AS COL02,
@@ -183,14 +184,16 @@
         rjzy.rjzy as col56,
         ev.rjzy as col57,
         KT.ID AS COL58,
-        CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59
+        CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59,
+        EVS.UP_DATE AS COL60
         FROM (SELECT UPUSER,
         UPUSERID,
         KETANGBIAOID,
         QUEID,
         ANSID,
         EVALUATIONID,
-        DETANSWER
+        DETANSWER,
+        EVSTMP.UP_DATE
         FROM (SELECT EVS.UPUSER,
         EVS.UPUSERID,
         EV.MINKCID AS KETANGBIAOID,
@@ -222,7 +225,8 @@
         'K'
         ELSE
         ''
-        END) AS DETANSWER
+        END) AS DETANSWER,
+        EVS.UP_DATE
         FROM kc_evaluation    EV,
         KC_EVALUATIONS   EVS,
         KC_EVALUATIONANS ANS,
@@ -254,7 +258,8 @@
         'E'
         ELSE
         'F'
-        END AS DETANSWER
+        END AS DETANSWER,
+        EVS.UP_DATE
         FROM kc_evaluation    EV,
         KC_EVALUATIONS   EVS,
         KC_EVALUATIONANS ANS,
@@ -273,7 +278,8 @@
         EVS.QUEID,
         EVS.EVALUATIONID,
         EVS.ANSID,
-        EVS.TEXTANSCONTENT AS DETANSWER
+        EVS.TEXTANSCONTENT AS DETANSWER,
+        EVS.UP_DATE
         FROM kc_evaluation    EV,
         KC_EVALUATIONS   EVS,
         KC_EVALUATIONQUE QUE
@@ -370,7 +376,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
         XSTK.COL56,
         XSTK.COL57,
         XSTK.COL58,
-        XSTK.COL59
+        XSTK.COL59,
+        XSTK.COL60
         FROM (SELECT EVS.evaluationid AS COL00,
         XQXN.TITLE AS COL01, -- 线上听课表(2)
         KT.KCMC AS COL02,
@@ -459,7 +466,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
         rjzy.rjzy as col56,
         ev.rjzy as col57,
         KT.ID AS COL58,
-        CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59
+        CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59,
+        EVS.UP_DATE AS COL60
         FROM (SELECT EVS.UPUSER,
         EVS.UPUSERID,
         EV.MINKCID AS KETANGBIAOID,
@@ -479,7 +487,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
         'E'
         ELSE
         'F'
-        END AS DETANSWER
+        END AS DETANSWER,
+        EVS.UP_DATE
         FROM kc_evaluation    EV,
         KC_EVALUATIONS   EVS,
         KC_EVALUATIONANS ANS,
@@ -525,7 +534,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
         'K'
         ELSE
         ''
-        END) AS DETANSWER
+        END) AS DETANSWER,
+        EVS.UP_DATE
         FROM kc_evaluation    EV,
         KC_EVALUATIONS   EVS,
         KC_EVALUATIONANS ANS,
@@ -557,7 +567,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
         'E'
         ELSE
         'F'
-        END AS DETANSWER
+        END AS DETANSWER,
+        EVS.UP_DATE
         FROM kc_evaluation    EV,
         KC_EVALUATIONS   EVS,
         KC_EVALUATIONANS ANS,
@@ -578,7 +589,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
         EVS.QUEID,
         EVS.EVALUATIONID,
         EVS.ANSID,
-        EVS.TEXTANSCONTENT AS DETANSWER
+        EVS.TEXTANSCONTENT AS DETANSWER,
+        EVS.UP_DATE
         FROM kc_evaluation    EV,
         KC_EVALUATIONS   EVS,
         KC_EVALUATIONQUE QUE
@@ -674,7 +686,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
         THPJ.COL56,
         THPJ.COL57,
         THPJ.COL58,
-        THPJ.COL59
+        THPJ.COL59,
+        THPJ.COL60
         FROM (SELECT EVS.EVALUATIONID AS COL00,
         XQXN.TITLE AS COL01, -- 同行评价表(4)
         KT.KCMC AS COL02,
@@ -763,14 +776,16 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
         rjzy.rjzy as col56,
         ev.rjzy as col57,
         KT.ID AS COL58,
-        CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59
+        CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59,
+        EVS.UP_DATE AS COL60
         FROM (SELECT UPUSER,
         UPUSERID,
         KETANGBIAOID,
         QUEID,
         ANSID,
         EVALUATIONID,
-        DETANSWER
+        DETANSWER,
+        EVSTMP.UP_DATE
         FROM (SELECT EVS.UPUSER,
         EVS.UPUSERID,
         EV.MINKCID AS KETANGBIAOID,
@@ -802,7 +817,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
         'K'
         ELSE
         ''
-        END) AS DETANSWER
+        END) AS DETANSWER,
+        EVS.UP_DATE
         FROM kc_evaluation    EV,
         KC_EVALUATIONS   EVS,
         KC_EVALUATIONANS ANS,
@@ -834,7 +850,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
         'E'
         ELSE
         'F'
-        END AS DETANSWER
+        END AS DETANSWER,
+        EVS.UP_DATE
         FROM kc_evaluation    EV,
         KC_EVALUATIONS   EVS,
         KC_EVALUATIONANS ANS,
@@ -853,7 +870,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
         EVS.QUEID,
         EVS.EVALUATIONID,
         EVS.ANSID,
-        EVS.TEXTANSCONTENT AS DETANSWER
+        EVS.TEXTANSCONTENT AS DETANSWER,
+        EVS.UP_DATE
         FROM kc_evaluation    EV,
         KC_EVALUATIONS   EVS,
         KC_EVALUATIONQUE QUE
@@ -950,7 +968,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
         LBPJ.COL56,
         LBPJ.COL57,
         LBPJ.COL58,
-        LBPJ.COL59
+        LBPJ.COL59,
+        LBPJ.COL60
         FROM (SELECT EVS.EVALUATIONID AS COL00,
         XQXN.TITLE AS COL01, -- 老版评价表(1)
         KT.KCMC AS COL02,
@@ -1039,14 +1058,16 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
         rjzy.rjzy as col56,
         ev.rjzy as col57,
         KT.ID AS COL58,
-        CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59
+        CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59,
+        EVS.UP_DATE AS COL60
         FROM (SELECT UPUSER,
         UPUSERID,
         KETANGBIAOID,
         QUEID,
         ANSID,
         EVALUATIONID,
-        DETANSWER
+        DETANSWER,
+        EVSTMP.UP_DATE
         FROM (
         SELECT EVS.UPUSER,
         EVS.UPUSERID,
@@ -1067,7 +1088,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
         'E'
         ELSE
         'F'
-        END AS DETANSWER
+        END AS DETANSWER,
+        EVS.UP_DATE
         FROM kc_evaluation    EV,
         KC_EVALUATIONS   EVS,
         KC_EVALUATIONANS ANS,

jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml

@@ -80,7 +80,16 @@
 <!--        FROM kc_tksfrzb-->
         select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as assess1 ,round(max(ytkcs-0),0) as tkyq from kc_export_config_tpkwcqkjzglx a
         LEFT JOIN sys_dict_item b on a.tklx = b.item_value and dict_id = '1682386362753224705'
-        and a.xqxn = (select flag1 from kc_sys_config where id = 1)
+        <where>
+            <if test="kcEvaluation.xnxq != null and kcEvaluation.xnxq != ''">
+                and a.xqxn = #{kcEvaluation.xnxq}
+            </if>
+            <if test="kcEvaluation.xnxq == null or kcEvaluation.xnxq == ''">
+                and a.xqxn = (select flag1 from kc_sys_config where id = 1)
+            </if>
+        </where>
+
+<!--        (select flag1 from kc_sys_config where id = 1)-->
 <!--        <if test="kcEvaluation.tksf != null and kcEvaluation.tksf != ''">-->
 <!--            AND b.item_value = #{kcEvaluation.tksf}-->
 <!--        </if>-->
@@ -351,27 +360,44 @@
     </select>
 
     <select id="selectPkmxExportList" parameterType="org.jeecg.modules.kc.qa.entity.KcEvaluationPkmx" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluationPkmx">
-        SELECT pk.*, au.assess1 as tksf, fen.avgscore as tkpjjg
-        FROM
+        SELECT pk.*, au.assess1 as tksf,xnxq.title as xqxn,if(kcb.szkc='1','是','否') as szkc FROM
         (
         SELECT
         k.id,c.gh as userid, c.xm as username, c.dwh as college, k.kkdw, k.kcmc, k.kcxz, k.skjs, k.week as zc, k.hh as jc, p.up_date, p.up_time, p.id AS evaId, p.evaluationver,
-        k.bz,
-        p.source,
-        k.kechengbiaoid
+        k.bz,k.skrq,k.kechengbiaoid,
+        p.source
         FROM kc_ketangbiao k, kc_evaluation p, xxhbuser c
         WHERE
         k.id = p.minkcid
         AND p.upuserid = c.gh
         <if test="startTime != null and startTime != ''">
-            and p.up_date &gt;= #{startTime}
+            and k.skrq &gt;= #{startTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            and p.up_date &lt;= #{endTime}
+            and k.skrq &lt;= #{endTime}
+        </if>
+        <if test="username != null and username != ''">
+            and (c.xm like concat('%',#{username},'%') or c.gh like concat('%',#{username},'%'))
         </if>
         ) AS pk
-        LEFT JOIN kc_assessuser au ON pk.userid = au.usercode
-        left join zongtipingjiapingjunfen fen on fen.kechengbiaoid = pk.kechengbiaoid
+        LEFT JOIN (
+        select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as assess1 ,round(max(ytkcs-0),0) as tkyq from kc_export_config_tpkwcqkjzglx a
+        LEFT JOIN sys_dict_item b on a.tklx = b.item_value and dict_id = '1682386362753224705'
+<!--        and a.xqxn = (select flag1 from kc_sys_config where id = 1)-->
+
+        <where>
+            <if test="xnxq != null and xnxq != ''">
+                and a.xqxn = #{xnxq}
+            </if>
+            <if test="xnxq == null or xnxq == ''">
+                and a.xqxn = (select flag1 from kc_sys_config where id = 1)
+            </if>
+        </where>
+        GROUP BY gh,xm
+
+
+        ) au ON pk.userid = au.usercode
+        LEFT JOIN kc_xqxn_history xnxq on pk.skrq >= xnxq.start_time  and pk.skrq &lt;= xnxq.end_time
         left join kc_kechengbiao kcb on pk.kechengbiaoid = kcb.id
         <where>
             <if test="kcxz != null and kcxz != ''">
@@ -384,7 +410,7 @@
                 and pk.college = #{szdw}
             </if>
             <if test="tksf != null and tksf != ''">
-                AND au.assesscode = #{tksf}
+                AND au.assess1 = #{tksf}
             </if>
             <if test="szkc != null and szkc != ''">
                 <if test='szkc == "1"'>