Merge remote-tracking branch 'origin/master'

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

@@ -37,7 +37,7 @@ public class PlanQuarter {
      * 采购单位（登录账号的单位）
      */
     @NotNull(message = "采购单位不能为空")
-    private String purchaseDeptId;
+    private Long purchaseDeptId;
 
     @Excel(name = "采购单位")
     @TableField(exist = false)

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

@@ -29,7 +29,7 @@ public class PlanYears {
      * 采购单位（登录账号的单位）
      */
     @NotNull(message = "采购单位不能为空")
-    private String purchaseDeptId;
+    private Long purchaseDeptId;
 
     @Excel(name = "采购单位")
     @TableField(exist = false)

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/PlanQuarterStandardVo.java

@@ -8,6 +8,7 @@ import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -137,6 +138,10 @@ public class PlanQuarterStandardVo extends PageVo {
      */
     @ApiModelProperty(value = "退回原因")
     private String reasonOfReturn;
+    /**
+     * 计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示
+     */
+    private String adjustReason;
 
     /**
      * 创建者

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/PlanYearsStandardVo.java

@@ -8,6 +8,7 @@ import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -134,6 +135,11 @@ public class PlanYearsStandardVo extends PageVo {
     @ApiModelProperty(value = "退回原因")
     private String reasonOfReturn;
 
+    /**
+     * 计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示
+     */
+    private String adjustReason;
+
     /**
      * 创建者
      */

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

@@ -4,6 +4,7 @@ package com.ozs.plan.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.plan.doman.PlanQuarter;
 import com.ozs.plan.doman.PlanQuarter;
+import com.ozs.plan.doman.vo.requestVo.PlanQuarterStandardVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -64,6 +65,14 @@ public interface PlanQuarterMapper extends BaseMapper<PlanQuarter> {
      */
     public PlanQuarter getById(Long planPracticalId);
 
+    /**
+     * 根据年度计划id查询季度计划
+     *
+     * @param planYearId 年度计划ID
+     * @return 结果
+     */
+    public PlanQuarter getByPlanYearId(Long planYearId);
+
     /**
      * 查询项目名称是否存在(除自己以外)
      *
@@ -84,7 +93,7 @@ public interface PlanQuarterMapper extends BaseMapper<PlanQuarter> {
 
     public Integer commit(Long planPracticalId);
 
-    public Integer review(PlanQuarter ofYears);
+    public Integer review(PlanQuarterStandardVo vo);
 
     Integer sendLetter(Long planPracticalId);
 }

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

@@ -3,6 +3,7 @@ package com.ozs.plan.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.plan.doman.PlanYears;
+import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -83,7 +84,7 @@ public interface PlanYearsMapper extends BaseMapper<PlanYears> {
 
     public Integer commit(Long planYearId);
 
-    public Integer review(PlanYears ofYears);
+    public Integer review(PlanYearsStandardVo vo);
 
     Integer sendLetter(Long planYearId);
 }

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

@@ -8,6 +8,8 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.common.core.domain.model.LoginUser;
+import com.ozs.common.enums.DataIsDelete;
+import com.ozs.common.enums.PmProjectStatus;
 import com.ozs.common.enums.ProjectStatus;
 import com.ozs.common.enums.ProjectTypes;
 import com.ozs.common.enums.SysFileRefEnum;
@@ -22,6 +24,8 @@ 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.pm.doman.PmDemand;
+import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.system.domain.SysFileInfo;
 import com.ozs.system.domain.SysFileRef;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
@@ -68,6 +72,8 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
     private SysDeptMapper deptMapper;
     @Autowired
     private SysFileService fileService;
+    @Autowired
+    private PmDemandMapper pmDemandMapper;
 
     @Override
     public Page selectPlanQuarterList(PlanQuarterStandardVo vo) {
@@ -112,6 +118,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
                     lw.le(PlanQuarter::getPlanDemandSubTime, vo.getEndTime());
                 }
+                lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete);
                 Page<PlanQuarter> page = planQuarterMapper.selectPage(new Page<PlanQuarter>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -169,6 +176,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
                     lw.le(PlanQuarter::getPlanDemandSubTime, vo.getEndTime());
                 }
+                lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete);
                 Page<PlanQuarter> page = planQuarterMapper.selectPage(new Page<PlanQuarter>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -317,7 +325,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofYear.getPurchaseDeptName());
                     if (!ObjectUtils.isEmpty(info)) {
-                        ofYear.setPurchaseDeptId(String.valueOf(info.getDeptId()));
+                        ofYear.setPurchaseDeptId(info.getDeptId());
                     } else {
                         ++failureNum;
                         failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");
@@ -406,8 +414,9 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
     @Override
     @Transactional
     public AjaxResult reviewTo(PlanQuarterStandardVo vo) {
+        //季度计划审核通过后同步到年度计划和项目管理
         PlanQuarter quarters = new PlanQuarter();
-        BeanUtils.copyProperties(vo, quarters);
+        PmDemand demand = new PmDemand();
         PlanQuarter byId = planQuarterMapper.getById(vo.getPlanPracticalId());
         if (ObjectUtils.isEmpty(byId.getPlanYearId())) {
             PlanYears ofYears = new PlanYears();
@@ -416,20 +425,36 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
             planYearsMapper.insertPlanYears(ofYears);
             quarters.setPlanYearId(ofYears.getPlanYearId());
         }
-        quarters.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-        return review(vo, quarters);
+        BeanUtils.copyProperties(byId, demand);
+        demand.setPlanId(byId.getPlanPracticalId());
+        //同步到项目管理状态为需求待填制
+        demand.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_FILL.getCode()));
+        demand.setCreateTime(new Date());
+        pmDemandMapper.insert(demand);
+        //计划附件也进行同步---查询年度计划附件后复制一份改为项目需求附件
+        LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
+        sysFileRefLp.eq(SysFileRef::getType, SysFileRefEnum.PLAN_YEAR.getType());
+        sysFileRefLp.eq(SysFileRef::getRedId, vo.getPlanYearId());
+        List<SysFileRef> sysFileRefs = sysFileRefMapper.selectList(sysFileRefLp);
+        if (!ObjectUtils.isEmpty(sysFileRefs)) {
+            for (SysFileRef ref : sysFileRefs) {
+                ref.setRedId(demand.getDemandId());
+                ref.setType(SysFileRefEnum.PM_DEMAND.getType());
+                sysFileRefMapper.insert(ref);
+            }
+        }
+        vo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
+        return review(vo);
     }
 
     @Override
     @Transactional
     public AjaxResult reviewReturn(PlanQuarterStandardVo vo) {
-        PlanQuarter quarters = new PlanQuarter();
-        BeanUtils.copyProperties(vo, quarters);
-        quarters.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
-        return review(vo, quarters);
+        vo.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
+        return review(vo);
     }
 
-    private AjaxResult review(PlanQuarterStandardVo vo, PlanQuarter quarters) {
+    private AjaxResult review(PlanQuarterStandardVo vo) {
         List<SysFileRef> sysFileRefs = vo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             for (SysFileRef ref : sysFileRefs) {
@@ -442,7 +467,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                 sysFileRefMapper.insert(ref);
             }
         }
-        int review = planQuarterMapper.review(quarters);
+        int review = planQuarterMapper.review(vo);
         if (review != 1) {
             return AjaxResult.error("项目状态数据异常");
         }
@@ -451,11 +476,16 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
 
     @Override
     public AjaxResult appUpdate(PlanQuarterStandardVo vo) {
-        PlanQuarter quarters = new PlanQuarter();
-        BeanUtils.copyProperties(vo, quarters);
+        //如果项目管理中数据已填制，则不允许申请修改
+        LambdaQueryWrapper<PmDemand> demandLp = new LambdaQueryWrapper<>();
+        demandLp.eq(PmDemand::getPlanId, vo.getPlanPracticalId());
+        PmDemand demand = pmDemandMapper.selectOne(demandLp);
+        if (!String.valueOf(demand.getProjectStatus()).equals(PmProjectStatus.DEMAND_WAIT_FILL.getCode())) {
+            return AjaxResult.error("项目信息已填制，不可更改");
+        }
         //申请后会成为未提交的状态，可以进行修改
-        quarters.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-        int review = planQuarterMapper.review(quarters);
+        vo.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
+        int review = planQuarterMapper.review(vo);
         if (review != 1) {
             return AjaxResult.error("项目状态数据异常");
         }

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

@@ -10,6 +10,7 @@ import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.common.core.domain.entity.SysRole;
 import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.core.domain.model.LoginUser;
+import com.ozs.common.enums.DataIsDelete;
 import com.ozs.common.enums.IsExcess;
 import com.ozs.common.enums.PmProjectStatus;
 import com.ozs.common.enums.ProjectStatus;
@@ -40,6 +41,7 @@ import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.system.service.ISysUserService;
 import com.ozs.system.service.SysFileService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -92,6 +94,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         List<PlanYears> planYearsList = new ArrayList<>();
         try {
             BeanUtils.copyProperties(vo, ofYears);
+            if (!ObjectUtils.isEmpty(vo.getPurchaseDeptId())) {
+                ofYears.setPurchaseDeptId(Long.valueOf(vo.getPurchaseDeptId()));
+            }
             planYears = planYearsMapper.selectPlanYearsList(ofYears);
             planYearsList = changeTo(planYears);
         } catch (Exception e) {
@@ -128,6 +133,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
                     lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
                 }
+                lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete);
                 Page<PlanYears> page = planYearsMapper.selectPage(new Page<PlanYears>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -147,6 +153,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         List<PlanYears> planYearsList = new ArrayList<>();
         try {
             BeanUtils.copyProperties(vo, ofYears);
+            ofYears.setPurchaseDeptId(Long.valueOf(vo.getPurchaseDeptId()));
             planYears = planYearsMapper.selectPlanYearsExamineList(ofYears);
             planYearsList = changeTo(planYears);
         } catch (Exception e) {
@@ -185,6 +192,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
                     lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
                 }
+                lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete);
                 Page<PlanYears> page = planYearsMapper.selectPage(new Page<PlanYears>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -206,6 +214,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         PlanYears ofYears = new PlanYears();
         try {
             BeanUtils.copyProperties(yearsStandardVo, ofYears);
+            ofYears.setPurchaseDeptId(Long.valueOf(yearsStandardVo.getPurchaseDeptId()));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -278,6 +287,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         PlanYears ofYears = new PlanYears();
         try {
             BeanUtils.copyProperties(yearsStandardVo, ofYears);
+            ofYears.setPurchaseDeptId(Long.valueOf(yearsStandardVo.getPurchaseDeptId()));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -335,7 +345,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofYear.getPurchaseDeptName());
                     if (!ObjectUtils.isEmpty(info)) {
-                        ofYear.setPurchaseDeptId(String.valueOf(info.getDeptId()));
+                        ofYear.setPurchaseDeptId(info.getDeptId());
                     } else {
                         ++failureNum;
                         failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");
@@ -424,29 +434,53 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Override
     @Transactional
     public AjaxResult reviewTo(PlanYearsStandardVo vo) {
+        //年度计划审核通过后同步到季度计划和项目管理
         PlanYears ofYears = new PlanYears();
-        BeanUtils.copyProperties(vo, ofYears);
-        //年度计划审核通过后同步到季度计划
-        PlanYears byId = planYearsMapper.getById(vo.getPlanYearId());
         PlanQuarter quarters = new PlanQuarter();
+        PmDemand demand = new PmDemand();
+        PlanYears byId = planYearsMapper.getById(vo.getPlanYearId());
         BeanUtils.copyProperties(byId, quarters);
-        quarters.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-        planQuarterMapper.insertPlanQuarter(quarters);
-        ofYears.setPlanYearId(vo.getPlanYearId());
-        ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-        return review(vo, ofYears);
+        BeanUtils.copyProperties(byId, demand);
+
+        //同步到季度计划状态为已审核---(已审核过的不再同步)
+        PlanQuarter quarter = planQuarterMapper.getByPlanYearId(vo.getPlanYearId());
+        if (ObjectUtils.isEmpty(quarter)) {
+            quarters.setPlanYearId(byId.getPlanYearId());
+            quarters.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
+            quarters.setCreateTime(new Date());
+            planQuarterMapper.insertPlanQuarter(quarters);
+            //同步到项目管理状态为需求待填制
+            demand.setPlanId(quarters.getPlanPracticalId());
+            demand.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_FILL.getCode()));
+            demand.setCreateTime(new Date());
+            pmDemandMapper.insert(demand);
+            //计划附件也进行同步---查询年度计划附件后复制一份改为项目需求附件
+            LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
+            sysFileRefLp.eq(SysFileRef::getType, SysFileRefEnum.PLAN_YEAR.getType());
+            sysFileRefLp.eq(SysFileRef::getRedId, vo.getPlanYearId());
+            List<SysFileRef> sysFileRefs = sysFileRefMapper.selectList(sysFileRefLp);
+            if (!ObjectUtils.isEmpty(sysFileRefs)) {
+                for (SysFileRef ref : sysFileRefs) {
+                    ref.setRedId(demand.getDemandId());
+                    ref.setType(SysFileRefEnum.PM_DEMAND.getType());
+                    ref.setId(null);
+                    sysFileRefMapper.insert(ref);
+                }
+            }
+        }
+
+        vo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
+        return review(vo);
     }
 
     @Override
     @Transactional
     public AjaxResult reviewReturn(PlanYearsStandardVo vo) {
-        PlanYears ofYears = new PlanYears();
-        BeanUtils.copyProperties(vo, ofYears);
-        ofYears.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
-        return review(vo, ofYears);
+        vo.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
+        return review(vo);
     }
 
-    private AjaxResult review(PlanYearsStandardVo vo, PlanYears ofYears) {
+    private AjaxResult review(PlanYearsStandardVo vo) {
         List<SysFileRef> sysFileRefs = vo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             for (SysFileRef ref : sysFileRefs) {
@@ -459,7 +493,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 sysFileRefMapper.insert(ref);
             }
         }
-        int review = planYearsMapper.review(ofYears);
+        int review = planYearsMapper.review(vo);
         if (review != 1) {
             return AjaxResult.error("项目状态数据异常");
         }
@@ -468,11 +502,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
     @Override
     public AjaxResult appUpdate(PlanYearsStandardVo vo) {
-        PlanYears ofYears = new PlanYears();
-        BeanUtils.copyProperties(vo, ofYears);
         //申请后会成为未提交的状态，可以进行修改
-        ofYears.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-        int review = planYearsMapper.review(ofYears);
+        vo.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
+        int review = planYearsMapper.review(vo);
         if (review != 1) {
             return AjaxResult.error("项目状态数据异常");
         }

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

@@ -125,6 +125,13 @@
           and del_flay = 0
     </select>
 
+    <select id="getByPlanYearId" resultType="com.ozs.plan.doman.PlanQuarter" parameterType="java.lang.Long">
+        select *
+        from plan_practical
+        where plan_year_id = #{planYearId}
+          and del_flay = 0
+    </select>
+
     <select id="countProjectNameOther" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(plan_practical.plan_practical_id)
         from plan_practical
@@ -136,13 +143,15 @@
 
     <!--	创建计划信息-->
     <insert id="insertPlanQuarter" parameterType="com.ozs.plan.doman.PlanQuarter" useGeneratedKeys="true"
-            keyProperty="planYearId">
-        insert into plan_practical (purchase_dept_id, project_name, project_type, demand_overview, evaluation,
+            keyProperty="planPracticalId">
+        insert into plan_practical (purchase_dept_id, plan_year_id, project_name, project_type, demand_overview,
+                                    evaluation,
                                     is_excess,
                                     purchase_services, purchase_mode, plan_demand_sub_time, plan_purchase_finish_time,
                                     plan_deliver_time, project_attr, adjust_reason, remarks, project_status,
                                     created, create_time, del_flay, plan_type, send_letter)
-        values (#{purchaseDeptId}, #{projectName}, #{projectType}, #{demandOverview}, #{evaluation}, #{isExcess},
+        values (#{purchaseDeptId}, #{planYearId}, #{projectName}, #{projectType}, #{demandOverview}, #{evaluation},
+                #{isExcess},
                 #{purchaseServices}, #{purchaseMode}, #{planDemandSubTime}, #{planPurchaseFinishTime},
                 #{planDeliverTime},
                 #{projectAttr}, #{adjustReason}, #{remarks}, #{projectStatus}, #{created}, #{createTime}, 0, 0, 0)
@@ -170,14 +179,17 @@
     </update>
 
     <!--	计划审核-->
-    <update id="review" parameterType="com.ozs.plan.doman.PlanQuarter">
+    <update id="review" parameterType="com.ozs.plan.doman.vo.requestVo.PlanQuarterStandardVo">
         update plan_practical
         <set>
             <if test="refuseReason != null and refuseReason != ''">
                 refuse_reason=#{refuseReason},
             </if>
             <if test="projectStatus != null and projectStatus != ''">
-                project_status=#{projectStatus}
+                project_status=#{projectStatus},
+            </if>
+            <if test="adjustReason != null and adjustReason != ''">
+                adjust_reason=#{adjustReason}
             </if>
         </set>
         where plan_practical_id = #{planPracticalId}

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

@@ -162,10 +162,19 @@
 	</update>
 
 	<!--	计划审核-->
-	<update id="review" parameterType="com.ozs.plan.doman.PlanYears">
+	<update id="review" parameterType="com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo">
 		update plan_years
-		set refuse_reason=#{refuseReason},
-			project_status=#{projectStatus}
+		<set>
+			<if test="refuseReason != null and refuseReason != ''">
+				refuse_reason=#{refuseReason},
+			</if>
+			<if test="projectStatus != null and projectStatus != ''">
+				project_status=#{projectStatus},
+			</if>
+			<if test="adjustReason != null and adjustReason != ''">
+				adjust_reason=#{adjustReason}
+			</if>
+		</set>
 		where plan_year_id = #{planYearId}
 	</update>