From 31e2a0c5c47444b62633fab3664ca3eb8a74a114 Mon Sep 17 00:00:00 2001 From: sunyugang Date: Tue, 15 Jul 2025 17:19:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E4=BA=9Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dw/controller/DwAnswerController.java | 9 - .../controller/DwIndexConfigController.java | 4 +- .../com/ruoyi/dw/domain/DwIndexConfig.java | 2 +- .../ruoyi/dw/mapper/DwIndexConfigMapper.java | 4 +- .../impl/DwIndexConfigServiceImpl.java | 11 +- .../service/impl/DwQuestionServiceImpl.java | 1073 +++++++++++++++-- .../mapper/dw/DwIndexConfigMapper.xml | 10 +- 7 files changed, 966 insertions(+), 147 deletions(-) diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/DwAnswerController.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/DwAnswerController.java index 9e54219..6a0a8cf 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/DwAnswerController.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/DwAnswerController.java @@ -9,9 +9,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.dw.domain.DwAnswer; import com.ruoyi.dw.service.IDwAnswerService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -91,11 +89,4 @@ public class DwAnswerController extends BaseController return toAjax(dwAnswerService.deleteDwAnswerByIds(ids)); } - - @Log(title = "导入调查问卷", businessType = BusinessType.IMPORT) - @PostMapping("/importData") - public AjaxResult importAnswer(MultipartFile file, int infoId) throws Exception{ - return null; - } - } diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/DwIndexConfigController.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/DwIndexConfigController.java index 66d9cae..873ff9c 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/DwIndexConfigController.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/DwIndexConfigController.java @@ -127,8 +127,8 @@ public class DwIndexConfigController extends BaseController return AjaxResult.error("请先选择展示调查问题"); } String[] question_ids = dwIndexConfig.getQuestionId().split(","); - if (question_ids.length > 1 && dwIndexConfig.getIndexType() == 0){ - return AjaxResult.error("饼状图只能选择一个问题"); + if (question_ids.length > 1){ + return AjaxResult.error("只能选择一个问题"); } return toAjax(dwIndexConfigService.insertDwIndexConfig(dwIndexConfig)); } diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/DwIndexConfig.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/DwIndexConfig.java index db39bb3..8115092 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/DwIndexConfig.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/DwIndexConfig.java @@ -37,7 +37,7 @@ public class DwIndexConfig extends BaseEntity @Excel(name = "展现形式") private Long indexType; - public void setId(Long id) + public void setId(Long id) { this.id = id; } diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/DwIndexConfigMapper.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/DwIndexConfigMapper.java index 31a74de..9ecc57c 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/DwIndexConfigMapper.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/DwIndexConfigMapper.java @@ -69,10 +69,10 @@ public interface DwIndexConfigMapper /** * 根据问题id进行统计 - * @param questionIds + * @param questionId * @return */ - public List selectIndex(@Param("questionIds") String[] questionIds, @Param("infoId") Long infoId); + public List selectIndex(@Param("questionId") Long questionId, @Param("infoId") Long infoId); /** * 毕业年份折线图统计 diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/DwIndexConfigServiceImpl.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/DwIndexConfigServiceImpl.java index 03679ee..e5d5975 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/DwIndexConfigServiceImpl.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/DwIndexConfigServiceImpl.java @@ -6,16 +6,20 @@ import java.util.List; import java.util.Map; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.dw.domain.DwQuestion; import com.ruoyi.dw.domain.vo.AnswerCountVo; import com.ruoyi.dw.domain.vo.BynfVo; import com.ruoyi.dw.domain.vo.DwxzVo; import com.ruoyi.dw.domain.vo.SydVo; +import com.ruoyi.dw.mapper.DwQuestionMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.dw.mapper.DwIndexConfigMapper; import com.ruoyi.dw.domain.DwIndexConfig; import com.ruoyi.dw.service.IDwIndexConfigService; +import javax.annotation.Resource; + /** * 调查问卷统计展示Service业务层处理 * @@ -28,6 +32,9 @@ public class DwIndexConfigServiceImpl implements IDwIndexConfigService @Autowired private DwIndexConfigMapper dwIndexConfigMapper; + @Resource + private DwQuestionMapper dwQuestionMapper; + /** * 查询调查问卷统计展示 * @@ -110,7 +117,9 @@ public class DwIndexConfigServiceImpl implements IDwIndexConfigService for (DwIndexConfig config: configs){ result.put("id", config.getId()); result.put("indexType", config.getIndexType()); - List list = dwIndexConfigMapper.selectIndex(config.getQuestionId().split(","), config.getInfoId()); + DwQuestion question = dwQuestionMapper.selectDwQuestionById(Long.valueOf(config.getQuestionId())); + result.put("question", question.getQuestion()); + List list = dwIndexConfigMapper.selectIndex(Long.valueOf(config.getQuestionId()), config.getInfoId()); result.put("data", list); } return result; 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 da1e3d6..a9d7aa2 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 @@ -176,16 +176,87 @@ public class DwQuestionServiceImpl implements IDwQuestionService answers.add(answer7); DwAnswer answer8 = new DwAnswer(); Cell cell23 = row.getCell(23); - answer8.setAnswer(cell23.getStringCellValue()); + Cell cell24 = row.getCell(24); + if (cell24 != null && StringUtils.isNotEmpty(cell24.getStringCellValue())){ + answer8.setAnswer(cell24.getStringCellValue()); + }else { + answer8.setAnswer(cell23.getStringCellValue()); + } answer8.setInfoId(dwInfo.getId()); answer8.setQuestionId(8L); answers.add(answer8); - DwAnswer answer9 = new DwAnswer(); - Cell cell25 = row.getCell(25); - answer9.setAnswer(cell25.getStringCellValue()); - answer9.setInfoId(dwInfo.getId()); - answer9.setQuestionId(9L); - answers.add(answer9); + Cell cell26 = row.getCell(26); + if (cell26 != null && StringUtils.isNotEmpty(cell26.getStringCellValue())){ + DwAnswer answer91 = new DwAnswer(); + answer91.setAnswer(cell26.getStringCellValue()); + answer91.setInfoId(dwInfo.getId()); + answer91.setQuestionId(9L); + answers.add(answer91); + } + Cell cell27 = row.getCell(27); + if (cell27 != null && StringUtils.isNotEmpty(cell27.getStringCellValue())){ + DwAnswer answer92 = new DwAnswer(); + answer92.setAnswer(cell27.getStringCellValue()); + answer92.setInfoId(dwInfo.getId()); + answer92.setQuestionId(9L); + answers.add(answer92); + } + Cell cell28 = row.getCell(28); + if (cell28 != null && StringUtils.isNotEmpty(cell28.getStringCellValue())){ + DwAnswer answer93 = new DwAnswer(); + answer93.setAnswer(cell28.getStringCellValue()); + answer93.setInfoId(dwInfo.getId()); + answer93.setQuestionId(9L); + answers.add(answer93); + } + Cell cell29 = row.getCell(29); + if (cell29 != null && StringUtils.isNotEmpty(cell29.getStringCellValue())){ + DwAnswer answer94 = new DwAnswer(); + answer94.setAnswer(cell29.getStringCellValue()); + answer94.setInfoId(dwInfo.getId()); + answer94.setQuestionId(9L); + answers.add(answer94); + } + Cell cell30 = row.getCell(30); + if (cell30 != null && StringUtils.isNotEmpty(cell30.getStringCellValue())){ + DwAnswer answer95 = new DwAnswer(); + answer95.setAnswer(cell30.getStringCellValue()); + answer95.setInfoId(dwInfo.getId()); + answer95.setQuestionId(9L); + answers.add(answer95); + } + Cell cell31 = row.getCell(31); + if (cell31 != null && StringUtils.isNotEmpty(cell31.getStringCellValue())){ + DwAnswer answer96 = new DwAnswer(); + answer96.setAnswer(cell31.getStringCellValue()); + answer96.setInfoId(dwInfo.getId()); + answer96.setQuestionId(9L); + answers.add(answer96); + } + Cell cell32 = row.getCell(32); + if (cell32 != null && StringUtils.isNotEmpty(cell32.getStringCellValue())){ + DwAnswer answer97 = new DwAnswer(); + answer97.setAnswer(cell32.getStringCellValue()); + answer97.setInfoId(dwInfo.getId()); + answer97.setQuestionId(9L); + answers.add(answer97); + } + Cell cell33 = row.getCell(33); + if (cell33 != null && StringUtils.isNotEmpty(cell33.getStringCellValue())){ + DwAnswer answer98 = new DwAnswer(); + answer98.setAnswer(cell33.getStringCellValue()); + answer98.setInfoId(dwInfo.getId()); + answer98.setQuestionId(9L); + answers.add(answer98); + } + Cell cell35 = row.getCell(35); + if (cell35 != null && StringUtils.isNotEmpty(cell35.getStringCellValue())){ + DwAnswer answer99 = new DwAnswer(); + answer99.setAnswer(cell35.getStringCellValue()); + answer99.setInfoId(dwInfo.getId()); + answer99.setQuestionId(9L); + answers.add(answer99); + } DwAnswer answer10 = new DwAnswer(); Cell cell36 = row.getCell(36); answer10.setAnswer(cell36.getStringCellValue()); @@ -268,12 +339,70 @@ public class DwQuestionServiceImpl implements IDwQuestionService answer21.setInfoId(dwInfo.getId()); answer21.setQuestionId(21L); answers.add(answer21); - DwAnswer answer22 = new DwAnswer(); - Cell cell50 = row.getCell(50); - answer22.setAnswer(cell50.getStringCellValue()); - answer22.setInfoId(dwInfo.getId()); - answer22.setQuestionId(22L); - answers.add(answer22); + Cell cell51 = row.getCell(51); + if (cell51 != null && StringUtils.isNotEmpty(cell51.getStringCellValue())){ + DwAnswer answer221 = new DwAnswer(); + answer221.setAnswer(cell51.getStringCellValue()); + answer221.setInfoId(dwInfo.getId()); + answer221.setQuestionId(22L); + answers.add(answer221); + } + Cell cell52 = row.getCell(52); + if (cell52 != null && StringUtils.isNotEmpty(cell52.getStringCellValue())){ + DwAnswer answer222 = new DwAnswer(); + answer222.setAnswer(cell52.getStringCellValue()); + answer222.setInfoId(dwInfo.getId()); + answer222.setQuestionId(22L); + answers.add(answer222); + } + Cell cell53 = row.getCell(53); + if (cell53 != null && StringUtils.isNotEmpty(cell53.getStringCellValue())){ + DwAnswer answer223 = new DwAnswer(); + answer223.setAnswer(cell53.getStringCellValue()); + answer223.setInfoId(dwInfo.getId()); + answer223.setQuestionId(22L); + answers.add(answer223); + } + Cell cell54 = row.getCell(54); + if (cell54 != null && StringUtils.isNotEmpty(cell54.getStringCellValue())){ + DwAnswer answer224 = new DwAnswer(); + answer224.setAnswer(cell54.getStringCellValue()); + answer224.setInfoId(dwInfo.getId()); + answer224.setQuestionId(22L); + answers.add(answer224); + } + Cell cell55 = row.getCell(55); + if (cell55 != null && StringUtils.isNotEmpty(cell55.getStringCellValue())){ + DwAnswer answer225 = new DwAnswer(); + answer225.setAnswer(cell55.getStringCellValue()); + answer225.setInfoId(dwInfo.getId()); + answer225.setQuestionId(22L); + answers.add(answer225); + } + Cell cell56 = row.getCell(56); + if (cell56 != null && StringUtils.isNotEmpty(cell56.getStringCellValue())){ + DwAnswer answer226 = new DwAnswer(); + answer226.setAnswer(cell56.getStringCellValue()); + answer226.setInfoId(dwInfo.getId()); + answer226.setQuestionId(22L); + answers.add(answer226); + } + Cell cell57 = row.getCell(57); + if (cell57 != null && StringUtils.isNotEmpty(cell57.getStringCellValue())){ + DwAnswer answer227 = new DwAnswer(); + answer227.setAnswer(cell57.getStringCellValue()); + answer227.setInfoId(dwInfo.getId()); + answer227.setQuestionId(22L); + answers.add(answer227); + } + Cell cell59 = row.getCell(59); + if (cell59 != null && StringUtils.isNotEmpty(cell59.getStringCellValue())){ + DwAnswer answer228 = new DwAnswer(); + answer228.setAnswer(cell59.getStringCellValue()); + answer228.setInfoId(dwInfo.getId()); + answer228.setQuestionId(22L); + answers.add(answer228); + } DwAnswer answer23 = new DwAnswer(); Cell cell60 = row.getCell(60); answer23.setAnswer(cell60.getStringCellValue()); @@ -297,12 +426,54 @@ public class DwQuestionServiceImpl implements IDwQuestionService answer25.setInfoId(dwInfo.getId()); answer25.setQuestionId(25L); answers.add(answer25); - DwAnswer answer26 = new DwAnswer(); - Cell cell64 = row.getCell(64); - answer26.setAnswer(cell64.getStringCellValue()); - answer26.setInfoId(dwInfo.getId()); - answer26.setQuestionId(26L); - answers.add(answer26); + Cell cell65 = row.getCell(65); + if (cell65 != null && StringUtils.isNotEmpty(cell65.getStringCellValue())){ + DwAnswer answer261 = new DwAnswer(); + answer261.setAnswer(cell65.getStringCellValue()); + answer261.setInfoId(dwInfo.getId()); + answer261.setQuestionId(26L); + answers.add(answer261); + } + Cell cell66 = row.getCell(66); + if (cell66 != null && StringUtils.isNotEmpty(cell66.getStringCellValue())){ + DwAnswer answer262 = new DwAnswer(); + answer262.setAnswer(cell66.getStringCellValue()); + answer262.setInfoId(dwInfo.getId()); + answer262.setQuestionId(26L); + answers.add(answer262); + } + Cell cell67 = row.getCell(67); + if (cell67 != null && StringUtils.isNotEmpty(cell67.getStringCellValue())){ + DwAnswer answer263 = new DwAnswer(); + answer263.setAnswer(cell67.getStringCellValue()); + answer263.setInfoId(dwInfo.getId()); + answer263.setQuestionId(26L); + answers.add(answer263); + } + Cell cell68 = row.getCell(68); + if (cell68 != null && StringUtils.isNotEmpty(cell68.getStringCellValue())){ + DwAnswer answer264 = new DwAnswer(); + answer264.setAnswer(cell68.getStringCellValue()); + answer264.setInfoId(dwInfo.getId()); + answer264.setQuestionId(26L); + answers.add(answer264); + } + Cell cell69 = row.getCell(69); + if (cell69 != null && StringUtils.isNotEmpty(cell69.getStringCellValue())){ + DwAnswer answer265 = new DwAnswer(); + answer265.setAnswer(cell69.getStringCellValue()); + answer265.setInfoId(dwInfo.getId()); + answer265.setQuestionId(26L); + answers.add(answer265); + } + Cell cell70 = row.getCell(70); + if (cell70 != null && StringUtils.isNotEmpty(cell70.getStringCellValue())){ + DwAnswer answer266 = new DwAnswer(); + answer266.setAnswer(cell70.getStringCellValue()); + answer266.setInfoId(dwInfo.getId()); + answer266.setQuestionId(26L); + answers.add(answer266); + } DwAnswer answer27 = new DwAnswer(); Cell cell71 = row.getCell(71); answer27.setAnswer(cell71.getStringCellValue()); @@ -350,12 +521,102 @@ public class DwQuestionServiceImpl implements IDwQuestionService answer32.setInfoId(dwInfo.getId()); answer32.setQuestionId(32L); answers.add(answer32); - DwAnswer answer33 = new DwAnswer(); - Cell cell85 = row.getCell(85); - answer33.setAnswer(cell85.getStringCellValue()); - answer33.setInfoId(dwInfo.getId()); - answer33.setQuestionId(33L); - answers.add(answer33); + Cell cell86 = row.getCell(86); + if (cell86 != null && StringUtils.isNotEmpty(cell86.getStringCellValue())){ + DwAnswer answer331 = new DwAnswer(); + answer331.setAnswer(cell86.getStringCellValue()); + answer331.setInfoId(dwInfo.getId()); + answer331.setQuestionId(33L); + answers.add(answer331); + } + Cell cell87 = row.getCell(87); + if (cell87 != null && StringUtils.isNotEmpty(cell87.getStringCellValue())){ + DwAnswer answer332 = new DwAnswer(); + answer332.setAnswer(cell87.getStringCellValue()); + answer332.setInfoId(dwInfo.getId()); + answer332.setQuestionId(33L); + answers.add(answer332); + } + Cell cell88 = row.getCell(88); + if (cell88 != null && StringUtils.isNotEmpty(cell88.getStringCellValue())){ + DwAnswer answer333 = new DwAnswer(); + answer333.setAnswer(cell88.getStringCellValue()); + answer333.setInfoId(dwInfo.getId()); + answer333.setQuestionId(33L); + answers.add(answer333); + } + Cell cell89 = row.getCell(89); + if (cell89 != null && StringUtils.isNotEmpty(cell89.getStringCellValue())){ + DwAnswer answer334 = new DwAnswer(); + answer334.setAnswer(cell89.getStringCellValue()); + answer334.setInfoId(dwInfo.getId()); + answer334.setQuestionId(33L); + answers.add(answer334); + } + Cell cell90 = row.getCell(90); + if (cell90 != null && StringUtils.isNotEmpty(cell90.getStringCellValue())){ + DwAnswer answer335 = new DwAnswer(); + answer335.setAnswer(cell90.getStringCellValue()); + answer335.setInfoId(dwInfo.getId()); + answer335.setQuestionId(33L); + answers.add(answer335); + } + Cell cell91 = row.getCell(91); + if (cell91 != null && StringUtils.isNotEmpty(cell91.getStringCellValue())){ + DwAnswer answer336 = new DwAnswer(); + answer336.setAnswer(cell91.getStringCellValue()); + answer336.setInfoId(dwInfo.getId()); + answer336.setQuestionId(33L); + answers.add(answer336); + } + Cell cell92 = row.getCell(92); + if (cell92 != null && StringUtils.isNotEmpty(cell92.getStringCellValue())){ + DwAnswer answer337 = new DwAnswer(); + answer337.setAnswer(cell92.getStringCellValue()); + answer337.setInfoId(dwInfo.getId()); + answer337.setQuestionId(33L); + answers.add(answer337); + } + Cell cell93 = row.getCell(93); + if (cell93 != null && StringUtils.isNotEmpty(cell93.getStringCellValue())){ + DwAnswer answer338 = new DwAnswer(); + answer338.setAnswer(cell93.getStringCellValue()); + answer338.setInfoId(dwInfo.getId()); + answer338.setQuestionId(33L); + answers.add(answer338); + } + Cell cell94 = row.getCell(94); + if (cell94 != null && StringUtils.isNotEmpty(cell94.getStringCellValue())){ + DwAnswer answer339 = new DwAnswer(); + answer339.setAnswer(cell94.getStringCellValue()); + answer339.setInfoId(dwInfo.getId()); + answer339.setQuestionId(33L); + answers.add(answer339); + } + Cell cell95 = row.getCell(95); + if (cell95 != null && StringUtils.isNotEmpty(cell95.getStringCellValue())){ + DwAnswer answer3310 = new DwAnswer(); + answer3310.setAnswer(cell95.getStringCellValue()); + answer3310.setInfoId(dwInfo.getId()); + answer3310.setQuestionId(33L); + answers.add(answer3310); + } + Cell cell96 = row.getCell(96); + if (cell96 != null && StringUtils.isNotEmpty(cell96.getStringCellValue())){ + DwAnswer answer3311 = new DwAnswer(); + answer3311.setAnswer(cell96.getStringCellValue()); + answer3311.setInfoId(dwInfo.getId()); + answer3311.setQuestionId(33L); + answers.add(answer3311); + } + Cell cell97 = row.getCell(97); + if (cell97 != null && StringUtils.isNotEmpty(cell97.getStringCellValue())){ + DwAnswer answer3312 = new DwAnswer(); + answer3312.setAnswer(cell97.getStringCellValue()); + answer3312.setInfoId(dwInfo.getId()); + answer3312.setQuestionId(33L); + answers.add(answer3312); + } DwAnswer answer34 = new DwAnswer(); Cell cell98 = row.getCell(98); answer34.setAnswer(cell98.getStringCellValue()); @@ -374,12 +635,127 @@ public class DwQuestionServiceImpl implements IDwQuestionService answer35.setInfoId(dwInfo.getId()); answer35.setQuestionId(35L); answers.add(answer35); - DwAnswer answer36 = new DwAnswer(); - Cell cell104 = row.getCell(104); - answer36.setAnswer(cell104.getStringCellValue()); - answer36.setInfoId(dwInfo.getId()); - answer36.setQuestionId(36L); - answers.add(answer36); + Cell cell105 = row.getCell(105); + if (cell105 != null && StringUtils.isNotEmpty(cell105.getStringCellValue())){ + DwAnswer answer361 = new DwAnswer(); + answer361.setAnswer(cell105.getStringCellValue()); + answer361.setInfoId(dwInfo.getId()); + answer361.setQuestionId(36L); + answers.add(answer361); + } + Cell cell106 = row.getCell(106); + if (cell106 != null && StringUtils.isNotEmpty(cell106.getStringCellValue())){ + DwAnswer answer362 = new DwAnswer(); + answer362.setAnswer(cell106.getStringCellValue()); + answer362.setInfoId(dwInfo.getId()); + answer362.setQuestionId(36L); + answers.add(answer362); + } + Cell cell107 = row.getCell(107); + if (cell107 != null && StringUtils.isNotEmpty(cell107.getStringCellValue())){ + DwAnswer answer363 = new DwAnswer(); + answer363.setAnswer(cell107.getStringCellValue()); + answer363.setInfoId(dwInfo.getId()); + answer363.setQuestionId(36L); + answers.add(answer363); + } + Cell cell108 = row.getCell(108); + if (cell108 != null && StringUtils.isNotEmpty(cell108.getStringCellValue())){ + DwAnswer answer364 = new DwAnswer(); + answer364.setAnswer(cell108.getStringCellValue()); + answer364.setInfoId(dwInfo.getId()); + answer364.setQuestionId(36L); + answers.add(answer364); + } + Cell cell109 = row.getCell(109); + if (cell109 != null && StringUtils.isNotEmpty(cell109.getStringCellValue())){ + DwAnswer answer365 = new DwAnswer(); + answer365.setAnswer(cell109.getStringCellValue()); + answer365.setInfoId(dwInfo.getId()); + answer365.setQuestionId(36L); + answers.add(answer365); + } + Cell cell110 = row.getCell(110); + if (cell110 != null && StringUtils.isNotEmpty(cell110.getStringCellValue())){ + DwAnswer answer366 = new DwAnswer(); + answer366.setAnswer(cell110.getStringCellValue()); + answer366.setInfoId(dwInfo.getId()); + answer366.setQuestionId(36L); + answers.add(answer366); + } + Cell cell111 = row.getCell(111); + if (cell111 != null && StringUtils.isNotEmpty(cell111.getStringCellValue())){ + DwAnswer answer367 = new DwAnswer(); + answer367.setAnswer(cell111.getStringCellValue()); + answer367.setInfoId(dwInfo.getId()); + answer367.setQuestionId(36L); + answers.add(answer367); + } + Cell cell112 = row.getCell(112); + if (cell112 != null && StringUtils.isNotEmpty(cell112.getStringCellValue())){ + DwAnswer answer368 = new DwAnswer(); + answer368.setAnswer(cell112.getStringCellValue()); + answer368.setInfoId(dwInfo.getId()); + answer368.setQuestionId(36L); + answers.add(answer368); + } + Cell cell113 = row.getCell(113); + if (cell113 != null && StringUtils.isNotEmpty(cell113.getStringCellValue())){ + DwAnswer answer369 = new DwAnswer(); + answer369.setAnswer(cell113.getStringCellValue()); + answer369.setInfoId(dwInfo.getId()); + answer369.setQuestionId(36L); + answers.add(answer369); + } + Cell cell114 = row.getCell(114); + if (cell114 != null && StringUtils.isNotEmpty(cell114.getStringCellValue())){ + DwAnswer answer3610 = new DwAnswer(); + answer3610.setAnswer(cell114.getStringCellValue()); + answer3610.setInfoId(dwInfo.getId()); + answer3610.setQuestionId(36L); + answers.add(answer3610); + } + Cell cell115 = row.getCell(115); + if (cell115 != null && StringUtils.isNotEmpty(cell115.getStringCellValue())){ + DwAnswer answer3611 = new DwAnswer(); + answer3611.setAnswer(cell115.getStringCellValue()); + answer3611.setInfoId(dwInfo.getId()); + answer3611.setQuestionId(36L); + answers.add(answer3611); + + } + Cell cell116 = row.getCell(116); + if (cell116 != null && StringUtils.isNotEmpty(cell116.getStringCellValue())){ + DwAnswer answer3612 = new DwAnswer(); + answer3612.setAnswer(cell116.getStringCellValue()); + answer3612.setInfoId(dwInfo.getId()); + answer3612.setQuestionId(36L); + answers.add(answer3612); + } + Cell cell117 = row.getCell(117); + if (cell117 != null && StringUtils.isNotEmpty(cell117.getStringCellValue())){ + DwAnswer answer3613 = new DwAnswer(); + answer3613.setAnswer(cell117.getStringCellValue()); + answer3613.setInfoId(dwInfo.getId()); + answer3613.setQuestionId(36L); + answers.add(answer3613); + } + Cell cell118 = row.getCell(118); + if (cell118 != null && StringUtils.isNotEmpty(cell118.getStringCellValue())){ + DwAnswer answer3614 = new DwAnswer(); + answer3614.setAnswer(cell118.getStringCellValue()); + answer3614.setInfoId(dwInfo.getId()); + answer3614.setQuestionId(36L); + answers.add(answer3614); + } + Cell cell120 = row.getCell(120); + if (cell120 != null && StringUtils.isNotEmpty(cell120.getStringCellValue())){ + DwAnswer answer3615 = new DwAnswer(); + answer3615.setAnswer(cell120.getStringCellValue()); + answer3615.setInfoId(dwInfo.getId()); + answer3615.setQuestionId(36L); + answers.add(answer3615); + } DwAnswer answer37 = new DwAnswer(); Cell cell121 = row.getCell(121); Cell cell122 = row.getCell(122); @@ -396,15 +772,57 @@ public class DwQuestionServiceImpl implements IDwQuestionService answer37.setInfoId(dwInfo.getId()); answer37.setQuestionId(37L); answers.add(answer37); - DwAnswer answer38 = new DwAnswer(); - Cell cell129 = row.getCell(129); - answer38.setAnswer(cell129.getStringCellValue()); - answer38.setInfoId(dwInfo.getId()); - answer38.setQuestionId(38L); - answers.add(answer38); - DwAnswer answer39 = new DwAnswer(); + Cell cell130 = row.getCell(130); + if (cell130 != null && StringUtils.isNotEmpty(cell130.getStringCellValue())){ + DwAnswer answer381 = new DwAnswer(); + answer381.setAnswer(cell130.getStringCellValue()); + answer381.setInfoId(dwInfo.getId()); + answer381.setQuestionId(38L); + answers.add(answer381); + } Cell cell131 = row.getCell(131); - answer39.setAnswer(cell131.getStringCellValue()); + if (cell131 != null && StringUtils.isNotEmpty(cell131.getStringCellValue())){ + DwAnswer answer382 = new DwAnswer(); + answer382.setAnswer(cell131.getStringCellValue()); + answer382.setInfoId(dwInfo.getId()); + answer382.setQuestionId(38L); + answers.add(answer382); + } + Cell cell132 = row.getCell(132); + if (cell132 != null && StringUtils.isNotEmpty(cell132.getStringCellValue())){ + DwAnswer answer383 = new DwAnswer(); + answer383.setAnswer(cell132.getStringCellValue()); + answer383.setInfoId(dwInfo.getId()); + answer383.setQuestionId(38L); + answers.add(answer383); + } + Cell cell133 = row.getCell(133); + if (cell133 != null && StringUtils.isNotEmpty(cell133.getStringCellValue())){ + DwAnswer answer384 = new DwAnswer(); + answer384.setAnswer(cell133.getStringCellValue()); + answer384.setInfoId(dwInfo.getId()); + answer384.setQuestionId(38L); + answers.add(answer384); + } + Cell cell134 = row.getCell(134); + if (cell134 != null && StringUtils.isNotEmpty(cell134.getStringCellValue())){ + DwAnswer answer385 = new DwAnswer(); + answer385.setAnswer(cell134.getStringCellValue()); + answer385.setInfoId(dwInfo.getId()); + answer385.setQuestionId(38L); + answers.add(answer385); + } + Cell cell135 = row.getCell(135); + if (cell135 != null && StringUtils.isNotEmpty(cell135.getStringCellValue())){ + DwAnswer answer386 = new DwAnswer(); + answer386.setAnswer(cell135.getStringCellValue()); + answer386.setInfoId(dwInfo.getId()); + answer386.setQuestionId(38L); + answers.add(answer386); + } + DwAnswer answer39 = new DwAnswer(); + Cell cell136 = row.getCell(136); + answer39.setAnswer(cell136.getStringCellValue()); answer39.setInfoId(dwInfo.getId()); answer39.setQuestionId(39L); answers.add(answer39); @@ -496,12 +914,102 @@ public class DwQuestionServiceImpl implements IDwQuestionService answer9.setInfoId(dwInfo.getId()); answer9.setQuestionId(50L); answers.add(answer9); - DwAnswer answer10 = new DwAnswer(); - Cell cell26 = row.getCell(26); - answer10.setAnswer(cell26.getStringCellValue()); - answer10.setInfoId(dwInfo.getId()); - answer10.setQuestionId(51L); - answers.add(answer10); + Cell cell27 = row.getCell(27); + if (cell27 != null && StringUtils.isNotEmpty(cell27.getStringCellValue())) { + DwAnswer answer101 = new DwAnswer(); + answer101.setAnswer(cell27.getStringCellValue()); + answer101.setInfoId(dwInfo.getId()); + answer101.setQuestionId(51L); + answers.add(answer101); + } + Cell cell28 = row.getCell(28); + if (cell28 != null && StringUtils.isNotEmpty(cell28.getStringCellValue())) { + DwAnswer answer102 = new DwAnswer(); + answer102.setAnswer(cell28.getStringCellValue()); + answer102.setInfoId(dwInfo.getId()); + answer102.setQuestionId(51L); + answers.add(answer102); + } + Cell cell29 = row.getCell(29); + if (cell29 != null && StringUtils.isNotEmpty(cell29.getStringCellValue())) { + DwAnswer answer103 = new DwAnswer(); + answer103.setAnswer(cell29.getStringCellValue()); + answer103.setInfoId(dwInfo.getId()); + answer103.setQuestionId(51L); + answers.add(answer103); + } + Cell cell30 = row.getCell(30); + if (cell30 != null && StringUtils.isNotEmpty(cell30.getStringCellValue())) { + DwAnswer answer104 = new DwAnswer(); + answer104.setAnswer(cell30.getStringCellValue()); + answer104.setInfoId(dwInfo.getId()); + answer104.setQuestionId(51L); + answers.add(answer104); + } + Cell cell31 = row.getCell(31); + if (cell31 != null && StringUtils.isNotEmpty(cell31.getStringCellValue())) { + DwAnswer answer105 = new DwAnswer(); + answer105.setAnswer(cell31.getStringCellValue()); + answer105.setInfoId(dwInfo.getId()); + answer105.setQuestionId(51L); + answers.add(answer105); + } + Cell cell32 = row.getCell(32); + if (cell32 != null && StringUtils.isNotEmpty(cell32.getStringCellValue())) { + DwAnswer answer106 = new DwAnswer(); + answer106.setAnswer(cell32.getStringCellValue()); + answer106.setInfoId(dwInfo.getId()); + answer106.setQuestionId(51L); + answers.add(answer106); + } + Cell cell33 = row.getCell(33); + if (cell33 != null && StringUtils.isNotEmpty(cell33.getStringCellValue())) { + DwAnswer answer107 = new DwAnswer(); + answer107.setAnswer(cell33.getStringCellValue()); + answer107.setInfoId(dwInfo.getId()); + answer107.setQuestionId(51L); + answers.add(answer107); + } + Cell cell34 = row.getCell(34); + if (cell34 != null && StringUtils.isNotEmpty(cell34.getStringCellValue())) { + DwAnswer answer108 = new DwAnswer(); + answer108.setAnswer(cell34.getStringCellValue()); + answer108.setInfoId(dwInfo.getId()); + answer108.setQuestionId(51L); + answers.add(answer108); + } + Cell cell35 = row.getCell(35); + if (cell35 != null && StringUtils.isNotEmpty(cell35.getStringCellValue())) { + DwAnswer answer109 = new DwAnswer(); + answer109.setAnswer(cell35.getStringCellValue()); + answer109.setInfoId(dwInfo.getId()); + answer109.setQuestionId(51L); + answers.add(answer109); + } + Cell cell36 = row.getCell(36); + if (cell36 != null && StringUtils.isNotEmpty(cell36.getStringCellValue())) { + DwAnswer answer110 = new DwAnswer(); + answer110.setAnswer(cell36.getStringCellValue()); + answer110.setInfoId(dwInfo.getId()); + answer110.setQuestionId(51L); + answers.add(answer110); + } + Cell cell37 = row.getCell(37); + if (cell37 != null && StringUtils.isNotEmpty(cell37.getStringCellValue())) { + DwAnswer answer111 = new DwAnswer(); + answer111.setAnswer(cell37.getStringCellValue()); + answer111.setInfoId(dwInfo.getId()); + answer111.setQuestionId(51L); + answers.add(answer111); + } + Cell cell38 = row.getCell(38); + if (cell38 != null && StringUtils.isNotEmpty(cell38.getStringCellValue())) { + DwAnswer answer112 = new DwAnswer(); + answer112.setAnswer(cell38.getStringCellValue()); + answer112.setInfoId(dwInfo.getId()); + answer112.setQuestionId(51L); + answers.add(answer112); + } DwAnswer answer11 = new DwAnswer(); Cell cell39 = row.getCell(39); answer11.setAnswer(cell39.getStringCellValue()); @@ -555,36 +1063,174 @@ public class DwQuestionServiceImpl implements IDwQuestionService answer17.setInfoId(dwInfo.getId()); answer17.setQuestionId(58L); answers.add(answer17); - DwAnswer answer18 = new DwAnswer(); - Cell cell51 = row.getCell(51); + Cell cell52 = row.getCell(52); + if (cell52 != null && StringUtils.isNotEmpty(cell52.getStringCellValue())) { + DwAnswer answer181 = new DwAnswer(); + answer181.setAnswer(cell52.getStringCellValue()); + answer181.setInfoId(dwInfo.getId()); + answer181.setQuestionId(59L); + answers.add(answer181); + } + Cell cell53 = row.getCell(53); + if (cell53 != null && StringUtils.isNotEmpty(cell53.getStringCellValue())) { + DwAnswer answer181 = new DwAnswer(); + answer181.setAnswer(cell53.getStringCellValue()); + answer181.setInfoId(dwInfo.getId()); + answer181.setQuestionId(59L); + answers.add(answer181); + } + Cell cell54 = row.getCell(54); + if (cell54 != null && StringUtils.isNotEmpty(cell54.getStringCellValue())) { + DwAnswer answer182 = new DwAnswer(); + answer182.setAnswer(cell54.getStringCellValue()); + answer182.setInfoId(dwInfo.getId()); + answer182.setQuestionId(59L); + answers.add(answer182); + } + Cell cell55 = row.getCell(55); + if (cell55 != null && StringUtils.isNotEmpty(cell55.getStringCellValue())) { + DwAnswer answer183 = new DwAnswer(); + answer183.setAnswer(cell55.getStringCellValue()); + answer183.setInfoId(dwInfo.getId()); + answer183.setQuestionId(59L); + answers.add(answer183); + } + Cell cell56 = row.getCell(56); + if (cell56 != null && StringUtils.isNotEmpty(cell56.getStringCellValue())) { + DwAnswer answer184 = new DwAnswer(); + answer184.setAnswer(cell56.getStringCellValue()); + answer184.setInfoId(dwInfo.getId()); + answer184.setQuestionId(59L); + answers.add(answer184); + } + Cell cell57 = row.getCell(57); + if (cell57 != null && StringUtils.isNotEmpty(cell57.getStringCellValue())) { + DwAnswer answer185 = new DwAnswer(); + answer185.setAnswer(cell57.getStringCellValue()); + answer185.setInfoId(dwInfo.getId()); + answer185.setQuestionId(59L); + answers.add(answer185); + } Cell cell59 = row.getCell(59); - if (cell59 != null && StringUtils.isNotEmpty(cell59.getStringCellValue())){ - answer18.setAnswer(cell51.getStringCellValue().replace("其他","") - + cell59.getStringCellValue()); - }else { - answer18.setAnswer(cell51.getStringCellValue()); + if (cell59 != null && StringUtils.isNotEmpty(cell59.getStringCellValue())) { + DwAnswer answer186 = new DwAnswer(); + answer186.setAnswer(cell59.getStringCellValue()); + answer186.setInfoId(dwInfo.getId()); + answer186.setQuestionId(59L); + answers.add(answer186); + } + Cell cell61 = row.getCell(61); + if (cell61 != null && StringUtils.isNotEmpty(cell61.getStringCellValue())) { + DwAnswer answer191 = new DwAnswer(); + answer191.setAnswer(cell61.getStringCellValue()); + answer191.setInfoId(dwInfo.getId()); + answer191.setQuestionId(60L); + answers.add(answer191); + } + Cell cell62 = row.getCell(62); + if (cell62 != null && StringUtils.isNotEmpty(cell62.getStringCellValue())) { + DwAnswer answer192 = new DwAnswer(); + answer192.setAnswer(cell62.getStringCellValue()); + answer192.setInfoId(dwInfo.getId()); + answer192.setQuestionId(60L); + answers.add(answer192); + } + Cell cell63 = row.getCell(63); + if (cell63 != null && StringUtils.isNotEmpty(cell63.getStringCellValue())) { + DwAnswer answer193 = new DwAnswer(); + answer193.setAnswer(cell63.getStringCellValue()); + answer193.setInfoId(dwInfo.getId()); + answer193.setQuestionId(60L); + answers.add(answer193); + } + Cell cell64 = row.getCell(64); + if (cell64 != null && StringUtils.isNotEmpty(cell64.getStringCellValue())) { + DwAnswer answer194 = new DwAnswer(); + answer194.setAnswer(cell64.getStringCellValue()); + answer194.setInfoId(dwInfo.getId()); + answer194.setQuestionId(60L); + answers.add(answer194); + } + Cell cell65 = row.getCell(65); + if (cell65 != null && StringUtils.isNotEmpty(cell65.getStringCellValue())) { + DwAnswer answer195 = new DwAnswer(); + answer195.setAnswer(cell65.getStringCellValue()); + answer195.setInfoId(dwInfo.getId()); + answer195.setQuestionId(60L); + answers.add(answer195); + } + Cell cell66 = row.getCell(66); + if (cell66 != null && StringUtils.isNotEmpty(cell66.getStringCellValue())) { + DwAnswer answer196 = new DwAnswer(); + answer196.setAnswer(cell66.getStringCellValue()); + answer196.setInfoId(dwInfo.getId()); + answer196.setQuestionId(60L); + answers.add(answer196); + } + Cell cell67 = row.getCell(67); + if (cell67 != null && StringUtils.isNotEmpty(cell67.getStringCellValue())) { + DwAnswer answer197 = new DwAnswer(); + answer197.setAnswer(cell67.getStringCellValue()); + answer197.setInfoId(dwInfo.getId()); + answer197.setQuestionId(60L); + answers.add(answer197); + } + Cell cell69 = row.getCell(69); + if (cell69 != null && StringUtils.isNotEmpty(cell69.getStringCellValue())) { + DwAnswer answer201 = new DwAnswer(); + answer201.setAnswer(cell69.getStringCellValue()); + answer201.setInfoId(dwInfo.getId()); + answer201.setQuestionId(61L); + answers.add(answer201); + } + Cell cell70 = row.getCell(70); + if (cell70 != null && StringUtils.isNotEmpty(cell70.getStringCellValue())) { + DwAnswer answer202 = new DwAnswer(); + answer202.setAnswer(cell70.getStringCellValue()); + answer202.setInfoId(dwInfo.getId()); + answer202.setQuestionId(61L); + answers.add(answer202); + } + Cell cell71 = row.getCell(71); + if (cell71 != null && StringUtils.isNotEmpty(cell71.getStringCellValue())) { + DwAnswer answer203 = new DwAnswer(); + answer203.setAnswer(cell71.getStringCellValue()); + answer203.setInfoId(dwInfo.getId()); + answer203.setQuestionId(61L); + answers.add(answer203); + } + Cell cell72 = row.getCell(72); + if (cell72 != null && StringUtils.isNotEmpty(cell72.getStringCellValue())) { + DwAnswer answer204 = new DwAnswer(); + answer204.setAnswer(cell72.getStringCellValue()); + answer204.setInfoId(dwInfo.getId()); + answer204.setQuestionId(61L); + answers.add(answer204); + } + Cell cell73 = row.getCell(73); + if (cell73 != null && StringUtils.isNotEmpty(cell73.getStringCellValue())) { + DwAnswer answer205 = new DwAnswer(); + answer205.setAnswer(cell73.getStringCellValue()); + answer205.setInfoId(dwInfo.getId()); + answer205.setQuestionId(61L); + answers.add(answer205); + } + Cell cell74 = row.getCell(74); + if (cell74 != null && StringUtils.isNotEmpty(cell74.getStringCellValue())) { + DwAnswer answer206 = new DwAnswer(); + answer206.setAnswer(cell74.getStringCellValue()); + answer206.setInfoId(dwInfo.getId()); + answer206.setQuestionId(61L); + answers.add(answer206); } - answer18.setInfoId(dwInfo.getId()); - answer18.setQuestionId(59L); - answers.add(answer18); - DwAnswer answer19 = new DwAnswer(); - Cell cell60 = row.getCell(60); - answer19.setAnswer(cell60.getStringCellValue()); - answer19.setInfoId(dwInfo.getId()); - answer19.setQuestionId(60L); - answers.add(answer19); - DwAnswer answer20 = new DwAnswer(); - Cell cell68 = row.getCell(68); Cell cell76 = row.getCell(76); - if (cell76 != null && StringUtils.isNotEmpty(cell76.getStringCellValue())){ - answer20.setAnswer(cell68.getStringCellValue().replace("其他","") - + cell76.getStringCellValue()); - }else { - answer20.setAnswer(cell68.getStringCellValue()); + if (cell76 != null && StringUtils.isNotEmpty(cell76.getStringCellValue())) { + DwAnswer answer207 = new DwAnswer(); + answer207.setAnswer(cell76.getStringCellValue()); + answer207.setInfoId(dwInfo.getId()); + answer207.setQuestionId(61L); + answers.add(answer207); } - answer20.setInfoId(dwInfo.getId()); - answer20.setQuestionId(61L); - answers.add(answer20); DwAnswer answer21 = new DwAnswer(); Cell cell77 = row.getCell(77); answer21.setAnswer(cell77.getStringCellValue()); @@ -669,40 +1315,62 @@ public class DwQuestionServiceImpl implements IDwQuestionService answer9.setInfoId(dwInfo.getId()); answer9.setQuestionId(74L); answers.add(answer9); - DwAnswer answer10 = new DwAnswer(); - String answer10_str = ""; Cell cell25 = row.getCell(25); if (cell25 != null && StringUtils.isNotEmpty(cell25.getStringCellValue())){ - answer10_str = cell25.getStringCellValue() + ","; + DwAnswer answer101 = new DwAnswer(); + answer101.setAnswer(cell25.getStringCellValue()); + answer101.setInfoId(dwInfo.getId()); + answer101.setQuestionId(75L); + answers.add(answer101); } Cell cell26 = row.getCell(26); if (cell26 != null && StringUtils.isNotEmpty(cell26.getStringCellValue())){ - answer10_str = cell26.getStringCellValue() + ","; + DwAnswer answer102 = new DwAnswer(); + answer102.setAnswer(cell26.getStringCellValue()); + answer102.setInfoId(dwInfo.getId()); + answer102.setQuestionId(75L); + answers.add(answer102); } Cell cell27 = row.getCell(27); if (cell27 != null && StringUtils.isNotEmpty(cell27.getStringCellValue())){ - answer10_str = cell27.getStringCellValue() + ","; + DwAnswer answer103 = new DwAnswer(); + answer103.setAnswer(cell27.getStringCellValue()); + answer103.setInfoId(dwInfo.getId()); + answer103.setQuestionId(75L); + answers.add(answer103); } Cell cell28 = row.getCell(28); if (cell28 != null && StringUtils.isNotEmpty(cell28.getStringCellValue())){ - answer10_str = cell28.getStringCellValue() + ","; + DwAnswer answer104 = new DwAnswer(); + answer104.setAnswer(cell28.getStringCellValue()); + answer104.setInfoId(dwInfo.getId()); + answer104.setQuestionId(75L); + answers.add(answer104); } Cell cell29 = row.getCell(29); if (cell29 != null && StringUtils.isNotEmpty(cell29.getStringCellValue())){ - answer10_str = cell29.getStringCellValue() + ","; + DwAnswer answer105 = new DwAnswer(); + answer105.setAnswer(cell29.getStringCellValue()); + answer105.setInfoId(dwInfo.getId()); + answer105.setQuestionId(75L); + answers.add(answer105); } Cell cell31 = row.getCell(31); if (cell31 != null && StringUtils.isNotEmpty(cell31.getStringCellValue())){ - answer10_str = cell31.getStringCellValue() + ","; + DwAnswer answer106 = new DwAnswer(); + answer106.setAnswer(cell31.getStringCellValue()); + answer106.setInfoId(dwInfo.getId()); + answer106.setQuestionId(75L); + answers.add(answer106); } Cell cell33 = row.getCell(33); if (cell33!=null && StringUtils.isNotEmpty(cell33.getStringCellValue())){ - answer10_str = cell33.getStringCellValue() + ","; + DwAnswer answer107 = new DwAnswer(); + answer107.setAnswer(cell33.getStringCellValue()); + answer107.setInfoId(dwInfo.getId()); + answer107.setQuestionId(75L); + answers.add(answer107); } - answer10.setAnswer(answer10_str.substring(0,answer10_str.length()-1)); - answer10.setInfoId(dwInfo.getId()); - answer10.setQuestionId(75L); - answers.add(answer10); DwAnswer answer11 = new DwAnswer(); Cell cell34 = row.getCell(34); Cell cell35 = row.getCell(35); @@ -737,96 +1405,249 @@ public class DwQuestionServiceImpl implements IDwQuestionService answer14.setInfoId(dwInfo.getId()); answer14.setQuestionId(79L); answers.add(answer14); - DwAnswer answer15 = new DwAnswer(); Cell cell41 = row.getCell(41); Cell cell42 = row.getCell(42); Cell cell43 = row.getCell(43); Cell cell44 = row.getCell(44); Cell cell45 = row.getCell(45); Cell cell47 = row.getCell(47); - String answer15_str = ""; if (cell41 != null && StringUtils.isNotEmpty(cell41.getStringCellValue())){ - answer15_str = cell41.getStringCellValue() + ","; + DwAnswer answer151 = new DwAnswer(); + answer151.setAnswer(cell41.getStringCellValue()); + answer151.setInfoId(dwInfo.getId()); + answer151.setQuestionId(80L); } if (cell42 != null && StringUtils.isNotEmpty(cell42.getStringCellValue())){ - answer15_str = cell42.getStringCellValue() + ","; + DwAnswer answer152 = new DwAnswer(); + answer152.setAnswer(cell42.getStringCellValue()); + answer152.setInfoId(dwInfo.getId()); + answer152.setQuestionId(80L); + answers.add(answer152); } if (cell43 != null && StringUtils.isNotEmpty(cell43.getStringCellValue())){ - answer15_str = cell43.getStringCellValue() + ","; + DwAnswer answer153 = new DwAnswer(); + answer153.setAnswer(cell43.getStringCellValue()); + answer153.setInfoId(dwInfo.getId()); + answer153.setQuestionId(80L); + answers.add(answer153); } if (cell44 != null && StringUtils.isNotEmpty(cell44.getStringCellValue())){ - answer15_str = cell44.getStringCellValue() + ","; + DwAnswer answer154 = new DwAnswer(); + answer154.setAnswer(cell44.getStringCellValue()); + answer154.setInfoId(dwInfo.getId()); + answer154.setQuestionId(80L); + answers.add(answer154); } if (cell45 != null && StringUtils.isNotEmpty(cell45.getStringCellValue())){ - answer15_str = cell45.getStringCellValue() + ","; + DwAnswer answer155 = new DwAnswer(); + answer155.setAnswer(cell45.getStringCellValue()); + answer155.setInfoId(dwInfo.getId()); + answer155.setQuestionId(80L); + answers.add(answer155); } if (cell47 != null && StringUtils.isNotEmpty(cell47.getStringCellValue())){ - answer15_str = cell47.getStringCellValue() + ","; + DwAnswer answer156 = new DwAnswer(); + answer156.setAnswer(cell47.getStringCellValue()); + answer156.setInfoId(dwInfo.getId()); + answer156.setQuestionId(80L); + answers.add(answer156); } - answer15.setAnswer(answer15_str.substring(0,answer15_str.length()-1)); - answer15.setInfoId(dwInfo.getId()); - answer15.setQuestionId(80L); - answers.add(answer15); DwAnswer answer16 = new DwAnswer(); Cell cell48 = row.getCell(48); answer16.setAnswer(cell48.getStringCellValue()); answer16.setInfoId(dwInfo.getId()); answer16.setQuestionId(81L); answers.add(answer16); - DwAnswer answer17 = new DwAnswer(); - Cell cell49 = row.getCell(49); - answer17.setAnswer(cell49.getStringCellValue()); - answer17.setInfoId(dwInfo.getId()); - answer17.setQuestionId(82L); - answers.add(answer17); - DwAnswer answer18 = new DwAnswer(); - Cell cell56 = row.getCell(56); - answer18.setAnswer(cell56.getStringCellValue()); - answer18.setInfoId(dwInfo.getId()); - answer18.setQuestionId(83L); - answers.add(answer18); - DwAnswer answer19 = new DwAnswer(); - Cell cell63 = row.getCell(63); - answer19.setAnswer(cell63.getStringCellValue()); - answer19.setInfoId(dwInfo.getId()); - answer19.setQuestionId(84L); - answers.add(answer19); + Cell cell50 = row.getCell(50); + if (cell50!=null && StringUtils.isNotEmpty(cell50.getStringCellValue())){ + DwAnswer answer171 = new DwAnswer(); + answer171.setAnswer(cell50.getStringCellValue()); + answer171.setInfoId(dwInfo.getId()); + answer171.setQuestionId(82L); + answers.add(answer171); + } + Cell cell51 = row.getCell(51); + if (cell51!=null && StringUtils.isNotEmpty(cell51.getStringCellValue())){ + DwAnswer answer172 = new DwAnswer(); + answer172.setAnswer(cell51.getStringCellValue()); + answer172.setInfoId(dwInfo.getId()); + answer172.setQuestionId(82L); + answers.add(answer172); + } + Cell cell52 = row.getCell(52); + if (cell52!=null && StringUtils.isNotEmpty(cell52.getStringCellValue())){ + DwAnswer answer173 = new DwAnswer(); + answer173.setAnswer(cell52.getStringCellValue()); + answer173.setInfoId(dwInfo.getId()); + answer173.setQuestionId(82L); + answers.add(answer173); + } + Cell cell53 = row.getCell(53); + if (cell53!=null && StringUtils.isNotEmpty(cell53.getStringCellValue())){ + DwAnswer answer174 = new DwAnswer(); + answer174.setAnswer(cell53.getStringCellValue()); + answer174.setInfoId(dwInfo.getId()); + answer174.setQuestionId(82L); + answers.add(answer174); + } + Cell cell55 = row.getCell(55); + if (cell55!=null && StringUtils.isNotEmpty(cell55.getStringCellValue())){ + DwAnswer answer175 = new DwAnswer(); + answer175.setAnswer(cell55.getStringCellValue()); + answer175.setInfoId(dwInfo.getId()); + answer175.setQuestionId(82L); + answers.add(answer175); + } + Cell cell57 = row.getCell(57); + if (cell57!=null && StringUtils.isNotEmpty(cell57.getStringCellValue())){ + DwAnswer answer181 = new DwAnswer(); + answer181.setAnswer(cell57.getStringCellValue()); + answer181.setInfoId(dwInfo.getId()); + answer181.setQuestionId(83L); + answers.add(answer181); + } + Cell cell58 = row.getCell(58); + if (cell58!=null && StringUtils.isNotEmpty(cell58.getStringCellValue())){ + DwAnswer answer182 = new DwAnswer(); + answer182.setAnswer(cell58.getStringCellValue()); + answer182.setInfoId(dwInfo.getId()); + answer182.setQuestionId(83L); + answers.add(answer182); + } + Cell cell59 = row.getCell(59); + if (cell59!=null && StringUtils.isNotEmpty(cell59.getStringCellValue())){ + DwAnswer answer183 = new DwAnswer(); + answer183.setAnswer(cell59.getStringCellValue()); + answer183.setInfoId(dwInfo.getId()); + answer183.setQuestionId(83L); + answers.add(answer183); + } + Cell cell60 = row.getCell(60); + if (cell60!=null && StringUtils.isNotEmpty(cell60.getStringCellValue())){ + DwAnswer answer184 = new DwAnswer(); + answer184.setAnswer(cell60.getStringCellValue()); + answer184.setInfoId(dwInfo.getId()); + answer184.setQuestionId(83L); + answers.add(answer184); + } + Cell cell61 = row.getCell(61); + if (cell61!=null && StringUtils.isNotEmpty(cell61.getStringCellValue())){ + DwAnswer answer185 = new DwAnswer(); + answer185.setAnswer(cell61.getStringCellValue()); + answer185.setInfoId(dwInfo.getId()); + answer185.setQuestionId(83L); + answers.add(answer185); + } + Cell cell62 = row.getCell(62); + if (cell62!=null && StringUtils.isNotEmpty(cell62.getStringCellValue())){ + DwAnswer answer186 = new DwAnswer(); + answer186.setAnswer(cell62.getStringCellValue()); + answer186.setInfoId(dwInfo.getId()); + answer186.setQuestionId(83L); + answers.add(answer186); + } + Cell cell64 = row.getCell(64); + if (cell64!=null && StringUtils.isNotEmpty(cell64.getStringCellValue())){ + DwAnswer answer191 = new DwAnswer(); + answer191.setAnswer(cell64.getStringCellValue()); + answer191.setInfoId(dwInfo.getId()); + answer191.setQuestionId(84L); + answers.add(answer191); + } + Cell cell65 = row.getCell(65); + if (cell65!=null && StringUtils.isNotEmpty(cell65.getStringCellValue())){ + DwAnswer answer192 = new DwAnswer(); + answer192.setAnswer(cell65.getStringCellValue()); + answer192.setInfoId(dwInfo.getId()); + answer192.setQuestionId(84L); + answers.add(answer192); + } + Cell cell66 = row.getCell(66); + if (cell66!=null && StringUtils.isNotEmpty(cell66.getStringCellValue())){ + DwAnswer answer193 = new DwAnswer(); + answer193.setAnswer(cell66.getStringCellValue()); + answer193.setInfoId(dwInfo.getId()); + answer193.setQuestionId(84L); + answers.add(answer193); + } + Cell cell67 = row.getCell(67); + if (cell67!=null && StringUtils.isNotEmpty(cell67.getStringCellValue())){ + DwAnswer answer194 = new DwAnswer(); + answer194.setAnswer(cell67.getStringCellValue()); + answer194.setInfoId(dwInfo.getId()); + answer194.setQuestionId(84L); + answers.add(answer194); + } + Cell cell68 = row.getCell(68); + if (cell68!=null && StringUtils.isNotEmpty(cell68.getStringCellValue())){ + DwAnswer answer195 = new DwAnswer(); + answer195.setAnswer(cell68.getStringCellValue()); + answer195.setInfoId(dwInfo.getId()); + answer195.setQuestionId(84L); + answers.add(answer195); + } + Cell cell69 = row.getCell(69); + if (cell69!=null && StringUtils.isNotEmpty(cell69.getStringCellValue())){ + DwAnswer answer196 = new DwAnswer(); + answer196.setAnswer(cell69.getStringCellValue()); + answer196.setInfoId(dwInfo.getId()); + answer196.setQuestionId(84L); + answers.add(answer196); + } DwAnswer answer20 = new DwAnswer(); Cell cell70 = row.getCell(70); answer20.setAnswer(cell70.getStringCellValue()); answer20.setInfoId(dwInfo.getId()); answer20.setQuestionId(85L); answers.add(answer20); - DwAnswer answer21 = new DwAnswer(); Cell cell72 = row.getCell(72); Cell cell73 = row.getCell(73); Cell cell74 = row.getCell(74); Cell cell75 = row.getCell(75); Cell cell76 = row.getCell(76); Cell cell78 = row.getCell(78); - String answer21_str = ""; if (cell72 != null && StringUtils.isNotEmpty(cell72.getStringCellValue())){ - answer21_str = cell72.getStringCellValue() + ","; + DwAnswer answer211 = new DwAnswer(); + answer211.setAnswer(cell72.getStringCellValue()); + answer211.setInfoId(dwInfo.getId()); + answer211.setQuestionId(86L); + answers.add(answer211); } if (cell73 != null && StringUtils.isNotEmpty(cell73.getStringCellValue())){ - answer21_str = cell73.getStringCellValue() + ","; + DwAnswer answer212 = new DwAnswer(); + answer212.setAnswer(cell73.getStringCellValue()); + answer212.setInfoId(dwInfo.getId()); + answer212.setQuestionId(86L); + answers.add(answer212); } if (cell74 != null && StringUtils.isNotEmpty(cell74.getStringCellValue())){ - answer21_str = cell74.getStringCellValue() + ","; + DwAnswer answer213 = new DwAnswer(); + answer213.setAnswer(cell74.getStringCellValue()); + answer213.setInfoId(dwInfo.getId()); + answer213.setQuestionId(86L); + answers.add(answer213); } if (cell75 != null && StringUtils.isNotEmpty(cell75.getStringCellValue())){ - answer21_str = cell75.getStringCellValue() + ","; + DwAnswer answer214 = new DwAnswer(); + answer214.setAnswer(cell75.getStringCellValue()); + answer214.setInfoId(dwInfo.getId()); + answer214.setQuestionId(86L); + answers.add(answer214); } if (cell76 != null && StringUtils.isNotEmpty(cell76.getStringCellValue())){ - answer21_str = cell76.getStringCellValue() + ","; + DwAnswer answer215 = new DwAnswer(); + answer215.setAnswer(cell76.getStringCellValue()); + answer215.setInfoId(dwInfo.getId()); + answer215.setQuestionId(86L); + answers.add(answer215); } if (cell78 != null && StringUtils.isNotEmpty(cell78.getStringCellValue())){ - answer21_str = cell78.getStringCellValue() + ","; + DwAnswer answer216 = new DwAnswer(); + answer216.setAnswer(cell78.getStringCellValue()); + answer216.setInfoId(dwInfo.getId()); + answer216.setQuestionId(86L); + answers.add(answer216); } - answer21.setAnswer(answer21_str.substring(0,answer21_str.length()-1)); - answer21.setInfoId(dwInfo.getId()); - answer21.setQuestionId(86L); - answers.add(answer21); DwAnswer answer22 = new DwAnswer(); Cell cell79 = row.getCell(79); answer22.setAnswer(cell79.getStringCellValue()); diff --git a/ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml b/ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml index 153c3a7..a00ba55 100644 --- a/ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml +++ b/ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml @@ -90,12 +90,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"