modify

Helius

2020-12-27 a714bc197c7dbcda3308e6d12a526739032166e0

modify

 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java

@@ -19,7 +19,7 @@
    private Long id;

    @ApiModelProperty(value = "下单顾问ID")
    private Long staffId;
    private Long createStaffId;

    @ApiModelProperty(value = "服务单编号")
    private String serviceNo;
@@ -43,12 +43,12 @@
    @ApiModelProperty(value = "服务项目信息")
    private List<ServiceOrderListProjVo> projs;

    public Long getStaffId() {
        return staffId;
    public Long getCreateStaffId() {
        return createStaffId;
    }

    public void setStaffId(Long staffId) {
        this.staffId = staffId;
    public void setCreateStaffId(Long createStaffId) {
        this.createStaffId = createStaffId;
    }

    public List<ServiceOrderListProjVo> getProjs() {

 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml

@@ -466,7 +466,7 @@
        <result property="vipName" column="vipName" />
        <result property="timeLength" column="timeLength" />
        <result property="status" column="status" />
        <result property="staffId" column="staffId" />
        <result property="createStaffId" column="createStaffId" />
        <collection property="projs" ofType="com.matrix.system.app.vo.ServiceOrderListProjVo">
            <result property="projName" column="projName" />
            <result property="beautyName" column="beautyName" />
@@ -482,9 +482,10 @@
           a.YY_TIME time,
           a.TOTAL_TIME timeLength,
           a.state status,
           a.create_staff_id createStaffId,
           d.BED_NAME bed,
           e.VIP_NAME vipName,
           a.create_staff_id staffId,
           b.staff_id staffId,
           f.su_name beautyName,
           g.proj_name projName
        from sys_proj_services a