Bläddra i källkod

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

gitadmin 3 år sedan
förälder
incheckning
1fe45878e7

+ 7 - 8
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -1,11 +1,6 @@
 package com.goafanti.admin.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
+import java.util.*;
 
 import javax.annotation.Resource;
 
@@ -382,9 +377,13 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 			acb.setId(depId);
 			deps=departmentMapper.selectBysuperId(oo.getId());
 			depIds =departmentService.selectSubordinateDeps(depId);
+			Department department = new Department();
+			department.setId(depId);
+			depIds.add(department);
 		}
 		List<AdminCustomerBo> list =departmentMapper.AlldepCount(depIds,startTime,  endTime);
-		for (AdminCustomerBo ad : list) {
+
+		for(AdminCustomerBo ad:list){
 			if (acb.getId().equals(ad.getDepId())){
 				acb.getaList().add(ad);
 			}
@@ -408,7 +407,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		List<depCountBo>  deps =departmentMapper.selectBysuperId(id);
 		for (depCountBo dep : deps) {
 			dep.setList(iterationDeps(dep.getId(),list));
-			for (AdminCustomerBo ad : list) {
+			for (AdminCustomerBo ad:list){
 				if (dep.getId().equals(ad.getDepId())){
 					dep.getaList().add(ad);
 				}

+ 27 - 27
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -44,8 +44,8 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	 * 新增第三方机构
 	 * @param t
 	 * @param calculation 0 其他 1软著 2专利
-	 * @param patentType 专利名称 0实用新型 1发明专利 2外观专利 3 其他
-	 * @param startType  0外包 1供应商  外包全为输入,供应商才分软著和专利从后台选取
+	 *  patentType 专利名称 0实用新型 1发明专利 2外观专利 3 其他
+	 *  startType  0外包 1供应商  外包全为输入,供应商才分软著和专利从后台选取
 	 * @param type  type 0正常新增 1发起后新增
 	 * 	type=1用于发起供应商后,用来计算成本,正常则在发起时计算
 	 * @return
@@ -122,7 +122,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 * 删除第三方机构
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/deleteCompany" , method = RequestMethod.POST)
@@ -137,7 +137,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	}
 	/**
 	 * 第三方机构列表
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/selectCompany" , method = RequestMethod.GET)
@@ -166,7 +166,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 * 新增付款节点
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/addPaymentNode" , method = RequestMethod.POST)
@@ -194,7 +194,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 * 删除付款节点
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/deletePaymentNode" , method = RequestMethod.POST)
@@ -209,7 +209,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	}
 	/**
 	 * 修改付款节点
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/updatePaymentNode" , method = RequestMethod.POST)
@@ -241,7 +241,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 * 付款节点列表
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/selectPaymentNode" , method = RequestMethod.GET)
@@ -257,7 +257,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 * 新增付款
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/addOrderPayment" , method = RequestMethod.POST)
@@ -297,7 +297,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	}
 	/**
 	 * 修改付款
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/updateOrderPayment" , method = RequestMethod.POST)
@@ -317,7 +317,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 * 付款详情
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/OrderPaymentDetails" , method = RequestMethod.GET)
@@ -333,7 +333,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 * 付款列表
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/selectOrderPayment" , method = RequestMethod.GET)
@@ -349,7 +349,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 * 付款日志
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/selectPaymentLog" , method = RequestMethod.GET)
@@ -364,7 +364,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	}
 	/**
 	 * 新增财务付款
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/addfinancialPayment" , method = RequestMethod.POST)
@@ -389,7 +389,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 * 删除财务付款
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/deleteFinancialPayment" , method = RequestMethod.POST)
@@ -404,7 +404,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	}
 	/**
 	 * 财务付款列表
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/selectfinancialPayment" , method = RequestMethod.GET)
@@ -482,7 +482,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	}
 	/**
 	 *  软著价格表
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/listSoftWritingPrice" , method = RequestMethod.GET)
@@ -499,7 +499,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	}
 	/**
 	 *  删除软著价格表
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/deleteSoftWritingPrice" , method = RequestMethod.POST)
@@ -515,7 +515,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 *  批量确认付款
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/groupPayment" , method = RequestMethod.POST)
@@ -531,7 +531,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 *  	新增官费信息
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/addOfficialFeePrice" , method = RequestMethod.POST)
@@ -552,7 +552,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 *  	修改官费信息
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/updateOfficialFeePrice" , method = RequestMethod.POST)
@@ -576,7 +576,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	}
 	/**
 	 *  删除官费信息
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/deleteOfficialFeePrice" , method = RequestMethod.POST)
@@ -594,7 +594,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 * 	 官费列表
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/listOfficialFeePrice" , method = RequestMethod.GET)
@@ -608,7 +608,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 *  	新增专利信息
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/addPatentPrice" , method = RequestMethod.POST)
@@ -626,7 +626,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 *  	修改专利信息
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/updatePatentPrice" , method = RequestMethod.POST)
@@ -647,7 +647,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	}
 	/**
 	 *  删除专利信息
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/deletePatentPrice" , method = RequestMethod.POST)
@@ -665,7 +665,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 * 	 专利列表
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/listPatentPrice" , method = RequestMethod.GET)

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

@@ -624,6 +624,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					||TokenManager.hasRole(AFTConstants.FINANCE)||TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
 			//添加财务和财务经理。查看客户所有公出
 			in.setType(2);
+			if(in.getDeps()!=null){
+				map.put("deps", departmentService.parseArray(in.getDeps()));
+			}
 		}else if(TokenManager.hasRole(AFTConstants.COMPANY_MANAGER)||TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
 			in.setType(1);
 			if (in.getDeps()!=null){