diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java index 427b189..62b9ada 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java @@ -8,10 +8,7 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.dw.domain.CheckQuery; import com.ruoyi.dw.domain.DataCheckStatus; -import com.ruoyi.dw.domain.vo.XyCheck; -import com.ruoyi.dw.domain.vo.XyCheckBl; -import com.ruoyi.dw.domain.vo.XyCheckExport; -import com.ruoyi.dw.domain.vo.XyDataCheck; +import com.ruoyi.dw.domain.vo.*; import com.ruoyi.dw.mapper.DataCheckMapper; import com.ruoyi.dw.mapper.XyCheckMapper; import com.ruoyi.dw.util.SortField; @@ -32,10 +29,7 @@ import java.time.LocalDateTime; import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; @RestController @RequestMapping("/xy/check") @@ -53,7 +47,12 @@ public class XyCheckController extends BaseController { */ @GetMapping("/status") public AjaxResult getStatus() { - return AjaxResult.success(dataCheckMapper.getStatus()); + DataCheckStatus cjCheckStatus = dataCheckMapper.getStatus("cj"); + DataCheckStatus dwCheckStatus = dataCheckMapper.getStatus("dw"); + Map map = new HashMap<>(); + map.put("cj", cjCheckStatus); + map.put("dw", dwCheckStatus); + return AjaxResult.success(map); } /** @@ -76,7 +75,31 @@ public class XyCheckController extends BaseController { endTime.set(Calendar.SECOND, 59); endTime.set(Calendar.MILLISECOND, 0); Date endDate = endTime.getTime(); - dataCheckMapper.updateCheck(startDate, endDate,checkStatus.getWeekCheck(),checkStatus.getWeekTimeCheck()); + dataCheckMapper.updateCheck(startDate, endDate,checkStatus.getWeekCheck(),checkStatus.getWeekTimeCheck(),"dw"); + return AjaxResult.success("设置成功"); + } + + /** + * 修改考核状态 + * @return + */ + @PutMapping("/dwStatus") + public AjaxResult updateDwStatus(@RequestBody DataCheckStatus checkStatus) { + Calendar startTime = Calendar.getInstance(); + startTime.setTime(checkStatus.getBeginDate()); + startTime.set(Calendar.HOUR_OF_DAY, 0); + startTime.set(Calendar.MINUTE, 0); + startTime.set(Calendar.SECOND, 0); + startTime.set(Calendar.MILLISECOND, 0); + Date startDate = startTime.getTime(); + Calendar endTime = Calendar.getInstance(); + endTime.setTime(checkStatus.getEndDate()); + endTime.set(Calendar.HOUR_OF_DAY, 23); + endTime.set(Calendar.MINUTE, 59); + endTime.set(Calendar.SECOND, 59); + endTime.set(Calendar.MILLISECOND, 0); + Date endDate = endTime.getTime(); + dataCheckMapper.updateCheck(startDate, endDate,checkStatus.getWeekCheck(),checkStatus.getWeekTimeCheck(),"cj"); return AjaxResult.success("设置成功"); } @@ -86,7 +109,7 @@ public class XyCheckController extends BaseController { */ @GetMapping("/dwCount") public AjaxResult dwCount(CheckQuery checkQuery) { - DataCheckStatus checkStatus = dataCheckMapper.getStatus(); + DataCheckStatus checkStatus = dataCheckMapper.getStatus("dw"); Date beginDate = null; Date endDate = null; if (StringUtils.isNotEmpty(checkQuery.getBeginDate())) { @@ -99,7 +122,30 @@ public class XyCheckController extends BaseController { }else { endDate = checkStatus.getEndDate(); } - return AjaxResult.success(xyCheckMapper.selectXyCheckDw(beginDate, endDate)); + List xyCheckDws = xyCheckMapper.selectXyCheckDw(beginDate, endDate); + List result = XyCheckDwConverter.convertPreserveOrder(xyCheckDws); + if (checkQuery.getSort().intValue() == 1){ + result = XyCheckSorter.sortDwList(result, SortField.DW_COUNT,SortOrder.DESC); + } + return AjaxResult.success(result); + } + + /** + * 根据专业关联表统计各个学院的调查问卷数量 + * @return + */ + @GetMapping("/dwBzCount") + public AjaxResult dwBzCount(CheckQuery checkQuery) { + DataCheckStatus checkStatus = dataCheckMapper.getStatus("dw"); + String[] dates = getWeekRange(checkStatus.getWeekCheck(), checkStatus.getWeekTimeCheck()); + Date date1 = DateUtils.parseDate(dates[0]); + Date date2 = DateUtils.parseDate(dates[1]); + List bzs = xyCheckMapper.selectXyCheckDw(date1, date2); + List result = XyCheckDwConverter.convertPreserveOrder(bzs); + if (checkQuery.getSort().intValue() == 1){ + result = XyCheckSorter.sortDwList(result, SortField.DW_COUNT,SortOrder.DESC); + } + return AjaxResult.success(result); } /** @@ -109,7 +155,7 @@ public class XyCheckController extends BaseController { */ @GetMapping("/zzt") public AjaxResult studentCount(CheckQuery checkQuery) { - DataCheckStatus checkStatus = dataCheckMapper.getStatus(); + DataCheckStatus checkStatus = dataCheckMapper.getStatus("dw"); String[] dates = getWeekRange(checkStatus.getWeekCheck(), checkStatus.getWeekTimeCheck()); Date date1 = DateUtils.parseDate(dates[0]); Date date2 = DateUtils.parseDate(dates[1]); @@ -170,7 +216,7 @@ public class XyCheckController extends BaseController { */ @PostMapping("/export/cj") public void exportCj(HttpServletResponse response) throws IOException { - DataCheckStatus checkStatus = dataCheckMapper.getStatus(); + DataCheckStatus checkStatus = dataCheckMapper.getStatus("dw"); String[] dates = getWeekRange(checkStatus.getWeekCheck(), checkStatus.getWeekTimeCheck()); Date date1 = DateUtils.parseDate(dates[0]); Date date2 = DateUtils.parseDate(dates[1]); @@ -198,7 +244,7 @@ public class XyCheckController extends BaseController { */ @GetMapping("/zxt") public AjaxResult studentCount2(CheckQuery checkQuery) { - DataCheckStatus checkStatus = dataCheckMapper.getStatus(); + DataCheckStatus checkStatus = dataCheckMapper.getStatus("dw"); Date beginDate = null; Date endDate = null; if (StringUtils.isNotEmpty(checkQuery.getBeginDate())) { diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/DataCheckStatus.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/DataCheckStatus.java index d676af6..da60118 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/DataCheckStatus.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/DataCheckStatus.java @@ -23,6 +23,8 @@ public class DataCheckStatus { private String weekTimeCheck; + private String checkType; + public Integer getId() { return id; } @@ -70,4 +72,12 @@ public class DataCheckStatus { public void setWeekTimeCheck(String weekTimeCheck) { this.weekTimeCheck = weekTimeCheck; } + + public String getCheckType() { + return checkType; + } + + public void setCheckType(String checkType) { + this.checkType = checkType; + } } diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyCheckDw.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyCheckDw.java index fb3b215..3a99f80 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyCheckDw.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyCheckDw.java @@ -4,6 +4,8 @@ public class XyCheckDw { private String xy; + private Integer dwId; + private Integer dwCount; public String getXy() { @@ -14,6 +16,14 @@ public class XyCheckDw { this.xy = xy; } + public Integer getDwId() { + return dwId; + } + + public void setDwId(Integer dwId) { + this.dwId = dwId; + } + public Integer getDwCount() { return dwCount; } diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyCheckDwConverter.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyCheckDwConverter.java new file mode 100644 index 0000000..4fcc00c --- /dev/null +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyCheckDwConverter.java @@ -0,0 +1,34 @@ +package com.ruoyi.dw.domain.vo; +import java.util.*; +import java.util.stream.Collectors; + +public class XyCheckDwConverter { + + + public static List convertPreserveOrder(List source) { + if (source == null) return Collections.emptyList(); + + Map linked = new LinkedHashMap<>(); // 保序 + + for (XyCheckDw d : source) { + XyCheckDwOut out = linked.computeIfAbsent(d.getXy(), k -> { + XyCheckDwOut o = new XyCheckDwOut(); + o.setXy(k); + o.setBy5ynCount(0); + o.setBy5ysCount(0); + o.setLtxCount(0); + o.setYrdwCount(0); + return o; + }); + + switch (d.getDwId()) { + case 1: out.setBy5ynCount(out.getBy5ynCount() + d.getDwCount()); break; + case 2: out.setBy5ysCount(out.getBy5ysCount() + d.getDwCount()); break; + case 3: out.setLtxCount(out.getLtxCount() + d.getDwCount()); break; + case 4: out.setYrdwCount(out.getYrdwCount() + d.getDwCount()); break; + } + } + + return new ArrayList<>(linked.values()); + } +} diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyCheckDwOut.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyCheckDwOut.java new file mode 100644 index 0000000..1d88337 --- /dev/null +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyCheckDwOut.java @@ -0,0 +1,58 @@ +package com.ruoyi.dw.domain.vo; + +public class XyCheckDwOut { + + private String xy; + + private Integer by5ynCount; + + private Integer by5ysCount; + + private Integer ltxCount; + + private Integer yrdwCount; + + public String getXy() { + return xy; + } + + public void setXy(String xy) { + this.xy = xy; + } + + public Integer getBy5ynCount() { + return by5ynCount; + } + + public void setBy5ynCount(Integer by5ynCount) { + this.by5ynCount = by5ynCount; + } + + public Integer getBy5ysCount() { + return by5ysCount; + } + + public void setBy5ysCount(Integer by5ysCount) { + this.by5ysCount = by5ysCount; + } + + public Integer getLtxCount() { + return ltxCount; + } + + public void setLtxCount(Integer ltxCount) { + this.ltxCount = ltxCount; + } + + public Integer getYrdwCount() { + return yrdwCount; + } + + public void setYrdwCount(Integer yrdwCount) { + this.yrdwCount = yrdwCount; + } + + public Integer getAllCount(){ + return this.ltxCount + this.by5ynCount + this.by5ysCount + this.yrdwCount; + } +} diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/DataCheckMapper.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/DataCheckMapper.java index caecfd5..5de2495 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/DataCheckMapper.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/DataCheckMapper.java @@ -7,7 +7,7 @@ import java.util.Date; public interface DataCheckMapper { - public DataCheckStatus getStatus(); + public DataCheckStatus getStatus(String checkType); public int startCheck(@Param("checkDate") Date checkDate); @@ -16,5 +16,6 @@ public interface DataCheckMapper { public int updateCheck(@Param("startCheckDate") Date startCheckDate, @Param("endCheckDate") Date endCheckDate, @Param("weekCheck") int weekCheck, - @Param("weekTimeCheck") String weekTimeCheck); + @Param("weekTimeCheck") String weekTimeCheck, + @Param("checkType") String checkType); } 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 5ca130e..c6cfeaa 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 @@ -128,9 +128,23 @@ public class DwQuestionServiceImpl implements IDwQuestionService //第一个调查问卷问题 Row row = sheet.getRow(i); Cell idCell = row.getCell(0); - idCell.setCellType(CellType.STRING); - String id = idCell.getStringCellValue(); - if (redisCache.hasKey(id)){ + String id = ""; + if (idCell != null) { + switch (idCell.getCellType()) { + case STRING: + id = idCell.getStringCellValue(); + break; + case NUMERIC: + id = String.valueOf((long) idCell.getNumericCellValue()); // 防止科学计数法 + break; + case BLANK: + id = ""; + break; + default: + id = ""; + } + } + if (redisCache.hasKey(id)){ continue; } if (dwInfo.getId().intValue() == 1) { @@ -147,12 +161,6 @@ public class DwQuestionServiceImpl implements IDwQuestionService answer111.setInfoId(dwInfo.getId()); answer111.setQuestionId(111L); answers.add(answer111); - Cell cell18 = row.getCell(18); - DwAnswer answer112 = new DwAnswer(); - answer112.setAnswer(cell18.getStringCellValue()); - answer112.setInfoId(dwInfo.getId()); - answer112.setQuestionId(112L); - answers.add(answer112); DwAnswer answer1 = new DwAnswer(); Cell cell17 = row.getCell(17); answer1.setAnswer(cell17.getStringCellValue()); @@ -160,377 +168,378 @@ public class DwQuestionServiceImpl implements IDwQuestionService answer1.setQuestionId(1L); answers.add(answer1); DwAnswer answer2 = new DwAnswer(); - Cell cell19 = row.getCell(19); - answer2.setAnswer(cell19.getStringCellValue()); + Cell cell18 = row.getCell(18); + answer2.setAnswer(cell18.getStringCellValue()); answer2.setInfoId(dwInfo.getId()); answer2.setQuestionId(2L); answers.add(answer2); DwAnswer answer3 = new DwAnswer(); - Cell cell20 = row.getCell(20); - answer3.setAnswer(cell20.getStringCellValue()); + Cell cell19 = row.getCell(19); + answer3.setAnswer(cell19.getStringCellValue()); answer3.setInfoId(dwInfo.getId()); answer3.setQuestionId(3L); answers.add(answer3); DwAnswer answer4 = new DwAnswer(); - Cell cell21 = row.getCell(21); - answer4.setAnswer(cell21.getStringCellValue()); + Cell cell20 = row.getCell(20); + answer4.setAnswer(cell20.getStringCellValue()); answer4.setInfoId(dwInfo.getId()); answer4.setQuestionId(4L); answers.add(answer4); - Cell cell22 = row.getCell(22); - if (cell22 != null){ + Cell cell21 = row.getCell(21); + if (cell21 != null){ DwAnswer answer5 = new DwAnswer(); - answer5.setAnswer(cell22.getStringCellValue()); + answer5.setAnswer(cell21.getStringCellValue()); answer5.setInfoId(dwInfo.getId()); answer5.setQuestionId(5L); answers.add(answer5); } - Cell cell23 = row.getCell(23); - if (cell23 != null){ + Cell cell22 = row.getCell(22); + if (cell22 != null){ DwAnswer answer6 = new DwAnswer(); - answer6.setAnswer(cell23.getStringCellValue()); + answer6.setAnswer(cell22.getStringCellValue()); answer6.setInfoId(dwInfo.getId()); answer6.setQuestionId(6L); answers.add(answer6); } + Cell cell23 = row.getCell(23); Cell cell24 = row.getCell(24); - Cell cell25 = row.getCell(25); - if (cell25 != null && cell24 != null) { + if (cell23 != null && cell24 != null) { DwAnswer answer7 = new DwAnswer(); - if (cell25 != null && StringUtils.isNotEmpty(cell25.getStringCellValue())){ - answer7.setAnswer(cell25.getStringCellValue()); - }else { + if (cell24 != null && StringUtils.isNotEmpty(cell24.getStringCellValue())){ answer7.setAnswer(cell24.getStringCellValue()); + }else { + answer7.setAnswer(cell23.getStringCellValue()); } answer7.setInfoId(dwInfo.getId()); answer7.setQuestionId(7L); answers.add(answer7); } DwAnswer answer8 = new DwAnswer(); + Cell cell25 = row.getCell(25); Cell cell26 = row.getCell(26); - Cell cell27 = row.getCell(27); - if (cell26 != null && cell27 !=null){ - if (StringUtils.isNotEmpty(cell27.getStringCellValue())){ - answer8.setAnswer(cell27.getStringCellValue()); - }else { + if (cell25 != null && cell26 !=null){ + if (StringUtils.isNotEmpty(cell26.getStringCellValue())){ answer8.setAnswer(cell26.getStringCellValue()); + }else { + answer8.setAnswer(cell25.getStringCellValue()); } } answer8.setInfoId(dwInfo.getId()); answer8.setQuestionId(8L); answers.add(answer8); - Cell cell29 = row.getCell(29); - if (cell29 != null && StringUtils.isNotEmpty(cell29.getStringCellValue())){ + Cell cell28 = row.getCell(28); + if (cell28 != null && StringUtils.isNotEmpty(cell28.getStringCellValue())){ DwAnswer answer91 = new DwAnswer(); - answer91.setAnswer(cell29.getStringCellValue()); + answer91.setAnswer(cell28.getStringCellValue()); answer91.setInfoId(dwInfo.getId()); answer91.setQuestionId(9L); answers.add(answer91); } - Cell cell30 = row.getCell(30); - if (cell30 != null && StringUtils.isNotEmpty(cell30.getStringCellValue())){ + Cell cell29 = row.getCell(29); + if (cell29 != null && StringUtils.isNotEmpty(cell29.getStringCellValue())){ DwAnswer answer92 = new DwAnswer(); - answer92.setAnswer(cell30.getStringCellValue()); + answer92.setAnswer(cell29.getStringCellValue()); answer92.setInfoId(dwInfo.getId()); answer92.setQuestionId(9L); answers.add(answer92); } - Cell cell31 = row.getCell(31); - if (cell31 != null && StringUtils.isNotEmpty(cell31.getStringCellValue())){ + Cell cell30 = row.getCell(30); + if (cell30 != null && StringUtils.isNotEmpty(cell30.getStringCellValue())){ DwAnswer answer93 = new DwAnswer(); - answer93.setAnswer(cell31.getStringCellValue()); + answer93.setAnswer(cell30.getStringCellValue()); answer93.setInfoId(dwInfo.getId()); answer93.setQuestionId(9L); answers.add(answer93); } - Cell cell32 = row.getCell(32); - if (cell32 != null && StringUtils.isNotEmpty(cell32.getStringCellValue())){ + Cell cell31 = row.getCell(31); + if (cell31 != null && StringUtils.isNotEmpty(cell31.getStringCellValue())){ DwAnswer answer94 = new DwAnswer(); - answer94.setAnswer(cell32.getStringCellValue()); + answer94.setAnswer(cell31.getStringCellValue()); answer94.setInfoId(dwInfo.getId()); answer94.setQuestionId(9L); answers.add(answer94); } - Cell cell33 = row.getCell(33); - if (cell33 != null && StringUtils.isNotEmpty(cell33.getStringCellValue())){ + Cell cell32 = row.getCell(32); + if (cell32 != null && StringUtils.isNotEmpty(cell32.getStringCellValue())){ DwAnswer answer95 = new DwAnswer(); - answer95.setAnswer(cell33.getStringCellValue()); + answer95.setAnswer(cell32.getStringCellValue()); answer95.setInfoId(dwInfo.getId()); answer95.setQuestionId(9L); answers.add(answer95); } - Cell cell34 = row.getCell(34); - if (cell34 != null && StringUtils.isNotEmpty(cell34.getStringCellValue())){ + Cell cell33 = row.getCell(33); + if (cell33 != null && StringUtils.isNotEmpty(cell33.getStringCellValue())){ DwAnswer answer96 = new DwAnswer(); - answer96.setAnswer(cell34.getStringCellValue()); + answer96.setAnswer(cell33.getStringCellValue()); answer96.setInfoId(dwInfo.getId()); answer96.setQuestionId(9L); answers.add(answer96); } - Cell cell35 = row.getCell(35); - if (cell35 != null && StringUtils.isNotEmpty(cell35.getStringCellValue())){ + Cell cell34 = row.getCell(34); + if (cell34 != null && StringUtils.isNotEmpty(cell34.getStringCellValue())){ DwAnswer answer97 = new DwAnswer(); - answer97.setAnswer(cell35.getStringCellValue()); + answer97.setAnswer(cell34.getStringCellValue()); answer97.setInfoId(dwInfo.getId()); answer97.setQuestionId(9L); answers.add(answer97); } - Cell cell36 = row.getCell(36); - if (cell36 != null && StringUtils.isNotEmpty(cell36.getStringCellValue())){ + Cell cell35 = row.getCell(35); + if (cell35 != null && StringUtils.isNotEmpty(cell35.getStringCellValue())){ DwAnswer answer98 = new DwAnswer(); - answer98.setAnswer(cell36.getStringCellValue()); + answer98.setAnswer(cell35.getStringCellValue()); answer98.setInfoId(dwInfo.getId()); answer98.setQuestionId(9L); answers.add(answer98); } - Cell cell37 = row.getCell(37); - if (cell37 != null && StringUtils.isNotEmpty(cell37.getStringCellValue())){ + Cell cell36 = row.getCell(36); + if (cell36 != null && StringUtils.isNotEmpty(cell36.getStringCellValue())){ DwAnswer answer99 = new DwAnswer(); - answer99.setAnswer(cell37.getStringCellValue()); + answer99.setAnswer(cell36.getStringCellValue()); answer99.setInfoId(dwInfo.getId()); answer99.setQuestionId(9L); answers.add(answer99); } - Cell cell38 = row.getCell(38); - if (cell38 != null && StringUtils.isNotEmpty(cell38.getStringCellValue())){ + Cell cell37 = row.getCell(37); + if (cell37 != null && StringUtils.isNotEmpty(cell37.getStringCellValue())){ DwAnswer answer910 = new DwAnswer(); - answer910.setAnswer(cell38.getStringCellValue()); + answer910.setAnswer(cell37.getStringCellValue()); answer910.setInfoId(dwInfo.getId()); answer910.setQuestionId(9L); answers.add(answer910); } - Cell cell39 = row.getCell(39); + Cell cell38 = row.getCell(38); DwAnswer answer10 = new DwAnswer(); - answer10.setAnswer(cell39.getStringCellValue()); + answer10.setAnswer(cell38.getStringCellValue()); answer10.setInfoId(dwInfo.getId()); answer10.setQuestionId(10L); answers.add(answer10); DwAnswer answer11 = new DwAnswer(); - Cell cell40 = row.getCell(40); - answer11.setAnswer(cell40.getStringCellValue()); + Cell cell39 = row.getCell(39); + answer11.setAnswer(cell39.getStringCellValue()); answer11.setInfoId(dwInfo.getId()); answer11.setQuestionId(11L); answers.add(answer11); - Cell cell41 = row.getCell(41); + Cell cell40 = row.getCell(40); DwAnswer answer12 = new DwAnswer(); - answer12.setAnswer(cell41.getStringCellValue()); + answer12.setAnswer(cell40.getStringCellValue()); answer12.setInfoId(dwInfo.getId()); answer12.setQuestionId(12L); answers.add(answer12); - Cell cell42 = row.getCell(42); + Cell cell41 = row.getCell(41); DwAnswer answer13 = new DwAnswer(); - answer13.setAnswer(cell42.getStringCellValue()); + answer13.setAnswer(cell41.getStringCellValue()); answer13.setInfoId(dwInfo.getId()); answer13.setQuestionId(13L); answers.add(answer13); - Cell cell43 = row.getCell(43); + Cell cell42 = row.getCell(42); DwAnswer answer14 = new DwAnswer(); - answer14.setAnswer(cell43.getStringCellValue()); + answer14.setAnswer(cell42.getStringCellValue()); answer14.setInfoId(dwInfo.getId()); answer14.setQuestionId(14L); answers.add(answer14); DwAnswer answer15 = new DwAnswer(); - Cell cell44 = row.getCell(44); - answer15.setAnswer(cell44.getStringCellValue()); + Cell cell43 = row.getCell(43); + answer15.setAnswer(cell43.getStringCellValue()); answer15.setInfoId(dwInfo.getId()); answer15.setQuestionId(15L); answers.add(answer15); DwAnswer answer16 = new DwAnswer(); + Cell cell44 = row.getCell(44); Cell cell45 = row.getCell(45); - Cell cell46 = row.getCell(46); - if (cell46 != null && StringUtils.isNotEmpty(cell46.getStringCellValue())){ - answer16.setAnswer(cell46.getStringCellValue()); - }else { + if (cell45 != null && StringUtils.isNotEmpty(cell45.getStringCellValue())){ answer16.setAnswer(cell45.getStringCellValue()); + }else { + answer16.setAnswer(cell44.getStringCellValue()); } answer16.setInfoId(dwInfo.getId()); answer16.setQuestionId(16L); answers.add(answer16); DwAnswer answer17 = new DwAnswer(); - Cell cell47 = row.getCell(47); - answer17.setAnswer(cell47.getStringCellValue()); + Cell cell46 = row.getCell(46); + answer17.setAnswer(cell46.getStringCellValue()); answer17.setInfoId(dwInfo.getId()); answer17.setQuestionId(17L); answers.add(answer17); DwAnswer answer18 = new DwAnswer(); - Cell cell48 = row.getCell(48); - answer18.setAnswer(cell48.getStringCellValue()); + Cell cell47 = row.getCell(47); + answer18.setAnswer(cell47.getStringCellValue()); answer18.setInfoId(dwInfo.getId()); answer18.setQuestionId(18L); answers.add(answer18); DwAnswer answer19 = new DwAnswer(); + Cell cell48 = row.getCell(48); Cell cell49 = row.getCell(49); - Cell cell50 = row.getCell(50); - if (cell50 != null && StringUtils.isNotEmpty(cell50.getStringCellValue())){ - answer19.setAnswer(cell50.getStringCellValue()); - }else { + if (cell49 != null && StringUtils.isNotEmpty(cell49.getStringCellValue())){ answer19.setAnswer(cell49.getStringCellValue()); + }else { + answer19.setAnswer(cell48.getStringCellValue()); } answer19.setInfoId(dwInfo.getId()); answer19.setQuestionId(19L); answers.add(answer19); DwAnswer answer20 = new DwAnswer(); - Cell cell51 = row.getCell(51); - answer20.setAnswer(cell51.getStringCellValue()); + Cell cell50 = row.getCell(50); + answer20.setAnswer(cell50.getStringCellValue()); answer20.setInfoId(dwInfo.getId()); answer20.setQuestionId(20L); answers.add(answer20); DwAnswer answer21 = new DwAnswer(); - Cell cell52 = row.getCell(52); - answer21.setAnswer(cell52.getStringCellValue()); + Cell cell51 = row.getCell(51); + answer21.setAnswer(cell51.getStringCellValue()); answer21.setInfoId(dwInfo.getId()); answer21.setQuestionId(21L); answers.add(answer21); - Cell cell54 = row.getCell(54); - if (cell54 != null && StringUtils.isNotEmpty(cell54.getStringCellValue())){ + Cell cell53 = row.getCell(53); + if (cell53 != null && StringUtils.isNotEmpty(cell53.getStringCellValue())){ DwAnswer answer221 = new DwAnswer(); - answer221.setAnswer(cell54.getStringCellValue()); + answer221.setAnswer(cell53.getStringCellValue()); answer221.setInfoId(dwInfo.getId()); answer221.setQuestionId(22L); answers.add(answer221); } - Cell cell55 = row.getCell(55); - if (cell55 != null && StringUtils.isNotEmpty(cell55.getStringCellValue())){ + Cell cell54 = row.getCell(54); + if (cell54 != null && StringUtils.isNotEmpty(cell54.getStringCellValue())){ DwAnswer answer222 = new DwAnswer(); - answer222.setAnswer(cell55.getStringCellValue()); + answer222.setAnswer(cell54.getStringCellValue()); answer222.setInfoId(dwInfo.getId()); answer222.setQuestionId(22L); answers.add(answer222); } - Cell cell56 = row.getCell(56); - if (cell56 != null && StringUtils.isNotEmpty(cell56.getStringCellValue())){ + Cell cell55 = row.getCell(55); + if (cell55 != null && StringUtils.isNotEmpty(cell55.getStringCellValue())){ DwAnswer answer223 = new DwAnswer(); - answer223.setAnswer(cell56.getStringCellValue()); + answer223.setAnswer(cell55.getStringCellValue()); answer223.setInfoId(dwInfo.getId()); answer223.setQuestionId(22L); answers.add(answer223); } - Cell cell57 = row.getCell(57); - if (cell57 != null && StringUtils.isNotEmpty(cell57.getStringCellValue())){ + Cell cell56 = row.getCell(56); + if (cell56 != null && StringUtils.isNotEmpty(cell56.getStringCellValue())){ DwAnswer answer224 = new DwAnswer(); - answer224.setAnswer(cell57.getStringCellValue()); + answer224.setAnswer(cell56.getStringCellValue()); answer224.setInfoId(dwInfo.getId()); answer224.setQuestionId(22L); answers.add(answer224); } - Cell cell58 = row.getCell(58); - if (cell58 != null && StringUtils.isNotEmpty(cell58.getStringCellValue())){ + Cell cell57 = row.getCell(57); + if (cell57 != null && StringUtils.isNotEmpty(cell57.getStringCellValue())){ DwAnswer answer225 = new DwAnswer(); - answer225.setAnswer(cell58.getStringCellValue()); + answer225.setAnswer(cell57.getStringCellValue()); answer225.setInfoId(dwInfo.getId()); answer225.setQuestionId(22L); answers.add(answer225); } - Cell cell59 = row.getCell(59); - if (cell59 != null && StringUtils.isNotEmpty(cell59.getStringCellValue())){ + Cell cell58 = row.getCell(58); + if (cell58 != null && StringUtils.isNotEmpty(cell58.getStringCellValue())){ DwAnswer answer226 = new DwAnswer(); - answer226.setAnswer(cell59.getStringCellValue()); + answer226.setAnswer(cell58.getStringCellValue()); answer226.setInfoId(dwInfo.getId()); answer226.setQuestionId(22L); answers.add(answer226); } - Cell cell60 = row.getCell(60); - if (cell60 != null && StringUtils.isNotEmpty(cell60.getStringCellValue())){ + Cell cell59 = row.getCell(59); + if (cell59 != null && StringUtils.isNotEmpty(cell59.getStringCellValue())){ DwAnswer answer227 = new DwAnswer(); - answer227.setAnswer(cell60.getStringCellValue()); + answer227.setAnswer(cell59.getStringCellValue()); answer227.setInfoId(dwInfo.getId()); answer227.setQuestionId(22L); answers.add(answer227); } + Cell cell60 = row.getCell(60); + if (cell60 != null && StringUtils.isNotEmpty(cell60.getStringCellValue())){ + DwAnswer answer228 = new DwAnswer(); + answer228.setAnswer(cell60.getStringCellValue()); + answer228.setInfoId(dwInfo.getId()); + answer228.setQuestionId(22L); + answers.add(answer228); + } Cell cell61 = row.getCell(61); if (cell61 != null && StringUtils.isNotEmpty(cell61.getStringCellValue())){ - DwAnswer answer228 = new DwAnswer(); - answer228.setAnswer(cell61.getStringCellValue()); - answer228.setInfoId(dwInfo.getId()); - answer228.setQuestionId(22L); - answers.add(answer228); - } - Cell cell62 = row.getCell(62); - if (cell62 != null && StringUtils.isNotEmpty(cell62.getStringCellValue())){ - DwAnswer answer228 = new DwAnswer(); - answer228.setAnswer(cell62.getStringCellValue()); - answer228.setInfoId(dwInfo.getId()); - answer228.setQuestionId(22L); - answers.add(answer228); + DwAnswer answer229 = new DwAnswer(); + answer229.setAnswer(cell61.getStringCellValue()); + answer229.setInfoId(dwInfo.getId()); + answer229.setQuestionId(22L); + answers.add(answer229); } DwAnswer answer23 = new DwAnswer(); - Cell cell63 = row.getCell(63); - answer23.setAnswer(cell63.getStringCellValue()); + Cell cell62 = row.getCell(62); + answer23.setAnswer(cell62.getStringCellValue()); answer23.setInfoId(dwInfo.getId()); answer23.setQuestionId(23L); answers.add(answer23); DwAnswer answer24 = new DwAnswer(); - Cell cell64 = row.getCell(64); - answer24.setAnswer(cell64.getStringCellValue()); + Cell cell63 = row.getCell(63); + answer24.setAnswer(cell63.getStringCellValue()); answer24.setInfoId(dwInfo.getId()); answer24.setQuestionId(24L); answers.add(answer24); DwAnswer answer25 = new DwAnswer(); + Cell cell64 = row.getCell(64); Cell cell65 = row.getCell(65); - Cell cell66 = row.getCell(66); - if (cell66 != null && StringUtils.isNotEmpty(cell66.getStringCellValue())){ - answer25.setAnswer(cell66.getStringCellValue()); - }else { + if (cell65 != null && StringUtils.isNotEmpty(cell65.getStringCellValue())){ answer25.setAnswer(cell65.getStringCellValue()); + }else { + answer25.setAnswer(cell64.getStringCellValue()); } answer25.setInfoId(dwInfo.getId()); answer25.setQuestionId(25L); answers.add(answer25); - Cell cell68 = row.getCell(68); - if (cell68 != null && StringUtils.isNotEmpty(cell68.getStringCellValue())){ + Cell cell67 = row.getCell(67); + if (cell67 != null && StringUtils.isNotEmpty(cell67.getStringCellValue())){ DwAnswer answer261 = new DwAnswer(); - answer261.setAnswer(cell68.getStringCellValue()); + answer261.setAnswer(cell67.getStringCellValue()); answer261.setInfoId(dwInfo.getId()); answer261.setQuestionId(26L); answers.add(answer261); } - Cell cell69 = row.getCell(69); - if (cell69 != null && StringUtils.isNotEmpty(cell69.getStringCellValue())){ + Cell cell68 = row.getCell(68); + if (cell68 != null && StringUtils.isNotEmpty(cell68.getStringCellValue())){ DwAnswer answer262 = new DwAnswer(); - answer262.setAnswer(cell69.getStringCellValue()); + answer262.setAnswer(cell68.getStringCellValue()); answer262.setInfoId(dwInfo.getId()); answer262.setQuestionId(26L); answers.add(answer262); } - Cell cell70 = row.getCell(70); - if (cell70 != null && StringUtils.isNotEmpty(cell70.getStringCellValue())){ + Cell cell69 = row.getCell(69); + if (cell69 != null && StringUtils.isNotEmpty(cell69.getStringCellValue())){ DwAnswer answer263 = new DwAnswer(); - answer263.setAnswer(cell70.getStringCellValue()); + answer263.setAnswer(cell69.getStringCellValue()); answer263.setInfoId(dwInfo.getId()); answer263.setQuestionId(26L); answers.add(answer263); } - Cell cell71 = row.getCell(71); - if (cell71 != null && StringUtils.isNotEmpty(cell71.getStringCellValue())){ + Cell cell70 = row.getCell(70); + if (cell70 != null && StringUtils.isNotEmpty(cell70.getStringCellValue())){ DwAnswer answer264 = new DwAnswer(); - answer264.setAnswer(cell71.getStringCellValue()); + answer264.setAnswer(cell70.getStringCellValue()); answer264.setInfoId(dwInfo.getId()); answer264.setQuestionId(26L); answers.add(answer264); } - Cell cell72 = row.getCell(72); - if (cell72 != null && StringUtils.isNotEmpty(cell72.getStringCellValue())){ + Cell cell71 = row.getCell(71); + if (cell71 != null && StringUtils.isNotEmpty(cell71.getStringCellValue())){ DwAnswer answer265 = new DwAnswer(); - answer265.setAnswer(cell72.getStringCellValue()); + answer265.setAnswer(cell71.getStringCellValue()); answer265.setInfoId(dwInfo.getId()); answer265.setQuestionId(26L); answers.add(answer265); } - Cell cell73 = row.getCell(73); - if (cell73 != null && StringUtils.isNotEmpty(cell73.getStringCellValue())){ + Cell cell72 = row.getCell(72); + if (cell72 != null && StringUtils.isNotEmpty(cell72.getStringCellValue())){ DwAnswer answer266 = new DwAnswer(); - answer266.setAnswer(cell73.getStringCellValue()); + answer266.setAnswer(cell72.getStringCellValue()); answer266.setInfoId(dwInfo.getId()); answer266.setQuestionId(26L); answers.add(answer266); } DwAnswer answer27 = new DwAnswer(); - Cell cell74 = row.getCell(74); - answer27.setAnswer(cell74.getStringCellValue()); + Cell cell73 = row.getCell(73); + answer27.setAnswer(cell73.getStringCellValue()); answer27.setInfoId(dwInfo.getId()); answer27.setQuestionId(27L); answers.add(answer27); DwAnswer answer28 = new DwAnswer(); + Cell cell74 = row.getCell(74); Cell cell75 = row.getCell(75); Cell cell76 = row.getCell(76); Cell cell77 = row.getCell(77); @@ -538,35 +547,34 @@ public class DwQuestionServiceImpl implements IDwQuestionService Cell cell79 = row.getCell(79); Cell cell80 = row.getCell(80); Cell cell81 = row.getCell(81); - Cell cell82 = row.getCell(82); - answer28.setAnswer(cell75.getStringCellValue() +","+cell76.getStringCellValue() - +","+cell77.getStringCellValue() +","+cell78.getStringCellValue() +"," - +cell79.getStringCellValue() +","+cell80.getStringCellValue() +"," - +cell81.getStringCellValue() +","+ cell82.getStringCellValue()); + answer28.setAnswer(cell74.getStringCellValue() +","+cell75.getStringCellValue() + +","+cell76.getStringCellValue() +","+cell77.getStringCellValue() +"," + +cell78.getStringCellValue() +","+cell79.getStringCellValue() +"," + +cell80.getStringCellValue() +","+ cell81.getStringCellValue()); answer28.setInfoId(dwInfo.getId()); answer28.setQuestionId(28L); answers.add(answer28); DwAnswer answer29 = new DwAnswer(); - Cell cell83 = row.getCell(83); - answer29.setAnswer(cell83.getStringCellValue()); + Cell cell82 = row.getCell(82); + answer29.setAnswer(cell82.getStringCellValue()); answer29.setInfoId(dwInfo.getId()); answer29.setQuestionId(29L); answers.add(answer29); DwAnswer answer30 = new DwAnswer(); - Cell cell84 = row.getCell(84); - answer30.setAnswer(cell84.getStringCellValue()); + Cell cell83 = row.getCell(83); + answer30.setAnswer(cell83.getStringCellValue()); answer30.setInfoId(dwInfo.getId()); answer30.setQuestionId(30L); answers.add(answer30); + Cell cell84 = row.getCell(84); Cell cell85 = row.getCell(85); - Cell cell86 = row.getCell(86); - String diqu = cell85.getStringCellValue(); + String diqu = cell84.getStringCellValue(); if (StringUtils.isNotEmpty(diqu)){ int index = diqu.indexOf('，'); if (index != -1) { diqu = diqu.substring(0, index); - if (cell86 != null){ - diqu = diqu + cell86.getStringCellValue(); + if (cell85 != null){ + diqu = diqu + cell85.getStringCellValue(); } DwAnswer answer31 = new DwAnswer(); answer31.setAnswer(diqu); @@ -575,248 +583,249 @@ public class DwQuestionServiceImpl implements IDwQuestionService answers.add(answer31); } } - Cell cell87 = row.getCell(87); + Cell cell86 = row.getCell(86); DwAnswer answer32 = new DwAnswer(); - answer32.setAnswer(cell87.getStringCellValue()); + answer32.setAnswer(cell86.getStringCellValue()); answer32.setInfoId(dwInfo.getId()); answer32.setQuestionId(32L); answers.add(answer32); - Cell cell89 = row.getCell(89); - if (cell89 != null && StringUtils.isNotEmpty(cell89.getStringCellValue())){ + Cell cell88 = row.getCell(88); + if (cell88 != null && StringUtils.isNotEmpty(cell88.getStringCellValue())){ DwAnswer answer331 = new DwAnswer(); - answer331.setAnswer(cell89.getStringCellValue()); + answer331.setAnswer(cell88.getStringCellValue()); answer331.setInfoId(dwInfo.getId()); answer331.setQuestionId(33L); answers.add(answer331); } - Cell cell90 = row.getCell(90); - if (cell90 != null && StringUtils.isNotEmpty(cell90.getStringCellValue())){ + Cell cell89 = row.getCell(89); + if (cell89 != null && StringUtils.isNotEmpty(cell89.getStringCellValue())){ DwAnswer answer332 = new DwAnswer(); - answer332.setAnswer(cell90.getStringCellValue()); + answer332.setAnswer(cell89.getStringCellValue()); answer332.setInfoId(dwInfo.getId()); answer332.setQuestionId(33L); answers.add(answer332); } - Cell cell91 = row.getCell(91); - if (cell91 != null && StringUtils.isNotEmpty(cell91.getStringCellValue())){ + Cell cell90 = row.getCell(90); + if (cell90 != null && StringUtils.isNotEmpty(cell90.getStringCellValue())){ DwAnswer answer333 = new DwAnswer(); - answer333.setAnswer(cell91.getStringCellValue()); + answer333.setAnswer(cell90.getStringCellValue()); answer333.setInfoId(dwInfo.getId()); answer333.setQuestionId(33L); answers.add(answer333); } - Cell cell92 = row.getCell(92); - if (cell92 != null && StringUtils.isNotEmpty(cell92.getStringCellValue())){ + Cell cell91 = row.getCell(91); + if (cell91 != null && StringUtils.isNotEmpty(cell91.getStringCellValue())){ DwAnswer answer334 = new DwAnswer(); - answer334.setAnswer(cell92.getStringCellValue()); + answer334.setAnswer(cell91.getStringCellValue()); answer334.setInfoId(dwInfo.getId()); answer334.setQuestionId(33L); answers.add(answer334); } - Cell cell93 = row.getCell(93); - if (cell93 != null && StringUtils.isNotEmpty(cell93.getStringCellValue())){ + Cell cell92 = row.getCell(92); + if (cell92 != null && StringUtils.isNotEmpty(cell92.getStringCellValue())){ DwAnswer answer335 = new DwAnswer(); - answer335.setAnswer(cell93.getStringCellValue()); + answer335.setAnswer(cell92.getStringCellValue()); answer335.setInfoId(dwInfo.getId()); answer335.setQuestionId(33L); answers.add(answer335); } - Cell cell94 = row.getCell(94); - if (cell94 != null && StringUtils.isNotEmpty(cell94.getStringCellValue())){ + Cell cell93 = row.getCell(93); + if (cell93 != null && StringUtils.isNotEmpty(cell93.getStringCellValue())){ DwAnswer answer336 = new DwAnswer(); - answer336.setAnswer(cell94.getStringCellValue()); + answer336.setAnswer(cell93.getStringCellValue()); answer336.setInfoId(dwInfo.getId()); answer336.setQuestionId(33L); answers.add(answer336); } - Cell cell95 = row.getCell(95); - if (cell95 != null && StringUtils.isNotEmpty(cell95.getStringCellValue())){ + Cell cell94 = row.getCell(94); + if (cell94 != null && StringUtils.isNotEmpty(cell94.getStringCellValue())){ DwAnswer answer337 = new DwAnswer(); - answer337.setAnswer(cell95.getStringCellValue()); + answer337.setAnswer(cell94.getStringCellValue()); answer337.setInfoId(dwInfo.getId()); answer337.setQuestionId(33L); answers.add(answer337); } - Cell cell96 = row.getCell(96); - if (cell96 != null && StringUtils.isNotEmpty(cell96.getStringCellValue())){ + Cell cell95 = row.getCell(95); + if (cell95 != null && StringUtils.isNotEmpty(cell95.getStringCellValue())){ DwAnswer answer338 = new DwAnswer(); - answer338.setAnswer(cell96.getStringCellValue()); + answer338.setAnswer(cell95.getStringCellValue()); answer338.setInfoId(dwInfo.getId()); answer338.setQuestionId(33L); answers.add(answer338); } - Cell cell97 = row.getCell(97); - if (cell97 != null && StringUtils.isNotEmpty(cell97.getStringCellValue())){ + Cell cell96 = row.getCell(96); + if (cell96 != null && StringUtils.isNotEmpty(cell96.getStringCellValue())){ DwAnswer answer339 = new DwAnswer(); - answer339.setAnswer(cell97.getStringCellValue()); + answer339.setAnswer(cell96.getStringCellValue()); answer339.setInfoId(dwInfo.getId()); answer339.setQuestionId(33L); answers.add(answer339); } - Cell cell98 = row.getCell(98); - if (cell98 != null && StringUtils.isNotEmpty(cell98.getStringCellValue())){ + Cell cell97 = row.getCell(97); + if (cell97 != null && StringUtils.isNotEmpty(cell97.getStringCellValue())){ DwAnswer answer3310 = new DwAnswer(); - answer3310.setAnswer(cell98.getStringCellValue()); + answer3310.setAnswer(cell97.getStringCellValue()); answer3310.setInfoId(dwInfo.getId()); answer3310.setQuestionId(33L); answers.add(answer3310); } - Cell cell99 = row.getCell(99); - if (cell99 != null && StringUtils.isNotEmpty(cell99.getStringCellValue())){ + Cell cell98 = row.getCell(98); + if (cell98 != null && StringUtils.isNotEmpty(cell98.getStringCellValue())){ DwAnswer answer3311 = new DwAnswer(); - answer3311.setAnswer(cell99.getStringCellValue()); + answer3311.setAnswer(cell98.getStringCellValue()); answer3311.setInfoId(dwInfo.getId()); answer3311.setQuestionId(33L); answers.add(answer3311); } - Cell cell100 = row.getCell(100); - if (cell100 != null && StringUtils.isNotEmpty(cell100.getStringCellValue())){ + Cell cell99 = row.getCell(99); + if (cell99 != null && StringUtils.isNotEmpty(cell99.getStringCellValue())){ DwAnswer answer3312 = new DwAnswer(); - answer3312.setAnswer(cell100.getStringCellValue()); + answer3312.setAnswer(cell99.getStringCellValue()); answer3312.setInfoId(dwInfo.getId()); answer3312.setQuestionId(33L); answers.add(answer3312); } DwAnswer answer34 = new DwAnswer(); - Cell cell101 = row.getCell(101); - answer34.setAnswer(cell101.getStringCellValue()); + Cell cell100 = row.getCell(100); + answer34.setAnswer(cell100.getStringCellValue()); answer34.setInfoId(dwInfo.getId()); answer34.setQuestionId(34L); answers.add(answer34); DwAnswer answer35 = new DwAnswer(); + Cell cell101 = row.getCell(101); Cell cell102 = row.getCell(102); Cell cell103 = row.getCell(103); Cell cell104 = row.getCell(104); Cell cell105 = row.getCell(105); - Cell cell106 = row.getCell(106); - answer35.setAnswer(cell102.getStringCellValue() +","+cell103.getStringCellValue() - +","+cell104.getStringCellValue() +","+cell105.getStringCellValue() +"," - +cell106.getStringCellValue()); + answer35.setAnswer(cell101.getStringCellValue() +","+cell102.getStringCellValue() + +","+cell103.getStringCellValue() +","+cell104.getStringCellValue() +"," + +cell105.getStringCellValue()); answer35.setInfoId(dwInfo.getId()); answer35.setQuestionId(35L); answers.add(answer35); - Cell cell108 = row.getCell(108); - if (cell108 != null && StringUtils.isNotEmpty(cell108.getStringCellValue())){ + Cell cell107 = row.getCell(107); + if (cell107 != null && StringUtils.isNotEmpty(cell107.getStringCellValue())){ DwAnswer answer361 = new DwAnswer(); - answer361.setAnswer(cell108.getStringCellValue()); + answer361.setAnswer(cell107.getStringCellValue()); answer361.setInfoId(dwInfo.getId()); answer361.setQuestionId(36L); answers.add(answer361); } - Cell cell109 = row.getCell(109); - if (cell109 != null && StringUtils.isNotEmpty(cell109.getStringCellValue())){ + Cell cell108 = row.getCell(108); + if (cell108 != null && StringUtils.isNotEmpty(cell108.getStringCellValue())){ DwAnswer answer362 = new DwAnswer(); - answer362.setAnswer(cell109.getStringCellValue()); + answer362.setAnswer(cell108.getStringCellValue()); answer362.setInfoId(dwInfo.getId()); answer362.setQuestionId(36L); answers.add(answer362); } - Cell cell110 = row.getCell(110); - if (cell110 != null && StringUtils.isNotEmpty(cell110.getStringCellValue())){ + Cell cell109 = row.getCell(109); + if (cell109 != null && StringUtils.isNotEmpty(cell109.getStringCellValue())){ DwAnswer answer363 = new DwAnswer(); - answer363.setAnswer(cell110.getStringCellValue()); + answer363.setAnswer(cell109.getStringCellValue()); answer363.setInfoId(dwInfo.getId()); answer363.setQuestionId(36L); answers.add(answer363); } - Cell cell111 = row.getCell(111); - if (cell111 != null && StringUtils.isNotEmpty(cell111.getStringCellValue())){ + Cell cell110 = row.getCell(110); + if (cell110 != null && StringUtils.isNotEmpty(cell110.getStringCellValue())){ DwAnswer answer364 = new DwAnswer(); - answer364.setAnswer(cell111.getStringCellValue()); + answer364.setAnswer(cell110.getStringCellValue()); answer364.setInfoId(dwInfo.getId()); answer364.setQuestionId(36L); answers.add(answer364); } - Cell cell112 = row.getCell(112); - if (cell112 != null && StringUtils.isNotEmpty(cell112.getStringCellValue())){ + Cell cell111 = row.getCell(111); + if (cell111 != null && StringUtils.isNotEmpty(cell111.getStringCellValue())){ DwAnswer answer365 = new DwAnswer(); - answer365.setAnswer(cell112.getStringCellValue()); + answer365.setAnswer(cell111.getStringCellValue()); answer365.setInfoId(dwInfo.getId()); answer365.setQuestionId(36L); answers.add(answer365); } - Cell cell113 = row.getCell(113); - if (cell113 != null && StringUtils.isNotEmpty(cell113.getStringCellValue())){ + Cell cell112 = row.getCell(112); + if (cell112 != null && StringUtils.isNotEmpty(cell112.getStringCellValue())){ DwAnswer answer366 = new DwAnswer(); - answer366.setAnswer(cell113.getStringCellValue()); + answer366.setAnswer(cell112.getStringCellValue()); answer366.setInfoId(dwInfo.getId()); answer366.setQuestionId(36L); answers.add(answer366); } - Cell cell114 = row.getCell(114); - if (cell114 != null && StringUtils.isNotEmpty(cell114.getStringCellValue())){ + Cell cell113 = row.getCell(113); + if (cell113 != null && StringUtils.isNotEmpty(cell113.getStringCellValue())){ DwAnswer answer367 = new DwAnswer(); - answer367.setAnswer(cell114.getStringCellValue()); + answer367.setAnswer(cell113.getStringCellValue()); answer367.setInfoId(dwInfo.getId()); answer367.setQuestionId(36L); answers.add(answer367); } - Cell cell115 = row.getCell(115); - if (cell115 != null && StringUtils.isNotEmpty(cell115.getStringCellValue())){ + Cell cell114 = row.getCell(114); + if (cell114 != null && StringUtils.isNotEmpty(cell114.getStringCellValue())){ DwAnswer answer368 = new DwAnswer(); - answer368.setAnswer(cell115.getStringCellValue()); + answer368.setAnswer(cell114.getStringCellValue()); answer368.setInfoId(dwInfo.getId()); answer368.setQuestionId(36L); answers.add(answer368); } - Cell cell116 = row.getCell(116); - if (cell116 != null && StringUtils.isNotEmpty(cell116.getStringCellValue())){ + Cell cell115 = row.getCell(115); + if (cell115 != null && StringUtils.isNotEmpty(cell115.getStringCellValue())){ DwAnswer answer369 = new DwAnswer(); - answer369.setAnswer(cell116.getStringCellValue()); + answer369.setAnswer(cell115.getStringCellValue()); answer369.setInfoId(dwInfo.getId()); answer369.setQuestionId(36L); answers.add(answer369); } - Cell cell117 = row.getCell(117); - if (cell117 != null && StringUtils.isNotEmpty(cell117.getStringCellValue())){ + Cell cell116 = row.getCell(116); + if (cell116 != null && StringUtils.isNotEmpty(cell116.getStringCellValue())){ DwAnswer answer3610 = new DwAnswer(); - answer3610.setAnswer(cell117.getStringCellValue()); + answer3610.setAnswer(cell116.getStringCellValue()); answer3610.setInfoId(dwInfo.getId()); answer3610.setQuestionId(36L); answers.add(answer3610); } - Cell cell118 = row.getCell(118); - if (cell118 != null && StringUtils.isNotEmpty(cell118.getStringCellValue())){ + Cell cell117 = row.getCell(117); + if (cell117 != null && StringUtils.isNotEmpty(cell117.getStringCellValue())){ DwAnswer answer3611 = new DwAnswer(); - answer3611.setAnswer(cell118.getStringCellValue()); + answer3611.setAnswer(cell117.getStringCellValue()); answer3611.setInfoId(dwInfo.getId()); answer3611.setQuestionId(36L); answers.add(answer3611); } - Cell cell119 = row.getCell(119); - if (cell119 != null && StringUtils.isNotEmpty(cell119.getStringCellValue())){ + Cell cell118 = row.getCell(118); + if (cell118 != null && StringUtils.isNotEmpty(cell118.getStringCellValue())){ DwAnswer answer3612 = new DwAnswer(); - answer3612.setAnswer(cell119.getStringCellValue()); + answer3612.setAnswer(cell118.getStringCellValue()); answer3612.setInfoId(dwInfo.getId()); answer3612.setQuestionId(36L); answers.add(answer3612); } - Cell cell120 = row.getCell(120); - if (cell120 != null && StringUtils.isNotEmpty(cell120.getStringCellValue())){ + Cell cell119 = row.getCell(119); + if (cell119 != null && StringUtils.isNotEmpty(cell119.getStringCellValue())){ DwAnswer answer3613 = new DwAnswer(); - answer3613.setAnswer(cell120.getStringCellValue()); + answer3613.setAnswer(cell119.getStringCellValue()); answer3613.setInfoId(dwInfo.getId()); answer3613.setQuestionId(36L); answers.add(answer3613); } - Cell cell121 = row.getCell(121); - if (cell121 != null && StringUtils.isNotEmpty(cell121.getStringCellValue())){ + Cell cell120 = row.getCell(120); + if (cell120 != null && StringUtils.isNotEmpty(cell120.getStringCellValue())){ DwAnswer answer3614 = new DwAnswer(); - answer3614.setAnswer(cell121.getStringCellValue()); + answer3614.setAnswer(cell120.getStringCellValue()); answer3614.setInfoId(dwInfo.getId()); answer3614.setQuestionId(36L); answers.add(answer3614); } - Cell cell123 = row.getCell(123); - if (cell123 != null && StringUtils.isNotEmpty(cell123.getStringCellValue())){ + Cell cell122 = row.getCell(122); + if (cell122 != null && StringUtils.isNotEmpty(cell122.getStringCellValue())){ DwAnswer answer3615 = new DwAnswer(); - answer3615.setAnswer(cell123.getStringCellValue()); + answer3615.setAnswer(cell122.getStringCellValue()); answer3615.setInfoId(dwInfo.getId()); answer3615.setQuestionId(36L); answers.add(answer3615); } DwAnswer answer37 = new DwAnswer(); + Cell cell123 = row.getCell(123); Cell cell124 = row.getCell(124); Cell cell125 = row.getCell(125); Cell cell126 = row.getCell(126); @@ -824,88 +833,87 @@ public class DwQuestionServiceImpl implements IDwQuestionService Cell cell128 = row.getCell(128); Cell cell129 = row.getCell(129); Cell cell130 = row.getCell(130); - Cell cell131 = row.getCell(131); - answer37.setAnswer(cell124.getStringCellValue() +","+cell125.getStringCellValue() - +","+cell126.getStringCellValue() +","+cell127.getStringCellValue() +"," - +","+cell128.getStringCellValue() +","+cell129.getStringCellValue() +"," - +","+cell130.getStringCellValue() +","+cell131.getStringCellValue() ); + answer37.setAnswer(cell123.getStringCellValue() +","+cell124.getStringCellValue() + +","+cell125.getStringCellValue() +","+cell126.getStringCellValue() +"," + +","+cell127.getStringCellValue() +","+cell128.getStringCellValue() +"," + +","+cell129.getStringCellValue() +","+cell130.getStringCellValue() ); answer37.setInfoId(dwInfo.getId()); answer37.setQuestionId(37L); answers.add(answer37); - Cell cell133 = row.getCell(133); - if (cell133 != null && StringUtils.isNotEmpty(cell133.getStringCellValue())){ + Cell cell132 = row.getCell(132); + if (cell132 != null && StringUtils.isNotEmpty(cell132.getStringCellValue())){ DwAnswer answer381 = new DwAnswer(); - answer381.setAnswer(cell133.getStringCellValue()); + answer381.setAnswer(cell132.getStringCellValue()); answer381.setInfoId(dwInfo.getId()); answer381.setQuestionId(38L); answers.add(answer381); } - Cell cell134 = row.getCell(134); - if (cell134 != null && StringUtils.isNotEmpty(cell134.getStringCellValue())){ + Cell cell133 = row.getCell(133); + if (cell133 != null && StringUtils.isNotEmpty(cell133.getStringCellValue())){ DwAnswer answer382 = new DwAnswer(); - answer382.setAnswer(cell134.getStringCellValue()); + answer382.setAnswer(cell133.getStringCellValue()); answer382.setInfoId(dwInfo.getId()); answer382.setQuestionId(38L); answers.add(answer382); } - Cell cell135 = row.getCell(135); - if (cell135 != null && StringUtils.isNotEmpty(cell135.getStringCellValue())){ + Cell cell134 = row.getCell(134); + if (cell134 != null && StringUtils.isNotEmpty(cell134.getStringCellValue())){ DwAnswer answer383 = new DwAnswer(); - answer383.setAnswer(cell135.getStringCellValue()); + answer383.setAnswer(cell134.getStringCellValue()); answer383.setInfoId(dwInfo.getId()); answer383.setQuestionId(38L); answers.add(answer383); } - Cell cell136 = row.getCell(136); - if (cell136 != null && StringUtils.isNotEmpty(cell136.getStringCellValue())){ + Cell cell135 = row.getCell(135); + if (cell135 != null && StringUtils.isNotEmpty(cell135.getStringCellValue())){ DwAnswer answer384 = new DwAnswer(); - answer384.setAnswer(cell136.getStringCellValue()); + answer384.setAnswer(cell135.getStringCellValue()); answer384.setInfoId(dwInfo.getId()); answer384.setQuestionId(38L); answers.add(answer384); } - Cell cell137 = row.getCell(137); - if (cell137 != null && StringUtils.isNotEmpty(cell137.getStringCellValue())){ + Cell cell136 = row.getCell(136); + if (cell136 != null && StringUtils.isNotEmpty(cell136.getStringCellValue())){ DwAnswer answer385 = new DwAnswer(); - answer385.setAnswer(cell137.getStringCellValue()); + answer385.setAnswer(cell136.getStringCellValue()); answer385.setInfoId(dwInfo.getId()); answer385.setQuestionId(38L); answers.add(answer385); } - Cell cell138 = row.getCell(138); - if (cell138 != null && StringUtils.isNotEmpty(cell138.getStringCellValue())){ + Cell cell137 = row.getCell(137); + if (cell137 != null && StringUtils.isNotEmpty(cell137.getStringCellValue())){ DwAnswer answer386 = new DwAnswer(); - answer386.setAnswer(cell138.getStringCellValue()); + answer386.setAnswer(cell137.getStringCellValue()); answer386.setInfoId(dwInfo.getId()); answer386.setQuestionId(38L); answers.add(answer386); } DwAnswer answer39 = new DwAnswer(); - Cell cell139 = row.getCell(139); - answer39.setAnswer(cell139.getStringCellValue()); + Cell cell138 = row.getCell(138); + answer39.setAnswer(cell138.getStringCellValue()); answer39.setInfoId(dwInfo.getId()); answer39.setQuestionId(39L); answers.add(answer39); DwAnswer answer40 = new DwAnswer(); + Cell cell139 = row.getCell(139); Cell cell140 = row.getCell(140); Cell cell141 = row.getCell(141); Cell cell142 = row.getCell(142); - Cell cell143 = row.getCell(143); - answer40.setAnswer(cell140.getStringCellValue() +","+cell141.getStringCellValue() - +","+cell142.getStringCellValue() +","+cell143.getStringCellValue() ); + answer40.setAnswer(cell139.getStringCellValue() +","+cell140.getStringCellValue() + +","+cell141.getStringCellValue() +","+cell142.getStringCellValue() ); answer40.setInfoId(dwInfo.getId()); answer40.setQuestionId(40L); answers.add(answer40); DwAnswer answer41 = new DwAnswer(); + Cell cell143 = row.getCell(143); Cell cell144 = row.getCell(144); Cell cell145 = row.getCell(145); Cell cell146 = row.getCell(146); Cell cell147 = row.getCell(147); Cell cell148 = row.getCell(148); - Cell cell149 = row.getCell(149); - answer41.setAnswer(cell144.getStringCellValue() +","+cell145.getStringCellValue() - +","+cell146.getStringCellValue() +","+cell147.getStringCellValue() +"," - +","+cell148.getStringCellValue() +","+cell149.getStringCellValue()); + answer41.setAnswer(cell143.getStringCellValue() +","+cell144.getStringCellValue() + +","+cell145.getStringCellValue() +","+cell146.getStringCellValue() +"," + +","+cell147.getStringCellValue() +","+cell148.getStringCellValue()); answer41.setInfoId(dwInfo.getId()); answer41.setQuestionId(41L); answers.add(answer41); @@ -940,213 +948,215 @@ public class DwQuestionServiceImpl implements IDwQuestionService answer2.setInfoId(dwInfo.getId()); answer2.setQuestionId(43L); answers.add(answer2); - DwAnswer answer118 = new DwAnswer(); - Cell cell20 = row.getCell(20); - answer118.setAnswer(cell20.getStringCellValue()); - answer118.setInfoId(dwInfo.getId()); - answer118.setQuestionId(43L); - answers.add(answer118); DwAnswer answer3 = new DwAnswer(); + Cell cell20 = row.getCell(20); Cell cell21 = row.getCell(21); - Cell cell22 = row.getCell(22); - if (cell22 != null && StringUtils.isNotEmpty(cell22.getStringCellValue())) { - answer3.setAnswer(cell22.getStringCellValue()); - }else { + if (cell21 != null && StringUtils.isNotEmpty(cell21.getStringCellValue())) { answer3.setAnswer(cell21.getStringCellValue()); + }else { + answer3.setAnswer(cell20.getStringCellValue()); } answer3.setInfoId(dwInfo.getId()); answer3.setQuestionId(44L); answers.add(answer3); DwAnswer answer4 = new DwAnswer(); - Cell cell23 = row.getCell(23); - answer4.setAnswer(cell23.getStringCellValue()); + Cell cell22 = row.getCell(22); + answer4.setAnswer(cell22.getStringCellValue()); answer4.setInfoId(dwInfo.getId()); answer4.setQuestionId(45L); answers.add(answer4); DwAnswer answer5 = new DwAnswer(); - Cell cell24 = row.getCell(24); - answer5.setAnswer(cell24.getStringCellValue()); + Cell cell23 = row.getCell(23); + answer5.setAnswer(cell23.getStringCellValue()); answer5.setInfoId(dwInfo.getId()); answer5.setQuestionId(46L); answers.add(answer5); DwAnswer answer6 = new DwAnswer(); - Cell cell25 = row.getCell(25); - answer6.setAnswer(cell25.getStringCellValue()); + Cell cell24 = row.getCell(24); + answer6.setAnswer(cell24.getStringCellValue()); answer6.setInfoId(dwInfo.getId()); answer6.setQuestionId(47L); answers.add(answer6); DwAnswer answer7 = new DwAnswer(); + Cell cell25 = row.getCell(25); Cell cell26 = row.getCell(26); - Cell cell27 = row.getCell(27); - if (cell27 != null && StringUtils.isNotEmpty(cell27.getStringCellValue())) { - answer7.setAnswer(cell27.getStringCellValue()); - }else { + if (cell26 != null && StringUtils.isNotEmpty(cell26.getStringCellValue())) { answer7.setAnswer(cell26.getStringCellValue()); + }else { + answer7.setAnswer(cell25.getStringCellValue()); } answer7.setInfoId(dwInfo.getId()); answer7.setQuestionId(48L); answers.add(answer7); DwAnswer answer8 = new DwAnswer(); - Cell cell28 = row.getCell(28); - answer8.setAnswer(cell28.getStringCellValue()); + Cell cell27 = row.getCell(27); + answer8.setAnswer(cell27.getStringCellValue()); answer8.setInfoId(dwInfo.getId()); answer8.setQuestionId(49L); answers.add(answer8); DwAnswer answer9 = new DwAnswer(); - Cell cell29 = row.getCell(29); - answer9.setAnswer(cell29.getStringCellValue()); + Cell cell28 = row.getCell(28); + answer9.setAnswer(cell28.getStringCellValue()); answer9.setInfoId(dwInfo.getId()); answer9.setQuestionId(50L); answers.add(answer9); - Cell cell31 = row.getCell(31); - if (cell31 != null && StringUtils.isNotEmpty(cell31.getStringCellValue())) { + Cell cell30 = row.getCell(30); + if (cell30 != null && StringUtils.isNotEmpty(cell30.getStringCellValue())) { DwAnswer answer101 = new DwAnswer(); - answer101.setAnswer(cell31.getStringCellValue()); + answer101.setAnswer(cell30.getStringCellValue()); answer101.setInfoId(dwInfo.getId()); answer101.setQuestionId(51L); answers.add(answer101); } - Cell cell32 = row.getCell(32); - if (cell32 != null && StringUtils.isNotEmpty(cell32.getStringCellValue())) { + Cell cell31 = row.getCell(31); + if (cell31 != null && StringUtils.isNotEmpty(cell31.getStringCellValue())) { DwAnswer answer102 = new DwAnswer(); - answer102.setAnswer(cell32.getStringCellValue()); + answer102.setAnswer(cell31.getStringCellValue()); answer102.setInfoId(dwInfo.getId()); answer102.setQuestionId(51L); answers.add(answer102); } - Cell cell33 = row.getCell(33); - if (cell33 != null && StringUtils.isNotEmpty(cell33.getStringCellValue())) { + Cell cell32 = row.getCell(32); + if (cell32 != null && StringUtils.isNotEmpty(cell32.getStringCellValue())) { DwAnswer answer103 = new DwAnswer(); - answer103.setAnswer(cell33.getStringCellValue()); + answer103.setAnswer(cell32.getStringCellValue()); answer103.setInfoId(dwInfo.getId()); answer103.setQuestionId(51L); answers.add(answer103); } - Cell cell34 = row.getCell(34); - if (cell34 != null && StringUtils.isNotEmpty(cell34.getStringCellValue())) { + Cell cell33 = row.getCell(33); + if (cell33 != null && StringUtils.isNotEmpty(cell33.getStringCellValue())) { DwAnswer answer104 = new DwAnswer(); - answer104.setAnswer(cell34.getStringCellValue()); + answer104.setAnswer(cell33.getStringCellValue()); answer104.setInfoId(dwInfo.getId()); answer104.setQuestionId(51L); answers.add(answer104); } - Cell cell35 = row.getCell(35); - if (cell35 != null && StringUtils.isNotEmpty(cell35.getStringCellValue())) { + Cell cell34 = row.getCell(34); + if (cell34 != null && StringUtils.isNotEmpty(cell34.getStringCellValue())) { DwAnswer answer105 = new DwAnswer(); - answer105.setAnswer(cell35.getStringCellValue()); + answer105.setAnswer(cell34.getStringCellValue()); answer105.setInfoId(dwInfo.getId()); answer105.setQuestionId(51L); answers.add(answer105); } - Cell cell36 = row.getCell(36); - if (cell36 != null && StringUtils.isNotEmpty(cell36.getStringCellValue())) { + Cell cell35 = row.getCell(35); + if (cell35 != null && StringUtils.isNotEmpty(cell35.getStringCellValue())) { DwAnswer answer106 = new DwAnswer(); - answer106.setAnswer(cell36.getStringCellValue()); + answer106.setAnswer(cell35.getStringCellValue()); answer106.setInfoId(dwInfo.getId()); answer106.setQuestionId(51L); answers.add(answer106); } - Cell cell37 = row.getCell(37); - if (cell37 != null && StringUtils.isNotEmpty(cell37.getStringCellValue())) { + Cell cell36 = row.getCell(36); + if (cell36 != null && StringUtils.isNotEmpty(cell36.getStringCellValue())) { DwAnswer answer107 = new DwAnswer(); - answer107.setAnswer(cell37.getStringCellValue()); + answer107.setAnswer(cell36.getStringCellValue()); answer107.setInfoId(dwInfo.getId()); answer107.setQuestionId(51L); answers.add(answer107); } - Cell cell38 = row.getCell(38); - if (cell38 != null && StringUtils.isNotEmpty(cell38.getStringCellValue())) { + Cell cell37 = row.getCell(37); + if (cell37 != null && StringUtils.isNotEmpty(cell37.getStringCellValue())) { DwAnswer answer108 = new DwAnswer(); - answer108.setAnswer(cell38.getStringCellValue()); + answer108.setAnswer(cell37.getStringCellValue()); answer108.setInfoId(dwInfo.getId()); answer108.setQuestionId(51L); answers.add(answer108); } - Cell cell39 = row.getCell(39); - if (cell39 != null && StringUtils.isNotEmpty(cell39.getStringCellValue())) { + Cell cell38 = row.getCell(38); + if (cell38 != null && StringUtils.isNotEmpty(cell38.getStringCellValue())) { DwAnswer answer109 = new DwAnswer(); - answer109.setAnswer(cell39.getStringCellValue()); + answer109.setAnswer(cell38.getStringCellValue()); answer109.setInfoId(dwInfo.getId()); answer109.setQuestionId(51L); answers.add(answer109); } - Cell cell40 = row.getCell(40); - if (cell40 != null && StringUtils.isNotEmpty(cell40.getStringCellValue())) { + Cell cell39 = row.getCell(39); + if (cell39 != null && StringUtils.isNotEmpty(cell39.getStringCellValue())) { DwAnswer answer110 = new DwAnswer(); - answer110.setAnswer(cell40.getStringCellValue()); + answer110.setAnswer(cell39.getStringCellValue()); answer110.setInfoId(dwInfo.getId()); answer110.setQuestionId(51L); answers.add(answer110); } - Cell cell41 = row.getCell(41); - if (cell41 != null && StringUtils.isNotEmpty(cell41.getStringCellValue())) { + Cell cell40 = row.getCell(40); + if (cell40 != null && StringUtils.isNotEmpty(cell40.getStringCellValue())) { DwAnswer answer111 = new DwAnswer(); - answer111.setAnswer(cell41.getStringCellValue()); + answer111.setAnswer(cell40.getStringCellValue()); answer111.setInfoId(dwInfo.getId()); answer111.setQuestionId(51L); answers.add(answer111); } - Cell cell42 = row.getCell(42); - if (cell42 != null && StringUtils.isNotEmpty(cell42.getStringCellValue())) { + Cell cell41 = row.getCell(41); + if (cell41 != null && StringUtils.isNotEmpty(cell41.getStringCellValue())) { DwAnswer answer112 = new DwAnswer(); - answer112.setAnswer(cell42.getStringCellValue()); + answer112.setAnswer(cell41.getStringCellValue()); answer112.setInfoId(dwInfo.getId()); answer112.setQuestionId(51L); answers.add(answer112); } DwAnswer answer11 = new DwAnswer(); - Cell cell43 = row.getCell(43); - answer11.setAnswer(cell43.getStringCellValue()); + Cell cell42 = row.getCell(42); + answer11.setAnswer(cell42.getStringCellValue()); answer11.setInfoId(dwInfo.getId()); answer11.setQuestionId(52L); answers.add(answer11); DwAnswer answer12 = new DwAnswer(); - Cell cell44 = row.getCell(44); - answer12.setAnswer(cell44.getStringCellValue()); + Cell cell43 = row.getCell(43); + answer12.setAnswer(cell43.getStringCellValue()); answer12.setInfoId(dwInfo.getId()); answer12.setQuestionId(53L); answers.add(answer12); DwAnswer answer13 = new DwAnswer(); + Cell cell44 = row.getCell(44); Cell cell45 = row.getCell(45); - Cell cell46 = row.getCell(46); - Cell cell47 = row.getCell(47); - answer13.setAnswer(cell45.getStringCellValue() + ","+cell46.getStringCellValue() - + "," +cell47.getStringCellValue()); + Cell cell46 = row.getCell(47); + answer13.setAnswer(cell44.getStringCellValue() + ","+cell45.getStringCellValue() + + "," +cell46.getStringCellValue()); answer13.setInfoId(dwInfo.getId()); answer13.setQuestionId(54L); answers.add(answer13); DwAnswer answer14 = new DwAnswer(); - Cell cell48 = row.getCell(48); - answer14.setAnswer(cell48.getStringCellValue()); + Cell cell47 = row.getCell(47); + answer14.setAnswer(cell47.getStringCellValue()); answer14.setInfoId(dwInfo.getId()); answer14.setQuestionId(55L); answers.add(answer14); DwAnswer answer15 = new DwAnswer(); + Cell cell48 = row.getCell(48); Cell cell49 = row.getCell(49); - Cell cell50 = row.getCell(50); - if (cell50 != null && cell50.getStringCellValue().equals("否")){ + if (cell49 != null && cell49.getStringCellValue().equals("否")){ answer15.setAnswer("否"); }else { - answer15.setAnswer(cell49.getStringCellValue()); + answer15.setAnswer(cell48.getStringCellValue()); } answer15.setInfoId(dwInfo.getId()); answer15.setQuestionId(56L); answers.add(answer15); DwAnswer answer16 = new DwAnswer(); - Cell cell51 = row.getCell(51); - answer16.setAnswer(cell51.getStringCellValue()); + Cell cell50 = row.getCell(50); + answer16.setAnswer(cell50.getStringCellValue()); answer16.setInfoId(dwInfo.getId()); answer16.setQuestionId(57L); answers.add(answer16); DwAnswer answer17 = new DwAnswer(); + Cell cell51 = row.getCell(51); Cell cell52 = row.getCell(52); Cell cell53 = row.getCell(53); - Cell cell54 = row.getCell(54); - answer17.setAnswer(cell52.getStringCellValue() + "," +cell53.getStringCellValue() - + "," +cell54.getStringCellValue()); + answer17.setAnswer(cell51.getStringCellValue() + "," +cell52.getStringCellValue() + + "," +cell53.getStringCellValue()); answer17.setInfoId(dwInfo.getId()); answer17.setQuestionId(58L); answers.add(answer17); + Cell cell55 = row.getCell(55); + if (cell55 != null && StringUtils.isNotEmpty(cell55.getStringCellValue())) { + DwAnswer answer181 = new DwAnswer(); + answer181.setAnswer(cell55.getStringCellValue()); + answer181.setInfoId(dwInfo.getId()); + answer181.setQuestionId(59L); + answers.add(answer181); + } Cell cell56 = row.getCell(56); if (cell56 != null && StringUtils.isNotEmpty(cell56.getStringCellValue())) { DwAnswer answer181 = new DwAnswer(); @@ -1157,184 +1167,176 @@ public class DwQuestionServiceImpl implements IDwQuestionService } 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(59L); - answers.add(answer181); - } - Cell cell58 = row.getCell(58); - if (cell58 != null && StringUtils.isNotEmpty(cell58.getStringCellValue())) { DwAnswer answer182 = new DwAnswer(); - answer182.setAnswer(cell58.getStringCellValue()); + answer182.setAnswer(cell57.getStringCellValue()); answer182.setInfoId(dwInfo.getId()); answer182.setQuestionId(59L); answers.add(answer182); } - Cell cell59 = row.getCell(59); - if (cell59 != null && StringUtils.isNotEmpty(cell59.getStringCellValue())) { + Cell cell58 = row.getCell(58); + if (cell58 != null && StringUtils.isNotEmpty(cell58.getStringCellValue())) { DwAnswer answer183 = new DwAnswer(); - answer183.setAnswer(cell59.getStringCellValue()); + answer183.setAnswer(cell58.getStringCellValue()); answer183.setInfoId(dwInfo.getId()); answer183.setQuestionId(59L); answers.add(answer183); } - Cell cell60 = row.getCell(60); - if (cell60 != null && StringUtils.isNotEmpty(cell60.getStringCellValue())) { + Cell cell59 = row.getCell(59); + if (cell59 != null && StringUtils.isNotEmpty(cell59.getStringCellValue())) { DwAnswer answer184 = new DwAnswer(); - answer184.setAnswer(cell60.getStringCellValue()); + answer184.setAnswer(cell59.getStringCellValue()); answer184.setInfoId(dwInfo.getId()); answer184.setQuestionId(59L); answers.add(answer184); } - Cell cell61 = row.getCell(61); - if (cell61 != null && StringUtils.isNotEmpty(cell61.getStringCellValue())) { + Cell cell60 = row.getCell(60); + if (cell60 != null && StringUtils.isNotEmpty(cell60.getStringCellValue())) { DwAnswer answer185 = new DwAnswer(); - answer185.setAnswer(cell61.getStringCellValue()); + answer185.setAnswer(cell60.getStringCellValue()); answer185.setInfoId(dwInfo.getId()); answer185.setQuestionId(59L); answers.add(answer185); } - Cell cell63 = row.getCell(63); - if (cell63 != null && StringUtils.isNotEmpty(cell63.getStringCellValue())) { + Cell cell62 = row.getCell(62); + if (cell62 != null && StringUtils.isNotEmpty(cell62.getStringCellValue())) { DwAnswer answer186 = new DwAnswer(); - answer186.setAnswer(cell63.getStringCellValue()); + answer186.setAnswer(cell62.getStringCellValue()); answer186.setInfoId(dwInfo.getId()); answer186.setQuestionId(59L); answers.add(answer186); } - Cell cell65 = row.getCell(65); - if (cell65 != null && StringUtils.isNotEmpty(cell65.getStringCellValue())) { + Cell cell64 = row.getCell(64); + if (cell64 != null && StringUtils.isNotEmpty(cell64.getStringCellValue())) { DwAnswer answer192 = new DwAnswer(); - answer192.setAnswer(cell65.getStringCellValue()); + answer192.setAnswer(cell64.getStringCellValue()); answer192.setInfoId(dwInfo.getId()); answer192.setQuestionId(60L); answers.add(answer192); } - Cell cell66 = row.getCell(66); - if (cell66 != null && StringUtils.isNotEmpty(cell66.getStringCellValue())) { + Cell cell65 = row.getCell(65); + if (cell65 != null && StringUtils.isNotEmpty(cell65.getStringCellValue())) { DwAnswer answer193 = new DwAnswer(); - answer193.setAnswer(cell66.getStringCellValue()); + answer193.setAnswer(cell65.getStringCellValue()); answer193.setInfoId(dwInfo.getId()); answer193.setQuestionId(60L); answers.add(answer193); } - Cell cell67 = row.getCell(67); - if (cell67 != null && StringUtils.isNotEmpty(cell67.getStringCellValue())) { + Cell cell66 = row.getCell(66); + if (cell66 != null && StringUtils.isNotEmpty(cell66.getStringCellValue())) { DwAnswer answer194 = new DwAnswer(); - answer194.setAnswer(cell67.getStringCellValue()); + answer194.setAnswer(cell66.getStringCellValue()); answer194.setInfoId(dwInfo.getId()); answer194.setQuestionId(60L); answers.add(answer194); } - Cell cell68 = row.getCell(68); - if (cell68 != null && StringUtils.isNotEmpty(cell68.getStringCellValue())) { + Cell cell67 = row.getCell(67); + if (cell67 != null && StringUtils.isNotEmpty(cell67.getStringCellValue())) { DwAnswer answer195 = new DwAnswer(); - answer195.setAnswer(cell68.getStringCellValue()); + answer195.setAnswer(cell67.getStringCellValue()); answer195.setInfoId(dwInfo.getId()); answer195.setQuestionId(60L); answers.add(answer195); } - Cell cell69 = row.getCell(69); - if (cell69 != null && StringUtils.isNotEmpty(cell69.getStringCellValue())) { + Cell cell68 = row.getCell(68); + if (cell68 != null && StringUtils.isNotEmpty(cell68.getStringCellValue())) { DwAnswer answer196 = new DwAnswer(); - answer196.setAnswer(cell69.getStringCellValue()); + answer196.setAnswer(cell68.getStringCellValue()); answer196.setInfoId(dwInfo.getId()); answer196.setQuestionId(60L); answers.add(answer196); } - Cell cell70 = row.getCell(70); - if (cell70 != null && StringUtils.isNotEmpty(cell70.getStringCellValue())) { + Cell cell69 = row.getCell(69); + if (cell69 != null && StringUtils.isNotEmpty(cell69.getStringCellValue())) { DwAnswer answer197 = new DwAnswer(); - answer197.setAnswer(cell70.getStringCellValue()); + answer197.setAnswer(cell69.getStringCellValue()); answer197.setInfoId(dwInfo.getId()); answer197.setQuestionId(60L); answers.add(answer197); } - Cell cell73 = row.getCell(73); - if (cell73 != null && StringUtils.isNotEmpty(cell73.getStringCellValue())) { + Cell cell72 = row.getCell(72); + if (cell72 != null && StringUtils.isNotEmpty(cell72.getStringCellValue())) { DwAnswer answer201 = new DwAnswer(); - answer201.setAnswer(cell73.getStringCellValue()); + answer201.setAnswer(cell72.getStringCellValue()); answer201.setInfoId(dwInfo.getId()); answer201.setQuestionId(61L); answers.add(answer201); } - Cell cell74 = row.getCell(74); - if (cell74 != null && StringUtils.isNotEmpty(cell74.getStringCellValue())) { + Cell cell73 = row.getCell(73); + if (cell73 != null && StringUtils.isNotEmpty(cell73.getStringCellValue())) { DwAnswer answer202 = new DwAnswer(); - answer202.setAnswer(cell74.getStringCellValue()); + answer202.setAnswer(cell73.getStringCellValue()); answer202.setInfoId(dwInfo.getId()); answer202.setQuestionId(61L); answers.add(answer202); } - Cell cell75 = row.getCell(75); - if (cell75 != null && StringUtils.isNotEmpty(cell75.getStringCellValue())) { + Cell cell74 = row.getCell(74); + if (cell74 != null && StringUtils.isNotEmpty(cell74.getStringCellValue())) { DwAnswer answer203 = new DwAnswer(); - answer203.setAnswer(cell75.getStringCellValue()); + answer203.setAnswer(cell74.getStringCellValue()); answer203.setInfoId(dwInfo.getId()); answer203.setQuestionId(61L); answers.add(answer203); } - Cell cell76 = row.getCell(76); - if (cell76 != null && StringUtils.isNotEmpty(cell76.getStringCellValue())) { + Cell cell75 = row.getCell(75); + if (cell75 != null && StringUtils.isNotEmpty(cell75.getStringCellValue())) { DwAnswer answer204 = new DwAnswer(); - answer204.setAnswer(cell76.getStringCellValue()); + answer204.setAnswer(cell75.getStringCellValue()); answer204.setInfoId(dwInfo.getId()); answer204.setQuestionId(61L); answers.add(answer204); } - Cell cell77 = row.getCell(77); - if (cell77 != null && StringUtils.isNotEmpty(cell77.getStringCellValue())) { + Cell cell76 = row.getCell(76); + if (cell76 != null && StringUtils.isNotEmpty(cell76.getStringCellValue())) { DwAnswer answer205 = new DwAnswer(); - answer205.setAnswer(cell77.getStringCellValue()); + answer205.setAnswer(cell76.getStringCellValue()); answer205.setInfoId(dwInfo.getId()); answer205.setQuestionId(61L); answers.add(answer205); } - Cell cell78 = row.getCell(78); - if (cell78 != null && StringUtils.isNotEmpty(cell78.getStringCellValue())) { + Cell cell77 = row.getCell(77); + if (cell77 != null && StringUtils.isNotEmpty(cell77.getStringCellValue())) { DwAnswer answer206 = new DwAnswer(); - answer206.setAnswer(cell78.getStringCellValue()); + answer206.setAnswer(cell77.getStringCellValue()); answer206.setInfoId(dwInfo.getId()); answer206.setQuestionId(61L); answers.add(answer206); } - Cell cell80 = row.getCell(80); - if (cell80 != null && StringUtils.isNotEmpty(cell80.getStringCellValue())) { + Cell cell79 = row.getCell(79); + if (cell79 != null && StringUtils.isNotEmpty(cell79.getStringCellValue())) { DwAnswer answer207 = new DwAnswer(); - answer207.setAnswer(cell80.getStringCellValue()); + answer207.setAnswer(cell79.getStringCellValue()); answer207.setInfoId(dwInfo.getId()); answer207.setQuestionId(61L); answers.add(answer207); } DwAnswer answer21 = new DwAnswer(); - Cell cell81 = row.getCell(81); - answer21.setAnswer(cell81.getStringCellValue()); + Cell cell80 = row.getCell(80); + answer21.setAnswer(cell80.getStringCellValue()); answer21.setInfoId(dwInfo.getId()); answer21.setQuestionId(62L); answers.add(answer21); DwAnswer answer22 = new DwAnswer(); - Cell cell83 = row.getCell(83); - answer22.setAnswer(cell83.getStringCellValue()); + Cell cell82 = row.getCell(82); + answer22.setAnswer(cell82.getStringCellValue()); answer22.setInfoId(dwInfo.getId()); answer22.setQuestionId(63L); answers.add(answer22); DwAnswer answer23 = new DwAnswer(); + Cell cell83 = row.getCell(83); Cell cell84 = row.getCell(84); - Cell cell85 = row.getCell(85); - if (cell84 != null && cell85 != null) { - if (StringUtils.isNotEmpty(cell85.getStringCellValue())){ - answer23.setAnswer(cell85.getStringCellValue()); - }else { + if (cell83 != null && cell84 != null) { + if (StringUtils.isNotEmpty(cell84.getStringCellValue())){ answer23.setAnswer(cell84.getStringCellValue()); + }else { + answer23.setAnswer(cell83.getStringCellValue()); } answer23.setInfoId(dwInfo.getId()); answer23.setQuestionId(64L); answers.add(answer23); } DwAnswer answer24 = new DwAnswer(); - Cell cell86 = row.getCell(86); - answer24.setAnswer(cell86.getStringCellValue()); + Cell cell85 = row.getCell(85); + answer24.setAnswer(cell85.getStringCellValue()); answer24.setInfoId(dwInfo.getId()); answer24.setQuestionId(65L); answers.add(answer24); @@ -1367,368 +1369,365 @@ public class DwQuestionServiceImpl implements IDwQuestionService Cell cell19 = row.getCell(19); answer5.setAnswer(cell19.getStringCellValue()); answer5.setInfoId(dwInfo.getId()); - answer5.setQuestionId(70L); + answer5.setQuestionId(72L); answers.add(answer5); - DwAnswer answer6 = new DwAnswer(); + Cell cell20 = row.getCell(20); - answer6.setAnswer(cell20.getStringCellValue()); - answer6.setInfoId(dwInfo.getId()); - answer6.setQuestionId(71L); - answers.add(answer6); + if (cell20 != null && StringUtils.isNotEmpty(cell20.getStringCellValue())) { + DwAnswer answer6 = new DwAnswer(); + answer6.setAnswer(cell20.getStringCellValue()); + answer6.setInfoId(dwInfo.getId()); + answer6.setQuestionId(71L); + answers.add(answer6); + } DwAnswer answer7 = new DwAnswer(); Cell cell21 = row.getCell(21); answer7.setAnswer(cell21.getStringCellValue()); answer7.setInfoId(dwInfo.getId()); - answer7.setQuestionId(72L); + answer7.setQuestionId(73L); answers.add(answer7); DwAnswer answer8 = new DwAnswer(); Cell cell22 = row.getCell(22); answer8.setAnswer(cell22.getStringCellValue()); answer8.setInfoId(dwInfo.getId()); - answer8.setQuestionId(73L); + answer8.setQuestionId(74L); answers.add(answer8); - DwAnswer answer9 = new DwAnswer(); - Cell cell23 = row.getCell(23); - answer9.setAnswer(cell23.getStringCellValue()); - answer9.setInfoId(dwInfo.getId()); - answer9.setQuestionId(74L); - answers.add(answer9); - Cell cell25 = row.getCell(25); - if (cell25 != null && StringUtils.isNotEmpty(cell25.getStringCellValue())){ + Cell cell24 = row.getCell(24); + if (cell24 != null && StringUtils.isNotEmpty(cell24.getStringCellValue())){ DwAnswer answer101 = new DwAnswer(); - answer101.setAnswer(cell25.getStringCellValue()); + answer101.setAnswer(cell24.getStringCellValue()); answer101.setInfoId(dwInfo.getId()); answer101.setQuestionId(75L); answers.add(answer101); } - Cell cell26 = row.getCell(26); - if (cell26 != null && StringUtils.isNotEmpty(cell26.getStringCellValue())){ + Cell cell25 = row.getCell(25); + if (cell25 != null && StringUtils.isNotEmpty(cell25.getStringCellValue())){ DwAnswer answer102 = new DwAnswer(); - answer102.setAnswer(cell26.getStringCellValue()); + answer102.setAnswer(cell25.getStringCellValue()); answer102.setInfoId(dwInfo.getId()); answer102.setQuestionId(75L); answers.add(answer102); } - Cell cell27 = row.getCell(27); - if (cell27 != null && StringUtils.isNotEmpty(cell27.getStringCellValue())){ + Cell cell26 = row.getCell(26); + if (cell26 != null && StringUtils.isNotEmpty(cell26.getStringCellValue())){ DwAnswer answer103 = new DwAnswer(); - answer103.setAnswer(cell27.getStringCellValue()); + answer103.setAnswer(cell26.getStringCellValue()); answer103.setInfoId(dwInfo.getId()); answer103.setQuestionId(75L); answers.add(answer103); } - Cell cell28 = row.getCell(28); - if (cell28 != null && StringUtils.isNotEmpty(cell28.getStringCellValue())){ + Cell cell27 = row.getCell(27); + if (cell27 != null && StringUtils.isNotEmpty(cell27.getStringCellValue())){ DwAnswer answer104 = new DwAnswer(); - answer104.setAnswer(cell28.getStringCellValue()); + answer104.setAnswer(cell27.getStringCellValue()); answer104.setInfoId(dwInfo.getId()); answer104.setQuestionId(75L); answers.add(answer104); } - Cell cell29 = row.getCell(29); - if (cell29 != null && StringUtils.isNotEmpty(cell29.getStringCellValue())){ + Cell cell28 = row.getCell(28); + if (cell28 != null && StringUtils.isNotEmpty(cell28.getStringCellValue())){ DwAnswer answer105 = new DwAnswer(); - answer105.setAnswer(cell29.getStringCellValue()); + answer105.setAnswer(cell28.getStringCellValue()); answer105.setInfoId(dwInfo.getId()); answer105.setQuestionId(75L); answers.add(answer105); } - Cell cell31 = row.getCell(31); - if (cell31 != null && StringUtils.isNotEmpty(cell31.getStringCellValue())){ + Cell cell30 = row.getCell(30); + if (cell30 != null && StringUtils.isNotEmpty(cell30.getStringCellValue())){ DwAnswer answer106 = new DwAnswer(); - answer106.setAnswer(cell31.getStringCellValue()); + answer106.setAnswer(cell30.getStringCellValue()); answer106.setInfoId(dwInfo.getId()); answer106.setQuestionId(75L); answers.add(answer106); } - Cell cell33 = row.getCell(33); - if (cell33!=null && StringUtils.isNotEmpty(cell33.getStringCellValue())){ + Cell cell32 = row.getCell(32); + if (cell32!=null && StringUtils.isNotEmpty(cell32.getStringCellValue())){ DwAnswer answer107 = new DwAnswer(); - answer107.setAnswer(cell33.getStringCellValue()); + answer107.setAnswer(cell32.getStringCellValue()); answer107.setInfoId(dwInfo.getId()); answer107.setQuestionId(75L); answers.add(answer107); } DwAnswer answer11 = new DwAnswer(); + Cell cell33 = row.getCell(33); Cell cell34 = row.getCell(34); - Cell cell35 = row.getCell(35); - if (cell35 != null && StringUtils.isNotEmpty(cell35.getStringCellValue())){ - answer11.setAnswer(cell35.getStringCellValue()); - }else { + if (cell34 != null && StringUtils.isNotEmpty(cell34.getStringCellValue())){ answer11.setAnswer(cell34.getStringCellValue()); + }else { + answer11.setAnswer(cell33.getStringCellValue()); } answer11.setInfoId(dwInfo.getId()); answer11.setQuestionId(76L); answers.add(answer11); DwAnswer answer12 = new DwAnswer(); - Cell cell36 = row.getCell(36); - answer12.setAnswer(cell36.getStringCellValue()); + Cell cell35 = row.getCell(35); + answer12.setAnswer(cell35.getStringCellValue()); answer12.setInfoId(dwInfo.getId()); answer12.setQuestionId(77L); answers.add(answer12); DwAnswer answer13 = new DwAnswer(); + Cell cell36 = row.getCell(36); Cell cell37 = row.getCell(37); - Cell cell38 = row.getCell(38); - if (cell38 != null && StringUtils.isNotEmpty(cell38.getStringCellValue())){ - answer13.setAnswer(cell38.getStringCellValue()); - }else { + if (cell37 != null && StringUtils.isNotEmpty(cell37.getStringCellValue())){ answer13.setAnswer(cell37.getStringCellValue()); + }else { + answer13.setAnswer(cell36.getStringCellValue()); } answer13.setInfoId(dwInfo.getId()); answer13.setQuestionId(78L); answers.add(answer13); DwAnswer answer14 = new DwAnswer(); - Cell cell39 = row.getCell(39); - answer14.setAnswer(cell39.getStringCellValue()); + Cell cell38 = row.getCell(38); + answer14.setAnswer(cell38.getStringCellValue()); answer14.setInfoId(dwInfo.getId()); answer14.setQuestionId(79L); answers.add(answer14); + Cell cell40 = row.getCell(40); 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); - if (cell41 != null && StringUtils.isNotEmpty(cell41.getStringCellValue())){ + Cell cell46 = row.getCell(46); + if (cell40 != null && StringUtils.isNotEmpty(cell40.getStringCellValue())){ DwAnswer answer151 = new DwAnswer(); - answer151.setAnswer(cell41.getStringCellValue()); + answer151.setAnswer(cell40.getStringCellValue()); answer151.setInfoId(dwInfo.getId()); answer151.setQuestionId(80L); } - if (cell42 != null && StringUtils.isNotEmpty(cell42.getStringCellValue())){ + if (cell41 != null && StringUtils.isNotEmpty(cell41.getStringCellValue())){ DwAnswer answer152 = new DwAnswer(); - answer152.setAnswer(cell42.getStringCellValue()); + answer152.setAnswer(cell41.getStringCellValue()); answer152.setInfoId(dwInfo.getId()); answer152.setQuestionId(80L); answers.add(answer152); } - if (cell43 != null && StringUtils.isNotEmpty(cell43.getStringCellValue())){ + if (cell42 != null && StringUtils.isNotEmpty(cell42.getStringCellValue())){ DwAnswer answer153 = new DwAnswer(); - answer153.setAnswer(cell43.getStringCellValue()); + answer153.setAnswer(cell42.getStringCellValue()); answer153.setInfoId(dwInfo.getId()); answer153.setQuestionId(80L); answers.add(answer153); } - if (cell44 != null && StringUtils.isNotEmpty(cell44.getStringCellValue())){ + if (cell43 != null && StringUtils.isNotEmpty(cell43.getStringCellValue())){ DwAnswer answer154 = new DwAnswer(); - answer154.setAnswer(cell44.getStringCellValue()); + answer154.setAnswer(cell43.getStringCellValue()); answer154.setInfoId(dwInfo.getId()); answer154.setQuestionId(80L); answers.add(answer154); } - if (cell45 != null && StringUtils.isNotEmpty(cell45.getStringCellValue())){ + if (cell44 != null && StringUtils.isNotEmpty(cell44.getStringCellValue())){ DwAnswer answer155 = new DwAnswer(); - answer155.setAnswer(cell45.getStringCellValue()); + answer155.setAnswer(cell44.getStringCellValue()); answer155.setInfoId(dwInfo.getId()); answer155.setQuestionId(80L); answers.add(answer155); } - if (cell47 != null && StringUtils.isNotEmpty(cell47.getStringCellValue())){ + if (cell46 != null && StringUtils.isNotEmpty(cell46.getStringCellValue())){ DwAnswer answer156 = new DwAnswer(); - answer156.setAnswer(cell47.getStringCellValue()); + answer156.setAnswer(cell46.getStringCellValue()); answer156.setInfoId(dwInfo.getId()); answer156.setQuestionId(80L); answers.add(answer156); } DwAnswer answer16 = new DwAnswer(); - Cell cell48 = row.getCell(48); - answer16.setAnswer(cell48.getStringCellValue()); + Cell cell47 = row.getCell(47); + answer16.setAnswer(cell47.getStringCellValue()); answer16.setInfoId(dwInfo.getId()); answer16.setQuestionId(81L); answers.add(answer16); - Cell cell50 = row.getCell(50); - if (cell50!=null && StringUtils.isNotEmpty(cell50.getStringCellValue())){ + Cell cell49 = row.getCell(49); + if (cell49!=null && StringUtils.isNotEmpty(cell49.getStringCellValue())){ DwAnswer answer171 = new DwAnswer(); - answer171.setAnswer(cell50.getStringCellValue()); + answer171.setAnswer(cell49.getStringCellValue()); answer171.setInfoId(dwInfo.getId()); answer171.setQuestionId(82L); answers.add(answer171); } - Cell cell51 = row.getCell(51); - if (cell51!=null && StringUtils.isNotEmpty(cell51.getStringCellValue())){ + Cell cell50 = row.getCell(50); + if (cell50!=null && StringUtils.isNotEmpty(cell50.getStringCellValue())){ DwAnswer answer172 = new DwAnswer(); - answer172.setAnswer(cell51.getStringCellValue()); + answer172.setAnswer(cell50.getStringCellValue()); answer172.setInfoId(dwInfo.getId()); answer172.setQuestionId(82L); answers.add(answer172); } - Cell cell52 = row.getCell(52); - if (cell52!=null && StringUtils.isNotEmpty(cell52.getStringCellValue())){ + Cell cell51 = row.getCell(51); + if (cell51!=null && StringUtils.isNotEmpty(cell51.getStringCellValue())){ DwAnswer answer173 = new DwAnswer(); - answer173.setAnswer(cell52.getStringCellValue()); + answer173.setAnswer(cell51.getStringCellValue()); answer173.setInfoId(dwInfo.getId()); answer173.setQuestionId(82L); answers.add(answer173); } - Cell cell53 = row.getCell(53); - if (cell53!=null && StringUtils.isNotEmpty(cell53.getStringCellValue())){ + Cell cell52 = row.getCell(52); + if (cell52!=null && StringUtils.isNotEmpty(cell52.getStringCellValue())){ DwAnswer answer174 = new DwAnswer(); - answer174.setAnswer(cell53.getStringCellValue()); + answer174.setAnswer(cell52.getStringCellValue()); answer174.setInfoId(dwInfo.getId()); answer174.setQuestionId(82L); answers.add(answer174); } - Cell cell55 = row.getCell(55); - if (cell55!=null && StringUtils.isNotEmpty(cell55.getStringCellValue())){ + Cell cell54 = row.getCell(54); + if (cell54!=null && StringUtils.isNotEmpty(cell54.getStringCellValue())){ DwAnswer answer175 = new DwAnswer(); - answer175.setAnswer(cell55.getStringCellValue()); + answer175.setAnswer(cell54.getStringCellValue()); answer175.setInfoId(dwInfo.getId()); answer175.setQuestionId(82L); answers.add(answer175); } - Cell cell57 = row.getCell(57); - if (cell57!=null && StringUtils.isNotEmpty(cell57.getStringCellValue())){ + Cell cell56 = row.getCell(56); + if (cell56!=null && StringUtils.isNotEmpty(cell56.getStringCellValue())){ DwAnswer answer181 = new DwAnswer(); - answer181.setAnswer(cell57.getStringCellValue()); + answer181.setAnswer(cell56.getStringCellValue()); answer181.setInfoId(dwInfo.getId()); answer181.setQuestionId(83L); answers.add(answer181); } - Cell cell58 = row.getCell(58); - if (cell58!=null && StringUtils.isNotEmpty(cell58.getStringCellValue())){ + Cell cell57 = row.getCell(57); + if (cell57!=null && StringUtils.isNotEmpty(cell57.getStringCellValue())){ DwAnswer answer182 = new DwAnswer(); - answer182.setAnswer(cell58.getStringCellValue()); + answer182.setAnswer(cell57.getStringCellValue()); answer182.setInfoId(dwInfo.getId()); answer182.setQuestionId(83L); answers.add(answer182); } - Cell cell59 = row.getCell(59); - if (cell59!=null && StringUtils.isNotEmpty(cell59.getStringCellValue())){ + Cell cell58 = row.getCell(58); + if (cell58!=null && StringUtils.isNotEmpty(cell58.getStringCellValue())){ DwAnswer answer183 = new DwAnswer(); - answer183.setAnswer(cell59.getStringCellValue()); + answer183.setAnswer(cell58.getStringCellValue()); answer183.setInfoId(dwInfo.getId()); answer183.setQuestionId(83L); answers.add(answer183); } - Cell cell60 = row.getCell(60); - if (cell60!=null && StringUtils.isNotEmpty(cell60.getStringCellValue())){ + Cell cell59 = row.getCell(59); + if (cell59!=null && StringUtils.isNotEmpty(cell59.getStringCellValue())){ DwAnswer answer184 = new DwAnswer(); - answer184.setAnswer(cell60.getStringCellValue()); + answer184.setAnswer(cell59.getStringCellValue()); answer184.setInfoId(dwInfo.getId()); answer184.setQuestionId(83L); answers.add(answer184); } - Cell cell61 = row.getCell(61); - if (cell61!=null && StringUtils.isNotEmpty(cell61.getStringCellValue())){ + Cell cell60 = row.getCell(60); + if (cell60!=null && StringUtils.isNotEmpty(cell60.getStringCellValue())){ DwAnswer answer185 = new DwAnswer(); - answer185.setAnswer(cell61.getStringCellValue()); + answer185.setAnswer(cell60.getStringCellValue()); answer185.setInfoId(dwInfo.getId()); answer185.setQuestionId(83L); answers.add(answer185); } - Cell cell62 = row.getCell(62); - if (cell62!=null && StringUtils.isNotEmpty(cell62.getStringCellValue())){ + Cell cell61 = row.getCell(61); + if (cell61!=null && StringUtils.isNotEmpty(cell61.getStringCellValue())){ DwAnswer answer186 = new DwAnswer(); - answer186.setAnswer(cell62.getStringCellValue()); + answer186.setAnswer(cell61.getStringCellValue()); answer186.setInfoId(dwInfo.getId()); answer186.setQuestionId(83L); answers.add(answer186); } - Cell cell64 = row.getCell(64); - if (cell64!=null && StringUtils.isNotEmpty(cell64.getStringCellValue())){ + Cell cell63 = row.getCell(63); + if (cell63!=null && StringUtils.isNotEmpty(cell63.getStringCellValue())){ DwAnswer answer191 = new DwAnswer(); - answer191.setAnswer(cell64.getStringCellValue()); + answer191.setAnswer(cell63.getStringCellValue()); answer191.setInfoId(dwInfo.getId()); answer191.setQuestionId(84L); answers.add(answer191); } - Cell cell65 = row.getCell(65); - if (cell65!=null && StringUtils.isNotEmpty(cell65.getStringCellValue())){ + Cell cell64 = row.getCell(64); + if (cell64!=null && StringUtils.isNotEmpty(cell64.getStringCellValue())){ DwAnswer answer192 = new DwAnswer(); - answer192.setAnswer(cell65.getStringCellValue()); + answer192.setAnswer(cell64.getStringCellValue()); answer192.setInfoId(dwInfo.getId()); answer192.setQuestionId(84L); answers.add(answer192); } - Cell cell66 = row.getCell(66); - if (cell66!=null && StringUtils.isNotEmpty(cell66.getStringCellValue())){ + Cell cell65 = row.getCell(65); + if (cell65!=null && StringUtils.isNotEmpty(cell65.getStringCellValue())){ DwAnswer answer193 = new DwAnswer(); - answer193.setAnswer(cell66.getStringCellValue()); + answer193.setAnswer(cell65.getStringCellValue()); answer193.setInfoId(dwInfo.getId()); answer193.setQuestionId(84L); answers.add(answer193); } - Cell cell67 = row.getCell(67); - if (cell67!=null && StringUtils.isNotEmpty(cell67.getStringCellValue())){ + Cell cell66 = row.getCell(66); + if (cell66!=null && StringUtils.isNotEmpty(cell66.getStringCellValue())){ DwAnswer answer194 = new DwAnswer(); - answer194.setAnswer(cell67.getStringCellValue()); + answer194.setAnswer(cell66.getStringCellValue()); answer194.setInfoId(dwInfo.getId()); answer194.setQuestionId(84L); answers.add(answer194); } - Cell cell68 = row.getCell(68); - if (cell68!=null && StringUtils.isNotEmpty(cell68.getStringCellValue())){ + Cell cell67 = row.getCell(67); + if (cell67!=null && StringUtils.isNotEmpty(cell67.getStringCellValue())){ DwAnswer answer195 = new DwAnswer(); - answer195.setAnswer(cell68.getStringCellValue()); + answer195.setAnswer(cell67.getStringCellValue()); answer195.setInfoId(dwInfo.getId()); answer195.setQuestionId(84L); answers.add(answer195); } - Cell cell69 = row.getCell(69); - if (cell69!=null && StringUtils.isNotEmpty(cell69.getStringCellValue())){ + Cell cell68 = row.getCell(68); + if (cell68!=null && StringUtils.isNotEmpty(cell68.getStringCellValue())){ DwAnswer answer196 = new DwAnswer(); - answer196.setAnswer(cell69.getStringCellValue()); + answer196.setAnswer(cell68.getStringCellValue()); answer196.setInfoId(dwInfo.getId()); answer196.setQuestionId(84L); answers.add(answer196); } DwAnswer answer20 = new DwAnswer(); - Cell cell70 = row.getCell(70); - answer20.setAnswer(cell70.getStringCellValue()); + Cell cell69 = row.getCell(69); + answer20.setAnswer(cell69.getStringCellValue()); answer20.setInfoId(dwInfo.getId()); answer20.setQuestionId(85L); answers.add(answer20); + Cell cell71 = row.getCell(71); 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); - if (cell72 != null && StringUtils.isNotEmpty(cell72.getStringCellValue())){ + Cell cell77 = row.getCell(77); + if (cell71 != null && StringUtils.isNotEmpty(cell71.getStringCellValue())){ DwAnswer answer211 = new DwAnswer(); - answer211.setAnswer(cell72.getStringCellValue()); + answer211.setAnswer(cell71.getStringCellValue()); answer211.setInfoId(dwInfo.getId()); answer211.setQuestionId(86L); answers.add(answer211); } - if (cell73 != null && StringUtils.isNotEmpty(cell73.getStringCellValue())){ + if (cell72 != null && StringUtils.isNotEmpty(cell72.getStringCellValue())){ DwAnswer answer212 = new DwAnswer(); - answer212.setAnswer(cell73.getStringCellValue()); + answer212.setAnswer(cell72.getStringCellValue()); answer212.setInfoId(dwInfo.getId()); answer212.setQuestionId(86L); answers.add(answer212); } - if (cell74 != null && StringUtils.isNotEmpty(cell74.getStringCellValue())){ + if (cell73 != null && StringUtils.isNotEmpty(cell73.getStringCellValue())){ DwAnswer answer213 = new DwAnswer(); - answer213.setAnswer(cell74.getStringCellValue()); + answer213.setAnswer(cell73.getStringCellValue()); answer213.setInfoId(dwInfo.getId()); answer213.setQuestionId(86L); answers.add(answer213); } - if (cell75 != null && StringUtils.isNotEmpty(cell75.getStringCellValue())){ + if (cell74 != null && StringUtils.isNotEmpty(cell74.getStringCellValue())){ DwAnswer answer214 = new DwAnswer(); - answer214.setAnswer(cell75.getStringCellValue()); + answer214.setAnswer(cell74.getStringCellValue()); answer214.setInfoId(dwInfo.getId()); answer214.setQuestionId(86L); answers.add(answer214); } - if (cell76 != null && StringUtils.isNotEmpty(cell76.getStringCellValue())){ + if (cell75 != null && StringUtils.isNotEmpty(cell75.getStringCellValue())){ DwAnswer answer215 = new DwAnswer(); - answer215.setAnswer(cell76.getStringCellValue()); + answer215.setAnswer(cell75.getStringCellValue()); answer215.setInfoId(dwInfo.getId()); answer215.setQuestionId(86L); answers.add(answer215); } - if (cell78 != null && StringUtils.isNotEmpty(cell78.getStringCellValue())){ + if (cell77 != null && StringUtils.isNotEmpty(cell77.getStringCellValue())){ DwAnswer answer216 = new DwAnswer(); - answer216.setAnswer(cell78.getStringCellValue()); + answer216.setAnswer(cell77.getStringCellValue()); answer216.setInfoId(dwInfo.getId()); answer216.setQuestionId(86L); answers.add(answer216); } DwAnswer answer22 = new DwAnswer(); - Cell cell79 = row.getCell(79); - answer22.setAnswer(cell79.getStringCellValue()); + Cell cell78 = row.getCell(78); + answer22.setAnswer(cell78.getStringCellValue()); answer22.setInfoId(dwInfo.getId()); answer22.setQuestionId(87L); answers.add(answer22); @@ -1756,192 +1755,211 @@ public class DwQuestionServiceImpl implements IDwQuestionService answer3.setInfoId(dwInfo.getId()); answer3.setQuestionId(90L); answers.add(answer3); - DwAnswer answer4 = new DwAnswer(); Cell cell19 = row.getCell(19); + if (cell19 != null && StringUtils.isNotEmpty(cell19.getStringCellValue())){ + DwAnswer answer41 = new DwAnswer(); + answer41.setAnswer(cell19.getStringCellValue()); + answer41.setInfoId(dwInfo.getId()); + answer41.setQuestionId(91L); + answers.add(answer41); + } Cell cell20 = row.getCell(20); if (cell20 != null && StringUtils.isNotEmpty(cell20.getStringCellValue())){ - answer4.setAnswer(cell20.getStringCellValue()); - }else { - answer4.setAnswer(cell19.getStringCellValue()); + DwAnswer answer42 = new DwAnswer(); + answer42.setAnswer(cell20.getStringCellValue()); + answer42.setInfoId(dwInfo.getId()); + answer42.setQuestionId(91L); + 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); + answers.add(answer43); } - answer4.setInfoId(dwInfo.getId()); - answer4.setQuestionId(91L); - answers.add(answer4); Cell cell22 = row.getCell(22); - if (cell22 != null && StringUtils.isNotEmpty(cell22.getStringCellValue())){ + if (cell22 != null && StringUtils.isNotEmpty(cell22.getStringCellValue())) { + DwAnswer answer44 = new DwAnswer(); + answer44.setAnswer(cell22.getStringCellValue()); + answer44.setInfoId(dwInfo.getId()); + answer44.setQuestionId(91L); + answers.add(answer44); + } + Cell cell24 = row.getCell(24); + if (cell24 != null && StringUtils.isNotEmpty(cell24.getStringCellValue())){ DwAnswer answer201 = new DwAnswer(); - answer201.setAnswer(cell22.getStringCellValue()); + answer201.setAnswer(cell24.getStringCellValue()); answer201.setInfoId(dwInfo.getId()); answer201.setQuestionId(107L); answers.add(answer201); } - Cell cell23 = row.getCell(23); - if (cell23 != null && StringUtils.isNotEmpty(cell23.getStringCellValue())){ + Cell cell25 = row.getCell(25); + if (cell25 != null && StringUtils.isNotEmpty(cell25.getStringCellValue())){ DwAnswer answer202 = new DwAnswer(); - answer202.setAnswer(cell23.getStringCellValue()); + answer202.setAnswer(cell25.getStringCellValue()); answer202.setInfoId(dwInfo.getId()); answer202.setQuestionId(107L); answers.add(answer202); } - Cell cell24 = row.getCell(24); - if (cell24 != null && StringUtils.isNotEmpty(cell24.getStringCellValue())){ + Cell cell26 = row.getCell(26); + if (cell26 != null && StringUtils.isNotEmpty(cell26.getStringCellValue())){ DwAnswer answer203 = new DwAnswer(); - answer203.setAnswer(cell24.getStringCellValue()); + answer203.setAnswer(cell26.getStringCellValue()); answer203.setInfoId(dwInfo.getId()); answer203.setQuestionId(107L); answers.add(answer203); } - Cell cell26 = row.getCell(26); - if (cell26 != null && StringUtils.isNotEmpty(cell26.getStringCellValue())){ + Cell cell28 = row.getCell(28); + if (cell28 != null && StringUtils.isNotEmpty(cell28.getStringCellValue())){ DwAnswer answer211 = new DwAnswer(); - answer211.setAnswer(cell26.getStringCellValue()); + answer211.setAnswer(cell28.getStringCellValue()); answer211.setInfoId(dwInfo.getId()); answer211.setQuestionId(108L); answers.add(answer211); } - Cell cell27 = row.getCell(27); - if (cell27 != null && StringUtils.isNotEmpty(cell27.getStringCellValue())){ + Cell cell29 = row.getCell(29); + if (cell29 != null && StringUtils.isNotEmpty(cell29.getStringCellValue())){ DwAnswer answer212 = new DwAnswer(); - answer212.setAnswer(cell27.getStringCellValue()); + answer212.setAnswer(cell29.getStringCellValue()); answer212.setInfoId(dwInfo.getId()); answer212.setQuestionId(108L); answers.add(answer212); } - Cell cell28 = row.getCell(28); - if (cell28 != null && StringUtils.isNotEmpty(cell28.getStringCellValue())){ + Cell cell30 = row.getCell(30); + if (cell30 != null && StringUtils.isNotEmpty(cell30.getStringCellValue())){ DwAnswer answer213 = new DwAnswer(); - answer213.setAnswer(cell28.getStringCellValue()); + answer213.setAnswer(cell30.getStringCellValue()); answer213.setInfoId(dwInfo.getId()); answer213.setQuestionId(108L); answers.add(answer213); } - Cell cell29 = row.getCell(29); - if (cell29 != null && StringUtils.isNotEmpty(cell29.getStringCellValue())){ + Cell cell31 = row.getCell(31); + if (cell31 != null && StringUtils.isNotEmpty(cell31.getStringCellValue())){ DwAnswer answer214 = new DwAnswer(); - answer214.setAnswer(cell29.getStringCellValue()); + answer214.setAnswer(cell31.getStringCellValue()); answer214.setInfoId(dwInfo.getId()); answer214.setQuestionId(108L); answers.add(answer214); } - Cell cell30 = row.getCell(30); - if (cell30 != null && StringUtils.isNotEmpty(cell30.getStringCellValue())){ + Cell cell32 = row.getCell(32); + if (cell32 != null && StringUtils.isNotEmpty(cell32.getStringCellValue())){ DwAnswer answer215 = new DwAnswer(); - answer215.setAnswer(cell30.getStringCellValue()); + answer215.setAnswer(cell32.getStringCellValue()); answer215.setInfoId(dwInfo.getId()); answer215.setQuestionId(108L); answers.add(answer215); } - Cell cell31 = row.getCell(31); - if (cell31 != null && StringUtils.isNotEmpty(cell31.getStringCellValue())){ + Cell cell33 = row.getCell(33); + if (cell33 != null && StringUtils.isNotEmpty(cell33.getStringCellValue())){ DwAnswer answer216 = new DwAnswer(); - answer216.setAnswer(cell31.getStringCellValue()); + answer216.setAnswer(cell33.getStringCellValue()); answer216.setInfoId(dwInfo.getId()); answer216.setQuestionId(108L); answers.add(answer216); } - Cell cell32 = row.getCell(32); - if (cell32 != null && StringUtils.isNotEmpty(cell32.getStringCellValue())){ + Cell cell34 = row.getCell(34); + if (cell34 != null && StringUtils.isNotEmpty(cell34.getStringCellValue())){ DwAnswer answer51 = new DwAnswer(); - answer51.setAnswer(cell32.getStringCellValue()); + answer51.setAnswer(cell34.getStringCellValue()); answer51.setInfoId(dwInfo.getId()); answer51.setQuestionId(108L); answers.add(answer51); } - Cell cell34 = row.getCell(34); - if (cell34 != null && StringUtils.isNotEmpty(cell34.getStringCellValue())){ + Cell cell36 = row.getCell(36); + if (cell36 != null && StringUtils.isNotEmpty(cell36.getStringCellValue())){ DwAnswer answer52 = new DwAnswer(); - answer52.setAnswer(cell34.getStringCellValue()); + answer52.setAnswer(cell36.getStringCellValue()); answer52.setInfoId(dwInfo.getId()); answer52.setQuestionId(92L); answers.add(answer52); } - Cell cell35 = row.getCell(35); - if (cell35 != null && StringUtils.isNotEmpty(cell35.getStringCellValue())){ + Cell cell37 = row.getCell(37); + if (cell37 != null && StringUtils.isNotEmpty(cell37.getStringCellValue())){ DwAnswer answer53 = new DwAnswer(); - answer53.setAnswer(cell35.getStringCellValue()); + answer53.setAnswer(cell37.getStringCellValue()); answer53.setInfoId(dwInfo.getId()); answer53.setQuestionId(92L); answers.add(answer53); } - Cell cell36 = row.getCell(36); - if (cell36 != null && StringUtils.isNotEmpty(cell36.getStringCellValue())){ + Cell cell38 = row.getCell(38); + if (cell38 != null && StringUtils.isNotEmpty(cell38.getStringCellValue())){ DwAnswer answer54 = new DwAnswer(); - answer54.setAnswer(cell36.getStringCellValue()); + answer54.setAnswer(cell38.getStringCellValue()); answer54.setInfoId(dwInfo.getId()); answer54.setQuestionId(92L); answers.add(answer54); } - Cell cell37 = row.getCell(37); - if (cell37 != null && StringUtils.isNotEmpty(cell37.getStringCellValue())){ + Cell cell39 = row.getCell(39); + if (cell39 != null && StringUtils.isNotEmpty(cell39.getStringCellValue())){ DwAnswer answer55 = new DwAnswer(); - answer55.setAnswer(cell37.getStringCellValue()); + answer55.setAnswer(cell39.getStringCellValue()); answer55.setInfoId(dwInfo.getId()); answer55.setQuestionId(92L); answers.add(answer55); } - Cell cell38 = row.getCell(38); - if (cell38 != null && StringUtils.isNotEmpty(cell38.getStringCellValue())){ + Cell cell40 = row.getCell(40); + if (cell40 != null && StringUtils.isNotEmpty(cell40.getStringCellValue())){ DwAnswer answer56 = new DwAnswer(); - answer56.setAnswer(cell38.getStringCellValue()); + answer56.setAnswer(cell40.getStringCellValue()); answer56.setInfoId(dwInfo.getId()); answer56.setQuestionId(92L); answers.add(answer56); } - Cell cell39 = row.getCell(39); - if (cell39 != null && StringUtils.isNotEmpty(cell39.getStringCellValue())){ + Cell cell41 = row.getCell(41); + if (cell41 != null && StringUtils.isNotEmpty(cell41.getStringCellValue())){ DwAnswer answer57 = new DwAnswer(); - answer57.setAnswer(cell39.getStringCellValue()); + answer57.setAnswer(cell41.getStringCellValue()); answer57.setInfoId(dwInfo.getId()); answer57.setQuestionId(92L); answers.add(answer57); } - Cell cell40 = row.getCell(40); - if (cell40 != null && StringUtils.isNotEmpty(cell40.getStringCellValue())){ + Cell cell42 = row.getCell(42); + if (cell42 != null && StringUtils.isNotEmpty(cell42.getStringCellValue())){ DwAnswer answer58 = new DwAnswer(); - answer58.setAnswer(cell40.getStringCellValue()); + answer58.setAnswer(cell42.getStringCellValue()); answer58.setInfoId(dwInfo.getId()); answer58.setQuestionId(92L); answers.add(answer58); } - Cell cell41 = row.getCell(41); + Cell cell43 = row.getCell(43); DwAnswer answer6 = new DwAnswer(); - answer6.setAnswer(cell41.getStringCellValue()); + answer6.setAnswer(cell43.getStringCellValue()); answer6.setInfoId(dwInfo.getId()); answer6.setQuestionId(93L); answers.add(answer6); DwAnswer answer7 = new DwAnswer(); - Cell cell42 = row.getCell(42); - answer7.setAnswer(cell42.getStringCellValue()); + Cell cell44 = row.getCell(44); + answer7.setAnswer(cell44.getStringCellValue()); answer7.setInfoId(dwInfo.getId()); answer7.setQuestionId(94L); answers.add(answer7); DwAnswer answer8 = new DwAnswer(); - Cell cell43 = row.getCell(43); - answer8.setAnswer(cell43.getStringCellValue()); + Cell cell45 = row.getCell(45); + answer8.setAnswer(cell45.getStringCellValue()); answer8.setInfoId(dwInfo.getId()); answer8.setQuestionId(95L); answers.add(answer8); DwAnswer answer9 = new DwAnswer(); - Cell cell44 = row.getCell(44); - answer9.setAnswer(cell44.getStringCellValue()); + Cell cell46 = row.getCell(46); + answer9.setAnswer(cell46.getStringCellValue()); answer9.setInfoId(dwInfo.getId()); answer9.setQuestionId(96L); answers.add(answer9); DwAnswer answer10 = new DwAnswer(); - Cell cell45 = row.getCell(45); - answer10.setAnswer(cell45.getStringCellValue()); + Cell cell47 = row.getCell(47); + answer10.setAnswer(cell47.getStringCellValue()); answer10.setInfoId(dwInfo.getId()); answer10.setQuestionId(97L); answers.add(answer10); DwAnswer answer11 = new DwAnswer(); - Cell cell46 = row.getCell(46); - answer11.setAnswer(cell46.getStringCellValue()); + Cell cell48 = row.getCell(48); + answer11.setAnswer(cell48.getStringCellValue()); answer11.setInfoId(dwInfo.getId()); answer11.setQuestionId(98L); answers.add(answer11); DwAnswer answer12 = new DwAnswer(); - Cell cell47 = row.getCell(47); - Cell cell48 = row.getCell(48); Cell cell49 = row.getCell(49); Cell cell50 = row.getCell(50); Cell cell51 = row.getCell(51); @@ -1954,70 +1972,72 @@ public class DwQuestionServiceImpl implements IDwQuestionService Cell cell58 = row.getCell(58); Cell cell59 = row.getCell(59); Cell cell60 = row.getCell(60); - answer12.setAnswer(cell47.getStringCellValue() + "," + cell48.getStringCellValue() - + "," + cell49.getStringCellValue() + "," + cell50.getStringCellValue() + Cell cell61 = row.getCell(61); + Cell cell62 = row.getCell(62); + answer12.setAnswer(cell49.getStringCellValue() + "," + cell50.getStringCellValue() + "," + cell51.getStringCellValue() + "," + cell52.getStringCellValue() + "," + cell53.getStringCellValue() + "," + cell54.getStringCellValue() + "," + cell55.getStringCellValue() + "," + cell56.getStringCellValue() + "," + cell57.getStringCellValue() + "," + cell58.getStringCellValue() - + "," + cell59.getStringCellValue() + "," + cell60.getStringCellValue()); + + "," + cell59.getStringCellValue() + "," + cell60.getStringCellValue() + + "," + cell61.getStringCellValue() + "," + cell62.getStringCellValue()); answer12.setInfoId(dwInfo.getId()); answer12.setQuestionId(99L); answers.add(answer12); DwAnswer answer13 = new DwAnswer(); - Cell cell61 = row.getCell(61); - Cell cell62 = row.getCell(62); - if (cell62 != null && StringUtils.isNotEmpty(cell62.getStringCellValue())){ - answer13.setAnswer(cell62.getStringCellValue()); + Cell cell63 = row.getCell(63); + Cell cell64 = row.getCell(64); + if (cell64 != null && StringUtils.isNotEmpty(cell64.getStringCellValue())){ + answer13.setAnswer(cell64.getStringCellValue()); }else { - answer13.setAnswer(cell61.getStringCellValue()); + answer13.setAnswer(cell63.getStringCellValue()); } answer13.setInfoId(dwInfo.getId()); answer13.setQuestionId(100L); answers.add(answer13); DwAnswer answer14 = new DwAnswer(); - Cell cell63 = row.getCell(63); - answer14.setAnswer(cell63.getStringCellValue()); + Cell cell65 = row.getCell(65); + answer14.setAnswer(cell65.getStringCellValue()); answer14.setInfoId(dwInfo.getId()); answer14.setQuestionId(101L); answers.add(answer14); DwAnswer answer15 = new DwAnswer(); - Cell cell64 = row.getCell(64); - Cell cell65 = row.getCell(65); - if (cell65 != null && StringUtils.isNotEmpty(cell65.getStringCellValue())){ - answer15.setAnswer(cell65.getStringCellValue()); + Cell cell66 = row.getCell(66); + Cell cell67 = row.getCell(67); + if (cell67 != null && StringUtils.isNotEmpty(cell67.getStringCellValue())){ + answer15.setAnswer(cell67.getStringCellValue()); }else { - answer15.setAnswer(cell64.getStringCellValue()); + answer15.setAnswer(cell66.getStringCellValue()); } answer15.setInfoId(dwInfo.getId()); answer15.setQuestionId(102L); answers.add(answer15); DwAnswer answer16 = new DwAnswer(); - Cell cell66 = row.getCell(66); - answer16.setAnswer(cell66.getStringCellValue()); + Cell cell68 = row.getCell(68); + answer16.setAnswer(cell68.getStringCellValue()); answer16.setInfoId(dwInfo.getId()); answer16.setQuestionId(103L); answers.add(answer16); DwAnswer answer17 = new DwAnswer(); - Cell cell67 = row.getCell(67); - answer17.setAnswer(cell67.getStringCellValue()); + Cell cell69 = row.getCell(69); + answer17.setAnswer(cell69.getStringCellValue()); answer17.setInfoId(dwInfo.getId()); answer17.setQuestionId(104L); answers.add(answer17); DwAnswer answer18 = new DwAnswer(); - Cell cell68 = row.getCell(68); - Cell cell69 = row.getCell(69); - if (cell69 != null && StringUtils.isNotEmpty(cell69.getStringCellValue())){ - answer18.setAnswer(cell69.getStringCellValue()); + Cell cell70 = row.getCell(70); + Cell cell71 = row.getCell(71); + if (cell71 != null && StringUtils.isNotEmpty(cell71.getStringCellValue())){ + answer18.setAnswer(cell71.getStringCellValue()); }else { - answer18.setAnswer(cell68.getStringCellValue()); + answer18.setAnswer(cell70.getStringCellValue()); } answer18.setInfoId(dwInfo.getId()); answer18.setQuestionId(105L); answers.add(answer18); DwAnswer answer19 = new DwAnswer(); - Cell cell70 = row.getCell(70); - answer19.setAnswer(cell70.getStringCellValue()); + Cell cell72 = row.getCell(72); + answer19.setAnswer(cell72.getStringCellValue()); answer19.setInfoId(dwInfo.getId()); answer19.setQuestionId(106L); answers.add(answer19); diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/util/SortField.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/util/SortField.java index 38d8f9e..29b3eec 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/util/SortField.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/util/SortField.java @@ -5,5 +5,6 @@ public enum SortField { GX_COUNT, YX_COUNT, WX_COUNT, - BZ_COUNT + BZ_COUNT, + DW_COUNT } diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/util/XyCheckSorter.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/util/XyCheckSorter.java index 1fadb6c..e12fa44 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/util/XyCheckSorter.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/util/XyCheckSorter.java @@ -1,6 +1,8 @@ package com.ruoyi.dw.util; import com.ruoyi.dw.domain.vo.XyCheck; +import com.ruoyi.dw.domain.vo.XyCheckDw; +import com.ruoyi.dw.domain.vo.XyCheckDwOut; import java.util.ArrayList; import java.util.Comparator; @@ -51,4 +53,36 @@ public class XyCheckSorter{ sortedList.sort(comparator); return sortedList; } + + /** + * 根据指定字段和排序方式对 XyCheck 列表进行排序 + * + * @param list 原始列表 + * @param sortField 排序字段（ALL_COUNT、GX_COUNT、YX_COUNT、WX_COUNT） + * @param sortOrder 排序方式（ASC 升序 / DESC 降序） + * @return 排序后的列表（新列表，不影响原始数据） + */ + public static List sortDwList(List list, SortField sortField, SortOrder sortOrder) { + if (list == null || list.isEmpty()) { + return new ArrayList<>(); + } + + Comparator comparator = null; + + switch (sortField) { + case DW_COUNT: + comparator = Comparator.comparing(XyCheckDwOut::getAllCount); + break; + default: + throw new IllegalArgumentException("无效的排序字段: " + sortField); + } + + if (sortOrder == SortOrder.DESC) { + comparator = comparator.reversed(); + } + + List sortedList = new ArrayList<>(list); + sortedList.sort(comparator); + return sortedList; + } } \ No newline at end of file diff --git a/ruoyi-dw/src/main/resources/mapper/dw/DataCheckMapper.xml b/ruoyi-dw/src/main/resources/mapper/dw/DataCheckMapper.xml index 7eb9143..115994a 100644 --- a/ruoyi-dw/src/main/resources/mapper/dw/DataCheckMapper.xml +++ b/ruoyi-dw/src/main/resources/mapper/dw/DataCheckMapper.xml @@ -13,8 +13,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select id,check_status,begin_date,end_date,week_check,week_time_check + from data_check_status where check_type = #{checkType} @@ -26,7 +27,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update data_check_status set begin_date = #{startCheckDate},end_date = #{endCheckDate},week_check = #{weekCheck},week_time_check = #{weekTimeCheck} + update data_check_status + set + begin_date = #{startCheckDate}, + end_date = #{endCheckDate}, + week_check = #{weekCheck}, + week_time_check = #{weekTimeCheck} + where check_type = #{checkType} \ No newline at end of file diff --git a/ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml b/ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml index 086d323..bd68610 100644 --- a/ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml +++ b/ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml @@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select answer, count(0) as answer_count from dw_answer where info_id = #{infoId} - and question_id = #{questionId} + and question_id = #{questionId} and answer != '' group by answer diff --git a/ruoyi-dw/src/main/resources/mapper/dw/XyCheckMapper.xml b/ruoyi-dw/src/main/resources/mapper/dw/XyCheckMapper.xml index 796b185..0922f8a 100644 --- a/ruoyi-dw/src/main/resources/mapper/dw/XyCheckMapper.xml +++ b/ruoyi-dw/src/main/resources/mapper/dw/XyCheckMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -14,26 +15,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + \ No newline at end of file