feat: 零工市场列表页

pom.xml

@@ -53,8 +53,8 @@
         </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.4.3</version>
+            <artifactId>pagehelper</artifactId>
+            <version>6.1.0</version>
         </dependency>
 
         <!-- devtools -->
@@ -182,6 +182,15 @@
             <artifactId>ojdbc10</artifactId>
             <version>19.15.0.0</version>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/cn.easyproject/orai18n -->
+        <dependency>
+            <groupId>cn.easyproject</groupId>
+            <artifactId>orai18n</artifactId>
+            <version>12.1.0.2.0</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/com/hz/employmentsite/config/MultiDataSourceConfig.java

@@ -24,7 +24,7 @@ import javax.sql.DataSource;
         sqlSessionTemplateRef = "mysqlSqlSessionTemplate"
 )
 @MapperScan(
-        basePackages = "com.hz.employmentsite.mapper.oracle",
+        basePackages = "com.hz.employmentsite.oraclemapper",
         sqlSessionFactoryRef = "oracleSqlSessionFactory" // 关键点：关联 Oracle 的Factory
 )
 public class MultiDataSourceConfig {
@@ -75,7 +75,12 @@ public class MultiDataSourceConfig {
         SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
         bean.setDataSource(dataSource);
         bean.setMapperLocations(new PathMatchingResourcePatternResolver()
-                .getResources("classpath:mapping/oracle/**/*.xml"));
+                .getResources("classpath:oraclemapping/**/*.xml"));
+
+        // 添加 PageHelper 拦截器
+        Interceptor[] plugins = { new PageInterceptor() };
+        bean.setPlugins(plugins);
+
         return bean.getObject();
     }
 

src/main/java/com/hz/employmentsite/config/MyBatisFilterConfig.java

@@ -1,17 +1,15 @@
 package com.hz.employmentsite.config;
 
 import com.hz.employmentsite.util.datarange.DataRangeInterceptor;
-import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.context.annotation.Configuration;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
 
 @Configuration
-@AutoConfigureAfter(PageHelperAutoConfiguration.class)
+//@AutoConfigureAfter(PageHelperAutoConfiguration.class)
 public class MyBatisFilterConfig {
     @Autowired
     List<SqlSessionFactory> sqlSessionFactoryList;

src/main/java/com/hz/employmentsite/controller/companyService/GigMarketController.java

@@ -18,8 +18,10 @@ public class GigMarketController {
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse<PageInfo<GigMarketVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                                                       @RequestParam(required = false) String AAE004) throws Exception {
-        PageInfo<GigMarketVo> result = gigMarketService.getList(pageIndex, pageSize, AAE004);
+                                                       @RequestParam(required = false) String AAB004, @RequestParam(required = false) String AAB998, @RequestParam(required = false) String AAB022,
+                                                       @RequestParam(required = false) Double ACB241, @RequestParam(required = false) Double ACB242, @RequestParam(required = false) String BAD002,
+                                                       @RequestParam(required = false) String BCB687) throws Exception {
+        PageInfo<GigMarketVo> result = gigMarketService.getList(pageIndex, pageSize, AAB004, AAB998, AAB022, ACB241, ACB242, BAD002, BCB687);
         return RespGenerstor.success(result);
     }
 }

src/main/java/com/hz/employmentsite/mapper/oracle/GigMarketMapper.java

@@ -1,13 +0,0 @@
-package com.hz.employmentsite.mapper.oracle;
-
-import com.hz.employmentsite.vo.companyService.GigMarketVo;
-
-import java.util.List;
-
-public interface GigMarketMapper {
-    /**
-     * 查询零工市场列表
-     * @param AAE004 联系人（雇主名称）
-     */
-    List<GigMarketVo> getList(String AAE004);
-}

src/main/java/com/hz/employmentsite/oraclemapper/cquery/GigMarketCQuery.java

@@ -0,0 +1,21 @@
+package com.hz.employmentsite.oraclemapper.cquery;
+
+import com.hz.employmentsite.vo.companyService.GigMarketVo;
+
+import java.util.List;
+
+public interface GigMarketCQuery {
+    /**
+     * 查询零工市场列表
+     * @param AAB004 雇主名称
+     * @param AAB998 统一社会信用代码
+     * @param AAB022 所属行业
+     * @param ACB241 最低薪资
+     * @param ACB242 最高薪资
+     * @param BAD002 结算方式
+     * @param BCB687 所属驿站
+     */
+    List<GigMarketVo> getList(String AAB004, String AAB998, String AAB022,
+                              Double ACB241, Double ACB242, String BAD002,
+                              String BCB687);
+}

src/main/java/com/hz/employmentsite/oraclemapper/cquery/SgDictCQuery.java

@@ -0,0 +1,9 @@
+package com.hz.employmentsite.oraclemapper.cquery;
+
+import com.hz.employmentsite.model.SysDictionaryItem;
+
+import java.util.List;
+
+public interface SgDictCQuery {
+    List<SysDictionaryItem> getDictListByKindCode(String KindCode);
+}

src/main/java/com/hz/employmentsite/services/impl/companyService/GigMarketServiceImpl.java

@@ -2,7 +2,7 @@ package com.hz.employmentsite.services.impl.companyService;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.hz.employmentsite.mapper.oracle.GigMarketMapper;
+import com.hz.employmentsite.oraclemapper.cquery.GigMarketCQuery;
 import com.hz.employmentsite.services.service.companyService.GigMarketService;
 import com.hz.employmentsite.vo.companyService.GigMarketVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,21 +14,25 @@ import java.util.List;
 public class GigMarketServiceImpl implements GigMarketService {
 
     @Autowired
-    private GigMarketMapper gigMarketMapper;
-
+    private GigMarketCQuery gigMarketCQuery;
 
     /**
      * 查询零工市场列表
      *
      * @param pageIndex 分页页码
      * @param pageSize  分页条数
-     * @param AAE004    联系人（雇主名称）
+     * @param AAB004 雇主名称
+     * @param AAB998 统一社会信用代码
+     * @param AAB022 所属行业
+     * @param ACB241 最低薪资
+     * @param ACB242 最高薪资
+     * @param BAD002 结算方式
+     * @param BCB687 所属驿站
      */
     @Override
-    public PageInfo<GigMarketVo> getList(Integer pageIndex, Integer pageSize, String AAE004) {
+    public PageInfo<GigMarketVo> getList(Integer pageIndex, Integer pageSize, String AAB004, String AAB998, String AAB022, Double ACB241, Double ACB242, String BAD002, String BCB687) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<GigMarketVo> dataList = gigMarketMapper.getList(AAE004);
-        PageInfo<GigMarketVo> result = new PageInfo(dataList);
-        return result;
+        List<GigMarketVo> dataList = gigMarketCQuery.getList(AAB004, AAB998, AAB022, ACB241, ACB242, BAD002, BCB687);
+        return new PageInfo<>(dataList);
     }
 }

src/main/java/com/hz/employmentsite/services/service/companyService/GigMarketService.java

@@ -8,8 +8,13 @@ public interface GigMarketService {
      * 查询零工市场列表
      * @param pageIndex 分页页码
      * @param pageSize 分页条数
-     * @param AAE004 联系人（雇主名称）
+     * @param AAB004 雇主名称
+     * @param AAB998 统一社会信用代码
+     * @param AAB022 所属行业
+     * @param ACB241 最低薪资
+     * @param ACB242 最高薪资
+     * @param BAD002 结算方式
+     * @param BCB687 所属驿站
      */
-    PageInfo<GigMarketVo> getList(Integer pageIndex, Integer pageSize,
-                                  String AAE004);
+    PageInfo<GigMarketVo> getList(Integer pageIndex, Integer pageSize, String AAB004, String AAB998, String AAB022, Double ACB241, Double ACB242, String BAD002, String BCB687);
 }

src/main/java/com/hz/employmentsite/vo/common/SgDictVo.java

@@ -0,0 +1,12 @@
+package com.hz.employmentsite.vo.common;
+
+import lombok.Data;
+
+@Data
+public class SgDictVo {
+    public String KIND_CODE;
+
+    public String CODE;
+
+    public String DETAIL;
+}

src/main/java/com/hz/employmentsite/vo/companyService/GigMarketVo.java

@@ -11,14 +11,26 @@ public class GigMarketVo {
 
     public String BBB911; // 企业ID
 
+    public String AAB004; // 企业名称
+
+    public String AAB998; // 统一社会信用代码
+
+    public String AAB022; // 所属行业
+
+    public String AAB022Name; // 所属行业名称
+
     public String BDZDB3; // 工种类型
 
+    public String BDZDB3Name; // 工种类型名称
+
     public String BGB249; // 工种名称
 
     public String BCE055; // 岗位名称
 
     public String BAD002; // 结算方式
 
+    public String BAD002Name; // 结算方式
+
     public Double ACB241; // 薪资下限
 
     public Double ACB242; // 薪资上限
@@ -49,6 +61,8 @@ public class GigMarketVo {
 
     public String BAE045; // 状态
 
+    public String BAE045Name; // 状态名称
+
     public String BCCA9R; // 是否退回
 
     public String BCE851; // 抽审状态

src/main/resources/application.yml

@@ -101,10 +101,12 @@ mybatis:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 pagehelper:
-  helperDialect: mysql
+  # helperDialect: mysql
   reasonable: true
   supportMethodsArguments: true
   params: count=countSql
+  auto-dialect: true
+  auto-runtime-dialect: true  # 自动识别运行时数据源
 appconfig:
   #开发平台设置
   isDev: true

src/main/resources/mapping/oracle/GigMarketMapper.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hz.employmentsite.mapper.oracle.GigMarketMapper">
-    <select id="getList" resultType="com.hz.employmentsite.vo.companyService.CompanyVo">
-        select
-            lgsc.*
-        from CB28 lgsc
-        where 1=1
-        <if test="AAE004!='' and AAE004!=null">
-            and lgsc.AAE004 like Concat('%',#{AAE004},'%')
-        </if>
-    </select>
-</mapper>

src/main/resources/oraclemapping/cquery/GigMarketCQuery.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hz.employmentsite.oraclemapper.cquery.GigMarketCQuery">
+    <select id="getList" resultType="com.hz.employmentsite.vo.companyService.GigMarketVo">
+        SELECT
+            lgsc.BCB906,
+            qyxx.BBB911,
+            qyxx.AAB004,
+            qyxx.AAB998,
+            qyxx.AAB022,
+            lgsc.BCE055,
+            lgsc.ACB240,
+            lgsc.BAD002,
+            lgsc.ACB241,
+            lgsc.ACB242,
+            lgsc.BCZ253,
+            sshyDic.DETAIL AS AAB022Name,
+            gzlxDic.DETAIL AS BDZDB3Name,
+            gwztDic.DETAIL AS BAE045Name,
+            jsfsDic.DETAIL AS BAD002Name
+        FROM
+            CB28 lgsc
+            LEFT JOIN CBD5 qyxx ON lgsc.BBB911 = qyxx.BBB911
+            LEFT JOIN S_SG_DICT sshyDic ON qyxx.AAB022 = sshyDic.CODE AND sshyDic.KIND_CODE = 'AAB022'
+            LEFT JOIN S_SG_DICT gzlxDic ON lgsc.BDZDB3 = gzlxDic.CODE AND gzlxDic.KIND_CODE = 'BDZDB3_GGZP'
+            LEFT JOIN S_SG_DICT gwztDic ON lgsc.BAE045 = gwztDic.CODE AND gwztDic.KIND_CODE = 'BAE045'
+            LEFT JOIN S_SG_DICT jsfsDic ON lgsc.BAD002 = jsfsDic.CODE AND jsfsDic.KIND_CODE = 'BAD002'
+        where 1=1
+        <if test="AAB004!='' and AAB004!=null">
+            and qyxx.AAB004 like '%' || #{AAB004} || '%'
+        </if>
+        <if test="AAB998!='' and AAB998!=null">
+            and qyxx.AAB998 like '%' || #{AAB998} || '%'
+        </if>
+        <if test="AAB022!='' and AAB022!=null">
+            and qyxx.AAB022 = #{AAB022}
+        </if>
+        <if test="ACB241 != null and ACB241 != ''">
+            and lgsc.ACB241 <![CDATA[ >= ]]> #{ACB241}
+        </if>
+        <if test="ACB242 != null and ACB242 != ''">
+            and lgsc.ACB242 <![CDATA[ <= ]]> #{ACB242}
+        </if>
+        <if test="BAD002!='' and BAD002!=null">
+            and lgsc.BAD002 = #{BAD002}
+        </if>
+        <if test="BCB687!='' and BCB687!=null">
+            and lgsc.BCB687 = #{BCB687}
+        </if>
+        ORDER BY BDB286 DESC
+    </select>
+</mapper>

src/main/resources/oraclemapping/cquery/SgDictCQuery.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hz.employmentsite.oraclemapper.cquery.SgDictCQuery">
+    <select id="getDictListByKindCode" resultType="com.hz.employmentsite.model.SysDictionaryItem">
+        SELECT
+            code,
+            DETAIL AS name
+        FROM
+            S_SG_DICT
+        WHERE
+            KIND_CODE = #{KindCode}
+    </select>
+</mapper>

vue/src/api/system/dictionary/index.ts

@@ -134,3 +134,13 @@ export function getPositionForStudentList(schoolYearID: string,practiceBaseID:st
   });
 }
 
+export function getSgDictList(kindCode: string) {
+  return request<any>({
+    url: 'system/dictionary/getSgDictList',
+    method: 'get',
+    params: {kindCode: kindCode},
+  }, {
+    isNew: true,
+  });
+}
+

vue/src/views/companyService/gigMarket/index.vue

@@ -3,18 +3,26 @@
     <a-form ref="formRef" name="advanced_search" class="ant-advanced-search-form" :model="searchParams">
       <a-row :gutter="24">
         <a-col :span="6">
-          <a-form-item label="企业名称" :label-col="{span:6}" name="companyName">
-            <a-input v-model:value="searchParams.companyName" placeholder="" :allow-clear="true"/>
+          <a-form-item label="雇主名称" :label-col="{span:6}" name="AAB004">
+            <a-input v-model:value="searchParams.AAB004" placeholder="" :allow-clear="true"/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="统一信用代码" :label-col="{span:6}" name="companyCode">
-            <a-input v-model:value="searchParams.companyCode" placeholder="" :allow-clear="true"/>
+          <a-form-item label="统一信用代码" :label-col="{span:6}" name="AAB998">
+            <a-input v-model:value="searchParams.AAB998" placeholder="" :allow-clear="true"/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="企业状态" :label-col="{span:6}" name="recordStatus">
-
+          <a-form-item label="所属行业" :label-col="{span:6}" name="AAB022">
+            <a-select
+              ref="select"
+              v-model:value="searchParams.AAB022"
+              :options="sshyList"
+              :field-names="{ label: 'name', value: 'code' }"
+              :allow-clear="true"
+              @change="loadData"
+            >
+            </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="6" style="text-align: left">
@@ -39,6 +47,38 @@
           </a>
         </a-col>
       </a-row>
+      <a-row :gutter="24" v-show="expand">
+        <a-col :span="6">
+          <a-form-item label="薪酬范围" :label-col="{span:6}" name="regionCode">
+            <a-input-group compact>
+              <a-input-number v-model:value="searchParams.ACB241" :controls="false" style="width:125px;"
+                              placeholder=""/>
+              <a-input
+                style="width: 40px; border-left: 0;border-right: 0; pointer-events: none; background-color: #fff;margin-left: 1px;"
+                placeholder="至" disabled/>
+              <a-input-number v-model:value="searchParams.ACB242" :controls="false" style="width:125px;"
+                              placeholder=""/>
+            </a-input-group>
+          </a-form-item>
+        </a-col>
+        <a-col :span="6">
+          <a-form-item label="结算方式" :label-col="{span:6}" name="BAD002">
+            <a-select
+              ref="select"
+              v-model:value="searchParams.BAD002"
+              :options="jsfsList"
+              :field-names="{ label: 'name', value: 'code' }"
+              :allow-clear="true"
+              @change="loadData"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="6">
+          <a-form-item label="所属驿站" :label-col="{span:6}" name="siteID">
+          </a-form-item>
+        </a-col>
+      </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" class="flex-space-between">
           <div>
@@ -59,6 +99,11 @@
                :row-key="record=>record.companyID"
                bordered>
         <template #bodyCell="{ column, text, record }">
+          <template v-if="column.key === 'ACB241'">
+            <div>
+              {{ showSalary(record.ACB241, record.ACB242, record.BAD002Name) }}
+            </div>
+          </template>
           <template v-if="column.key === 'operation'">
             <div class="table-operation">
               <a-button type="link" size="small" @click='onDetail(record)' functioncode="T01020101">查看</a-button>
@@ -74,30 +119,24 @@
 <script setup lang="ts">
 import ColumnsSetting from "@/components/common/ColumnsSetting.vue";
 import {DownOutlined, UpOutlined} from "@ant-design/icons-vue";
-import {computed, reactive, ref} from "vue";
-import type {FormInstance, TableProps} from "ant-design-vue";
+import {computed, onMounted, reactive, ref} from "vue";
 import PositionShowModal from "@/views/companyService/company/show.vue";
 import {getPaginationTotalTitle} from "@/utils/common";
-import {getList} from "@/api/companyService/company";
 import {getGigMarketList} from "@/api/companyService/gigMarket";
+import type {FormInstance, SelectProps, TableProps} from "ant-design-vue";
+import {getSgDictList} from "@/api/system/dictionary";
 
 const formRef = ref<FormInstance>(null);
 const expand = ref(false);
 const searchParams = reactive({
   pageIndex: 1,
   pageSize: 20,
-  companyName: '',
-  companyCode: '',
-  recordStatus: '',
-  regionCode: '',
-  streetCode: '',
-  siteID: "",
-  startDate: "",
-  endDate: "",
-  postCountSorter: "",
-  companyTypeID: "",
-  industryID: "",
-  createUserName: ""
+  AAB004: "",
+  AAB998: "",
+  AAB022: "",
+  ACB241: "",
+  ACB242: "",
+  BAD002: "",
 });
 // 原始表格定义数据
 const originalColumns = [
@@ -109,11 +148,20 @@ const originalColumns = [
     customRender: item => `${searchParams.pageSize * (searchParams.pageIndex - 1) + item.index + 1}`,
     isDisabled: true
   },
-  {title: '企业名称', dataIndex: 'companyName', key: 'companyName', width: 200, align: "center"},
-  {title: '操作', key: 'operation', fixed: 'right', width: 150, align: "center", isDisabled: true},
+  {title: '雇主名称', dataIndex: 'AAB004', key: 'AAB004', width: 200, align: "center"},
+  {title: '统一社会信用代码', dataIndex: 'AAB998', key: 'AAB998', width: 200, align: "center"},
+  {title: '所属行业', dataIndex: 'AAB022Name', key: 'AAB022Name', width: 200, align: "center"},
+  {title: '工种类型', dataIndex: 'BDZDB3Name', key: 'BDZDB3Name', width: 200, align: "center"},
+  {title: '岗位名称', dataIndex: 'BCE055', key: 'BCE055', width: 200, align: "center"},
+  {title: '招工人数', dataIndex: 'ACB240', key: 'ACB240', width: 200, align: "center"},
+  {title: '结算方式', dataIndex: 'BAD002Name', key: 'BAD002Name', width: 200, align: "center"},
+  {title: '薪酬待遇', dataIndex: 'ACB241', key: 'ACB241', width: 200, align: "center"},
+  {title: '岗位状态', dataIndex: 'BAE045Name', key: 'BAE045Name', width: 200, align: "center"},
+  {title: '登记机构', dataIndex: 'BCZ253', key: 'BCZ253', width: 200, align: "center"},
+  {title: '操作', key: 'operation', fixed: 'right', width: 100, align: "center", isDisabled: true},
 ];
 // 响应式表格定义
-const columns = ref<Array<any>>(originalColumns.filter(item => !item.isDefaultClose));
+const columns = ref<Array<any>>(originalColumns);
 const pagination = computed(() => ({
   total: formState.total,
   current: searchParams.pageIndex,
@@ -124,11 +172,9 @@ const pagination = computed(() => ({
 const handleTableChange: TableProps['onChange'] = (pag: {
   pageSize: number;
   current: number,
-}, filters, sorter: any) => {
-  console.log(filters);
+}) => {
   searchParams.pageIndex = pag.current;
   searchParams.pageSize = pag.pageSize;
-  searchParams.postCountSorter = sorter.order;
   loadData();
 };
 const onSelectChange = (selectedRowKeys: any) => {
@@ -141,12 +187,17 @@ const formState = reactive({
   selectedRowKeys: [],
   loading: false
 });
+// 所属行业字典列表
+const sshyList = ref<SelectProps['options']>();
+// 结算方式字典列表
+const jsfsList = ref<SelectProps['options']>();
 
 // 数据加载
 async function loadData() {
   formState.loading = true;
-  getGigMarketList(searchParams).then((result) => {
-    console.log(result);
+  getGigMarketList(searchParams).then((result: any) => {
+    dataList.value = result.list;
+    formState.total = result.total;
   }).finally(() => {
     formState.loading = false;
   })
@@ -167,6 +218,42 @@ function columnsCheckSub(columnsKeys: Array<string>) {
   // 从原始表格定义数据中过滤出已选择的字段
   columns.value = originalColumns.filter((item: any) => columnsKeys.includes(item.key));
 }
+
+function showSalary(minSalary: any, maxSalary: any, jsfs: any) {
+  let dw = "元";
+  if (jsfs == "按小时结") {
+    dw += "/小时"
+  }
+  if (jsfs == "日结") {
+    dw += "/天"
+  }
+  if (jsfs == "月结") {
+    dw += "/月"
+  }
+  if (minSalary != null) {
+    if (maxSalary != null) {
+      return minSalary.toString() + "-" + maxSalary.toString() + dw;
+    } else {
+      return "≥" + minSalary.toString() + dw;
+    }
+  } else {
+    if (maxSalary != null) {
+      return "≤" + maxSalary.toString() + dw;
+    } else {
+      return "";
+    }
+  }
+}
+
+onMounted(() => {
+  getSgDictList("AAB022").then((result) => {
+    sshyList.value = result;
+  })
+  getSgDictList("BAD002").then((result) => {
+    jsfsList.value = result;
+  })
+  onSearch();
+})
 </script>
 
 <style scoped>