#报销完善

LSH

2023-08-22 e89a0bdd6041774d77408744993ba3b98a1e1c97

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

@@ -9,9 +9,11 @@
import com.zy.crm.manager.service.CompanyService;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.Dic;
import com.zy.crm.system.entity.Host;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.DeptService;
import com.zy.crm.system.service.DicService;
import com.zy.crm.system.service.HostService;
import com.zy.crm.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -64,21 +66,21 @@
    private Long cstmrId;

    /**
     * 客户代号
     * 项目代号
     */
    @ApiModelProperty(value= "客户代号")
    @ApiModelProperty(value= "项目代号")
    private String uuid;

    /**
     * 客户名称
     * 跟踪项目名称
     */
    @ApiModelProperty(value= "客户名称")
    @ApiModelProperty(value= "跟踪项目名称")
    private String name;

    /**
     * 总金额
     * 项目总金额
     */
    @ApiModelProperty(value= "总金额")
    @ApiModelProperty(value= "项目总金额")
    private Double money;

    /**
@@ -171,6 +173,12 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;


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


    /**
     * 注释
     */
@@ -179,7 +187,7 @@

    public Order() {}

    public Order(Long hostId,Long deptId,Long userId,Long cstmrId,String uuid,String name,Double money,Long company,String remarks,Long director,String province,String city,String district,String town,String addr,String files,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
    public Order(Long hostId,Long deptId,Long userId,Long cstmrId,String uuid,String name,Double money,Long company,String remarks,Long director,String province,String city,String district,String town,String addr,String files,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,Integer step,String memo) {
        this.hostId = hostId;
        this.deptId = deptId;
        this.userId = userId;
@@ -201,6 +209,7 @@
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.step = step;
        this.memo = memo;
    }

@@ -308,7 +317,7 @@
        if (Cools.isEmpty(this.createTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
        return new SimpleDateFormat("yyyy-MM-dd HH:mm").format(this.createTime);
    }

    public String getUpdateBy$(){
@@ -324,7 +333,82 @@
        if (Cools.isEmpty(this.updateTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
        return new SimpleDateFormat("yyyy-MM-dd HH:mm").format(this.updateTime);
    }

    @TableField(exist = false)
    private String pcd;

    public String getPcd() {
        StringBuilder sb = new StringBuilder();
        if (!Cools.isEmpty(province)) {
            sb.append(province).append(",");
        }
        if (!Cools.isEmpty(city)) {
            sb.append(city).append(",");
        }
        if (!Cools.isEmpty(district)) {
            sb.append(district).append(",");
        }
        String s = sb.toString();
        if (s.endsWith(",")) {
            s = s.substring(0, s.length() - 1);
        }
        return s;
    }

    public String getPcd$() {
        StringBuilder sb = new StringBuilder();
        DicService service = SpringUtils.getBean(DicService.class);
        if (!Cools.isEmpty(province)) {
            Dic provinceDic = service.selectById(province);
            if (!Cools.isEmpty(provinceDic)) {
                sb.append(provinceDic.getName()).append(",");
            }
        }
        if (!Cools.isEmpty(city)) {
            Dic cityDic = service.selectById(city);
            if (!Cools.isEmpty(cityDic)) {
                sb.append(cityDic.getName()).append(",");
            }
        }
        if (!Cools.isEmpty(district)) {
            Dic districtDic = service.selectById(district);
            if (!Cools.isEmpty(districtDic)) {
                sb.append(districtDic.getName()).append(",");
            }
        }
        String s = sb.toString();
        if (s.endsWith(",")) {
            s = s.substring(0, s.length() - 1);
        }
        return s;
    }

    public void setPcd(String pcd) {
        this.pcd = pcd;
        if (!Cools.isEmpty(pcd)) {
            String[] split = this.pcd.split(",");
            for (int i = 0;i< split.length; i++) {
                switch (i) {
                    case 0:
                        this.province = split[0];
                        break;
                    case 1:
                        this.city = split[1];
                        break;
                    case 2:
                        this.district = split[2];
                        break;
                    default:
                        break;
                }
            }
        } else {
            this.province = "";
            this.city = "";
            this.district = "";
        }
    }