Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

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

@@ -88,10 +88,6 @@ public class MonthlyReconciliationController extends BaseController {
         } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
                 || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
             // 采购管理部门  或  采购办
-            /*  (purchase_dept_id = 当前用户deptID  AND  is_excess = 0)
-                OR
-                (purchase_dept_id IN (当前用户 子deptId 集合) and AND  is_excess = 1)
-             */
             SysDept sysDept = new SysDept();
             sysDept.setParentId(getDeptId());
             sysDept.setStatus("0");

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

@@ -100,10 +100,6 @@ public class PlanQuarterController extends BaseController {
             } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
                     || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
                 // 采购管理部门  或  采购办
-            /*  (purchase_dept_id = 当前用户deptID  AND  is_excess = 0)
-                OR
-                (purchase_dept_id IN (当前用户 子deptId 集合) and AND  is_excess = 1)
-             */
                 SysDept sysDept = new SysDept();
                 sysDept.setParentId(loginUser.getDeptId());
                 sysDept.setStatus("0");
@@ -182,10 +178,6 @@ public class PlanQuarterController extends BaseController {
             } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
                     || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
                 // 采购管理部门  或  采购办
-            /*  (purchase_dept_id = 当前用户deptID  AND  is_excess = 0)
-                OR
-                (purchase_dept_id IN (当前用户 子deptId 集合) and AND  is_excess = 1)
-             */
                 SysDept sysDept = new SysDept();
                 sysDept.setParentId(loginUser.getDeptId());
                 sysDept.setStatus("0");

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

@@ -101,10 +101,6 @@ public class PlanYearsController extends BaseController {
             } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
                     || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
                 // 采购管理部门  或  采购办
-            /*  (purchase_dept_id = 当前用户deptID  AND  is_excess = 0)
-                OR
-                (purchase_dept_id IN (当前用户 子deptId 集合) and AND  is_excess = 1)
-             */
                 SysDept sysDept = new SysDept();
                 sysDept.setParentId(loginUser.getDeptId());
                 sysDept.setStatus("0");
@@ -182,10 +178,6 @@ public class PlanYearsController extends BaseController {
             } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
                     || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
                 // 采购管理部门  或  采购办
-            /*  (purchase_dept_id = 当前用户deptID  AND  is_excess = 0)
-                OR
-                (purchase_dept_id IN (当前用户 子deptId 集合) and AND  is_excess = 1)
-             */
                 SysDept sysDept = new SysDept();
                 sysDept.setParentId(loginUser.getDeptId());
                 sysDept.setStatus("0");

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

@@ -68,7 +68,7 @@ public class ProvisionalPlanController extends BaseController {
 
     @ApiOperation(value = "新增临时计划")
     @PostMapping("/insertProvisionalPlan")
-    @PreAuthorize("@ss.hasPermi('provisionalPlan:insertProvisionalPlan')")
+    @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:insertProvisionalPlan')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.INSERT)
     public AjaxResult insertProvisionalPlan(@RequestBody ProvisionalPlan provisionalPlan, HttpServletRequest request) {
         //获取采购单位
@@ -85,7 +85,7 @@ public class ProvisionalPlanController extends BaseController {
 
     @ApiOperation(value = "删除临时计划", notes = "必传 plan_practical_id")
     @PostMapping("/deleteProvisionalPlan")
-    @PreAuthorize("@ss.hasPermi('provisionalPlan:deleteProvisionalPlan')")
+    @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:deleteProvisionalPlan')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.DELETE)
     public AjaxResult deleteProvisionalPlan(@RequestBody ProvisionalPlan provisionalPlan) {
         if (StringUtils.isNull(provisionalPlan) || StringUtils.isNull(provisionalPlan.getPlanPracticalId())) {
@@ -96,7 +96,7 @@ public class ProvisionalPlanController extends BaseController {
 
     @ApiOperation(value = "修改临时计划", notes = "必传 plan_year_id 及修改数据")
     @PostMapping("/updateProvisionalPlan")
-    @PreAuthorize("@ss.hasPermi('provisionalPlan:updateProvisionalPlan')")
+    @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:updateProvisionalPlan')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.UPDATE)
     public AjaxResult updateProvisionalPlan(@RequestBody ProvisionalPlanVo provisionalPlan) {
         if (StringUtils.isNull(provisionalPlan) || StringUtils.isNull(provisionalPlan.getPlanPracticalId())) {
@@ -107,7 +107,7 @@ public class ProvisionalPlanController extends BaseController {
 
     @ApiOperation(value = "查询临时计划")
     @PostMapping("/selectProvisionalPlan")
-    @PreAuthorize("@ss.hasPermi('provisionalPlan:selectProvisionalPlan')")
+    @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:selectProvisionalPlan')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.QUERY)
     public AjaxResult selectProvisionalPlan(@RequestBody ProvisionalPlanVo vo, HttpServletRequest request) {
         if (StringUtils.isNull(vo)
@@ -152,10 +152,6 @@ public class ProvisionalPlanController extends BaseController {
             } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
                     || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
                 // 采购管理部门  或  采购办
-            /*  (purchase_dept_id = 当前用户deptID  AND  is_excess = 0)
-                OR
-                (purchase_dept_id IN (当前用户 子deptId 集合) and AND  is_excess = 1)
-             */
                 SysDept sysDept = new SysDept();
                 sysDept.setParentId(loginUser.getDeptId());
                 sysDept.setStatus("0");
@@ -197,7 +193,7 @@ public class ProvisionalPlanController extends BaseController {
 
     @ApiOperation(value = "查询临时计划-审核单位")
     @PostMapping("/selectProvisionalPlanAudit")
-    @PreAuthorize("@ss.hasPermi('provisionalPlan:selectProvisionalPlanAudit')")
+    @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:selectProvisionalPlanAudit')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.QUERY)
     public AjaxResult selectProvisionalPlanAudit(@RequestBody ProvisionalPlanVo vo, HttpServletRequest request) {
         if (StringUtils.isNull(vo)
@@ -244,10 +240,6 @@ public class ProvisionalPlanController extends BaseController {
             } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
                     || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
                 // 采购管理部门  或  采购办
-            /*  (purchase_dept_id = 当前用户deptID  AND  is_excess = 0)
-                OR
-                (purchase_dept_id IN (当前用户 子deptId 集合) and AND  is_excess = 1)
-             */
                 SysDept sysDept = new SysDept();
                 sysDept.setParentId(loginUser.getDeptId());
                 sysDept.setStatus("0");
@@ -278,13 +270,18 @@ public class ProvisionalPlanController extends BaseController {
             e.printStackTrace();
         }
         Page pages = PageUtils.getPages(vo.getPageNum().intValue(), vo.getPageSize().intValue(), planQuarterList);
-
-        return AjaxResult.success(pages);
+        PageInfo<ProvisionalPlan> provisionalPlanPageInfo = new PageInfo<>();
+        if (!ObjectUtils.isEmpty(pages) && pages.getRecords().size() > 0) {
+            provisionalPlanPageInfo.setList(pages.getRecords());
+            provisionalPlanPageInfo.setTotal(pages.getTotal());
+            provisionalPlanPageInfo.setPages(Integer.parseInt(pages.getPages() + ""));
+        }
+        return AjaxResult.success(provisionalPlanPageInfo);
     }
 
     @ApiOperation(value = "查询临时计划详情")
     @PostMapping("/selectById")
-    @PreAuthorize("@ss.hasPermi('provisionalPlan:selectById')")
+    @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:selectById')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.QUERY)
     public AjaxResult selectById(@RequestBody ProvisionalPlanVo provisionalPlanVo) {
         if (StringUtils.isNull(provisionalPlanVo) || StringUtils.isNull(provisionalPlanVo.getPlanPracticalId())) {
@@ -295,7 +292,7 @@ public class ProvisionalPlanController extends BaseController {
 
     @ApiOperation(value = "导入临时计划")
     @PostMapping("/importProvisionalPlan")
-    @PreAuthorize("@ss.hasPermi('provisionalPlan:importProvisionalPlan')")
+    @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:importProvisionalPlan')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.INSERT)
     public AjaxResult importProvisionalPlan(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<ProvisionalPlan> util = new ExcelUtil<>(ProvisionalPlan.class);
@@ -311,7 +308,7 @@ public class ProvisionalPlanController extends BaseController {
 
     @ApiOperation(value = "导出临时计划")
     @PostMapping("/exportProvisionalPlan")
-    @PreAuthorize("@ss.hasPermi('provisionalPlan:exportProvisionalPlan')")
+    @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:exportProvisionalPlan')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.EXPORT)
     public void exportProvisionalPlan(HttpServletResponse response, @RequestBody ProvisionalPlanVo provisionalPlanVo) throws Exception {
         List<ProvisionalPlan> list = provisionalPlanService.selectProvisionalPlanExport(provisionalPlanVo);
@@ -321,7 +318,7 @@ public class ProvisionalPlanController extends BaseController {
 
     @ApiOperation(value = "提交临时计划")
     @PostMapping("/commitProvisionalPlan")
-    @PreAuthorize("@ss.hasPermi('provisionalPlan:commitProvisionalPlan')")
+    @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:commitProvisionalPlan')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.UPDATE)
     public AjaxResult commitProvisionalPlan(@RequestBody ProvisionalPlanVo provisionalPlanVo) {
         if (StringUtils.isNull(provisionalPlanVo) || StringUtils.isNull(provisionalPlanVo.getPlanPracticalId())) {
@@ -332,7 +329,7 @@ public class ProvisionalPlanController extends BaseController {
 
     @ApiOperation(value = "审核通过")
     @PostMapping("/auditPass")
-    @PreAuthorize("@ss.hasPermi('provisionalPlan:auditPass')")
+    @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:auditPass')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.UPDATE)
     public AjaxResult auditPass(@RequestBody ProvisionalPlanVo provisionalPlanVo, HttpServletRequest request) {
         if (StringUtils.isNull(provisionalPlanVo) || StringUtils.isNull(provisionalPlanVo.getPlanPracticalId())) {
@@ -345,7 +342,7 @@ public class ProvisionalPlanController extends BaseController {
 
     @ApiOperation(value = "审核不通过")
     @PostMapping("/auditNoPass")
-    @PreAuthorize("@ss.hasPermi('provisionalPlan:auditNoPass')")
+    @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:auditNoPass')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.UPDATE)
     public AjaxResult auditNoPass(@RequestBody ProvisionalPlanVo provisionalPlanVo, HttpServletRequest request) {
         if (StringUtils.isNull(provisionalPlanVo) || StringUtils.isNull(provisionalPlanVo.getPlanPracticalId())) {

purchase-admin/src/main/java/com/ozs/web/controller/statisticalAnalysis/StatisticalAnalysisController.java

@@ -32,6 +32,8 @@ import java.util.List;
 import java.util.Map;
 
 /**
+ * 统计分析页面控制层
+ *
  * @author buzhanyi
  */
 @RestController

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

@@ -814,6 +814,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         if (ObjectUtils.isEmpty(pmDemand)) {
             throw new Exception("参数错误");
         }
+        if (ObjectUtils.isEmpty(pmReleaseAnnouncementReqVo.getSysFileRefs())) {
+            throw new Exception("上传附件不能为空");
+        }
+
         PmReleaseAnnouncement pmReleaseAnnouncement = new PmReleaseAnnouncement();
         BeanUtils.copyProperties(pmReleaseAnnouncementReqVo, pmReleaseAnnouncement);
         if (pmReleaseAnnouncementService.saveOrUpdate(pmReleaseAnnouncement)) {
@@ -1110,6 +1114,12 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         }
     }
 
+    /**
+     * 填写中标
+     * @param pmBidWinningReqVo
+     * @return
+     * @throws Exception
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean insertPmBidWinning(PmBidWinningReqVo pmBidWinningReqVo) throws Exception {
@@ -1170,6 +1180,23 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             if (pmBidWinningOpeningRefService.saveOrUpdateBatch(pmBidWinningOpeningRefList)) {
 
                 uploadFile(pmBidWinning.getId(), SysFileRefEnum.PM_BID_WINNING_FILE.getType(), pmBidWinningReqVo.getSysFileRefs(), pmBidWinningReqVo.getUpdateBy());
+
+
+                //发布公告生成后，会默认将该数据同步到公告管理和首页中
+                PmDemand pmDemand = this.getById(pmBidWinningReqVo.getDemandId());
+                BaseNotice baseNotice = new BaseNotice();
+                baseNotice.setName(pmDemand.getProjectName());
+                baseNotice.setTitle(pmDemand.getProjectName() + "中标公告");
+                LambdaQueryWrapper<BaseNoticeType> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                lambdaQueryWrapper.eq(BaseNoticeType::getName, "中标公告");
+                BaseNoticeType baseNoticeType = baseNoticeTypeService.getOne(lambdaQueryWrapper);
+                if (baseNoticeType == null) {
+                    throw new Exception("中标公告 公告类型不存在");
+                }
+                baseNotice.setType(baseNoticeType.getId());
+                baseNotice.setReleaseTime(pmBidWinningReqVo.getBidAnnouncementTime());
+                 this.baseNoticeService.saveOrUpdate(baseNotice);
+
                 PmDemand pmDemandUpdate = new PmDemand();
                 pmDemandUpdate.setDemandId(pmBidWinningReqVo.getDemandId());
                 pmDemandUpdate.setProjectStatus(PmProjectStatus.BIDDING_PUBLICITY.getCode());
@@ -1286,6 +1313,22 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             }
 
             uploadFile(pmBidFailure.getId(), SysFileRefEnum.PM_BID_FAILURE_FILE.getType(), pmBidFailureReqVo.getSysFileRefs(), pmBidFailureReqVo.getUpdateBy());
+
+            //发布公告生成后，会默认将该数据同步到公告管理和首页中
+            PmDemand pmDemand = this.getById(pmBidFailureReqVo.getDemandId());
+            BaseNotice baseNotice = new BaseNotice();
+            baseNotice.setName(pmDemand.getProjectName());
+            baseNotice.setTitle(pmDemand.getProjectName() + "流标公告");
+            LambdaQueryWrapper<BaseNoticeType> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(BaseNoticeType::getName, "流标公告");
+            BaseNoticeType baseNoticeType = baseNoticeTypeService.getOne(lambdaQueryWrapper);
+            if (baseNoticeType == null) {
+                throw new Exception("流标公告 公告类型不存在");
+            }
+            baseNotice.setType(baseNoticeType.getId());
+            baseNotice.setReleaseTime(pmBidFailureReqVo.getBidFailureTime());
+            this.baseNoticeService.saveOrUpdate(baseNotice);
+
             PmDemand pmDemandUpdate = new PmDemand();
             pmDemandUpdate.setDemandId(pmBidFailureReqVo.getDemandId());
             pmDemandUpdate.setProjectStatus(PmProjectStatus.WAIT_ANNOUNCEMENT.getCode());