#

LSH

2023-11-01 56ebe6f9a3886ba62d60692d246e6eed1ae66d23

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

@@ -96,7 +96,7 @@
                    list.add(dto);
                    break;
                case 3:
                    dto.setTitle("总裁办审核");
                    dto.setTitle("总经办审核");
                    dto.setUserId(president.getId());
                    dto.setUsername(president.getNickname());
                    list.add(dto);
@@ -124,19 +124,22 @@
            SettleDto dto = new SettleDto();
            dto.setStep(i);
            switch (i) {
                case 0:
//                case 0:
//                    dto.setTitle("开始");
//                    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);
//                    break;
                case 1:
                    dto.setTitle("开始");
                    dto.setMsg(user.getUsername() + "创建了审批");
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getUsername());
                    dto.setUsername(user.getNickname());
                    dto.setTime(DateUtils.convert(new Date()));
                    dto.setCurr(Boolean.TRUE);
                    list.add(dto);
                    break;
                case 1:
                    dto.setTitle("提交报销");
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getNickname());
                    list.add(dto);
                    break;
                case 2:
@@ -207,7 +210,7 @@
        return list;
    }

    public static List<SettleDto> initSalesPricing(User manager ,User user,List<String> names ,int nodes) {
    public static List<SettleDto> initSalesPricing(User manager ,User user,User userUp,List<String> names ,int nodes) {
        List<SettleDto> list = new ArrayList<>();
        for (int i = 0; i < nodes+1; i++) {
            SettleDto dto = new SettleDto();
@@ -236,6 +239,42 @@
                    break;
                case 3:
                    dto.setTitle(names.get(i));
                    dto.setUserId(userUp.getId());
                    dto.setUsername(userUp.getUsername());
                    list.add(dto);
                    break;
                default:
                    break;
            }
        }
        return list;
    }

    public static List<SettleDto> initSalesPricingPriOnline2(User user,User userUp,List<String> names ,int nodes) {
        List<SettleDto> list = new ArrayList<>();
        for (int i = 0; i < nodes+1; i++) {
            SettleDto dto = new SettleDto();
            dto.setStep(i);
            switch (i) {
                case 0:
                    dto.setTitle("开始");
                    dto.setMsg(user.getUsername() + names.get(i));
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getUsername());
                    dto.setTime(DateUtils.convert(new Date()));
                    dto.setCurr(Boolean.TRUE);
                    list.add(dto);
                    break;
                case 1:
                    dto.setTitle(names.get(i));
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getNickname());
                    list.add(dto);
                    break;
                case 2:
                    dto.setTitle(names.get(i));
                    dto.setUserId(userUp.getId());
                    dto.setUsername(userUp.getUsername());
                    list.add(dto);
                    break;
                default:
@@ -251,7 +290,7 @@
            SettleDto dto = new SettleDto();
            dto.setStep(i);
            switch (i) {
                case 0:
                case 1:
                    dto.setTitle("开始");
                    dto.setMsg(user.getUsername() + names.get(i));
                    dto.setUserId(user.getId());
@@ -260,12 +299,12 @@
                    dto.setCurr(Boolean.TRUE);
                    list.add(dto);
                    break;
                case 1:
                    dto.setTitle(names.get(i));
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getNickname());
                    list.add(dto);
                    break;
//                case 1:
//                    dto.setTitle(names.get(i));
//                    dto.setUserId(user.getId());
//                    dto.setUsername(user.getNickname());
//                    list.add(dto);
//                    break;
                case 2:
                    dto.setTitle(names.get(i));
                    dto.setUserId(manager.getId());
@@ -280,6 +319,8 @@
                    break;
                case 4:
                    dto.setTitle(names.get(i));
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getUsername());
                    list.add(dto);
                    break;
                default: