Merge remote-tracking branch 'origin/master'

h5app/public/appconfig.json

@@ -1,4 +1,4 @@
 {
   "isDev": true,
-  "webSiteUrl": "http://www.bowintek.com/hzyz/mobile/"
+  "webSiteUrl": "http://www.bowintek.com/hzyz/mobile"
 }

h5app/src/App.vue

@@ -32,6 +32,7 @@ ion-content {
 
 /*顶部导航白色背景主题样式*/
 .header-theme2 {
+  border-bottom: 1px solid #f1f5f7;
   background: white;
   text-align: center;
 
@@ -53,6 +54,10 @@ ion-content {
   }
 }
 
+.header-theme2::after{
+  background-image: none !important;
+}
+
 .grid-content {
   margin: 10px 10px;
   background-color: #f0f2f5;

h5app/src/router/index.ts

@@ -7,7 +7,7 @@ import TeacherTabsPage from '../views/tapp/tabsPage.vue';
 import DemoPage from '../views/pages/demo/edit.vue';
 import JobUserInfoIndex from '../views/pages/jobUserInfo/index.vue';
 import JobUserInfoUserEdit from '../views/pages/jobUserInfo/userEdit.vue';
-import JobUserInfoCompanyEdit from '../views/pages/jobUserInfo/userEdit.vue';
+import JobUserInfoCompanyEdit from '../views/pages/jobUserInfo/companyEdit.vue';
 
 const routes: Array<RouteRecordRaw> = [
     {

h5app/src/views/pages/jobUserInfo/companyEdit.vue

@@ -1,5 +1,37 @@
 <template>
-  <div>
-    companyeidt
-  </div>
-</template>
+  <ion-page class="list-page">
+    <ion-header class="header-theme2">
+      <ion-toolbar>
+        <ion-buttons slot="start">
+          <ion-icon :icon="arrowBackOutline" @click="onBack"></ion-icon>
+        </ion-buttons>
+        <ion-title>企业信息登记</ion-title>
+      </ion-toolbar>
+    </ion-header>
+    <ion-content>
+      companyInfoEidt
+    </ion-content>
+  </ion-page>
+</template>
+<script>
+import {defineComponent} from "vue";
+import {arrowBackOutline} from 'ionicons/icons';
+import {useRouter} from "vue-router";
+
+export default defineComponent({
+  name: "companyInfoEidt",
+  setup() {
+    const router = useRouter();
+    const onBack = () => {
+      router.push('/jobUserInfo/index');
+    }
+    return {
+      arrowBackOutline,
+      onBack
+    }
+  }
+});
+</script>
+<style lang="less">
+
+</style>

h5app/src/views/pages/jobUserInfo/index.vue

@@ -1,11 +1,11 @@
 <template>
   <ion-page class="list-page">
-    <ion-header class="header-theme2">
+    <ion-header class="header-theme2 header-theme3">
       <ion-toolbar>
         <ion-title>信息登记</ion-title>
       </ion-toolbar>
     </ion-header>
-    <ion-content class="qr_content">
+    <ion-content>
       <div class="bw-vue-form">
         <div class="form-detail">
           <ion-label>姓名</ion-label>
@@ -42,6 +42,7 @@ import {alertController} from "@ionic/vue";
 import {getUserByID} from "@/api/siteUserInfo";
 import {useRouter} from "vue-router";
 import {getWxOpenId} from "@/api/wechat";
+import {useUserStore} from "@/store/modules/user";
 
 
 const presentAlert = async (message) => {
@@ -63,24 +64,19 @@ export default defineComponent({
     const user = ref({userNo: '', name: '', IDCard: '', siteName: ''});
     const urlParams = getUrlParams();
     const userId = urlParams["userId"];
-    const openId = ref("");
+    const userStore = useUserStore();
 
     const getUser = async function () {
       const reqData = await getUserByID(userId);
       user.value = reqData;
     };
 
-    const getOpenId = async function () {
-      const reqData = await getWxOpenId();
-      openId.value = reqData;
-    };
-
     const onCompany = function () {
-      router.push({path: '/jobUserInfo/companyedit', query: {reload: 1, openId: openId.value}});
+      router.push({path: '/jobUserInfo/companyedit', query: {reload: 1, openId: userStore.getOpenId}});
     };
 
     const onJobUser = function () {
-      router.push({path: '/jobUserInfo/useredit', query: {reload: 1, openId: openId.value}});
+      router.push({path: '/jobUserInfo/useredit', query: {reload: 1, openId: userStore.getOpenId}});
     };
 
 
@@ -90,8 +86,6 @@ export default defineComponent({
       getUser();
     }
 
-    getOpenId();
-
     return {
       user,
       onCompany,
@@ -101,6 +95,10 @@ export default defineComponent({
 });
 </script>
 <style lang="less">
+.bw-vue-form{
+  padding: 20px 10px;
+}
+
 .page_button {
   display: flex;
   justify-content: space-around;
@@ -110,4 +108,10 @@ export default defineComponent({
     width: 150px;
   }
 }
+.header-theme3{
+  ion-title{
+    margin-left: 0px !important;
+  }
+}
+
 </style>

h5app/src/views/pages/jobUserInfo/userEdit.vue

@@ -1,5 +1,37 @@
 <template>
-  <div>
-    userEdit
-  </div>
-</template>
+  <ion-page class="list-page">
+    <ion-header class="header-theme2">
+      <ion-toolbar>
+        <ion-buttons slot="start">
+          <ion-icon :icon="arrowBackOutline" @click="onBack"></ion-icon>
+        </ion-buttons>
+        <ion-title>求职者信息登记</ion-title>
+      </ion-toolbar>
+    </ion-header>
+    <ion-content>
+      jobUserInfoEdit
+    </ion-content>
+  </ion-page>
+</template>
+<script>
+import {defineComponent} from "vue";
+import {arrowBackOutline} from 'ionicons/icons';
+import {useRouter} from "vue-router";
+
+export default defineComponent({
+  name: "jobUserInfoEdit",
+  setup() {
+    const router = useRouter();
+    const onBack = () => {
+      router.push('/jobUserInfo/index');
+    }
+    return {
+      arrowBackOutline,
+      onBack
+    }
+  }
+});
+</script>
+<style lang="less">
+
+</style>

src/main/java/com/hz/employmentsite/mapper/PcSiteUserMapper.java

@@ -2,9 +2,10 @@ package com.hz.employmentsite.mapper;
 
 import com.hz.employmentsite.model.PcSiteUser;
 import com.hz.employmentsite.model.PcSiteUserExample;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface PcSiteUserMapper {
     long countByExample(PcSiteUserExample example);
 
@@ -20,6 +21,8 @@ public interface PcSiteUserMapper {
 
     PcSiteUser selectByPrimaryKey(String siteUserID);
 
+    List<String> selectByMobile(@Param("mobile") String mobile);
+
     int updateByExampleSelective(@Param("row") PcSiteUser row, @Param("example") PcSiteUserExample example);
 
     int updateByExample(@Param("row") PcSiteUser row, @Param("example") PcSiteUserExample example);

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

@@ -17,6 +17,10 @@ public class PcSite {
 
     private String siteY;
 
+    private Double siteLongitude;
+
+    private Double siteLatitude;
+
     private String siteName;
 
     private String fzrName;
@@ -152,4 +156,20 @@ public class PcSite {
     public void setRemark(String remark) {
         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 void setSiteLatitude(Double siteLatitude) {
+        this.siteLatitude = siteLatitude;
+    }
 }

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

@@ -3,8 +3,8 @@ package com.hz.employmentsite.services.impl.baseSettings;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseException;
-import com.hz.employmentsite.mapper.PcSiteMapper;
 import com.hz.employmentsite.mapper.PcSiteInstitutionMapper;
+import com.hz.employmentsite.mapper.PcSiteMapper;
 import com.hz.employmentsite.mapper.PcSiteUserMapper;
 import com.hz.employmentsite.mapper.cquery.SiteInfoCQuery;
 import com.hz.employmentsite.mapper.cquery.SiteInstitutionCQuery;
@@ -12,7 +12,7 @@ import com.hz.employmentsite.model.*;
 import com.hz.employmentsite.services.service.baseSettings.SiteInfoService;
 import com.hz.employmentsite.util.StringUtils;
 import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
-import com.hz.employmentsite.vo.baseSettings.SiteUserVo; 
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -119,6 +119,8 @@ public class SiteInfoImpl implements SiteInfoService {
             dbData.setFzrMobile(data.getFzrMobile());
             dbData.setSiteX(data.getSiteX());
             dbData.setSiteY(data.getSiteY());
+            dbData.setSiteLongitude(data.getSiteLongitude());
+            dbData.setSiteLatitude(data.getSiteLatitude());
             dbData.setDetailAddress(data.getDetailAddress());
             dbData.setRegionCode(data.getRegionCode());
             dbData.setStreetCode(data.getStreetCode());
@@ -135,6 +137,8 @@ public class SiteInfoImpl implements SiteInfoService {
             dbData.setFzrMobile(data.fzrMobile);
             dbData.setSiteX(data.siteX);
             dbData.setSiteY(data.siteY);
+            dbData.setSiteLongitude(data.siteLongitude);
+            dbData.setSiteLatitude(data.siteLatitude);
             dbData.setDetailAddress(data.detailAddress);
             dbData.setRegionCode(data.regionCode);
             dbData.setStreetCode(data.streetCode);

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

@@ -2,6 +2,7 @@ package com.hz.employmentsite.services.impl.baseSettings;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hz.employmentsite.filter.exception.BaseException;
 import com.hz.employmentsite.mapper.PcSiteUserMapper;
 import com.hz.employmentsite.mapper.SysRoleMapper;
 import com.hz.employmentsite.mapper.SysUserMapper;
@@ -90,14 +91,23 @@ public class SiteUserImpl implements SiteUserService {
     @Override
     public Integer save(SiteUserVo data, String userId) {
         int result = 0;
+
+        // 手机号查重
+        List<String> byMobileSiteId = pcSiteUserMapper.selectByMobile(data.mobile);
+
         SiteUserVo record = get(data.siteUserID);
-        PcSiteUser dbData = record ==null ? null : pcSiteUserMapper.selectByPrimaryKey(record.siteUserID);
+        PcSiteUser dbData = record == null ? null : pcSiteUserMapper.selectByPrimaryKey(record.siteUserID);
         Boolean isExist = dbData != null;
-        SysUser curSysUserData = data.userID != null ? sysUserMapper.selectByPrimaryKey(data.userID):null;
+        SysUser curSysUserData = data.userID != null ? sysUserMapper.selectByPrimaryKey(data.userID) : null;
         Boolean isLinkUser = curSysUserData != null;
         SysRoleExample roleExp = null;
         /*注意：这里的data.roleID为用户类型ID*/
         if (!isExist) {
+            // 添加时有重复手机号立即报错
+            if (!byMobileSiteId.isEmpty()) {
+                throw new BaseException("500", "该手机号已绑定其他驿站人员");
+            }
+
             //添加
             //处理用户表
             curSysUserData = new SysUser();
@@ -125,9 +135,14 @@ public class SiteUserImpl implements SiteUserService {
             dbData.setCreateTime(new Date());
             result += pcSiteUserMapper.insert(dbData);
         } else {
+            // 修改时，ID列表中没有参数中的ID才报错
+            if (!byMobileSiteId.isEmpty() && !byMobileSiteId.contains(data.siteID)) {
+                throw new BaseException("500", "该手机号已绑定其他驿站人员");
+            }
+
             //修改
             //处理用户表
-            if(isLinkUser){
+            if (isLinkUser) {
                 curSysUserData.setName(data.siteUserName);
                 curSysUserData.setUserTypeID(data.roleID);
                 curSysUserData.setLoginID(StrToPinYin(data.siteUserName));

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

@@ -2,10 +2,11 @@ package com.hz.employmentsite.vo.baseSettings;
 
 import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
 import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.util.datarange.annotations.SiteID;
 import lombok.Data;
+
 import java.sql.Date;
 import java.util.List;
-import com.hz.employmentsite.util.datarange.annotations.SiteID;
 
 @Data
 public class SiteInfoVo {
@@ -24,6 +25,9 @@ public class SiteInfoVo {
     public String siteX;
     public String siteY;
 
+    public Double siteLongitude;
+    public Double siteLatitude;
+
     public String siteName;
     public String fzrName;
     public String fzrMobile;

src/main/resources/mapping/PcSiteMapper.xml

@@ -2,21 +2,23 @@
 <!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="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"/>
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -111,18 +113,18 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.hz.employmentsite.model.PcSite">
-    insert into pc_site (SiteID, SiteCode, RegionCode, 
-      StreetCode, DetailAddress, SiteX, 
-      SiteY, 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}, #{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)
+    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>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcSite">
     insert into pc_site
@@ -148,6 +150,12 @@
       <if test="siteY != null">
         SiteY,
       </if>
+      <if test="siteLongitude != null">
+        SiteLongitude,
+      </if>
+      <if test="siteLatitude != null">
+        SiteLatitude,
+      </if>
       <if test="siteName != null">
         SiteName,
       </if>
@@ -195,6 +203,12 @@
       <if test="siteY != null">
         #{siteY,jdbcType=VARCHAR},
       </if>
+      <if test="siteLongitude != null">
+        #{siteLongitude,jdbcType=DOUBLE},
+      </if>
+      <if test="siteLatitude != null">
+        #{siteLatitude,jdbcType=DOUBLE},
+      </if>
       <if test="siteName != null">
         #{siteName,jdbcType=VARCHAR},
       </if>
@@ -251,6 +265,12 @@
       <if test="row.siteY != null">
         SiteY = #{row.siteY,jdbcType=VARCHAR},
       </if>
+      <if test="row.siteLongitude != null">
+        SiteLongitude = #{row.siteLongitude,jdbcType=DOUBLE},
+      </if>
+      <if test="row.siteLatitude != null">
+        SiteLatitude = #{row.siteLatitude,jdbcType=DOUBLE},
+      </if>
       <if test="row.siteName != null">
         SiteName = #{row.siteName,jdbcType=VARCHAR},
       </if>
@@ -283,20 +303,22 @@
   <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},
-      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 = #{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}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -322,6 +344,12 @@
       <if test="siteY != null">
         SiteY = #{siteY,jdbcType=VARCHAR},
       </if>
+      <if test="row.siteLongitude != null">
+        SiteLongitude = #{row.siteLongitude,jdbcType=DOUBLE},
+      </if>
+      <if test="row.siteLatitude != null">
+        SiteLatitude = #{row.siteLatitude,jdbcType=DOUBLE},
+      </if>
       <if test="siteName != null">
         SiteName = #{siteName,jdbcType=VARCHAR},
       </if>
@@ -351,20 +379,22 @@
   </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},
-      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}
     where SiteID = #{siteID,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/mapping/PcSiteUserMapper.xml

@@ -322,17 +322,23 @@
   <update id="updateByPrimaryKey" parameterType="com.hz.employmentsite.model.PcSiteUser">
     update pc_site_user
     set SiteUserName = #{siteUserName,jdbcType=VARCHAR},
-      UserID = #{userID,jdbcType=VARCHAR},
-      SiteID = #{siteID,jdbcType=VARCHAR},
-      Gender = #{gender,jdbcType=INTEGER},
-      Mobile = #{mobile,jdbcType=VARCHAR},
-      RoleID = #{roleID,jdbcType=INTEGER},
-      CreateUserID = #{createUserID,jdbcType=VARCHAR},
-      CreateTime = #{createTime,jdbcType=TIMESTAMP},
-      UpdateBy = #{updateBy,jdbcType=VARCHAR},
-      UpdateTime = #{updateTime,jdbcType=TIMESTAMP},
-      UserNo = #{userNo,jdbcType=VARCHAR},
-      IDCard = #{IDCard,jdbcType=VARCHAR}
+        UserID       = #{userID,jdbcType=VARCHAR},
+        SiteID       = #{siteID,jdbcType=VARCHAR},
+        Gender       = #{gender,jdbcType=INTEGER},
+        Mobile       = #{mobile,jdbcType=VARCHAR},
+        RoleID       = #{roleID,jdbcType=INTEGER},
+        CreateUserID = #{createUserID,jdbcType=VARCHAR},
+        CreateTime   = #{createTime,jdbcType=TIMESTAMP},
+        UpdateBy     = #{updateBy,jdbcType=VARCHAR},
+        UpdateTime   = #{updateTime,jdbcType=TIMESTAMP},
+        UserNo       = #{userNo,jdbcType=VARCHAR},
+        IDCard       = #{IDCard,jdbcType=VARCHAR}
     where SiteUserID = #{siteUserID,jdbcType=VARCHAR}
   </update>
+
+  <select id="selectByMobile" resultType="String">
+    select SiteID
+    from pc_site_user
+    where mobile = #{mobile,jdbcType=VARCHAR}
+  </select>
 </mapper>

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

@@ -59,13 +59,27 @@
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="驿站坐标"  name="sitePosition" :label-col="{span:7}" :rules="[{ required: true, message: '请选择驿站坐标!' }]">
-            <label v-if="opCategory==3">{{dataModel.sitePosition}}</label>
-            <a-input v-model:value="dataModel.sitePosition" placeholder=""/>
+          <a-form-item label="经度"  name="siteLongitude" :label-col="{span:7}" :rules="[{ required: true, message: '请输入经度!' }]">
+            <label v-if="opCategory==3">{{dataModel.siteLongitude }}</label>
+            <a-input-number style="width: 100%" :controls="false" v-model:value="dataModel.siteLongitude" placeholder=""/>
           </a-form-item>
         </a-col>
-        <a-col :span="1">
-            <a-button type="primary"  @click='' >选择</a-button>
+<!--        <a-col :span="8">-->
+<!--          <a-form-item label="驿站坐标"  name="sitePosition" :label-col="{span:7}" :rules="[{ required: true, message: '请选择驿站坐标!' }]">-->
+<!--            <label v-if="opCategory==3">{{dataModel.sitePosition}}</label>-->
+<!--            <a-input v-model:value="dataModel.sitePosition" placeholder=""/>-->
+<!--          </a-form-item>-->
+<!--        </a-col>-->
+<!--        <a-col :span="1">-->
+<!--            <a-button type="primary"  @click='' >选择</a-button>-->
+<!--        </a-col>-->
+      </a-row>
+      <a-row type="flex">
+        <a-col :span="7">
+          <a-form-item label="纬度"  name="siteLatitude" :label-col="{span:7}" :rules="[{ required: true, message: '请输入站点负责人!' }]">
+            <label v-if="opCategory==3">{{dataModel.siteLatitude }}</label>
+            <a-input-number style="width: 100%" :controls="false" v-model:value="dataModel.siteLatitude" placeholder=""/>
+          </a-form-item>
         </a-col>
       </a-row>
 <!--      <a-divider orientation="left">管理人员 共计：{{manageUsers.length}}</a-divider>