buzhanyi hace 2 años
padre
commit
bfd40f39d5

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

@@ -284,7 +284,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "导入年度计划数据")
     @PostMapping("/importPlanYearsData")
-    @PreAuthorize("@ss.hasPermi('plan:quarter:importPlanYearsData')")
+    //@PreAuthorize("@ss.hasPermi('plan:quarter:importPlanYearsData')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.INSERT)
     public AjaxResult importPlanYearsData(@RequestBody List<Long> planYearIds) throws Exception {
         if (ObjectUtils.isEmpty(planYearIds)) {

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

@@ -3406,7 +3406,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         byChange.add(tThisYear);
         //正常推进周期内的采购任务--本年度项目未超过计划完成采购时间的数据
         StatisticalChartsResVo cThisYear = pmDemandMapper.selectCCThisYear(pmDemandReqVo);
-        cThisYear.setColumnName("上年度结转和本年度提报的采购需求中累计已完成的采购任务");
+        cThisYear.setColumnName("正常推进周期内的采购任务");
         byChange.add(cThisYear);
         return byChange;
     }