修改bug

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java

@@ -83,7 +83,7 @@ public class SyncKcktStat extends BaseSync {
                 kcKechengbiaoQueryWrapper.eq("rwbh",KcKechengbiaoPar.getRwbh());
                 kcKechengbiaoQueryWrapper.eq("kkdwid",KcKechengbiaoPar.getKkdwid());
                 kcKechengbiaoQueryWrapper.eq("kcxz",KcKechengbiaoPar.getKcxz());
-                kcKechengbiaoQueryWrapper.eq("skdd",KcKechengbiaoPar.getSkdd());
+//                kcKechengbiaoQueryWrapper.eq("skdd",KcKechengbiaoPar.getSkdd());
                 kcKechengbiaoQueryWrapper.eq("sksj",KcKechengbiaoPar.getSksj());
                 kcKechengbiaoQueryWrapper.eq("jkzc",KcKechengbiaoPar.getJkzc());
                 kcKechengbiaoQueryWrapper.eq("xf",KcKechengbiaoPar.getXf());

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

@@ -257,4 +257,6 @@ public class KcEvaluationsStat implements Serializable {
     private java.lang.String col55;
     private java.lang.String col56;
     private java.lang.String col57;
+    private java.lang.String col58;
+    private java.lang.String col59;
 }

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

@@ -92,7 +92,9 @@
         YBTK.COL54,
         YBTK.COL55,
         YBTK.COL56,
-        YBTK.COL57
+        YBTK.COL57,
+        YBTK.COL58,
+        YBTK.COL59
         FROM (SELECT EVS.EVALUATIONID AS COL00,
         XQXN.TITLE AS COL01, -- 一般听课表(3)
         KT.KCMC AS COL02,
@@ -179,7 +181,9 @@
         '' AS COL54,
         '' AS COL55,
         rjzy.rjzy as col56,
-        ev.rjzy as col57
+        ev.rjzy as col57,
+        KT.ID AS COL58,
+        CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59
         FROM (SELECT UPUSER,
         UPUSERID,
         KETANGBIAOID,
@@ -284,6 +288,8 @@
         ON EVS.EVALUATIONID = EV.ID
         LEFT JOIN KC_KETANGBIAO KT
         ON EVS.KETANGBIAOID = KT.ID
+        LEFT JOIN KC_KECHENGBIAO KC
+        ON KT.kechengbiaoid = KC.ID
         left join kc_export_config_tpkwcqkjzglx rjzy on kt.jgh = rjzy.gh
         LEFT JOIN KC_XQXN_HISTORY XQXN
         ON KT.SKRQ >= XQXN.START_TIME
@@ -360,7 +366,9 @@
         XSTK.COL54,
         XSTK.COL55,
         XSTK.COL56,
-        XSTK.COL57
+        XSTK.COL57,
+        XSTK.COL58,
+        XSTK.COL59
         FROM (SELECT EVS.evaluationid AS COL00,
         XQXN.TITLE AS COL01, -- 线上听课表(2)
         KT.KCMC AS COL02,
@@ -447,7 +455,9 @@
         '' AS COL54,
         '' AS COL55,
         rjzy.rjzy as col56,
-        ev.rjzy as col57
+        ev.rjzy as col57,
+        KT.ID AS COL58,
+        CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59
         FROM (SELECT EVS.UPUSER,
         EVS.UPUSERID,
         EVS.KETANGBIAOID,
@@ -580,6 +590,8 @@
         ON EVS.EVALUATIONID = EV.ID
         LEFT JOIN KC_KETANGBIAO KT
         ON EVS.KETANGBIAOID = KT.ID
+        LEFT JOIN KC_KECHENGBIAO KC
+        ON KT.kechengbiaoid = KC.ID
         left join kc_export_config_tpkwcqkjzglx rjzy on kt.jgh = rjzy.gh
         LEFT JOIN KC_XQXN_HISTORY XQXN
         ON KT.SKRQ >= XQXN.START_TIME
@@ -656,7 +668,9 @@
         THPJ.COL54,
         THPJ.COL55,
         THPJ.COL56,
-        THPJ.COL57
+        THPJ.COL57,
+        THPJ.COL58,
+        THPJ.COL59
         FROM (SELECT EVS.EVALUATIONID AS COL00,
         XQXN.TITLE AS COL01, -- 同行评价表(4)
         KT.KCMC AS COL02,
@@ -743,7 +757,9 @@
         '' AS COL54,
         '' AS COL55,
         rjzy.rjzy as col56,
-        ev.rjzy as col57
+        ev.rjzy as col57,
+        KT.ID AS COL58,
+        CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59
         FROM (SELECT UPUSER,
         UPUSERID,
         KETANGBIAOID,
@@ -848,6 +864,8 @@
         ON EVS.EVALUATIONID = EV.ID
         LEFT JOIN KC_KETANGBIAO KT
         ON EVS.KETANGBIAOID = KT.ID
+        LEFT JOIN KC_KECHENGBIAO KC
+        ON KT.kechengbiaoid = KC.ID
         left join kc_export_config_tpkwcqkjzglx rjzy on kt.jgh = rjzy.gh
         LEFT JOIN KC_XQXN_HISTORY XQXN
         ON KT.SKRQ >= XQXN.START_TIME
@@ -924,7 +942,9 @@
         LBPJ.COL54,
         LBPJ.COL55,
         LBPJ.COL56,
-        LBPJ.COL57
+        LBPJ.COL57,
+        LBPJ.COL58,
+        LBPJ.COL59
         FROM (SELECT EVS.EVALUATIONID AS COL00,
         XQXN.TITLE AS COL01, -- 老版评价表(1)
         KT.KCMC AS COL02,
@@ -953,7 +973,7 @@
         WHEN '2' THEN
         '线上听课表'
         WHEN '3' THEN
-        '老版评价表' --
+        '老版评价表'
         WHEN '4' THEN
         '同行评价表'
         ELSE
@@ -1011,7 +1031,9 @@
         '' AS COL54,
         '' AS COL55,
         rjzy.rjzy as col56,
-        ev.rjzy as col57
+        ev.rjzy as col57,
+        KT.ID AS COL58,
+        CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59
         FROM (SELECT UPUSER,
         UPUSERID,
         KETANGBIAOID,
@@ -1058,6 +1080,8 @@
         ON EVS.EVALUATIONID = EV.ID
         LEFT JOIN KC_KETANGBIAO KT
         ON EVS.KETANGBIAOID = KT.ID
+        LEFT JOIN KC_KECHENGBIAO KC
+        ON KT.kechengbiaoid = KC.ID
         left join kc_export_config_tpkwcqkjzglx rjzy on kt.jgh = rjzy.gh
         LEFT JOIN KC_XQXN_HISTORY XQXN
         ON KT.SKRQ >= XQXN.START_TIME

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml

@@ -91,8 +91,8 @@
     <delete id="removeCfsj" parameterType="org.jeecg.modules.kc.ktgl.entity.KcKechengbiao">
         delete from kc_kechengbiao  where xqxn = #{xqxn} and id not in (
         select maxid from (
-        select kcbh,kcmc,skjs,rwbh,kkdw,kcxz,skdd,sksj,kkdwid,xq,jgh,jzglb,sfcj,xqxn,max(id) as maxid from
+        select kcbh,kcmc,skjs,rwbh,kkdw,kcxz,sksj,kkdwid,xq,jgh,jzglb,sfcj,xqxn,max(id) as maxid from
         kc_kechengbiao t where t.xqxn = #{xqxn}
-        GROUP BY  kcbh,kcmc,skjs,rwbh,kkdw,kcxz,skdd,sksj,kkdwid,xq,jgh,jzglb,sfcj,xqxn)a)
+        GROUP BY  kcbh,kcmc,skjs,rwbh,kkdw,kcxz,sksj,kkdwid,xq,jgh,jzglb,sfcj,xqxn)a)
     </delete>
 </mapper>

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

@@ -68,7 +68,9 @@
             and (c.xm like concat('%',#{kcEvaluation.username},'%') or c.gh like concat('%',#{kcEvaluation.username},'%'))
         </if>
         ) AS pk
-        LEFT JOIN kc_assessuser au ON pk.userid = au.usercode
+        LEFT JOIN (SELECT gh as usercode,xm as username, zwmc as assess1
+        FROM kc_tksfrzb
+         ) 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
         <where>
             <if test="kcEvaluation.kcxz != null and kcEvaluation.kcxz != ''">
@@ -81,7 +83,7 @@
                 and pk.college = #{kcEvaluation.szdw}
             </if>
             <if test="kcEvaluation.tksf != null and kcEvaluation.tksf != ''">
-                AND au.assesscode = #{kcEvaluation.tksf}
+                AND au.assess1 = #{kcEvaluation.tksf}
             </if>
         </where>
         ORDER BY

jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java

@@ -268,13 +268,23 @@ public class KcTingkeController extends JeecgController<KcTingke, IKcTingkeServi
 												  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 												  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 												  HttpServletRequest req) {
+		 String xnxq = kcTingke.getXnxq();
+		 if(StringUtils.isNotBlank(xnxq)){
+			 QueryWrapper<KcXqxnHistory> kcXqxnHistoryQueryWrapper = new QueryWrapper<>();
+			 kcXqxnHistoryQueryWrapper.eq("title",xnxq);
+			 kcXqxnHistoryQueryWrapper.last("limit 1");
+			 KcXqxnHistory kcXqxnHistory =kcXqxnHistoryService.getOne(kcXqxnHistoryQueryWrapper);
+			 kcTingke.setStartTime(DateUtil.format(kcXqxnHistory.getStartTime(),"yyyy-MM-dd"));
+			 kcTingke.setEndTime(DateUtil.format(kcXqxnHistory.getEndTime(),"yyyy-MM-dd"));
+		 }
 		 QueryWrapper<KcTingke> queryWrapper = QueryGenerator.initQueryWrapper(kcTingke, req.getParameterMap());
 		 queryWrapper.ge(StringUtils.isNotBlank(kcTingke.getStartTime()),"tk.tingketime",kcTingke.getStartTime());
 		 queryWrapper.le(StringUtils.isNotBlank(kcTingke.getEndTime()),"tk.tingketime",kcTingke.getEndTime()+" 23:59:59");
 		 queryWrapper.like(StringUtils.isNotBlank(kcTingke.getJsxm()),"cn",kcTingke.getJsxm());
 		 queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getSzdw()),"college",kcTingke.getSzdw());
-		 queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getTksf()),"sf.assesscode",kcTingke.getTksf());
+		 queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getTksf()),"sf.assess1",kcTingke.getTksf());
-
+		 queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKkdw()),"tk.kkdw",kcTingke.getKkdw());
+		 queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKcxz()),"tk.kcxz",kcTingke.getKcxz());
 //		 AND ( cn LIKE '%jiaoshi%' )
 //		 AND c.college = '国际合作与交流处'
 //		 AND assesscode = '1101'

jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml

@@ -96,15 +96,15 @@
     </select>
 
     <select id="getTkmxlist" resultType="org.jeecg.modules.kc.tktj.entity.KcTingke">
-        SELECT tk.id, tk.user as userid, tk.cn as username, tk.college, sf.assess1 as tksf , tk.kkdw, tk.kcmc, tk.kcxz, tk.skjs, tk.week as zc, tk.hh as jc, tk.tingketime
+        SELECT tk.id, tk.user as userid, tk.cn as username, tk.college, sf.assess1 as tksf , tk.kkdw, tk.kcmc, tk.kcxz, tk.skjs, tk.week as zc, tk.hh as jc, tk.tingketime,tk.xnxq
         FROM
         ( SELECT k.*, t.tingketime, c.USER, c.college, c.cn
         FROM kc_ketangbiao k, kc_tingke t, kc_casusers c
         WHERE k.id = t.kechengbiaoid AND t.userid = c.USER
         ) tk
-        LEFT JOIN (SELECT usercode,username, GROUP_CONCAT(assess1) assess1
+        LEFT JOIN (SELECT gh as usercode,xm as username, GROUP_CONCAT(zwmc) assess1
-        FROM kc_assessuser
+        FROM kc_tksfrzb
-        GROUP BY usercode) sf ON tk.USER = sf.usercode
+        GROUP BY gh) sf ON tk.USER = sf.usercode
 
         ${ew.customSqlSegment}
         ORDER BY