补充copy方法中未赋值字段

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

@@ -346,7 +346,6 @@ public class PlanYearsController extends BaseController {
         String message = planYearsService.importPlanYears(planYears, updateSupport, loginUser);
         return success(message);
     }
-    //}
 
     @ApiOperation(value = "系统首页计划管理")
     @GetMapping("/planYearsTotal")

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

@@ -54,10 +54,6 @@ import java.util.stream.Collectors;
 @RequestMapping("/plan/provisionalPlan")
 public class ProvisionalPlanController extends BaseController {
 
-    @Autowired
-    private PlanQuarterService quarterService;
-    @Autowired
-    private PlanQuarterServiceImpl quarterServiceImpl;
     @Autowired
     private ProvisionalPlanService provisionalPlanService;
     @Autowired
@@ -65,8 +61,6 @@ public class ProvisionalPlanController extends BaseController {
     @Autowired
     private ISysDeptService iSysDeptService;
     @Autowired
-    private PlanQuarterServiceImpl planQuarterServiceImpl;
-    @Autowired
     private SysFileRefService sysFileRefService;
 
     @ApiOperation(value = "新增临时计划")

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

@@ -444,8 +444,9 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             planYearsMapper.insertPlanYears(ofYears);
             quarters.setPlanYearId(ofYears.getPlanYearId());
         }
-        demand.setEvaluation(byId.getEvaluation().doubleValue());
         BeanUtils.copyProperties(byId, demand);
+        demand.setEvaluation(byId.getEvaluation().doubleValue());
+        demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
         demand.setPlanId(byId.getPlanPracticalId());
         demand.setPurchaseDeptId(Long.valueOf(byId.getPurchaseDeptId()));
         //同步到项目管理状态为需求待填制
@@ -545,32 +546,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         return AjaxResult.success();
     }
 
-    //判断是否为超额计划
-    public String isExcessOrNo(String projectType, BigDecimal evaluation) {
-        BigDecimal threshold = new BigDecimal(0);
-        //获取各个项目类型设定的概算金额阈值
-        List<SysDictData> data = dictTypeService.selectDictDataByType("sys_over_limit_threshold");
-        HashMap<String, String> thresholdMap = new LinkedHashMap<>();
-        //各个类型的概算金额阈值
-        for (SysDictData dictData : data) {
-            //    类型----阈值
-            thresholdMap.put(dictData.getDictLabel(), dictData.getDictValue());
-        }
-        //项目类型
-        for (ProjectTypes value : ProjectTypes.values()) {
-            if (projectType.equals(value.getCode())) {
-                threshold = BigDecimal.valueOf(Long.parseLong(thresholdMap.get(value.getInfo())));
-            }
-            break;
-        }
-        if (evaluation.compareTo(threshold) == 1) {
-            //是超额计划
-            return ("1");
-        } else {
-            return ("0");
-        }
-    }
-
     //字段赋值对应的名称
     public List<PlanQuarterResponseVo> changeTo(List<PlanQuarter> planQuarters) {
         //获取季度计划各个季度提报时间的阈值

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

@@ -485,6 +485,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             //同步到项目管理状态为需求待填制
             demand.setPlanId(quarters.getPlanPracticalId());
             demand.setEvaluation(byId.getEvaluation().doubleValue());
+            demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
             demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
             demand.setPurchaseDeptId(Long.valueOf(byId.getPurchaseDeptId()));
             demand.setCreateTime(new Date());

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

@@ -448,8 +448,9 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         }
         PmDemand demand = new PmDemand();
         BeanUtils.copyProperties(byId, demand);
-        demand.setPlanId(Long.valueOf(byId.getPlanPracticalId()));
+        demand.setPlanId(byId.getPlanPracticalId());
         demand.setEvaluation(byId.getEvaluation().doubleValue());
+        demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
         //同步到项目管理状态为需求待填制
         demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
         demand.setPurchaseDeptId(Long.parseLong(byId.getPurchaseDeptId()));
@@ -505,32 +506,6 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         return AjaxResult.success();
     }
 
-    //判断是否为超额计划
-    public String isExcessOrNo(String projectType, BigDecimal evaluation) {
-        BigDecimal threshold = new BigDecimal(0);
-        //获取各个项目类型设定的概算金额阈值
-        List<SysDictData> data = dictTypeService.selectDictDataByType("sys_over_limit_threshold");
-        HashMap<String, String> thresholdMap = new LinkedHashMap<>();
-        //各个类型的概算金额阈值
-        for (SysDictData dictData : data) {
-            //    类型----阈值
-            thresholdMap.put(dictData.getDictLabel(), dictData.getDictValue());
-        }
-        //项目类型
-        for (ProjectTypes value : ProjectTypes.values()) {
-            if (projectType.equals(value.getCode())) {
-                threshold = BigDecimal.valueOf(Long.parseLong(thresholdMap.get(value.getInfo())));
-            }
-            break;
-        }
-        if (evaluation.compareTo(threshold) == 1) {
-            //是超额计划
-            return ("1");
-        } else {
-            return ("0");
-        }
-    }
-
     // 字典项负值
     public ProvisionalPlan changeToProvisionalPlan(ProvisionalPlan provisionalPlan) {
         HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();