#oss实装

LSH

2023-08-21 7885832c819f7922eddf20480cd9e4d4e97b265e

 src/main/java/com/zy/crm/common/model/SettleDto.java

@@ -71,7 +71,7 @@
        return list;
    }

    public static List<SettleDto> initPriQuote(Plan plan, User manager) {
    public static List<SettleDto> initPriQuote(Plan plan, User manager ,User president,User user) {
        List<SettleDto> list = new ArrayList<>();
        for (int i = 1; i < 6; i++) {
            SettleDto dto = new SettleDto();
@@ -79,9 +79,9 @@
            switch (i) {
                case 1:
                    dto.setTitle("开始");
                    dto.setMsg(plan.getUserId$() + "创建了审批");
                    dto.setUserId(plan.getUserId());
                    dto.setUsername(plan.getUserId$());
                    dto.setMsg(user.getUsername() + "创建了审批");
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getUsername());
                    dto.setTime(DateUtils.convert(new Date()));
                    dto.setCurr(Boolean.TRUE);
                    list.add(dto);
@@ -94,13 +94,15 @@
                    break;
                case 3:
                    dto.setTitle("总裁办审核");
                    dto.setUserId(president.getId());
                    dto.setUsername(president.getNickname());
                    list.add(dto);
                    break;
//                case 4:
//                    dto.setTitle("业务员审核");
//                    list.add(dto);
//                    break;
                case 4:
                    dto.setTitle("业务员审核");
                    list.add(dto);
                    break;
                case 5:
                    dto.setTitle("审批通过");
                    dto.setUserId(plan.getUserId());
                    dto.setUsername(plan.getUserId$());