web-相关bug问题调整处理

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

@@ -21,7 +21,7 @@ public class PcInstitution {
 
     private String companyDesc;
 
-    private String remaark;
+    private String remark;
 
     private String createUserID;
 
@@ -103,12 +103,12 @@ public class PcInstitution {
         this.companyDesc = companyDesc == null ? null : companyDesc.trim();
     }
 
-    public String getRemaark() {
-        return remaark;
+    public String getRemark() {
+        return remark;
     }
 
-    public void setRemaark(String remaark) {
-        this.remaark = remaark == null ? null : remaark.trim();
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
     }
 
     public String getCreateUserID() {

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

@@ -735,73 +735,73 @@ public class PcInstitutionExample {
             return (Criteria) this;
         }
 
-        public Criteria andRemaarkIsNull() {
-            addCriterion("Remaark is null");
+        public Criteria andRemarkIsNull() {
+            addCriterion("Remark is null");
             return (Criteria) this;
         }
 
-        public Criteria andRemaarkIsNotNull() {
-            addCriterion("Remaark is not null");
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("Remark is not null");
             return (Criteria) this;
         }
 
-        public Criteria andRemaarkEqualTo(String value) {
-            addCriterion("Remaark =", value, "remaark");
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("Remark =", value, "remark");
             return (Criteria) this;
         }
 
-        public Criteria andRemaarkNotEqualTo(String value) {
-            addCriterion("Remaark <>", value, "remaark");
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("Remark <>", value, "remark");
             return (Criteria) this;
         }
 
-        public Criteria andRemaarkGreaterThan(String value) {
-            addCriterion("Remaark >", value, "remaark");
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("Remark >", value, "remark");
             return (Criteria) this;
         }
 
-        public Criteria andRemaarkGreaterThanOrEqualTo(String value) {
-            addCriterion("Remaark >=", value, "remaark");
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("Remark >=", value, "remark");
             return (Criteria) this;
         }
 
-        public Criteria andRemaarkLessThan(String value) {
-            addCriterion("Remaark <", value, "remaark");
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("Remark <", value, "remark");
             return (Criteria) this;
         }
 
-        public Criteria andRemaarkLessThanOrEqualTo(String value) {
-            addCriterion("Remaark <=", value, "remaark");
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("Remark <=", value, "remark");
             return (Criteria) this;
         }
 
-        public Criteria andRemaarkLike(String value) {
-            addCriterion("Remaark like", value, "remaark");
+        public Criteria andRemarkLike(String value) {
+            addCriterion("Remark like", value, "remark");
             return (Criteria) this;
         }
 
-        public Criteria andRemaarkNotLike(String value) {
-            addCriterion("Remaark not like", value, "remaark");
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("Remark not like", value, "remark");
             return (Criteria) this;
         }
 
-        public Criteria andRemaarkIn(List<String> values) {
-            addCriterion("Remaark in", values, "remaark");
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("Remark in", values, "remark");
             return (Criteria) this;
         }
 
-        public Criteria andRemaarkNotIn(List<String> values) {
-            addCriterion("Remaark not in", values, "remaark");
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("Remark not in", values, "remark");
             return (Criteria) this;
         }
 
-        public Criteria andRemaarkBetween(String value1, String value2) {
-            addCriterion("Remaark between", value1, value2, "remaark");
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("Remark between", value1, value2, "remark");
             return (Criteria) this;
         }
 
-        public Criteria andRemaarkNotBetween(String value1, String value2) {
-            addCriterion("Remaark not between", value1, value2, "remaark");
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("Remark not between", value1, value2, "remark");
             return (Criteria) this;
         }
 

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

@@ -87,6 +87,7 @@ public class InstitutionImpl implements InstitutionService {
             dbData.setFrName(data.getFrName());
             dbData.setFrMobile(data.getFrMobile());
             dbData.setCompanyDesc(data.getCompanyDesc());
+            dbData.setRemark(data.getRemark());
             dbData.setCreateUserID(userId);
             dbData.setCreateTime(new Date());
             result = pcInstitutionMapper.insert(dbData);
@@ -100,6 +101,7 @@ public class InstitutionImpl implements InstitutionService {
             dbData.setFrName(data.frName);
             dbData.setFrMobile(data.frMobile);
             dbData.setCompanyDesc(data.companyDesc);
+            dbData.setRemark(data.remark);
             dbData.setModifyUserID(userId);
             dbData.setModifyTime(new Date());
             result = pcInstitutionMapper.updateByPrimaryKey(dbData);

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

@@ -12,6 +12,7 @@ public class InstitutionVo {
     public String companyName;
     public String companyAddress;
     public String companyDesc;
+    public String remark;
 
     public String fzrName;
     public String fzrMobile;

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

@@ -17,7 +17,9 @@ public class CompanyVo {
     public String companyName;
 
     public String companyCode;
+
     public Integer companyModel;
+    public String  companyModelType;
 
     public String companyModelStr;
 

src/main/resources/mapping/PcInstitutionMapper.xml

@@ -11,7 +11,7 @@
     <result column="FrMobile" jdbcType="VARCHAR" property="frMobile" />
     <result column="CompanyCode" jdbcType="VARCHAR" property="companyCode" />
     <result column="CompanyDesc" jdbcType="VARCHAR" property="companyDesc" />
-    <result column="Remaark" jdbcType="VARCHAR" property="remaark" />
+    <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" />
@@ -77,7 +77,7 @@
   </sql>
   <sql id="Base_Column_List">
     InstitutionID, CompanyName, CompanyAddress, FzrName, FzrMobile, FrName, FrMobile, 
-    CompanyCode, CompanyDesc, Remaark, CreateUserID, CreateTime, ModifyUserID, ModifyTime
+    CompanyCode, CompanyDesc, Remark, CreateUserID, CreateTime, ModifyUserID, ModifyTime
   </sql>
   <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcInstitutionExample" resultMap="BaseResultMap">
     select
@@ -113,12 +113,12 @@
     insert into pc_institution (InstitutionID, CompanyName, CompanyAddress, 
       FzrName, FzrMobile, FrName, 
       FrMobile, CompanyCode, CompanyDesc, 
-      Remaark, CreateUserID, CreateTime, 
+      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}, 
-      #{remaark,jdbcType=VARCHAR}, #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{remark,jdbcType=VARCHAR}, #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcInstitution">
@@ -151,8 +151,8 @@
       <if test="companyDesc != null">
         CompanyDesc,
       </if>
-      <if test="remaark != null">
-        Remaark,
+      <if test="remark != null">
+        Remark,
       </if>
       <if test="createUserID != null">
         CreateUserID,
@@ -195,8 +195,8 @@
       <if test="companyDesc != null">
         #{companyDesc,jdbcType=VARCHAR},
       </if>
-      <if test="remaark != null">
-        #{remaark,jdbcType=VARCHAR},
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
       </if>
       <if test="createUserID != null">
         #{createUserID,jdbcType=VARCHAR},
@@ -248,8 +248,8 @@
       <if test="row.companyDesc != null">
         CompanyDesc = #{row.companyDesc,jdbcType=VARCHAR},
       </if>
-      <if test="row.remaark != null">
-        Remaark = #{row.remaark,jdbcType=VARCHAR},
+      <if test="row.remark != null">
+        Remark = #{row.remark,jdbcType=VARCHAR},
       </if>
       <if test="row.createUserID != null">
         CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
@@ -279,7 +279,7 @@
       FrMobile = #{row.frMobile,jdbcType=VARCHAR},
       CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
       CompanyDesc = #{row.companyDesc,jdbcType=VARCHAR},
-      Remaark = #{row.remaark,jdbcType=VARCHAR},
+      Remark = #{row.remark,jdbcType=VARCHAR},
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
@@ -315,8 +315,8 @@
       <if test="companyDesc != null">
         CompanyDesc = #{companyDesc,jdbcType=VARCHAR},
       </if>
-      <if test="remaark != null">
-        Remaark = #{remaark,jdbcType=VARCHAR},
+      <if test="remark != null">
+        Remark = #{remark,jdbcType=VARCHAR},
       </if>
       <if test="createUserID != null">
         CreateUserID = #{createUserID,jdbcType=VARCHAR},
@@ -343,7 +343,7 @@
       FrMobile = #{frMobile,jdbcType=VARCHAR},
       CompanyCode = #{companyCode,jdbcType=VARCHAR},
       CompanyDesc = #{companyDesc,jdbcType=VARCHAR},
-      Remaark = #{remaark,jdbcType=VARCHAR},
+      Remark = #{remark,jdbcType=VARCHAR},
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},

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

@@ -2,16 +2,12 @@
 <!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.CompanyCQuery">
     <select id="getList" resultType="com.hz.employmentsite.vo.companyService.CompanyVo">
-
-        select company.*,city.name as regionName,area.name as streetName,
-        (select count(*) from pc_post where CompanyID=company.CompanyID) as postCount,u.`Name` as createUserName
-        from pc_company company
-        left join sys_user u
-        on u.UserID = company.CreateUserID
-        left join area_code city
-        on company.RegionCode = city.code
-        left join area_code area
-        on company.StreetCode = area.code
+        select company.*,city.name as regionName,area.name as streetName,sys_cmodel.Name as companyModelType,
+        (select count(*) from pc_post where CompanyID=company.CompanyID) as postCount,u.`Name` as createUserName from pc_company company
+        left join sys_user u on u.UserID = company.CreateUserID
+        left join (select * from sys_dictionary_item where DictionaryCode ='CompanyModel') sys_cmodel on company.CompanyModel = sys_cmodel.Value
+        left join area_code city on company.RegionCode = city.code
+        left join area_code area on company.StreetCode = area.code
         where 1=1
         <if test="primaryKey!='' and primaryKey!=null">
             and companyID = #{primaryKey}

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

@@ -98,12 +98,12 @@
       <a-divider orientation="left">其他</a-divider>
       <a-row>
         <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.companyDesc" :disabled="opCategory==3"
-                    placeholder="企业简介" style="text-align: center;" />
+                    placeholder="企业简介" style="text-align: left;vertical-align: middle;"/>
       </a-row>
       <a-row style="height: 10px"></a-row>
       <a-row>
-        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.remarkDesc"  :disabled="opCategory==3"
-                    placeholder="备注" style="text-align: center;" />
+        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.remark"  :disabled="opCategory==3"
+                    placeholder="备注" style="text-align: left;" />
       </a-row>
       <a-form-item class="buttom-btns">
         <a-button @click="onClose">取消</a-button>

vue/src/views/baseSettings/institution/index.vue

@@ -88,15 +88,15 @@ export default defineComponent({
       loading: false
     });
     const columns: TableColumnsType = [
-      {title: '序号', align: "center",key: 'institutionID',customRender: item => `${searchParams.pageSize * (searchParams.pageIndex - 1) + item.index + 1}`},
-      {title: '企业名称', dataIndex: 'companyName', key: 'companyName', align: "center"},
-      {title: '企业地址', dataIndex: 'companyAddress', key: 'companyAddress',width:120, align: "center"},
-      {title: '负责人姓名', dataIndex: 'fzrName', key: 'fzrName', align: "center"},
-      {title: '负责人电话', dataIndex: 'fzrMobile', key: 'fzrMobile', align: "center"},
-      {title: '法人姓名', dataIndex: 'frName', key: 'frName', align: "center"},
-      {title: '法人电话', dataIndex: 'frMobile', key: 'frMobile', align: "center"},
+      {title: '序号', align: "center",key: 'institutionID',width:50,customRender: item => `${searchParams.pageSize * (searchParams.pageIndex - 1) + item.index + 1}`},
+      {title: '企业名称', dataIndex: 'companyName', key: 'companyName',width:260, align: "center"},
+      {title: '企业地址', dataIndex: 'companyAddress', key: 'companyAddress',width:260, align: "center"},
+      {title: '负责人姓名', dataIndex: 'fzrName', key: 'fzrName',width:100, align: "center"},
+      {title: '负责人电话', dataIndex: 'fzrMobile', key: 'fzrMobile', width:110,align: "center"},
+      {title: '法人姓名', dataIndex: 'frName', key: 'frName',width:100, align: "center"},
+      {title: '法人电话', dataIndex: 'frMobile', key: 'frMobile',width:110, align: "center"},
       {title: '企业机构代码', dataIndex: 'companyCode', key: 'companyCode', align: "center"},
-      {title: '管理驿站数量', dataIndex: 'siteCount', key: 'siteCount', align: "center",
+      {title: '管理驿站数量', dataIndex: 'siteCount', key: 'siteCount', width:100,align: "center",
         /*customRender:  ({record}) => record.resolveDate == null?"":dayjs(record.resolveDate).format('YYYY-MM-DD')*/
       },
       {title: '操作', key: 'operation', fixed: 'right',width:170, align: "center"},

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

@@ -16,8 +16,8 @@
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="所属机构" name="institutionName" :label-col="{span:7}" :rules="[{ required: true, message: '请选择所属机构!' }]">
-            <label v-if="opCategory==3">{{dataModel.institutionName}}</label>
+          <a-form-item label="所属机构" name="institutionID" :label-col="{span:7}" :rules="[{ required: true, message: '请选择所属机构!' }]">
+            <label v-if="opCategory==3">{{dataModel.institutionID}}</label>
             <a-select  ref="select" v-model:value="dataModel.institutionID" :options="institutionList"
                       :field-names="{ label: 'text', value: 'value' }" :allow-clear="true" > </a-select>
           </a-form-item>

vue/src/views/baseSettings/siteInfo/index.vue

@@ -168,9 +168,11 @@ export default defineComponent({
     }
 
     const changeRegion = async function(){
-      const streetResult: any = await getStreetCodeList(searchParams.regionCode);
-      console.log('streetResult',streetResult);
-      streetList.value = streetResult;
+      if(searchParams.regionCode){
+        const streetResult: any = await getStreetCodeList(searchParams.regionCode);
+        console.log('streetResult',streetResult);
+        streetList.value = streetResult;
+      }
       onSearch();
     }
 

vue/src/views/companyService/company/edit.vue

@@ -46,10 +46,10 @@
           <a-form-item
             label="企业办公地址"
             :label-col="{ span: 8 }"
-            name="address"
+            name="companyAddress"
             :rules="[{ required: true, message: '请输入企业办公地址!' }]"
           >
-            <a-textarea v-model:value="dataModel.address" placeholder="" :rows="4"/>
+            <a-textarea v-model:value="dataModel.companyAddress" placeholder="" :rows="4"/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
@@ -128,14 +128,6 @@
                 />
               </a-radio>
             </a-radio-group>
-
-            <!--            <label v-if="!showPicker"-->
-            <!--                   style="float:left;line-height: 30px;height: 30px;font-size: 16px;">{{ dataModel.validTime }}</label>-->
-            <!--            -->
-            <!--            <div v-if="!showPicker"-->
-            <!--                 style="margin-left:10px;color:blue;float:left;line-height: 30px;height: 30px;font-size: 16px;"-->
-            <!--                 v-on:click="showDataPicker">选择有效期-->
-            <!--            </div>-->
           </a-form-item>
         </a-col>
         <a-col :span="8">
@@ -349,9 +341,9 @@ export default defineComponent(
       const onFinish = () => {
         console.log(showPicker.value);
         if (showPicker.value === '1') {
-          formState.dataModel.validTime = '2099-12-31';
+          formState.dataModel.validDate = '2099-12-31T00:00:00.000+08:00';
         } else {
-          formState.dataModel.validTime = showDateTime.value;
+          formState.dataModel.validDate = showDateTime.value;
         }
         save(formState.dataModel).then(result => {
           if (result) {
@@ -365,11 +357,12 @@ export default defineComponent(
         getCompanyModelList();
         getCompanyById(id).then(result => {
           formState.dataModel = result;
-          showPicker.value = formState.dataModel.validTime == '2099-12-31' ? '1' : '2';
+          console.log("curDataModel",formState.dataModel);
+          showPicker.value = formState.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 = formState.dataModel.validTime;
+            showDateTime.value = formState.dataModel.validDate;
           changeCity();
         })
       };

vue/src/views/companyService/company/index.vue

@@ -193,7 +193,7 @@ export default defineComponent({
         }
       },
       {title: '参保人数', dataIndex: 'insuredCount', key: 'insuredCount', width: 100,align: "center"},
-      {title: '企业规模', dataIndex: 'companyModel', key: 'companyModel',width: 140, align: "center"},
+      {title: '企业规模', dataIndex: 'companyModelType', key: 'companyModelType',width: 140, align: "center"},
       {title: '当前岗位数量', dataIndex: 'postCount', key: 'postCount', width: 120,align: "center"},
       {title: '录入人', dataIndex: 'createUserName', key: 'createUserName', width: 120,align: "center"},
       {
@@ -222,11 +222,13 @@ export default defineComponent({
     const tabsViewStore = useTabsViewStore();
 
     const changeCity = () => {
-      get('system/area/getAreaList', {code: searchParams.regionCode}).then(data => {
-        console.log(data);
-        streetList.value = data;
-        console.log(streetList.value);
-      })
+      if(searchParams.regionCode){
+        get('system/area/getAreaList', {code: searchParams.regionCode}).then(data => {
+          console.log(data);
+          streetList.value = data;
+          console.log(streetList.value);
+        })
+      }
       loadData();
     }
 

vue/src/views/companyService/post/index.vue

@@ -139,11 +139,11 @@ export default defineComponent({
     const postStatusList = [{name: '启用', value: 1}, {name: '停用', value: 0}];
     const importOptions = ref<ImportProps>({
       title: '导入',
-      url: 'companyService/post/importPost  ',
+      url: 'companyService/post/importPost',
       columns: [
         {cnName: '岗位名称', enName: 'postName', width: 100},
-        {cnName: '有效开始时间', enName: 'validTime', width: 100},
-        {cnName: '有效期(天)', enName: 'validDay', width: 100},
+        {cnName: '开始日期', enName: 'startTime', width: 100},
+        {cnName: '结束日期', enName: 'endTime', width: 100},
         {cnName: '岗位状态', enName: 'recordStatusName', width: 100},
         {cnName: '所属企业', enName: 'companyName', width: 100},
         {cnName: '工作性质', enName: 'workNature', width: 100},
@@ -184,11 +184,14 @@ export default defineComponent({
       {title: '岗位名称', dataIndex: 'postName', key: 'postName', align: "center"},
       {title: '招聘人数', dataIndex: 'recruitCount', key: 'recruitCount', width: 120, align: "center"},
       {
-        title: '有效开始日期', dataIndex: 'validTime', key: 'validTime', align: "center", customRender: (item) => {
-          return item.record.validTime == null ? "" : (dayjs(item.record.validTime).format('YYYY-MM-DD'))
+        title: '开始日期', dataIndex: 'startTime', key: 'startTime', align: "center", customRender: (item) => {
+          return item.record.startTime == null ? "" : (dayjs(item.record.startTime).format('YYYY-MM-DD'))
+        }
+      },
+      {title: '结束日期', dataIndex: 'endTime', key: 'endTime', align: "center",customRender: (item) => {
+          return item.record.endTime == null ? "" : (dayjs(item.record.endTime).format('YYYY-MM-DD'))
         }
       },
-      {title: '有效期(天)', dataIndex: 'validDay', key: 'validDay', align: "center"},
       {title: '招聘企业', dataIndex: 'companyName', key: 'companyName', align: "center"},
       {
         title: '岗位状态', dataIndex: 'recordStatus', key: 'recordStatus', align: "center", customRender: (item) => {

vue/src/views/taskAndLog/dowork/index.vue

@@ -177,9 +177,11 @@ export default defineComponent({
     }
 
     const changeRegion = async function(){
-      const streetResult: any = await getStreetCodeList(searchParams.regionCode);
-      console.log('streetResult',streetResult);
-      streetList.value = streetResult;
+      if(searchParams.regionCode){ 
+        const streetResult: any = await getStreetCodeList(searchParams.regionCode);
+        console.log('streetResult',streetResult);
+        streetList.value = streetResult;
+      }
       onSearch();
     }