报表权限添加

陈威
1 parent 2db0bc54
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
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicMoneyController.java
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McBasicMoney.java
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
@@ -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<McBasicCmty> list = mcBasicCmtyService.selectMcBasicCmtySummaryList(mcBasicCmtyVo);
@@ -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<McBasicMoney> 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<String, String> map = MapUtils.newHashMap();
+            map.put("status", "failure");
+            map.put("message", "下载文件失败" + e.getMessage());
+            response.getWriter().println(JSON.toJSONString(map));
+        }
+    }
+
+
+
+
+
 }
@@ -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<String> ticketTypeList = new ArrayList<String>();
@@ -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<String> ticketTypeList = new ArrayList<String>();
@@ -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;
  
     /** 公司代码 */
@@ -688,6 +688,30 @@
                 #{item}
             </foreach>
         </if>
+        <if test="startUpdateTime != null   and 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
+            ) &gt;= #{startUpdateTime}
+        </if>
+        <if test="finishUpdateTime != null   and finishUpdateTime != '' ">
+            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
+            ) &lt;= #{finishUpdateTime}
+        </if>
+        <if test="startIgnTime != null and startIgnTime != '' ">
+            AND i.ign_time &gt;= #{startIgnTime}
+        </if>
+        <if test="finishIgnTime != null and finishIgnTime != '' ">
+            AND i.ign_time &lt;= #{startIgnTime}
+        </if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         order by t.update_time desc
...	...	@@ -226,7 +226,7 @@ public class McBasicCmtyController extends BaseController {
226	226	}
227	227
228	228
229		-
	229	+ @RequirePermission("schsf:mcBasicCmty:summaryList")
230	230	@GetMapping("/summaryList")
231	231	public TableDataInfo summaryList(McBasicCmtyVo mcBasicCmtyVo) {
232	232	startPage();
...	...	@@ -235,7 +235,7 @@ public class McBasicCmtyController extends BaseController {
235	235	return getDataTable(list);
236	236	}
237	237
238		-
	238	+ @RequirePermission("schsf:mcBasicCmty:summaryExport")
239	239	@PostMapping("/summaryExport")
240	240	public void summaryExport(@RequestBody McBasicCmtyVo mcBasicCmtyVo,HttpServletResponse response) throws IOException {
241	241	List<McBasicCmty> list = mcBasicCmtyService.selectMcBasicCmtySummaryList(mcBasicCmtyVo);
...	...
...	...	@@ -20,10 +20,7 @@ import com.chinagas.modules.schsf.utils.listener.McBasicMoneyImportInspection;
20	20	import lombok.extern.slf4j.Slf4j;
21	21	import org.apache.commons.lang3.StringUtils;
22	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	24	import org.springframework.web.multipart.MultipartFile;
28	25
29	26	import javax.servlet.http.HttpServletResponse;
...	...	@@ -172,7 +169,7 @@ public class McBasicMoneyController extends BaseController {
172	169
173	170
174	171
175		-
	172	+ @RequirePermission("schsf:mcBasicMoney:summaryList")
176	173	@GetMapping("/summaryList")
177	174	public TableDataInfo summaryList(McBasicMoneyVo mcBasicMoneyVo) {
178	175	startPage();
...	...	@@ -181,4 +178,35 @@ public class McBasicMoneyController extends BaseController {
181	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	}
...	...
...	...	@@ -279,6 +279,7 @@ public class McVisitController extends BaseController {
279	279	* @param mcVisitVo
280	280	* @return
281	281	*/
	282	+ @RequirePermission("schsf:mcVisit:visitList")
282	283	@GetMapping("/visitList")
283	284	public TableDataInfo visitList(McVisitVo mcVisitVo) {
284	285	startPage();
...	...	@@ -299,6 +300,7 @@ public class McVisitController extends BaseController {
299	300	* @param mcVisitVo
300	301	* @return
301	302	*/
	303	+ @RequirePermission("schsf:mcVisit:chargedList")
302	304	@GetMapping("/chargedList")
303	305	public TableDataInfo chargedList(McVisitVo mcVisitVo) {
304	306	startPage();
...	...	@@ -318,6 +320,7 @@ public class McVisitController extends BaseController {
318	320	* @param mcVisitVo
319	321	* @return
320	322	*/
	323	+ @RequirePermission("schsf:mcVisit:visitListExport")
321	324	@PostMapping("/visitListExport")
322	325	public void visitListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException {
323	326	List<String> ticketTypeList = new ArrayList<String>();
...	...	@@ -390,6 +393,7 @@ public class McVisitController extends BaseController {
390	393	* @param mcVisitVo
391	394	* @return
392	395	*/
	396	+ @RequirePermission("schsf:mcVisit:chargedListExport")
393	397	@PostMapping("/chargedListExport")
394	398	public void chargedListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException {
395	399	List<String> ticketTypeList = new ArrayList<String>();
...	...
...	...	@@ -2,6 +2,7 @@ package com.chinagas.modules.schsf.domain;
2	2
3	3	import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
4	4	import com.alibaba.excel.annotation.ExcelProperty;
	5	+import com.alibaba.excel.annotation.write.style.ColumnWidth;
5	6	import com.chinagas.common.core.web.domain.BaseEntity;
6	7	import org.apache.commons.lang3.builder.ToStringBuilder;
7	8	import org.apache.commons.lang3.builder.ToStringStyle;
...	...	@@ -28,14 +29,17 @@ public class McBasicMoney extends BaseEntity
28	29
29	30	/** 区域名称 */
30	31	@ExcelProperty(index = 1,value = "区域名称")
	32	+ @ColumnWidth(26)
31	33	private String regionName;
32	34
33	35	/** 集团名称 */
34	36	@ExcelProperty(index = 2,value = "经管集团/直管公司")
	37	+ @ColumnWidth(26)
35	38	private String groupName;
36	39
37	40	/** 公司名称 */
38	41	@ExcelProperty(index = 3,value = "公司名称")
	42	+ @ColumnWidth(26)
39	43	private String companyName;
40	44
41	45	/** 公司代码 */
...	...
...	...	@@ -688,6 +688,30 @@
688	688	#{item}
689	689	</foreach>
690	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	716	${params.dataScope}
693	717	order by t.update_time desc
...	...