diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java index 4b5eac2..68840af 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java @@ -226,7 +226,7 @@ public class McBasicCmtyController extends BaseController { } - + @RequirePermission("schsf:mcBasicCmty:summaryList") @GetMapping("/summaryList") public TableDataInfo summaryList(McBasicCmtyVo mcBasicCmtyVo) { startPage(); @@ -235,7 +235,7 @@ public class McBasicCmtyController extends BaseController { return getDataTable(list); } - + @RequirePermission("schsf:mcBasicCmty:summaryExport") @PostMapping("/summaryExport") public void summaryExport(@RequestBody McBasicCmtyVo mcBasicCmtyVo,HttpServletResponse response) throws IOException { List list = mcBasicCmtyService.selectMcBasicCmtySummaryList(mcBasicCmtyVo); diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicMoneyController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicMoneyController.java index 4875a35..57fcb5b 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicMoneyController.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicMoneyController.java @@ -20,10 +20,7 @@ import com.chinagas.modules.schsf.utils.listener.McBasicMoneyImportInspection; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -172,7 +169,7 @@ public class McBasicMoneyController extends BaseController { - + @RequirePermission("schsf:mcBasicMoney:summaryList") @GetMapping("/summaryList") public TableDataInfo summaryList(McBasicMoneyVo mcBasicMoneyVo) { startPage(); @@ -181,4 +178,35 @@ public class McBasicMoneyController extends BaseController { return getDataTable(list); } + @RequirePermission("schsf:mcBasicMoney:summaryExport") + @PostMapping("/summaryExport") + public void summaryExport(@RequestBody McBasicMoneyVo mcBasicMoneyVo, HttpServletResponse response) throws IOException { + mcBasicMoneyVo.setDefFlag("0"); + List list = mcBasicMoneyService.selectMcBasicMoneySummaryList(mcBasicMoneyVo); + try { + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 + String fileName = URLEncoder.encode("累加金额项目公司", "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + // 这里需要设置不关闭流 + EasyExcel.write(response.getOutputStream(), McBasicMoney.class).autoCloseStream(Boolean.FALSE).sheet("累加金额项目公司") + .doWrite(list); + } catch (Exception e) { + // 重置response + e.printStackTrace(); + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + Map map = MapUtils.newHashMap(); + map.put("status", "failure"); + map.put("message", "下载文件失败" + e.getMessage()); + response.getWriter().println(JSON.toJSONString(map)); + } + } + + + + + } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java index e1d502a..6a7378c 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java @@ -279,6 +279,7 @@ public class McVisitController extends BaseController { * @param mcVisitVo * @return */ + @RequirePermission("schsf:mcVisit:visitList") @GetMapping("/visitList") public TableDataInfo visitList(McVisitVo mcVisitVo) { startPage(); @@ -299,6 +300,7 @@ public class McVisitController extends BaseController { * @param mcVisitVo * @return */ + @RequirePermission("schsf:mcVisit:chargedList") @GetMapping("/chargedList") public TableDataInfo chargedList(McVisitVo mcVisitVo) { startPage(); @@ -318,6 +320,7 @@ public class McVisitController extends BaseController { * @param mcVisitVo * @return */ + @RequirePermission("schsf:mcVisit:visitListExport") @PostMapping("/visitListExport") public void visitListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException { List ticketTypeList = new ArrayList(); @@ -390,6 +393,7 @@ public class McVisitController extends BaseController { * @param mcVisitVo * @return */ + @RequirePermission("schsf:mcVisit:chargedListExport") @PostMapping("/chargedListExport") public void chargedListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException { List ticketTypeList = new ArrayList(); diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McBasicMoney.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McBasicMoney.java index 0682305..fa77657 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McBasicMoney.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McBasicMoney.java @@ -2,6 +2,7 @@ package com.chinagas.modules.schsf.domain; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.chinagas.common.core.web.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -28,14 +29,17 @@ public class McBasicMoney extends BaseEntity /** 区域名称 */ @ExcelProperty(index = 1,value = "区域名称") + @ColumnWidth(26) private String regionName; /** 集团名称 */ @ExcelProperty(index = 2,value = "经管集团/直管公司") + @ColumnWidth(26) private String groupName; /** 公司名称 */ @ExcelProperty(index = 3,value = "公司名称") + @ColumnWidth(26) private String companyName; /** 公司代码 */ diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml index 2612881..4e2ce60 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml +++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml @@ -688,6 +688,30 @@ #{item} + + AND ( + CASE + WHEN i.update_time IS NULL THEN t.update_time + WHEN t.update_time > i.update_time THEN t.update_time + ELSE i.update_time + END + ) >= #{startUpdateTime} + + + AND ( + CASE + WHEN i.update_time IS NULL THEN t.update_time + WHEN t.update_time > i.update_time THEN t.update_time + ELSE i.update_time + END + ) <= #{finishUpdateTime} + + + AND i.ign_time >= #{startIgnTime} + + + AND i.ign_time <= #{startIgnTime} + ${params.dataScope} order by t.update_time desc -- libgit2 0.21.2