From abaf2b8217862c269b70edd98f51f5adf4a0f2b2 Mon Sep 17 00:00:00 2001 From: liwen Date: Thu, 22 Aug 2024 13:44:10 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E6=96=B0=E5=A2=9E=E5=8D=AB=E7=94=9F?= =?UTF-8?q?=E8=80=83=E6=A0=B8=E8=A1=A8=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safeproduct/constants/SafeProductConstant.java | 1 + .../dto/HygieneEvaluationExportDTO.java | 59 ++++++++++++ .../safeproduct/controller/HygieneController.java | 50 ++++++----- .../safeproduct/service/IHygieneRecordService.java | 7 ++ .../service/impl/HygieneRecordServiceImpl.java | 99 ++++++++++++++++++++- .../com/hnac/hzims/safeproduct/utils/BaseUtil.java | 40 +++++++++ .../main/resources/template/卫生考核表.xlsx | Bin 0 -> 10754 bytes 7 files changed, 231 insertions(+), 25 deletions(-) create mode 100644 hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/HygieneEvaluationExportDTO.java create mode 100644 hzims-service/safeproduct/src/main/resources/template/卫生考核表.xlsx diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/constants/SafeProductConstant.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/constants/SafeProductConstant.java index fd81755..ecff4d7 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/constants/SafeProductConstant.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/constants/SafeProductConstant.java @@ -20,6 +20,7 @@ public interface SafeProductConstant { */ String DOCX_SUFFIX = ".docx"; String PDF_SUFFIX = ".pdf"; + String XLSX_SUFFIX = ".xlsx"; /** * 培训管理 diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/HygieneEvaluationExportDTO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/HygieneEvaluationExportDTO.java new file mode 100644 index 0000000..2987b84 --- /dev/null +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/HygieneEvaluationExportDTO.java @@ -0,0 +1,59 @@ +package com.hnac.hzims.safeproduct.dto; + +import com.hnac.hzims.safeproduct.vo.HygieneEvaluationPeopleVO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author liwen + * @date 2024-08-20 + */ +@Data +@ApiModel(value = "卫生考核导出DTO类") +public class HygieneEvaluationExportDTO { + + @ApiModelProperty(value = "年份") + private String year; + + @ApiModelProperty(value = "月份") + private String month; + + @ApiModelProperty(value = "第一周开始日") + private String firstWeekStart; + + @ApiModelProperty(value = "第一周结束日") + private String firstWeekEnd; + + @ApiModelProperty(value = "第二周开始日") + private String secondWeekStart; + + @ApiModelProperty(value = "第二周结束日") + private String secondWeekEnd; + + @ApiModelProperty(value = "第三周开始日") + private String thirdWeekStart; + + @ApiModelProperty(value = "第三周结束日") + private String thirdWeekEnd; + + @ApiModelProperty(value = "第四周开始日") + private String fourthWeekStart; + + @ApiModelProperty(value = "第四周结束日") + private String fourthWeekEnd; + + @ApiModelProperty(value = "第五周开始日") + private String fifthWeekStart; + + @ApiModelProperty(value = "第五周结束日") + private String fifthWeekEnd; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "考核人员列表") + private List evaluationList; +} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java index 1119951..7ac7509 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java @@ -39,7 +39,7 @@ import java.util.Map; @RestController @AllArgsConstructor @RequestMapping("/hygiene") -@Business(module = Constants.APP_NAME, value = "卫生自查", ignore = false) +@Business(module = Constants.APP_NAME, value = "卫生自查") @Api(value = "卫生自查", tags = "卫生自查接口") public class HygieneController extends BladeController { @@ -52,7 +52,7 @@ public class HygieneController extends BladeController { @PostMapping("/savePlan") @ApiOperation(value = "新增卫生自查计划") @ApiOperationSupport(order = 1) - @Operate(label = "新增卫生自查计划", type = BusinessType.INSERT, ignore = false) + @Operate(label = "新增卫生自查计划", type = BusinessType.INSERT) public R savePlan(@Valid @RequestBody HygienePlanDTO hygienePlanDTO) { return hygienePlanService.savePlan(hygienePlanDTO); } @@ -60,7 +60,7 @@ public class HygieneController extends BladeController { @PostMapping("/updatePlan") @ApiOperation(value = "修改卫生自查计划") @ApiOperationSupport(order = 2) - @Operate(label = "修改卫生自查计划", type = BusinessType.UPDATE, ignore = false) + @Operate(label = "修改卫生自查计划", type = BusinessType.UPDATE) public R updatePlan(@Valid @RequestBody HygienePlanDTO hygienePlanDTO) { return hygienePlanService.updatePlan(hygienePlanDTO); } @@ -68,7 +68,7 @@ public class HygieneController extends BladeController { @PostMapping("/removePlan") @ApiOperation(value = "删除卫生自查计划") @ApiOperationSupport(order = 3) - @Operate(label = "删除卫生自查计划", type = BusinessType.DELETE, ignore = false) + @Operate(label = "删除卫生自查计划", type = BusinessType.DELETE) public R removePlan(@RequestParam Long id) { return R.status(hygienePlanService.removePlan(id)); } @@ -76,7 +76,7 @@ public class HygieneController extends BladeController { @GetMapping("/planDetail") @ApiOperation(value = "卫生自查计划详情") @ApiOperationSupport(order = 4) - @Operate(label = "卫生自查计划详情", type = BusinessType.QUERY, ignore = false) + @Operate(label = "卫生自查计划详情", type = BusinessType.QUERY) public R planDetail(@RequestParam Long id) { return R.data(hygienePlanService.getPlan(id)); } @@ -90,7 +90,7 @@ public class HygieneController extends BladeController { }) @ApiOperation(value = "卫生自查计划分页") @ApiOperationSupport(order = 5) - @Operate(label = "卫生自查计划分页", type = BusinessType.QUERY, ignore = false) + @Operate(label = "卫生自查计划分页", type = BusinessType.QUERY) public R> planPage(@ApiIgnore @RequestParam Map param, Query query) { IPage page = hygienePlanService.planPage(param, query); return R.data(page); @@ -99,7 +99,7 @@ public class HygieneController extends BladeController { @PostMapping("/saveRecord") @ApiOperation(value = "新增卫生自查记录") @ApiOperationSupport(order = 6) - @Operate(label = "新增卫生自查记录", type = BusinessType.INSERT, ignore = false) + @Operate(label = "新增卫生自查记录", type = BusinessType.INSERT) public R saveRecord(@Valid @RequestBody HygieneRecordDTO hygieneRecordDTO) { return hygieneRecordService.saveRecord(hygieneRecordDTO); } @@ -107,7 +107,7 @@ public class HygieneController extends BladeController { @PostMapping("/updateRecord") @ApiOperation(value = "修改卫生自查记录") @ApiOperationSupport(order = 7) - @Operate(label = "修改卫生自查记录", type = BusinessType.UPDATE, ignore = false) + @Operate(label = "修改卫生自查记录", type = BusinessType.UPDATE) public R updateRecord(@Valid @RequestBody HygieneRecordDTO hygieneRecordDTO) { return hygieneRecordService.updateRecord(hygieneRecordDTO); } @@ -115,7 +115,7 @@ public class HygieneController extends BladeController { @PostMapping("/removeRecord") @ApiOperation(value = "删除卫生自查记录") @ApiOperationSupport(order = 8) - @Operate(label = "删除卫生自查记录", type = BusinessType.DELETE, ignore = false) + @Operate(label = "删除卫生自查记录", type = BusinessType.DELETE) public R removeRecord(@RequestParam Long id) { return R.status(hygieneRecordService.removeById(id)); } @@ -123,7 +123,7 @@ public class HygieneController extends BladeController { @GetMapping("/recordDetail") @ApiOperation(value = "卫生自查记录详情") @ApiOperationSupport(order = 9) - @Operate(label = "卫生自查记录详情", type = BusinessType.QUERY, ignore = false) + @Operate(label = "卫生自查记录详情", type = BusinessType.QUERY) public R recordDetail(@RequestParam Long id) { return R.data(hygieneRecordService.getRecordDetail(id)); } @@ -137,7 +137,7 @@ public class HygieneController extends BladeController { }) @ApiOperation(value = "卫生自查记录分页") @ApiOperationSupport(order = 10) - @Operate(label = "卫生自查记录分页", type = BusinessType.QUERY, ignore = false) + @Operate(label = "卫生自查记录分页", type = BusinessType.QUERY) public R> recordPage(@ApiIgnore @RequestParam Map param, Query query) { IPage page = hygieneRecordService.recordPage(param, query); return R.data(page); @@ -146,7 +146,7 @@ public class HygieneController extends BladeController { @GetMapping("/dataByMonth") @ApiOperation(value = "月度统计表") @ApiOperationSupport(order = 11) - @Operate(label = "月度统计表", type = BusinessType.QUERY, ignore = false) + @Operate(label = "月度统计表", type = BusinessType.QUERY) public R> dataByMonth(@RequestParam String month, String unit, Query query) { IPage page = hygienePlanService.dataByMonth(month, unit, query); return R.data(page); @@ -155,7 +155,7 @@ public class HygieneController extends BladeController { @GetMapping("/exportHygieneRecordData") @ApiOperation(value = "卫生自查记录表导出") @ApiOperationSupport(order = 12) - @Operate(label = "卫生自查记录表导出", type = BusinessType.EXPORT, ignore = false) + @Operate(label = "卫生自查记录表导出", type = BusinessType.EXPORT) public void exportHygieneRecordData(@RequestParam Long id, HttpServletResponse response) { hygieneRecordService.exportHygieneRecordData(id, response); } @@ -167,7 +167,7 @@ public class HygieneController extends BladeController { }) @ApiOperation(value = "月度数据导出") @ApiOperationSupport(order = 13) - @Operate(label = "月度数据导出", type = BusinessType.EXPORT, ignore = false) + @Operate(label = "月度数据导出", type = BusinessType.EXPORT) public void exportMonthData(@ApiIgnore @RequestParam Map param, Query query, HttpServletResponse response) { hygienePlanService.exportMonthData(param, query, response); } @@ -181,7 +181,7 @@ public class HygieneController extends BladeController { }) @ApiOperation(value = "卫生自查计划导出") @ApiOperationSupport(order = 14) - @Operate(label = "卫生自查计划导出", type = BusinessType.EXPORT, ignore = false) + @Operate(label = "卫生自查计划导出", type = BusinessType.EXPORT) public void exportHygienePlanData(@ApiIgnore @RequestParam Map param, HttpServletResponse response) { hygienePlanService.exportHygienePlanData(param, response); } @@ -189,7 +189,7 @@ public class HygieneController extends BladeController { @PostMapping("/saveHygieneTemplate") @ApiOperation(value = "新增卫生自查模板") @ApiOperationSupport(order = 15) - @Operate(label = "新增卫生自查模板", type = BusinessType.INSERT, ignore = false) + @Operate(label = "新增卫生自查模板", type = BusinessType.INSERT) public R saveHygieneTemplate(@RequestBody HygieneTemplateDTO hygieneTemplateDTO) { boolean save = hygieneTemplateService.saveHygieneTemplate(hygieneTemplateDTO); return R.status(save); @@ -198,7 +198,7 @@ public class HygieneController extends BladeController { @PostMapping("/updateHygieneTemplate") @ApiOperation(value = "修改卫生自查模板") @ApiOperationSupport(order = 16) - @Operate(label = "修改卫生自查模板", type = BusinessType.UPDATE, ignore = false) + @Operate(label = "修改卫生自查模板", type = BusinessType.UPDATE) public R updateHygieneTemplate(@RequestBody HygieneTemplateDTO hygieneTemplateDTO) { boolean update = hygieneTemplateService.updateHygieneTemplate(hygieneTemplateDTO); return R.status(update); @@ -207,7 +207,7 @@ public class HygieneController extends BladeController { @PostMapping("/removeHygieneTemplate") @ApiOperation(value = "删除卫生自查模板") @ApiOperationSupport(order = 17) - @Operate(label = "删除卫生自查模板", type = BusinessType.DELETE, ignore = false) + @Operate(label = "删除卫生自查模板", type = BusinessType.DELETE) public R removeHygieneTemplate(@RequestParam Long id) { boolean remove = hygieneTemplateService.removeHygieneTemplate(id); return R.status(remove); @@ -216,7 +216,7 @@ public class HygieneController extends BladeController { @GetMapping("/hygieneTemplateDetail") @ApiOperation(value = "卫生自查模板详情") @ApiOperationSupport(order = 18) - @Operate(label = "卫生自查模板详情", type = BusinessType.QUERY, ignore = false) + @Operate(label = "卫生自查模板详情", type = BusinessType.QUERY) public R hygieneTemplateDetail(@RequestParam Long id) { HygieneTemplateDetailVO detail = hygieneTemplateService.getHygieneTemplateDetail(id); return R.data(detail); @@ -225,7 +225,7 @@ public class HygieneController extends BladeController { @GetMapping("/hygieneTemplatePage") @ApiOperation(value = "卫生自查模板分页") @ApiOperationSupport(order = 19) - @Operate(label = "卫生自查模板分页", type = BusinessType.QUERY, ignore = false) + @Operate(label = "卫生自查模板分页", type = BusinessType.QUERY) public R> hygieneTemplatePage(@ApiIgnore @RequestParam Map param, Query query) { IPage page = hygieneTemplateService.getHygieneTemplatePage(param, query); return R.data(page); @@ -240,7 +240,7 @@ public class HygieneController extends BladeController { }) @ApiOperation(value = "卫生月度详情列表") @ApiOperationSupport(order = 20) - @Operate(label = "卫生月度详情列表", type = BusinessType.QUERY, ignore = false) + @Operate(label = "卫生月度详情列表", type = BusinessType.QUERY) public R> detailListByMonth(@ApiIgnore @RequestParam Map param, Query query) { IPage page = hygienePlanService.getDetailListByMonth(param, query); return R.data(page); @@ -254,4 +254,12 @@ public class HygieneController extends BladeController { HygieneEvaluationPageVO page = hygieneRecordService.getEvaluationPage(month); return R.data(page); } + + @GetMapping("/exportEvaluationData") + @ApiOperation(value = "卫生考核数据导出") + @ApiOperationSupport(order = 22) + @Operate(label = "卫生考核数据导出", type = BusinessType.EXPORT) + public void exportEvaluationData(@RequestParam String month, HttpServletResponse response) { + hygieneRecordService.exportEvaluationData(month, response); + } } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IHygieneRecordService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IHygieneRecordService.java index 59152e5..f4f1660 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IHygieneRecordService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IHygieneRecordService.java @@ -78,4 +78,11 @@ public interface IHygieneRecordService extends IService { * @return 考核记录表VO类 */ HygieneEvaluationPageVO getEvaluationPage(String month); + + /** + * 卫生考核数据导出 + * @param month 当前月份 + * @param response 响应类 + */ + void exportEvaluationData(String month, HttpServletResponse response); } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneRecordServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneRecordServiceImpl.java index 755daf7..30db487 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneRecordServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneRecordServiceImpl.java @@ -1,17 +1,24 @@ package com.hnac.hzims.safeproduct.service.impl; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import cn.hutool.core.date.DatePattern; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.common.utils.DateUtil; import com.hnac.hzims.safeproduct.constants.SafeProductConstant; +import com.hnac.hzims.safeproduct.dto.HygieneEvaluationExportDTO; import com.hnac.hzims.safeproduct.dto.HygieneRecordDTO; import com.hnac.hzims.safeproduct.entity.HygienePlanEntity; import com.hnac.hzims.safeproduct.entity.HygieneRecordEntity; import com.hnac.hzims.safeproduct.entity.HygieneZoneEntity; import com.hnac.hzims.safeproduct.enums.RehearsalStatusEnum; +import com.hnac.hzims.safeproduct.hazard.util.ExcelConvertPdf; import com.hnac.hzims.safeproduct.mapper.HygienePlanMapper; import com.hnac.hzims.safeproduct.mapper.HygieneRecordMapper; import com.hnac.hzims.safeproduct.service.IHygieneRecordService; @@ -19,6 +26,9 @@ import com.hnac.hzims.safeproduct.service.IHygieneZoneService; import com.hnac.hzims.safeproduct.utils.BaseUtil; import com.hnac.hzims.safeproduct.vo.*; import com.hnac.hzinfo.exception.HzServiceException; +import com.itextpdf.text.DocumentException; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -32,7 +42,14 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.nio.file.Files; +import java.nio.file.Paths; import java.time.DayOfWeek; import java.time.LocalDate; import java.time.ZoneId; @@ -268,21 +285,21 @@ public class HygieneRecordServiceImpl extends ServiceImpl peopleNameList = baseMapper.selectHygieneZoneByIds(Arrays.asList(zoneIds)); - // 遍历责任区数据 for (int j = 0; j < zoneIds.length; j++) { List scoreList = new ArrayList<>(); HygieneEvaluationPeopleVO peopleVO = new HygieneEvaluationPeopleVO(); + // 查询责任区的负责人名称 String zoneId = zoneIds[j]; Optional zoneOptional = peopleNameList.stream().filter(x -> x.getId().equals(Long.valueOf(zoneId))).findFirst(); if (zoneOptional.isPresent()) { + // 卫生记录周数 Integer weekNo = hygieneRecordEntity.getWeekNum(); - // 考核人名称 + // 负责人名称 String principal = zoneOptional.get().getPrincipal(); - // 判断单位内该名称是否已存在 + // 判断单位内该名称是否已存在，存在则补充新的考核分数据，否则新增其考核分数据 Optional checkPeople = evaluationList.stream().filter(x -> x.getPrincipal().equals(principal) && x.getUnit().equals(hygieneRecordEntity.getUnit())).findFirst(); - if (checkPeople.isPresent()) { peopleVO = checkPeople.get(); scoreList = peopleVO.getScoreList(); @@ -307,11 +324,85 @@ public class HygieneRecordServiceImpl extends ServiceImpl weekList = page.getWeekList(); + weekList.forEach(week -> { + String start = DateUtil.format(week.getStartDate(), "yyyy-MM-dd"); + start = start.substring(start.indexOf("-") + 1); + String end = DateUtil.format(week.getEndDate(), "yyyy-MM-dd"); + end = end.substring(end.indexOf("-") + 1); + switch (week.getWeekNum()) { + case 1: + exportDTO.setFirstWeekStart(start); + exportDTO.setFirstWeekEnd(end); + break; + case 2: + exportDTO.setSecondWeekStart(start); + exportDTO.setSecondWeekEnd(end); + break; + case 3: + exportDTO.setThirdWeekStart(start); + exportDTO.setThirdWeekEnd(end); + break; + case 4: + exportDTO.setFourthWeekStart(start); + exportDTO.setFourthWeekEnd(end); + break; + case 5: + exportDTO.setFifthWeekStart(start); + exportDTO.setFifthWeekEnd(end); + break; + } + }); + // 考核人员数据 + exportDTO.setEvaluationList(page.getEvaluationList()); + // 封装参数 + Map params = BaseUtil.obj2Map(exportDTO); + TemplateExportParams templateParams = new TemplateExportParams("template/卫生考核表.xlsx", true); + // 导出 + try { + String fileName = URLEncoder.encode("卫生考核表.xlsx", "UTF-8"); + response.setHeader("Content-Disposition", "attachment; filename=" + fileName); + response.setContentType("application/vnd.ms-excel;charset=utf-8"); + Workbook workbook = ExcelExportUtil.exportExcel(templateParams, params); + Sheet sheet = workbook.getSheetAt(0); + BaseUtil.mergeCell(0, 0, JSONArray.parseArray(JSON.toJSONString(exportDTO)), "unit").forEach(sheet::addMergedRegion); + BaseUtil.mergeCell(0, 7, JSONArray.parseArray(JSON.toJSONString(exportDTO)), "remark").forEach(sheet::addMergedRegion); + String pdfPath = "D://" + "/卫生考核表" + SafeProductConstant.PDF_SUFFIX; + OutputStream outputStream = Files.newOutputStream(Paths.get(pdfPath)); + ExcelConvertPdf.excelConvertPdf(workbook, outputStream); + BaseUtil.readPdf(response, pdfPath); + } catch (UnsupportedEncodingException e) { + log.error("卫生考核表导出异常-UnsupportedEncodingException：" + e.getMessage()); + } catch (DocumentException e) { + log.error("卫生考核表导出异常-DocumentException：" + e.getMessage()); + } catch (IOException e) { + log.error("卫生考核表导出异常-IOException：" + e.getMessage()); + } + } + + /** * 查询是否存在同月编号 * @param currentMonth 当月 * @return 存在则返回上一编号，否则返回null diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/BaseUtil.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/BaseUtil.java index 2c1755e..914c81f 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/BaseUtil.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/BaseUtil.java @@ -1,10 +1,13 @@ package com.hnac.hzims.safeproduct.utils; import cn.afterturn.easypoi.word.WordExportUtil; +import com.alibaba.fastjson.JSON; +import com.google.common.collect.Lists; import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.safeproduct.constants.SafeProductConstant; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; +import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xwpf.usermodel.*; import org.json.JSONArray; import org.json.JSONObject; @@ -421,4 +424,41 @@ public class BaseUtil { throw new ServiceException("标准总分值未全部分配"); } } + + /** + * + * @param initRow 起始行数 + * @param initColumn 起始列数 + * @param data 数据 + * @param attribute 合并属性 + * @return 单元格列表 + */ + public static List mergeCell(int initRow, int initColumn, com.alibaba.fastjson.JSONArray data, String attribute) { + List result = Lists.newArrayList(); + String initAttribute = com.alibaba.fastjson.JSONObject.parseObject(JSON.toJSONString(data.get(0))).getString(attribute); + int mergeCount = 1; + for (int index = 0; index < data.size(); index++) { + if (index == 0) { + continue; + } + com.alibaba.fastjson.JSONObject object = com.alibaba.fastjson.JSONObject.parseObject(JSON.toJSONString(data.get(index))); + if (object.getString(attribute).equals(initAttribute)) { + mergeCount++; + } + else { + if (mergeCount > 1) { + result.add(new CellRangeAddress(initRow, initRow+mergeCount-1, initColumn, initColumn)); + } + initRow = initRow+mergeCount; + initAttribute = object.getString(attribute); + mergeCount = 1; + } + if (index == data.size() -1) { + if (mergeCount > 1) { + result.add(new CellRangeAddress(initRow, initRow + mergeCount-1, initColumn, initColumn)); + } + } + } + return result; + } } diff --git a/hzims-service/safeproduct/src/main/resources/template/卫生考核表.xlsx b/hzims-service/safeproduct/src/main/resources/template/卫生考核表.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..93b2b21c51b27f4dbe290920c42962a950f66238 GIT binary patch literal 10754 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 R;CKq2CKAD822ek0|6fNza%KPk literal 0 HcmV?d00001