diff --git a/pom.xml b/pom.xml index 4eccc36..0fa1229 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 2.4 1.12.1 1.9.1 - 4.5.0 + 4.2.0 9.4.47.v20220610 diff --git a/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java b/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java index 7535829..832257c 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java @@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.afterturn.easypoi.excel.export.ExcelExportService; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; @@ -731,7 +732,7 @@ public class WelfareSingleServiceImpl extends ViServiceImpl impl excelExportEntity.setHeight(20); excelExportEntity.setWidth(20); excelExportEntity.setType(2); - excelExportEntity.setExportImageType(2); + excelExportEntity.setExportImageType(1); exportEntities.add(excelExportEntity); List loginnames = list.stream().map(v -> v.getString("loginname")).distinct().collect(Collectors.toList()); @@ -774,6 +775,13 @@ public class WelfareSingleServiceImpl extends ViServiceImpl impl Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, dataList); workbook.write(outputStream); + /*Workbook workbook = new XSSFWorkbook(); + ExcelExportService service = new ExcelExportService(); + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + service.createSheetForMap(workbook, exportParams, exportEntities, dataList); + workbook.write(outputStream);*/ + // List result = new ArrayList<>(); // //查询这个福利下有哪些礼品 // WelfareProject welfareProject = dao().fetch(WelfareProject.class, projectId); diff --git a/src/main/resources/static/components/sign/sign.vue b/src/main/resources/static/components/sign/sign.vue index 318073c..6726ceb 100644 --- a/src/main/resources/static/components/sign/sign.vue +++ b/src/main/resources/static/components/sign/sign.vue @@ -81,8 +81,8 @@ module.exports = { clearInterval(signatureInterval) const ts = new Date().getTime() + (Math.floor(Math.random() * (1000 - 1 + 1)) + 1).toString() console.log(ts) - // this.postAddress = location.protocol + '//' + location.host + '/signature?prefix=' + this.prefix + '&id=' + ts + "&is_value_base64=" + this.is_value_base64 - this.postAddress = 'https://zhgh.hmc.edu.cn/signature?prefix=' + this.prefix + '&id=' + ts + "&is_value_base64=" + this.is_value_base64 + this.postAddress = location.protocol + '//' + location.host + '/signature?prefix=' + this.prefix + '&id=' + ts + "&is_value_base64=" + this.is_value_base64 + //this.postAddress = 'https://zhgh.hmc.edu.cn/signature?prefix=' + this.prefix + '&id=' + ts + "&is_value_base64=" + this.is_value_base64 this.showQrCode = true diff --git a/src/main/resources/views/platform/welfare/list/ListMange.html b/src/main/resources/views/platform/welfare/list/ListMange.html index c2c6bfa..faa8e9e 100644 --- a/src/main/resources/views/platform/welfare/list/ListMange.html +++ b/src/main/resources/views/platform/welfare/list/ListMange.html @@ -883,7 +883,7 @@ layout("/layouts/platform.html"){ const sum = selectNums.reduce((accumulator, currentValue) => accumulator + currentValue, 0) if (sum > multiSelectNum) { - this.$set(this.welfareOptions[optionIndex], 'selectNum', value - 1) + this.$set(this.welfareOptions[optionIndex], 'selectNum', multiSelectNum) this.$message('此次福利最多只能选择' + multiSelectNum + '份'); }