字段调整

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

@@ -1,6 +1,8 @@
 package com.ozs.plan.doman;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
@@ -23,7 +25,7 @@ public class PlanYears extends BaseEntity {
      * 主键编号
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @TableId(type = IdType.AUTO)
     private Long planYearId;
     /**
      * 采购单位（登录账号的单位）
@@ -45,6 +47,7 @@ public class PlanYears extends BaseEntity {
     @Excel(name = "项目类型")
     @NotNull(message = "项目类型不能为空")
     private String projectType;
+    private String projectTypeStr;
     /**
      * 需求概况
      */
@@ -68,12 +71,14 @@ public class PlanYears extends BaseEntity {
     @Excel(name = "采购服务站")
     @NotNull(message = "采购服务站不能为空")
     private String purchaseServices;
+    private String purchaseServicesStr;
     /**
      * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
      */
     @Excel(name = "采购方式")
     @NotNull(message = "采购方式不能为空")
     private String purchaseMode;
+    private String purchaseModeStr;
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */
@@ -101,6 +106,7 @@ public class PlanYears extends BaseEntity {
     @Excel(name = "项目属性")
     @NotNull(message = "项目属性不能为空")
     private String projectAttr;
+    private String projectAttrStr;
     /**
      * 计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示
      */

purchase-system/src/main/java/com/ozs/plan/mapper/PlanYearsMapper.java

@@ -77,7 +77,7 @@ public interface PlanYearsMapper extends BaseMapper<PlanYears> {
      * @param ofYears 年度计划
      * @return 结果
      */
-    public int updateById(PlanYears ofYears);
+    public int updateInfoById(PlanYears ofYears);
 
     public int deletePlanYearsById(Long planId);
 

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

@@ -25,10 +25,13 @@ import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.system.service.SysFileService;
 import com.ozs.system.service.impl.SysUserServiceImpl;
+import io.netty.util.internal.ObjectUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import javax.validation.Validator;
 import java.math.BigDecimal;
@@ -98,6 +101,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         return planYears;
     }
 
+    @Transactional
     @Override
     public AjaxResult insertPlanYears(PlanYearsStandardVo yearsStandardVo) {
         if (planYearsMapper.countProjectName(yearsStandardVo.getProjectName()).size() > 0) {
@@ -116,14 +120,16 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         ofYears.setCreateTime(new Date());
         Long insertId = planYearsMapper.insertPlanYears(ofYears);
         List<SysFileRef> sysFileRefs = yearsStandardVo.getSysFileRefs();
-        for (SysFileRef ref : sysFileRefs) {
-            ref.setRedId(insertId);
-            ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
-            ref.setCreated(ofYears.getCreated());
-            ref.setCreateTime(new Date());
-            ref.setUpdated(ofYears.getCreated());
-            ref.setUpdateTime(new Date());
-            sysFileRefMapper.insert(ref);
+        if (!ObjectUtils.isEmpty(sysFileRefs)) {
+            for (SysFileRef ref : sysFileRefs) {
+                ref.setRedId(insertId);
+                ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
+                ref.setCreated(ofYears.getCreated());
+                ref.setCreateTime(new Date());
+                ref.setUpdated(ofYears.getCreated());
+                ref.setUpdateTime(new Date());
+                sysFileRefMapper.insert(ref);
+            }
         }
         return AjaxResult.success();
     }
@@ -156,7 +162,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         map.put("type", "1");
         List<SysFileRef> fileRefs = sysFileRefMapper.selectByMap(map);
         BeanUtils.copyProperties(byId, responseVo);
-        if (fileRefs.size() > 0) {
+        if (!ObjectUtils.isEmpty(fileRefs)) {
             List<String> urlList = new ArrayList<>();
             for (SysFileRef ref : fileRefs) {
                 urlList.add(fileService.getById(ref.getFileId()).getFileUrl());
@@ -180,20 +186,22 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         ofYears.setIsExcess(isExcessOrNo(ofYears.getProjectType(), ofYears.getEvaluation()));
         ofYears.setUpdateTime(new Date());
         ofYears.setSendLetter("0");
-        planYearsMapper.updateById(ofYears);
+        planYearsMapper.updateInfoById(ofYears);
         List<SysFileRef> sysFileRefs = yearsStandardVo.getSysFileRefs();
         HashMap<String, Object> map = new HashMap<>();
         map.put("red_id", ofYears.getPlanYearId());
         map.put("type", "1");
         sysFileRefMapper.deleteByMap(map);
-        for (SysFileRef ref : sysFileRefs) {
-            ref.setRedId(ofYears.getPlanYearId());
-            ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
-            ref.setCreated(ofYears.getCreated());
-            ref.setCreateTime(new Date());
-            ref.setUpdated(ofYears.getCreated());
-            ref.setUpdateTime(new Date());
-            sysFileRefMapper.insert(ref);
+        if (!ObjectUtils.isEmpty(sysFileRefs)) {
+            for (SysFileRef ref : sysFileRefs) {
+                ref.setRedId(ofYears.getPlanYearId());
+                ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
+                ref.setCreated(ofYears.getCreated());
+                ref.setCreateTime(new Date());
+                ref.setUpdated(ofYears.getCreated());
+                ref.setUpdateTime(new Date());
+                sysFileRefMapper.insert(ref);
+            }
         }
         return AjaxResult.success();
     }
@@ -326,10 +334,12 @@ public class PlanYearsServiceImpl implements PlanYearsService {
 
     private AjaxResult review(PlanYearsStandardVo vo, PlanYears ofYears) {
         List<SysFileRef> sysFileRefs = vo.getSysFileRefs();
-        for (SysFileRef ref : sysFileRefs) {
-            ref.setRedId(vo.getPlanYearId());
-            ref.setType(SysFileRefEnum.PLAN_YEAR_EXAMINE.getType());
-            sysFileRefMapper.insert(ref);
+        if (!ObjectUtils.isEmpty(sysFileRefs)) {
+            for (SysFileRef ref : sysFileRefs) {
+                ref.setRedId(vo.getPlanYearId());
+                ref.setType(SysFileRefEnum.PLAN_YEAR_EXAMINE.getType());
+                sysFileRefMapper.insert(ref);
+            }
         }
         int review = planYearsMapper.review(ofYears);
         if (review != 1) {
@@ -363,10 +373,12 @@ public class PlanYearsServiceImpl implements PlanYearsService {
     @Override
     public AjaxResult upLoadPlanFile(PlanYearsStandardVo yearsStandardVo) {
         List<SysFileRef> sysFileRefs = yearsStandardVo.getSysFileRefs();
-        for (SysFileRef ref : sysFileRefs) {
-            ref.setRedId(yearsStandardVo.getPlanYearId());
-            ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
-            sysFileRefMapper.insert(ref);
+        if (!ObjectUtils.isEmpty(sysFileRefs)) {
+            for (SysFileRef ref : sysFileRefs) {
+                ref.setRedId(yearsStandardVo.getPlanYearId());
+                ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
+                sysFileRefMapper.insert(ref);
+            }
         }
         return AjaxResult.success();
     }
@@ -415,13 +427,13 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         for (PlanYears planYear : planYears) {
             for (Map.Entry<String, String> entry : projectTypesMap.entrySet()) {
                 if (planYear.getProjectType().equals(entry.getValue())) {
-                    planYear.setProjectType(entry.getKey());
+                    planYear.setProjectTypeStr(entry.getKey());
                     break;
                 }
             }
             for (Map.Entry<String, String> entry : planPurchaseModesMap.entrySet()) {
                 if (planYear.getPurchaseMode().equals(entry.getValue())) {
-                    planYear.setPurchaseMode(entry.getKey());
+                    planYear.setPurchaseModeStr(entry.getKey());
                     break;
                 }
             }
@@ -441,14 +453,14 @@ public class PlanYearsServiceImpl implements PlanYearsService {
             } else {
                 for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
                     if (planYear.getProjectAttr().equals(entry.getValue())) {
-                        planYear.setProjectAttr(entry.getKey());
+                        planYear.setProjectAttrStr(entry.getKey());
                         break;
                     }
                 }
             }
             for (Map.Entry<String, String> entry : purchaseServices.entrySet()) {
                 if (planYear.getPurchaseServices().equals(entry.getValue())) {
-                    planYear.setPurchaseServices(entry.getKey());
+                    planYear.setPurchaseServicesStr(entry.getKey());
                     break;
                 }
             }

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

@@ -30,7 +30,7 @@
 		<result property="del_flay" column="delFlay"/>
 	</resultMap>
 
-	<update id="updateById" parameterType="com.ozs.plan.doman.PlanYears">
+	<update id="updateInfoById" parameterType="com.ozs.plan.doman.PlanYears">
 		update plan_years
 		set project_name=#{projectName},
 			project_type=#{projectType},