Merge remote-tracking branch 'origin/wb' into qa

cjl

2023-09-28 bcc3e41bdd1865c288f7d570ce4da1d5cea32462

Merge remote-tracking branch 'origin/wb' into qa

 screen-api/src/main/java/com/moral/api/pojo/enums/AllocationApproveEnum.java

@@ -26,7 +26,7 @@
    /**
     *新建
     */
    NEW_BUILT(10, "新建"),
//    NEW_BUILT(10, "新建"),
    /**
     *整改中
     */

 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java

@@ -327,7 +327,7 @@
                    Date dateOfDay = DateUtils.getDateOfDay(allocation.getEscalationTime(), allocation.getChangeDay());
                    Date date = new Date();
                    boolean timeBefor = DateUtils.isTimeBefor(date, dateOfDay);
                    if (timeBefor && !state.equals("40") && !state.equals("50")){
                    if (timeBefor && !state.equals("40") && !state.equals("50") && !state.equals("9")){
                        //逾期次数
                        overdue++;
                    }