diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java index 7fcd61e4..92c57d09 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java @@ -166,6 +166,12 @@ public class TbsBudgetController { List voList = new ArrayList<>(); for (TbsBudget budget : list) { TbsBudgetVo budgetVo = tbsBudgetService.toVoEntity(budget); + if(budgetVo.getBudgetCheckState().equals(TbsCommonCheckState.State_2_finished)){ + long count = tbsBudgetMapper.countLastChange(budgetVo.getId()); + if(count>0){ + budgetVo.setBudgetCheckState(TbsCommonCheckState.State_1_apply); + } + } voList.add(budgetVo); } return R.byPageHelperList(list,voList); diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java index 5d885359..fb358f09 100644 --- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java +++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java @@ -45,6 +45,14 @@ public interface TbsBudgetMapper extends BaseMapper { @Update("update tbs_budget set center_combo = concat(center_type,'_',center_id) where id = #{budgetId}") int updateBudgetComboCenter(@Param("budgetId")Long budgetId); + /** + * 查询最新的审批申请是否在审批中 + * @param budgetId + * @return + */ + @Select("select count(1) from tbs_budget_change where budget_id = #{budgetId} and id = ( " + + " select max(id) from tbs_budget_change where budget_id = #{budgetId} and del_flag=0 ) and budget_check_state = 1") + long countLastChange(@Param("budgetId")Long budgetId); @InterceptorIgnore(tenantLine = "true") @Select("select tbs_budget.id from tbs_budget " +