Browse Source

导出表头文字修改,流水搜索加订单编号筛选

limin 7 years ago
parent
commit
b33ce0b1e5

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

@@ -90,4 +90,5 @@ public interface TOrderMonthReportMapper {
 	int proofDataBySomeBody(TOrderNew orderNew);
 	
 	int updateYearReportData(String d);
+	int insertLastYearOrderData();
 }

+ 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>

+ 2 - 1
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

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

@@ -521,8 +521,8 @@ public class ExportExcelUtil {
 	 * @return
 	 */
 	public static XSSFWorkbook exportDeptBonusInfoS(Map<String,List<TOrderBonusBo>> map,String[] deptnames){
-		String comment[] = {"订单编号", "订单负责人", "签单日期", "客户名称", "签单金额", "首付款", "已收","已退","订单状态","项目状态","发放类型",
-							"校对后单量","发放状态","当月认证项目数量","当月科技项目数量","年度认证项目数量","年度科技项目数量"};
+		String comment[] = {"订单编号", "订单负责人", "签单日期", "客户名称", "签单金额(万元)", "首付款(万元)", "已收(万元)","已退(万元)","订单状态","项目状态","发放类型",
+							"校对后单量(个)","发放状态","当月认证项目数量","当月科技项目数量","年度认证项目数量","年度科技项目数量"};
 		//map 数据 ,deptnames 部门名称,comment表头 (列名称)
 		//1,创建一个workbook,对应的是一个excel文件
 		XSSFWorkbook wb = new XSSFWorkbook();
@@ -573,7 +573,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());

+ 0 - 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.util.Date;
 import java.util.Properties;
 
@@ -16,26 +15,6 @@ import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeUtility;
 
 import com.goafanti.common.bo.EmailBo;
-import com.goafanti.order.enums.OrderNewState;
-
-
-//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;

+ 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;
+	}
+	
 }

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

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

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

@@ -60,7 +60,7 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 			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()){

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

@@ -525,7 +525,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;

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

@@ -90,6 +90,11 @@ public class OrderReportServiceImpl extends BaseMybatisDao<TOrderMonthReportMapp
 	public int updateYearReportData() {
 		return monthReportMapper.updateYearReportData(null);
 	}
+
+	@Override
+	public int saveYearReportData() {
+		return monthReportMapper.insertLastYearOrderData();
+	}
 	
 	
 }