Merge branch 'master' of http://39.98.153.250:9080/bowintek/EmploymentSite

 Conflicts:

	doc/就业驿站管理系统.pdb

	doc/就业驿站管理系统.pdm

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

@@ -31,6 +31,12 @@ public class PcInstitution {
 
     private Date modifyTime;
 
+    private String signInPoliticalArea;
+
+    private Date validDate;
+
+    private Integer economicTypeID;
+
     public String getInstitutionID() {
         return institutionID;
     }
@@ -142,4 +148,28 @@ public class PcInstitution {
     public void setModifyTime(Date modifyTime) {
         this.modifyTime = modifyTime;
     }
+
+    public String getSignInPoliticalArea() {
+        return signInPoliticalArea;
+    }
+
+    public void setSignInPoliticalArea(String signInPoliticalArea) {
+        this.signInPoliticalArea = signInPoliticalArea;
+    }
+
+    public Date getValidDate() {
+        return validDate;
+    }
+
+    public void setValidDate(Date validDate) {
+        this.validDate = validDate;
+    }
+
+    public Integer getEconomicTypeID() {
+        return economicTypeID;
+    }
+
+    public void setEconomicTypeID(Integer economicTypeID) {
+        this.economicTypeID = economicTypeID;
+    }
 }

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

@@ -95,6 +95,9 @@ public class InstitutionImpl implements InstitutionService {
             dbData.setRemark(data.getRemark());
             dbData.setCreateUserID(userId);
             dbData.setCreateTime(new Date());
+            dbData.setSignInPoliticalArea(data.getSignInPoliticalArea());
+            dbData.setValidDate(data.getValidDate());
+            dbData.setEconomicTypeID(data.getEconomicTypeID());
             result = pcInstitutionMapper.insert(dbData);
         } else {
             //修改
@@ -109,6 +112,9 @@ public class InstitutionImpl implements InstitutionService {
             dbData.setRemark(data.remark);
             dbData.setModifyUserID(userId);
             dbData.setModifyTime(new Date());
+            dbData.setSignInPoliticalArea(data.signInPoliticalArea);
+            dbData.setValidDate(data.getValidDate());
+            dbData.setEconomicTypeID(data.getEconomicTypeID());
             result = pcInstitutionMapper.updateByPrimaryKey(dbData);
         }
         /*先删除所有关联数据，再添加*/

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

@@ -1,9 +1,10 @@
 package com.hz.employmentsite.vo.baseSettings;
 
+import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
 import lombok.Data;
+
 import java.sql.Date;
 import java.util.List;
-import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
 
 @Data
 public class InstitutionVo {
@@ -31,4 +32,10 @@ public class InstitutionVo {
     public String modifyUserID;
     public Date modifyTime;
 
+    public String signInPoliticalArea;
+    public java.util.Date validDate;
+
+    public Integer economicTypeID;
+    public String economicTypeName;
+
 }

src/main/resources/mapping/PcInstitutionMapper.xml

@@ -2,20 +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.PcInstitutionMapper">
   <resultMap id="BaseResultMap" type="com.hz.employmentsite.model.PcInstitution">
-    <id column="InstitutionID" jdbcType="VARCHAR" property="institutionID" />
-    <result column="CompanyName" jdbcType="VARCHAR" property="companyName" />
-    <result column="CompanyAddress" jdbcType="VARCHAR" property="companyAddress" />
-    <result column="FzrName" jdbcType="VARCHAR" property="fzrName" />
-    <result column="FzrMobile" jdbcType="VARCHAR" property="fzrMobile" />
-    <result column="FrName" jdbcType="VARCHAR" property="frName" />
-    <result column="FrMobile" jdbcType="VARCHAR" property="frMobile" />
-    <result column="CompanyCode" jdbcType="VARCHAR" property="companyCode" />
-    <result column="CompanyDesc" jdbcType="VARCHAR" property="companyDesc" />
-    <result column="Remark" jdbcType="VARCHAR" property="remark" />
-    <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" />
+    <id column="InstitutionID" jdbcType="VARCHAR" property="institutionID"/>
+    <result column="CompanyName" jdbcType="VARCHAR" property="companyName"/>
+    <result column="CompanyAddress" jdbcType="VARCHAR" property="companyAddress"/>
+    <result column="FzrName" jdbcType="VARCHAR" property="fzrName"/>
+    <result column="FzrMobile" jdbcType="VARCHAR" property="fzrMobile"/>
+    <result column="FrName" jdbcType="VARCHAR" property="frName"/>
+    <result column="FrMobile" jdbcType="VARCHAR" property="frMobile"/>
+    <result column="CompanyCode" jdbcType="VARCHAR" property="companyCode"/>
+    <result column="CompanyDesc" jdbcType="VARCHAR" property="companyDesc"/>
+    <result column="Remark" jdbcType="VARCHAR" property="remark"/>
+    <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="SignInPoliticalArea" jdbcType="VARCHAR" property="signInPoliticalArea"/>
+    <result column="EconomicTypeID" jdbcType="TIMESTAMP" property="economicTypeID"/>
+    <result column="ValidDate" jdbcType="INTEGER" property="validDate"/>
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -76,8 +79,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    InstitutionID, CompanyName, CompanyAddress, FzrName, FzrMobile, FrName, FrMobile, 
-    CompanyCode, CompanyDesc, Remark, CreateUserID, CreateTime, ModifyUserID, ModifyTime
+    InstitutionID
+    , CompanyName, CompanyAddress, FzrName, FzrMobile, FrName, FrMobile,
+    CompanyCode, CompanyDesc, Remark, CreateUserID, CreateTime, ModifyUserID,
+    ModifyTime,SignInPoliticalArea,EconomicTypeID,ValidDate
   </sql>
   <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcInstitutionExample" resultMap="BaseResultMap">
     select
@@ -110,16 +115,17 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.hz.employmentsite.model.PcInstitution">
-    insert into pc_institution (InstitutionID, CompanyName, CompanyAddress, 
-      FzrName, FzrMobile, FrName, 
-      FrMobile, CompanyCode, CompanyDesc, 
-      Remark, CreateUserID, CreateTime, 
-      ModifyUserID, ModifyTime)
-    values (#{institutionID,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{companyAddress,jdbcType=VARCHAR}, 
-      #{fzrName,jdbcType=VARCHAR}, #{fzrMobile,jdbcType=VARCHAR}, #{frName,jdbcType=VARCHAR}, 
-      #{frMobile,jdbcType=VARCHAR}, #{companyCode,jdbcType=VARCHAR}, #{companyDesc,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=VARCHAR}, #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP})
+    insert into pc_institution (InstitutionID, CompanyName, CompanyAddress,
+                                FzrName, FzrMobile, FrName,
+                                FrMobile, CompanyCode, CompanyDesc,
+                                Remark, CreateUserID, CreateTime,
+                                ModifyUserID, ModifyTime, SignInPoliticalArea, EconomicTypeID, ValidDate)
+    values (#{institutionID,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{companyAddress,jdbcType=VARCHAR},
+            #{fzrName,jdbcType=VARCHAR}, #{fzrMobile,jdbcType=VARCHAR}, #{frName,jdbcType=VARCHAR},
+            #{frMobile,jdbcType=VARCHAR}, #{companyCode,jdbcType=VARCHAR}, #{companyDesc,jdbcType=VARCHAR},
+            #{remark,jdbcType=VARCHAR}, #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+            #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{signInPoliticalArea,jdbcType=VARCHAR},
+            #{economicTypeID,jdbcType=INTEGER}, #{validDate,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcInstitution">
     insert into pc_institution
@@ -166,6 +172,15 @@
       <if test="modifyTime != null">
         ModifyTime,
       </if>
+      <if test="signInPoliticalArea != null">
+        SignInPoliticalArea,
+      </if>
+      <if test="validDate != null">
+        ValidDate,
+      </if>
+      <if test="economicTypeID != null">
+        EconomicTypeID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="institutionID != null">
@@ -210,6 +225,15 @@
       <if test="modifyTime != null">
         #{modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="signInPoliticalArea != null">
+        #{signInPoliticalArea,jdbcType=VARCHAR},
+      </if>
+      <if test="validDate != null">
+        #{validDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="economicTypeID != null">
+        #{economicTypeID,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hz.employmentsite.model.PcInstitutionExample" resultType="java.lang.Long">
@@ -263,6 +287,15 @@
       <if test="row.modifyTime != null">
         ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="row.signInPoliticalArea != null">
+        SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
+      </if>
+      <if test="row.validDate != null">
+        ValidDate = #{row.validDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="row.economicTypeID != null">
+        EconomicTypeID = #{row.economicTypeID,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -271,19 +304,22 @@
   <update id="updateByExample" parameterType="map">
     update pc_institution
     set InstitutionID = #{row.institutionID,jdbcType=VARCHAR},
-      CompanyName = #{row.companyName,jdbcType=VARCHAR},
-      CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
-      FzrName = #{row.fzrName,jdbcType=VARCHAR},
-      FzrMobile = #{row.fzrMobile,jdbcType=VARCHAR},
-      FrName = #{row.frName,jdbcType=VARCHAR},
-      FrMobile = #{row.frMobile,jdbcType=VARCHAR},
-      CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
-      CompanyDesc = #{row.companyDesc,jdbcType=VARCHAR},
-      Remark = #{row.remark,jdbcType=VARCHAR},
-      CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
-      CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
-      ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP}
+    CompanyName = #{row.companyName,jdbcType=VARCHAR},
+    CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
+    FzrName = #{row.fzrName,jdbcType=VARCHAR},
+    FzrMobile = #{row.fzrMobile,jdbcType=VARCHAR},
+    FrName = #{row.frName,jdbcType=VARCHAR},
+    FrMobile = #{row.frMobile,jdbcType=VARCHAR},
+    CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
+    CompanyDesc = #{row.companyDesc,jdbcType=VARCHAR},
+    Remark = #{row.remark,jdbcType=VARCHAR},
+    CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
+    CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
+    ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
+    ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
+    SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
+    ValidDate = #{row.validDate,jdbcType=TIMESTAMP},
+    EconomicTypeID = #{row.economicTypeID,jdbcType=INTEGER}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -330,24 +366,36 @@
       <if test="modifyTime != null">
         ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="signInPoliticalArea != null">
+        SignInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
+      </if>
+      <if test="validDate != null">
+        ValidDate = #{validDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="economicTypeID != null">
+        EconomicTypeID = #{economicTypeID,jdbcType=INTEGER},
+      </if>
     </set>
     where InstitutionID = #{institutionID,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hz.employmentsite.model.PcInstitution">
     update pc_institution
-    set CompanyName = #{companyName,jdbcType=VARCHAR},
-      CompanyAddress = #{companyAddress,jdbcType=VARCHAR},
-      FzrName = #{fzrName,jdbcType=VARCHAR},
-      FzrMobile = #{fzrMobile,jdbcType=VARCHAR},
-      FrName = #{frName,jdbcType=VARCHAR},
-      FrMobile = #{frMobile,jdbcType=VARCHAR},
-      CompanyCode = #{companyCode,jdbcType=VARCHAR},
-      CompanyDesc = #{companyDesc,jdbcType=VARCHAR},
-      Remark = #{remark,jdbcType=VARCHAR},
-      CreateUserID = #{createUserID,jdbcType=VARCHAR},
-      CreateTime = #{createTime,jdbcType=TIMESTAMP},
-      ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP}
+    set CompanyName         = #{companyName,jdbcType=VARCHAR},
+        CompanyAddress      = #{companyAddress,jdbcType=VARCHAR},
+        FzrName             = #{fzrName,jdbcType=VARCHAR},
+        FzrMobile           = #{fzrMobile,jdbcType=VARCHAR},
+        FrName              = #{frName,jdbcType=VARCHAR},
+        FrMobile            = #{frMobile,jdbcType=VARCHAR},
+        CompanyCode         = #{companyCode,jdbcType=VARCHAR},
+        CompanyDesc         = #{companyDesc,jdbcType=VARCHAR},
+        Remark              = #{remark,jdbcType=VARCHAR},
+        CreateUserID        = #{createUserID,jdbcType=VARCHAR},
+        CreateTime          = #{createTime,jdbcType=TIMESTAMP},
+        ModifyUserID        = #{modifyUserID,jdbcType=VARCHAR},
+        ModifyTime          = #{modifyTime,jdbcType=TIMESTAMP},
+        signInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
+        validDate           = #{validDate,jdbcType=TIMESTAMP},
+        economicTypeID      = #{economicTypeID,jdbcType=INTEGER}
     where InstitutionID = #{institutionID,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/mapping/cquery/InstitutionCQuery.xml

@@ -2,8 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hz.employmentsite.mapper.cquery.InstitutionCQuery">
     <select id="getList" resultType="com.hz.employmentsite.vo.baseSettings.InstitutionVo">
-        select institution.*,COUNT(inSites.siteInstitutionID)as siteCount from  pc_institution  institution
+        select institution.*,COUNT(inSites.siteInstitutionID)as siteCount, com_type.Name as economicTypeName
+        from pc_institution institution
         left join pc_site_institution inSites on institution.institutionID = inSites.institutionID
+        left join (select * from sys_dictionary_item where DictionaryCode ='CompanyType') com_type on
+        institution.EconomicTypeID = com_type.Value
         where 1 = 1
         <if test="institutionIDList!='' and institutionIDList!=null">
             and institution.institutionID in (${institutionIDList})

vue/src/views/baseSettings/institution/detail.vue

@@ -9,6 +9,11 @@
       <a-descriptions-item label="法人姓名">{{ institutionInfo.frName }}</a-descriptions-item>
       <a-descriptions-item label="法人电话">{{ institutionInfo.frMobile }}</a-descriptions-item>
       <a-descriptions-item label="企业机构代码">{{ institutionInfo.companyCode }}</a-descriptions-item>
+      <a-descriptions-item label="注册地行政区划">{{ institutionInfo.signInPoliticalArea }}</a-descriptions-item>
+      <a-descriptions-item label="经济类型">{{ institutionInfo.economicTypeName }}</a-descriptions-item>
+      <a-descriptions-item label="营业执照有效期">
+        {{ institutionInfo.validDate ? dayjs(institutionInfo.validDate).format('YYYY-MM-DD') : '' }}
+      </a-descriptions-item>
     </a-descriptions>
     <a-divider orientation="left">管理驿站 共计：{{ manageSiteList.length }}</a-divider>
     <a-table :columns="manageSitesTabColumns" :data-source="manageSiteList" :scroll="{ x:'100%', y: 200 }"
@@ -26,6 +31,7 @@
 import {onMounted, reactive, ref} from "vue";
 import {getInstitutionByID} from "@/api/baseSettings/institution";
 import {getListByInstitutionID} from "@/api/baseSettings/siteInfo";
+import dayjs from "dayjs";
 
 // 运营机构数据
 const institutionInfo = reactive({
@@ -38,6 +44,9 @@ const institutionInfo = reactive({
   companyCode: "",
   companyDesc: "",
   remark: "",
+  signInPoliticalArea: "",
+  validDate: "",
+  economicTypeName: ""
 })
 
 // 关联驿站表格定义

vue/src/views/baseSettings/institution/edit.vue

@@ -49,8 +49,56 @@
             <a-input v-model:value="dataModel.companyCode" placeholder=""/>
           </a-form-item>
         </a-col>
-        <a-col :span="7"></a-col>
-        <a-col :span="10"></a-col>
+        <a-col :span="7">
+          <a-form-item
+            label="经济类型"
+            :label-col="{ span: 7 }"
+            name="economicTypeID"
+          >
+            <a-select
+              ref="select"
+              style="width: 100%"
+              v-model:value="dataModel.economicTypeID"
+              :options="companyTypeList"
+              :field-names="{ label: 'name', value: 'value' }"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="注册地址行政区划"
+            :label-col="{ span: 8 }"
+            name="signInPoliticalArea"
+          >
+            <a-input v-model:value="dataModel.signInPoliticalArea"></a-input>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row type="flex">
+        <a-col :span="8">
+          <a-form-item
+            label="营业执照有效期"
+            :label-col="{ span: 8 }"
+            name="validDate"
+          >
+            <a-radio-group v-model:value="showPicker" name="showPicker">
+              <a-radio value="1">至长期</a-radio>
+              <a-radio value="2">
+                <a-date-picker
+                  v-model:value="showDateTime"
+                  picker="date"
+                  value-format="YYYY-MM-DD"
+                  :disabled="showPicker === '1'"
+                />
+              </a-radio>
+            </a-radio-group>
+          </a-form-item>
+        </a-col>
+        <a-col :span="7">
+        </a-col>
+        <a-col :span="8">
+        </a-col>
       </a-row>
       <a-divider orientation="left" v-if="opCategory==2">管理驿站 共计：{{manageSites.length}}</a-divider>
       <!--      <a-row>
@@ -119,8 +167,10 @@ import {useTabsViewStore} from "@/store/modules/tabsView";
 import {getInstitutionByID, saveInstitution} from "@/api/baseSettings/institution";
 import {getSiteList,getListByInstitutionID,getSiteByID} from "@/api/baseSettings/siteInfo";
 import BUploadFile from "@/components/file/uploadFile.vue";
-import {message, TableColumnsType, TableProps} from "ant-design-vue";
+import {message, type SelectProps, TableColumnsType, TableProps} from "ant-design-vue";
 import {getPaginationTotalTitle} from "@/utils/common";
+import {getSysDictionaryList} from "@/api/system/dictionary";
+import dayjs from "dayjs";
 
 interface InstitutionModel {
   dataModel: any;
@@ -173,14 +223,29 @@ export default defineComponent({
 
     const allSites = ref<any>([]);
     const manageSites = ref<any>([]);
+    const showPicker = ref('1');
+    const showDateTime = ref<any>();
+
+    const companyTypeList = ref<SelectProps['options']>();
+
+    const getCompanyTypeList = async function () {
+      const data: any = await getSysDictionaryList("CompanyType");
+      companyTypeList.value = data;
+    }
 
     const loadData = (institutionID: any,operateType:any) => {
       getAllSites();
+      getCompanyTypeList();
       opCategory.value = operateType;
       getInstitutionByID(institutionID).then((result: any) => {
         formData.dataModel = result;
-        //console.log('dataModel',formData.dataModel);
         GetManageSites(formData.dataModel.institutionID);
+        showPicker.value = formData.dataModel.validDate == '2099-12-31T00:00:00.000+08:00' ? '1' : '2';
+        if (showPicker.value === '1') {
+          showDateTime.value = dayjs(new Date().toLocaleDateString().replaceAll("/", "-"));
+        } else {
+          showDateTime.value = formData.dataModel.validDate;
+        }
       });
     }
 
@@ -253,7 +318,11 @@ export default defineComponent({
 
     const onFinish = () => {
       mobileValidate();
-      /*validateSameSite();*/
+      if (showPicker.value === '1') {
+        formData.dataModel.validDate = '2099-12-31T00:00:00.000+08:00';
+      } else {
+        formData.dataModel.validDate = showDateTime.value;
+      }
       if (isAllowCommit.value){
         formData.dataModel.manageSites = manageSites.value;
         saveInstitution(formData.dataModel).then(result => {
@@ -279,6 +348,9 @@ export default defineComponent({
       allSites,
       manageSites,
       isAllowCommit,
+      companyTypeList,
+      showPicker,
+      showDateTime,
       getAllSites,
       GetManageSites,
       /*addSite,