Merge remote-tracking branch 'origin/zycrm' into zycrm

Junjie

2023-11-10 cbc9250b33a955bc919a6afc5d4101ef65bbfafa

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

@@ -30,7 +30,27 @@

    private Boolean curr;

    public static List<SettleDto> init(Plan plan, User manager) {
    public static List<SettleDto> InItFlowPath(List<User> users, List<String> names, int nodes) {
        List<SettleDto> list = new ArrayList<>();
        for (int i = 0; i < nodes; i++) {
            SettleDto dto = new SettleDto();
            dto.setStep(i);
            if (i == 0) {
                dto.setTitle("开始");
                dto.setMsg(users.get(i).getUsername() + names.get(i));
                dto.setTime(DateUtils.convert(new Date()));
                dto.setCurr(Boolean.TRUE);
            } else {
                dto.setTitle(names.get(i));
            }
            dto.setUserId(users.get(i).getId());
            dto.setUsername(users.get(i).getUsername());
            list.add(dto);
        }
        return list;
    }

    public static List<SettleDto> init(Plan plan, User manager, User planLeader) {
        List<SettleDto> list = new ArrayList<>();
        for (int i = 1; i < 6; i++) {
            SettleDto dto = new SettleDto();
@@ -46,20 +66,16 @@
                    list.add(dto);
                    break;
                case 2:
                    dto.setTitle("组长审核");
                    dto.setUserId(manager.getId());
                    dto.setUsername(manager.getNickname());
                    dto.setTitle("售前审核");
                    dto.setUserId(planLeader.getId());
                    dto.setUsername(planLeader.getNickname());
                    list.add(dto);
                    break;
                case 3:
                    dto.setTitle("售前审核");
                    list.add(dto);
                    break;
                case 4:
                    dto.setTitle("规划员审核");
                    list.add(dto);
                    break;
                case 5:
                case 4:
                    dto.setTitle("审批通过");
                    dto.setUserId(plan.getUserId());
                    dto.setUsername(plan.getUserId$());
@@ -72,9 +88,9 @@
        return list;
    }

    public static List<SettleDto> initPriQuote(Plan plan, User manager ,User president,User user) {
    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++) {
        for (int i = 1; i < 5; i++) {
            SettleDto dto = new SettleDto();
            dto.setStep(i);
            switch (i) {
@@ -94,15 +110,11 @@
                    list.add(dto);
                    break;
                case 3:
                    dto.setTitle("总裁办审核");
                    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("审批通过");
                    dto.setUserId(plan.getUserId());
@@ -116,25 +128,19 @@
        return list;
    }

    public static List<SettleDto> initPriQuote(ReimburseOnline reimburseOnline, User manager , User president3, User president4,User president5,User president6,User user) {
    public static List<SettleDto> initPriQuote(ReimburseOnline reimburseOnline, User manager, User president3, User president4, User president5, User president6, User user) {
        List<SettleDto> list = new ArrayList<>();
        for (int i = 0; i < 7; i++) {
            SettleDto dto = new SettleDto();
            dto.setStep(i);
            switch (i) {
                case 0:
                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:
@@ -144,33 +150,29 @@
                    list.add(dto);
                    break;
                case 3:
                    dto.setTitle(president3.getUsername()+"审核");
                    dto.setTitle(president3.getUsername() + "审核");
                    dto.setUserId(president3.getId());
                    dto.setUsername(president3.getNickname());
                    list.add(dto);
                    break;
                case 4:
                    dto.setTitle(president4.getUsername()+"审核");
                    dto.setTitle(president4.getUsername() + "审核");
                    dto.setUserId(president4.getId());
                    dto.setUsername(president4.getNickname());
                    list.add(dto);
                    break;
                case 5:
                    dto.setTitle(president5.getUsername()+"审核");
                    dto.setTitle(president5.getUsername() + "审核");
                    dto.setUserId(president5.getId());
                    dto.setUsername(president5.getNickname());
                    list.add(dto);
                    break;
                case 6:
                    dto.setTitle(president6.getUsername()+"审核");
                    dto.setTitle(president6.getUsername() + "审核");
                    dto.setUserId(president6.getId());
                    dto.setUsername(president6.getNickname());
                    list.add(dto);
                    break;
//                case 4:
//                    dto.setTitle("业务员审核");
//                    list.add(dto);
//                    break;
                default:
                    break;
            }
@@ -178,9 +180,9 @@
        return list;
    }

    public static List<SettleDto> initBusiness(User manager ,User user) {
    public static List<SettleDto> initBusiness(User manager, User user) {
        List<SettleDto> list = new ArrayList<>();
        for (int i = 0; i < 7; i++) {
        for (int i = 0; i < 3; i++) {
            SettleDto dto = new SettleDto();
            dto.setStep(i);
            switch (i) {
@@ -188,6 +190,8 @@
                    dto.setTitle("提交出差");
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getNickname());
                    dto.setMsg(user.getNickname() + "提交出差申请");
                    dto.setTime(DateUtils.convert(new Date()));
                    list.add(dto);
                    break;
                case 2:
@@ -203,4 +207,125 @@
        return list;
    }

    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();
            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(manager.getId());
                    dto.setUsername(manager.getNickname());
                    list.add(dto);
                    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:
                    break;
            }
        }
        return list;
    }

    public static List<SettleDto> initContract(User manager, User user, User president, 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 1:
                    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(manager.getId());
                    dto.setUsername(manager.getNickname());
                    list.add(dto);
                    break;
                case 3:
                    dto.setTitle(names.get(i));
                    dto.setUserId(president.getId());
                    dto.setUsername(president.getNickname());
                    list.add(dto);
                    break;
                case 4:
                    dto.setTitle(names.get(i));
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getUsername());
                    list.add(dto);
                    break;
                default:
                    break;
            }
        }
        return list;
    }


}