From eedcc7f793dcc0ef32d8d8caa5b8a2cb64a5c33c Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 24 May 2023 08:44:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml      |  2 +-
 .../jeecg/modules/kc/qa/entity/KcEvaluation.java    |  2 +-
 .../jeecg/modules/kc/qa/entity/KcEvaluations.java   |  4 ++--
 .../kc/qa/service/impl/KcEvaluationServiceImpl.java | 13 +++++++++++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
index 1928ae3a..5051f215 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
@@ -18,7 +18,7 @@
         when xqbh = 'U' then '全部'
         ELSE '' END  as xq,
         jgh,xnxq,jzglb,1 as sfcj,sfxsk as skxs,'' as sfzc,'' as bz,'' as zt,kcdl
-        from xxhbkckb t,kc_jieci jc where concat(substring(sksj,2,2),'、',substring(sksj,4,2)) = jc.jieci
+        from xxhbkckb t,kc_jieci jc where concat(substring(sksj,2,2),'、',substring(sksj,4,2)) = jc.jieci and t.kcdl != '毕业设计'
 <!--        <if test="startTime != null and startTime != ''">-->
 <!--            and sksj > #{startTime}-->
 <!--        </if>-->
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 3e8d13f1..950a1f65 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
@@ -33,7 +33,7 @@ public class KcEvaluation implements Serializable {
 
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
-    private java.lang.Integer id;
+    private java.lang.String id;
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "上传日期")
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluations.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluations.java
index a10d61b1..ef8fc5de 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluations.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluations.java
@@ -35,7 +35,7 @@ public class KcEvaluations implements Serializable {
 	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
-    private java.lang.Integer id;
+    private java.lang.String id;
 	/**上传日期*/
 	@Excel(name = "上传日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -79,5 +79,5 @@ public class KcEvaluations implements Serializable {
 	/**问卷版本*/
 	@Excel(name = "问卷版本", width = 15)
     @ApiModelProperty(value = "问卷版本")
-    private java.lang.Integer evaluationid;
+    private java.lang.String evaluationid;
 }
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 beb8f958..d21eb23d 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
@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
 
@@ -54,11 +55,18 @@ public class KcEvaluationServiceImpl extends ServiceImpl<KcEvaluationMapper, KcE
     @Transactional(rollbackFor = JeecgBootException.class)
     @Override
     public void addQaAll(KcEvaluation kcEvaluation) {
-        DateTime now = DateUtil.date();
+        Date now = DateUtil.date();
+        if(kcEvaluation.getUpTimestamp()!=null){
+            try {
+                now = DateUtils.parseDate(kcEvaluation.getUpTimestamp(),"yyyy-MM-dd HH:mm:ss");
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
 //        DateUtil.format(now,"yyyyMMddHHmmssSSS");
         kcEvaluation.setUpDate(now);
         kcEvaluation.setUpTime(now);
-        kcEvaluation.setUpTimestamp(now.toString("yyyy-MM-dd HH:mm:ss"));
+        kcEvaluation.setUpTimestamp(DateUtils.formatDate(now,"yyyy-MM-dd HH:mm:ss"));
 //        DateUtil.format(now,"yyyy-MM-dd");
         save(kcEvaluation);
         if(kcEvaluation.getAnsList() != null && !kcEvaluation.getAnsList().isEmpty()){
@@ -67,6 +75,7 @@ public class KcEvaluationServiceImpl extends ServiceImpl<KcEvaluationMapper, KcE
                 x.setUpDate(kcEvaluation.getUpDate());
                 x.setUpTime(kcEvaluation.getUpTime());
                 x.setUpTimestamp(kcEvaluation.getUpTimestamp());
+                x.setUpuser(kcEvaluation.getUpuser());
             });
             kcEvaluationsService.saveBatch(kcEvaluation.getAnsList());
         }