anderx пре 4 година
родитељ
комит
19b061229c

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

@@ -87,7 +87,7 @@ public interface NewOrderDunMapper {
 
 	void insertBatch(List<OutNewOrderDunBo> newtd2);
 
-	List<OutSelectOrderDunAll> selectOrderDunAll(@Param("depId") String depId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+	List<OutSelectOrderDunAll> selectOrderDunAll(@Param("depId") String depId, @Param("startDate") String startDate, @Param("endDate") String endDate,@Param("sort") Integer sort);
 
 	List<OutSelectOrderDun> selectOrderDun(@Param("depId") String depId,@Param("aid") String aid,@Param("sort") Integer sort,@Param("province") Integer province,
 										   @Param("startDate") String startDate, @Param("endDate")  String endDate);

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

@@ -26,5 +26,5 @@ public interface PublicReleaseCountMapper {
                                                        @Param("province")Integer province ,@Param("sort")Integer sort);
 
     List<outProvinceFollowStatistic> provinceFollowStatisticsList(@Param("depId")String depId, @Param("date")String date,
-                                                                  @Param("province")Integer province ,@Param("sort")Integer sort);
+                                                                  @Param("province")Integer province ,@Param("type")Integer type,@Param("sort")Integer sort);
 }

+ 7 - 6
src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml

@@ -506,6 +506,11 @@
       and b.department_id = #{depId}
     </if>
      )y group by y.province)z left join district_glossory dg on z.province=dg.id
+    order by
+    <if test="sort==0"> z.receivables </if>
+    <if test="sort==1"> z.quantity </if>
+    <if test="sort==2"> z.totalAmount </if>
+     desc
   </select>
 
 
@@ -529,12 +534,8 @@
     and b.id= #{aid}
       </if>
     )y group by y.depName,y.name,y.id)z order by
-     <if test="sort=0">
-       z.totalAmount
-     </if>
-    <if test="sort=1">
-      z.totalAmount
-    </if>
+    <if test="sort==0"> z.totalAmount </if>
+    <if test="sort==1"> z.money </if>
     desc
   </select>
 </mapper>

+ 9 - 3
src/main/java/com/goafanti/common/mapper/PublicReleaseCountMapper.xml

@@ -145,9 +145,9 @@
     new_interview ,new_quantity ,new_total ,(new_quantity/new_interview)newRatio,
     (use_interview+new_interview)totalInterview,(use_quantity+new_quantity)totalQuantity,(use_total+new_total)total
     from (select dg.id,dg.name,use_interview, use_quantity,use_total,new_interview,new_quantity,new_total
-    from (select province,sum(if(new_user=1,1,0))use_interview,sum(if(new_user=1,a.quantity ,0))use_quantity,sum(if(new_user=1,a.total ,0))use_total,
-    sum(if(new_user=0,1,0))new_interview,sum(if(new_user=0,a.quantity ,0))new_quantity,sum(if(new_user=0,a.total ,0))new_total
-    from public_release_count a
+    from (select province,sum(if(new_user=1,a.quantity,0))use_interview,sum(if(new_user=1,a.sign ,0))use_quantity,
+    sum(if(new_user=1,a.total ,0))use_total, sum(if(new_user=0,a.quantity,0))new_interview,sum(if(new_user=0,a.sign ,0))new_quantity,
+    sum(if(new_user=0,a.total ,0))new_total from public_release_count a
     where a.`date` = #{date}
     <if test="depId !=null">
       and a.dep_id= #{depId}
@@ -176,6 +176,12 @@
     <if test="depId !=null">
       and a.dep_id = #{depId}
     </if>
+    <if test="type ==1">
+      and a.new_user =1
+    </if>
+    <if test="type ==2">
+      and a.new_user =0
+    </if>
     group by b.id,b.name ,a.uid ,a.new_user )x
     left join `user` c on x.uid =c.id
     order by

+ 18 - 6
src/main/java/com/goafanti/order/controller/AdminNewOrderDunApiController.java

@@ -108,13 +108,18 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 	全国应收款统计
+	 * 全国应收款统计
+	 * @param depId
+	 * @param depName
+	 * @param startDate
+	 * @param endDate
+	 * @param sort 0按应收款 1按单量 2按金额
 	 * @return
 	 */
 	@RequestMapping(value = "/selectOrderDunAll",method = RequestMethod.GET)
-	public Result selectOrderDunAll(String depId,String depName,String startDate ,String endDate){
+	public Result selectOrderDunAll(String depId,String depName,String startDate ,String endDate,Integer sort){
 		Result res = new Result();
-		List<OutSelectOrderDunAll> list =newOrderDunService.selectOrderDunAll(depId,startDate,endDate);
+		List<OutSelectOrderDunAll> list =newOrderDunService.selectOrderDunAll(depId,startDate,endDate, sort);
 		res.data(list);
 		return res;
 	}
@@ -124,11 +129,17 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/selectOrderDunAllExprot",method = RequestMethod.GET)
-	public Result selectOrderDunAllExprot(String depId,String depName,String startDate ,String endDate){
-		List<OutSelectOrderDunAll> list=newOrderDunService.selectOrderDunAll(depId,startDate,endDate);
+	public Result selectOrderDunAllExprot(String depId,String depName,String startDate ,String endDate,Integer sort){
+		List<OutSelectOrderDunAll> list=newOrderDunService.selectOrderDunAll(depId,startDate,endDate, sort);
 		NewExcelUtil<OutSelectOrderDunAll> excelUtil=new NewExcelUtil<>(OutSelectOrderDunAll.class);
 		StringBuffer sb=new StringBuffer("搜索条件=》");
 		if (depName!=null)sb=sb.append("省份:").append(depName).append(",");
+		if (sort!=null){
+			sb=sb.append("排序:");
+			if (sort==0)sb=sb.append("排序:").append("按应收款").append(",");
+			if (sort==1)sb=sb.append("排序:").append("按单量").append(",");
+			if (sort==2)sb=sb.append("排序:").append("按金额").append(",");
+		}
 		if(startDate!=null&&endDate!=null)sb=sb.append("催收时间:").append(startDate).append("~").append(endDate).append(",");
 		return excelUtil.exportExcel(list,"签单统计表",uploadPath,sb.substring(0,sb.toString().length()-1));
 	}
@@ -156,7 +167,8 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
 		if (depName!=null)sb=sb.append("催收部门:").append(depName).append(",");
 		if (aName!=null)sb=sb.append("催款人:").append(aName).append(",");
 		if (sort!=null){
-			if (sort==0)sb=sb.append("排序:").append("按签单金额").append(",");
+			sb=sb.append("排序:");
+			if (sort==0)sb=sb.append("排序:").append("按签单额").append(",");
 			if (sort==1)sb=sb.append("排序:").append("按应收款").append(",");
 		}
 		if(startDate!=null&&endDate!=null)sb=sb.append("催收时间:").append(startDate).append("~").append(endDate).append(",");

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

@@ -26,7 +26,7 @@ public interface NewOrderDunService {
 	List<OutNewOrderDunBo> selectAllOrderDun();
 
 
-    List<OutSelectOrderDunAll> selectOrderDunAll(String depId, String startDate, String endDate);
+    List<OutSelectOrderDunAll> selectOrderDunAll(String depId, String startDate, String endDate,Integer sort);
 
 	List<OutSelectOrderDun> selectOrderDun(String depId, String depName, String aid, String aName,Integer sort,Integer province,String startDate, String endDate);
 }

+ 3 - 2
src/main/java/com/goafanti/order/service/impl/NewOrderDunServiceImpl.java

@@ -78,9 +78,10 @@ public class NewOrderDunServiceImpl extends BaseMybatisDao<NewOrderDunMapper> im
 	}
 
 	@Override
-	public List<OutSelectOrderDunAll> selectOrderDunAll(String depId, String startDate, String endDate) {
+	public List<OutSelectOrderDunAll> selectOrderDunAll(String depId, String startDate, String endDate,Integer sort) {
 		endDate=endDate+" 23:59:59";
-		return newOrderDunMapper.selectOrderDunAll(depId,startDate,endDate);
+		if(sort==null)sort=0;
+		return newOrderDunMapper.selectOrderDunAll(depId,startDate,endDate, sort);
 	}
 
 	@Override

+ 9 - 4
src/main/java/com/goafanti/user/controller/UserFollowController.java

@@ -87,12 +87,17 @@ public class UserFollowController extends BaseApiController {
 
     /**
      * 省份面谈跟进统计
+     * @param depId 部门编号
+     * @param date 日期 YYYY-MM
+     * @param province 省份编号
+     * @param type 分类 0所有 1旧客户 2新客户
+     * @param sort 排序 0签单 1面谈
      * @return
      */
     @RequestMapping(value = "/provinceFollowStatisticsList", method = RequestMethod.GET)
-    public Result  provinceFollowStatisticsList(String depId,String date,Integer province,Integer sort){
+    public Result  provinceFollowStatisticsList(String depId,String date,Integer province,Integer type,Integer sort){
         Result res =new Result();
-        return res.data(userFollowService.provinceFollowStatisticsList(depId,date,province,sort));
+        return res.data(userFollowService.provinceFollowStatisticsList(depId,date,province,type,sort));
     }
 
     /**
@@ -100,8 +105,8 @@ public class UserFollowController extends BaseApiController {
      * @return
      */
     @RequestMapping(value = "/provinceFollowStatisticsListExport", method = RequestMethod.GET)
-    public Result  provinceFollowStatisticsListExport(String depId,String depName,String date,Integer province,String provinceName,Integer sort){
-        List<outProvinceFollowStatistic> list = userFollowService.provinceFollowStatisticsList(depId, date, province, sort);
+    public Result  provinceFollowStatisticsListExport(String depId,String depName,String date,Integer province,String provinceName,Integer type,Integer sort){
+        List<outProvinceFollowStatistic> list = userFollowService.provinceFollowStatisticsList(depId, date, province,type, sort);
         NewExcelUtil<outProvinceFollowStatistic>excelUtil =new NewExcelUtil<>(outProvinceFollowStatistic.class);
         StringBuffer sb=new StringBuffer("搜索条件=》");
         if (depName!=null)sb=sb.append("部门:").append(depName).append(",");

+ 1 - 1
src/main/java/com/goafanti/user/service/UserFollowService.java

@@ -15,5 +15,5 @@ public interface UserFollowService {
 
     List<outFollowStatisticsList> followStatisticsList(String depId, String date,Integer province, Integer sort);
 
-    List<outProvinceFollowStatistic> provinceFollowStatisticsList(String depId, String date, Integer province, Integer sort);
+    List<outProvinceFollowStatistic> provinceFollowStatisticsList(String depId, String date, Integer province,Integer type ,Integer sort);
 }

+ 2 - 2
src/main/java/com/goafanti/user/service/impl/UserFollowServiceImpl.java

@@ -82,8 +82,8 @@ public class UserFollowServiceImpl extends BaseMybatisDao<UserFollowMapper>  imp
     }
 
     @Override
-    public List<outProvinceFollowStatistic> provinceFollowStatisticsList(String depId, String date, Integer province, Integer sort) {
+    public List<outProvinceFollowStatistic> provinceFollowStatisticsList(String depId, String date, Integer province,Integer type, Integer sort) {
         if(sort==null)sort=0;
-        return publicReleaseCountMapper.provinceFollowStatisticsList(depId,date,province,sort);
+        return publicReleaseCountMapper.provinceFollowStatisticsList(depId,date,province,type,sort);
     }
 }