Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, #56403 企标计划-查看 制修订类型显示错误

See merge request LiuChao/foton-slrs-system-rest!553
This commit is contained in:
super_liu
2022-07-15 18:05:06 +08:00
@@ -116,16 +116,27 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
// 技术标准 更新计划库 // 技术标准 更新计划库
if(StringUtils.isNotBlank(esRevisePlan.getId())){ if(StringUtils.isNotBlank(esRevisePlan.getId())){
EsRevisePlan upd = new EsRevisePlan();
upd.setId(esRevisePlan.getId());
String reviseStatus = "";
if(StringUtils.isNotBlank(esRevisePlan.getReviseStatus())){
if(esRevisePlan.getReviseStatus().contains("_")){
reviseStatus = esRevisePlan.getReviseStatus().split("_")[1];
}else {
reviseStatus = esRevisePlan.getReviseStatus();
}
}
if(StringUtils.isBlank(esRevisePlan.getPlanStatus()) || !"4".equals(esRevisePlan.getPlanStatus())){ if(StringUtils.isBlank(esRevisePlan.getPlanStatus()) || !"4".equals(esRevisePlan.getPlanStatus())){
esRevisePlan.setReviseStatus(reviseStatus);
if("1".equals(esRevisePlan.getReviseStatus())){ if("1".equals(esRevisePlan.getReviseStatus())){
esRevisePlan.setPlanStatus("1"); upd.setPlanStatus("1");
}else if("2".equals(esRevisePlan.getReviseStatus())){ }else if("2".equals(esRevisePlan.getReviseStatus())){
esRevisePlan.setPlanStatus("2"); upd.setPlanStatus("2");
}else if("3".equals(esRevisePlan.getReviseStatus())){ }else if("3".equals(esRevisePlan.getReviseStatus())){
esRevisePlan.setPlanStatus("3"); upd.setPlanStatus("3");
} }
} }
esRevisePlanDao.updateById(esRevisePlan); esRevisePlanDao.updateById(upd);
} }
return "操作成功"; return "操作成功";
} }