Browse Source

Merge branch 'test' of ssh://git@git.jishutao.com:55555/jishutao/kede-server.git into test

anderx 7 years ago
parent
commit
54f9c72b18

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

@@ -321,7 +321,7 @@
 	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
-	  and o.proof_status = 1
+	  and o.proof_status = 1 and o.delete_sign = 0 and o.order_status <> 7
 	  and PERIOD_DIFF( date_format( now( ) , '%Y%m' ) , date_format( o.sign_time, '%Y%m' ) ) = 1
 	group by o.salesman_id , o.order_type
   </insert>
@@ -334,7 +334,8 @@
   </insert>
   <!-- 查看订单统计数据 -->
   <select id="getOrderReportDataList" parameterType="Map" resultType="com.goafanti.order.bo.OrderReportBo">
-  	select @rowno:= @rowno+1 as id, d.name as deptName, a.name as saleName, m.`type`, sum(proof_count) as proofCount, sum(amount) as amount
+  	select @rowno:= @rowno+1 as id, d.name as deptName, a.name as saleName, m.`type`, sum(proof_count) as proofCount, sum(amount) as amount,
+  	m.id as mid
 	from t_order_month_report m
 	left join admin a on m.salemans_id = a.id
 	left join department d on d.id = a.department_id
@@ -358,6 +359,7 @@
 	</if>
   </select>
   <select id="getOrderReportDataCount" parameterType="Map" resultType="java.lang.Integer">
+  select count(*) from (
   	select count(*)
 	from t_order_month_report m
 	left join admin a on m.salemans_id = a.id
@@ -374,6 +376,9 @@
 	<bind name="n" value=" '%' + r.saleName + '%'"/>
 	 and a.name like #{n,jdbcType=VARCHAR}
 	</if>
+	group by
+	a.department_id, a.id, m.`type`
+	)ff
   </select>
  <!-- 导出月统计 -->
  <select id="exportMonthData" parameterType="com.goafanti.order.bo.OrderReportBo" resultType="com.goafanti.order.bo.OrderReportBo">
@@ -466,7 +471,7 @@
  	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 
+	  	proof_status = 1 and o.delete_sign = 0 and o.order_status &lt;&gt; 7
 	  	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' )
@@ -477,7 +482,7 @@
 	select o.order_type, #{month,jdbcType=INTEGER},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 o.proof_status = 1 o.delete_sign = 0 and o.order_status &lt;&gt; 7
 	  and date_format( o.sign_time, '%Y%m' ) = #{month,jdbcType=INTEGER}
 	group by o.salesman_id , o.order_type
  </insert>

+ 7 - 0
src/main/java/com/goafanti/order/bo/OrderReportBo.java

@@ -13,6 +13,7 @@ public class OrderReportBo  extends TOrderMonthReport{
 	private String renzm;
 	private String kejiy;
 	private String renzy;
+	private Integer mid;
 	
 	public String getSaleName() {
 		return saleName;
@@ -74,5 +75,11 @@ public class OrderReportBo  extends TOrderMonthReport{
 	public void setRenzy(String renzy) {
 		this.renzy = renzy;
 	}
+	public Integer getMid() {
+		return mid;
+	}
+	public void setMid(Integer mid) {
+		this.mid = mid;
+	}
 	
 }

+ 6 - 5
src/main/java/com/goafanti/order/controller/OrderBonusStatisticsApiController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.model.TOrderMonthReport;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.utils.ExcelUtils;
 import com.goafanti.common.utils.ExportExcelUtil;
@@ -313,14 +314,14 @@ public class OrderBonusStatisticsApiController extends CertifyApiController {
 	}
 	 
 	/**
-	 * 发放营销员奖金
-	 * @param bonusBo
+	 * 手动更新校对单量
+	 * @param report
 	 * @return
 	 */
-	@RequestMapping(value = "/saleBonusPayment",method = RequestMethod.POST)
-	public Result saleBonusPayment(TOrderBonusBo bonusBo){
+	@RequestMapping(value="/updateProof", method = RequestMethod.POST)
+	public Result updateProof(TOrderMonthReport report){
 		Result res = new Result();
-		
+		res.setData(orderReportServiceImpl.updateMonthDataById(report));
 		return res;
 	}
 }

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

@@ -4,6 +4,7 @@ import java.util.Set;
 
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
+import com.goafanti.common.model.TOrderMonthReport;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.OrderReportBo;
 
@@ -60,4 +61,11 @@ public interface OrderReportService {
 	 */
 	int saveYearReportData();
 	
+	/**
+	 * 手动修改统计数据
+	 * @param id
+	 * @return
+	 */
+	int updateMonthDataById(TOrderMonthReport report);
+	
 }

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

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.TOrderMonthReportMapper;
 import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.TOrderMonthReport;
 import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -101,5 +102,10 @@ public class OrderReportServiceImpl extends BaseMybatisDao<TOrderMonthReportMapp
 	public int saveYearReportData() {
 		return monthReportMapper.updateByYear();
 	}
+
+	@Override
+	public int updateMonthDataById(TOrderMonthReport report) {
+		return monthReportMapper.updateByPrimaryKeySelective(report);
+	}
 	
 }