项目属性字段使用英文逗号拼接

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

@@ -8,7 +8,6 @@ import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.framework.web.service.TokenService;
 import com.ozs.plan.doman.PlanQuarter;
 import com.ozs.plan.doman.vo.requestVo.PlanQuarterStandardVo;
-import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import com.ozs.plan.service.PlanQuarterService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -17,9 +17,9 @@ import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.plan.doman.PlanQuarter;
 import com.ozs.plan.doman.PlanYears;
 import com.ozs.plan.doman.vo.requestVo.PlanQuarterStandardVo;
-import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import com.ozs.plan.doman.vo.responseVo.PlanQuarterResponseVo;
 import com.ozs.plan.mapper.PlanQuarterMapper;
+import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.service.PlanQuarterService;
 import com.ozs.system.domain.SysFileInfo;
 import com.ozs.system.domain.SysFileRef;
@@ -54,6 +54,8 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
     @Autowired
     PlanQuarterMapper planQuarterMapper;
     @Autowired
+    PlanYearsMapper planYearsMapper;
+    @Autowired
     protected Validator validator;
     @Autowired
     private ISysDictTypeService dictTypeService;
@@ -315,18 +317,21 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                 if (planQuarterMapper.countProjectName(ofYear.getProjectName()) == 0) {
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofYear.getPurchaseDeptName());
-                    if (StringUtils.isNotNull(info)) {
+                    if (!ObjectUtils.isEmpty(info)) {
                         ofYear.setPurchaseDeptId(info.getDeptId());
+                    } else {
+                        ++failureNum;
+                        failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");
                     }
                     ofYear.setProjectType(projectTypesMap.get(ofYear.getProjectType()));
                     ofYear.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
                     ofYear.setPurchaseMode(planPurchaseModesMap.get(ofYear.getPurchaseMode()));
                     //项目属性是多选字段
                     StringBuilder builder = new StringBuilder();
-                    if (ofYear.getProjectAttr().contains("，")) {
-                        String[] split = ofYear.getProjectAttr().split("，");
+                    if (ofYear.getProjectAttr().contains(",")) {
+                        String[] split = ofYear.getProjectAttr().split(",");
                         for (String s : split) {
-                            builder.append(projectAttributes.get(s) + "，");
+                            builder.append(projectAttributes.get(s) + ",");
                         }
                     } else {
                         builder.append(projectAttributes.get(ofYear.getProjectAttr()));
@@ -349,11 +354,11 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                     //    successMsg.append("<br/>" + successNum + "、项目 " + ofYear.getProjectName() + " 更新成功");
                 } else {
                     failureNum++;
-                    failureMsg.append("*" + successNum + "、项目 " + ofYear.getProjectName() + " 已存在");
+                    failureMsg.append(failureNum + "*项目 " + ofYear.getProjectName() + " 已存在！/n");
                 }
             } catch (Exception exc) {
                 failureNum++;
-                String msg = "*" + successNum + "、项目 " + ofYear.getProjectName() + " 导入失败";
+                String msg = "*" + successNum + "*项目 " + ofYear.getProjectName() + " 导入失败";
                 failureMsg.append(msg + exc.getMessage());
                 log.error(msg, exc);
             }
@@ -404,6 +409,13 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
     public AjaxResult reviewTo(PlanQuarterStandardVo vo) {
         PlanQuarter quarters = new PlanQuarter();
         BeanUtils.copyProperties(vo, quarters);
+        PlanQuarter byId = planQuarterMapper.getById(vo.getPlanPracticalId());
+        if (ObjectUtils.isEmpty(byId.getPlanYearId())) {
+            PlanYears ofYears = new PlanYears();
+            BeanUtils.copyProperties(vo, ofYears);
+            planYearsMapper.insertPlanYears(ofYears);
+            quarters.setPlanYearId(ofYears.getPlanYearId());
+        }
         quarters.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
         return review(vo, quarters);
     }
@@ -532,11 +544,11 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
             //项目属性是拼接的
             if (planYear.getProjectAttr().length() > 1) {
                 StringBuilder builder = new StringBuilder();
-                String[] split = planYear.getProjectAttr().split("，");
+                String[] split = planYear.getProjectAttr().split(",");
                 for (String s : split) {
                     for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
                         if (s.equals(entry.getValue())) {
-                            builder.append(entry.getKey() + "，");
+                            builder.append(entry.getKey() + ",");
                             break;
                         }
                     }

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

@@ -14,9 +14,11 @@ import com.ozs.common.enums.SysFileRefEnum;
 import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
+import com.ozs.plan.doman.PlanQuarter;
 import com.ozs.plan.doman.PlanYears;
 import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import com.ozs.plan.doman.vo.responseVo.PlanYearsResponseVo;
+import com.ozs.plan.mapper.PlanQuarterMapper;
 import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.service.PlanYearsService;
 import com.ozs.system.domain.SysFileInfo;
@@ -52,6 +54,8 @@ public class PlanYearsServiceImpl implements PlanYearsService {
     @Autowired
     PlanYearsMapper planYearsMapper;
     @Autowired
+    PlanQuarterMapper planQuarterMapper;
+    @Autowired
     protected Validator validator;
     @Autowired
     private ISysDictTypeService dictTypeService;
@@ -284,6 +288,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         return AjaxResult.success();
     }
 
+    @Transactional
     @Override
     public String importPlanYears(List<PlanYearsStandardVo> planYears, boolean isUpdateSupport, LoginUser loginUser) {
         if (StringUtils.isNull(planYears) || planYears.size() == 0) {
@@ -314,18 +319,21 @@ public class PlanYearsServiceImpl implements PlanYearsService {
                 if (planYearsMapper.countProjectName(ofYear.getProjectName()) == 0) {
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofYear.getPurchaseDeptName());
-                    if (StringUtils.isNotNull(info)) {
+                    if (!ObjectUtils.isEmpty(info)) {
                         ofYear.setPurchaseDeptId(info.getDeptId());
+                    } else {
+                        ++failureNum;
+                        failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");
                     }
                     ofYear.setProjectType(projectTypesMap.get(ofYear.getProjectType()));
                     ofYear.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
                     ofYear.setPurchaseMode(planPurchaseModesMap.get(ofYear.getPurchaseMode()));
                     //项目属性是多选字段
                     StringBuilder builder = new StringBuilder();
-                    if (ofYear.getProjectAttr().contains("，")) {
-                        String[] split = ofYear.getProjectAttr().split("，");
+                    if (ofYear.getProjectAttr().contains(",")) {
+                        String[] split = ofYear.getProjectAttr().split(",");
                         for (String s : split) {
-                            builder.append(projectAttributes.get(s) + "，");
+                            builder.append(projectAttributes.get(s) + ",");
                         }
                     } else {
                         builder.append(projectAttributes.get(ofYear.getProjectAttr()));
@@ -348,11 +356,11 @@ public class PlanYearsServiceImpl implements PlanYearsService {
                     //    successMsg.append("<br/>" + successNum + "、项目 " + ofYear.getProjectName() + " 更新成功");
                 } else {
                     failureNum++;
-                    failureMsg.append("*" + successNum + "、项目 " + ofYear.getProjectName() + " 已存在");
+                    failureMsg.append(failureNum + "*项目 " + ofYear.getProjectName() + " 已存在！/n");
                 }
             } catch (Exception exc) {
                 failureNum++;
-                String msg = "*" + successNum + "、项目 " + ofYear.getProjectName() + " 导入失败";
+                String msg = "*" + successNum + "*项目 " + ofYear.getProjectName() + " 导入失败";
                 failureMsg.append(msg + exc.getMessage());
                 log.error(msg, exc);
             }
@@ -403,6 +411,11 @@ public class PlanYearsServiceImpl implements PlanYearsService {
     public AjaxResult reviewTo(PlanYearsStandardVo vo) {
         PlanYears ofYears = new PlanYears();
         BeanUtils.copyProperties(vo, ofYears);
+        //年度计划审核通过后同步到季度计划
+        PlanYears byId = planYearsMapper.getById(vo.getPlanYearId());
+        PlanQuarter quarters = new PlanQuarter();
+        BeanUtils.copyProperties(byId, quarters);
+        planQuarterMapper.insertPlanQuarter(quarters);
         ofYears.setPlanYearId(vo.getPlanYearId());
         ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
         return review(vo, ofYears);
@@ -532,11 +545,11 @@ public class PlanYearsServiceImpl implements PlanYearsService {
             //项目属性是拼接的
             if (planYear.getProjectAttr().length() > 1) {
                 StringBuilder builder = new StringBuilder();
-                String[] split = planYear.getProjectAttr().split("，");
+                String[] split = planYear.getProjectAttr().split(",");
                 for (String s : split) {
                     for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
                         if (s.equals(entry.getValue())) {
-                            builder.append(entry.getKey() + "，");
+                            builder.append(entry.getKey() + ",");
                             break;
                         }
                     }

purchase-system/src/main/resources/mapper/plan/PlanQuarterMapper.xml

@@ -76,7 +76,7 @@
 			and plan_type=0
 			and del_flay=0
 		</where>
-		order by create_time desc
+		order by plan_demand_sub_time desc
 	</select>
 
 	<select id="selectPlanQuarterExamineList" parameterType="com.ozs.plan.doman.PlanQuarter"
@@ -107,7 +107,7 @@
 			and plan_type=0
 			and del_flay=0
 		</where>
-		order by create_time desc
+		order by plan_demand_sub_time desc
 	</select>
 
 	<select id="countProjectName" resultType="java.lang.Integer" parameterType="java.lang.String">