Просмотр исходного кода

Merge remote-tracking branch 'origin/test' into dev

anderx лет назад: 7
Родитель
Сommit
e820a1e5a7

+ 6 - 0
src/main/java/com/goafanti/common/dao/TOrderMonthReportMapper.java

@@ -90,4 +90,10 @@ public interface TOrderMonthReportMapper {
 	int proofDataBySomeBody(TOrderNew orderNew);
 	
 	int updateYearReportData(String d);
+	int insertLastYearOrderData();
+	
+	int insertBySome(TOrderNew on);
+	
+	int updateByMonth(Integer month);
+	int updateByYear();
 }

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderBillNewMapper.xml

@@ -489,6 +489,9 @@
   	left join t_order_new o on o.order_no = b.order_no
   	left join admin oa on oa.id = o.salesman_id
   	where b.delete_sign = 0 
+  	<if test='b.orderNo != null and b.orderNo != ""'>
+  	and b.order_no = #{b.orderNo,jdbcType=VARCHAR}
+  	</if>
   	<if test='b.creater != null and b.creater != ""'>
   	and b.creater = #{b.creater,jdbcType=VARCHAR}
   	</if>
@@ -521,6 +524,9 @@
   	left join t_order_new o on o.order_no = b.order_no
   	left join admin oa on oa.id = o.salesman_id
   	where b.delete_sign = 0 
+  	<if test='b.orderNo != null and b.orderNo != ""'>
+  	and b.order_no = #{b.orderNo,jdbcType=VARCHAR}
+  	</if>
   	<if test='b.creater != null and b.creater != ""'>
   	and b.creater = #{b.creater,jdbcType=VARCHAR}
   	</if>

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

@@ -317,7 +317,7 @@
   </update>
    <!-- 定时插入上月的签单数据 -->
   <insert id="insertLastMonthOrderData" parameterType="java.lang.String">
-  	INSERT INTO t_order_month_report(`type`,`month`,amount,proof_count,salemans_id) 
+  	REPLACE INTO t_order_month_report(`type`,`month`,amount,proof_count,salemans_id) 
 	select o.order_type, date_format(DATE_ADD(NOW(),INTERVAL -1 MONTH),'%Y%m'),sum(o.total_amount), sum(o.proof_count), o.salesman_id 
 	from t_order_new o
 	where 1 = 1
@@ -327,9 +327,9 @@
   </insert>
   <!-- 定时插入上一年的数据 -->
   <insert id="insertLastYearOrderData" parameterType="java.lang.String">
-  	INSERT INTO t_order_year_report(`type`,`year`,amount,proof_count,salemans_id) 
-	select m.`type`, m.`year`, sum(amount), sum(proof_count), salemans_id from t_order_month_report m
-	where m.`year` = year(date_sub(now(),interval 1 year))
+  	REPLACE INTO t_order_year_report(`type`,`year`,amount,proof_count,salemans_id) 
+	select m.`type`, year(date_sub(now(),interval 1 year)), sum(amount), sum(proof_count), salemans_id from t_order_month_report m
+	where CAST(`month` as CHAR) like concat (year(date_sub(now(),interval 1 year)),'%') 
 	group by m.salemans_id , m.`type`
   </insert>
   <!-- 查看订单统计数据 -->
@@ -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 + '%'"/>
@@ -459,4 +459,33 @@
 	  	
 	WHERE y.salemans_id = m.salemans_id and y.type = m.type and year = date_format(now(),'%Y')
  </update>
+ 
+ <!-- 新增某人某月某类型的统计数据 -->
+ <insert id="insertBySome" parameterType="com.goafanti.common.model.TOrderNew">
+ 	INSERT INTO t_order_month_report(`type`,`month`,amount,proof_count,salemans_id) 
+ 	select order_type,  date_format( sign_time , '%Y%m' ), sum(total_amount) as amount, sum(proof_count) as proof_count,   salesman_id  
+	from t_order_new 
+	  	where  
+	  	proof_status = 1 
+	  	and salesman_id = #{salesmanId,jdbcType=VARCHAR} 
+	  	and order_type = #{orderType,jdbcType=INTEGER}
+	  	and date_format( sign_time , '%Y%m' )  = date_format( #{signTime,jdbcType=DATE}, '%Y%m' )
+ </insert>
+ <!-- 更新指定月份的统计数据 -->
+ <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(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
+	  and date_format( o.sign_time, '%Y%m' ) = #{month,jdbcType=INTEGER}
+	group by o.salesman_id , o.order_type
+ </insert>
+ <!-- 更新本年的年统计数据 -->
+ <insert id="updateByYear">
+ 	REPLACE INTO t_order_year_report(`type`,`year`,amount,proof_count,salemans_id) 
+	select m.`type`, year(now()), sum(amount), sum(proof_count), salemans_id from t_order_month_report m
+	where CAST(`month` as CHAR) like concat (year(now()),'%') 
+	group by m.salemans_id , m.`type`
+ </insert>
 </mapper>

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

@@ -453,7 +453,8 @@
   <!-- 财务专员查看自己处理的退款数据  -->
   <select id="getRefundList" parameterType="Map" resultType="com.goafanti.order.bo.OrderRefundBo">
   select r.id as id , r.create_time as createTime, r.order_no as orderNo, u.nickname as buyName, u.id as buyid, o.order_status as orderStatus,
-  	a.name as saleName, a.id as saleId, o.liquidation_status as liquidationStatus ,reason as reason,refund_status as  refundStatus
+  	a.name as saleName, a.id as saleId, o.liquidation_status as liquidationStatus ,reason as reason,refund_status as  refundStatus,
+  	o.refund_amount as refundAmount
   	from t_order_refund r
   	 left join t_order_new o on r.order_no = o.order_no
   	 left join `user` u on o.buyer_id = u.id
@@ -478,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>
@@ -494,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 + '%'"/>

+ 2 - 2
src/main/java/com/goafanti/common/task/MonthReportTask.java

@@ -20,12 +20,12 @@ public class MonthReportTask {
      * 每月1号7点执行任务
      */
     @Scheduled(cron = "0 0 7 1 * ?")
-   //@Scheduled(cron = "0 3 18 * * ?")
+    //@Scheduled(cron = "0 3 16 * * ?")
     public void testTask(){
     	//新增月数据
     	int count = orderReportServiceImpl.insertOrderStatisticsByMonthTask();
     	//更新年数据
-    	int c = orderReportServiceImpl.updateYearReportData();
+    	int c = orderReportServiceImpl.saveYearReportData();
     	
     	LoggerUtils.debug(logger, "统计上月订单【%s】条。", count);
     	LoggerUtils.debug(logger, "更新年订单【%s】条。", c);

+ 29 - 0
src/main/java/com/goafanti/common/task/YearReportTask.java

@@ -0,0 +1,29 @@
+package com.goafanti.common.task;
+
+import javax.annotation.Resource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.order.service.OrderReportService;
+
+@Component
+public class YearReportTask {
+	@Resource
+	private  OrderReportService	orderReportServiceImpl;
+	
+	Logger	logger	= LoggerFactory.getLogger(YearReportTask.class);
+	/**
+     * 每年1月1日0点执行任务
+     */
+	//@Scheduled(cron = "0 10 14 * * ?")
+    @Scheduled(cron = "0 0 0 1 1 ?")
+    public void testTask(){
+    	//新增年数据
+    	int c = orderReportServiceImpl.saveLastYearReportData();
+    	LoggerUtils.debug(logger, "统计去年订单【%s】条。", c);
+    }
+}

+ 12 - 15
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){
-		String comment[] = {"订单编号", "订单负责人", "签单日期", "客户名称", "签单金额", "首付款", "已收","已退","订单状态","项目状态","发放类型",
-							"校对后单量","发放状态","当月认证项目数量","当月科技项目数量","年度认证项目数量","年度科技项目数量"};
-		//map 数据 ,deptnames 部门名称,comment表头 (列名称)
+	public static XSSFWorkbook exportDeptBonusInfoS(Map<String,List<TOrderBonusBo>> map){
+		String 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);
@@ -574,7 +571,7 @@ public class ExportExcelUtil {
 				r.createCell(9).setCellValue(ProjectNewStage.getValueByCode(ob.getProjectStatus()));
 				
 				r.createCell(10).setCellValue(BonusSubject.getValueByCode(ob.getBonusSubject()));
-				r.createCell(11).setCellValue(ob.getProofCount());
+				r.createCell(11).setCellValue(ob.getProofCount().toString());
 				r.createCell(12).setCellValue(ob.getGrantStatus() == 0? "未发放":"已发放");
 				
 				r.createCell(13).setCellValue(ob.getRenzm());

+ 1 - 21
src/main/java/com/goafanti/common/utils/SendEmailUtil.java

@@ -1,7 +1,6 @@
 package com.goafanti.common.utils;
 
 import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
 import java.security.GeneralSecurityException;
 import java.util.Date;
 import java.util.Properties;
@@ -20,25 +19,6 @@ import com.goafanti.common.bo.EmailBo;
 import com.goafanti.order.enums.OrderNewState;
 import com.sun.mail.util.MailSSLSocketFactory;
 
-
-//public class Singleton {
-//
-//    private static volatile Singleton singleton;
-//
-//    private Singleton() {}
-//
-//    public static Singleton getInstance() {
-//        if (singleton == null) {
-//            synchronized (Singleton.class) {
-//                if (singleton == null) {
-//                    singleton = new Singleton();
-//                }
-//            }
-//        }
-//        return singleton;
-//    }
-//}
-
 public class SendEmailUtil {
 	private static Session session;
 	private static volatile SendEmailUtil singleton;
@@ -120,7 +100,7 @@ public class SendEmailUtil {
 			msg.setSubject(emailBo.getSubject());
 			msg.setSentDate(new Date());
 			msg.setContent(emailBo.format(ees[i]), "text/html;charset=utf-8");
-			//Send the message
+			// Send the message
 			Transport.send(msg);
 		}
 	}

+ 8 - 0
src/main/java/com/goafanti/order/bo/OrderRefundBo.java

@@ -12,6 +12,7 @@ public class OrderRefundBo extends TOrderRefund {
 	private String saleId;
 	private String startTime;
 	private String endTime;
+	private String refundAmount;
 	public String getBuyName() {
 		return buyName;
 	}
@@ -60,4 +61,11 @@ public class OrderRefundBo extends TOrderRefund {
 	public void setEndTime(String endTime) {
 		this.endTime = endTime;
 	}
+	public String getRefundAmount() {
+		return refundAmount;
+	}
+	public void setRefundAmount(String refundAmount) {
+		this.refundAmount = refundAmount;
+	}
+	
 }

+ 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("", "没有指定订单日期"));

+ 12 - 0
src/main/java/com/goafanti/order/service/OrderReportService.java

@@ -48,4 +48,16 @@ public interface OrderReportService {
 	 */
 	int updateYearReportData();
 	
+	/**
+	 * 每年定时统计去年订单
+	 * @return
+	 */
+	int saveLastYearReportData();
+	
+	/**
+	 * 统计今年订单
+	 * @return
+	 */
+	int saveYearReportData();
+	
 }

Разница между файлами не показана из-за своего большого размера
+ 53 - 28
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java


+ 2 - 6
src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java

@@ -42,32 +42,28 @@ 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 = {"平台流水编号","平台流水时间","交易金额","付款方","收款方","流水科目","交易渠道","交易时间","财务流水号","订单编号","订单负责人"};
+		String[] comment = {"平台流水编号","平台流水时间","交易金额(万元)","付款方","收款方","流水科目","交易渠道","交易时间","财务流水号","订单编号","订单负责人"};
 		String filePath = uploadPath + "/billtemp";
 //		File f = new File(filePath);
 //		if(!f.exists()){
 //			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;
 	}
 }

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

@@ -521,7 +521,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (list==null && list.size()==0) {
 			return null;
 		}
-		String[] comment = {"订单编号","签单时间","客户名称","订单状态","签单金额","项目状态","结算状态","已收款","订单负责人","催收科目","催款启动日期"};
+		String[] comment = {"订单编号","签单时间","客户名称","订单状态","签单金额(万元)","项目状态","结算状态","已收款(万元)","订单负责人","催收科目","催款启动日期"};
 		String filePath = uploadPath + "/OrderDun";
 		XSSFWorkbook wb = ExportExcelUtil.exportOrderDunData(list, comment, filePath);
 		return wb;

+ 10 - 0
src/main/java/com/goafanti/order/service/impl/OrderReportServiceImpl.java

@@ -88,8 +88,18 @@ public class OrderReportServiceImpl extends BaseMybatisDao<TOrderMonthReportMapp
 
 	@Override
 	public int updateYearReportData() {
+		
 		return monthReportMapper.updateYearReportData(null);
 	}
+
+	@Override
+	public int saveLastYearReportData() {
+		return monthReportMapper.insertLastYearOrderData();
+	}
 	
+	@Override
+	public int saveYearReportData() {
+		return monthReportMapper.updateByYear();
+	}
 	
 }