提交忽略文件

doum

2026-01-29 8609ca5767d261a4e7aef1b729a29e230c24e43f

提交忽略文件

 admin/src/views/business/member.vue

@@ -8,13 +8,12 @@
      <el-form-item label="工号" prop="code">
        <el-input v-model="searchForm.code" style="width: 150px" placeholder="请输入工号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="战区" prop="fieldIdList">
      <el-form-item label="战区" prop="zhanquIds">
        <el-select
            v-model="searchForm.fieldIdList"
            v-model="searchForm.zhanquIds"
            style="width: 150px"
            placeholder="战区"
            clearable
            multiple
            @change="search"
        >
          <el-option
@@ -25,13 +24,12 @@
          ></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="商业化类型" prop="busTypeIdList">
      <el-form-item label="商业化类型" prop="bustypeIds">
        <el-select
            v-model="searchForm.busTypeIdList"
            v-model="searchForm.bustypeIds"
            style="width: 150px"
            placeholder="商业化类型"
            clearable
            multiple
            @change="search"
        >
          <el-option
@@ -42,9 +40,9 @@
          ></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="擅长领域" prop="levelIdList">
      <el-form-item label="擅长领域" prop="fieldIdList">
        <el-select
            v-model="searchForm.levelIdList"
            v-model="searchForm.fieldIdList"
            style="width: 150px"
            placeholder="擅长领域"
            clearable
@@ -59,13 +57,12 @@
          ></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="老师等级" prop="levelIdList">
      <el-form-item label="老师等级" prop="levelId">
        <el-select
            v-model="searchForm.levelIdList"
            v-model="searchForm.levelId"
            style="width: 150px"
            placeholder="老师等级"
            clearable
            multiple
            @change="search"
        >
          <el-option
@@ -133,12 +130,30 @@
        </el-table-column>
        <el-table-column prop="caseNum" label="标杆案例" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.caseNum">{{row.caseNum}}个</span>
            <span >{{row.caseNum || 0}}个</span>
          </template>
        </el-table-column>
        <el-table-column prop="busTypeNames" label="商业化类型" min-width="200px"></el-table-column>
        <el-table-column prop="areaNames" label="服务战区" min-width="200px"></el-table-column>
        <el-table-column prop="fieldNames" label="擅长领域" min-width="200px"></el-table-column>
        <el-table-column prop="busTypeNames" label="商业化类型" min-width="200px">
          <template slot-scope="{row}">
            <div v-if="row.typeList && row.typeList.length">
             <div style="display:inline-block;" v-for="(item,index) in row.typeList">{{item.name||''}} <span v-if="index < row.typeList.length-1" style="display:inline-block;padding: 0px 3px;">/</span></div>
            </div>
          </template>
        </el-table-column>
        <el-table-column prop="areaNames" label="服务战区" min-width="200px">
          <template slot-scope="{row}">
            <div v-if="row.zqList && row.zqList.length">
              <div style="display:inline-block;" v-for="(item,index) in row.zqList">{{item.name||''}} <span v-if="index < row.zqList.length-1" style="display:inline-block;padding: 0px 3px;">/</span></div>
            </div>
          </template>
        </el-table-column>
        <el-table-column prop="fieldNames" label="擅长领域" min-width="200px">
          <template slot-scope="{row}">
            <div v-if="row.fieldList && row.fieldList.length">
              <div style="display:inline-block;" v-for="(item,index) in row.fieldList">{{item.name||''}} <span v-if="index < row.fieldList.length-1" style="display:inline-block;padding: 0px 3px;">/</span></div>
            </div>
          </template>
        </el-table-column>
        <el-table-column label="状态">
          <template slot-scope="{row}">
            <el-switch @change="changeStatus($event, row)" v-model="row.status" active-color="#13ce66"
@@ -189,11 +204,13 @@
      // 搜索
      searchForm: {
        name: '',
        queryFlag:1,
        code: '',
        status: null,
        levelIdList:[],
        levelId:null,
        fieldIdList: [],
        busTypeIdList:[],
        zhanquIds:null,
        bustypeIds:null,
        type: 0
      },
      cateList:[],

 server/services/src/main/java/com/doumee/dao/business/model/Member.java

@@ -154,6 +154,9 @@
    @ApiModelProperty("擅长领域")
    @TableField(exist = false)
    private List<Category> fieldList;
    @ApiModelProperty("擅长领域")
    @TableField(exist = false)
    private List<Integer> fieldIdList;
    @ApiModelProperty("战区集合")
    @TableField(exist = false)
    private List<Category> zqList;

 server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -125,8 +125,11 @@
                .leftJoin(SystemUser.class,SystemUser::getId,Member::getUpdateUser)
                .leftJoin(Category.class,Category::getId,Member::getLevelId)
                .apply(Objects.nonNull(model.getBustypeIds())," find_in_set( '["+model.getBustypeIds()+"]', t.BUSTYPE_IDS ) ")
                .apply(Objects.nonNull(model.getZhanquIds())," find_in_set( '["+model.getZhanquIds()+"]', t.ZHANQU_IDS ) ")
                .like(StringUtils.isNotBlank(model.getName()),Member::getName, model.getName())
                .eq(Objects.nonNull(model.getStatus()),Member::getStatus, model.getStatus())
                .in(Objects.nonNull(model.getLevelId()),Member::getStatus, model.getStatus())
                .eq(Objects.nonNull(model.getCode()),Member::getCode, model.getCode())
                .orderByDesc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.ZERO),Member::getFee)
                .orderByAsc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.ONE),Member::getFee)
                .orderByDesc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.TWO),Category::getDetail)