Sfoglia il codice sorgente

订单项目统计开发

anderx 1 anno fa
parent
commit
851f6d5a95

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

@@ -90,4 +90,5 @@ public interface TOrderTaskMapper {
 
     List<String> selectOrderNoAllByaid(String aid);
 
+    OutOrderProject selectStatisticsOrderProject(InputOrderProject in);
 }

+ 20 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -2501,7 +2501,7 @@
 
 
 
-  <delete id="deleteBySplitId" parameterType="java.lang.Integer">
+    <delete id="deleteBySplitId" parameterType="java.lang.Integer">
     delete from t_order_task
     where split_super = #{id,jdbcType=INTEGER}
   </delete>
@@ -2511,4 +2511,23 @@
     where manager_id = #{aid}
   </update>
 
+  <select id="selectStatisticsOrderProject" resultType="com.goafanti.order.bo.OutOrderProject">
+    SELECT a.order_no as orderNo, a.order_type orderType,a.sales_type as salesType,b.service_type AS serviceType,a.liquidation_status as liquidationStatus,
+           '催款节点' as dunNodeContent,b.project_type as projectType, a.total_amount as totalAmount,a.approval ,a.sign_time as signTime,
+           a.create_time as createTime,b.buyer_name as buyerName,a.contract_no as contractNo, d.bname htlx,
+           a.settlement_amount as settlementAmount,b.invoice_amount as invicueAmount, b.cost_amount as costAmount,b.payment_amount as paymentAmount,
+           b.finance_name as financeName,b.salesman_name as salesmanName, e.commodity_name as commodityName,e2.service_year as serviceYear,
+           e2.service_life as serviceLife,e2.year_sum as yearSum,e.task_distribution_time as taskDistributionTime ,e.commodity_quantity as commodityQuantity,
+           e3.cost_amount as costAmount,e.project_status as  projectStatus,e.task_start_time as taskStartTime,e.task_end_time as taskEndTime,
+           e.receiver_name as receiverName ,'技术组',t1.cb,a.order_type orderType,
+           e.task_comment taskComment,'核算比例',a.order_status orderStatus,t1.counts,t1.tdtk
+    from t_order_new a left join t_order_mid b on a.order_no =b.order_no
+                       left join t_order_task c on a.order_no =c.order_no and c.main =1
+                       left join business_project d on c.commodity_id =d.id left join business_category d2 on d.cid =d2.id
+                       left join t_order_task e on a.order_no =e.order_no and e.split_status in (0,2)
+                       left join t_task_member e2 on e.id =e2.tid left join t_task_mid e3 on e.id =e3.tid
+                       left join (SELECT order_no ,count(*)counts,sum(if(`type`=0,1,0))tdtk,sum(if(`type`=4,1,0))cb
+                                  from new_order_change group by order_no ) t1 on a.order_no =t1.order_no
+    where a.process_status >6
+  </select>
 </mapper>

+ 4 - 0
src/main/java/com/goafanti/order/bo/InputOrderProject.java

@@ -0,0 +1,4 @@
+package com.goafanti.order.bo;
+
+public class InputOrderProject {
+}

+ 4 - 0
src/main/java/com/goafanti/order/bo/OutOrderProject.java

@@ -0,0 +1,4 @@
+package com.goafanti.order.bo;
+
+public class OutOrderProject {
+}

+ 15 - 0
src/main/java/com/goafanti/order/controller/StatisticsApiController.java

@@ -183,4 +183,19 @@ public class StatisticsApiController extends CertifyApiController {
 		return res;
 	}
 
+	/**
+	 * 销售来源订单列表
+	 * @param in
+	 * @return
+	 */
+	@RequestMapping(value="/orderProject", method = RequestMethod.GET)
+	public Result orderProject(InputOrderProject in ){
+		Result res=new Result();
+		res.data(userStaticticsService.orderProject(in));
+		return res;
+	}
+
+
+
+
 }

+ 2 - 0
src/main/java/com/goafanti/order/service/UserStaticticsService.java

@@ -16,4 +16,6 @@ public interface UserStaticticsService {
     Pagination<TOrderNewBo> signStatisticsOrderList(InputSignStatistics in);
 
     List<OutSignStatistics> signStatisticsGetList(InputSignStatistics in);
+
+    Object orderProject(InputOrderProject in);
 }

+ 15 - 2
src/main/java/com/goafanti/order/service/impl/UserStatisticsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.goafanti.order.service.impl;
 
 import com.goafanti.admin.service.DepartmentService;
+import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.dao.UserMidMapper;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -11,7 +12,9 @@ import groovy.util.logging.Log4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 @Log4j
@@ -19,6 +22,8 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
 
 	@Autowired
 	private DepartmentService departmentService;
+	@Autowired
+	private TOrderTaskMapper tOrderTaskMapper;
 
 	@Override
 	public Pagination<OutSignSummary> signSummary(InputSignSummary in) {
@@ -67,7 +72,9 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
 	}
 
 
-	private void addsignStatisticsParam(InputSignStatistics in, Map<String, Object> map) {
+
+
+    private void addsignStatisticsParam(InputSignStatistics in, Map<String, Object> map) {
 		if (in.getDeps()!=null){
 			map.put("deps",departmentService.parseArray(in.getDeps()));
 		}
@@ -85,4 +92,10 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
 		addsignStatisticsParam(in, map);
 		return (Pagination<TOrderNewBo>) findPage("selectsignStatisticsOrderList","selectsignStatisticsOrderCount",map,in.getPageNo(),in.getPageSize());
 	}
+
+	@Override
+	public Object orderProject(InputOrderProject in) {
+		tOrderTaskMapper.selectStatisticsOrderProject(in);
+		return null;
+	}
 }