#

luxiaotao1123

2022-11-24 46d42b0832edb326b262d1c95c64c17bc0784f30

#

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

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

    public static List<SettleDto> init(Plan plan) {
        List<SettleDto> list = new ArrayList<>();
        for (int i = 1; i < 8; i++) {
        for (int i = 1; i < 5; i++) {
            SettleDto dto = new SettleDto();
            dto.setStep(i);
            switch (i) {
@@ -44,23 +44,14 @@
                    list.add(dto);
                    break;
                case 2:
                    dto.setTitle("组长待审");
                    break;
                case 3:
                    dto.setTitle("组长审核");
                    list.add(dto);
                    break;
                case 4:
                    dto.setTitle("规划待审");
                    break;
                case 5:
                case 3:
                    dto.setTitle("规划审核");
                    list.add(dto);
                    break;
                case 6:
                    dto.setTitle("审批中");
                    break;
                case 7:
                case 4:
                    dto.setTitle("审批通过");
                    list.add(dto);
                    break;

 src/main/java/com/zy/crm/manager/controller/PlanController.java

@@ -302,15 +302,12 @@
    private Integer getStepOfSettle(int settle){
        switch (settle){
            case 1:
            case 2:
                return 2;
            case 3:
            case 4:
            case 2:
                return 3;
            case 5:
            case 6:
            case 3:
                return 4;
            case 7:
            case 4:
                return 0;
            default:
                return 1;

 src/main/java/com/zy/crm/manager/entity/Plan.java

@@ -174,9 +174,9 @@
    private String files;

    /**
     * 进度 1: 开始  2: 组长待审  3: 组长审核  4: 规划待审  5: 规划审核  6: 审批中  7: 审批通过
     * 进度 进度 1: 开始  2: 组长审核  3: 规划审核   4: 审批通过
     */
    @ApiModelProperty(value= "进度 1: 开始  2: 组长待审  3: 组长审核  4: 规划待审  5: 规划审核  6: 审批中  7: 审批通过  ")
    @ApiModelProperty(value= "进度 1: 开始  2: 组长审核  3: 规划审核   4: 审批通过  ")
    private Integer settle;

    /**
@@ -407,16 +407,10 @@
            case 1:
                return "开始";
            case 2:
                return "组长待审";
            case 3:
                return "组长审核";
            case 4:
                return "规划待审";
            case 5:
            case 3:
                return "规划审核";
            case 6:
                return "审批中";
            case 7:
            case 4:
                return "审批通过";
            default:
                return String.valueOf(this.settle);