|
@@ -565,11 +565,9 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
|
|
|
public AjaxResult handleAppUpdate(PlanQuarterStandardVo vo) {
|
|
|
//getProjectAttr传值1为同意。-1为拒绝
|
|
|
PlanQuarter planQuarter = new PlanQuarter();
|
|
|
- BeanUtils.copyProperties(vo, planQuarter);
|
|
|
- PlanQuarter byId = planQuarterMapper.getById(planQuarter.getPlanPracticalId());
|
|
|
+ planQuarter.setPlanPracticalId(vo.getPlanPracticalId());
|
|
|
//同意修改申请
|
|
|
if ("1".equals(vo.getProjectAttr())) {
|
|
|
- planQuarter.setProjectAttr(null);
|
|
|
planQuarter.setAppUpdate("");
|
|
|
planQuarter.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
|
|
|
planQuarterMapper.updateById(planQuarter);
|
|
@@ -577,7 +575,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
|
|
|
planQuarterMapper.deletePlanQuarterById(vo.getPlanPracticalId());
|
|
|
return AjaxResult.success("已同意该修改申请");
|
|
|
}
|
|
|
- planQuarter.setProjectAttr(null);
|
|
|
planQuarter.setAppUpdate("false");
|
|
|
planQuarterMapper.updateById(planQuarter);
|
|
|
return AjaxResult.success("已拒绝改申请");
|
|
@@ -721,7 +718,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
|
|
|
return AjaxResult.success("已成功进行撤销");
|
|
|
}
|
|
|
PlanQuarter planQuarter = new PlanQuarter();
|
|
|
- BeanUtils.copyProperties(quarterStandardVo, planQuarter);
|
|
|
+ planQuarter.setPlanPracticalId(quarterStandardVo.getPlanPracticalId());
|
|
|
planQuarter.setAppDelete("false");
|
|
|
planQuarterMapper.updateById(planQuarter);
|
|
|
return AjaxResult.success("已拒绝改申请");
|