#规则完善

LSH

2023-08-22 564bf7ab6a639c2c4557d35b8fd9b51dca60a738

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

@@ -104,7 +104,7 @@
     */
    @ApiModelProperty(value= "方案所需")
    @TableField("plan_need")
    private Long planNeed;
    private String planNeed;

    /**
     * 立项 1: 是  0: 否
@@ -123,7 +123,7 @@
     * 规划员
     */
    @ApiModelProperty(value= "规划员")
    private String planner;
    private Long planner;

    /**
     * 完成时间
@@ -174,9 +174,9 @@
    private String files;

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

    /**
@@ -234,71 +234,13 @@
    @ApiModelProperty(value= "注释")
    private String memo;

    /**
     * 项目进度流程{1：项目创建，2：核价处理，3：产品费用明细，4：报价预算单，5：报价单}
     */
    @ApiModelProperty(value= "项目进度流程{1：项目创建，2：核价处理，3：产品费用明细，4：报价预算单，5：报价单}")
    private Integer step;

    public Plan() {}

    public Plan(Long hostId,Long deptId,Long planType,Long userId,Long orderId,Long cstmrId,String uuid,String name,Date appleTime,Long planNeed,Integer beItem,String planner,Date finishTime,String form,Integer change,Integer changeTime,String changeReason,Double planBonus,Double planLeaderBonus,String files,Integer settle,String settleMsg,String comment,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.hostId = hostId;
        this.deptId = deptId;
        this.planType = planType;
        this.userId = userId;
        this.orderId = orderId;
        this.cstmrId = cstmrId;
        this.uuid = uuid;
        this.name = name;
        this.appleTime = appleTime;
        this.planNeed = planNeed;
        this.beItem = beItem;
        this.planner = planner;
        this.finishTime = finishTime;
        this.form = form;
        this.change = change;
        this.changeTime = changeTime;
        this.changeReason = changeReason;
        this.planBonus = planBonus;
        this.planLeaderBonus = planLeaderBonus;
        this.files = files;
        this.settle = settle;
        this.settleMsg = settleMsg;
        this.comment = comment;
        this.status = status;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
    }

//    Plan plan = new Plan(
//            null,    // 所属商户
//            null,    // 所属部门
//            null,    // 业务类型[非空]
//            null,    // 业务员
//            null,    // 跟踪项目
//            null,    // 甲方单位
//            null,    // 规划单代号[非空]
//            null,    // 规划单名称[非空]
//            null,    // 申请日期
//            null,    // 方案所需
//            null,    // 立项
//            null,    // 规划员
//            null,    // 完成时间
//            null,    // 表单内容
//            null,    // 更改方案
//            null,    // 更改次数
//            null,    // 更改方案原因
//            null,    // 规格奖金
//            null,    // 规格组长奖金
//            null,    // 附件
//            null,    // 进度
//            null,    // 审核进度
//            null,    // 评论
//            null,    // 状态
//            null,    // 添加人员
//            null,    // 添加时间
//            null,    // 修改人员
//            null,    // 修改时间
//            null    // 注释
//    );

    public String getHostId$(){
        HostService service = SpringUtils.getBean(HostService.class);
@@ -362,12 +304,20 @@
    }

    public String getPlanNeed$(){
        PlanNeedService service = SpringUtils.getBean(PlanNeedService.class);
        PlanNeed planNeed = service.selectById(this.planNeed);
        if (!Cools.isEmpty(planNeed)){
            return String.valueOf(planNeed.getName());
        if (Cools.isEmpty(this.planNeed)){
            return null;
        }
        return null;
        PlanNeedService service = SpringUtils.getBean(PlanNeedService.class);
        String[] planNeeds = this.planNeed.split("-");
        String name="";
        for (String planNeeda : planNeeds){
            PlanNeed planNeed = service.selectById(Integer.parseInt(planNeeda));
            if (!Cools.isEmpty(planNeed)){
//                return String.valueOf(planNeed.getName());
                name = name+planNeed.getName()+";";
            }
        }
        return name;
    }

    public String getBeItem$(){
@@ -405,24 +355,39 @@
        if (null == this.settle){ return null; }
        switch (this.settle){
            case 1:
                return "开始";
                return "等待组长审核";
            case 2:
                return "组长待审";
                return "等待售前分配规划员";
            case 3:
                return "组长审核";
                return "等待规划员提交";
            case 4:
                return "规划待审";
                return "规划员已提交";
            case 5:
                return "规划审核";
            case 6:
                return "审批中";
            case 7:
                return "审批通过";
            default:
                return String.valueOf(this.settle);
        }
    }

    public String getPlanner$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.planner);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return "";
    }

    public String getNowHeadman$(){
        PlanTypeService planTypeService = SpringUtils.getBean(PlanTypeService.class);
        PlanType planType = planTypeService.selectById(this.planType);
        User user = planTypeService.findPlanLeader(planType);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){