Browse Source

新增统计导出和详情列表导出

Administrator 4 years ago
parent
commit
bd335c57c3

+ 8 - 0
src/main/java/com/goafanti/admin/bo/OutPublicDtails.java

@@ -1,13 +1,21 @@
 package com.goafanti.admin.bo;
 
+import com.goafanti.common.utils.excel.Excel;
+
 public class OutPublicDtails {
 
+	@Excel(name = "客户名称")
 	private String nickname;
 	private String userName;
+	@Excel(name = "公出申请人")
 	private String aname;
+	@Excel(name = "公出时长")
 	private String duration;
+	@Excel(name = "状态" ,readConverterExp = "0=驳回,1=发起,2=同意,3=撤销")
 	private Integer status;
+	@Excel(name = "公出开始时间")
 	private String releaseStarts;
+	@Excel(name = "公出结束时间")
 	private String releaseEnds;
 	private String annexUrl;
 	private String photoUrl;

+ 8 - 1
src/main/java/com/goafanti/admin/bo/OutPublicStatistics.java

@@ -1,13 +1,20 @@
 package com.goafanti.admin.bo;
 
+import com.goafanti.common.utils.excel.Excel;
+
 public class OutPublicStatistics {
 
+	@Excel(name = "公出人员")
 	private String name;
 	private String aid;
+	@Excel(name = "公出次数")
 	private Integer tg;
+	@Excel(name = "总时长")
+	private Double duration;
+	@Excel(name = "未审核次数")
 	private Integer wsh;
+	@Excel(name = "驳回次数")
 	private Integer bh;
-	private Double duration;
 	public Integer getBh() {
 		return bh;
 	}

+ 29 - 0
src/main/java/com/goafanti/admin/controller/AdminReleaseApiController.java

@@ -1,8 +1,11 @@
 package com.goafanti.admin.controller;
 
 
+import java.util.List;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -12,11 +15,15 @@ import com.goafanti.admin.bo.InputPublicDtails;
 import com.goafanti.admin.bo.InputPublicRelease;
 import com.goafanti.admin.bo.InputPublicReleaseList;
 import com.goafanti.admin.bo.InputPublicStatistics;
+import com.goafanti.admin.bo.OutPublicDtails;
+import com.goafanti.admin.bo.OutPublicStatistics;
 import com.goafanti.admin.service.PublicReleaseService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.utils.StringUtils;
+import com.goafanti.common.utils.excel.NewExcelUtil;
+import com.goafanti.user.bo.OutUserChannel;
 
 @RestController
 @RequestMapping(value = "/api/admin/release")
@@ -156,6 +163,17 @@ public class AdminReleaseApiController extends CertifyApiController{
 		return res;
 	}
 	
+	/**
+	 * 公出统计导出
+	 * @return
+	 */
+	@RequestMapping(value = "/publicReleaseStatistics/export", method = RequestMethod.GET)
+	public Result publicReleaseStatisticsExport(InputPublicStatistics in,HttpServletResponse response){
+		List<OutPublicStatistics> list =publicReleaseService.publicReleaseStatisticsList(in);
+      	NewExcelUtil<OutPublicStatistics>excel=new NewExcelUtil<>(OutPublicStatistics.class);
+  		 return  excel.exportExcel(list,"公出统计列表",response);
+	}
+	
 	
 	/**
 	 * 公出详情列表
@@ -168,6 +186,17 @@ public class AdminReleaseApiController extends CertifyApiController{
 		return res;
 	}
 	
+	/**
+	 * 公出详情列表
+	 * @return
+	 */
+	@RequestMapping(value = "/publicReleaseDtails/export", method = RequestMethod.GET)
+	public Result publicReleaseListDtailsExport(InputPublicDtails in ,HttpServletResponse response){
+		List<OutPublicDtails> list=publicReleaseService.publicReleaseListDtailsList(in);
+		NewExcelUtil<OutPublicDtails>excel=new NewExcelUtil<>(OutPublicDtails.class);
+ 		 return  excel.exportExcel(list,"公出详细列表",response);
+	}
+	
 	/** 上传图片 **/
 	@RequestMapping(value = "/upload", method = RequestMethod.POST)
 	public Result uploadOrderInvoiceFile(HttpServletRequest req){

+ 7 - 0
src/main/java/com/goafanti/admin/service/PublicReleaseService.java

@@ -7,8 +7,11 @@ import com.goafanti.admin.bo.InputPublicDtails;
 import com.goafanti.admin.bo.InputPublicRelease;
 import com.goafanti.admin.bo.InputPublicReleaseList;
 import com.goafanti.admin.bo.InputPublicStatistics;
+import com.goafanti.admin.bo.OutPublicDtails;
 import com.goafanti.admin.bo.OutPublicRelease;
+import com.goafanti.admin.bo.OutPublicStatistics;
 import com.goafanti.admin.bo.outPublicReleaseLog;
+import com.goafanti.user.bo.OutUserChannel;
 
 public interface PublicReleaseService {
 
@@ -36,4 +39,8 @@ public interface PublicReleaseService {
 
 	boolean checkTime(InputPublicRelease in);
 
+	List<OutPublicStatistics> publicReleaseStatisticsList(InputPublicStatistics in);
+
+	List<OutPublicDtails> publicReleaseListDtailsList(InputPublicDtails in);
+
 }

+ 34 - 0
src/main/java/com/goafanti/admin/service/impl/PublicReleaseServiceImpl.java

@@ -287,6 +287,21 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		return (Pagination<OutPublicStatistics>) findPage("listPublicStatistics", "countPublicStatistics", map, in.getPageNo(), in.getPageSize());
 	}
 
+	
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<OutPublicStatistics> publicReleaseStatisticsList(InputPublicStatistics in) {
+		Map<String,Object> map =new HashMap<String, Object>();
+		if(in.getAid()!=null)map.put("aid", in.getAid());
+		if(in.getDepId()!=null)map.put("depId", in.getDepId());
+		if(in.getClockStart()!=null)map.put("clockStart", in.getClockStart());
+		if(in.getClockEnd()!=null)map.put("clockEnd", in.getClockEnd()+" 23:59:59");
+		if(in.getCreateStart()!=null)map.put("createStart", in.getCreateStart());
+		if(in.getCreateEnd()!=null)map.put("createEnd", in.getCreateEnd()+" 23:59:59");
+		return (List<OutPublicStatistics>) findList("listPublicStatistics",map, in.getPageNo(), 99999);
+	}
+
 
 
 
@@ -302,6 +317,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if(in.getStatus()!=null)map.put("status", in.getStatus());
 		return (Pagination<OutPublicDtails>) findPage("listPublicDtails", "countPublicDtails", map, in.getPageNo(), in.getPageSize());
 	}
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<OutPublicDtails> publicReleaseListDtailsList(InputPublicDtails in) {
+		Map<String,Object> map =new HashMap<String, Object>();
+		if(in.getAid()!=null)map.put("aid", in.getAid());
+		if(in.getReleaseStart()!=null)map.put("releaseStart", in.getReleaseStart());
+		if(in.getReleaseEnd()!=null)map.put("releaseEnd", in.getReleaseEnd()+" 23:59:59");
+		if(in.getUid()!=null)map.put("uid", in.getUid());
+		if(in.getStatus()!=null)map.put("status", in.getStatus());
+		return (List<OutPublicDtails>) findList("listPublicDtails", map, in.getPageNo(), 99999);
+	}
 
 
 
@@ -326,6 +353,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		return false;
 	}
 
+
+
+
+
+
+
+