From 0fa07d890749ed926fd8cce9f3ae846dea12f4b5 Mon Sep 17 00:00:00 2001
From: sunyugang <sun_shine1229@163.com>
Date: Tue, 16 Sep 2025 16:36:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E4=BA=BA=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E9=97=AE=E5=8D=B7=EF=BC=8C=E5=90=8C=E6=97=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=A4=9A=E4=B8=AA=E7=9A=84=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DwQuestionServiceImpl.java   | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/DwQuestionServiceImpl.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/DwQuestionServiceImpl.java
index b03c150..11d31c3 100644
--- a/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/DwQuestionServiceImpl.java
+++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/DwQuestionServiceImpl.java
@@ -130,7 +130,7 @@ public class DwQuestionServiceImpl implements IDwQuestionService
                 //第一个调查问卷问题
                 Row row = sheet.getRow(i);
                 Cell idCell = row.getCell(0);
-                String dateTime = row.getCell(6).getStringCellValue();
+                String dateTime = row.getCell(4).getStringCellValue();
                 Date answerDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, dateTime);
                 String id = "";
                 if (idCell != null) {
@@ -928,6 +928,7 @@ public class DwQuestionServiceImpl implements IDwQuestionService
                             +","+cell129.getStringCellValue() +","+cell130.getStringCellValue() );
                     answer37.setInfoId(dwInfo.getId());
                     answer37.setQuestionId(37L);
+                    answer37.setCreateTime(answerDate);
                     answers.add(answer37);
                     Cell cell132 = row.getCell(132);
                     if (cell132 != null && StringUtils.isNotEmpty(cell132.getStringCellValue())){
@@ -1276,6 +1277,7 @@ public class DwQuestionServiceImpl implements IDwQuestionService
                             + "," +cell53.getStringCellValue());
                     answer17.setInfoId(dwInfo.getId());
                     answer17.setQuestionId(58L);
+                    answer17.setCreateTime(answerDate);
                     answers.add(answer17);
                     Cell cell55 = row.getCell(55);
                     if (cell55 != null && StringUtils.isNotEmpty(cell55.getStringCellValue())) {
@@ -1972,30 +1974,36 @@ public class DwQuestionServiceImpl implements IDwQuestionService
                     }
                     Cell cell20 = row.getCell(20);
                     if (cell20 != null && StringUtils.isNotEmpty(cell20.getStringCellValue())){
-                        DwAnswer answer42 = new DwAnswer();
-                        answer42.setAnswer(cell20.getStringCellValue());
-                        answer42.setInfoId(dwInfo.getId());
-                        answer42.setQuestionId(91L);
-                        answer42.setCreateTime(answerDate);
-                        answers.add(answer42);
+                        if (cell19 != null && !cell19.getStringCellValue().equals(cell20.getStringCellValue())){
+                            DwAnswer answer42 = new DwAnswer();
+                            answer42.setAnswer(cell20.getStringCellValue());
+                            answer42.setInfoId(dwInfo.getId());
+                            answer42.setQuestionId(91L);
+                            answer42.setCreateTime(answerDate);
+                            answers.add(answer42);
+                        }
                     }
                     Cell cell21 = row.getCell(21);
                     if (cell21 != null && StringUtils.isNotEmpty(cell21.getStringCellValue())){
-                        DwAnswer answer43 = new DwAnswer();
-                        answer43.setAnswer(cell21.getStringCellValue());
-                        answer43.setInfoId(dwInfo.getId());
-                        answer43.setQuestionId(91L);
-                        answer43.setCreateTime(answerDate);
-                        answers.add(answer43);
+                        if (cell19 != null && !cell19.getStringCellValue().equals(cell21.getStringCellValue())) {
+                            DwAnswer answer43 = new DwAnswer();
+                            answer43.setAnswer(cell21.getStringCellValue());
+                            answer43.setInfoId(dwInfo.getId());
+                            answer43.setQuestionId(91L);
+                            answer43.setCreateTime(answerDate);
+                            answers.add(answer43);
+                        }
                     }
                     Cell cell22 = row.getCell(22);
                     if (cell22 != null && StringUtils.isNotEmpty(cell22.getStringCellValue())) {
-                        DwAnswer answer44 = new DwAnswer();
-                        answer44.setAnswer(cell22.getStringCellValue());
-                        answer44.setInfoId(dwInfo.getId());
-                        answer44.setQuestionId(91L);
-                        answer44.setCreateTime(answerDate);
-                        answers.add(answer44);
+                        if (cell19 != null && !cell19.getStringCellValue().equals(cell22.getStringCellValue())) {
+                            DwAnswer answer44 = new DwAnswer();
+                            answer44.setAnswer(cell22.getStringCellValue());
+                            answer44.setInfoId(dwInfo.getId());
+                            answer44.setQuestionId(91L);
+                            answer44.setCreateTime(answerDate);
+                            answers.add(answer44);
+                        }
                     }
                     Cell cell24 = row.getCell(24);
                     if (cell24 != null && StringUtils.isNotEmpty(cell24.getStringCellValue())){