是否在提报时间范围内

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

@@ -190,9 +190,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         if (planQuarterMapper.countProjectName(quarterStandardVo.getProjectName()) > 0) {
             return AjaxResult.error("该项目名称已经存在");
         }
-        if (!isBetweenValue(quarterStandardVo)) {
-            return AjaxResult.error("所创计划不在提报日期内!");
-        }
         //默认未超额
         if (ObjectUtils.isEmpty(quarterStandardVo.getIsExcess())) {
             quarterStandardVo.setIsExcess("0");
@@ -268,9 +265,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         if (planQuarterMapper.countProjectNameOther(quarterStandardVo.getProjectName(), String.valueOf(quarterStandardVo.getPlanPracticalId())) > 0) {
             return AjaxResult.error("该项目名称已经存在");
         }
-        if (!isBetweenValue(quarterStandardVo)) {
-            return AjaxResult.error("所创计划不在提报日期内!");
-        }
         //默认未超额
         if (ObjectUtils.isEmpty(quarterStandardVo.getIsExcess())) {
             quarterStandardVo.setIsExcess("0");
@@ -388,6 +382,9 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     @Transactional
     public AjaxResult commit(PlanQuarterStandardVo quarterStandardVo) {
         PlanQuarter byId = planQuarterMapper.getById(quarterStandardVo.getPlanPracticalId());
+        if (!isBetweenValue(byId)) {
+            return AjaxResult.error("所创计划不在提报日期内!");
+        }
         BigDecimal evaluation = byId.getEvaluation();
         SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
         Long deptId = sysUser.getDeptId();
@@ -740,7 +737,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     }
 
     //是否在提报时间内
-    public Boolean isBetweenValue(PlanQuarterStandardVo quarterStandardVo) {
+    public Boolean isBetweenValue(PlanQuarter planQuarter) {
         //获取年度计划提报时间的阈值
         //获取季度计划各个季度提报时间的阈值
         List<SysDictData> supTime = dictTypeService.selectDictDataByType("sys_quarterly_plan");
@@ -753,7 +750,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date thresholdTimeStart = null;
         Date thresholdTimeEnd = null;
-        Date subTime = quarterStandardVo.getPlanDemandSubTime();
+        Date subTime = planQuarter.getPlanDemandSubTime();
         try {
             for (QuarterEnum val : QuarterEnum.values()) {
                 if (val.getInfo().contains(subTime.getMonth() + "")) {

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

@@ -219,9 +219,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         if (planYearsMapper.countProjectName(yearsStandardVo.getProjectName()) > 0) {
             return AjaxResult.error("该项目名称已经存在");
         }
-        if (!isBetweenValue(yearsStandardVo)) {
-            return AjaxResult.error("所创计划不在提报日期内!");
-        }
         //默认未超额
         if (ObjectUtils.isEmpty(yearsStandardVo.getIsExcess())) {
             yearsStandardVo.setIsExcess("0");
@@ -298,9 +295,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         if (planYearsMapper.countProjectNameOther(yearsStandardVo.getProjectName(), String.valueOf(yearsStandardVo.getPlanYearId())) > 0) {
             return AjaxResult.error("该项目名称已经存在");
         }
-        if (!isBetweenValue(yearsStandardVo)) {
-            return AjaxResult.error("所创计划不在提报日期内!");
-        }
         //默认未超额
         if (ObjectUtils.isEmpty(yearsStandardVo.getIsExcess())) {
             yearsStandardVo.setIsExcess("0");
@@ -334,7 +328,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     }
 
     //是否在提报时间内
-    public Boolean isBetweenValue(PlanYearsStandardVo yearsStandardVo) {
+    public Boolean isBetweenValue(PlanYears planYear) {
         //获取年度计划提报时间的阈值
         List<SysDictData> supTime = dictTypeService.selectDictDataByType("sys_annual_plan");
         HashMap<String, String> thresholdMap = new LinkedHashMap<>();
@@ -346,7 +340,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date thresholdTimeStart = null;
         Date thresholdTimeEnd = null;
-        Date subTime = yearsStandardVo.getPlanDemandSubTime();
+        Date subTime = planYear.getPlanDemandSubTime();
         try {
             if (!ObjectUtils.isEmpty(thresholdTimeStart) && !ObjectUtils.isEmpty(thresholdTimeEnd)) {
                 thresholdTimeStart = dateFormat.parse(thresholdMap.get("起止时间开始"));
@@ -447,6 +441,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Transactional
     public AjaxResult commit(PlanYearsStandardVo yearsStandardVo) {
         PlanYears byId = planYearsMapper.getById(yearsStandardVo.getPlanYearId());
+        if (!isBetweenValue(byId)) {
+            return AjaxResult.error("所创计划不在提报日期内!");
+        }
         BigDecimal evaluation = byId.getEvaluation();
         SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
         Long deptId = sysUser.getDeptId();