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

Merge branch 'test2' of jishutao/kede-server into prod

anderx 1 год назад
Родитель
Сommit
c9cd653e7d
38 измененных файлов с 905 добавлено и 637 удалено
  1. 3 2
      src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java
  2. 1 1
      src/main/java/com/goafanti/admin/service/NewAdminService.java
  3. 33 30
      src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java
  4. 27 4
      src/main/java/com/goafanti/admin/service/impl/AdminStatisticsServiceImpl.java
  5. 4 2
      src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java
  6. 2 0
      src/main/java/com/goafanti/common/dao/AdminMapper.java
  7. 0 7
      src/main/java/com/goafanti/common/dao/AdminUserCountMapper.java
  8. 6 3
      src/main/java/com/goafanti/common/dao/NewOrderDunMapper.java
  9. 32 24
      src/main/java/com/goafanti/common/mapper/AdminMapper.xml
  10. 1 23
      src/main/java/com/goafanti/common/mapper/AdminUserCountMapper.xml
  11. 9 0
      src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml
  12. 4 1
      src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml
  13. 14 93
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  14. 104 16
      src/main/java/com/goafanti/common/mapper/TaskDetailsLogMapper.xml
  15. 160 72
      src/main/java/com/goafanti/common/mapper/TaskDetailsMapper.xml
  16. 4 2
      src/main/java/com/goafanti/common/mapper/UserFollowMapper.xml
  17. 9 8
      src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
  18. 92 8
      src/main/java/com/goafanti/common/model/TaskDetails.java
  19. 104 8
      src/main/java/com/goafanti/common/model/TaskDetailsLog.java
  20. 5 14
      src/main/java/com/goafanti/common/task/ReleaseUserTask.java
  21. 1 63
      src/main/java/com/goafanti/common/utils/AsyncUtils.java
  22. 118 15
      src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java
  23. 0 1
      src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java
  24. 4 10
      src/main/java/com/goafanti/customer/service/CustomerService.java
  25. 5 118
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  26. 21 0
      src/main/java/com/goafanti/order/bo/OrderListBo.java
  27. 1 1
      src/main/java/com/goafanti/order/controller/StatisticsApiController.java
  28. 0 1
      src/main/java/com/goafanti/order/service/OrderNewService.java
  29. 0 2
      src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java
  30. 1 46
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  31. 14 1
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  32. 0 4
      src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java
  33. 10 0
      src/main/java/com/goafanti/techproject/bo/InputTaskDetailsBo.java
  34. 12 0
      src/main/java/com/goafanti/techproject/bo/TaskDetailsBo.java
  35. 3 3
      src/main/java/com/goafanti/techproject/controller/TaskDetailsController.java
  36. 3 2
      src/main/java/com/goafanti/techproject/service/TaskDetailsService.java
  37. 98 15
      src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java
  38. 0 37
      src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

+ 3 - 2
src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java

@@ -66,7 +66,8 @@ public class AdminSuperviserApiController extends CertifyApiController {
 	 * 新增管理员
 	 */
 	@RequestMapping(value = "/insertAdmin", method = RequestMethod.POST)
-	public Result insertAdmin(@RequestParam(value = "roles[]", required = false) String[] roleIds, String data) {
+	public Result insertAdmin(@RequestParam(value = "roles[]", required = false) String[] roleIds, String data,
+							   String publicReviewerIds,String assistReviewerIds) {
 		Result res = new Result();
 		JSONObject jo = (JSONObject) JSON.parse(data);
 		List<String> roles = new ArrayList<String>();
@@ -111,7 +112,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 				ad.setPassword(AFTConstants.INITIALPASSWORD);
 			}
 			ad.setPassword(passwordUtil.getEncryptPwd(ad));
-			res.setData(newAdminService.insertNewAdmin(ad,roles));
+			res.setData(newAdminService.insertNewAdmin(ad,roles,publicReviewerIds,assistReviewerIds));
 		}
 		return res;
 	}

+ 1 - 1
src/main/java/com/goafanti/admin/service/NewAdminService.java

@@ -55,7 +55,7 @@ public interface NewAdminService {
 
 	Map<String, String> selectTechBroder();
 
-	int insertNewAdmin(Admin ad, List<String> roleIds);
+	int insertNewAdmin(Admin ad, List<String> roleIds,String publicReviewerIds,String assistReviewerIds);
 
 	Map<String, String> listAdminSelect();
 

+ 33 - 30
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -8,7 +8,10 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.error.BusinessException;
-import com.goafanti.common.model.*;
+import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.Department;
+import com.goafanti.common.model.FinanceCount;
+import com.goafanti.common.model.UserBusiness;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.StringUtils;
@@ -49,8 +52,6 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	@Autowired
 	private NewAdminService newAdminService;
 	@Autowired
-	private AdminUserCountMapper adminUserCountMapper;
-	@Autowired
 	private TOrderNewMapper TOrderNewMapper;
 	@Autowired
 	private ExpenseAccountMapper expenseAccountMapper;
@@ -384,7 +385,12 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	@Override
 	public DepCountBo selectAllUser(String depId, String startTime, String endTime,String aName) {
 		DepCountBo acb=new DepCountBo();
-		if (endTime!=null)endTime=endTime+" 23:59:59";
+		if (StringUtils.isBlank(startTime))startTime=null;
+		if (StringUtils.isBlank(endTime)){
+			endTime = null;
+		}else {
+			endTime=endTime+" 23:59:59";
+		}
 		List<DepCountBo >deps=new ArrayList<>();
 		List<Department> depIds=new ArrayList<>();
 		//总裁助力不查看老员工
@@ -715,30 +721,35 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 
 	@Override
 	public Result selectAllUserExport(String depId, String startTime, String endTime, String aName) {
-		String endTimeStr=endTime+" 23:59:59";
-		List<Department> depIds=new ArrayList<>();
-		//总裁助力不查看老员工
-		Integer seniorstaff = null;
-		if (TokenManager.hasRole(AFTConstants.CED_ASSISTANT)){
-			seniorstaff=0;
-		}
-		OrganizationListOut oo=departmentMapper.selectAllById(depId);
 		if(TokenManager.hasRole(AFTConstants.OPERATION_MANAGER)){
 			List<String> myShiroDep = departmentService.selectMyDeps();
 			if (!myShiroDep.contains(depId))throw new BusinessException("无权查看此部门信息");
 		}
-		depIds =departmentService.selectSubordinateDeps(depId);
-		Department department = new Department();
-		department.setId(depId);
-		depIds.add(department);
-		List<AdminCustomerBo> list =null;
-		//原sql计算
-//		list=departmentMapper.AlldepCount(depIds,startTime,  endTime);
-		//新java计算
-		list=AllDepCount(depIds,startTime,endTimeStr,seniorstaff);
+		DepCountBo depCountBo = selectAllUser(depId, startTime, endTime, aName);
+		List<AdminCustomerBo> adminCustomerBos =pushSelectAllUser(depCountBo);
 		NewExcelUtil excel=new NewExcelUtil(AdminCustomerBo.class);
 		String sheetName=String.format("部门统计表_%s~%s",startTime,endTime);
-		return excel.exportExcel(list,sheetName,uploadPath);
+		return excel.exportExcel(adminCustomerBos,sheetName,uploadPath);
+	}
+
+	private List<AdminCustomerBo> pushSelectAllUser(DepCountBo depCountBo) {
+		List<AdminCustomerBo> list = new ArrayList<>();
+		if (!depCountBo.getaList().isEmpty()){
+			list.addAll(depCountBo.getaList());
+		}
+		iterDeps(list,depCountBo.getList());
+		return list;
+	}
+
+	private void iterDeps(List<AdminCustomerBo> list, List<DepCountBo> list1) {
+		for (DepCountBo e : list1) {
+			if (!e.getaList().isEmpty()){
+				list.addAll(e.getaList());
+			}
+			if (!e.getList().isEmpty()){
+				iterDeps(list,e.getList());
+			}
+		}
 	}
 
 	/**
@@ -776,15 +787,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		}
 	}
 
-	private void publiAdminUserCount(List<AdminUserCount> list) {
-		for (AdminUserCount e : list) {
 
-			int i=adminUserCountMapper.updateByAidAndDateSelective(e);
-			if (i==0){
-				adminUserCountMapper.insertSelective(e);
-			}
-		}
-	}
 
 
 }

+ 27 - 4
src/main/java/com/goafanti/admin/service/impl/AdminStatisticsServiceImpl.java

@@ -35,14 +35,34 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
     private SalesTeamMapper salesTeamMapper;
     @Resource
     private AdminCallDayMapper adminCallDayMapper;
+    @Resource
+    private UserFollowMapper userFollowMapper;
+    @Resource
+    private NewOrderDunMapper newOrderDunMapper;
 
 
     @Override
     public Object info( String startTime, String endTime) {
         String aid=TokenManager.getAdminId();
         endTime=endTime+" 23:59:59";
+        //不再计算私有,签单,渠道
         AdminStatisticsBo adminStatisticsBo = adminMapper.adminStatisticsInfo(aid);
-        if (adminStatisticsBo==null)adminStatisticsBo=new AdminStatisticsBo();
+        if (adminStatisticsBo==null){
+            adminStatisticsBo=new AdminStatisticsBo();
+        }else {
+            //从客户中计算再添加到adminStatisticsBo
+            AdminStatisticsBo ListCount = adminMapper.selectUserCount(aid, null, null);
+            adminStatisticsBo.setPrivateSum(ListCount.getPrivateSum());
+            adminStatisticsBo.setSignSum(ListCount.getSignSum());
+            adminStatisticsBo.setChannelSum(ListCount.getChannelSum());
+            //计算公出次数
+            Integer publicSum = publicReleaseMapper.selectCountByaidAndDate(aid, null, null);
+            adminStatisticsBo.setPublicReleaseSum(publicSum);
+            //计算跟进次数
+            Integer followSum = userFollowMapper.selectByaidAndDate(aid, null, null);
+            adminStatisticsBo.setFollowSum(followSum);
+
+        }
         if (adminStatisticsBo.getReceivables()==null) adminStatisticsBo.setReceivables(new BigDecimal(0));
         AdminStatisticsBo asb = adminMapper.adminStatisticsInfoByTime(aid, startTime, endTime);
         if (asb==null) {
@@ -52,11 +72,14 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
             adminStatisticsBo.setRangeFollowSum(0);
             adminStatisticsBo.setRangeOrderSum(0);
         }else {
-            adminStatisticsBo.setRangePrivateSum(asb.getRangePrivateSum());
-            adminStatisticsBo.setRangeSignSum(asb.getRangeSignSum());
-            adminStatisticsBo.setRangeChannelSum(asb.getRangeChannelSum());
             adminStatisticsBo.setRangeFollowSum(asb.getRangeFollowSum());
             adminStatisticsBo.setRangeOrderSum(asb.getRangeOrderSum());
+            //从客户中计算再添加到adminStatisticsBo
+            AdminStatisticsBo ListCount = adminMapper.selectUserCount(aid, startTime, endTime);
+            adminStatisticsBo.setRangePrivateSum(ListCount.getPrivateSum());
+            adminStatisticsBo.setRangeSignSum(ListCount.getSignSum());
+            adminStatisticsBo.setRangeChannelSum(ListCount.getChannelSum());
+
         }
         Integer rangePublicReleaseSum=adminMapper.adminStatisticsPublicReleaseByAidAndTime(aid, startTime, endTime);
         if (rangePublicReleaseSum==null)rangePublicReleaseSum=0;

+ 4 - 2
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -296,7 +296,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 	}
 
 	@Override
-	public int insertNewAdmin(Admin ad ,List<String> roleIds) {
+	public int insertNewAdmin(Admin ad ,List<String> roleIds,String publicReviewerIds,String assistReviewerIds) {
 		ad.setStatus("0");
 		ad.setId(UUID.randomUUID().toString());
 		ad.setType(sumType(roleIds));
@@ -314,8 +314,10 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 			TokenManager.clearUserAuthByUserId(ad.getId());
 		}
 		if(ad.getAmbId()!=null)pushAmbRole(ad);
+		//修改公出审核人
+		if(publicReviewerIds!=null)updatePublicReviewer(ad.getId(),publicReviewerIds,0);
+		if(assistReviewerIds!=null)updatePublicReviewer(ad.getId(),assistReviewerIds,1);
 		adminMapper.insert(ad);
-
 		return 1;
 	}
 

+ 2 - 0
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -280,6 +280,8 @@ public interface AdminMapper {
     Admin selectByCallStaffNo(String staffNo);
 
     List<Admin> queryByTeamId(Integer id);
+
+    AdminStatisticsBo selectUserCount(@Param("aid") String aid, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }
 
 

+ 0 - 7
src/main/java/com/goafanti/common/dao/AdminUserCountMapper.java

@@ -1,9 +1,6 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.AdminUserCount;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 public interface AdminUserCountMapper {
     int deleteByPrimaryKey(Integer id);
@@ -20,10 +17,6 @@ public interface AdminUserCountMapper {
 
     int updateByAidAndDateSelective(AdminUserCount e);
 
-    int updateByaidAndDate(@Param("aid") String aid,@Param("startTime") String startTime,
-                           @Param("endTime")String endTime);
 
-    List<AdminUserCount> selectByaidAndDate(@Param("aid") String aid, @Param("startTime") String startTime);
 
-    void updateUserCountResetting(String aid);
 }

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

@@ -3,13 +3,13 @@ package com.goafanti.common.dao;
 import com.goafanti.common.model.NewOrderDun;
 import com.goafanti.common.model.NewOrderDunExample;
 import com.goafanti.order.bo.OutNewOrderDunBo;
-
-import java.util.List;
-
 import com.goafanti.order.bo.OutSelectOrderDun;
 import com.goafanti.order.bo.OutSelectOrderDunAll;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 public interface NewOrderDunMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
@@ -91,4 +91,7 @@ public interface NewOrderDunMapper {
 
 	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);
+
+
+	BigDecimal selectByAidAndDate(@Param("aid") String aid, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }

+ 32 - 24
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -1095,28 +1095,27 @@
         where a.id= #{aid}
     </select>
     <select id="adminStatisticsInfo" resultType="com.goafanti.admin.bo.AdminStatisticsBo">
-        select *
-        from (select aid ,sum(private_count)privateSum ,sum(channel_count)channelSum ,sum(sign_count)signSum ,
-                     sum(public_release_count)publicReleaseSum ,sum(follow_count) followSum,sum(order_count) orderSum
-              from admin_user_count a where aid=#{aid} group by aid)x
+        select x.id aid,y.projectCheckSum,y.projectStopSum,g.orderSum,g.changeSum,
+               z.rejectSum,t.receivables
+        from admin x
                  left join(select a.salesman_id aid , sum(if( b.project_status =29,1,0))projectStopSum ,
                                   sum(if(b.check_status=1,1,0))projectCheckSum from t_order_new a left join t_order_task b
-                                                                                                            on a.order_no =b.order_no where a.salesman_id =  #{aid})y on x.aid=y.aid
+                                                                                                            on a.order_no =b.order_no where a.salesman_id =  #{aid})y on x.id=y.aid
                  left join (  select salesman_id aid,  sum(1)orderSum, sum(if(delete_sign=2,1,0))changeSum
                               from t_order_new where delete_sign in (0,2,3) and process_status >0
-                                                 and salesman_id =  #{aid})g on x.aid=g.aid
+                                                 and salesman_id =  #{aid})g on x.id=g.aid
                  left join (  select salesman_id aid,  sum(if(order_status=3 or order_status=5,1,0))rejectSum
                               from t_order_new where delete_sign in (0,2,3)
-                                                 and salesman_id =  #{aid})z on x.aid=z.aid
+                                                 and salesman_id =  #{aid})z on x.id=z.aid
                  left join (  SELECT b.salesman_id aid ,sum(a.money)  receivables
                               from new_order_dun a left join t_order_new b on a.order_no =b.order_no
                               where a.status =1   and b.delete_sign in (0,2,3)
-                                and b.salesman_id = #{aid})t on x.aid=t.aid
+                                and b.salesman_id = #{aid})t on x.id=t.aid
+        where x.id= #{aid}
     </select>
 
     <select id="adminStatisticsInfoByTime" resultType="com.goafanti.admin.bo.AdminStatisticsBo">
-        select sum(private_count)rangePrivateSum ,sum(channel_count)rangeChannelSum ,sum(sign_count)rangeSignSum ,
-               sum(follow_count) rangeFollowSum,sum(order_count) rangeOrdersum
+        select sum(follow_count) rangeFollowSum,sum(order_count) rangeOrdersum
         from admin_user_count a where aid=#{aid} and  date_time BETWEEN #{startTime} and #{endTime}
         group by aid
     </select>
@@ -1194,16 +1193,17 @@
     <select id="consultantStatisticsInfoByTime" resultType="com.goafanti.admin.bo.ConsultantStatisticsBo">
         select a.id,x.projectCount,x.inProgress,x.notStarted,y.complete,y.stop,z.countPublicRelease,z.countAssist
         from admin a left join (select a.task_receiver aid,sum(commodity_quantity) projectCount,
-                                       sum(if(a.project_status=1,commodity_quantity,0)) inProgress,
-                                       sum(if(a.project_status=0,commodity_quantity,0)) notStarted from t_order_task a  where a.split_status in (0,2)
-                                                                                                                          and a.task_receiver = #{aid} and a.task_distribution_time BETWEEN #{startTime} and #{endTime} group by a.task_receiver )x on a.id=x.aid
+                           sum(if(a.project_status=1,commodity_quantity,0)) inProgress, sum(if(a.project_status=0,commodity_quantity,0)) notStarted
+                            from t_order_task a  where a.split_status in (0,2) and a.task_receiver = #{aid}
+                            and a.task_distribution_time BETWEEN #{startTime} and #{endTime} group by a.task_receiver )x on a.id=x.aid
                      left join (SELECT a.task_receiver aid,sum(if(a.project_status in (19,27) ,commodity_quantity,0)) complete,
-                                       sum(if(a.project_status in (2,3,29),commodity_quantity,0)) stop from t_order_task a left join task_time b on a.id=b.tid
+                                       sum(if(a.project_status in (2,3,29),commodity_quantity,0)) stop
+                                from t_order_task a left join task_time b on a.id=b.tid
                                 where a.split_status in (0,2) and b.project_status =a.project_status and a.task_receiver = #{aid}
                                   and b.date_time  BETWEEN #{startTime} and #{endTime} group by a.task_receiver )y on a.id=y.aid
                      left join (select aid,sum(if(a.`type` in (0,1,2),1,0)) countPublicRelease,sum(if(a.`type` in (3),1,0)) countAssist
                                 from public_release a left join public_release_details b on a.id=b.prid where aid=  #{aid} and a.status =2
-                                                                                                          and a.release_start BETWEEN #{startTime} and #{endTime} group by a.aid)z on a.id=z.aid
+                            and a.release_start BETWEEN #{startTime} and #{endTime} group by a.aid)z on a.id=z.aid
         where a.id=#{aid}
     </select>
     <select id="consultantthisMonthUser" resultType="com.goafanti.admin.bo.ConsultantUserCount">
@@ -1251,15 +1251,15 @@
         select x.aid,x.orderCount,x.expenseCount,x.invoiceCount,x.memberCount,x.paymentCount,b.counts publicCount,y.orderUnauditedCount,
                c.counts receivables,y.expenseUnauditedCount,y.invoiceUnauditedCount,y.memberUnauditedCount,y.paymentUnauditedCount
         from ( select a.aid,sum(a.order_count)orderCount ,sum(a.expense_count)expenseCount ,SUM(a.invoice_count) invoiceCount,
-                      sum(a.member_count) memberCount ,sum(a.payment_count)paymentCount from finance_count a where a.aid= #{aid} )x
-                 left join(select aid,sum(if(a.`type` in (0,1,2),1,0)) counts from public_release a left join public_release_details b on a.id=b.prid
-                           where a.status=2 and  a.aid= #{aid} )b  on x.aid=b.aid
-                 left join (SELECT c.finance_id aid,sum(a.money) counts from new_order_dun a left join t_order_new b on a.order_no =b.order_no
-                                                                                             left join department c on b.order_dep =c.id where a.status =1   and b.delete_sign in (0,2,3) and c.finance_id = #{aid} )c on x.aid=c.aid
-                 left join (select a.aid,sum(a.order_unaudited_count)orderUnauditedCount , sum(a.expense_unaudited_count)expenseUnauditedCount ,
-                                   SUM(a.invoice_unaudited_count) invoiceUnauditedCount, sum(a.member_unaudited_count) memberUnauditedCount ,
-                                   sum(a.payment_unaudited_count)paymentUnauditedCount from finance_count a where a.aid= #{aid}
-                                                                                                              and a.date_time BETWEEN #{startTime}  and #{endTime} group by a.aid)y on x.aid=y.aid
+                  sum(a.member_count) memberCount ,sum(a.payment_count)paymentCount from finance_count a where a.aid= #{aid} )x
+        left join(select aid,sum(if(a.`type` in (0,1,2),1,0)) counts from public_release a left join public_release_details b on a.id=b.prid
+               where a.status=2 and  a.aid= #{aid} )b  on x.aid=b.aid
+        left join (SELECT c.finance_id aid,sum(a.money) counts from new_order_dun a left join t_order_new b on a.order_no =b.order_no
+                 left join department c on b.order_dep =c.id where a.status =1   and b.delete_sign in (0,2,3) and c.finance_id = #{aid} )c on x.aid=c.aid
+        left join (select a.aid,sum(a.order_unaudited_count)orderUnauditedCount , sum(a.expense_unaudited_count)expenseUnauditedCount ,
+               SUM(a.invoice_unaudited_count) invoiceUnauditedCount, sum(a.member_unaudited_count) memberUnauditedCount ,
+               sum(a.payment_unaudited_count)paymentUnauditedCount from finance_count a where a.aid= #{aid}
+        and a.date_time BETWEEN #{startTime}  and #{endTime} group by a.aid)y on x.aid=y.aid
     </select>
     <select id="financeCountRangeReceivables" resultType="java.math.BigDecimal">
         SELECT  ifnull(sum(a.money),0)  receivables
@@ -1321,5 +1321,13 @@
         from admin
         where team_id = #{teamId}
     </select>
+    <select id="selectUserCount" resultType="com.goafanti.admin.bo.AdminStatisticsBo">
+        select aid,sum(if( share_type=0 and channel=0 and new_channel=0,1,0))privateSum,
+               sum(if(share_type=0 and new_channel=1,1,0))channelSum,
+               sum(if( share_type=2 ,1,0))signSum
+        from `user` where `type` =1   and source in(1,2,3)
+        AND aid = #{aid}
+        group by aid
+    </select>
 </mapper>
 

+ 1 - 23
src/main/java/com/goafanti/common/mapper/AdminUserCountMapper.xml

@@ -172,30 +172,8 @@
     </update>
 
 
-  <update id="updateByaidAndDate" >
-    update admin_user_count a,(select aid,dates,sum(sy)pr,sum(syqd)prc,sum(qd)sign
-    from (select  aid,if( share_type=0 and new_channel=0,1,0)sy,
-    if( share_type=0 and new_channel=1,1,0)syqd,if( share_type=2,1,0)qd,DATE_FORMAT(transfer_time , '%Y-%m-%d') dates
-    from user
-    where share_type in (0,2)
-    and  aid = #{aid}
-    and transfer_time BETWEEN #{startTime} and  #{endTime})x group by aid,dates
-    )b
-    set a.private_count =b.pr ,a.channel_count =b.prc,a.sign_count =b.sign
-    where a.aid=b.aid and a.date_time=b.dates
-  </update>
 
 
-  <select id="selectByaidAndDate"  resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from admin_user_count
-    where aid= #{aid} and date_time=#{startTime}
-  </select>
 
-  <update id="updateUserCountResetting">
-    update admin_user_count
-    set  private_count=0,sign_count=0,channel_count=0,order_count=0
-    where aid= #{aid}
-  </update>
+
 </mapper>

+ 9 - 0
src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml

@@ -538,4 +538,13 @@
     <if test="sort==1"> z.money </if>
     desc
   </select>
+  <select id="selectByAidAndDate" resultType="java.math.BigDecimal">
+      SELECT sum(money)
+      from new_order_dun a left join t_order_new b on a.order_no =b.order_no
+      where b.delete_sign in (0,2,3) and b.salesman_id = #{aid} and a.status =1
+      <if test="startTime!=null and endTime!=null">
+        and a.start_time between #{startTime} and #{endTime}
+      </if>
+  </select>
+
 </mapper>

+ 4 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -1062,7 +1062,10 @@
         from (select aid
               from public_release a left join public_release_details b on a.id=b.prid
               where status =2 and aid= #{aid}
-                and a.release_start BETWEEN #{startTime} and #{endTime} )x
+                <if test="startTime !=null and endTime !=null">
+                and a.release_start BETWEEN #{startTime} and #{endTime}
+              </if>
+              )x
         group by aid
     </select>
     <select id="selectByaidAndDate" resultType="com.goafanti.admin.bo.OutFinanceCount">

+ 14 - 93
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1156,6 +1156,14 @@
         left join (select * from  t_order_outsource where type=0) too on o.order_no=too.order_no
         left join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
         from t_order_approval group by order_no) toa on o.order_no=toa.order_no
+        <include refid="financeListSql"/>
+        order by o.liquidation_status, o.sign_time desc
+        <if test="page_sql != null">
+            ${page_sql}
+        </if>
+    </select>
+    <sql id="financeListSql">
+
         <if test="type !=null">
             inner join
             (select distinct order_no
@@ -1246,103 +1254,16 @@
             <bind name="d" value="o.endFinalReceivablesTime + ' 23:59:59'" />
             and a.final_Receivables_time between #{c,jdbcType=VARCHAR} and #{d,jdbcType=VARCHAR}
         </if>
-        order by o.liquidation_status, o.sign_time desc
-        <if test="page_sql != null">
-            ${page_sql}
+        <if test="o.startSignTime != null and o.startSignTime != &quot;&quot; and o.endSignTime != null and o.endSignTime != &quot;&quot;">
+            <bind name="e" value="o.startSignTime + ' 00:00:00'" />
+            <bind name="f" value="o.endSignTime + ' 23:59:59'" />
+            and o.sign_time between #{e,jdbcType=VARCHAR} and #{f,jdbcType=VARCHAR}
         </if>
-    </select>
+    </sql>
     <select id="financeCount" parameterType="Map" resultType="java.lang.Integer">
         select count(*) from t_order_new o left join `user` u on o.buyer_id = u.id
         left join department d on o.order_dep = d.id   left join t_order_mid a on o.order_no=a.order_no
-        <if test="type !=null">
-            inner join
-            (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
-            from t_order_approval
-            where `type` in
-            <foreach collection="type" item="item" separator="," open="(" close=")">
-                #{item}
-            </foreach>
-            group by order_no) toa on o.order_no=toa.order_no
-        </if>
-        where delete_sign in(0,2) and o.approval in(0,1,2,4,5,7,8) and outsource=  #{o.outsource,jdbcType=INTEGER}
-        <if test="o.processStatus == 3">
-            and o.process_status = #{o.processStatus,jdbcType=INTEGER}
-        </if>
-        <if test="o.processStatus == 4" >
-            and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
-        </if>
-        <if test="o.processStatus == 9">
-            and o.back_status = 3
-        </if>
-        <if test="fids != null and fids.size() &gt; 0">
-            and (d.finance_id in
-            <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
-                #{item}
-            </foreach>
-            or d.retrial_finance_id in
-            <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
-                #{item}
-            </foreach>)
-        </if>
-        <if test="o.orderStatus != null and o.orderStatus != &quot;&quot;">
-            and (o.order_status >=  #{o.orderStatus,jdbcType=INTEGER} or o.back_status=3)
-        </if>
-        <if test="deps !=null">
-            and o.order_dep in
-            <foreach close=")" collection="deps" item="depId" open="(" separator=",">
-                #{depId}
-            </foreach>
-        </if>
-        <if test="o.contractNo != null and o.contractNo != &quot;&quot;">
-            and o.contract_no like CONCAT('%',#{o.contractNo,jdbcType=VARCHAR},'%')
-        </if>
-        <if test="o.liquidationStatus != null">
-            and o.liquidation_status = #{o.liquidationStatus,jdbcType=INTEGER}
-        </if>
-        <if test="o.amountStatus == 0">
-            and o.total_amount &lt; 10
-        </if>
-        <if test="o.amountStatus == 1">
-            and o.total_amount between 10 and 20
-        </if>
-        <if test="o.amountStatus == 2">
-            and o.total_amount between 20 and 30
-        </if>
-        <if test="o.amountStatus == 3">
-            and o.total_amount between 30 and 40
-        </if>
-        <if test="o.amountStatus == 4">
-            and o.total_amount  &gt; 40
-        </if>
-        <if test="o.orderNo != null and o.orderNo != &quot;&quot;">
-            and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
-        </if>
-        <if test="o.projectType != null and o.projectType != &quot;&quot;">
-            and a.project_type = #{o.projectType}
-        </if>
-        <if test="o.approval != null and o.approval ==1">
-            and o.approval in (1,4,7)
-        </if>
-        <if test="o.approval != null and o.approval ==2">
-            and o.approval in (2,5,8)
-        </if>
-        <if test="o.approval != null and o.approval ==4">
-            and o.approval in (1,2,4,5,7,8)
-        </if>
-        <if test="o.buyerName != null and o.buyerName != &quot;&quot;">
-            <bind name="n" value="'%' + o.buyerName + '%'" />
-            and u.nickname  like #{n,jdbcType=VARCHAR}
-        </if>
-        <if test="o.startTime != null and o.startTime != &quot;&quot; and o.endTime != null and o.endTime != &quot;&quot;">
-            <bind name="a" value="o.startTime + ' 00:00:00'" />
-            <bind name="b" value="o.endTime + ' 23:59:59'" />
-            and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
-        </if>
-        <if test="o.startFinalReceivablesTime != null and o.startFinalReceivablesTime != &quot;&quot; and o.endFinalReceivablesTime != null and o.endFinalReceivablesTime != &quot;&quot;">
-            <bind name="c" value="o.startFinalReceivablesTime + ' 00:00:00'" />
-            <bind name="d" value="o.endFinalReceivablesTime + ' 23:59:59'" />
-            and a.final_Receivables_time between #{c,jdbcType=VARCHAR} and #{d,jdbcType=VARCHAR}
-        </if>
+        <include refid="financeListSql"/>
     </select>
     <!-- 通过订单编号获得订单的负责人(营销员) -->
     <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">

Разница между файлами не показана из-за своего большого размера
+ 104 - 16
src/main/java/com/goafanti/common/mapper/TaskDetailsLogMapper.xml


Разница между файлами не показана из-за своего большого размера
+ 160 - 72
src/main/java/com/goafanti/common/mapper/TaskDetailsMapper.xml


+ 4 - 2
src/main/java/com/goafanti/common/mapper/UserFollowMapper.xml

@@ -295,7 +295,9 @@
         select count(*)followCount
         from (select aid
               from user_follow where aid= #{aid}
-                                 and create_time BETWEEN #{startTime} and #{endTime})a
-        group by aid
+        <if test="startTime !=null and endTime !=null">
+            and create_time BETWEEN #{startTime} and #{endTime}
+        </if>
+        )a group by aid
     </select>
 </mapper>

+ 9 - 8
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -2329,16 +2329,17 @@ inner join(
 
 
 	<select id="selectNoChannelByaids" resultType="com.goafanti.admin.bo.AdminCustomerBo">
-		select aid,sum(if( share_type=0 and channel=0,1,0))userCount,
-		sum(if(share_type=3 and channel=1,1,0))channelCount, sum(if( share_type=2 ,1,0))signCount,
-		sum(if(share_type=0 and source =1 and channel=0,1,0))newCount,
-		sum(if(share_type=0 and source =3 and channel=0,1,0))transferCount,
-		sum(if(share_type=0 and source =1 and channel=1,1,0))channelNewCount,
-		sum(if(share_type=0 and source =2 and channel=0,1,0))receiveCount,
+		select aid,sum(if( share_type=0 and new_channel=0,1,0))userCount,
+		sum(if(share_type=3 and new_channel=1,1,0))channelCount,
+		sum(if( share_type=2 ,1,0))signCount,
+		sum(if(share_type=0 and source =1 and new_channel=0,1,0))newCount,
+		sum(if(share_type=0 and source =3 and new_channel=0,1,0))transferCount,
+		sum(if(share_type=0 and source =1 and new_channel=1,1,0))channelNewCount,
+		sum(if(share_type=0 and source =2 and new_channel=0,1,0))receiveCount,
 		sum(if(share_type=0 and `level` =0,1,0))generalCount,
 		sum(if(share_type=0 and `level` =1,1,0))intentionCount,
 		sum(if(share_type=0 and `level` =2,1,0))keynoteCount
-		from `user` where `type` =1 and new_channel=0   and source in(1,2,3)
+		from `user` where `type` =1  and source in(1,2,3)
 		<if test="startTime != null and endTime != null">
 			and  transfer_time  between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
 		</if>
@@ -2352,7 +2353,7 @@ inner join(
 	</select>
 
 	<select id="selectChannelByaids" resultType="com.goafanti.admin.bo.AdminCustomerBo">
-		select a.aid,sum(if(c.channel=0,1,0))completeCount, sum(if(c.channel=1,1,0))channelCompleteCount
+		select a.aid,sum(if(c.new_channel=0,1,0))completeCount, sum(if(c.new_channel=1,1,0))channelCompleteCount
 		from public_release a left join public_release_details b on a.id=b.prid left join `user` c on b.uid=c.id
 		where b.clock_in =1
 		<if test="startTime != null and endTime != null">

+ 92 - 8
src/main/java/com/goafanti/common/model/TaskDetails.java

@@ -11,10 +11,10 @@ import java.util.Date;
  * 项目申报详情(TaskDetails)实体类
  *
  * @author makejava
- * @since 2025-01-20 17:19:20
+ * @since 2025-02-14 15:11:25
  */
 public class TaskDetails implements Serializable {
-    private static final long serialVersionUID = 992907593831828261L;
+    private static final long serialVersionUID = 378389592122062421L;
 
     private Integer id;
 /**
@@ -388,11 +388,11 @@ public class TaskDetails implements Serializable {
 /**
      * 评审省级序号
      */
-    private Integer reviewProvinceNumber;
+    private String reviewProvinceNumber;
 /**
      * 评审国家级高企编号
      */
-    private Integer reviewCountryNumber;
+    private String reviewCountryNumber;
 /**
      * 备注说明
      */
@@ -413,6 +413,34 @@ public class TaskDetails implements Serializable {
      * 会员等级
      */
     private Integer memberLvl;
+/**
+     * 项目负责人编号
+     */
+    private String projectId;
+/**
+     * 高新技术税收优惠政策检查
+     */
+    private String featureHt;
+/**
+     * 加计扣除税收优惠政策检查
+     */
+    private String featureAd;
+/**
+     * 税务常规检查
+     */
+    private String featureTr;
+/**
+     * 税务对研发费用检查
+     */
+    private String featureTe;
+/**
+     * 税务稽查
+     */
+    private String featureTi;
+/**
+     * 其他
+     */
+    private String featureOther;
 
 
     public Integer getId() {
@@ -1159,19 +1187,19 @@ public class TaskDetails implements Serializable {
         this.reviewCountry = reviewCountry;
     }
 
-    public Integer getReviewProvinceNumber() {
+    public String getReviewProvinceNumber() {
         return reviewProvinceNumber;
     }
 
-    public void setReviewProvinceNumber(Integer reviewProvinceNumber) {
+    public void setReviewProvinceNumber(String reviewProvinceNumber) {
         this.reviewProvinceNumber = reviewProvinceNumber;
     }
 
-    public Integer getReviewCountryNumber() {
+    public String getReviewCountryNumber() {
         return reviewCountryNumber;
     }
 
-    public void setReviewCountryNumber(Integer reviewCountryNumber) {
+    public void setReviewCountryNumber(String reviewCountryNumber) {
         this.reviewCountryNumber = reviewCountryNumber;
     }
 
@@ -1215,5 +1243,61 @@ public class TaskDetails implements Serializable {
         this.memberLvl = memberLvl;
     }
 
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getFeatureHt() {
+        return featureHt;
+    }
+
+    public void setFeatureHt(String featureHt) {
+        this.featureHt = featureHt;
+    }
+
+    public String getFeatureAd() {
+        return featureAd;
+    }
+
+    public void setFeatureAd(String featureAd) {
+        this.featureAd = featureAd;
+    }
+
+    public String getFeatureTr() {
+        return featureTr;
+    }
+
+    public void setFeatureTr(String featureTr) {
+        this.featureTr = featureTr;
+    }
+
+    public String getFeatureTe() {
+        return featureTe;
+    }
+
+    public void setFeatureTe(String featureTe) {
+        this.featureTe = featureTe;
+    }
+
+    public String getFeatureTi() {
+        return featureTi;
+    }
+
+    public void setFeatureTi(String featureTi) {
+        this.featureTi = featureTi;
+    }
+
+    public String getFeatureOther() {
+        return featureOther;
+    }
+
+    public void setFeatureOther(String featureOther) {
+        this.featureOther = featureOther;
+    }
+
 }
 

+ 104 - 8
src/main/java/com/goafanti/common/model/TaskDetailsLog.java

@@ -11,10 +11,10 @@ import java.util.Date;
  * 项目申报详情日志(TaskDetailsLog)实体类
  *
  * @author makejava
- * @since 2025-01-13 15:19:26
+ * @since 2025-02-14 15:11:32
  */
 public class TaskDetailsLog implements Serializable {
-    private static final long serialVersionUID = -42460168996948180L;
+    private static final long serialVersionUID = 419965485945349856L;
 
     private Integer id;
 /**
@@ -388,11 +388,11 @@ public class TaskDetailsLog implements Serializable {
 /**
      * 评审省级序号
      */
-    private Integer reviewProvinceNumber;
+    private String reviewProvinceNumber;
 /**
      * 评审国家级高企编号
      */
-    private Integer reviewCountryNumber;
+    private String reviewCountryNumber;
 /**
      * 备注说明
      */
@@ -409,6 +409,38 @@ public class TaskDetailsLog implements Serializable {
      * 创建时间
      */
     private Date createTime;
+/**
+     * 会员等级
+     */
+    private Integer memberLvl;
+/**
+     * 项目负责人编号
+     */
+    private String projectId;
+/**
+     * 高新技术税收优惠政策检查
+     */
+    private String featureHt;
+/**
+     * 加计扣除税收优惠政策检查
+     */
+    private String featureAd;
+/**
+     * 税务常规检查
+     */
+    private String featureTr;
+/**
+     * 税务对研发费用检查
+     */
+    private String featureTe;
+/**
+     * 税务稽查
+     */
+    private String featureTi;
+/**
+     * 其他
+     */
+    private String featureOther;
 
 
     public Integer getId() {
@@ -1155,19 +1187,19 @@ public class TaskDetailsLog implements Serializable {
         this.reviewCountry = reviewCountry;
     }
 
-    public Integer getReviewProvinceNumber() {
+    public String getReviewProvinceNumber() {
         return reviewProvinceNumber;
     }
 
-    public void setReviewProvinceNumber(Integer reviewProvinceNumber) {
+    public void setReviewProvinceNumber(String reviewProvinceNumber) {
         this.reviewProvinceNumber = reviewProvinceNumber;
     }
 
-    public Integer getReviewCountryNumber() {
+    public String getReviewCountryNumber() {
         return reviewCountryNumber;
     }
 
-    public void setReviewCountryNumber(Integer reviewCountryNumber) {
+    public void setReviewCountryNumber(String reviewCountryNumber) {
         this.reviewCountryNumber = reviewCountryNumber;
     }
 
@@ -1204,5 +1236,69 @@ public class TaskDetailsLog implements Serializable {
         this.createTime = createTime;
     }
 
+    public Integer getMemberLvl() {
+        return memberLvl;
+    }
+
+    public void setMemberLvl(Integer memberLvl) {
+        this.memberLvl = memberLvl;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getFeatureHt() {
+        return featureHt;
+    }
+
+    public void setFeatureHt(String featureHt) {
+        this.featureHt = featureHt;
+    }
+
+    public String getFeatureAd() {
+        return featureAd;
+    }
+
+    public void setFeatureAd(String featureAd) {
+        this.featureAd = featureAd;
+    }
+
+    public String getFeatureTr() {
+        return featureTr;
+    }
+
+    public void setFeatureTr(String featureTr) {
+        this.featureTr = featureTr;
+    }
+
+    public String getFeatureTe() {
+        return featureTe;
+    }
+
+    public void setFeatureTe(String featureTe) {
+        this.featureTe = featureTe;
+    }
+
+    public String getFeatureTi() {
+        return featureTi;
+    }
+
+    public void setFeatureTi(String featureTi) {
+        this.featureTi = featureTi;
+    }
+
+    public String getFeatureOther() {
+        return featureOther;
+    }
+
+    public void setFeatureOther(String featureOther) {
+        this.featureOther = featureOther;
+    }
+
 }
 

+ 5 - 14
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -4,7 +4,10 @@ import com.goafanti.business.bo.OutRestrictProject;
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.bo.userDaysBo;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.*;
+import com.goafanti.common.dao.NoticeMapper;
+import com.goafanti.common.dao.RestrictProjectMapper;
+import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.dao.UserTransferLogMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.NoticeTypes;
 import com.goafanti.common.model.Notice;
@@ -47,8 +50,6 @@ public class ReleaseUserTask {
 	int pointsDataLimit = 50;
 
 
-	@Resource
-	private AdminUserCountMapper adminUserCountMapper;
 
 	@Resource
 	private RestrictProjectMapper restProjectMapper;
@@ -309,9 +310,6 @@ public class ReleaseUserTask {
 			pushSignUser(lockSignList);
 			//处理私有客户
 			pushPrivateUser(lockUserList);
-			//处理每个人重复的天数
-			pushSalesmanCount(lockUserList,lockSignList);
-
 			pushChannel(releaseTime, userList);
 			//客户释放
 			List<LockingReleaseBo> lockList = customerService.selectPendinglockUserList();
@@ -331,14 +329,7 @@ public class ReleaseUserTask {
 	}
 
 
-	private void pushSalesmanCount(List<LockingReleaseBo> list, List<LockingReleaseBo> list2) {
-		list.addAll(list2);
-		for (LockingReleaseBo e : list) {
-			String sartTime= e.getLockTime();
-			String endTime=e.getLockTime()+" 23:59:59";
-			adminUserCountMapper.updateByaidAndDate(e.getAid(), sartTime, endTime);
-		}
-	}
+
 
 	private void pushPrivateUser(List<LockingReleaseBo> lockUserList) throws InterruptedException {
 		List<LockingReleaseBo> newList=new ArrayList<LockingReleaseBo>();

+ 1 - 63
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -68,8 +68,6 @@ public class AsyncUtils {
 	@Resource
 	private TOrderPaymentMapper tOrderPaymentMapper;
 	@Resource
-	private AdminUserCountMapper adminUserCountMapper;
-	@Resource
 	private FinanceCountMapper financeCountMapper;
 	@Resource
 	private WeChatUtils weChatUtils;
@@ -77,48 +75,8 @@ public class AsyncUtils {
 	private AdminProjectStatisticsMapper adminProjectStatisticsMapper;
 
 
-	/**
-	 * 处理离职意见转交客户
-	 * 	转出去则全部为0,转入则判定当天有没有,有则修改没有新增
-	 * @param aid
-	 */
-    public  void updateAdminUserCount(String aid, List<AdminUserCount> tramsferList) {
-		adminUserCountMapper.updateUserCountResetting(aid);
-		pushAdminUserCount(tramsferList);
-	}
 
-	private void pushAdminUserCount(List<AdminUserCount> list) {
-		for (AdminUserCount e : list) {
-			String startTime=DateUtils.formatDate(e.getDateTime(),AFTConstants.YYYYMMDD);
-			AdminUserCount selectAUC = getAdminUserCount(e.getAid(),startTime);
-			if (selectAUC==null){
-				adminUserCountMapper.insertSelective(e);
-			}else {
-				AdminUserCount newAUC=new AdminUserCount();
-				newAUC.setId(selectAUC.getId());
-				if (e.getPrivateCount()==null)selectAUC.setPrivateCount(0);
-				if (e.getChannelCount()==null)selectAUC.setChannelCount(0);
-				if (e.getSignCount()==null)selectAUC.setSignCount(0);
-				newAUC.setPrivateCount(e.getPrivateCount());
-				newAUC.setChannelCount(e.getChannelCount());
-				newAUC.setSignCount(e.getSignCount());
-				adminUserCountMapper.updateByPrimaryKeySelective(newAUC);
-			}
-		}
-	}
 
-	private AdminUserCount getAdminUserCount(String aid, String startTime) {
-		List<AdminUserCount> selectList = adminUserCountMapper.selectByaidAndDate(aid, startTime);
-		AdminUserCount selectAUC=null;
-		if (selectList.size()==1){
-			selectAUC=selectList.get(0);
-		}else if (selectList.size()>1){
-			for (int i=1;i<selectList.size();i++){
-				adminUserCountMapper.deleteByPrimaryKey(selectList.get(i).getId());
-			}
-		}
-		return selectAUC;
-	}
 
 
     public void patentSend(EmailBo bo) throws UnsupportedEncodingException, MessagingException {
@@ -813,27 +771,7 @@ public class AsyncUtils {
 		}
 	}
 
-	public void updateAdminUserOrderCount(List<AdminUserCount> tramsferList) {
-		for (AdminUserCount e : tramsferList) {
-			String startTime=DateUtils.formatDate(e.getDateTime(),AFTConstants.YYYYMMDD);
-			AdminUserCount selectAUC = getAdminUserCount(e.getAid(),startTime);
-			if (selectAUC==null){
-				adminUserCountMapper.insertSelective(e);
-			}else {
-				AdminUserCount newAUC=new AdminUserCount();
-				newAUC.setId(selectAUC.getId());
-				if (e.getPrivateCount()==null)selectAUC.setPrivateCount(0);
-				if (e.getChannelCount()==null)selectAUC.setChannelCount(0);
-				if (e.getSignCount()==null)selectAUC.setSignCount(0);
-				if (e.getOrderCount()==null)selectAUC.setOrderCount(0);
-				newAUC.setPrivateCount(e.getPrivateCount());
-				newAUC.setChannelCount(e.getChannelCount());
-				newAUC.setSignCount(e.getSignCount());
-				newAUC.setOrderCount(e.getOrderCount());
-				adminUserCountMapper.updateByPrimaryKeySelective(newAUC);
-			}
-		}
-	}
+
 
 
 	public void sendWeChat( String publicCarbonCopy,Integer id, String name, String startTime, String endTime, String typeName, String plan) {

+ 118 - 15
src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java

@@ -1975,7 +1975,7 @@ public class NewExcelUtil<T> {
 	}
 
 	private void addCell(Row row,TaskDetailsBo o,Integer index) {
-		for (int i = 0; i < 81; i++) {
+		for (int i = 0; i < 85; i++) {
 			Cell cell = row.createCell(i);
 			cell.setCellStyle(styles.get("data4"));
 			if (i==0)cell.setCellValue(index);//序号
@@ -1985,7 +1985,17 @@ public class NewExcelUtil<T> {
 			else if(i==4){//服务年限
 				cell.setCellValue(o.getServiceYear());
 			}
-			else if(i==5)cell.setCellValue(o.getMemberLvl());//会员级别
+			else if(i==5){//会员等级
+				if (o.getMemberLvl()==null){
+					cell.setCellValue("");
+				}else if (o.getMemberLvl()==1){
+					cell.setCellValue("A");
+				}else if (o.getMemberLvl()==2){
+					cell.setCellValue("AA");
+				}else if (o.getMemberLvl()==3){
+					cell.setCellValue("AAA");
+				}
+			}
 			else if(i==6)cell.setCellValue(addThis(o.getTaskName()));		//业务负责人
 			else if(i==7)cell.setCellValue(addThis(o.getProjectName()));		//项目负责人
 			else if(i==8)cell.setCellValue(addThis(o.getTechnologyName()));		//技术咨询师
@@ -2207,27 +2217,35 @@ public class NewExcelUtil<T> {
 				cell.setCellValue(addThis(o.getTrainingActual()));
 			}else if(i==69){//培训指标(本年度)-其他
 				cell.setCellValue(addThis(o.getTrainingOther()));
-			}else if(i==70){//特色工作-专项检查
-				cell.setCellValue("");
-			}else if(i==71){//特色工作-模拟稽查
-				cell.setCellValue("");
-			}else if(i==72){//其他事项说明
+			}else if(i==70){//特色工作-高新技术税收优惠政策检查
+				cell.setCellValue(addThis(o.getFeatureHt()));
+			}else if(i==71){//特色工作-加计扣除税收优惠政策检查
+				cell.setCellValue(addThis(o.getFeatureAd()));
+			}else if(i==72){//特色工作-税务常规检查
+				cell.setCellValue(addThis(o.getFeatureTr()));
+			}else if(i==73){//特色工作-税务对研发费用检查
+				cell.setCellValue(addThis(o.getFeatureTe()));
+			}else if(i==74){//特色工作-税务稽查
+				cell.setCellValue(addThis(o.getFeatureTi()));
+			}else if(i==75){//特色工作-其他
+				cell.setCellValue(addThis(o.getFeatureOther()));
+			}else if(i==76){//其他事项说明
 				cell.setCellValue(addThis(o.getRemarks()));
-			}else if(i==73){//创新能力评价评分
+			}else if(i==77){//创新能力评价评分
 				cell.setCellValue(addThis(o.getHtScore()));
-			}else if(i==74){//实际申报批次
+			}else if(i==78){//实际申报批次
 				cell.setCellValue(addThis(o.getHtBatch()));
-			}else if(i==75){//是否重点关注
+			}else if(i==79){//是否重点关注
 				if(o.getHtFocus()==null){
 					cell.setCellValue("");
 				}else {
 					cell.setCellValue(o.getHtFocus()==1?"是":"否");
 				}
-			}else if(i==76){//网上系统提交
+			}else if(i==80){//网上系统提交
 				addParam(cell,o.getWebSubmit(),o.getWebSubmitOther());
-			}else if(i==77){//纸质材料提交
+			}else if(i==81){//纸质材料提交
 				addParam(cell,o.getPaperSubmit(),o.getPaperSubmitOther());
-			}else if(i==78){//省级-拟公示序号
+			}else if(i==82){//省级-拟公示序号
 				if(o.getReviewProvince()==null){
 					cell.setCellValue("");
 				}else {
@@ -2237,7 +2255,7 @@ public class NewExcelUtil<T> {
 						cell.setCellValue("公示,序号:"+o.getReviewProvinceNumber());
 					}
 				}
-			}else if(i==79){//国家级-高企编号
+			}else if(i==83){//国家级-高企编号
 				if(o.getReviewCountry()==null){
 					cell.setCellValue("");
 				}else {
@@ -2247,7 +2265,7 @@ public class NewExcelUtil<T> {
 						cell.setCellValue("公示,编号:"+o.getReviewCountryNumber());
 					}
 				}
-			}else if(i==80){//更新时间
+			}else if(i==84){//更新时间
 				if(o.getUpdateTime()==null){
 					cell.setCellValue("");
 				}else {
@@ -2291,4 +2309,89 @@ public class NewExcelUtil<T> {
 		}
 
 	}
+
+	public Result TestExportExcel(List<T> list, String sheetName, String uploadPath) {
+		if (list == null) {
+			list = new ArrayList<T>();
+		}
+		this.list = list;
+		this.sheetName = sheetName;
+		createExcelField();
+		createWorkbook();
+		this.downloadPath=uploadPath;
+		{
+			OutputStream out = null;
+			String filename="";
+			try {
+				// 取出一共有多少个sheet.
+				int sheetNo =  (list.size() / sheetSize);
+				for (int index = 0; index <= sheetNo; index++) {
+					createSheet(sheetNo, index);
+					int line=0;
+					// 产生一行
+					Row title = sheet.createRow(line);
+					Cell cell = title.createCell(0);
+					cell.setCellValue(sheetName);
+					CellRangeAddress region = new CellRangeAddress(0, 0, 0, fields.size()-1);
+					sheet.addMergedRegion(region);
+					cell.setCellStyle(styles.get("total"));
+					if (StringUtils.isNotEmpty(screen)){
+						log.debug(screen);
+						Row r = sheet.createRow(++line);
+						Cell c = r.createCell(0);
+						c.setCellValue(screen);
+						CellRangeAddress rg = new CellRangeAddress(line, line, 0, fields.size()-1);
+						sheet.addMergedRegion(rg);
+						c.setCellStyle(styles.get("header"));
+					}
+					Row row = sheet.createRow(++line);
+					// 产生一行
+					int column = 0;
+					// 写入各个字段的列头名称
+					List<Object[]> fieldsList=new ArrayList<>();
+					for (Object[] os : fields) {
+						Excel excel = (Excel) os[1];
+						String [] ss={"销售类型","订单类型","结算类型","催款节点","是否会员","大客户","是否特批"};
+						for (String s : ss) {
+							if (excel.name().equals(s)){
+								fieldsList.add(os);
+							}
+						}
+					}
+					for (Object[] os : fieldsList) {
+						Excel excel = (Excel) os[1];
+						this.createCell(excel, row, column++);
+					}
+					fields.clear();
+					fields.addAll(fieldsList);
+					filename = encodingFilename(sheetName);
+					out = Files.newOutputStream(Paths.get(getAbsoluteFile(filename)));
+					fillMergeExcelData(index,++line);
+					//新增合并
+//				mergeOrderNo();
+					addStatisticsRow();
+				}
+				wb.write(out);
+				return new Result().data(filename);
+			} catch (Exception e) {
+				e.printStackTrace();
+				throw new BusinessException("导出Excel失败,请联系网站管理员!");
+			} finally {
+				if (wb != null) {
+					try {
+						wb.close();
+					} catch (IOException e1) {
+						e1.printStackTrace();
+					}
+				}
+				if (out != null) {
+					try {
+						out.close();
+					} catch (IOException e1) {
+						e1.printStackTrace();
+					}
+				}
+			}
+		}
+	}
 }

+ 0 - 1
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -1387,7 +1387,6 @@ public class AdminCustomerApiController extends BaseApiController{
 	 */
 	@RequestMapping(value = "/selectAllUser/export", method = RequestMethod.GET)
 	public Result selectAllUserExport(String depId, String startTime,String endTime,String aName ) {
-
 		return adminService.selectAllUserExport( depId,  startTime, endTime, aName);
 	}
 	/**

+ 4 - 10
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -3,7 +3,10 @@ package com.goafanti.customer.service;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.userDaysBo;
 import com.goafanti.common.error.BusinessException;
-import com.goafanti.common.model.*;
+import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.OrganizationContactBook;
+import com.goafanti.common.model.User;
+import com.goafanti.common.model.UserMid;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.customer.bo.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -574,15 +577,6 @@ public interface CustomerService {
 	void transferUser(List<String> uList, String aid, String uid);
 
 
-	/**
-	 *
-	 * @param aid
-	 * @param transferTime
-	 */
-	void updateAdminUserCount(String aid,Date transferTime);
-
-
-	AdminUserCount getAdminUserCount(String aid, String startTime);
 
 	Result importExcel(MultipartFile file);
 

+ 5 - 118
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -110,8 +110,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Resource
 	private SystemWebSocketHandler systemWebSocketHandler;
 	@Resource
-	private AdminUserCountMapper adminUserCountMapper;
-	@Resource
 	private RestrictProjectMapper restrictProjectMapper;
 	@Resource
 	private	AsyncUtils asyncUtils;
@@ -445,63 +443,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		addUserLock(uid, TokenManager.getAdminId(), now, uList);
 		addUserTransferLog(uid, TokenManager.getAdminId(), null,0, null, now, uList);
 
-		updateAdminUserCount(user.getAid(),user.getTransferTime());
 		return 1;
 	}
 
-	/**
-	 *
-	 * @param  aid    管理员编号
-	 * @param  transferTime  客户转换时间
-	 */
-	@Override
-	public void updateAdminUserCount(String aid ,Date transferTime) {
-		String startTime=DateUtils.formatDate(transferTime,AFTConstants.YYYYMMDD);
-		String endTime=startTime+" 23:59:59";
-		AdminUserCount adminUserCount=getAdminUserCount(aid,startTime);
-        AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
-        if (adminUserCount==null){
-            if(selectAUC!=null) adminUserCountMapper.insertSelective(selectAUC);
-		}else {
-            AdminUserCount newAUC=new AdminUserCount();
-			newAUC.setId(adminUserCount.getId());
-			if (selectAUC==null){
-				newAUC.setPrivateCount(0);
-				newAUC.setChannelCount(0);
-				newAUC.setSignCount(0);
-			}else {
-				if (selectAUC.getPrivateCount()==null)selectAUC.setPrivateCount(0);
-				if (selectAUC.getChannelCount()==null)selectAUC.setChannelCount(0);
-				if (selectAUC.getSignCount()==null)selectAUC.setSignCount(0);
-				newAUC.setPrivateCount(selectAUC.getPrivateCount());
-				newAUC.setChannelCount(selectAUC.getChannelCount());
-				newAUC.setSignCount(selectAUC.getSignCount());
-			}
-			adminUserCountMapper.updateByPrimaryKeySelective(newAUC);
-		}
-	}
 
 
 
-	/**
-	 * 用于处理异常多产生数据,删除多余数据修改原本数据
-	 * @param aid
-	 * @param startTime
-	 * @return
-	 */
-	@Override
-	public AdminUserCount getAdminUserCount(String aid, String startTime) {
-		List<AdminUserCount> selectList = adminUserCountMapper.selectByaidAndDate(aid, startTime);
-		AdminUserCount selectAUC=null;
-		if(!selectList.isEmpty())selectAUC=selectList.get(0);
-		if (selectList.size()>1){
-			for (int i=1;i<selectList.size();i++){
-				Integer id = selectList.get(i).getId();
-				if(id!=null) adminUserCountMapper.deleteByPrimaryKey(id);
-			}
-		}
-		return selectAUC;
-	}
+
+
 
 
 	@Override
@@ -974,7 +923,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		if (mainStatus==1){
 			followProject(fbb.getUid());
 		}
-		updateADminUserCountFollow(TokenManager.getAdminId(),followTime);
 	}
 
 	private void addUserFollowBusiness(UserFollowBusiness userFollowBusiness, String ub, BusinessListBo ub1, String ufbId, String followId) {
@@ -988,40 +936,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		userFollowBusinessMapper.insert(userFollowBusiness);
 	}
 
-	private void updateADminUserCountFollow(String aid, Date transferTime) {
-		{
-			String startTime= DateUtils.formatDate(transferTime,AFTConstants.YYYYMMDD);
-			String endTime=startTime+" 23:59:59";
-			AdminUserCount adminUserCount = getAdminUserCount(aid,startTime);
-			Integer count = userFollowMapper.selectByaidAndDate(aid, startTime, endTime);
-            AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
-            if (adminUserCount==null){
-                if (selectAUC==null)selectAUC=new AdminUserCount();
-				selectAUC.setFollowCount(count);
-				selectAUC.setAid(aid);
-				selectAUC.setDateTime(transferTime);
-				adminUserCountMapper.insertSelective(selectAUC);
-			}else {
-                AdminUserCount newAUC=new AdminUserCount();
-				newAUC.setId(adminUserCount.getId());
-				newAUC.setFollowCount(count);
-				if (selectAUC==null){
-					newAUC.setPrivateCount(0);
-					newAUC.setChannelCount(0);
-					newAUC.setSignCount(0);
-				}else {
-					if (selectAUC.getPrivateCount()==null)selectAUC.setPrivateCount(0);
-					if (selectAUC.getChannelCount()==null)selectAUC.setChannelCount(0);
-					if (selectAUC.getSignCount()==null)selectAUC.setSignCount(0);
-					newAUC.setPrivateCount(selectAUC.getPrivateCount());
-					newAUC.setChannelCount(selectAUC.getChannelCount());
-					newAUC.setSignCount(selectAUC.getSignCount());
-				}
-				adminUserCountMapper.updateByPrimaryKeySelective(newAUC);
-			}
 
-		}
-	}
 
 	/**
 	 * 跟进更新用户中间表
@@ -1479,32 +1394,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		} else {
 			userMapper.update(user);
 		}
-		//处理用户客户统计
-		if (AFTConstants.USER_RECEIVE.equals(operatorType)){
-			updateAdminUserCount(user.getAid(),user.getTransferTime());
-		}
-		if (typeFlag) {
-			updateAdminUserCountTransfer(useList,newList);
-		}
+
+
 		return errors;
 	}
 
-	/**
-	 *
-	 * @param useList
-	 * @param newList
-	 */
-	private void updateAdminUserCountTransfer(List<User> useList, List<User> newList) {
-		for (User u : useList) {
-
-			updateAdminUserCount(u.getAid(),u.getTransferTime());
-		}
-		for (User u : newList) {
 
-			updateAdminUserCount(u.getAid(),u.getTransferTime());
-		}
 
-	}
 
 	@Override
 	public void transferUser(List<String> uList, String aid, String uid) {
@@ -1624,7 +1520,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		updateUserMid(aid,uid,0,null);
 		addUserTransferLog(uid, aid,null, 15, null, date, null);
 		userMapper.update(u);
-		updateAdminUserCount(use.getAid(),use.getTransferTime());
 		return 1;
 	}
 
@@ -2475,9 +2370,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			utl.setUid(id);
 			userTransferLogMapper.insertSelective(utl);
 			userLockReleaseMapper.updateUserTypeLock(u.getId(), TokenManager.getAdminId(), 0, 2, date);
-			//用户客户统计移除时修改
-			updateAdminUserCount(u.getAid(),u.getTransferTime());
-
 		} else {
 			List<String> list = Arrays.asList(id.split(","));
 			List<UserTransferLog> ulList = new ArrayList<UserTransferLog>();
@@ -2500,16 +2392,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			userMapper.updateList(null, null, null, date, 1, list,null);
 			userLockReleaseMapper.updateUserTypeLockList(list, TokenManager.getAdminId(), 0, 2, date);
 			//批量移除客户,需要单独处理客户每天得计算。
-			updateAdminUserAllCount(userList);
 		}
 		return 1;
 	}
 
-	private void updateAdminUserAllCount(List<User> userList) {
-		for (User user : userList) {
-			updateAdminUserCount(user.getAid(),user.getTransferTime());
-		}
-	}
+
 
 
 	@Override

+ 21 - 0
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -157,6 +157,27 @@ public class OrderListBo {
 
 	private String typeExplain;
 
+	/** 开始签单 时间*/
+	private String startSignTime;
+	/** 结束签单 时间*/
+	private String endSignTime;
+
+	public String getEndSignTime() {
+		return endSignTime;
+	}
+
+	public void setEndSignTime(String endSignTime) {
+		this.endSignTime = endSignTime;
+	}
+
+	public String getStartSignTime() {
+		return startSignTime;
+	}
+
+	public void setStartSignTime(String startSignTime) {
+		this.startSignTime = startSignTime;
+	}
+
 	public String getTypeExplain() {
 		return typeExplain;
 	}

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

@@ -209,7 +209,7 @@ public class StatisticsApiController extends CertifyApiController {
 
 		NewExcelUtil<OutOrderProject> excelUtil=new NewExcelUtil<>(OutOrderProject.class);
 		return excelUtil.OrderMergeAndExportExcel(list,"订单项目数据统计表",uploadPath);
-//		return excelUtil.exportExcel(list,"订单项目数据统计表",uploadPath);
+//		return excelUtil.TestExportExcel(list,"订单项目数据统计表",uploadPath);
 	}
 
 

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

@@ -223,7 +223,6 @@ public interface OrderNewService {
 
 	int updateTag(String orderNo, Integer tag);
 
-	void updateAdminUserCountOrder(String aid,Date transferTime);
 
 
 	void financeCountOrderUnauditedSubtraction(TOrderNew use, Integer i);

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

@@ -129,7 +129,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public Map<String, Object> financeList(OrderListBo order, Integer pageNo, Integer pageSize) {
 		Map<String, Object> result = new HashMap<String, Object>();
@@ -216,7 +215,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
 			pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),order, TokenManager.getAdminId(),t.getApproval());
 		}
-		orderNewService.updateAdminUserCountOrder(t.getSalesmanId(),t.getCreateTime());
 		Admin admin=adminMapper.selectFinanceAdminByOrderDep(t.getOrderDep());
 		orderNewService.financeCountOrderUnauditedSubtraction(t,1);
 		return c;

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

@@ -23,7 +23,6 @@ import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.LockingReleaseBo;
-import com.goafanti.customer.service.CustomerService;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.enums.*;
 import com.goafanti.order.service.OrderNewService;
@@ -134,14 +133,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Autowired
 	private DepartmentService departmentService;
 	@Autowired
-	private CustomerService	customerService;
-	@Autowired
 	private TOrderPaymentMapper tOrderPaymentMapper;
 	@Autowired
 	private TOrderHighTechMapper tOrderHighTechMapper;
 	@Autowired
-	private AdminUserCountMapper adminUserCountMapper;
-	@Autowired
 	private FinanceCountMapper financeCountMapper;
 	@Autowired
 	private PublicReleaseMapper publicReleaseMapper;
@@ -654,10 +649,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		pushOrderDunContent(t2);
 		//计算公出统计
 		pushOrderPublicReleaseCount(t2);
-		updateAdminUserCountOrder(t2.getSalesmanId(),t2.getCreateTime());
-		if (newOrderFlag){
-			updateAdminUserCountOrder(t2.getSalesmanId(),date);
-		}
+
 		return 1;
 	}
 
@@ -965,41 +957,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 
-	@Override
-	public void updateAdminUserCountOrder(String aid,Date transferTime) {
-		String startTime= DateUtils.formatDate(transferTime,AFTConstants.YYYYMMDD);
-		String endTime=startTime+" 23:59:59";
-		AdminUserCount adminUserCount = customerService.getAdminUserCount(aid,startTime);
-		Integer orderCount = tOrderNewMapper.selectAidAndDate(aid, startTime, endTime);
-		if (adminUserCount==null){
-			AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
-			if (selectAUC==null)selectAUC=new AdminUserCount();
-			selectAUC.setOrderCount(orderCount);
-			selectAUC.setAid(aid);
-			selectAUC.setDateTime(transferTime);
-			adminUserCountMapper.insertSelective(selectAUC);
-		}else {
-			AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
-			AdminUserCount newAUC=new AdminUserCount();
-			newAUC.setId(adminUserCount.getId());
-			if (selectAUC==null){
-				newAUC.setPrivateCount(0);
-				newAUC.setChannelCount(0);
-				newAUC.setSignCount(0);
-				newAUC.setOrderCount(orderCount);
-			}else {
-				if (selectAUC.getPrivateCount()==null)selectAUC.setPrivateCount(0);
-				if (selectAUC.getChannelCount()==null)selectAUC.setChannelCount(0);
-				if (selectAUC.getSignCount()==null)selectAUC.setSignCount(0);
-				newAUC.setPrivateCount(selectAUC.getPrivateCount());
-				newAUC.setChannelCount(selectAUC.getChannelCount());
-				newAUC.setSignCount(selectAUC.getSignCount());
-				newAUC.setOrderCount(orderCount);
-			}
-			adminUserCountMapper.updateByPrimaryKeySelective(newAUC);
-		}
 
-	}
 
 	public void updateFinanceCount(String aid, Date createTime){
 		String startTime= DateUtils.formatDate(createTime,AFTConstants.YYYYMMDD);
@@ -1486,7 +1444,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
 		pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
-		updateAdminUserCountOrder(t2.getSalesmanId(),t2.getCreateTime());
 		return 1;
 	}
 
@@ -1851,7 +1808,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
 		//新增特批催款信息
 		tOrderNewMapper.update(t);
-		updateAdminUserCountOrder(t2.getSalesmanId(),t2.getCreateTime());
 		return 1;
 	}
 
@@ -2087,7 +2043,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(orderNo);
 		pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),order, TokenManager.getAdminId(),t.getApproval());
 		tOrderNewMapper.update(t);
-		updateAdminUserCountOrder(t.getSalesmanId(),t.getCreateTime());
 		financeCountOrderUnauditedSubtraction(t,2);
 		return 1;
 	}

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

@@ -241,7 +241,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		pushTaskChange(TokenManager.getAdminId(),taskReceiverId,type,t.getOrderNo());
 		//派单后设置用户客户统计
 		if (type==0){
-			customerService.updateAdminUserCount(tn.getSalesmanId(),date);
 			asyncUtils.updateAdminByAid(taskReceiverId);
 		}else {
 			asyncUtils.updateAdminByAid(TokenManager.getAdminId(),taskReceiverId);
@@ -1984,6 +1983,20 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Override
 	public List<TaskStopLogBo> projectStopList(Integer taskStopId) {
 		List<TaskStopLogBo> list =taskStopLogMapper.selectListBySoptId(taskStopId);
+		TaskStopLogBo taskStopLogBo = list.get(list.size() - 1);
+		if (taskStopLogBo.getStatus()==0){
+			TaskStopLogBo newBo=new TaskStopLogBo();
+			TaskStop taskStop = taskStopMapper.selectByPrimaryKey(Long.valueOf(taskStopId));
+			TOrderTask tOrderTask = tOrderTaskMapper.queryById(taskStop.getTid());
+			TOrderNewBo tOrderNew = tOrderNewMapper.getOrderNewDetail(tOrderTask.getOrderNo());
+			List<Admin> admins = adminMapper.listAdminBydepIdAndRoleType(tOrderNew.getOrderDep(),AFTConstants.SALESMAN_ADMIN);
+			StringBuilder str=new StringBuilder();
+			for (Admin admin : admins) {
+				if (!str.toString().contains(admin.getName()))str.append(admin.getName()).append(",");
+			}
+			newBo.setCreateName(str.substring(0,str.length()-1));
+			list.add(newBo);
+		}
 		return list;
 	}
 

+ 0 - 4
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -177,8 +177,6 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 				//所有客户转交给接受者
 				transferUserUpdateExamine(aid,transferId);
 				userMapper.updateDimissionTransfer(aid,transferId);
-				List<AdminUserCount> tramsferList = userMapper.selectListByaidAndDate(transferId);
-				asyncUtils.updateAdminUserCount(aid,tramsferList);
 			}else if (s==roleResources.QDYW.getCode()) {
 				userTransferLogMapper.insertUserLockLog(aid,transferId,date);
 				patentNewMapper.updateAdmin(aid,transferId);
@@ -189,8 +187,6 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 				tOrderLogMapper.insertOrderLog(aid,TokenManager.getAdminId(),date,str.toString());
 				tOrderNewMapper.updateSalesmanId(aid, transferId);
 				tOrderMidMapper.updateSalesmanId(aid, transferId);
-				List<AdminUserCount> tramsferList =adminMapper.selectAdminOrder(transferId);
-				asyncUtils.updateAdminUserOrderCount(tramsferList);
 			}else if (s == roleResources.XMRW.getCode()) {
 				// 获取被转角色判断修改对应任务角色
 				asyncUtils.pushTechTransfer(admin,tadmin,date);

+ 10 - 0
src/main/java/com/goafanti/techproject/bo/InputTaskDetailsBo.java

@@ -65,11 +65,21 @@ public class InputTaskDetailsBo {
      */
     private Integer chStatus;
 
+    private Integer roleStatus;
+
 
     private Integer pageSize;
     private Integer pageNo;
 
 
+    public Integer getRoleStatus() {
+        return roleStatus;
+    }
+
+    public void setRoleStatus(Integer roleStatus) {
+        this.roleStatus = roleStatus;
+    }
+
     public String getConsultantName() {
         return consultantName;
     }

+ 12 - 0
src/main/java/com/goafanti/techproject/bo/TaskDetailsBo.java

@@ -18,6 +18,10 @@ public class TaskDetailsBo extends TaskDetails {
      * 会员  0否 1是
      */
     private Integer memberStatus;
+    /**
+     * 修改权限 0=无,1=有
+     */
+    private Integer updateStatus;
 
 
 
@@ -25,6 +29,14 @@ public class TaskDetailsBo extends TaskDetails {
     List<Map<String,Object >> taskList;
     List<TaskFeature> featureList;
 
+    public Integer getUpdateStatus() {
+        return updateStatus;
+    }
+
+    public void setUpdateStatus(Integer updateStatus) {
+        this.updateStatus = updateStatus;
+    }
+
     public String getServiceProject() {
         return ServiceProject;
     }

+ 3 - 3
src/main/java/com/goafanti/techproject/controller/TaskDetailsController.java

@@ -83,7 +83,7 @@ public class TaskDetailsController extends BaseController {
      * @return 编辑结果
      */
     @PostMapping("/update")
-    public Result edit(TaskDetails taskDetails,Integer type) {
+    public Result update(TaskDetails taskDetails,Integer type) {
         return new Result<>().data(this.taskDetailsService.update(taskDetails,type));
     }
 
@@ -131,7 +131,7 @@ public class TaskDetailsController extends BaseController {
      */
     @GetMapping("/detailsList")
     public Result<TaskDetailsBo> detailsList(InputTaskDetailsBo in) {
-        return new Result<>().data(this.taskDetailsService.detailsList(in));
+        return new Result<>().data(this.taskDetailsService.pushDetailsList(in));
     }
 
 
@@ -154,7 +154,7 @@ public class TaskDetailsController extends BaseController {
      */
     @GetMapping("/export")
     public Result export(InputTaskDetailsBo in) {
-        return this.taskDetailsService.export(in);
+        return this.taskDetailsService.pushExport(in);
     }
 
     /**

+ 3 - 2
src/main/java/com/goafanti/techproject/service/TaskDetailsService.java

@@ -80,7 +80,8 @@ public interface TaskDetailsService {
     Object updateDownload(TaskDetails newTd);
 
 
-    Result export(InputTaskDetailsBo in);
 
-    Pagination<TaskDetailsBo> detailsList(InputTaskDetailsBo in);
+    Pagination<TaskDetailsBo> pushDetailsList(InputTaskDetailsBo in);
+
+    Result pushExport(InputTaskDetailsBo in);
 }

+ 98 - 15
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.goafanti.techproject.service.impl;
 
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.model.*;
 import com.goafanti.common.utils.DateUtils;
@@ -73,24 +74,40 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         TaskDetails taskDetails=taskDetailsMapper.selectById(tOrderTask.getProgressTid());
         if (taskDetails !=null){
             BeanUtils.copyProperties( taskDetails,res);
+            if (res.getProjectId()!=null&&res.getProjectId().equals(TokenManager.getAdminId())){
+                res.setUpdateStatus(1);
+            }else {
+                res.setUpdateStatus(0);
+            }
+        }else {
+            res.setTid(id);
         }
         addOrderInformation(res);
         return res;
     }
 
     @Override
-    public Result export(InputTaskDetailsBo in) {
+    public Result pushExport(InputTaskDetailsBo in) {
         in.setPageNo(1);
         in.setPageSize(10000);
-        Pagination<TaskDetailsBo> page = detailsList(in);
+        Pagination<TaskDetailsBo> page = pushDetailsList(in);
         List<TaskDetailsBo> list = (List<TaskDetailsBo>) page.getList();
         NewExcelUtil<TaskDetailsBo> excel=new NewExcelUtil<>(TaskDetailsBo.class);
         return excel.exportTaskDetailsExcel(list,"项目进度表",uploadPath);
     }
 
     @Override
-    public Pagination<TaskDetailsBo> detailsList(InputTaskDetailsBo in) {
-        in.setAid(TokenManager.getUserId());
+    public Pagination<TaskDetailsBo> pushDetailsList(InputTaskDetailsBo in) {
+
+        // 0=查询所有,1=查询自己,2=查询下级,3=负责人查询
+        if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
+            in.setRoleStatus(0);
+        } else  {
+            in.setAid(TokenManager.getAdminId());
+            if (in.getRoleStatus()==null){
+                in.setRoleStatus(1);
+            }
+        }
         Pagination<?> page = findPage("selectTaskDetailsList", "selectTaskDetailsCount", in);
         List<TaskDetails> list = (List<TaskDetails>) page.getList();
         List<TaskDetailsBo> list2=new ArrayList<>();
@@ -109,7 +126,6 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         TOrderNew tOrderNew = tOrderNewMapper.selectByTid(bo.getTid());
         TOrderTask tOrderTask = tOrderTaskMapper.queryById(bo.getTid());
         TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
-        List<Map<String,Object >> list;
         //获取项目服务年份算出平均值
         List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), null);
         List<TOrderTaskBo> collect = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 1).collect(Collectors.toList());
@@ -122,13 +138,15 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         }
         TTaskMember tTaskMember = ttaskMemberMapper.selectByTid(tOrderTask.getId());
         String serviceYear = getServiceYer(tTaskMember.getServiceYear());
-        list=addOrderList(collect2,serviceYear);
+        if (StringUtils.isEmpty(bo.getTaskName())){
+            bo.setTaskName(mid.getSalesmanName());
+        }
+        addOrderList(collect2,serviceYear,bo);
         bo.setUserName(mid.getBuyerName());
         bo.setOrderNo(tOrderNew.getOrderNo());
         bo.setContractNo(tOrderNew.getContractNo());
         bo.setServiceYear(serviceYear);
         bo.setMemberStatus(mid.getProjectType());
-        bo.setTaskList(list);
         if (bo.getMemberStatus()==null){
             BigDecimal totalAmount = tOrderNew.getTotalAmount().divide(new BigDecimal(yearSum), 2, RoundingMode.HALF_UP);
             Integer lvl=getOrderLvl(totalAmount);
@@ -137,6 +155,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         bo.setFeatureList(taskFeatureMapper.selectByTdId(bo.getId()));
     }
 
+
+
     private String getServiceYer(String serviceYear) {
         String serviceYear2;
         if (StringUtils.isEmpty(serviceYear)){
@@ -180,6 +200,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
      * 新增数据
      *
      * @param taskDetails 实例对象
+     * @param type        0=初步新增,1=新增切同步日志
      * @return 实例对象
      */
     @Override
@@ -198,6 +219,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         //新增日志数据
         if (type==1){
             try {
+                pushFeature(taskDetails);
                 addTaskDetailsLog(taskDetails);
             } catch (InvocationTargetException | IllegalAccessException e) {
                 throw new RuntimeException(e);
@@ -206,6 +228,37 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         return taskDetails;
     }
 
+    private void pushFeature(TaskDetails taskDetails) {
+        List<TaskFeature>  list = taskFeatureMapper.selectByTdId(taskDetails.getId());
+        for (TaskFeature e : list) {
+            StringBuilder str=new StringBuilder();
+            String dateStr = DateUtils.formatDate(e.getStartTime(), "yyyy-MM-dd");
+            str.append(dateStr).append(" 检查部门(").append(e.getDepName()).append(") ");
+            String type=e.getInspectWay()==0?"线上":e.getInspectWay()==1?"线下":"无";
+            str.append(type).append(";");
+            if (e.getType()==1){
+                taskDetails.setFeatureHt(str.toString());
+            }else if (e.getType()==2){
+                taskDetails.setFeatureAd(str.toString());
+            }else if (e.getType()==3){
+                taskDetails.setFeatureTr(str.toString());
+            }else if (e.getType()==4){
+                taskDetails.setFeatureTe(str.toString());
+            }else if (e.getType()==5){
+                taskDetails.setFeatureTi(str.toString());
+            }else if (e.getType()==0){
+                taskDetails.setFeatureOther(str.toString());
+            }
+        }
+        if (StringUtils.isEmpty(taskDetails.getFeatureHt()))taskDetails.setFeatureHt("无");
+        if (StringUtils.isEmpty(taskDetails.getFeatureAd()))taskDetails.setFeatureAd("无");
+        if (StringUtils.isEmpty(taskDetails.getFeatureTr()))taskDetails.setFeatureTr("无");
+        if (StringUtils.isEmpty(taskDetails.getFeatureTe()))taskDetails.setFeatureTe("无");
+        if (StringUtils.isEmpty(taskDetails.getFeatureTi()))taskDetails.setFeatureTi("无");
+        if (StringUtils.isEmpty(taskDetails.getFeatureOther()))taskDetails.setFeatureOther("无");
+        taskDetailsMapper.update(taskDetails);
+    }
+
     private void updateTask(TaskDetails taskDetails, String orderNo) {
         List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(orderNo, null);
         List<TOrderTaskBo> collect = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 0||e.getSplitStatus() == 2).collect(Collectors.toList());
@@ -316,7 +369,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
         int yearSum=1;
         for (TOrderTaskBo e : tOrderTaskBos) {
-            if (e.getYearSum()>yearSum){
+            if (e.getYearSum()!=null&&e.getYearSum()>yearSum){
                 yearSum=e.getYearSum();
             }
         }
@@ -341,14 +394,18 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
      */
     @Override
     public TaskDetails update(TaskDetails taskDetails,Integer type) {
-
         taskDetails.setUpdateTime(new Date());
+        if (taskDetails.getTid()==null){
+            TaskDetails use = taskDetailsMapper.selectById(taskDetails.getId());
+            taskDetails.setTid(use.getTid());
+        }
         countTaskDetails(taskDetails);
         this.taskDetailsMapper.update(taskDetails);
         TaskDetails res = this.queryById(taskDetails.getId());
         //调用就保存,不需要区分不保存
 //        if (type !=null&&type==1){
         try {
+            pushFeature(taskDetails);
             addTaskDetailsLog(res);
         } catch (InvocationTargetException | IllegalAccessException e) {
             throw new RuntimeException(e);
@@ -442,7 +499,6 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         TaskDetailsBo res = new TaskDetailsBo();
         TOrderNew tOrderNew = tOrderNewMapper.selectByTid(tid);
         TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
-        List<Map<String,Object >> list;
         List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
         //如果是会员
         TOrderTaskBo thisTask = new TOrderTaskBo();
@@ -453,7 +509,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
             }
         }
         String serviceYear = getServiceYer(thisTask.getServiceYear());
-        list=addOrderList(tOrderTaskBos, serviceYear);
+        addOrderList(tOrderTaskBos, serviceYear,res);
         if (taskDetails !=null){
                 BeanUtils.copyProperties(log, res);
         }
@@ -461,19 +517,19 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         res.setOrderNo(tOrderNew.getOrderNo());
         res.setContractNo(tOrderNew.getContractNo());
         res.setMemberStatus(mid.getProjectType());
-        res.setTaskList(list);
         BigDecimal totalAmount = tOrderNew.getTotalAmount();
         if (res.getMemberLvl()==null){
             Integer lvl=getOrderLvl(totalAmount);
             res.setMemberLvl(lvl);
         }
-        res.setTaskList(list);
         res.setFeatureList(taskFeatureLogMapper.selectByTdlid(id));
         return res;
     }
 
-    private List<Map<String, Object>> addOrderList(List<TOrderTaskBo> tOrderTaskBos, String serviceYear) {
+    private void addOrderList(List<TOrderTaskBo> tOrderTaskBos, String serviceYear,TaskDetailsBo bo) {
         List<Map<String, Object>> list =new ArrayList<>();
+        //判定是否是需要修改,只有在没有财税和技术,并且编号不是空才需要新增
+        boolean flag=false;
         for (TOrderTaskBo e : tOrderTaskBos) {
             String serviceYear1 = getServiceYer(e.getServiceYear());
             if (serviceYear1.equals(serviceYear)){
@@ -482,9 +538,36 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
                 map.put("taskName", e.getCommodityName());
                 map.put("id",e.getId());
                 list.add(map);
+                if (StringUtils.isEmpty(bo.getFinanceTaxationName())){
+                    if (e.getCommodityName().contains("财税")){
+                        bo.setFinanceTaxationName(e.getReceiverName());
+                    }
+                    if (bo.getId()!=null) flag=true;
+                }
+                if (StringUtils.isEmpty(bo.getTechnologyName())){
+                    if (e.getCommodityName().contains("技术")){
+                        bo.setTechnologyName(e.getReceiverName());
+                    }
+                    if (bo.getId()!=null) flag=true;
+                }
+            }
+            if (e.getId().equals(bo.getTid())
+                    &&StringUtils.isEmpty(bo.getProjectName())){
+                bo.setProjectName(e.getReceiverName());
             }
         }
-        return list;
+        if (flag){
+            TaskDetails update = new TaskDetails();
+            update.setId(bo.getId());
+            update.setFinanceTaxationName(bo.getFinanceTaxationName());
+            update.setTechnologyName(bo.getTechnologyName());
+            if (update.getFinanceTaxationName()!=null||
+                update.getTechnologyName()!=null){
+                taskDetailsMapper.update(update);
+            }
+
+        }
+        bo.setTaskList(list);
     }
 
     @Override

+ 0 - 37
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1055,7 +1055,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 		if (p.getStatus()!=null||p.getPublicType()!=null||p.getTechStartProcess()!=null){
 			publicReleaseMapper.update(p);
-			updateAdminUserCountPublicRelease(use.getAid(),use.getReleaseStart());
 		}
 		if (a.getOpenId()!=null) {
 			if (remarks.length()>19) {
@@ -1423,43 +1422,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		orderPublicReleaseLogMapper.insert(log);
 	}
 
-	private void updateAdminUserCountPublicRelease(String aid, Date transferTime) {
-		String startTime= DateUtils.formatDate(transferTime,AFTConstants.YYYYMMDD);
-		String endTime=startTime+" 23:59:59";
-		AdminUserCount adminUserCount = customerService.getAdminUserCount(aid,startTime);
-		Integer count = publicReleaseMapper.selectCountByaidAndDate(aid, startTime, endTime);
-		if (count==null){
-            count=0;
-        }
-		if (adminUserCount==null){
-			AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
-			if (selectAUC==null)selectAUC=new AdminUserCount();
-			selectAUC.setPublicReleaseCount(count);
-			selectAUC.setAid(aid);
-			selectAUC.setDateTime(transferTime);
-			adminUserCountMapper.insertSelective(selectAUC);
-		}else {
-			AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
-			AdminUserCount newAUC=new AdminUserCount();
-			newAUC.setId(adminUserCount.getId());
-			newAUC.setPublicReleaseCount(count);
-			if (selectAUC==null){
-				newAUC.setPrivateCount(0);
-				newAUC.setChannelCount(0);
-				newAUC.setSignCount(0);
-			}else {
-				if (selectAUC.getPrivateCount()==null)selectAUC.setPrivateCount(0);
-				if (selectAUC.getChannelCount()==null)selectAUC.setChannelCount(0);
-				if (selectAUC.getSignCount()==null)selectAUC.setSignCount(0);
-				newAUC.setPrivateCount(selectAUC.getPrivateCount());
-				newAUC.setChannelCount(selectAUC.getChannelCount());
-				newAUC.setSignCount(selectAUC.getSignCount());
-			}
 
-			adminUserCountMapper.updateByPrimaryKeySelective(newAUC);
-		}
-
-	}
 
 	private void addpublicLog(Integer id, Integer status, String remarks) {
 		PublicReleaseLog log = new PublicReleaseLog(id, TokenManager.getAdminId(), status, remarks, new Date());