Commit 3d6fbeb56182c904a0193d80cf12b634d40fed01
1 parent
2db0bc54
Exists in
dev
报表权限添加
Showing
5 changed files
with
67 additions
and
7 deletions
Show diff stats
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 { | @@ -226,7 +226,7 @@ public class McBasicCmtyController extends BaseController { | ||
| 226 | } | 226 | } |
| 227 | 227 | ||
| 228 | 228 | ||
| 229 | - | 229 | + @RequirePermission("schsf:mcBasicCmty:summaryList") |
| 230 | @GetMapping("/summaryList") | 230 | @GetMapping("/summaryList") |
| 231 | public TableDataInfo summaryList(McBasicCmtyVo mcBasicCmtyVo) { | 231 | public TableDataInfo summaryList(McBasicCmtyVo mcBasicCmtyVo) { |
| 232 | startPage(); | 232 | startPage(); |
| @@ -235,7 +235,7 @@ public class McBasicCmtyController extends BaseController { | @@ -235,7 +235,7 @@ public class McBasicCmtyController extends BaseController { | ||
| 235 | return getDataTable(list); | 235 | return getDataTable(list); |
| 236 | } | 236 | } |
| 237 | 237 | ||
| 238 | - | 238 | + @RequirePermission("schsf:mcBasicCmty:summaryExport") |
| 239 | @PostMapping("/summaryExport") | 239 | @PostMapping("/summaryExport") |
| 240 | public void summaryExport(@RequestBody McBasicCmtyVo mcBasicCmtyVo,HttpServletResponse response) throws IOException { | 240 | public void summaryExport(@RequestBody McBasicCmtyVo mcBasicCmtyVo,HttpServletResponse response) throws IOException { |
| 241 | List<McBasicCmty> list = mcBasicCmtyService.selectMcBasicCmtySummaryList(mcBasicCmtyVo); | 241 | List<McBasicCmty> list = mcBasicCmtyService.selectMcBasicCmtySummaryList(mcBasicCmtyVo); |
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; | @@ -20,10 +20,7 @@ import com.chinagas.modules.schsf.utils.listener.McBasicMoneyImportInspection; | ||
| 20 | import lombok.extern.slf4j.Slf4j; | 20 | import lombok.extern.slf4j.Slf4j; |
| 21 | import org.apache.commons.lang3.StringUtils; | 21 | import org.apache.commons.lang3.StringUtils; |
| 22 | import org.springframework.beans.factory.annotation.Autowired; | 22 | import org.springframework.beans.factory.annotation.Autowired; |
| 23 | -import org.springframework.web.bind.annotation.GetMapping; | ||
| 24 | -import org.springframework.web.bind.annotation.PostMapping; | ||
| 25 | -import org.springframework.web.bind.annotation.RequestMapping; | ||
| 26 | -import org.springframework.web.bind.annotation.RestController; | 23 | +import org.springframework.web.bind.annotation.*; |
| 27 | import org.springframework.web.multipart.MultipartFile; | 24 | import org.springframework.web.multipart.MultipartFile; |
| 28 | 25 | ||
| 29 | import javax.servlet.http.HttpServletResponse; | 26 | import javax.servlet.http.HttpServletResponse; |
| @@ -172,7 +169,7 @@ public class McBasicMoneyController extends BaseController { | @@ -172,7 +169,7 @@ public class McBasicMoneyController extends BaseController { | ||
| 172 | 169 | ||
| 173 | 170 | ||
| 174 | 171 | ||
| 175 | - | 172 | + @RequirePermission("schsf:mcBasicMoney:summaryList") |
| 176 | @GetMapping("/summaryList") | 173 | @GetMapping("/summaryList") |
| 177 | public TableDataInfo summaryList(McBasicMoneyVo mcBasicMoneyVo) { | 174 | public TableDataInfo summaryList(McBasicMoneyVo mcBasicMoneyVo) { |
| 178 | startPage(); | 175 | startPage(); |
| @@ -181,4 +178,35 @@ public class McBasicMoneyController extends BaseController { | @@ -181,4 +178,35 @@ public class McBasicMoneyController extends BaseController { | ||
| 181 | return getDataTable(list); | 178 | return getDataTable(list); |
| 182 | } | 179 | } |
| 183 | 180 | ||
| 181 | + @RequirePermission("schsf:mcBasicMoney:summaryExport") | ||
| 182 | + @PostMapping("/summaryExport") | ||
| 183 | + public void summaryExport(@RequestBody McBasicMoneyVo mcBasicMoneyVo, HttpServletResponse response) throws IOException { | ||
| 184 | + mcBasicMoneyVo.setDefFlag("0"); | ||
| 185 | + List<McBasicMoney> list = mcBasicMoneyService.selectMcBasicMoneySummaryList(mcBasicMoneyVo); | ||
| 186 | + try { | ||
| 187 | + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); | ||
| 188 | + response.setCharacterEncoding("utf-8"); | ||
| 189 | + // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 | ||
| 190 | + String fileName = URLEncoder.encode("累加金额项目公司", "UTF-8").replaceAll("\\+", "%20"); | ||
| 191 | + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); | ||
| 192 | + // 这里需要设置不关闭流 | ||
| 193 | + EasyExcel.write(response.getOutputStream(), McBasicMoney.class).autoCloseStream(Boolean.FALSE).sheet("累加金额项目公司") | ||
| 194 | + .doWrite(list); | ||
| 195 | + } catch (Exception e) { | ||
| 196 | + // 重置response | ||
| 197 | + e.printStackTrace(); | ||
| 198 | + response.reset(); | ||
| 199 | + response.setContentType("application/json"); | ||
| 200 | + response.setCharacterEncoding("utf-8"); | ||
| 201 | + Map<String, String> map = MapUtils.newHashMap(); | ||
| 202 | + map.put("status", "failure"); | ||
| 203 | + map.put("message", "下载文件失败" + e.getMessage()); | ||
| 204 | + response.getWriter().println(JSON.toJSONString(map)); | ||
| 205 | + } | ||
| 206 | + } | ||
| 207 | + | ||
| 208 | + | ||
| 209 | + | ||
| 210 | + | ||
| 211 | + | ||
| 184 | } | 212 | } |
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 { | @@ -279,6 +279,7 @@ public class McVisitController extends BaseController { | ||
| 279 | * @param mcVisitVo | 279 | * @param mcVisitVo |
| 280 | * @return | 280 | * @return |
| 281 | */ | 281 | */ |
| 282 | + @RequirePermission("schsf:mcVisit:visitList") | ||
| 282 | @GetMapping("/visitList") | 283 | @GetMapping("/visitList") |
| 283 | public TableDataInfo visitList(McVisitVo mcVisitVo) { | 284 | public TableDataInfo visitList(McVisitVo mcVisitVo) { |
| 284 | startPage(); | 285 | startPage(); |
| @@ -299,6 +300,7 @@ public class McVisitController extends BaseController { | @@ -299,6 +300,7 @@ public class McVisitController extends BaseController { | ||
| 299 | * @param mcVisitVo | 300 | * @param mcVisitVo |
| 300 | * @return | 301 | * @return |
| 301 | */ | 302 | */ |
| 303 | + @RequirePermission("schsf:mcVisit:chargedList") | ||
| 302 | @GetMapping("/chargedList") | 304 | @GetMapping("/chargedList") |
| 303 | public TableDataInfo chargedList(McVisitVo mcVisitVo) { | 305 | public TableDataInfo chargedList(McVisitVo mcVisitVo) { |
| 304 | startPage(); | 306 | startPage(); |
| @@ -318,6 +320,7 @@ public class McVisitController extends BaseController { | @@ -318,6 +320,7 @@ public class McVisitController extends BaseController { | ||
| 318 | * @param mcVisitVo | 320 | * @param mcVisitVo |
| 319 | * @return | 321 | * @return |
| 320 | */ | 322 | */ |
| 323 | + @RequirePermission("schsf:mcVisit:visitListExport") | ||
| 321 | @PostMapping("/visitListExport") | 324 | @PostMapping("/visitListExport") |
| 322 | public void visitListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException { | 325 | public void visitListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException { |
| 323 | List<String> ticketTypeList = new ArrayList<String>(); | 326 | List<String> ticketTypeList = new ArrayList<String>(); |
| @@ -390,6 +393,7 @@ public class McVisitController extends BaseController { | @@ -390,6 +393,7 @@ public class McVisitController extends BaseController { | ||
| 390 | * @param mcVisitVo | 393 | * @param mcVisitVo |
| 391 | * @return | 394 | * @return |
| 392 | */ | 395 | */ |
| 396 | + @RequirePermission("schsf:mcVisit:chargedListExport") | ||
| 393 | @PostMapping("/chargedListExport") | 397 | @PostMapping("/chargedListExport") |
| 394 | public void chargedListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException { | 398 | public void chargedListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException { |
| 395 | List<String> ticketTypeList = new ArrayList<String>(); | 399 | List<String> ticketTypeList = new ArrayList<String>(); |
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; | @@ -2,6 +2,7 @@ package com.chinagas.modules.schsf.domain; | ||
| 2 | 2 | ||
| 3 | import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; | 3 | import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; |
| 4 | import com.alibaba.excel.annotation.ExcelProperty; | 4 | import com.alibaba.excel.annotation.ExcelProperty; |
| 5 | +import com.alibaba.excel.annotation.write.style.ColumnWidth; | ||
| 5 | import com.chinagas.common.core.web.domain.BaseEntity; | 6 | import com.chinagas.common.core.web.domain.BaseEntity; |
| 6 | import org.apache.commons.lang3.builder.ToStringBuilder; | 7 | import org.apache.commons.lang3.builder.ToStringBuilder; |
| 7 | import org.apache.commons.lang3.builder.ToStringStyle; | 8 | import org.apache.commons.lang3.builder.ToStringStyle; |
| @@ -28,14 +29,17 @@ public class McBasicMoney extends BaseEntity | @@ -28,14 +29,17 @@ public class McBasicMoney extends BaseEntity | ||
| 28 | 29 | ||
| 29 | /** 区域名称 */ | 30 | /** 区域名称 */ |
| 30 | @ExcelProperty(index = 1,value = "区域名称") | 31 | @ExcelProperty(index = 1,value = "区域名称") |
| 32 | + @ColumnWidth(26) | ||
| 31 | private String regionName; | 33 | private String regionName; |
| 32 | 34 | ||
| 33 | /** 集团名称 */ | 35 | /** 集团名称 */ |
| 34 | @ExcelProperty(index = 2,value = "经管集团/直管公司") | 36 | @ExcelProperty(index = 2,value = "经管集团/直管公司") |
| 37 | + @ColumnWidth(26) | ||
| 35 | private String groupName; | 38 | private String groupName; |
| 36 | 39 | ||
| 37 | /** 公司名称 */ | 40 | /** 公司名称 */ |
| 38 | @ExcelProperty(index = 3,value = "公司名称") | 41 | @ExcelProperty(index = 3,value = "公司名称") |
| 42 | + @ColumnWidth(26) | ||
| 39 | private String companyName; | 43 | private String companyName; |
| 40 | 44 | ||
| 41 | /** 公司代码 */ | 45 | /** 公司代码 */ |
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
| @@ -688,6 +688,30 @@ | @@ -688,6 +688,30 @@ | ||
| 688 | #{item} | 688 | #{item} |
| 689 | </foreach> | 689 | </foreach> |
| 690 | </if> | 690 | </if> |
| 691 | + <if test="startUpdateTime != null and startUpdateTime != ''"> | ||
| 692 | + AND ( | ||
| 693 | + CASE | ||
| 694 | + WHEN i.update_time IS NULL THEN t.update_time | ||
| 695 | + WHEN t.update_time > i.update_time THEN t.update_time | ||
| 696 | + ELSE i.update_time | ||
| 697 | + END | ||
| 698 | + ) >= #{startUpdateTime} | ||
| 699 | + </if> | ||
| 700 | + <if test="finishUpdateTime != null and finishUpdateTime != '' "> | ||
| 701 | + AND ( | ||
| 702 | + CASE | ||
| 703 | + WHEN i.update_time IS NULL THEN t.update_time | ||
| 704 | + WHEN t.update_time > i.update_time THEN t.update_time | ||
| 705 | + ELSE i.update_time | ||
| 706 | + END | ||
| 707 | + ) <= #{finishUpdateTime} | ||
| 708 | + </if> | ||
| 709 | + <if test="startIgnTime != null and startIgnTime != '' "> | ||
| 710 | + AND i.ign_time >= #{startIgnTime} | ||
| 711 | + </if> | ||
| 712 | + <if test="finishIgnTime != null and finishIgnTime != '' "> | ||
| 713 | + AND i.ign_time <= #{startIgnTime} | ||
| 714 | + </if> | ||
| 691 | <!-- 数据范围过滤 --> | 715 | <!-- 数据范围过滤 --> |
| 692 | ${params.dataScope} | 716 | ${params.dataScope} |
| 693 | order by t.update_time desc | 717 | order by t.update_time desc |