推送

module_kzks/src/main/java/org/jeecg/modules/projectPushList/controller/ProjectPushListController.java

@@ -33,9 +33,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -51,199 +49,16 @@ import java.util.stream.Collectors;
 public class ProjectPushListController extends JeecgController<ProjectPushList, IProjectPushListService> {
 	@Autowired
 	private IProjectPushListService projectPushListService;
-	@Autowired
-	private IProjectPushSetService projectPushSetService;
-	@Autowired
-	private IProjectCostService costService;
-	@Autowired
-	private ISysUserDepartService userDepartService;
-	@Autowired
-	private IKyTaskInfoService kyTaskInfoService;
-	@Autowired
-	private ISysUserService sysUserService;
-	@Autowired
-	private ISysDepartService departService;
+
+
 	/**
-	 *   项目成本——寻找并新增推送
+	 *   项目成本——查找并更新推送
 	 */
-	@AutoLog(value = "项目成本——寻找并新增推送")
-	@ApiOperation(value="项目成本——寻找并新增推送", notes="项目成本——寻找并新增推送")
+	@AutoLog(value = "项目成本——查找并更新推送")
+	@ApiOperation(value="项目成本——查找并更新推送", notes="项目成本——查找并更新推送")
 	@PostMapping(value = "/addAll")
 	public Result<String> addAll() {
-		projectPushListService.truncateTable();
-
-		QueryWrapper<ProjectPushSet> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("cost_type","0");// 0材料费
-		List<ProjectPushSet> list1 = projectPushSetService.list(queryWrapper);
-		queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("cost_type","1");// 1外协费
-		List<ProjectPushSet> list2 = projectPushSetService.list(queryWrapper);
-		queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("cost_type","2");// 2人工费
-		List<ProjectPushSet> list3 = projectPushSetService.list(queryWrapper);
-		//3合同额
-		queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("cost_type","3");
-		List<ProjectPushSet> list4 = projectPushSetService.list(queryWrapper);
-		//4收款额
-		queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("cost_type","5");
-		List<ProjectPushSet> list5 = projectPushSetService.list(queryWrapper);
-
-		List<ProjectPushList> pushList = new ArrayList<>();//所有的推送列表
-
-		// 0材料费
-		if(list1!=null && !list1.isEmpty()){
-			QueryWrapper<ProjectCost> projectCostQueryWrapper;
-			for(ProjectPushSet set : list1){
-				String stage = set.getStage();
-				projectCostQueryWrapper = new QueryWrapper<>();
-				projectCostQueryWrapper.eq("clf",new BigDecimal(0));
-				projectCostQueryWrapper.eq("cost_percent",stage);
-				List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
-
-				List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
-				List<UserNameIDVO> userNameIdList = projectPushListService.userNamesByRoleIds(roleIds);
-
-				for (UserNameIDVO vo: userNameIdList){
-					//根据用户id查其所属部门的部门编码
-					List<String> sysOrgCodeList = projectPushListService.selectDeptCodeByUserId(vo.getUserId());
-					String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
-
-					for (ProjectCost cost:projectCostList1){
-						ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-								cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
-						pushList.add(push);
-					}
-				}
-			}
-		}
-		// 1外协费
-		if(list2!=null && !list2.isEmpty()){
-			QueryWrapper<ProjectCost> projectCostQueryWrapper;
-			for(ProjectPushSet set : list2){
-				String stage = set.getStage();
-				projectCostQueryWrapper = new QueryWrapper<>();
-				projectCostQueryWrapper.eq("wxf",new BigDecimal(0));
-				projectCostQueryWrapper.eq("cost_percent",stage);
-				List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
-
-				List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
-				List<UserNameIDVO> userNameIdList = projectPushListService.userNamesByRoleIds(roleIds);
-
-				for (UserNameIDVO vo: userNameIdList){
-					//根据用户id查其所属部门的部门编码
-					List<String> sysOrgCodeList = projectPushListService.selectDeptCodeByUserId(vo.getUserId());
-					String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
-
-					for (ProjectCost cost:projectCostList1){
-						ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-								cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
-						pushList.add(push);
-					}
-				}
-			}
-		}
-		// 2人工费(工资及劳务费)
-		if(list3!=null && !list3.isEmpty()){
-			QueryWrapper<ProjectCost> projectCostQueryWrapper;
-			for(ProjectPushSet set : list3){
-				String stage = set.getStage();
-				projectCostQueryWrapper = new QueryWrapper<>();
-				projectCostQueryWrapper.eq("gzjlwf",new BigDecimal(0));
-				projectCostQueryWrapper.eq("cost_percent",stage);
-				List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
-				List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
-				List<UserNameIDVO> userNameIdList = projectPushListService.userNamesByRoleIds(roleIds);
-
-				for (UserNameIDVO vo: userNameIdList){
-					//根据用户id查其所属部门的部门编码
-					List<String> sysOrgCodeList = projectPushListService.selectDeptCodeByUserId(vo.getUserId());
-					String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
-
-					for (ProjectCost cost:projectCostList1){
-						ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-								cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
-						pushList.add(push);
-					}
-				}
-			}
-		}
-		//3合同额
-		if(list4!=null && !list4.isEmpty()){
-			QueryWrapper<ProjectCost> projectCostQueryWrapper;
-			for(ProjectPushSet set : list4){
-				String stage = set.getStage();
-				projectCostQueryWrapper = new QueryWrapper<>();
-				projectCostQueryWrapper.eq("contractfpe",new BigDecimal(0));
-				projectCostQueryWrapper.eq("cost_percent",stage);
-				List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
-
-				for (ProjectCost cost:projectCostList1){
-					String taskno = cost.getTaskno();
-					String orgcode = null;
-					String username = null;
-					if(taskno!=null){
-						QueryWrapper<KyTaskInfo> taskInfoQueryWrapper = new QueryWrapper<>();
-						taskInfoQueryWrapper.eq("taskno",cost.getTaskno());
-						KyTaskInfo kyTaskInfo = kyTaskInfoService.getOne(taskInfoQueryWrapper);
-						if(kyTaskInfo!=null){
-							if(kyTaskInfo.getJycsid()!=null){//下达部门id
-								SysDepart sysDepart = departService.getById(kyTaskInfo.getJycsid());
-								if(sysDepart!=null) orgcode = sysDepart.getOrgCode();
-							}
-							if(kyTaskInfo.getBusinessman()!=null){
-								QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
-								wrapper.eq("realname",kyTaskInfo.getBusinessman());
-								SysUser user = sysUserService.getOne(wrapper);
-								if(user!=null) username=user.getUsername();
-							}
-						}
-					}
-					ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-							cost.getTaskno(),cost.getTaskname(),set.getId(), username, set.getContent(),orgcode);
-					pushList.add(push);
-				}
-			}
-		}
-		//4收款额
-		if(list5!=null && !list5.isEmpty()){
-			QueryWrapper<ProjectCost> projectCostQueryWrapper;for(ProjectPushSet set : list5){
-				String stage = set.getStage();
-				projectCostQueryWrapper = new QueryWrapper<>();
-				projectCostQueryWrapper.eq("taskmoney",new BigDecimal(0));
-				projectCostQueryWrapper.eq("cost_percent",stage);
-				List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
-
-				for (ProjectCost cost:projectCostList1){
-					String taskno = cost.getTaskno();
-					String orgcode = null;
-					String username = null;
-					if(taskno!=null){
-						QueryWrapper<KyTaskInfo> taskInfoQueryWrapper = new QueryWrapper<>();
-						taskInfoQueryWrapper.eq("taskno",cost.getTaskno());
-						KyTaskInfo kyTaskInfo = kyTaskInfoService.getOne(taskInfoQueryWrapper);
-						if(kyTaskInfo!=null){
-							if(kyTaskInfo.getJycsid()!=null){//下达部门id
-								SysDepart sysDepart = departService.getById(kyTaskInfo.getJycsid());
-								if(sysDepart!=null) orgcode = sysDepart.getOrgCode();
-							}
-							if(kyTaskInfo.getBusinessman()!=null){
-								QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
-								wrapper.eq("realname",kyTaskInfo.getBusinessman());
-								SysUser user = sysUserService.getOne(wrapper);
-								if(user!=null) username=user.getUsername();
-							}
-						}
-					}
-					ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-							cost.getTaskno(),cost.getTaskname(),set.getId(), username, set.getContent(),orgcode);
-					pushList.add(push);
-				}
-			}
-		}
-		projectPushListService.saveBatch(pushList);
-		return Result.OK("添加成功！");
+		return projectPushListService.addAll();
 	}
 
 

module_kzks/src/main/java/org/jeecg/modules/projectPushList/service/IProjectPushListService.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectPushList.service;
 
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.projectPushList.entity.ProjectPushList;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.projectPushList.vo.UserNameIDVO;
@@ -14,6 +15,9 @@ import java.util.List;
  */
 public interface IProjectPushListService extends IService<ProjectPushList> {
 
+    /**项目成本——查找并更新推送*/
+    public Result<String> addAll();
+
     /**清空推送列表*/
     public void truncateTable();
 

module_kzks/src/main/java/org/jeecg/modules/projectPushList/service/impl/ProjectPushListServiceImpl.java

@@ -1,19 +1,34 @@
 package org.jeecg.modules.projectPushList.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
+import org.jeecg.modules.kyTaskInfo.service.IKyTaskInfoService;
+import org.jeecg.modules.projectCost.entity.ProjectCost;
+import org.jeecg.modules.projectCost.service.IProjectCostService;
+import org.jeecg.modules.projectPushList.convert.ProjectPushListConvert;
 import org.jeecg.modules.projectPushList.entity.ProjectPushList;
 import org.jeecg.modules.projectPushList.mapper.ProjectPushListMapper;
 import org.jeecg.modules.projectPushList.service.IProjectPushListService;
 import org.jeecg.modules.projectPushList.vo.UserNameIDVO;
 import org.jeecg.modules.projectPushSet.entity.ProjectPushSet;
 import org.jeecg.modules.projectPushSet.mapper.ProjectPushSetMapper;
+import org.jeecg.modules.projectPushSet.service.IProjectPushSetService;
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysDepartService;
+import org.jeecg.modules.system.service.ISysUserDepartService;
+import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 推送列表
@@ -30,6 +45,178 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
     @Autowired
     @SuppressWarnings("all")
     private ProjectPushListMapper pushListMapper;
+    @Autowired
+    private IProjectPushSetService projectPushSetService;
+    @Autowired
+    private IProjectCostService costService;
+    @Autowired
+    private ISysUserDepartService userDepartService;
+    @Autowired
+    private IKyTaskInfoService kyTaskInfoService;
+    @Autowired
+    private ISysUserService sysUserService;
+    @Autowired
+    private ISysDepartService departService;
+
+
+    /**项目成本——查找并更新推送*/
+    public Result<String> addAll(){
+        this.truncateTable();//清空原来的数据
+
+        QueryWrapper<ProjectPushSet> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("cost_type","0");// 0材料费
+        List<ProjectPushSet> list1 = projectPushSetService.list(queryWrapper);
+        queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("cost_type","1");// 1外协费
+        List<ProjectPushSet> list2 = projectPushSetService.list(queryWrapper);
+        queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("cost_type","2");// 2人工费
+        List<ProjectPushSet> list3 = projectPushSetService.list(queryWrapper);
+
+        List<ProjectPushList> pushList = new ArrayList<>();//所有的推送列表
+
+        // 0材料费
+        if(list1!=null && !list1.isEmpty()){
+            QueryWrapper<ProjectCost> projectCostQueryWrapper;
+            for(ProjectPushSet set : list1){
+                String stage = set.getStage();
+                projectCostQueryWrapper = new QueryWrapper<>();
+                projectCostQueryWrapper.eq("clf",new BigDecimal(0));
+                projectCostQueryWrapper.eq("cost_percent",stage);
+                List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
+
+                List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
+                List<UserNameIDVO> userNameIdList = this.userNamesByRoleIds(roleIds);
+
+                for (UserNameIDVO vo: userNameIdList){
+                    //根据用户id查其所属部门的部门编码
+                    List<String> sysOrgCodeList = this.selectDeptCodeByUserId(vo.getUserId());
+                    String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
+
+                    for (ProjectCost cost:projectCostList1){
+                        ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
+                                cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
+                        pushList.add(push);
+                    }
+                }
+            }
+        }
+
+        // 1外协费
+        if(list2!=null && !list2.isEmpty()){
+            QueryWrapper<ProjectCost> projectCostQueryWrapper;
+            for(ProjectPushSet set : list2){
+                String stage = set.getStage();
+                projectCostQueryWrapper = new QueryWrapper<>();
+                projectCostQueryWrapper.eq("wxf",new BigDecimal(0));
+                projectCostQueryWrapper.eq("cost_percent",stage);
+                List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
+
+                List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
+                List<UserNameIDVO> userNameIdList = this.userNamesByRoleIds(roleIds);
+
+                for (UserNameIDVO vo: userNameIdList){
+                    //根据用户id查其所属部门的部门编码
+                    List<String> sysOrgCodeList = this.selectDeptCodeByUserId(vo.getUserId());
+                    String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
+
+                    for (ProjectCost cost:projectCostList1){
+                        ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
+                                cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
+                        pushList.add(push);
+                    }
+                }
+            }
+        }
+        // 2人工费(工资及劳务费)
+        if(list3!=null && !list3.isEmpty()){
+            QueryWrapper<ProjectCost> projectCostQueryWrapper;
+            for(ProjectPushSet set : list3){
+                String stage = set.getStage();
+                projectCostQueryWrapper = new QueryWrapper<>();
+                projectCostQueryWrapper.eq("gzjlwf",new BigDecimal(0));
+                projectCostQueryWrapper.eq("cost_percent",stage);
+                List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
+                List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
+                List<UserNameIDVO> userNameIdList = this.userNamesByRoleIds(roleIds);
+
+                for (UserNameIDVO vo: userNameIdList){
+                    //根据用户id查其所属部门的部门编码
+                    List<String> sysOrgCodeList = this.selectDeptCodeByUserId(vo.getUserId());
+                    String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
+
+                    for (ProjectCost cost:projectCostList1){
+                        ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
+                                cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
+                        pushList.add(push);
+                    }
+                }
+            }
+        }
+        //3合同额
+        String stage = "100";
+        QueryWrapper<ProjectCost> projectCostQueryWrapper= new QueryWrapper<>();
+        projectCostQueryWrapper.eq("contractfpe",new BigDecimal(0));
+        projectCostQueryWrapper.eq("cost_percent",stage);
+        List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
+
+        for (ProjectCost cost:projectCostList1){
+            String taskno = cost.getTaskno();
+            String orgcode = null;
+            String username = null;
+            if(taskno!=null){
+                KyTaskInfo kyTaskInfo = kyTaskInfoService.getKyTaskInfoByTaskno(taskno);
+                if(kyTaskInfo!=null){
+                    if(kyTaskInfo.getJycsid()!=null){//下达部门id
+                        SysDepart sysDepart = departService.getById(kyTaskInfo.getJycsid());
+                        if(sysDepart!=null) orgcode = sysDepart.getOrgCode();
+                    }
+                    if(kyTaskInfo.getBusinessman()!=null){
+                        QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
+                        wrapper.eq("realname",kyTaskInfo.getBusinessman());
+                        SysUser user = sysUserService.getOne(wrapper);
+                        if(user!=null) username=user.getUsername();
+                    }
+                }
+            }
+            ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
+                    cost.getTaskno(),cost.getTaskname(),"", username, "请及时处理合同额",orgcode);
+            pushList.add(push);
+        }
+
+        //4收款额
+        projectCostQueryWrapper = new QueryWrapper<>();
+        projectCostQueryWrapper.eq("taskmoney",new BigDecimal(0));
+        projectCostQueryWrapper.eq("TaskMoney",stage);
+        List<ProjectCost> projectCostList2 = costService.list(projectCostQueryWrapper);
+
+        for (ProjectCost cost:projectCostList2){
+            String taskno = cost.getTaskno();
+            String orgcode = null;
+            String username = null;
+            if(taskno!=null){
+                KyTaskInfo kyTaskInfo = kyTaskInfoService.getKyTaskInfoByTaskno(taskno);
+                if(kyTaskInfo!=null){
+                    if(kyTaskInfo.getJycsid()!=null){//下达部门id
+                        SysDepart sysDepart = departService.getById(kyTaskInfo.getJycsid());
+                        if(sysDepart!=null) orgcode = sysDepart.getOrgCode();
+                    }
+                    if(kyTaskInfo.getBusinessman()!=null){
+                        QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
+                        wrapper.eq("realname",kyTaskInfo.getBusinessman());
+                        SysUser user = sysUserService.getOne(wrapper);
+                        if(user!=null) username=user.getUsername();
+                    }
+                }
+            }
+            ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
+                    cost.getTaskno(),cost.getTaskname(),"", username, "请及时处理已收款",orgcode);
+            pushList.add(push);
+        }
+        this.saveBatch(pushList);
+        return Result.OK("添加成功！");
+    }
+
 
     /**清空推送列表*/
     public void truncateTable(){