#

lsh

2024-04-15 13a34d2197b001799ef8f0f09e5b48af2add0926

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.WeeklyCostTypesService;
import com.zy.crm.system.entity.*;
import com.zy.crm.system.service.*;
@@ -101,6 +102,20 @@
    private String comment;

    /**
     * 工作内容
     */
    @ApiModelProperty(value= "工作内容")
    @TableField("work_content")
    private String workContent;

    /**
     * 工作目的
     */
    @ApiModelProperty(value= "工作目的")
    @TableField("work_purpose")
    private String workPurpose;

    /**
     * 添加人员
     */
    @ApiModelProperty(value= "添加人员")
@@ -163,7 +178,7 @@
    @ApiModelProperty(value= "周报ID")
    @TableId(value = "weekly_id", type = IdType.INPUT)
    @TableField("weekly_id")
    private Integer weeklyId;
    private Long weeklyId;

    /**
     * 甲方单位ID
@@ -186,9 +201,46 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 省
     */
    @ApiModelProperty(value= "省")
    private String province;

    /**
     * 市
     */
    @ApiModelProperty(value= "市")
    private String city;

    /**
     * 县
     */
    @ApiModelProperty(value= "县")
    private String district;

    /**
     * 镇
     */
    @ApiModelProperty(value= "镇")
    private String town;

    /**
     * 甲方单位ID
     */
    @ApiModelProperty(value= "甲方单位ID")
    @TableField("cstmr_name")
    private String cstmrName;

    /**
     * 详细地址
     */
    @ApiModelProperty(value= "详细地址")
    private String addr;

    public WeeklyDailyPlan() {}

    public WeeklyDailyPlan(Date dailyTime,Long userId,Long hostId,Long deptId,Integer status,Integer settle,String settleMsg,String comment,Long createBy,Date createTime,Long updateBy,Date updateTime,String weeklyMatter,Long director,Integer settleSize,Integer settleCurrent,Integer weeklyId,Long cstmrId,Integer weeklyDay,String memo) {
    public WeeklyDailyPlan(Date dailyTime,Long userId,Long hostId,Long deptId,Integer status,Integer settle,String settleMsg,String comment,Long createBy,Date createTime,Long updateBy,Date updateTime,String weeklyMatter,Long director,Integer settleSize,Integer settleCurrent,Long weeklyId,Long cstmrId,Integer weeklyDay,String memo) {
        this.dailyTime = dailyTime;
        this.userId = userId;
        this.hostId = hostId;
@@ -306,6 +358,15 @@
        }
    }

    public String getCstmrId$(){
        CstmrService service = SpringUtils.getBean(CstmrService.class);
        Cstmr cstmr = service.selectById(this.cstmrId);
        if (!Cools.isEmpty(cstmr)){
            return String.valueOf(cstmr.getName());
        }
        return null;
    }

    public String getWeeklyDay$(){
        if (null == this.weeklyDay){ return ""; }
        WeeklyCostTypesService weeklyCostTypesService = SpringUtils.getBean(WeeklyCostTypesService.class);