chore:测试提交

jinpengyong

2023-09-26 08a9e6a0891cc01f34344eff4a3b3bad4e6e84ef

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

@@ -76,8 +76,6 @@
    @Autowired
    private AllocationMapper allocationMapper;
    @Autowired
    private ApproveTableMapper approveTableMapper;
    @Autowired
    private  SysAreaService sysAreaService;
    private ApproveTableService approveTableService;
    @Autowired
@@ -141,7 +139,7 @@
             i = Integer.parseInt(o.toString()) + 1;
        }
        //单号
        String allocationNum = "JBD" + dateString + String.format("%04d", i);
        String allocationNum = "JBD-" + dateString + String.format("%04d", i);
        allocation.setAllocationNum(allocationNum);
        if(Objects.nonNull(allocationCond.getEscalationUnitId())&&allocationCond.getEscalationUnitId().toString().length()==6) {
            allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
@@ -363,7 +361,7 @@
         int complete=0;
         int unComplete=0;
        for (Allocation allocation : allocations) {
            String state = allocation.getState();
            String state = allocation.getState()+"";
            if (state.equals("40")||state.equals("50")){
                 complete++;
            }else if(state.equals("10")||state.equals("20") ||state.equals("30")) {
@@ -408,7 +406,7 @@

                Date dateOfDay = DateUtils.getDateOfDay(allocation.getEscalationTime(), allocation.getChangeDay());
                Date date = new Date();
                String state = allocation.getState();
                String state = allocation.getState()+"";
                boolean timeBefor = DateUtils.isTimeBefor(date, dateOfDay);
                if (timeBefor && !state.equals("40") && !state.equals("50")){
                    //逾期次数