From 873e0e317904574ec6f780f67caba41e081b0157 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Tue, 20 Jun 2023 22:53:13 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8820=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=AF=84=E8=AF=BE=20=E8=B6=B3=E8=BF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qa/controller/KcEvaluationController.java | 25 +++++++++++++++++++
 .../modules/kc/qa/entity/KcEvaluation.java    | 12 +++++++++
 .../kc/qa/mapper/KcEvaluationMapper.java      |  2 ++
 .../kc/qa/mapper/xml/KcEvaluationMapper.xml   | 22 ++++++++++++++++
 .../kc/qa/service/IKcEvaluationService.java   |  2 ++
 .../service/impl/KcEvaluationServiceImpl.java |  5 ++++
 6 files changed, 68 insertions(+)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java
index 65cb80ed..942fdcdf 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java
@@ -65,6 +65,7 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
 
 	 @Value("${jeecg.path.upload}")
 	 private String upLoadPath;
+
 	/**
 	 * 分页列表查询
 	 *
@@ -395,5 +396,29 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
 		 return mv;
 	 }
 
+	 /**
+	  * 分页列表查询
+	  *
+	  * @param kcEvaluation
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "调查问卷-回答主表-分页列表查询")
+	 @ApiOperation(value="调查问卷-回答主表-分页列表查询", notes="调查问卷-回答主表-分页列表查询")
+	 @GetMapping(value = "/queryPkZuJiList")
+	 public Result<IPage<KcEvaluation>> queryPkZuJiList(KcEvaluation kcEvaluation,
+													  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													  HttpServletRequest req) {
+		 QueryWrapper<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper("a",kcEvaluation, req.getParameterMap());
+		 queryWrapper.eq("eq.genre",0);
+//		 queryWrapper.eq("a.upuserid",);
+		 queryWrapper.orderByDesc("a.up_timestamp");
+		 Page<KcEvaluation> page = new Page<KcEvaluation>(pageNo, pageSize);
+		 IPage<KcEvaluation> pageList = kcEvaluationService.queryPkZuJiPage(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
 
  }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java
index 81181485..9354f609 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java
@@ -328,7 +328,19 @@ public class KcEvaluation implements Serializable {
     @TableField(exist = false)
     private String xqxn;
 
+    @TableField(exist = false)
+    private String evaluationid;
 
+    @TableField(exist = false)
+    private String ketangbiaoid;
 
+    @TableField(exist = false)
+    private String score;
+
+    @TableField(exist = false)
+    private String tkrq;
+
+    @TableField(exist = false)
+    private String shijian;
 
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java
index ea43e592..fc3f279e 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java
@@ -37,4 +37,6 @@ public interface KcEvaluationMapper extends BaseMapper<KcEvaluation> {
     List<KcEvaluationVo> selectPageAndKcmc(Page<KcEvaluationVo> page, @Param(Constants.WRAPPER) QueryWrapper<KcEvaluationVo> queryWrapper);
 
     List<KcEvaluationVo2> selectPageAndKcmc2(Page<KcEvaluationVo2> page, @Param(Constants.WRAPPER) QueryWrapper<KcEvaluationVo2> queryWrapper);
+
+    List<KcEvaluation> queryPkZuJiPage(Page<KcEvaluation> page, @Param(Constants.WRAPPER) QueryWrapper<KcEvaluation> queryWrapper);
 }
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 01281d2d..7e53169a 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
@@ -441,5 +441,27 @@
         left join zongtipingjiapingjunfen fen on fen.kechengbiaoid = kt.kechengbiaoid
         ${ew.customSqlSegment}
     </select>
+    <select id="queryPkZuJiPage" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
+        SELECT
+            a.upuserid,
+            ifnull(DATE_FORMAT( a.up_timestamp, '%Y-%m-%d' ),'') tkrq,
+            DATE_FORMAT( a.up_timestamp, '%H:%i:%s' ) AS shijian,
+            a.id AS evaluationid,
+            a.evaluationver,
+            evs.ketangbiaoid,
+            ea.score,
+            a.source,
+            a.minkcid,
+            kt.kcmc,
+            kt.skjs,
+            kt.kkdw
+        FROM
+        kc_evaluation a
+        join kc_evaluations evs on a.id = evs.evaluationid
+        join kc_evaluationque eq on eq.evaluationver = a.evaluationver and evs.queid = eq.id
+        join kc_evaluationans ea on ea.id = evs.ansid and ea.queid = eq.id
+        left join kc_ketangbiao kt on kt.id = a.minkcid
+        ${ew.customSqlSegment}
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java
index f90204b6..22fb37f9 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java
@@ -38,4 +38,6 @@ public interface IKcEvaluationService extends IService<KcEvaluation> {
     IPage<KcEvaluationVo> selectPageAndKcmc(Page<KcEvaluationVo> page, QueryWrapper<KcEvaluationVo> queryWrapper);
 
     IPage<KcEvaluationVo2> selectPageAndKcmc2(Page<KcEvaluationVo2> page, QueryWrapper<KcEvaluationVo2> queryWrapper);
+
+    IPage<KcEvaluation> queryPkZuJiPage(Page<KcEvaluation> page, QueryWrapper<KcEvaluation> queryWrapper);
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java
index e5a9babe..bfcc8bfd 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java
@@ -123,4 +123,9 @@ public class KcEvaluationServiceImpl extends ServiceImpl<KcEvaluationMapper, KcE
         return page.setRecords(baseMapper.selectPageAndKcmc2(page,queryWrapper));
     }
 
+    @Override
+    public IPage<KcEvaluation> queryPkZuJiPage(Page<KcEvaluation> page, QueryWrapper<KcEvaluation> queryWrapper) {
+        return page.setRecords(baseMapper.queryPkZuJiPage(page,queryWrapper));
+    }
+
 }