Merge branch 'master' into prod

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanQuarterController.java

@@ -15,7 +15,6 @@ import com.ozs.common.enums.DataIsDelete;
 import com.ozs.common.exception.base.BaseException;
 import com.ozs.common.utils.DateUtils;
 import com.ozs.common.utils.PageUtils;
-import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.framework.web.service.TokenService;
 import com.ozs.plan.doman.PlanQuarter;
@@ -28,7 +27,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -75,7 +73,8 @@ public class PlanQuarterController extends BaseController {
             LoginUser loginUser = tokenService.getLoginUser(request);
             LambdaQueryWrapper<PlanQuarter> lw = new LambdaQueryWrapper<>();
             if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
-                lw.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
+                lw.eq(PlanQuarter::getCreated, loginUser.getUserId());
+                //lw.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
             }
             lw.eq(PlanQuarter::getPlanType, "0");
             lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanYearsController.java

@@ -76,7 +76,7 @@ public class PlanYearsController extends BaseController {
             LambdaQueryWrapper<PlanYears> lw = new LambdaQueryWrapper<PlanYears>();
             LoginUser loginUser = tokenService.getLoginUser(request);
             if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
-                lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
+                lw.eq(PlanYears::getCreated, loginUser.getUserId());
             }
             //是否是拉取到季度计划 true：是
             if (!ObjectUtils.isEmpty(vo.getIsToQuarter()) && vo.getIsToQuarter().equals("true")) {

purchase-admin/src/main/java/com/ozs/web/controller/plan/ProvisionalPlanController.java

@@ -76,12 +76,12 @@ public class ProvisionalPlanController extends BaseController {
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.INSERT)
     public AjaxResult insertProvisionalPlan(@RequestBody ProvisionalPlan provisionalPlan, HttpServletRequest request) {
         //年度中已存在的不能再使用（临时审核通过后会进行同步到年度计划）
-        if (provisionalPlanService.countYearProjectName(provisionalPlan.getProjectName()) > 0) {
-            return AjaxResult.error("该项目名称已经使用。");
-        }
-        if (provisionalPlanService.countProjectName(provisionalPlan.getProjectName()) > 0) {
-            return AjaxResult.error("该项目名称已经使用。");
-        }
+        //if (provisionalPlanService.countYearProjectName(provisionalPlan.getProjectName()) > 0) {
+        //    return AjaxResult.error("该项目名称已经使用。");
+        //}
+        //if (provisionalPlanService.countProjectName(provisionalPlan.getProjectName()) > 0) {
+        //    return AjaxResult.error("该项目名称已经使用。");
+        //}
         //获取采购单位
         LoginUser loginUser = tokenService.getLoginUser(request);
         provisionalPlan.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanQuarterServiceImpl.java

@@ -106,7 +106,8 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             while (size == 200) {
                 LambdaQueryWrapper<PlanQuarter> lw = new LambdaQueryWrapper<>();
                 if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
-                    lw.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
+                    lw.eq(PlanQuarter::getCreated, loginUser.getUserId());
+                    //lw.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
                 }
                 lw.eq(PlanQuarter::getPlanType, "0");
                 if (!ObjectUtils.isEmpty(vo.getProjectName())) {
@@ -483,6 +484,9 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             //同步到项目管理状态为需求待填制
             demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
             demand.setCreateTime(now);
+            demand.setCreateBy(byId.getCreated());
+            demand.setUpdateTime(now);
+            demand.setUpdateBy(demand.getCreateBy());
             pmDemandMapper.insert(demand);
             demandService.updateDemandWarnStatus(demand.getDemandId());
             //计划附件也进行同步---查询季度计划附件后同步到项目需求附件和年度计划附件

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -112,7 +112,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             while (size == 200) {
                 LambdaQueryWrapper<PlanYears> lw = new LambdaQueryWrapper<PlanYears>();
                 if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
-                    lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
+                    lw.eq(PlanYears::getCreated, loginUser.getUserId());
+                    //lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
                 }
                 if (!ObjectUtils.isEmpty(vo.getProjectName())) {
                     lw.like(PlanYears::getProjectName, vo.getProjectName());
@@ -1050,9 +1051,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Transactional
     @Override
     public AjaxResult insertPlanYears(PlanYearsStandardVo yearsStandardVo) {
-        if (planYearsMapper.countProjectName(yearsStandardVo.getProjectName()) > 0) {
-            return AjaxResult.error("该项目名称已经存在");
-        }
+        //if (planYearsMapper.countProjectName(yearsStandardVo.getProjectName()) > 0) {
+        //    return AjaxResult.error("该项目名称已经存在");
+        //}
         PlanYears ofYears = new PlanYears();
         try {
             BeanUtils.copyProperties(yearsStandardVo, ofYears);
@@ -1192,7 +1193,13 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         LambdaQueryWrapper<PlanYears> yearsLp = new LambdaQueryWrapper<PlanYears>();
         yearsLp.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
         yearsLp.eq(PlanYears::getProjectStatus, projectStatus);
-        if (isAd.equals("true")) {
+        // 通过用户ID查询角色
+        List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(user.getUserId());
+        //需求单位只能查看和操作个人数据
+        List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("demand_unit")).collect(Collectors.toList());
+        if (!ObjectUtils.isEmpty(sysRoleList)) {
+            yearsLp.eq(PlanYears::getCreated, user.getUserId());
+        } else if (isAd.equals("true")) {
             List<PmAuditDeptRef> list = new ArrayList<>();
             LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
             l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
@@ -1216,7 +1223,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         quarterLp.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
         quarterLp.eq(PlanQuarter::getProjectStatus, projectStatus);
         quarterLp.eq(PlanQuarter::getPurchaseDeptId, user.getDeptId());
-        if (isAd.equals("true")) {
+        if (!ObjectUtils.isEmpty(sysRoleList)) {
+            quarterLp.eq(PlanQuarter::getCreated, user.getUserId());
+        } else if (isAd.equals("true")) {
             List<PmAuditDeptRef> listF = new ArrayList<>();
             LambdaQueryWrapper<PmAuditDeptRef> lq = new LambdaQueryWrapper<>();
             lq.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
@@ -1246,7 +1255,13 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         LambdaQueryWrapper<PlanYears> yearsLp = new LambdaQueryWrapper<PlanYears>();
         yearsLp.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
         yearsLp.eq(PlanYears::getProjectStatus, projectStatus);
-        if (isAd.equals("true")) {
+        // 通过用户ID查询角色
+        List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(user.getUserId());
+        //需求单位只能查看和操作个人数据
+        List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("demand_unit")).collect(Collectors.toList());
+        if (!ObjectUtils.isEmpty(sysRoleList)) {
+            yearsLp.eq(PlanYears::getCreated, user.getUserId());
+        } else if (isAd.equals("true")) {
             List<PmAuditDeptRef> list = new ArrayList<>();
             LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
             l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
@@ -1269,7 +1284,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         LambdaQueryWrapper<PlanQuarter> quarterLp = new LambdaQueryWrapper<PlanQuarter>();
         quarterLp.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
         quarterLp.eq(PlanQuarter::getProjectStatus, projectStatus);
-        if (isAd.equals("true")) {
+        if (!ObjectUtils.isEmpty(sysRoleList)) {
+            quarterLp.eq(PlanQuarter::getCreated, user.getUserId());
+        } else if (isAd.equals("true")) {
             List<PmAuditDeptRef> listF = new ArrayList<>();
             LambdaQueryWrapper<PmAuditDeptRef> lq = new LambdaQueryWrapper<>();
             lq.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());

purchase-system/src/main/java/com/ozs/plan/service/impl/ProvisionalPlanServiceImpl.java

@@ -239,7 +239,8 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                 lw.eq(ProvisionalPlan::getPlanType, "1");
                 lw.eq(ProvisionalPlan::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
                 if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
-                    lw.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
+                    lw.eq(ProvisionalPlan::getCreated, loginUser.getUserId());
+                    //lw.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
                 }
                 lw.eq(ProvisionalPlan::getPlanType, "1");
                 if (!ObjectUtils.isEmpty(vo.getProjectName())) {
@@ -324,7 +325,8 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
             lw.eq(ProvisionalPlan::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
             lw.eq(ProvisionalPlan::getPlanType, "1");
             if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
-                lw.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
+                lw.eq(ProvisionalPlan::getCreated, loginUser.getUserId());
+                //lw.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
             }
             if (!ObjectUtils.isEmpty(vo.getProjectName())) {
                 lw.like(ProvisionalPlan::getProjectName, vo.getProjectName());
@@ -483,10 +485,10 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
             demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
             demand.setPurchaseDeptId(Long.parseLong(byId.getPurchaseDeptId()));
             demand.setCreateTime(now);
-            demand.setCreateBy(provisionalPlanVo.getUpdated());
-            demand.setUpdateTime(demand.getCreateTime());
+            demand.setCreateBy(byId.getCreated());
+            demand.setUpdateTime(now);
             demand.setUpdateBy(demand.getCreateBy());
-            demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
+            //demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
             pmDemandMapper.insert(demand);
             demandService.updateDemandWarnStatus(demand.getDemandId());
             //计划附件也进行同步---查询临时计划附件后复制一份改为项目需求附件

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -21,7 +21,9 @@ import com.ozs.common.constant.Constants;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysDictData;
+import com.ozs.common.core.domain.entity.SysRole;
 import com.ozs.common.core.domain.entity.SysUser;
+import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.enums.BidWinningStatus;
 import com.ozs.common.enums.ExpertType;
 import com.ozs.common.enums.IsExcess;
@@ -39,6 +41,7 @@ import com.ozs.common.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.home.domain.vo.HomeToDoQueryResVo;
+import com.ozs.plan.doman.PlanYears;
 import com.ozs.plan.doman.ProvisionalPlan;
 import com.ozs.plan.doman.vo.responseVo.PlanQuarterResponseVo;
 import com.ozs.plan.mapper.ProvisionalPlanMapper;
@@ -103,6 +106,7 @@ import com.ozs.system.domain.vo.SysRegionVO;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
 import com.ozs.system.mapper.SysDeptMapper;
 import com.ozs.system.mapper.SysFileRefMapper;
+import com.ozs.system.mapper.SysRoleMapper;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictDataService;
 import com.ozs.system.service.ISysDictTypeService;
@@ -146,7 +150,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     private PmDemandMapper pmDemandMapper;
     @Autowired
     private ISysDeptService deptService;
-
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
     @Autowired
     private ISysDictDataService dictDataService;
     @Autowired
@@ -637,7 +642,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                     }
                 }
             } else {
-                lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
+                lw.eq(PmDemand::getCreateBy, SecurityUtils.getUserId());
+                //lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
             }
         }
 
@@ -4020,9 +4026,16 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
     //查询不同状态下的项目数据
     public List<PmDemand> getListByStatus(String projectStatus) {
+        LoginUser user = SecurityUtils.getLoginUser();
         LambdaQueryWrapper<PmDemand> lw = new LambdaQueryWrapper<PmDemand>();
-        //需求待提交时不用查审核
-        if (!projectStatus.equals("5") && !projectStatus.equals("4")) {
+        // 通过用户ID查询角色
+        List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(user.getUserId());
+        //需求单位只能查看和操作个人数据
+        List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("demand_unit")).collect(Collectors.toList());
+        if (!ObjectUtils.isEmpty(sysRoleList)) {
+            lw.eq(PmDemand::getCreateBy, user.getUserId());
+        } else if (!projectStatus.equals("5") && !projectStatus.equals("4")) {
+            //需求待提交时不用查审核
             List<PmAuditDeptRef> list = new ArrayList<>();
             LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
             l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
@@ -4186,9 +4199,16 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     //查询不同状态下的项目数据的数量
     @Override
     public Integer getNumByStatus(String projectStatus) {
+        LoginUser user = SecurityUtils.getLoginUser();
         LambdaQueryWrapper<PmDemand> lw = new LambdaQueryWrapper<PmDemand>();
-        ///需求待提交时不用查审核
-        if (!projectStatus.equals("5") && !projectStatus.equals("4")) {
+        // 通过用户ID查询角色
+        List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(user.getUserId());
+        //需求单位只能查看和操作个人数据
+        List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("demand_unit")).collect(Collectors.toList());
+        if (!ObjectUtils.isEmpty(sysRoleList)) {
+            lw.eq(PmDemand::getCreateBy, user.getUserId());
+        } else if (!projectStatus.equals("5") && !projectStatus.equals("4")) {
+            ///需求待提交时不用查审核
             List<PmAuditDeptRef> list = new ArrayList<>();
             LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
             l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());