Merge remote-tracking branch 'origin/master'

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

@@ -340,12 +340,12 @@ public class PlanYearsController extends BaseController {
     @PostMapping("/importData")
     @PreAuthorize("@ss.hasPermi('plan:planYears:importData')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.INSERT)
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
+    public AjaxResult importData(MultipartFile file) throws Exception {
         ExcelUtil<PlanYearsStandardVo> util = new ExcelUtil<>(PlanYearsStandardVo.class);
         List<PlanYearsStandardVo> planYears = util.importExcel(file.getInputStream(), 2);
         //获取采购单位-
         LoginUser loginUser = getLoginUser();
-        String message = planYearsService.importPlanYears(planYears, updateSupport, loginUser);
+        String message = planYearsService.importPlanYears(planYears, loginUser);
         return success(message);
     }
 

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

@@ -92,7 +92,7 @@ public interface PlanYearsService extends IService<PlanYears> {
      *
      * @return 结果
      */
-    public String importPlanYears(List<PlanYearsStandardVo> planYears, boolean isUpdateSupport, LoginUser loginUser);
+    public String importPlanYears(List<PlanYearsStandardVo> planYears, LoginUser loginUser);
 
     /**
      * 提交年度计划

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

@@ -206,11 +206,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         return planYearsList;
     }
 
-    public static void main(String[] args) {
-        int i = (int) Math.ceil(6.66);
-        System.err.println(i);
-    }
-
     @Override
     public AjaxResult deletePlanYearsByIds(Long[] planIds) {
         planYearsMapper.deletePlanYearsByIds(planIds);
@@ -357,7 +352,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
     @Transactional
     @Override
-    public String importPlanYears(List<PlanYearsStandardVo> planYears, boolean isUpdateSupport, LoginUser loginUser) {
+    public String importPlanYears(List<PlanYearsStandardVo> planYears, LoginUser loginUser) {
         //获取字典数据
         HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
         //项目属性