修改

活动

src/main/java/com/ssj/dao/sys/jxy/dao/impl/JxyQueryDaoImpl.java

@@ -57,7 +57,7 @@ public class JxyQueryDaoImpl implements JxyQueryDao {
 	public Page<ErrorModel> errorList(Map<String, Object> params, Pageable initPage) {
 		StringBuilder selSQL = new StringBuilder();
 		List<Object> queryParams = new ArrayList<Object>();
-		selSQL.append("SELECT t12.child_name,t13.league_name,t.create_time,t.error_reason_code,t11.file_key,t11.`subject`\n");
+		selSQL.append("SELECT t12.child_name,t13.league_name,t.create_time,t.error_reason_code,t11.file_key,t11.`subject`,t11.create_time as upload_time \n");
 		selSQL.append("from scon_homework_idetify_error t \n");
 		selSQL.append("left join scon_homework_picture t11 on t.homework_picture_id = t11.id\n");
 		selSQL.append("left join tb_lib_vip t12 on t.vip_id = t12.id\n");
@@ -88,8 +88,9 @@ public class JxyQueryDaoImpl implements JxyQueryDao {
 	public Page<Map<String,Object>> activityList(Map<String, Object> params, Pageable initPage) {
 		StringBuilder selSQL = new StringBuilder();
 		List<Object> queryParams = new ArrayList<Object>();
-		selSQL.append("SELECT * \n");
+		selSQL.append("SELECT *,t11.wx_name,t11.photo \n");
 		selSQL.append("from tb_activity_sign t \n");
+		selSQL.append("left join  tb_user t11 on t.user_id = t11.id \n");
 		selSQL.append("where 1=1 \n");
 
 		if(!"".equals(params.get("type").toString())){

src/main/java/com/ssj/service/sys/fx/service/impl/MerchantMealServiceImpl.java

@@ -365,7 +365,12 @@ public class MerchantMealServiceImpl extends BaseServiceImpl<MerchantMeal, Strin
 				}
 				
 				merchant.setStartActiveTime(minMerchantMeal.getSignTime());
-				merchant.setActiveTime(minMerchantMeal.getSignTime());
+				if(minMerchantMeal.getType()==1){
+					merchant.setActiveTime(minMerchantMeal.getEndSignTime());
+				}else{
+					merchant.setActiveTime(minMerchantMeal.getSignTime());
+				}
+
 				merchant.setEndActiveTime(maxMerchantMeal.getEndSignTime());
 				merchant.setSignType(maxSignType);
 				merchant.setPortNum(maxPortNum);

src/main/java/com/ssj/sys/controller/ErrorController.java

@@ -160,7 +160,7 @@ public class ErrorController extends BaseController {
             entity.add(e2);
             ExcelExportEntity e3 =  new ExcelExportEntity("来源","type",20);
             e3.setNeedMerge(true);
-            e3.setReplace(new String[]{"kol_1","电梯框架广告_2","公交车站台广告_3","公众号文章_4","广州线下地推_5","门禁广告_6","朋友圈广告_7","社群广告_8","书店_9","无锡线下地推_10"});
+            e3.setReplace(new String[]{"其他渠道_1","推广_2","19.9电梯广告1_3","19.9电梯广告2_4","19.9电梯广告3_5","19.9元地推_6","19.9元书店_7","19.9元其他渠道_8"});
             entity.add(e3);
 
             ExcelExportEntity e4 =  new ExcelExportEntity("","list");

src/main/java/com/ssj/sys/controller/FinanceReportController.java

@@ -112,12 +112,14 @@ public class FinanceReportController extends BaseController {
             String libName="小塾币使用情况表-各月";
             os = response.getOutputStream(); //获得输出流
             response.reset();   //清空输出流
+
+            Map<String, Object> params = new HashMap<String, Object>();
+            params.put("month", DateHelper.format(new Date(),"yyyy-MM"));
+            libName +=params.get("month").toString();
             String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
             response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
             response.setContentType("application/vnd.ms-excel;charset=UTF-8");
             response.setCharacterEncoding("utf-8");
-            Map<String, Object> params = new HashMap<String, Object>();
-            params.put("month", DateHelper.format(new Date(),"yyyy-MM"));
             addPostcodes(params);
             List<Map<String,Object>> list = financeService.findLittleShuAllList(params);
             List<ExcelColumn> myColumns3 = new ArrayList<ExcelColumn>();
@@ -152,14 +154,15 @@ public class FinanceReportController extends BaseController {
             String libName="小塾币使用情况表-各馆";
             os = response.getOutputStream(); //获得输出流
             response.reset();   //清空输出流
+
+            Map<String, Object> params = new HashMap<String, Object>();
+            params.put("month", request.getParameter("month")==null?DateHelper.format(new Date(),"yyyy-MM"):request.getParameter("month"));
+            addPostcodes(params);
+            libName +=params.get("month").toString();
             String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
             response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
-//          response.setContentType("application/msexcel"); //定义输出类型
             response.setContentType("application/vnd.ms-excel;charset=UTF-8");
             response.setCharacterEncoding("utf-8");
-            Map<String, Object> params = new HashMap<String, Object>();
-            params.put("month", request.getParameter("month")==null?DateHelper.format(new Date(),"yyyy-MM"):request.getParameter("month"));
-            addPostcodes(params);
             Page<Map<String,Object>> page = financeService.littleMonthDetailList(params, initPage(1, 100000));
             List<ExcelColumn> myColumns3 = new ArrayList<ExcelColumn>();
             HttpSession session = request.getSession();
@@ -207,14 +210,19 @@ public class FinanceReportController extends BaseController {
             String libName="小塾币使用情况表-各馆各月";
             os = response.getOutputStream(); //获得输出流
             response.reset();   //清空输出流
+            Map<String, Object> params = new HashMap<String, Object>();
+            params.put("startMonth", request.getParameter("startMonth")==null?"":request.getParameter("startMonth"));
+            String endMonth = request.getParameter("endMonth")==null?"":request.getParameter("endMonth");
+            params.put("endMonth", endMonth);
+            libName = libName.concat(params.get("startMonth").toString()) ;
+            if(!endMonth.equals("")){
+                libName +="~"+endMonth;
+            }
             String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
             response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
-//          response.setContentType("application/msexcel"); //定义输出类型
             response.setContentType("application/vnd.ms-excel;charset=UTF-8");
             response.setCharacterEncoding("utf-8");
-            Map<String, Object> params = new HashMap<String, Object>();
-            params.put("startMonth", request.getParameter("startMonth")==null?"":request.getParameter("startMonth"));
-            params.put("endMonth", request.getParameter("endMonth")==null?"":request.getParameter("endMonth"));
+
             params.put("level", request.getParameter("level")==null?"":request.getParameter("level"));
             params.put("unitName", request.getParameter("unitName")==null?"":request.getParameter("unitName"));
             addPostcodes(params);
@@ -568,14 +576,17 @@ public class FinanceReportController extends BaseController {
             String libName="塾币模式结算表";
             os = response.getOutputStream(); //获得输出流
             response.reset();   //清空输出流
-            String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
-            response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
-            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-            response.setCharacterEncoding("utf-8");
+
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("startMonth", request.getParameter("startMonth")==null? new SimpleDateFormat("yyyy-MM").format(new Date()):request.getParameter("startMonth"));
             params.put("unitName", request.getParameter("unitName")==null?"":request.getParameter("unitName"));
             addPostcodes(params);
+
+            libName +=params.get("startMonth").toString();
+            String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
+            response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            response.setCharacterEncoding("utf-8");
             Page<Map<String,Object>> page = financeService.balanceConsumeDetailList(params, initPage(1, 100000));
             
             List<Map<String,Object>> list=page.getContent();
@@ -642,16 +653,19 @@ public class FinanceReportController extends BaseController {
             String libName="端口模式结算表";
             os = response.getOutputStream(); //获得输出流
             response.reset();   //清空输出流
-            String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
-            response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
-            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-            response.setCharacterEncoding("utf-8");
+
             Map<String, Object> params = new HashMap<String, Object>();
             
             params.put("startMonth", request.getParameter("startMonth")==null? new SimpleDateFormat("yyyy-MM").format(new Date()):request.getParameter("startMonth"));
             params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
             addPostcodes(params);
-            
+
+            libName +=params.get("startMonth").toString();
+            String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
+            response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            response.setCharacterEncoding("utf-8");
+
             Page<Map<String,Object>> page = financeService.balanceConsumeDetailList_New2(params, initPage(1, 10000));
             List<Map<String,Object>> list=page.getContent();
             for (Map<String, Object> map : list) {

src/main/java/com/ssj/sys/controller/FxController.java

@@ -2490,19 +2490,28 @@ public class FxController  extends BaseController {
 		    	try { 
 					String libName="塾币使用情况-明细";
 		    		os = response.getOutputStream(); //获得输出流  
-		    		response.reset();   //清空输出流  
-		    		String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";  
-		    		response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头  
-		    		response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-		    		response.setCharacterEncoding("utf-8");
+		    		response.reset();   //清空输出流
 		    		
 		    		
 		    		HttpSession session = request.getSession();
 					Admin admin =(Admin) session.getAttribute("admin");
 					Merchant merchant=merchantService.getMerchantByPosCode(admin.getLoginName());
 			        Map<String, Object> params = new HashMap<String, Object>();
-			        params.put("startTime", request.getParameter("startTime")==null? "" : request.getParameter("startTime"));
-			        params.put("endTime", request.getParameter("endTime")==null? "" : request.getParameter("endTime"));
+
+                    String startTime = request.getParameter("startTime")==null?"":request.getParameter("startTime");
+                    params.put("startTime",startTime);
+                    libName=libName.concat(startTime);
+                    String endTime = request.getParameter("endTime")==null?"":request.getParameter("endTime");
+                    if(!endTime.equals("")){
+                        libName= libName +"~"+endTime;
+                    }
+                    String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
+                    response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
+                    response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+                    response.setCharacterEncoding("utf-8");
+
+                    params.put("endTime",endTime );
+
 			        params.put("type", request.getParameter("type")==null? "" : request.getParameter("type"));
 			        
 			        params.put("remarks", request.getParameter("remarks")==null? "" : request.getParameter("remarks"));
@@ -3531,16 +3540,24 @@ public class FxController  extends BaseController {
     		String libName="服务包订单列表";
     		os = response.getOutputStream(); //获得输出流  
     		response.reset();   //清空输出流  
-    		String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";  
-    		response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头  
-    		response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-    		response.setCharacterEncoding("utf-8");
-		
+
 	        Map<String, Object> params = new HashMap<String, Object>();
 	        params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
+
 	        params.put("signType", request.getParameter("signType")==null?"":request.getParameter("signType"));
-	        params.put("signTime", request.getParameter("signTime")==null?"":request.getParameter("signTime"));
-	        params.put("endSignTime", request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime"));
+            String signTime = request.getParameter("signTime")==null?"":request.getParameter("signTime");
+            params.put("signTime",signTime);
+            libName=libName.concat(signTime);
+            String endSignTime = request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime");
+            if(!endSignTime.equals("")){
+                libName= libName +"~"+endSignTime;
+            }
+            String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
+            response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            response.setCharacterEncoding("utf-8");
+
+            params.put("endSignTime",endSignTime );
 	        params.put("merchantType", request.getParameter("merchantType")==null?"":request.getParameter("merchantType"));
 	        
 	        Page<Map<String, Object>> page = merchantMealOrderService.findMerchantMealOrderByPage(params, initPage(1, 10000, Direction.DESC, new String[]{"createTime"}));
@@ -3648,17 +3665,26 @@ public class FxController  extends BaseController {
     	try { 
     		String libName="加油包订单列表";
     		os = response.getOutputStream(); //获得输出流  
-    		response.reset();   //清空输出流  
-    		String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";  
-    		response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头  
-    		response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-    		response.setCharacterEncoding("utf-8");
+    		response.reset();   //清空输出流
     		
     		Map<String, Object> params = new HashMap<String, Object>();
 	        params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
 	        params.put("type", request.getParameter("type")==null?"":request.getParameter("type"));
-	        params.put("signTime", request.getParameter("signTime")==null?"":request.getParameter("signTime"));
-	        params.put("endSignTime", request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime"));
+
+            String signTime = request.getParameter("signTime")==null?"":request.getParameter("signTime");
+            params.put("signTime",signTime);
+            libName=libName.concat(signTime);
+            String endSignTime = request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime");
+            if(!endSignTime.equals("")){
+                libName= libName +"~"+endSignTime;
+            }
+            String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
+            response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            response.setCharacterEncoding("utf-8");
+
+            params.put("endSignTime",endSignTime );
+
 	        params.put("merchantType", request.getParameter("merchantType")==null?"":request.getParameter("merchantType"));
 	        
 	        Page<Map<String, Object>> page = merchantSignOrderService.findMerchantSignOrderByPage(params, initPage(1, 10000));
@@ -3735,16 +3761,23 @@ public class FxController  extends BaseController {
     	try { 
     		String libName="平台管理订单列表";
     		os = response.getOutputStream(); //获得输出流  
-    		response.reset();   //清空输出流  
-    		String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";  
-    		response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头  
-    		response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-    		response.setCharacterEncoding("utf-8");
+    		response.reset();   //清空输出流
     		
     		Map<String, Object> params = new HashMap<String, Object>();
 	        params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
-	        params.put("signTime", request.getParameter("signTime")==null?"":request.getParameter("signTime"));
-	        params.put("endSignTime", request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime"));
+            String signTime = request.getParameter("signTime")==null?"":request.getParameter("signTime");
+            params.put("signTime",signTime);
+            libName=libName.concat(signTime);
+            String endSignTime = request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime");
+            if(!endSignTime.equals("")){
+                libName= libName +"~"+endSignTime;
+            }
+            String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
+            response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            response.setCharacterEncoding("utf-8");
+
+            params.put("endSignTime",endSignTime );
 	        params.put("merchantType", request.getParameter("merchantType")==null?"":request.getParameter("merchantType"));
 	        
 	        Page<Map<String, Object>> page = merchantPlatOrderService.findMerchantPlatOrderByPage(params, initPage(1, 10000));
@@ -3823,18 +3856,25 @@ public class FxController  extends BaseController {
     	try { 
     		String libName="端口资金流水列表";
     		os = response.getOutputStream(); //获得输出流  
-    		response.reset();   //清空输出流  
-    		String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";  
-    		response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头  
-    		response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-    		response.setCharacterEncoding("utf-8");
+    		response.reset();   //清空输出流
 		
 	        Map<String, Object> params = new HashMap<String, Object>();
 	        params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
 	        params.put("type", request.getParameter("type")==null?"":request.getParameter("type"));
 	        params.put("merchantType", request.getParameter("merchantType")==null?"":request.getParameter("merchantType"));
-	        params.put("signTime", request.getParameter("signTime")==null?"":request.getParameter("signTime"));
-	        params.put("endSignTime", request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime"));
+            String signTime = request.getParameter("signTime")==null?"":request.getParameter("signTime");
+            params.put("signTime",signTime);
+            libName=libName.concat(signTime);
+            String endSignTime = request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime");
+            if(!endSignTime.equals("")){
+                libName= libName +"~"+endSignTime;
+            }
+            String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
+            response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            response.setCharacterEncoding("utf-8");
+
+            params.put("endSignTime",endSignTime );
 	        
 
 	        Page<Map<String, Object>> page = merchantMealService.findMerchantCapByPage(params, initPage(1, 10000, Direction.DESC, new String[]{"createTime"}));
@@ -3958,18 +3998,27 @@ public class FxController  extends BaseController {
     	try { 
     		String libName="塾币资金流水列表";
     		os = response.getOutputStream(); //获得输出流  
-    		response.reset();   //清空输出流  
-    		String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";  
-    		response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头  
-    		response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-    		response.setCharacterEncoding("utf-8");
+    		response.reset();   //清空输出流
 		
  	        Map<String, Object> params = new HashMap<String, Object>();
  	        params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
  	        params.put("type", request.getParameter("type")==null?"":request.getParameter("type"));
  	        params.put("merchantType", request.getParameter("merchantType")==null?"":request.getParameter("merchantType"));
- 	        params.put("createTime", request.getParameter("createTime")==null?"":request.getParameter("createTime"));
- 	        params.put("endCreateTime", request.getParameter("endCreateTime")==null?"":request.getParameter("endCreateTime"));
+
+            String createTime = request.getParameter("createTime")==null?"":request.getParameter("createTime");
+            params.put("createTime",createTime);
+            libName=libName.concat(createTime);
+            String endCreateTime = request.getParameter("endCreateTime")==null?"":request.getParameter("endCreateTime");
+            if(!endCreateTime.equals("")){
+                libName= libName +"~"+endCreateTime;
+            }
+            String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
+            response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            response.setCharacterEncoding("utf-8");
+
+            params.put("endCreateTime",endCreateTime );
+
 
  	        Page<Map<String, Object>> page = merchantMealService.findMerchantCapOldByPage(params, initPage(1, 10000, Direction.DESC, new String[]{"createTime"}));
 	 	    List<Map<String, Object>> mapList=page.getContent();
@@ -4076,18 +4125,25 @@ public class FxController  extends BaseController {
     	try { 
     		String libName="塾币结存流水列表";
     		os = response.getOutputStream(); //获得输出流  
-    		response.reset();   //清空输出流  
-    		String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";  
-    		response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头  
-    		response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-    		response.setCharacterEncoding("utf-8");
+    		response.reset();   //清空输出流
 		
 		  	Map<String, Object> params = new HashMap<String, Object>();
 	        params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
 	        params.put("type", request.getParameter("type")==null?"":request.getParameter("type"));
-	        params.put("createTime", request.getParameter("createTime")==null?"2020-10-09":request.getParameter("createTime"));
-	        params.put("endCreateTime", request.getParameter("endCreateTime")==null?DateHelper.format(new Date(), "yyyy-MM-dd") :request.getParameter("endCreateTime"));
-	        
+            String createTime = request.getParameter("createTime")==null?"2020-10-09":request.getParameter("createTime");
+            params.put("createTime",createTime);
+            libName=libName.concat(createTime);
+            String endCreateTime = request.getParameter("endCreateTime")==null?DateHelper.format(new Date(), "yyyy-MM-dd") :request.getParameter("endCreateTime");
+            if(!endCreateTime.equals("")){
+                libName= libName +"~"+endCreateTime;
+            }
+            String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
+            response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            response.setCharacterEncoding("utf-8");
+
+            params.put("endCreateTime",endCreateTime );
+
 	        Page<Map<String, Object>> page = financeService.findMerchantBalanceOldByPage(params, initPage(1, 10000, Direction.DESC, new String[]{"createTime"}));
 	        
 	        List<Map<String, Object>> mapList=page.getContent();
@@ -4162,17 +4218,25 @@ public class FxController  extends BaseController {
     	try { 
     		String libName="端口结存流水列表";
     		os = response.getOutputStream(); //获得输出流  
-    		response.reset();   //清空输出流  
-    		String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";  
-    		response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头  
-    		response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-    		response.setCharacterEncoding("utf-8");
+    		response.reset();   //清空输出流
 		
 		  	Map<String, Object> params = new HashMap<String, Object>();
 	        params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
 	        params.put("type", request.getParameter("type")==null?"":request.getParameter("type"));
-	        params.put("createTime", request.getParameter("createTime")==null?"2020-01-01":request.getParameter("createTime"));
-	        params.put("endCreateTime", request.getParameter("endCreateTime")==null?DateHelper.format(new Date(), "yyyy-MM-dd") :request.getParameter("endCreateTime"));
+
+            String createTime = request.getParameter("createTime")==null?"2020-01-01":request.getParameter("createTime");
+            params.put("createTime",createTime);
+            libName=libName.concat(createTime);
+            String endCreateTime = request.getParameter("endCreateTime")==null?DateHelper.format(new Date(), "yyyy-MM-dd") :request.getParameter("endCreateTime");
+            if(!endCreateTime.equals("")){
+                libName= libName +"~"+endCreateTime;
+            }
+            String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
+            response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            response.setCharacterEncoding("utf-8");
+
+            params.put("endCreateTime",endCreateTime );
 	        
 	        Page<Map<String, Object>> page = financeService.findMerchantBalanceByPage(params, initPage(1, 10000, Direction.DESC, new String[]{"createTime"}));
 	        
@@ -4262,17 +4326,25 @@ public class FxController  extends BaseController {
     		String libName="端口激活流水列表";
     		os = response.getOutputStream(); //获得输出流  
     		response.reset();   //清空输出流  
-    		String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";  
-    		response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头  
-    		response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-    		response.setCharacterEncoding("utf-8");
+
 		
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
         params.put("type", request.getParameter("type")==null?"":request.getParameter("type"));
         params.put("merchantType", request.getParameter("merchantType")==null?"":request.getParameter("merchantType"));
-        params.put("signTime", request.getParameter("signTime")==null?"":request.getParameter("signTime"));
-        params.put("endSignTime", request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime"));
+            String signTime = request.getParameter("signTime")==null?"":request.getParameter("signTime");
+            params.put("signTime",signTime);
+            libName=libName.concat(signTime);
+            String endSignTime = request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime");
+            if(!endSignTime.equals("")){
+                libName= libName +"~"+endSignTime;
+            }
+            String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";
+            response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            response.setCharacterEncoding("utf-8");
+
+            params.put("endSignTime",endSignTime );
         
 
         Page<Map<String, Object>> page = merchantMealService.findMerchantActiveCapByPage(params, initPage(1, 10000, Direction.DESC, new String[]{"createTime"}));

src/main/java/com/ssj/sys/controller/SysCuratorController.java

@@ -37,7 +37,7 @@ import java.util.*;
 /**
  * @author sh
  * @className SysCuratorController
- * @description TODO
+ * @description controller
  * @date 2020/6/17
  */
 @Controller
@@ -203,7 +203,7 @@ public class SysCuratorController extends BaseController {
             response.setCharacterEncoding("utf-8");
 
 
-            int pageSize = 10;
+            int pageSize = 10000;
             int pageNo =  -1;
             Map<String, Object> data=sysCuratorService.searchActiveTop(startDate,endDate,pageNo,pageSize);
             List<Map<String, Object>> studentList = (List<Map<String, Object>>)data.get("list");

src/main/java/com/ssj/sys/controller/SysOrderController.java

@@ -340,11 +340,61 @@ public class SysOrderController extends BaseController {
 		model.addAttribute("libList",libJoinService.getLibJoinByCode(orgcodeList()));
 		return "sys/order/lessonCourseOrderList";
 	}
-	
-	
-	
-	
-	
+
+
+	/**
+	 * 开票记录
+	 * @param model
+	 * @param pageSize
+	 * @param pageNo
+	 * @return
+	 * @throws Exception
+	 * 创建人：ZhangCaibao
+	 * 2017年5月8日 上午10:32:18
+	 * @String
+	 */
+	@RequestMapping("/invoiceOrderList")
+	public String invoiceOrderList(Model model,
+							   @RequestParam(required = false, defaultValue = "10") int pageSize,
+							   @RequestParam(required = false, defaultValue = "1") int pageNo) {
+
+		Map<String, Object> params = new HashMap<String, Object>();
+
+		params.put("beginDate", request.getParameter("beginDate")==null? DateHelper.format(DateHelper.getTheMonthFirstDay(), "yyyy-MM-dd"):request.getParameter("beginDate"));
+		params.put("endDate", request.getParameter("endDate")==null?DateHelper.format(new Date(), "yyyy-MM-dd"):request.getParameter("endDate"));
+
+		params.put("libId", request.getParameter("libId")==null?"":request.getParameter("libId"));
+		params.put("order_no", request.getParameter("order_no")==null?"":request.getParameter("order_no"));
+		SplitPage sp = new SplitPage();
+		sp.setAction(request.getRequestURI());
+		sp.setPageNo(pageNo);
+		sp.setPageSize(pageSize);
+		sp.setParams(params);
+		Page<Map<String, Object>>  page= libOrderDetailsService.findForInvoicePageList(params, initPage(pageNo,pageSize));
+		sp.setRowCnt((int) page.getTotalElements());
+		model.addAttribute("list", page.getContent());
+		model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
+		model.addAttribute("page", sp);
+		model.addAttribute("search", params);
+		model.addAttribute("libList",libJoinService.getLibJoinByCode(orgcodeList()));
+		return "sys/order/invoiceOrderList";
+	}
+
+	@RequestMapping(value="/updateOrderInvoice",method=RequestMethod.POST)
+	@ResponseBody
+	public ResponseEntity updateOrderInvoice(HttpServletRequest request, Model model,String id){
+		ResponseEntity response = new ResponseEntity();
+		LibOrderDetails orderDetails = libOrderDetailsService.getById(id);
+		if(Objects.nonNull(orderDetails)){
+			orderDetails.setInvoiceState(1);
+			libOrderDetailsService.save(orderDetails);
+			response.success("获取成功");
+		}else {
+			response.failure("修改失败，请检查传参");
+		}
+
+		return response;
+	}
 	
 	
 }

src/main/java/com/ssj/sys/model/ErrorModel.java

@@ -26,6 +26,8 @@ public class ErrorModel implements Serializable {
     private Date createTime;
     @Excel(name="报错作业原图",orderNum = "5",width = 50)
     private String fileKey;
+    @Excel(name="上传时间",format ="yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "6")
+    private Date uploadTime;
 
     public String getChildName() {
         return childName;
@@ -74,4 +76,12 @@ public class ErrorModel implements Serializable {
     public void setErrorReasonCode(String errorReasonCode) {
         this.errorReasonCode = errorReasonCode;
     }
+
+    public Date getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(Date uploadTime) {
+        this.uploadTime = uploadTime;
+    }
 }

src/main/resources/templates/sys/error/activityList.html

@@ -43,6 +43,12 @@
 				<option value="" th:selected="${ search.get('type')  eq '' }">全部</option>
 				<option value="1" th:selected="${ search.get('type')  eq '1' }">其他渠道</option>
 				<option value="2" th:selected="${ search.get('type')  eq '2' }">推广</option>
+				<option value="3" th:selected="${ search.get('type')  eq '3' }">19.9电梯广告1</option>
+				<option value="4" th:selected="${ search.get('type')  eq '4' }">19.9电梯广告2</option>
+				<option value="5" th:selected="${ search.get('type')  eq '5' }">19.9电梯广告3</option>
+				<option value="6" th:selected="${ search.get('type')  eq '6' }">19.9元地推</option>
+				<option value="7" th:selected="${ search.get('type')  eq '7' }">19.9元书店</option>
+				<option value="8" th:selected="${ search.get('type')  eq '8' }">19.9元其他渠道</option>
 			</select>
 		</li>
 
@@ -62,6 +68,8 @@
 		        <th>电话号码</th>
 		        <th>申请时间</th>
 				<th>来源</th>
+				<th>微信昵称</th>
+				<th>微信头像</th>
 				<th style="width: 60%;">
 					<table style="width: 100%;">
 						<thead>
@@ -81,7 +89,17 @@
 					<td  th:switch="${item.get('type')}" >
 						<span th:case="1">其他渠道</span>
 						<span th:case="2">推广</span>
+						<span th:case="3">19.9电梯广告1</span>
+						<span th:case="4">19.9电梯广告2</span>
+						<span th:case="5">19.9电梯广告3</span>
+						<span th:case="6">19.9元地推</span>
+						<span th:case="7">19.9元书店</span>
+						<span th:case="8">19.9元其他渠道</span>
 					</td>
+				<td th:text="${item.get('wx_name')}"  th:title="${item.get('wx_name')}" ></td>
+				<td  class="imgtd">
+					<img  th:if="${item.get('photo')}!=null" th:src="${imgUrl}+''+${item.get('photo')}" class="tablelink" style="width: 50px;height: 50px;" />
+				</td>
 				    <td style="width: 60%;" class="c_table">
 						<table style="width: 100%;">
 							<tr th:each="e:${item.get('list')}">

src/main/resources/templates/sys/error/errorList.html

@@ -70,6 +70,7 @@
 		        <th>报错原因</th>
 		        <th>报错时间</th>
 		        <th>报错作业原图</th>
+		        <th>上传时间</th>
 		    </tr>
 		</thead>
 		<tbody>
@@ -83,6 +84,7 @@
 					<td  class="imgtd">
 						<img  th:if="${item.fileKey}!=null" th:src="${imgUrl}+''+${item.fileKey}" style="width: 50px;height: 50px;" />
 					</td>
+				<td  th:text="${#calendars.format(item.uploadTime,'yyyy-MM-dd HH:mm:ss')}" ></td>
 			</tr>
 		</tbody>
 	</table>