feat: 零工市场详情页

doc/待更新脚本.txt

@@ -6,6 +6,7 @@ INSERT INTO sys_function_code VALUES ('T010507', '企业统计报表', 'T0105',
 INSERT INTO `sys_menu` VALUES ('T010507', 7, '企业统计报表', NULL, 'views/statistics/CompanyStatistics', '/companyStatistics', 'T0105', NULL, 0, 1, 1, 'T010507', 1, NULL, NULL);
 insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T010507');
 
+-- 零工市场功能
 INSERT INTO `sys_function_code` (`FunctionCode`, `FunctionName`, `ParentFunctionCode`, `OrderNo`) VALUES ('T010203', '零工市场管理', 'T0102', 3);
 INSERT INTO `sys_function_code` (`FunctionCode`, `FunctionName`, `ParentFunctionCode`, `OrderNo`) VALUES ('T01020301', '查看', 'T010203', 1);
 INSERT INTO `sys_menu` (`MenuNo`, `OrderNo`, `MenuName`, `Icon`, `ViewPath`, `Url`, `ParentMenuNo`, `Description`, `IsTopMenu`, `IsVisible`, `IsLeaf`, `FunctionCode`, `RecordStatus`, `ShortcutIcon`, `IsBlank`) VALUES ('T010203', 3, '零工市场管理', NULL, '', '/gigMarket', 'T0102', '零工市场管理', 0, 1, 1, 'T010203', 1, NULL, NULL);
@@ -13,3 +14,4 @@ INSERT INTO `sys_menu` (`MenuNo`, `OrderNo`, `MenuName`, `Icon`, `ViewPath`, `Ur
 INSERT INTO `sys_menu` (`MenuNo`, `OrderNo`, `MenuName`, `Icon`, `ViewPath`, `Url`, `ParentMenuNo`, `Description`, `IsTopMenu`, `IsVisible`, `IsLeaf`, `FunctionCode`, `RecordStatus`, `ShortcutIcon`, `IsBlank`) VALUES ('T01020302', 2, '零工市场详情', NULL, 'companyService/gigMarket/detail', '/detail', 'T010203', '', 0, 0, 1, 'T010203', 1, NULL, NULL);
 insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T010203');
 insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T01020301');
+ALTER TABLE `pc_site` ADD COLUMN `OracleTableID` varchar(50) NULL COMMENT 'Oracle数据表绑定驿站ID' AFTER `Remark`;

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

@@ -4,10 +4,13 @@ import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.services.service.companyService.GigMarketService;
+import com.hz.employmentsite.vo.companyService.CompanyVo;
 import com.hz.employmentsite.vo.companyService.GigMarketVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 @RestController
 @RequestMapping("/api/gigMarket")
@@ -18,10 +21,17 @@ public class GigMarketController {
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse<PageInfo<GigMarketVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                                                       @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);
+                                                       @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, @RequestParam(required = false) List<String> gigMarketIDList) throws Exception {
+        PageInfo<GigMarketVo> result = gigMarketService.getList(pageIndex, pageSize, gigMarketIDList, AAB004, AAB998, AAB022, ACB241, ACB242, BAD002, BCB687);
         return RespGenerstor.success(result);
     }
+
+    @GetMapping("/getGigMarketByID")
+    public BaseResponse<CompanyVo> getCompanyById(String id) {
+        var data = gigMarketService.getDataByID(id);
+        return RespGenerstor.success(data);
+    }
 }

src/main/java/com/hz/employmentsite/model/PcSite.java

@@ -37,6 +37,8 @@ public class PcSite {
 
     private String remark;
 
+    private String oracleTableID;
+
     public String getSiteID() {
         return siteID;
     }
@@ -93,6 +95,22 @@ public class PcSite {
         this.siteY = siteY == null ? null : siteY.trim();
     }
 
+    public Double getSiteLongitude() {
+        return siteLongitude;
+    }
+
+    public void setSiteLongitude(Double siteLongitude) {
+        this.siteLongitude = siteLongitude;
+    }
+
+    public Double getSiteLatitude() {
+        return siteLatitude;
+    }
+
+    public void setSiteLatitude(Double siteLatitude) {
+        this.siteLatitude = siteLatitude;
+    }
+
     public String getSiteName() {
         return siteName;
     }
@@ -157,19 +175,11 @@ public class PcSite {
         this.remark = remark == null ? null : remark.trim();
     }
 
-    public Double getSiteLongitude() {
-        return siteLongitude;
-    }
-
-    public void setSiteLongitude(Double siteLongitude) {
-        this.siteLongitude = siteLongitude;
-    }
-
-    public Double getSiteLatitude() {
-        return siteLatitude;
+    public String getOracleTableID() {
+        return oracleTableID;
     }
 
-    public void setSiteLatitude(Double siteLatitude) {
-        this.siteLatitude = siteLatitude;
+    public void setOracleTableID(String oracleTableID) {
+        this.oracleTableID = oracleTableID == null ? null : oracleTableID.trim();
     }
 }

src/main/java/com/hz/employmentsite/model/PcSiteExample.java

@@ -595,6 +595,126 @@ public class PcSiteExample {
             return (Criteria) this;
         }
 
+        public Criteria andSiteLongitudeIsNull() {
+            addCriterion("SiteLongitude is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLongitudeIsNotNull() {
+            addCriterion("SiteLongitude is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLongitudeEqualTo(Double value) {
+            addCriterion("SiteLongitude =", value, "siteLongitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLongitudeNotEqualTo(Double value) {
+            addCriterion("SiteLongitude <>", value, "siteLongitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLongitudeGreaterThan(Double value) {
+            addCriterion("SiteLongitude >", value, "siteLongitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLongitudeGreaterThanOrEqualTo(Double value) {
+            addCriterion("SiteLongitude >=", value, "siteLongitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLongitudeLessThan(Double value) {
+            addCriterion("SiteLongitude <", value, "siteLongitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLongitudeLessThanOrEqualTo(Double value) {
+            addCriterion("SiteLongitude <=", value, "siteLongitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLongitudeIn(List<Double> values) {
+            addCriterion("SiteLongitude in", values, "siteLongitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLongitudeNotIn(List<Double> values) {
+            addCriterion("SiteLongitude not in", values, "siteLongitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLongitudeBetween(Double value1, Double value2) {
+            addCriterion("SiteLongitude between", value1, value2, "siteLongitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLongitudeNotBetween(Double value1, Double value2) {
+            addCriterion("SiteLongitude not between", value1, value2, "siteLongitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLatitudeIsNull() {
+            addCriterion("SiteLatitude is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLatitudeIsNotNull() {
+            addCriterion("SiteLatitude is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLatitudeEqualTo(Double value) {
+            addCriterion("SiteLatitude =", value, "siteLatitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLatitudeNotEqualTo(Double value) {
+            addCriterion("SiteLatitude <>", value, "siteLatitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLatitudeGreaterThan(Double value) {
+            addCriterion("SiteLatitude >", value, "siteLatitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLatitudeGreaterThanOrEqualTo(Double value) {
+            addCriterion("SiteLatitude >=", value, "siteLatitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLatitudeLessThan(Double value) {
+            addCriterion("SiteLatitude <", value, "siteLatitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLatitudeLessThanOrEqualTo(Double value) {
+            addCriterion("SiteLatitude <=", value, "siteLatitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLatitudeIn(List<Double> values) {
+            addCriterion("SiteLatitude in", values, "siteLatitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLatitudeNotIn(List<Double> values) {
+            addCriterion("SiteLatitude not in", values, "siteLatitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLatitudeBetween(Double value1, Double value2) {
+            addCriterion("SiteLatitude between", value1, value2, "siteLatitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLatitudeNotBetween(Double value1, Double value2) {
+            addCriterion("SiteLatitude not between", value1, value2, "siteLatitude");
+            return (Criteria) this;
+        }
+
         public Criteria andSiteNameIsNull() {
             addCriterion("SiteName is null");
             return (Criteria) this;
@@ -1134,6 +1254,76 @@ public class PcSiteExample {
             addCriterion("Remark not between", value1, value2, "remark");
             return (Criteria) this;
         }
+
+        public Criteria andOracleTableIDIsNull() {
+            addCriterion("OracleTableID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOracleTableIDIsNotNull() {
+            addCriterion("OracleTableID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOracleTableIDEqualTo(String value) {
+            addCriterion("OracleTableID =", value, "oracleTableID");
+            return (Criteria) this;
+        }
+
+        public Criteria andOracleTableIDNotEqualTo(String value) {
+            addCriterion("OracleTableID <>", value, "oracleTableID");
+            return (Criteria) this;
+        }
+
+        public Criteria andOracleTableIDGreaterThan(String value) {
+            addCriterion("OracleTableID >", value, "oracleTableID");
+            return (Criteria) this;
+        }
+
+        public Criteria andOracleTableIDGreaterThanOrEqualTo(String value) {
+            addCriterion("OracleTableID >=", value, "oracleTableID");
+            return (Criteria) this;
+        }
+
+        public Criteria andOracleTableIDLessThan(String value) {
+            addCriterion("OracleTableID <", value, "oracleTableID");
+            return (Criteria) this;
+        }
+
+        public Criteria andOracleTableIDLessThanOrEqualTo(String value) {
+            addCriterion("OracleTableID <=", value, "oracleTableID");
+            return (Criteria) this;
+        }
+
+        public Criteria andOracleTableIDLike(String value) {
+            addCriterion("OracleTableID like", value, "oracleTableID");
+            return (Criteria) this;
+        }
+
+        public Criteria andOracleTableIDNotLike(String value) {
+            addCriterion("OracleTableID not like", value, "oracleTableID");
+            return (Criteria) this;
+        }
+
+        public Criteria andOracleTableIDIn(List<String> values) {
+            addCriterion("OracleTableID in", values, "oracleTableID");
+            return (Criteria) this;
+        }
+
+        public Criteria andOracleTableIDNotIn(List<String> values) {
+            addCriterion("OracleTableID not in", values, "oracleTableID");
+            return (Criteria) this;
+        }
+
+        public Criteria andOracleTableIDBetween(String value1, String value2) {
+            addCriterion("OracleTableID between", value1, value2, "oracleTableID");
+            return (Criteria) this;
+        }
+
+        public Criteria andOracleTableIDNotBetween(String value1, String value2) {
+            addCriterion("OracleTableID not between", value1, value2, "oracleTableID");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -7,6 +7,7 @@ import java.util.List;
 public interface GigMarketCQuery {
     /**
      * 查询零工市场列表
+     * @param gigMarketIDList 零工岗位ID
      * @param AAB004 雇主名称
      * @param AAB998 统一社会信用代码
      * @param AAB022 所属行业
@@ -15,7 +16,7 @@ public interface GigMarketCQuery {
      * @param BAD002 结算方式
      * @param BCB687 所属驿站
      */
-    List<GigMarketVo> getList(String AAB004, String AAB998, String AAB022,
+    List<GigMarketVo> getList(String gigMarketIDList, String AAB004, String AAB998, String AAB022,
                               Double ACB241, Double ACB242, String BAD002,
                               String BCB687);
 }

src/main/java/com/hz/employmentsite/services/impl/baseSettings/SiteInfoImpl.java

@@ -134,6 +134,7 @@ public class SiteInfoImpl implements SiteInfoService {
             dbData.setRegionCode(data.getRegionCode());
             dbData.setStreetCode(data.getStreetCode());
             dbData.setRemark(data.getRemark());
+            dbData.setOracleTableID(data.getOracleTableID());
             dbData.setCreateUserID(userId);
             dbData.setCreateTime(new Date());
             result = pcSiteMapper.insert(dbData);
@@ -152,6 +153,7 @@ public class SiteInfoImpl implements SiteInfoService {
             dbData.setRegionCode(data.regionCode);
             dbData.setStreetCode(data.streetCode);
             dbData.setRemark(data.remark);
+            dbData.setOracleTableID(data.getOracleTableID());
             dbData.setModifyUserID(userId);
             dbData.setModifyTime(new Date());
             result = pcSiteMapper.updateByPrimaryKey(dbData);

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.oraclemapper.cquery.GigMarketCQuery;
 import com.hz.employmentsite.services.service.companyService.GigMarketService;
+import com.hz.employmentsite.util.StringUtils;
 import com.hz.employmentsite.vo.companyService.GigMarketVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,6 +17,9 @@ public class GigMarketServiceImpl implements GigMarketService {
     @Autowired
     private GigMarketCQuery gigMarketCQuery;
 
+    @Autowired
+    private StringUtils stringUtils;
+
     /**
      * 查询零工市场列表
      *
@@ -30,9 +34,18 @@ public class GigMarketServiceImpl implements GigMarketService {
      * @param BCB687 所属驿站
      */
     @Override
-    public PageInfo<GigMarketVo> getList(Integer pageIndex, Integer pageSize, String AAB004, String AAB998, String AAB022, Double ACB241, Double ACB242, String BAD002, String BCB687) {
+    public PageInfo<GigMarketVo> getList(Integer pageIndex, Integer pageSize, List<String> gigMarketIDList, String AAB004, String AAB998, String AAB022, Double ACB241, Double ACB242, String BAD002, String BCB687) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<GigMarketVo> dataList = gigMarketCQuery.getList(AAB004, AAB998, AAB022, ACB241, ACB242, BAD002, BCB687);
+        List<GigMarketVo> dataList = gigMarketCQuery.getList(stringUtils.ListToInSql(gigMarketIDList), AAB004, AAB998, AAB022, ACB241, ACB242, BAD002, BCB687);
         return new PageInfo<>(dataList);
     }
+
+    @Override
+    public GigMarketVo getDataByID(String id) {
+        if (stringUtils.IsNullOrEmpty(id)) {
+            return null;
+        }
+
+        return gigMarketCQuery.getList(id, null, null, null, null, null, null, null).stream().findFirst().orElse(new GigMarketVo());
+    }
 }

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

@@ -3,9 +3,12 @@ package com.hz.employmentsite.services.service.companyService;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.vo.companyService.GigMarketVo;
 
+import java.util.List;
+
 public interface GigMarketService {
     /**
      * 查询零工市场列表
+     * @param gigMarketIDList 零工岗位ID
      * @param pageIndex 分页页码
      * @param pageSize 分页条数
      * @param AAB004 雇主名称
@@ -16,5 +19,7 @@ public interface GigMarketService {
      * @param BAD002 结算方式
      * @param BCB687 所属驿站
      */
-    PageInfo<GigMarketVo> getList(Integer pageIndex, Integer pageSize, String AAB004, String AAB998, String AAB022, Double ACB241, Double ACB242, String BAD002, String BCB687);
+    PageInfo<GigMarketVo> getList(Integer pageIndex, Integer pageSize, List<String> gigMarketIDList, String AAB004, String AAB998, String AAB022, Double ACB241, Double ACB242, String BAD002, String BCB687);
+
+    GigMarketVo getDataByID(String id);
 }

src/main/java/com/hz/employmentsite/vo/baseSettings/SiteInfoVo.java

@@ -49,4 +49,6 @@ public class SiteInfoVo {
     public String modifyUserName;
     public Date modifyTime;
 
+    public String oracleTableID;
+
 }

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

@@ -37,6 +37,8 @@ public class GigMarketVo {
 
     public String BCD182; // 薪资单位
 
+    public String BCD182Name; // 薪资单位名称
+
     public Double ACB240; // 招聘人数
 
     public String AAE004; // 联系人
@@ -49,6 +51,8 @@ public class GigMarketVo {
 
     public String ACB204; // 工作地点
 
+    public String ACB204Name; // 工作地点
+
     public String ACC530; // 联系地址
 
     public BigDecimal BCB034; // 经度

src/main/resources/generatorConfig.xml

@@ -112,6 +112,6 @@
         <table schema="" tableName="wx_qrcode_scan_record"><property name="useActualColumnNames" value="true"/></table>
          <table schema="" tableName="pc_signin"><property name="useActualColumnNames" value="true"/></table>
         -->
-
+        <table schema="" tableName="pc_site"><property name="useActualColumnNames" value="true"/></table>
     </context>
 </generatorConfiguration>

src/main/resources/mapping/PcSiteMapper.xml

@@ -2,23 +2,24 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hz.employmentsite.mapper.PcSiteMapper">
   <resultMap id="BaseResultMap" type="com.hz.employmentsite.model.PcSite">
-    <id column="SiteID" jdbcType="VARCHAR" property="siteID"/>
-    <result column="SiteCode" jdbcType="VARCHAR" property="siteCode"/>
-    <result column="RegionCode" jdbcType="VARCHAR" property="regionCode"/>
-    <result column="StreetCode" jdbcType="VARCHAR" property="streetCode"/>
-    <result column="DetailAddress" jdbcType="VARCHAR" property="detailAddress"/>
-    <result column="SiteX" jdbcType="VARCHAR" property="siteX"/>
-    <result column="SiteY" jdbcType="VARCHAR" property="siteY"/>
-    <result column="SiteLongitude" jdbcType="DOUBLE" property="siteLongitude"/>
-    <result column="SiteLatitude" jdbcType="DOUBLE" property="siteLatitude"/>
-    <result column="SiteName" jdbcType="VARCHAR" property="siteName"/>
-    <result column="FzrName" jdbcType="VARCHAR" property="fzrName"/>
-    <result column="FzrMobile" jdbcType="VARCHAR" property="fzrMobile"/>
-    <result column="CreateUserID" jdbcType="VARCHAR" property="createUserID"/>
-    <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime"/>
-    <result column="ModifyUserID" jdbcType="VARCHAR" property="modifyUserID"/>
-    <result column="ModifyTime" jdbcType="TIMESTAMP" property="modifyTime"/>
-    <result column="Remark" jdbcType="VARCHAR" property="remark"/>
+    <id column="SiteID" jdbcType="VARCHAR" property="siteID" />
+    <result column="SiteCode" jdbcType="VARCHAR" property="siteCode" />
+    <result column="RegionCode" jdbcType="VARCHAR" property="regionCode" />
+    <result column="StreetCode" jdbcType="VARCHAR" property="streetCode" />
+    <result column="DetailAddress" jdbcType="VARCHAR" property="detailAddress" />
+    <result column="SiteX" jdbcType="VARCHAR" property="siteX" />
+    <result column="SiteY" jdbcType="VARCHAR" property="siteY" />
+    <result column="SiteLongitude" jdbcType="DOUBLE" property="siteLongitude" />
+    <result column="SiteLatitude" jdbcType="DOUBLE" property="siteLatitude" />
+    <result column="SiteName" jdbcType="VARCHAR" property="siteName" />
+    <result column="FzrName" jdbcType="VARCHAR" property="fzrName" />
+    <result column="FzrMobile" jdbcType="VARCHAR" property="fzrMobile" />
+    <result column="CreateUserID" jdbcType="VARCHAR" property="createUserID" />
+    <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="ModifyUserID" jdbcType="VARCHAR" property="modifyUserID" />
+    <result column="ModifyTime" jdbcType="TIMESTAMP" property="modifyTime" />
+    <result column="Remark" jdbcType="VARCHAR" property="remark" />
+    <result column="OracleTableID" jdbcType="VARCHAR" property="oracleTableID" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -79,8 +80,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    SiteID, SiteCode, RegionCode, StreetCode, DetailAddress, SiteX, SiteY, SiteName, 
-    FzrName, FzrMobile, CreateUserID, CreateTime, ModifyUserID, ModifyTime, Remark
+    SiteID, SiteCode, RegionCode, StreetCode, DetailAddress, SiteX, SiteY, SiteLongitude, 
+    SiteLatitude, SiteName, FzrName, FzrMobile, CreateUserID, CreateTime, ModifyUserID, 
+    ModifyTime, Remark, OracleTableID
   </sql>
   <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcSiteExample" resultMap="BaseResultMap">
     select
@@ -113,18 +115,20 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.hz.employmentsite.model.PcSite">
-    insert into pc_site (SiteID, SiteCode, RegionCode,
-                         StreetCode, DetailAddress, SiteX,
-                         SiteY, SiteLongitude, SiteLatitude,
-                         SiteName, FzrName, FzrMobile,
-                         CreateUserID, CreateTime, ModifyUserID,
-                         ModifyTime, Remark)
-    values (#{siteID,jdbcType=VARCHAR}, #{siteCode,jdbcType=VARCHAR}, #{regionCode,jdbcType=VARCHAR},
-            #{streetCode,jdbcType=VARCHAR}, #{detailAddress,jdbcType=VARCHAR}, #{siteX,jdbcType=VARCHAR},
-            #{siteY,jdbcType=VARCHAR}, #{siteLongitude,jdbcType=DOUBLE}, #{siteLatitude,jdbcType=DOUBLE},
-            #{siteName,jdbcType=VARCHAR}, #{fzrName,jdbcType=VARCHAR},
-            #{fzrMobile,jdbcType=VARCHAR}, #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
-            #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR})
+    insert into pc_site (SiteID, SiteCode, RegionCode, 
+      StreetCode, DetailAddress, SiteX, 
+      SiteY, SiteLongitude, SiteLatitude, 
+      SiteName, FzrName, FzrMobile, 
+      CreateUserID, CreateTime, ModifyUserID, 
+      ModifyTime, Remark, OracleTableID
+      )
+    values (#{siteID,jdbcType=VARCHAR}, #{siteCode,jdbcType=VARCHAR}, #{regionCode,jdbcType=VARCHAR}, 
+      #{streetCode,jdbcType=VARCHAR}, #{detailAddress,jdbcType=VARCHAR}, #{siteX,jdbcType=VARCHAR}, 
+      #{siteY,jdbcType=VARCHAR}, #{siteLongitude,jdbcType=DOUBLE}, #{siteLatitude,jdbcType=DOUBLE}, 
+      #{siteName,jdbcType=VARCHAR}, #{fzrName,jdbcType=VARCHAR}, #{fzrMobile,jdbcType=VARCHAR}, 
+      #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, 
+      #{modifyTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{oracleTableID,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcSite">
     insert into pc_site
@@ -180,6 +184,9 @@
       <if test="remark != null">
         Remark,
       </if>
+      <if test="oracleTableID != null">
+        OracleTableID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="siteID != null">
@@ -233,6 +240,9 @@
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="oracleTableID != null">
+        #{oracleTableID,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hz.employmentsite.model.PcSiteExample" resultType="java.lang.Long">
@@ -295,6 +305,9 @@
       <if test="row.remark != null">
         Remark = #{row.remark,jdbcType=VARCHAR},
       </if>
+      <if test="row.oracleTableID != null">
+        OracleTableID = #{row.oracleTableID,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -303,22 +316,23 @@
   <update id="updateByExample" parameterType="map">
     update pc_site
     set SiteID = #{row.siteID,jdbcType=VARCHAR},
-    SiteCode = #{row.siteCode,jdbcType=VARCHAR},
-    RegionCode = #{row.regionCode,jdbcType=VARCHAR},
-    StreetCode = #{row.streetCode,jdbcType=VARCHAR},
-    DetailAddress = #{row.detailAddress,jdbcType=VARCHAR},
-    SiteX = #{row.siteX,jdbcType=VARCHAR},
-    SiteY = #{row.siteY,jdbcType=VARCHAR},
-    SiteLongitude = #{siteLongitude,jdbcType=DOUBLE},
-    SiteLatitude = #{siteLatitude,jdbcType=DOUBLE},
-    SiteName = #{row.siteName,jdbcType=VARCHAR},
-    FzrName = #{row.fzrName,jdbcType=VARCHAR},
-    FzrMobile = #{row.fzrMobile,jdbcType=VARCHAR},
-    CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
-    CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
-    ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
-    ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
-    Remark = #{row.remark,jdbcType=VARCHAR}
+      SiteCode = #{row.siteCode,jdbcType=VARCHAR},
+      RegionCode = #{row.regionCode,jdbcType=VARCHAR},
+      StreetCode = #{row.streetCode,jdbcType=VARCHAR},
+      DetailAddress = #{row.detailAddress,jdbcType=VARCHAR},
+      SiteX = #{row.siteX,jdbcType=VARCHAR},
+      SiteY = #{row.siteY,jdbcType=VARCHAR},
+      SiteLongitude = #{row.siteLongitude,jdbcType=DOUBLE},
+      SiteLatitude = #{row.siteLatitude,jdbcType=DOUBLE},
+      SiteName = #{row.siteName,jdbcType=VARCHAR},
+      FzrName = #{row.fzrName,jdbcType=VARCHAR},
+      FzrMobile = #{row.fzrMobile,jdbcType=VARCHAR},
+      CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
+      CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
+      ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
+      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
+      Remark = #{row.remark,jdbcType=VARCHAR},
+      OracleTableID = #{row.oracleTableID,jdbcType=VARCHAR}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -344,11 +358,11 @@
       <if test="siteY != null">
         SiteY = #{siteY,jdbcType=VARCHAR},
       </if>
-      <if test="row.siteLongitude != null">
-        SiteLongitude = #{row.siteLongitude,jdbcType=DOUBLE},
+      <if test="siteLongitude != null">
+        SiteLongitude = #{siteLongitude,jdbcType=DOUBLE},
       </if>
-      <if test="row.siteLatitude != null">
-        SiteLatitude = #{row.siteLatitude,jdbcType=DOUBLE},
+      <if test="siteLatitude != null">
+        SiteLatitude = #{siteLatitude,jdbcType=DOUBLE},
       </if>
       <if test="siteName != null">
         SiteName = #{siteName,jdbcType=VARCHAR},
@@ -374,27 +388,31 @@
       <if test="remark != null">
         Remark = #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="oracleTableID != null">
+        OracleTableID = #{oracleTableID,jdbcType=VARCHAR},
+      </if>
     </set>
     where SiteID = #{siteID,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hz.employmentsite.model.PcSite">
     update pc_site
-    set SiteCode      = #{siteCode,jdbcType=VARCHAR},
-        RegionCode    = #{regionCode,jdbcType=VARCHAR},
-        StreetCode    = #{streetCode,jdbcType=VARCHAR},
-        DetailAddress = #{detailAddress,jdbcType=VARCHAR},
-        SiteX         = #{siteX,jdbcType=VARCHAR},
-        SiteY         = #{siteY,jdbcType=VARCHAR},
-        SiteLongitude = #{siteLongitude,jdbcType=DOUBLE},
-        SiteLatitude  = #{siteLatitude,jdbcType=DOUBLE},
-        SiteName      = #{siteName,jdbcType=VARCHAR},
-        FzrName       = #{fzrName,jdbcType=VARCHAR},
-        FzrMobile     = #{fzrMobile,jdbcType=VARCHAR},
-        CreateUserID  = #{createUserID,jdbcType=VARCHAR},
-        CreateTime    = #{createTime,jdbcType=TIMESTAMP},
-        ModifyUserID  = #{modifyUserID,jdbcType=VARCHAR},
-        ModifyTime    = #{modifyTime,jdbcType=TIMESTAMP},
-        Remark        = #{remark,jdbcType=VARCHAR}
+    set SiteCode = #{siteCode,jdbcType=VARCHAR},
+      RegionCode = #{regionCode,jdbcType=VARCHAR},
+      StreetCode = #{streetCode,jdbcType=VARCHAR},
+      DetailAddress = #{detailAddress,jdbcType=VARCHAR},
+      SiteX = #{siteX,jdbcType=VARCHAR},
+      SiteY = #{siteY,jdbcType=VARCHAR},
+      SiteLongitude = #{siteLongitude,jdbcType=DOUBLE},
+      SiteLatitude = #{siteLatitude,jdbcType=DOUBLE},
+      SiteName = #{siteName,jdbcType=VARCHAR},
+      FzrName = #{fzrName,jdbcType=VARCHAR},
+      FzrMobile = #{fzrMobile,jdbcType=VARCHAR},
+      CreateUserID = #{createUserID,jdbcType=VARCHAR},
+      CreateTime = #{createTime,jdbcType=TIMESTAMP},
+      ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
+      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
+      Remark = #{remark,jdbcType=VARCHAR},
+      OracleTableID = #{oracleTableID,jdbcType=VARCHAR}
     where SiteID = #{siteID,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -3,29 +3,30 @@
 <mapper namespace="com.hz.employmentsite.oraclemapper.cquery.GigMarketCQuery">
     <select id="getList" resultType="com.hz.employmentsite.vo.companyService.GigMarketVo">
         SELECT
-            lgsc.BCB906,
+            lgsc.*,
             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
+            jsfsDic.DETAIL AS BAD002Name,
+            xzdwDic.DETAIL AS BCD182Name,
+            gzddDic.DETAIL AS ACB204Name
         FROM
             CB28 lgsc
-            LEFT JOIN CBD5 qyxx ON lgsc.BBB911 = qyxx.BBB911
+            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'
+            LEFT JOIN S_SG_DICT xzdwDic ON lgsc.BCD182 = xzdwDic.CODE AND xzdwDic.KIND_CODE = 'BCD182'
+            LEFT JOIN S_SG_DICT gzddDic ON lgsc.ACB204 = gzddDic.CODE AND gzddDic.KIND_CODE = 'ACB204'
         where 1=1
+        <if test="gigMarketIDList!='' and gigMarketIDList!=null">
+            and lgsc.BCB906 in (${gigMarketIDList})
+        </if>
         <if test="AAB004!='' and AAB004!=null">
             and qyxx.AAB004 like '%' || #{AAB004} || '%'
         </if>

vue/src/api/companyService/gigMarket.ts

@@ -12,3 +12,16 @@ export function getGigMarketList(params: any) {
     },
   );
 }
+
+export function getGigMarketByID(id: any) {
+  return request<object>(
+    {
+      url: "gigMarket/getGigMarketByID",
+      method: 'get',
+      params: {id},
+    },
+    {
+      isNew: true,
+    },
+  );
+}

vue/src/views/baseSettings/siteInfo/detail.vue

@@ -10,6 +10,7 @@
       <a-descriptions-item label="详细地址">{{ siteInfo.detailAddress }}</a-descriptions-item>
       <a-descriptions-item label="站点负责人">{{ siteInfo.fzrName }}</a-descriptions-item>
       <a-descriptions-item label="联系电话">{{ siteInfo.fzrMobile }}</a-descriptions-item>
+      <a-descriptions-item label="站点ID">{{ siteInfo.oracleTableID }}</a-descriptions-item>
       <a-descriptions-item label="最后更新人">
         {{ siteInfo.modifyUserName }}
       </a-descriptions-item>
@@ -54,7 +55,8 @@ const siteInfo = reactive({
   siteLatitude: "",
   remark: "",
   modifyUserName: "",
-  modifyTime: ""
+  modifyTime: "",
+  oracleTableID: ""
 })
 // 站点人员查询数据
 const siteUserSearchParams = reactive({

vue/src/views/baseSettings/siteInfo/edit.vue

@@ -58,6 +58,12 @@
             <a-input v-model:value="dataModel.fzrMobile" placeholder=""/>
           </a-form-item>
         </a-col>
+        <a-col :span="8">
+          <a-form-item label="站点ID" name="oracleTableID" :label-col="{span:7}">
+            <label v-if="opCategory==3">{{ dataModel.oracleTableID }}</label>
+            <a-input v-model:value="dataModel.oracleTableID" placeholder=""/>
+          </a-form-item>
+        </a-col>
       </a-row>
       <a-row type="flex">
       </a-row>

vue/src/views/companyService/gigMarket/detail.vue

@@ -1,11 +1,79 @@
 <template>
-  <div>
-    零工市场详情
+  <div class="card-edit">
+    <a-divider orientation="left">零工岗位信息</a-divider>
+    <a-descriptions bordered>
+      <a-descriptions-item label="雇主名称">{{ gigMarketInfo.AAB004 }}</a-descriptions-item>
+      <a-descriptions-item label="统一社会信用代码">{{ gigMarketInfo.AAB998 }}</a-descriptions-item>
+      <a-descriptions-item label="工种类型">{{ gigMarketInfo.BDZDB3Name }}</a-descriptions-item>
+      <a-descriptions-item label="岗位名称">{{ gigMarketInfo.BCE055 }}</a-descriptions-item>
+      <a-descriptions-item label="薪资上限">{{ gigMarketInfo.ACB242 }}</a-descriptions-item>
+      <a-descriptions-item label="薪资下限">{{ gigMarketInfo.ACB241 }}</a-descriptions-item>
+      <a-descriptions-item label="结算方式">{{ gigMarketInfo.BAD002Name }}</a-descriptions-item>
+      <a-descriptions-item label="薪资单位">{{ gigMarketInfo.BCD182Name }}</a-descriptions-item>
+      <a-descriptions-item label="招聘人数">{{ gigMarketInfo.ACB240 }}</a-descriptions-item>
+      <a-descriptions-item label="联系人">{{ gigMarketInfo.AAE004 }}</a-descriptions-item>
+      <a-descriptions-item label="联系电话">{{ gigMarketInfo.AAE005 }}</a-descriptions-item>
+      <a-descriptions-item label="发布有效期">
+        {{ gigMarketInfo.BZE321 ? dayjs(gigMarketInfo.BZE321).format('YYYY-MM-DD') : '' }}
+      </a-descriptions-item>
+      <a-descriptions-item label="工作描述" span="3">
+        {{ gigMarketInfo.ACB22A }}
+      </a-descriptions-item>
+      <a-descriptions-item label="工作地点" span="3">
+        {{ gigMarketInfo.ACB204Name }}
+      </a-descriptions-item>
+      <a-descriptions-item label="联系地址" span="3">
+        {{ gigMarketInfo.ACC530 }}
+      </a-descriptions-item>
+    </a-descriptions>
   </div>
 </template>
 
 <script setup lang="ts">
+// 企业信息
+import {onMounted, reactive} from "vue";
+import {getGigMarketByID} from "@/api/companyService/gigMarket";
+import dayjs from "dayjs";
 
+const gigMarketInfo = reactive({
+  AAB004: "",
+  AAB998: "",
+  BGB249: "",
+  BDZDB3Name: "",
+  BCE055: "",
+  ACB241: "",
+  ACB242: "",
+  BAD002Name: "",
+  BCD182Name: "",
+  ACB240: "",
+  AAE004: "",
+  AAE005: "",
+  BZE321: "",
+  ACB22A: "",
+  ACB204Name: "",
+  ACC530: ""
+})
+
+// 数据加载
+function loadData(id: any) {
+  getGigMarketByID(id).then(result => {
+    Object.keys(gigMarketInfo).forEach(key => {
+      gigMarketInfo[key] = result[key]
+    })
+  })
+}
+
+onMounted(() => {
+  const id = history.state.params?.id;
+  loadData(id);
+})
+</script>
+
+<script lang="ts">
+// 设置页面名称进行组件缓存
+export default {
+  name: "GigMarketDetail"
+}
 </script>
 
 <style scoped>

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

@@ -75,7 +75,16 @@
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="所属驿站" :label-col="{span:6}" name="siteID">
+          <a-form-item label="所属驿站" :label-col="{span:6}" name="BCB687">
+            <a-select
+              ref="select"
+              v-model:value="searchParams.BCB687"
+              :options="siteList"
+              :field-names="{ label: 'siteName', value: 'oracleTableID' }"
+              :allow-clear="true"
+              @change="loadData"
+            >
+            </a-select>
           </a-form-item>
         </a-col>
       </a-row>
@@ -95,8 +104,6 @@
       <a-table :columns="columns" :data-source="dataList" :scroll="{ x:'100%', y: 500 }" :pagination="pagination"
                :loading="formState.loading"
                @change="handleTableChange"
-               :row-selection="{ selectedRowKeys: formState.selectedRowKeys, onChange: onSelectChange}"
-               :row-key="record=>record.companyID"
                bordered>
         <template #bodyCell="{ column, text, record }">
           <template v-if="column.key === 'ACB241'">
@@ -125,6 +132,8 @@ import {getPaginationTotalTitle} from "@/utils/common";
 import {getGigMarketList} from "@/api/companyService/gigMarket";
 import type {FormInstance, SelectProps, TableProps} from "ant-design-vue";
 import {getSgDictList} from "@/api/system/dictionary";
+import {getSiteList} from "@/api/baseSettings/siteInfo";
+import {useTabsViewStore} from "@/store/modules/tabsView";
 
 const formRef = ref<FormInstance>(null);
 const expand = ref(false);
@@ -137,6 +146,7 @@ const searchParams = reactive({
   ACB241: "",
   ACB242: "",
   BAD002: "",
+  BCB687: "",
 });
 // 原始表格定义数据
 const originalColumns = [
@@ -191,6 +201,9 @@ const formState = reactive({
 const sshyList = ref<SelectProps['options']>();
 // 结算方式字典列表
 const jsfsList = ref<SelectProps['options']>();
+// 驿站列表
+const siteList = ref<Array<any>>([])
+const tabsViewStore = useTabsViewStore();
 
 // 数据加载
 async function loadData() {
@@ -210,7 +223,7 @@ function onSearch() {
 
 // 查看详情
 function onDetail(record) {
-  console.log(record)
+  tabsViewStore.addTabByPath('/companyService/gigMarket/detail', {id: record.BCB906});
 }
 
 // 字段展示列选择完毕
@@ -245,6 +258,16 @@ function showSalary(minSalary: any, maxSalary: any, jsfs: any) {
   }
 }
 
+function getAllSites() {
+  getSiteList({
+    pageIndex: 1,
+    pageSize: 9999
+  }).then((result: any) => {
+    siteList.value = result.list;
+  })
+}
+
+
 onMounted(() => {
   getSgDictList("AAB022").then((result) => {
     sshyList.value = result;
@@ -252,10 +275,18 @@ onMounted(() => {
   getSgDictList("BAD002").then((result) => {
     jsfsList.value = result;
   })
+  getAllSites();
   onSearch();
 })
 </script>
 
+<script lang="ts">
+// 设置页面名称进行组件缓存
+export default {
+  name: "GigMarketIndex"
+}
+</script>
+
 <style scoped>
 
 </style>