,,

admin-hanhai-vue/src/views/textConf/TbConfList.vue

@@ -0,0 +1,162 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <tb-conf-modal ref="modalForm" @ok="modalFormOk"></tb-conf-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TbConfModal from './modules/TbConfModal'
+
+  export default {
+    name: 'TbConfList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TbConfModal
+    },
+    data () {
+      return {
+        description: 'tb_conf管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'协议配置',
+            align:"center",
+            dataIndex: 'value',
+            scopedSlots: {customRender: 'htmlSlot'}
+          },
+          {
+            title:'配置项',
+            align:"center",
+            dataIndex: 'info'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/tbConf/tbConf/textList",
+          delete: "/tbConf/tbConf/delete",
+          deleteBatch: "/tbConf/tbConf/deleteBatch",
+          exportXlsUrl: "/tbConf/tbConf/exportXls",
+          importExcelUrl: "tbConf/tbConf/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'Text',value:'value',text:'配置值',dictCode:''})
+        fieldList.push({type:'string',value:'info',text:'配置项',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

admin-hanhai-vue/src/views/textConf/modules/TbConfForm.vue

@@ -0,0 +1,110 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="协议配置" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="value">
+              <j-editor v-model="model.value" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="配置项" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="info">
+              <a-input v-model="model.info" placeholder="请输入配置项"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'TbConfForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/tbConf/tbConf/add",
+          edit: "/tbConf/tbConf/edit",
+          queryById: "/tbConf/tbConf/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

admin-hanhai-vue/src/views/textConf/modules/TbConfModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <tb-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tb-conf-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import TbConfForm from './TbConfForm'
+
+  export default {
+    name: 'TbConfModal',
+    components: {
+      TbConfForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

admin-hanhai-vue/src/views/textConf/modules/TbConfModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <tb-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tb-conf-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import TbConfForm from './TbConfForm'
+  export default {
+    name: 'TbConfModal',
+    components: {
+      TbConfForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/controller/TbConfController.java

@@ -57,8 +57,40 @@ public class TbConfController extends JeecgController<TbConf, ITbConfService> {
 		IPage<TbConf> pageList = tbConfService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
-	/**
+
+
+
+
+	 @ApiOperation(value="tb_conf-分页列表查询", notes="tb_conf-分页列表查询")
+	 @GetMapping(value = "/textList")
+	 public Result<IPage<TbConf>> queryPageTextList(TbConf tbConf,
+													@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													HttpServletRequest req) {
+		 QueryWrapper<TbConf> queryWrapper = QueryGenerator.initQueryWrapper(tbConf, req.getParameterMap());
+		 Page<TbConf> page = new Page<TbConf>(pageNo, pageSize);
+		 queryWrapper.eq("dict_group","sys_text");
+		 IPage<TbConf> pageList = tbConfService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
+
+	 @ApiOperation(value="tb_conf-分页列表查询", notes="tb_conf-分页列表查询")
+	 @GetMapping(value = "/picList")
+	 public Result<IPage<TbConf>> queryPagePicList(TbConf tbConf,
+												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+												   HttpServletRequest req) {
+		 QueryWrapper<TbConf> queryWrapper = QueryGenerator.initQueryWrapper(tbConf, req.getParameterMap());
+		 Page<TbConf> page = new Page<TbConf>(pageNo, pageSize);
+		 queryWrapper.eq("dict_group","sys_pic");
+		 IPage<TbConf> pageList = tbConfService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
+
+
+	 /**
 	 *   添加
 	 *
 	 * @param tbConf

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/impl/TbUserRoleServiceImpl.java

@@ -22,20 +22,28 @@ public class TbUserRoleServiceImpl extends ServiceImpl<TbUserRoleMapper, TbUserR
 
     @Override
     public Map getRoleInfo(String userId) {
-
+//.eq(TbUserRole::getAuditStatus, 1)
         LambdaQueryWrapper<TbUserRole> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.eq(TbUserRole::getUserId, userId).
-                eq(TbUserRole::getRole, 0).eq(TbUserRole::getAuditStatus, 1);
+                eq(TbUserRole::getRole, 0);
         TbUserRole boss = this.getOne(queryWrapper1);
         LambdaQueryWrapper<TbUserRole> queryWrapper2 = new LambdaQueryWrapper<>();
         queryWrapper2.eq(TbUserRole::getUserId, userId).
-                eq(TbUserRole::getRole, 1).eq(TbUserRole::getAuditStatus, 1);
+                eq(TbUserRole::getRole, 1);
         TbUserRole company = this.getOne(queryWrapper2);
+        LambdaQueryWrapper<TbUserRole> queryWrapper3 = new LambdaQueryWrapper<>();
+        queryWrapper3.eq(TbUserRole::getUserId, userId).
+                eq(TbUserRole::getRole, 2);
+        TbUserRole worker = this.getOne(queryWrapper3);
+
         Map<String, TbUserRole> map = new HashMap<>();
 //          返回用人方个人身份信息
         map.put("boss", boss);
         //   返回用人方企业身份信息
         map.put("company", company);
+
+        map.put("worker", worker);
+
         return map;
 
     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ReqUserRole.java

@@ -15,65 +15,47 @@ import java.io.Serializable;
  * @Version: V1.0
  */
 @Data
-@ApiModel(value="选择身份对象", description="选择身份对象")
+@ApiModel(value="招聘方填写资料", description="招聘方填写资料")
 public class ReqUserRole implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-
-	/**用人方企业 1  用人方个人 0*/
-	@Excel(name = "用人方企业 1  用人方个人 0", width = 15, dicCode = "user_role")
-	@Dict(dicCode = "user_role")
-    @ApiModelProperty(value = "用人方企业 1  用人方个人 0")
-    private Integer role;
-	/**用户名*/
-	@Excel(name = "用户名", width = 15)
+    /**用户名*/
+    @Excel(name = "用户名", width = 15)
     @ApiModelProperty(value = "用户名")
-    private String userName;
-    @ApiModelProperty(value = "行业")
-    private String industry;
-//    @ApiModelProperty(value = "密码")
-//    private String password;
-	/**公司名称*/
-	@Excel(name = "公司名称", width = 15)
+    private java.lang.String userName;
+    /**公司名称*/
+    @Excel(name = "公司名称", width = 15)
     @ApiModelProperty(value = "公司名称")
-    private String companyName;
-//	/**税收编码*/
-//	@Excel(name = "税收编码", width = 15)
-//    @ApiModelProperty(value = "税收编码")
-//    private String taxCode;
-	/**公司地址*/
-	@Excel(name = "公司地址", width = 15)
-    @ApiModelProperty(value = "公司地址")
-    private String address;
-//	/**公司账号*/
-//	@Excel(name = "公司账号", width = 15)
-//    @ApiModelProperty(value = "公司账号")
-//    private String bankAccount;
-//	/**电话*/
-//	@Excel(name = "电话", width = 15)
-//    @ApiModelProperty(value = "电话")
-//    private String phone;
-//	/**开户行*/
-//	@Excel(name = "开户行", width = 15)
-//    @ApiModelProperty(value = "开户行")
-//    private String bankNama;
-	/**营业执照上传*/
-	@Excel(name = "营业执照上传", width = 15)
+    private java.lang.String companyName;
+    /**地址*/
+    @Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+    private java.lang.String companyAddress;
+    /**行业/工种*/
+    @Excel(name = "行业/工种", width = 15)
+    @ApiModelProperty(value = "行业/工种")
+    private java.lang.String industryName;
+    /**行业/工种id*/
+    @Excel(name = "行业/工种id", width = 15)
+    @ApiModelProperty(value = "行业/工种id")
+    private java.lang.String industryId;
+    /**身份证上传*/
+    @Excel(name = "身份证上传", width = 15)
+    @ApiModelProperty(value = "身份证上传")
+    private java.lang.String idCard;
+    /**电话*/
+    @Excel(name = "电话", width = 15)
+    @ApiModelProperty(value = "电话")
+    private java.lang.String phone;
+    /**角色*/
+    @Excel(name = "角色", width = 15, dicCode = "user_role")
+    @Dict(dicCode = "user_role")
+    @ApiModelProperty(value = "角色  用人方企业 1  用人方个人 0  ")
+    private java.lang.Integer role;
+    /**营业执照上传*/
+    @Excel(name = "营业执照上传", width = 15)
     @ApiModelProperty(value = "营业执照上传")
-    private String businessLicense;
-//	/**基本户信息照片上传*/
-//	@Excel(name = "基本户信息照片上传", width = 15)
-//    @ApiModelProperty(value = "基本户信息照片上传")
-//    private String basicAccount;
-//	/**收款银行照片上传*/
-//	@Excel(name = "收款银行照片上传", width = 15)
-//    @ApiModelProperty(value = "收款银行照片上传")
-//    private String bankInfo;
-//	/**审核状态 0审核中 1 审核通过 2审核未通过*/
-//	@Excel(name = "审核状态 0审核中 1 审核通过 2审核未通过", width = 15, dicCode = "audit_status")
-//	@Dict(dicCode = "audit_status")
-//    @ApiModelProperty(value = "审核状态 0审核中 1 审核通过 2审核未通过")
-//    private Integer auditStatus;
+    private java.lang.String businessLicense;
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ReqUserRole2.java

@@ -0,0 +1,69 @@
+package org.jeecg.modules.postBean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 角色表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-16
+ * @Version: V1.0
+ */
+@Data
+@ApiModel(value="求职者注册", description="求职者注册")
+public class ReqUserRole2 implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**用户名*/
+    @Excel(name = "用户名", width = 15)
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+    /**地址*/
+    @Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+    private String address;
+    /**行业/工种*/
+    @Excel(name = "行业/工种", width = 15)
+    @ApiModelProperty(value = "行业/工种")
+    private String industryName;
+    /**行业/工种id*/
+    @Excel(name = "行业/工种id", width = 15)
+    @ApiModelProperty(value = "行业/工种id")
+    private String industryId;
+    /**个人简介*/
+    @Excel(name = "个人简介", width = 15)
+    @ApiModelProperty(value = "个人简介")
+    private String detail;
+    /**身份证上传*/
+    @Excel(name = "身份证上传", width = 15)
+    @ApiModelProperty(value = "身份证上传")
+    private String idCard;
+    /**电话*/
+    @Excel(name = "电话", width = 15)
+    @ApiModelProperty(value = "电话")
+    private String phone;
+    /**年龄*/
+    @Excel(name = "年龄", width = 15)
+    @ApiModelProperty(value = "年龄")
+    private Integer age;
+    /**性别*/
+    @Excel(name = "性别", width = 15, dicCode = "sex")
+    @Dict(dicCode = "sex")
+    @ApiModelProperty(value = "性别")
+    private Integer gender;
+    /**期望薪资最小值*/
+    @Excel(name = "期望薪资最小值", width = 15)
+    @ApiModelProperty(value = "期望薪资最小值")
+    private Integer moneyMin;
+    /**期望薪资最大值*/
+    @Excel(name = "期望薪资最大值", width = 15)
+    @ApiModelProperty(value = "期望薪资最大值")
+    private Integer moneyMax;
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/IndexController.java

@@ -1,11 +1,18 @@
 package org.jeecg.modules.userCode.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.RedisUtil;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.industry.entity.TbIndustry;
+import org.jeecg.modules.industry.service.ITbIndustryService;
 import org.jeecg.modules.userCode.service.IndexService;
 import org.jeecg.modules.banner.entity.WebBanner;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
@@ -13,9 +20,11 @@ import org.jeecg.modules.postBean.SuggestReq;
 import org.jeecg.modules.tbSuggest.entity.TbSuggest;
 import org.jeecg.modules.tbSuggest.service.ITbSuggestService;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -36,7 +45,8 @@ public class IndexController {
     private ShiroRealm shiroRealm;
     @Resource
     private RedisUtil redisUtil;
-
+    @Autowired
+    private ITbIndustryService tbIndustryService;
 
 
     @ApiOperation(value = "我的头像昵称，平台客户电话等信息")
@@ -69,4 +79,26 @@ public class IndexController {
     }
 
 
+    @ApiOperation(value = "首页行业菜单", notes = "首页行业菜单")
+    @GetMapping(value = "/industryList")
+    public Result<List<TbIndustry>> queryPageList() {
+        QueryWrapper<TbIndustry> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("pid", 0).eq("del_flag", 0).orderByDesc("sort_no");
+        List<TbIndustry> list = tbIndustryService.list(queryWrapper);
+        return Result.OK(list);
+    }
+
+
+    @ApiOperation(value = "根据行业id查询工种", notes = "根据行业id查询工种")
+    @GetMapping(value = "/getIndustryById")
+    public Result<List<TbIndustry> > getIndustryById(@RequestParam(name = "pid", required = true) String pid) {
+        QueryWrapper<TbIndustry> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("pid", pid).eq("del_flag", 0).orderByDesc("sort_no");
+        List<TbIndustry> list = tbIndustryService.list(queryWrapper);
+        return Result.OK(list);
+    }
+
+
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/UserController.java

@@ -5,9 +5,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.bean.LoginReq;
 import org.jeecg.modules.postBean.ReqUserRole;
+import org.jeecg.modules.postBean.ReqUserRole2;
 import org.jeecg.modules.userCode.service.AppletLoginService;
+import org.jeecg.modules.userCode.service.UserService;
 import org.jeecg.modules.utils.ValidateTool;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,7 +30,10 @@ public class UserController {
 
     @Resource
     private AppletLoginService appletLoginService;
-
+    @Resource
+    private UserService userService;
+    @Resource
+    private ShiroRealm shiroRealm;
 
     //小程序授权登录
     @ApiOperation(value = "小程序-登录接口", notes = "小程序-登录接口")
@@ -37,9 +43,20 @@ public class UserController {
     }
 
 
-    @ApiOperation(value = "选择身份")
+    @ApiOperation(value = "求职者填写信息")
     @RequestMapping(value = "/role", method = RequestMethod.POST)
-    public Result<JSONObject> role(@RequestBody ReqUserRole reqUserRole, @RequestHeader("X-Access-Token") String token) {
+    public Result<JSONObject> role(@RequestBody ReqUserRole2 reqUserRole, @RequestHeader("X-Access-Token") String token) {
+        if (ValidateTool.isNull(reqUserRole)) {
+            return Result.error("参数错误");
+        }
+        return appletLoginService.role2(reqUserRole,token);
+    }
+
+
+
+    @ApiOperation(value = "招聘方填写信息")
+    @RequestMapping(value = "/roleBoss", method = RequestMethod.POST)
+    public Result<JSONObject> roleBoss(@RequestBody ReqUserRole reqUserRole, @RequestHeader("X-Access-Token") String token) {
         if (ValidateTool.isNull(reqUserRole)) {
             return Result.error("参数错误");
         }
@@ -48,4 +65,10 @@ public class UserController {
     }
 
 
+
+
+
+
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/AppletLoginService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.bean.LoginReq;
 import org.jeecg.modules.postBean.ReqUserRole;
+import org.jeecg.modules.postBean.ReqUserRole2;
 
 public interface AppletLoginService {
     /**
@@ -16,4 +17,8 @@ public interface AppletLoginService {
 
     Result<JSONObject> role(ReqUserRole reqUserRole, String token);
 
+
+    Result<JSONObject> role2(ReqUserRole2 reqUserRole, String token);
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/UserService.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.userCode.service;
+
+import com.alibaba.fastjson.JSONObject;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.postBean.ReqUserRole;
+
+
+public interface UserService {
+
+
+
+
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/AppletLoginServiceImpl.java

@@ -14,6 +14,7 @@ import org.jeecg.modules.bean.LoginReq;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.postBean.ReqUserRole;
+import org.jeecg.modules.postBean.ReqUserRole2;
 import org.jeecg.modules.userCode.service.AppletLoginService;
 import org.jeecg.modules.userRole.entity.TbUserRole;
 import org.jeecg.modules.userRole.service.ITbUserRoleService;
@@ -132,6 +133,35 @@ public class AppletLoginServiceImpl implements AppletLoginService {
     }
 
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result<JSONObject> role2(ReqUserRole2 reqUserRole, String token) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        Result<JSONObject> result = new Result<JSONObject>();
+        //getAuditStatus 0审核中 1 审核通过 2审核未通过
+        LambdaQueryWrapper<TbUserRole> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        objectLambdaQueryWrapper.eq(TbUserRole::getUserId,hanHaiMember.getId()).
+                eq(TbUserRole::getRole,2).in(TbUserRole::getAuditStatus,1,0);
+        TbUserRole one1 = tbUserRoleService.getOne(objectLambdaQueryWrapper);
+        if (ValidateTool.isNotNull(one1) && one1.getAuditStatus()==0){
+            return result.error500("已提交审核，请耐心等候或联系管理员");
+        }
+        if (ValidateTool.isNotNull(one1) && one1.getAuditStatus()==1){
+            return result.error500("已提交审核，请勿重复提交");
+        }
+        TbUserRole tbUserRole = new TbUserRole();
+        BeanUtils.copyProperties(reqUserRole, tbUserRole);
+        tbUserRole.setUserId(hanHaiMember.getId());
+        tbUserRole.setAuditStatus(0);
+        tbUserRole.setRole(2);
+        tbUserRoleService.save(tbUserRole);
+        JSONObject obj = new JSONObject();
+        obj.put("role", tbUserRole);
+        result.setResult(obj);
+        result.setCode(CommonConstant.SC_OK_200);
+        return result;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Result<JSONObject> role(ReqUserRole reqUserRole, String token) {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/UserServiceImpl.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.userCode.service.impl;
+
+
+import org.jeecg.common.util.RedisUtil;
+import org.jeecg.modules.banner.service.IWebBannerService;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.userCode.service.UserService;
+import org.jeecg.modules.userRole.service.ITbUserRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+@Service
+public class UserServiceImpl implements UserService {
+
+
+    @Resource
+    private IWebBannerService webBannerService;
+    @Autowired
+    private IHanHaiMemberService iHanHaiMemberService;
+    @Autowired
+    private RedisUtil redisUtil;
+    @Resource
+    private ITbUserRoleService tbUserRoleService;
+
+
+
+
+
+
+}