limin лет назад: 7
Родитель
Сommit
1389c9bf28

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderMonthReportMapper.xml

@@ -388,7 +388,7 @@
 	 and a.department_id = #{departmentId,jdbcType=VARCHAR}
 	</if>
 	<if test='type != null and type != ""'>
-	 and m.type= #{type,jdbcType=INTEGER}
+	 and m.type= #{type,jdbcType=INTEGER} -1
 	</if>
 	<if test='saleName != null and saleName != ""'>
 	<bind name="n" value=" '%' + saleName + '%'"/>
@@ -474,7 +474,7 @@
  <!-- 更新指定月份的统计数据 -->
  <insert id="updateByMonth" parameterType="java.lang.Integer">
  	REPLACE INTO t_order_month_report(`type`,`month`,amount,proof_count,salemans_id) 
-	select o.order_type, date_format(#{month,jdbcType=INTEGER},'%Y%m'),sum(o.total_amount), sum(o.proof_count), o.salesman_id 
+	select o.order_type, date_format(o.sign_time,'%Y%m'),sum(o.total_amount), sum(o.proof_count), o.salesman_id 
 	from t_order_new o
 	where 1 = 1
 	  and o.proof_status = 1

+ 4 - 4
src/main/java/com/goafanti/common/mapper/TOrderRefundMapper.xml

@@ -479,7 +479,7 @@
   	<if test='r.startTime != null and r.startTime != "" and r.endTime != null and r.endTime != ""'>
 	  	and o.sign_time between #{r.startTime,jdbcType=VARCHAR} and #{r.endTime,jdbcType=VARCHAR}
 	</if>
-	order by r.refund_status
+	order by r.refund_status, o.order_status
   	<if test="page_sql!=null">
 	 ${page_sql}
 	</if>
@@ -495,13 +495,13 @@
   		and r.refund_status = #{r.refundStatus,jdbcType=INTEGER}
   	</if>
   	<if test='r.refundStatus == null or r.refundStatus == ""'>
-  		and refund_status &lt; 2
+  		and r.refund_status &lt; 2
   	</if>
   	<if test='r.id != null and r.id != ""'>
-  		and id= #{r.id,jdbcType=INTEGER}
+  		and r.id= #{r.id,jdbcType=INTEGER}
   	</if>
   	<if test='r.orderNo != null and r.orderNo != ""'>
-  		and order_no = #{r.orderNo,jdbcType=VARCHAR}
+  		and r.order_no = #{r.orderNo,jdbcType=VARCHAR}
   	</if>
   	<if test='r.buyName != null and r.buyName != ""'>
 	  	<bind name="a" value="'%' + r.buyName + '%'"/>

+ 9 - 12
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -113,12 +113,11 @@ public class ExportExcelUtil {
 	/**
 	 * 导出部门流水数据
 	 * @param map 数据
-	 * @param deptnames 部门名称数组
 	 * @param comment 表头(列名)
 	 * @param filePath 生成文件路径
 	 */
-	public static XSSFWorkbook exportDeptBillInfo(Map<String,List<TOrderBillNew>> map,String[] deptnames,String[] comment,String filePath){
-		//map 数据 ,deptnames 部门名称,comment表头 (列名称)
+	public static XSSFWorkbook exportDeptBillInfo(Map<String,List<TOrderBillNew>> map,String[] comment,String filePath){
+		//map 数据 ,comment表头 (列名称)
  		//1,创建一个workbook,对应的是一个excel文件
 		XSSFWorkbook wb = new XSSFWorkbook();
 		int count = 0;
@@ -130,7 +129,7 @@ public class ExportExcelUtil {
 			XSSFRow row = sheet.createRow(0);
 			//4.创建一个cell
 			XSSFCell cell = row.createCell(0);
-			cell.setCellValue(deptnames[count]+" 流水记录");
+			cell.setCellValue(entry.getKey()+" 流水记录");
 			count ++;
 			XSSFCellStyle style1 = setCellStyle1(wb);
 			cell.setCellStyle(style1);
@@ -217,12 +216,11 @@ public class ExportExcelUtil {
 	/**
 	 * 导出技术员奖金统计
 	 * @param map
-	 * @param deptnames
 	 * @param comment
 	 * @return
 	 */
-	public static XSSFWorkbook exportDeptBonusInfoT(Map<String,List<TOrderBonusBo>> map,String[] deptnames,String[] comment){
-		//map 数据 ,deptnames 部门名称,comment表头 (列名称)
+	public static XSSFWorkbook exportDeptBonusInfoT(Map<String,List<TOrderBonusBo>> map,String[] comment){
+		//map 数据 ,comment表头 (列名称)
 		//1,创建一个workbook,对应的是一个excel文件
 		XSSFWorkbook wb = new XSSFWorkbook();
 		int count = 0;
@@ -234,7 +232,7 @@ public class ExportExcelUtil {
 			XSSFRow row = sheet.createRow(0);
 			//4.创建一个cell
 			XSSFCell cell = row.createCell(0);
-			cell.setCellValue(deptnames[count]+" 奖金记录");
+			cell.setCellValue(entry.getKey()+" 奖金记录");
 			count ++;
 			XSSFCellStyle style1 = setCellStyle1(wb);
 			cell.setCellStyle(style1);
@@ -518,13 +516,12 @@ public class ExportExcelUtil {
 	/**
 	 * 导出营销部部门奖金的数据
 	 * @param map
-	 * @param deptnames
 	 * @return
 	 */
-	public static XSSFWorkbook exportDeptBonusInfoS(Map<String,List<TOrderBonusBo>> map,String[] deptnames){
+	public static XSSFWorkbook exportDeptBonusInfoS(Map<String,List<TOrderBonusBo>> map){
 		String comment[] = {"订单编号", "订单负责人", "签单日期", "客户名称", "签单金额(万元)", "首付款(万元)", "已收(万元)","已退(万元)","订单状态","项目状态","发放类型",
 							"校对后单量(个)","发放状态","当月认证项目数量","当月科技项目数量","年度认证项目数量","年度科技项目数量"};
-		//map 数据 ,deptnames 部门名称,comment表头 (列名称)
+		//map 数据 ,comment表头 (列名称)
 		//1,创建一个workbook,对应的是一个excel文件
 		XSSFWorkbook wb = new XSSFWorkbook();
 		int count = 0;
@@ -536,7 +533,7 @@ public class ExportExcelUtil {
 			XSSFRow row = sheet.createRow(0);
 			//4.创建一个cell
 			XSSFCell cell = row.createCell(0);
-			cell.setCellValue(deptnames[count]+" 奖金记录");
+			cell.setCellValue(entry.getKey()+" 奖金记录");
 			count ++;
 			XSSFCellStyle style1 = setCellStyle1(wb);
 			cell.setCellStyle(style1);

+ 4 - 1
src/main/java/com/goafanti/order/controller/OrderBonusStatisticsApiController.java

@@ -33,6 +33,7 @@ import com.goafanti.order.bo.TOrderBonusBo;
 import com.goafanti.order.service.FundManageOrderService;
 import com.goafanti.order.service.OrderBonusService;
 import com.goafanti.order.service.OrderReportService;
+import com.goafanti.permission.service.NewRoleService;
 
 @RestController
 @RequestMapping(value = "/api/admin/bonus")
@@ -43,7 +44,8 @@ public class OrderBonusStatisticsApiController extends CertifyApiController {
 	private OrderBonusService orderBonusServiceImpl;
 	@Resource
 	private OrderReportService orderReportServiceImpl;
-	
+	@Resource
+	private NewRoleService newRoleService;
 	@Value(value = "${upload.private.path}")
 	private String	uploadPrivatePath	= null;
 	 /**
@@ -214,6 +216,7 @@ public class OrderBonusStatisticsApiController extends CertifyApiController {
 	  */
 	 @RequestMapping(value="/exportOrderData", method = RequestMethod.GET)
 	 public Result exportOrderData(OrderReportBo orderReportBo,HttpServletResponse response) throws IOException{
+		 //判断当前登录的角色
 		 Result res = new Result();
 		 if(null == orderReportBo.getMonth() || null == orderReportBo.getMonth1()){
 			res.getError().add(buildError("", "没有指定订单日期"));

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -283,7 +283,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			TOrderNewBo o = tOrderNewMapper.agreeEmailData(refund.getId());
 			TOrderNew record = new TOrderNew();
 			record.setOrderNo(o.getOrderNo());
-			record.setOrderStatus(6);
+			record.setOrderStatus(7);
 			tOrderNewMapper.updateByPrimaryKeySelective(record);
 			
 			//新增奖金信息表数据

+ 1 - 5
src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java

@@ -42,22 +42,18 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 		// 判断导出是否有部门
 		String deptid = billNew.getDepartmentId();
 		Map<String, List<TOrderBillNew>> map = new HashMap<String, List<TOrderBillNew>>();
-		String[] deptnames = null; 
 		if(StringUtils.isBlank(deptid)){
 			//获得所有有数据的部门
 			List<TOrderBillNew> dlist = billNewMapper.getDeptBySome(billNew);
 			if(null == dlist || dlist.size() == 0){
 				return null;
 			}
-			deptnames = new String[dlist.size()];
 			for (int i = 0; i < dlist.size(); i++) {
 				TOrderBillNew ob = dlist.get(i);
-				deptnames[i] = ob.getDepartmentName();
 				billNew.setDepartmentId(ob.getDepartmentId());
 				map.put(ob.getDepartmentName(), billNewMapper.getBillData(billNew));
 			}
 		}else{
-			deptnames = new String[1];
 			map.put(billNew.getDepartmentName(), billNewMapper.getBillData(billNew));
 		}
 		String[] comment = {"平台流水编号","平台流水时间","交易金额(万元)","付款方","收款方","流水科目","交易渠道","交易时间","财务流水号","订单编号","订单负责人"};
@@ -67,7 +63,7 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 //			f.mkdirs();
 //		}
 		//filePath += "/" + System.nanoTime() +".xls";
-		XSSFWorkbook wb = ExportExcelUtil.exportDeptBillInfo(map, deptnames, comment, filePath);
+		XSSFWorkbook wb = ExportExcelUtil.exportDeptBillInfo(map,  comment, filePath);
 		
 		return wb;
 	}

+ 2 - 12
src/main/java/com/goafanti/order/service/impl/OrderBonusServiceImpl.java

@@ -123,7 +123,6 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 		// 判断导出是否有部门
 		String deptid = bonusBo.getDepartmentId();
 		Map<String, List<TOrderBonusBo>> map = new HashMap<String, List<TOrderBonusBo>>();
-		String[] deptnames = null; 
 		if(StringUtils.isBlank(deptid)){
 			//获得所有有数据的部门
 			bonusBo.setGrantType(1);
@@ -131,20 +130,16 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 			if(null == dlist || dlist.size() == 0){
 				return null;
 			}
-			deptnames = new String[dlist.size()];
 			for (int i = 0; i < dlist.size(); i++) {
 				TOrderBonusBo ob = dlist.get(i);
-				deptnames[i] = ob.getDepartmentName();
 				bonusBo.setDepartmentId(ob.getDepartmentId());
 				map.put(ob.getDepartmentName(), bonusMapper.getBonusData(bonusBo));
 			}
 		}else{
-			deptnames = new String[1];
-			deptnames[0] = bonusBo.getDepartmentName();
 			map.put(bonusBo.getDepartmentName(), bonusMapper.getBonusData(bonusBo));
 		}
 		String[] comment = {"任务编号","订单编号","任务负责人","任务状态","任务数量","项目状态","受理日期","评审日期","下证日期","订单结算状态","发放类型","发放状态"};
-		XSSFWorkbook wb = ExportExcelUtil.exportDeptBonusInfoT(map, deptnames, comment);
+		XSSFWorkbook wb = ExportExcelUtil.exportDeptBonusInfoT(map, comment);
 		return wb;
 	}
 
@@ -152,7 +147,6 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 	public XSSFWorkbook exportSaleBonusData(TOrderBonusBo bonusBo) {
 		String deptid = bonusBo.getDepartmentId();
 		Map<String, List<TOrderBonusBo>> map = new HashMap<String, List<TOrderBonusBo>>();
-		String[] deptnames = null; 
 		if(StringUtils.isBlank(deptid)){
 			//获得所有有数据的部门
 			bonusBo.setGrantType(0);
@@ -160,10 +154,8 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 			if(null == dlist || dlist.size() == 0){
 				return null;
 			}
-			deptnames = new String[dlist.size()];
 			for (int i = 0; i < dlist.size(); i++) {
 				TOrderBonusBo ob = dlist.get(i);
-				deptnames[i] = ob.getDepartmentName();
 				bonusBo.setDepartmentId(ob.getDepartmentId());
 				List<TOrderBonusBo> l =  bonusMapper.getSaleBounsList(bonusBo);
 				innerData(l, bonusBo);
@@ -172,11 +164,9 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 		}else{
 			List<TOrderBonusBo> l =  bonusMapper.getSaleBounsList(bonusBo);
 			innerData(l, bonusBo);
-			deptnames = new String[1];
-			deptnames[0] = bonusBo.getDepartmentName();
 			map.put(bonusBo.getDepartmentName(), l);
 		}
-		XSSFWorkbook wb = ExportExcelUtil.exportDeptBonusInfoS(map, deptnames);
+		XSSFWorkbook wb = ExportExcelUtil.exportDeptBonusInfoS(map);
 		return wb;
 	}
 }