浏览代码

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-cloud

yumeng 3 年之前
父节点
当前提交
a6474d5424

+ 42 - 9
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -286,8 +286,14 @@ public class CwjsPolicyInfoController {
 		if ("admin".equalsIgnoreCase(roleCode) || "finance".equalsIgnoreCase(roleCode) ){
 
 		}else if("saleDirector".equalsIgnoreCase(roleCode)){
-			//销售总监 看下属
+			//总监 看下属
 			res = cwjsPolicyInfoService.getAllSubordinate(userId);
+			// 与自己有 关联的人员
+			//List<String> sale = cwjsSaleAssistantInfoService.getCwSaleAndAssistantListStr(userId);
+			// 自己部门下的所有人员
+			//List <CwjsSaleAssistantInfo> saleList = cwjsSaleAssistantInfoMapper.getSaleListByUserDepart(userId);
+			//List<String> sale = saleList.stream().map(CwjsSaleAssistantInfo::getSaleId).collect(Collectors.toList());
+			//res.addAll(sale);
 		}else {
 			//查询 对应的销售或 助理
 			res = cwjsSaleAssistantInfoService.getCwSaleAndAssistantListStr(userId);
@@ -319,8 +325,11 @@ public class CwjsPolicyInfoController {
 //			Set<String> userIds= materialReportOverViewService.recursiveQuerySubordinate(userId);
 			//List<String> userIds = cwjsPolicyInfoService.getAllSubordinate(userId);
 			List<CwjsPolicyInfo> removeList = new ArrayList<>();
-            cwjsPolicyInfoList.forEach(cwjsPolicy -> {
-                if(!userIds.contains(cwjsPolicy.getCreateUserId()) && !userId.equalsIgnoreCase(cwjsPolicy.getApprovedProgress())){
+			List<String> subList = cwjsCompanyApprovalUserList.stream().map(CwjsCompanyApprovalUser::getCompanySubjectId).collect(Collectors.toList());
+            //政策的主体 不是 审核人的主体 过滤 只保留 和审核人 是一样的主体的 政策
+			cwjsPolicyInfoList.forEach(cwjsPolicy -> {
+                //if(!userIds.contains(cwjsPolicy.getCreateUserId()) && !userId.equalsIgnoreCase(cwjsPolicy.getApprovedProgress())){
+                if(!subList.contains(String.valueOf(cwjsPolicy.getCompanySubjectId())) && !userIds.contains(cwjsPolicy.getCreateUserId())){
                     removeList.add(cwjsPolicy);
                 }
             });
@@ -356,21 +365,45 @@ public class CwjsPolicyInfoController {
 
 
 			//所有人只要能看到就能有查看的按钮
-            cwjsPolicy.setOperation("查看");
+          /*  cwjsPolicy.setOperation("查看");
 
-			//查询助理
-			//List <String> assistantList = cwjsSaleAssistantInfoMapper.getCwAssistantNameListPolicy(userId);
-			if((userIds.contains(userId) || userId.equals(cwjsPolicy.getCreateUserId())) && cwjsPolicy.getApprovedStatus() == 4){ //创建人是自己且状态是审核拒绝的
+			//查询 对应的销售或 助理
+			List <String> assistantList = cwjsSaleAssistantInfoService.getCwSaleAndAssistantListStr(cwjsPolicy.getCreateUserId());
+			if((assistantList.contains(userId) || assistantList.contains(cwjsPolicy.getCreateUserId())) && cwjsPolicy.getApprovedStatus() == 4){ //创建人是自己且状态是审核拒绝的
                 cwjsPolicy.setOperation("查看|编辑|提交审核");
             }
 
 			if(userId.equals(cwjsPolicy.getApprovedProgress()) && (cwjsPolicy.getApprovedStatus() == 1 || cwjsPolicy.getApprovedStatus() == 2)){
                 cwjsPolicy.setOperation("查看|审核通过|审核拒绝");
             }
-			if(userId.equals(cwjsPolicy.getApprovedProgress()) && cwjsPolicy.getApprovedStatus() == 4){
+			if(userId.equals(cwjsPolicy.getApprovedProgress()) && cwjsPolicy.getApprovedStatus() == 4 && !userId.equals(cwjsPolicy.getCreateUserId())){
                 cwjsPolicy.setOperation("查看");
             }
-
+*/
+			StringBuilder stringBuilder = new StringBuilder();
+
+			//审核拒绝
+			if (cwjsPolicy.getApprovedStatus() == 4){
+				//有 销售-助理 关联的人员 都可以编辑
+				if(!"admin".equalsIgnoreCase(roleCode) && !"finance".equalsIgnoreCase(roleCode)){
+					List <String> saleOrAssis = cwjsSaleAssistantInfoService.getCwSaleAndAssistantListStr(userId);
+					if(saleOrAssis.contains(cwjsPolicy.getCreateUserId())){
+						stringBuilder.append("编辑").append("|").append("提交审核").append("|");
+					}
+				}
+			}
+			//待审核
+			if (cwjsPolicy.getApprovedStatus() == 1 || cwjsPolicy.getApprovedStatus() == 2){
+				if(cwjsPolicy.getApprovedProgress().equals(userId)){
+					stringBuilder.append("审核通过").append("|").append("审核拒绝").append("|");
+				}
+			}
+		//审核通过
+			/*if (cwjsPolicy.getApprovedStatus() == 3){
+					stringBuilder.append("查看");
+			}*/
+			stringBuilder.append("查看").append("|");
+			cwjsPolicy.setOperation(stringBuilder.deleteCharAt(stringBuilder.lastIndexOf("|")).toString());
 
 
 

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsCompanyApprovalUserMapper.xml

@@ -5,7 +5,7 @@
         select * from ctop_cwjs_company_approval_user where company_subject_id = #{companySubjectId} and approval_user_id = #{userId}  limit 1
     </select>
     <select id="queryByUserId" resultType="org.jeecg.ctop.finance.policy.entity.CwjsCompanyApprovalUser">
-        select * from ctop_cwjs_company_approval_user where approval_user_id = #{userId}
+        select * from ctop_cwjs_company_approval_user where approval_user_id = #{userId} and del_flag = 0
     </select>
     <select id="queryByCompanySubjectId" resultType="org.jeecg.ctop.finance.policy.entity.CwjsCompanyApprovalUser">
         select * from ctop_cwjs_company_approval_user where company_subject_id = #{companySubjectId} ORDER BY level

+ 2 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/SettlementFileInfoMapper.xml

@@ -105,8 +105,8 @@
         IFNULL(cwjs.account_id,f.account_id) as accountId,
         IFNULL((SELECT u.auth_name from ctop_user_allocation u where u.account_id  = f.account_id),cwjs.account_name) as accountName,
         f.del_flag,
-        cwjs.create_user_id as saleUserId,
-        ( SELECT su.realname FROM sys_user su WHERE su.id = cwjs.create_user_id LIMIT 1 ) saleUserName,
+        IFNULL((SELECT cp.sale_id from ctop_user_allocation ua, ctop_project cp where f.account_id = ua.account_id and ua.project_id = cp.id),cwjs.create_user_id) as saleUserId,
+        IFNULL((SELECT su.realname from ctop_user_allocation ua, ctop_project cp,sys_user su where f.account_id = ua.account_id and ua.project_id = cp.id and cp.sale_id = su.id), (SELECT su.realname FROM sys_user su WHERE su.id = cwjs.create_user_id LIMIT 1 )) as saleUserName,
         f.create_user_id as operateUserId,
         ( SELECT su.realname FROM sys_user su WHERE su.id = f.create_user_id LIMIT 1 ) operateUserName,
         cwjs.create_time,