Merge branch 'master' into prod

purchase-system/src/main/java/com/ozs/plan/doman/ProvisionalPlan.java

@@ -82,6 +82,7 @@ public class ProvisionalPlan {
     /**
      * 预算科目
      */
+    @Excel(name = "预算科目")
     @TableField("budget_account")
     private String budgetAccount;
     @TableField(exist = false)

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

@@ -129,7 +129,8 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
         HashMap<String, String> projectTypesMap = planEnums.get("projectTypesAds");
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
-
+        //预算科目
+        HashMap<String, String> budgetAccountMap = planEnums.get("budgetAccount");
         int successNum = 0;
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
@@ -185,7 +186,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     }
                 }
                 ofProvisionalPlan.setOrganDivision(zBuilder.toString());
-
+                ofProvisionalPlan.setBudgetAccount(budgetAccountMap.get(ofProvisionalPlan.getBudgetAccount()));
 
                 //项目属性是多选字段
                 StringBuilder builder = new StringBuilder();
@@ -206,7 +207,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                 ofProvisionalPlan.setCreated(String.valueOf(loginUser.getUserId()));
                 ofProvisionalPlan.setCreateTime(new Date());
                 ofProvisionalPlan.setPlanType("1");
-                if (!ObjectUtils.isEmpty(ofProvisionalPlan.getPlanPracticalId()) && !ObjectUtils.isEmpty(ofProvisionalPlan.getOrganDivision())) {
+                if (!ObjectUtils.isEmpty(ofProvisionalPlan.getPurchaseDeptId()) && !ObjectUtils.isEmpty(ofProvisionalPlan.getOrganDivision())) {
                     provisionalPlanMapper.insert(ofProvisionalPlan);
                     successNum++;
                     successMsg.append(successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 导入成功!");
@@ -745,6 +746,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     StringBuilder builder = new StringBuilder();
                     String[] split = organDivision.split(",");
                     for (String s : split) {
+
                         sysDept = deptService.selectById(Long.valueOf(s));
                         if (!ObjectUtils.isEmpty(sysDept)) {
                             if (!organDivision.endsWith(s)) {