From 750b4a70c1b1faa8a1c1480a5bbc54c0d90086c6 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 10 Oct 2024 13:42:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=87=E6=8D=A2=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=AF=84?= =?UTF-8?q?=E4=BB=B7=E8=A1=A8=E5=AF=BC=E5=87=BA=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/testController.java | 2 +- .../KcExportConfigTpkwcqkjzglxController.java | 2 +- .../entity/KcEvaluationsStat.java | 3 ++- .../kc/qa/mapper/xml/KcEvaluationMapper.xml | 1 + .../system/controller/LoginController.java | 27 +++++++++++++++++++ 5 files changed, 32 insertions(+), 3 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/httpinterface/controller/testController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/httpinterface/controller/testController.java index 8a4fd325..e475d952 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/httpinterface/controller/testController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/httpinterface/controller/testController.java @@ -29,7 +29,7 @@ public class testController extends JeecgController { @ApiOperation(value="T_BKS-抓取-通过id查询", notes="T_BKS-抓取-通过id查询") @GetMapping(value = "/testPDF") public Result runAvyApiByIds(String ids,String type){ - PDFUtil.office2PDF("D:\\opt\\upFiles\\temp\\新版VPN使用说明2_1728432595957.docx","D:\\opt\\upFiles\\temp\\111b.pdf"); + PDFUtil.office2PDF("D:\\opt\\upFiles\\temp\\A学校教师教学体验调研报告2023年1_1720062188727.doc","D:\\opt\\upFiles\\temp\\111b.pdf"); return Result.OK(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java index cca6df44..00bea3e1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java @@ -520,7 +520,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController0))"); - kcEvaluationQueryWrapper.groupBy("a.gh"); + kcEvaluationQueryWrapper.groupBy("a.gh,a.tklx"); // where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) // diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java index 6e657dcb..647db9b6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java @@ -86,6 +86,8 @@ public class KcEvaluationsStat implements Serializable { @Excel(name = "听课身份", width = 15) @ApiModelProperty(value = "听课身份") private java.lang.String col13; + @Excel(name = "任教专业", width = 15) + private java.lang.String col56; /**听课评价结果(5分制)*/ @Excel(name = "听课评价结果(5分制)", width = 15) @ApiModelProperty(value = "听课评价结果(5分制)") @@ -254,7 +256,6 @@ public class KcEvaluationsStat implements Serializable { @Excel(name = "10.其它建议", width = 15) @ApiModelProperty(value = "10.其它建议") 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; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml index 780caac9..cb170230 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml @@ -566,6 +566,7 @@