机关业务指导处

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

@@ -138,77 +138,79 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         for (ProvisionalPlan ofProvisionalPlan : provisionalPlans) {
             try {
                 //将录入信息中的值更改为要保存的数据
-                    //采购单位
-                    SysDept info = deptMapper.checkDeptNameOnlyOne(ofProvisionalPlan.getPurchaseDeptName());
-                    if (StringUtils.isNotNull(info)) {
-                        ofProvisionalPlan.setPurchaseDeptId(String.valueOf(info.getDeptId()));
-                    }
-                    ofProvisionalPlan.setProjectType(projectTypesMap.get(ofProvisionalPlan.getProjectType()));
-                    ofProvisionalPlan.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-
-                    //机关业务指导处是多选字段
-                    StringBuilder zBuilder = new StringBuilder();
-                    if (ofProvisionalPlan.getOrganDivision().contains(",")) {
-                        String[] split = ofProvisionalPlan.getOrganDivision().split(",");
-                        for (String s : split) {
-                            SysDeptOrgan infoTow = sysDeptOrganMapper.checkDeptOrganNameOnlyOne(s);
-                            //不是最后一位就加‘,’，是就直接结尾
-                            if (!ofProvisionalPlan.getOrganDivision().endsWith(s)) {
-                                if (!ObjectUtils.isEmpty(infoTow)) {
-                                    zBuilder.append(infoTow.getId() + ",");
-                                } else {
-                                    ++failureNum;
-                                    failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在");
-                                }
+                //采购单位
+                SysDept info = deptMapper.checkDeptNameOnlyOne(ofProvisionalPlan.getPurchaseDeptName());
+                if (StringUtils.isNotNull(info)) {
+                    ofProvisionalPlan.setPurchaseDeptId(String.valueOf(info.getDeptId()));
+                }
+                ofProvisionalPlan.setProjectType(projectTypesMap.get(ofProvisionalPlan.getProjectType()));
+                ofProvisionalPlan.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
+
+                //机关业务指导处是多选字段
+                StringBuilder zBuilder = new StringBuilder();
+                if (ofProvisionalPlan.getOrganDivision().contains(",")) {
+                    String[] split = ofProvisionalPlan.getOrganDivision().split(",");
+                    for (String s : split) {
+                        SysDeptOrgan infoTow = sysDeptOrganMapper.checkDeptOrganNameOnlyOne(s);
+                        //不是最后一位就加‘,’，是就直接结尾
+                        if (!ofProvisionalPlan.getOrganDivision().endsWith(s)) {
+                            if (!ObjectUtils.isEmpty(infoTow)) {
+                                zBuilder.append(infoTow.getId() + ",");
                             } else {
-                                if (!ObjectUtils.isEmpty(infoTow)) {
-                                    zBuilder.append(infoTow.getId());
-                                } else {
-                                    ++failureNum;
-                                    failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在");
-                                }
+                                ++failureNum;
+                                failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在");
                             }
-                        }
-                        String zs = zBuilder.toString();
-                        if (zs.endsWith(",")) {
-                            zBuilder = null;
-                            zBuilder.append(zs.substring(0, zs.length() - 1));
-                        }
-                    } else {
-                        //没有多选
-                        SysDeptOrgan infoTow = sysDeptOrganMapper.checkDeptOrganNameOnlyOne(ofProvisionalPlan.getOrganDivision());
-                        if (!ObjectUtils.isEmpty(infoTow)) {
-                            zBuilder.append(infoTow.getId());
                         } else {
-                            ++failureNum;
-                            failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在");
+                            if (!ObjectUtils.isEmpty(infoTow)) {
+                                zBuilder.append(infoTow.getId());
+                            } else {
+                                ++failureNum;
+                                failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在");
+                            }
                         }
                     }
-                    ofProvisionalPlan.setOrganDivision(zBuilder.toString());
+                    String zs = zBuilder.toString();
+                    if (zs.endsWith(",")) {
+                        zBuilder = null;
+                        zBuilder.append(zs.substring(0, zs.length() - 1));
+                    }
+                } else {
+                    //没有多选
+                    SysDeptOrgan infoTow = sysDeptOrganMapper.checkDeptOrganNameOnlyOne(ofProvisionalPlan.getOrganDivision());
+                    if (!ObjectUtils.isEmpty(infoTow)) {
+                        zBuilder.append(infoTow.getId());
+                    } else {
+                        ++failureNum;
+                        failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在");
+                    }
+                }
+                ofProvisionalPlan.setOrganDivision(zBuilder.toString());
 
 
-                    //项目属性是多选字段
-                    StringBuilder builder = new StringBuilder();
-                    if (ofProvisionalPlan.getProjectAttr().contains(",")) {
-                        String[] split = ofProvisionalPlan.getProjectAttr().split(",");
-                        for (String s : split) {
-                            if (!ofProvisionalPlan.getProjectAttr().endsWith(s)) {
-                                builder.append(projectAttributes.get(s) + ",");
-                            } else {
-                                builder.append(projectAttributes.get(s));
-                            }
+                //项目属性是多选字段
+                StringBuilder builder = new StringBuilder();
+                if (ofProvisionalPlan.getProjectAttr().contains(",")) {
+                    String[] split = ofProvisionalPlan.getProjectAttr().split(",");
+                    for (String s : split) {
+                        if (!ofProvisionalPlan.getProjectAttr().endsWith(s)) {
+                            builder.append(projectAttributes.get(s) + ",");
+                        } else {
+                            builder.append(projectAttributes.get(s));
                         }
-                    } else {
-                        builder.append(projectAttributes.get(ofProvisionalPlan.getProjectAttr()));
                     }
-                    ofProvisionalPlan.setProjectAttr(builder.toString());
-                    //ofProvisionalPlan.setIsExcess(deptService.isExcessOrNo(ofProvisionalPlan.getProjectType(), ofProvisionalPlan.getEvaluation(), info.getDeptId()));
-                    ofProvisionalPlan.setCreated(String.valueOf(loginUser.getUserId()));
-                    ofProvisionalPlan.setCreateTime(new Date());
-                    ofProvisionalPlan.setPlanType("1");
+                } else {
+                    builder.append(projectAttributes.get(ofProvisionalPlan.getProjectAttr()));
+                }
+                ofProvisionalPlan.setProjectAttr(builder.toString());
+                //ofProvisionalPlan.setIsExcess(deptService.isExcessOrNo(ofProvisionalPlan.getProjectType(), ofProvisionalPlan.getEvaluation(), info.getDeptId()));
+                ofProvisionalPlan.setCreated(String.valueOf(loginUser.getUserId()));
+                ofProvisionalPlan.setCreateTime(new Date());
+                ofProvisionalPlan.setPlanType("1");
+                if (!ObjectUtils.isEmpty(ofProvisionalPlan.getPlanPracticalId()) && !ObjectUtils.isEmpty(ofProvisionalPlan.getOrganDivision())) {
                     provisionalPlanMapper.insert(ofProvisionalPlan);
                     successNum++;
                     successMsg.append(successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 导入成功!");
+                }
             } catch (Exception exc) {
                 failureNum++;
                 String msg = successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 导入失败；";