web、app-企业表新增注册资本类型字段，字典表新增注册资本类型字典

doc/待更新脚本.txt

@@ -1,4 +1,16 @@
 -- 2024-6-17 求职人员统计菜单与权限数据
 INSERT INTO sys_function_code VALUES ('T010504', '求职人员统计', 'T0105', 4);
 INSERT INTO `sys_menu` VALUES ('T010504', 4, '求职人员统计', NULL, 'views/statistics/JobUserCount', '/JobUserCount', 'T0105', NULL, 0, 1, 1, 'T010504', 1, NULL,NULL);
-insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T010504');
+insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T010504');
+
+-- 2024.06.18 企业表新增注册资本类型字段，字典表新增注册资本类型字典
+insert into sys_dictionary values ('RegisteredCapitalType','注册资本类型','10','1');
+INSERT INTO sys_dictionary_item  VALUES (uuid(), '', 'RegisteredCapitalType', 1, '万元(人民币)', 10, 1, 0),
+(uuid(), '', 'RegisteredCapitalType', 2, '万元(港币)', 20, 1, 0),
+       (uuid(), '', 'RegisteredCapitalType', 3, '万元(美元)', 30, 1, 0),
+       (uuid(), '', 'RegisteredCapitalType', 4, '万元(欧元)', 40, 1, 0),
+       (uuid(), '', 'RegisteredCapitalType', 5, '万元(日元)', 50, 1, 0),
+       (uuid(), '', 'RegisteredCapitalType', 6, '万元(其他)', 60, 1, 0);
+
+alter table pc_company add column RegisteredCapitalType int  comment '注册资本类型' AFTER RegisteredCapital;
+update pc_company set RegisteredCapitalType =1

h5app/src/views/pages/company/edit.vue

@@ -161,10 +161,19 @@
                 </ion-modal>
             </div>
             <div class="form-input" >
-              <ion-label>注册资本(万元)</ion-label>
-              <ion-input placeholder="请输入注册资本" label-placement="stacked" :clear-input="true"
-                         v-model="dataModel.registeredCapital" class="custom">
-              </ion-input>
+              <ion-label>注册资本</ion-label>
+              <div>
+                <ion-input placeholder="请输入注册资本" label-placement="stacked" :clear-input="true"
+                           v-model="dataModel.registeredCapital" class="custom" style="width:60%;float:left;">
+                </ion-input>
+                <ion-select id="registeredCapitalType" name="registeredCapitalType" cancel-text="取消"  v-model="dataModel.registeredCapitalType"
+                            interface="action-sheet" style="width: 40%;text-align: left;">
+                  <ion-select-option v-for="(record,key) in registeredCapitalTypeList" :key="key"
+                                     v-model:value="record.value">
+                    {{ record.name }}
+                  </ion-select-option>
+                </ion-select>
+              </div>
             </div>
             <div class="form-select">
               <ion-label>企业注册地址行政区划</ion-label>
@@ -429,6 +438,7 @@ export default defineComponent({
     const streetList = ref<any>([]);
     const siteList = ref<any>([]);
     const shortAgeTypeList = ref<any>([]);
+    const registeredCapitalTypeList = ref<any>([]);
     const refCompanySelectionLike = ref();
     const refLabelSelection = ref();
 
@@ -499,6 +509,12 @@ export default defineComponent({
       shortAgeTypeList.value = shortAgeTypeResult;
     }
 
+    const getRegisteredCapitalTypeList = async function(){
+      const registeredCapitalTypeResult :any = await getSysDictionaryList("registeredCapitalType");
+      registeredCapitalTypeList.value = registeredCapitalTypeResult;
+    }
+
+
     function isStringInteger(value: string) {
       const n = parseInt(value, 10);
       return n.toString() === value && Number.isInteger(n);
@@ -795,6 +811,7 @@ export default defineComponent({
       regionList,
       streetList,
       shortAgeTypeList,
+      registeredCapitalTypeList,
       companyStatusList,
       companyModelList,
       companyTagList,
@@ -818,6 +835,7 @@ export default defineComponent({
       getCompanyTagList,
       getEstateCategoryList,
       getShortAgeTypeList,
+      getRegisteredCapitalTypeList,
       getRegionListData,
       getSiteListData,
       changeCity,
@@ -832,6 +850,7 @@ export default defineComponent({
     this.getCompanyStatusList();
     this.getEstateCategoryList();
     this.getShortAgeTypeList();
+    this.getRegisteredCapitalTypeList();
     this.getRegionListData();
     this.getSiteListData();
   }

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

@@ -159,10 +159,19 @@
               </div>
             </div>
             <div class="form-input" >
-              <ion-label>注册资本(万元)</ion-label>
-              <ion-input placeholder="请输入注册资本" label-placement="stacked" :clear-input="true"
-                         v-model="dataModel.registeredCapital" class="custom">
-              </ion-input>
+              <ion-label>注册资本</ion-label>
+              <div>
+                <ion-input placeholder="请输入注册资本" label-placement="stacked" :clear-input="true"
+                           v-model="dataModel.registeredCapital" class="custom" style="width:60%;float:left;">
+                </ion-input>
+                <ion-select id="registeredCapitalType" name="registeredCapitalType" cancel-text="取消"  v-model="dataModel.registeredCapitalType"
+                            interface="action-sheet" style="width: 40%;text-align: left;">
+                  <ion-select-option v-for="(record,key) in registeredCapitalTypeList" :key="key"
+                                     v-model:value="record.value">
+                    {{ record.name }}
+                  </ion-select-option>
+                </ion-select>
+              </div>
             </div>
             <div class="form-select">
               <ion-label>企业注册地址行政区划</ion-label>
@@ -403,6 +412,7 @@ export default defineComponent({
     const streetList = ref<any>([]);
     const siteList = ref<any>([]);
     const shortAgeTypeList = ref<any>([]);
+    const registeredCapitalTypeList = ref<any>([]);
     const refCompanySelectionLike = ref();
 
     const getCompanyModelList = async function(){
@@ -435,6 +445,11 @@ export default defineComponent({
       shortAgeTypeList.value = shortAgeTypeResult;
     }
 
+    const getRegisteredCapitalTypeList = async function(){
+      const registeredCapitalTypeResult :any = await getSysDictionaryList("registeredCapitalType");
+      registeredCapitalTypeList.value = registeredCapitalTypeResult;
+    }
+
     function isStringInteger(value: string) {
       const n = parseInt(value, 10);
       return n.toString() === value && Number.isInteger(n);
@@ -717,6 +732,7 @@ export default defineComponent({
       regionList,
       streetList,
       shortAgeTypeList,
+      registeredCapitalTypeList,
       companyStatusList,
       companyModelList,
       companyTagList,
@@ -739,6 +755,7 @@ export default defineComponent({
       getCompanyTagList,
       getEstateCategoryList,
       getShortAgeTypeList,
+      getRegisteredCapitalTypeList,
       getRegionListData,
       getSiteListData,
       changeCity,
@@ -753,6 +770,7 @@ export default defineComponent({
     this.getCompanyStatusList();
     this.getEstateCategoryList();
     this.getShortAgeTypeList();
+    this.getRegisteredCapitalTypeList();
     this.getRegionListData();
     this.getSiteListData();
   }

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

@@ -87,6 +87,7 @@ public class CompanyController {
             data.setEstablishmentTime(new Date());
             data.isShortage = 1;
             data.recordStatus = 1;
+            data.registeredCapitalType = 1;
             PcSiteUserExample siteUserExp = new PcSiteUserExample();
             PcSiteUserExample.Criteria siteUserCro = siteUserExp.createCriteria();
             siteUserCro.andUserIDEqualTo(loginUserID);

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

@@ -58,6 +58,8 @@ public class PcCompany {
 
     private BigDecimal registeredCapital;
 
+    private Integer registeredCapitalType;
+
     private String signInPoliticalArea;
 
     private String industryID;
@@ -286,6 +288,14 @@ public class PcCompany {
         this.registeredCapital = registeredCapital;
     }
 
+    public Integer getRegisteredCapitalType() {
+        return registeredCapitalType;
+    }
+
+    public void setRegisteredCapitalType(Integer registeredCapitalType) {
+        this.registeredCapitalType = registeredCapitalType;
+    }
+
     public String getSignInPoliticalArea() {
         return signInPoliticalArea;
     }

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

@@ -1896,6 +1896,66 @@ public class PcCompanyExample {
             return (Criteria) this;
         }
 
+        public Criteria andRegisteredCapitalTypeIsNull() {
+            addCriterion("RegisteredCapitalType is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalTypeIsNotNull() {
+            addCriterion("RegisteredCapitalType is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalTypeEqualTo(Integer value) {
+            addCriterion("RegisteredCapitalType =", value, "registeredCapitalType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalTypeNotEqualTo(Integer value) {
+            addCriterion("RegisteredCapitalType <>", value, "registeredCapitalType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalTypeGreaterThan(Integer value) {
+            addCriterion("RegisteredCapitalType >", value, "registeredCapitalType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("RegisteredCapitalType >=", value, "registeredCapitalType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalTypeLessThan(Integer value) {
+            addCriterion("RegisteredCapitalType <", value, "registeredCapitalType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("RegisteredCapitalType <=", value, "registeredCapitalType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalTypeIn(List<Integer> values) {
+            addCriterion("RegisteredCapitalType in", values, "registeredCapitalType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalTypeNotIn(List<Integer> values) {
+            addCriterion("RegisteredCapitalType not in", values, "registeredCapitalType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalTypeBetween(Integer value1, Integer value2) {
+            addCriterion("RegisteredCapitalType between", value1, value2, "registeredCapitalType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("RegisteredCapitalType not between", value1, value2, "registeredCapitalType");
+            return (Criteria) this;
+        }
+
         public Criteria andSignInPoliticalAreaIsNull() {
             addCriterion("SignInPoliticalArea is null");
             return (Criteria) this;

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

@@ -215,6 +215,7 @@ public class CompanyServiceImpl implements CompanyService {
                 dbData.setModifyUserID(userId);
                 dbData.setEstablishmentTime(data.getEstablishmentTime());
                 dbData.setRegisteredCapital(data.getRegisteredCapital());
+                dbData.setRegisteredCapitalType(data.getRegisteredCapitalType());
                 dbData.setSignInPoliticalArea(data.getSignInPoliticalArea());
                 dbData.setWebsite(data.getWebsite());
                 dbData.setBonus(data.getBonus());
@@ -250,6 +251,7 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setModifyUserID(userId);
             dbData.setEstablishmentTime(data.getEstablishmentTime());
             dbData.setRegisteredCapital(data.getRegisteredCapital());
+            dbData.setRegisteredCapitalType(data.getRegisteredCapitalType());
             dbData.setSignInPoliticalArea(data.getSignInPoliticalArea());
             dbData.setWebsite(data.getWebsite());
             dbData.setBonus(data.getBonus());

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

@@ -86,6 +86,7 @@ public class CompanyVo {
 
     public Date establishmentTime;
     public BigDecimal registeredCapital;
+    public Integer registeredCapitalType;
     public String signInPoliticalArea;
     public String signInPoliticalAreaName;
 

src/main/resources/mapping/PcCompanyMapper.xml

@@ -29,6 +29,7 @@
     <result column="openId" jdbcType="VARCHAR" property="openId" />
     <result column="EstablishmentTime" jdbcType="TIMESTAMP" property="establishmentTime" />
     <result column="RegisteredCapital" jdbcType="DECIMAL" property="registeredCapital" />
+    <result column="RegisteredCapitalType" jdbcType="INTEGER" property="registeredCapitalType" />
     <result column="SignInPoliticalArea" jdbcType="VARCHAR" property="signInPoliticalArea" />
     <result column="IndustryID" jdbcType="VARCHAR" property="industryID" />
     <result column="EstateCategoryID" jdbcType="INTEGER" property="estateCategoryID" />
@@ -102,8 +103,8 @@
     CompanyID, SiteID, RegionCode, InsuredCount, StreetCode, CompanyName, CompanyCode, 
     CompanyModel, WorkSituation, CompanyType, CompanyAddress, UserName, UserMobile, CompanyEmail, 
     FrName, ValidDate, IsShortage, RecordStatus, CreateUserID, CreateTime, ModifyUserID, 
-    ModifyTime, Longitude, Latitude, openId, EstablishmentTime, RegisteredCapital, SignInPoliticalArea, 
-    IndustryID, EstateCategoryID, TagID, Website, Bonus
+    ModifyTime, Longitude, Latitude, openId, EstablishmentTime, RegisteredCapital, RegisteredCapitalType, 
+    SignInPoliticalArea, IndustryID, EstateCategoryID, TagID, Website, Bonus
   </sql>
   <sql id="Blob_Column_List">
     BusinScope, CompanyDesc
@@ -166,9 +167,10 @@
       CreateUserID, CreateTime, ModifyUserID, 
       ModifyTime, Longitude, Latitude, 
       openId, EstablishmentTime, RegisteredCapital, 
-      SignInPoliticalArea, IndustryID, EstateCategoryID, 
-      TagID, Website, Bonus, 
-      BusinScope, CompanyDesc)
+      RegisteredCapitalType, SignInPoliticalArea, 
+      IndustryID, EstateCategoryID, TagID, 
+      Website, Bonus, BusinScope, 
+      CompanyDesc)
     values (#{companyID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{regionCode,jdbcType=VARCHAR}, 
       #{insuredCount,jdbcType=INTEGER}, #{streetCode,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
       #{companyCode,jdbcType=VARCHAR}, #{companyModel,jdbcType=INTEGER}, #{workSituation,jdbcType=VARCHAR}, 
@@ -178,9 +180,10 @@
       #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, 
       #{modifyTime,jdbcType=TIMESTAMP}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, 
       #{openId,jdbcType=VARCHAR}, #{establishmentTime,jdbcType=TIMESTAMP}, #{registeredCapital,jdbcType=DECIMAL}, 
-      #{signInPoliticalArea,jdbcType=VARCHAR}, #{industryID,jdbcType=VARCHAR}, #{estateCategoryID,jdbcType=INTEGER}, 
-      #{tagID,jdbcType=INTEGER}, #{website,jdbcType=VARCHAR}, #{bonus,jdbcType=VARCHAR}, 
-      #{businScope,jdbcType=LONGVARCHAR}, #{companyDesc,jdbcType=LONGVARCHAR})
+      #{registeredCapitalType,jdbcType=INTEGER}, #{signInPoliticalArea,jdbcType=VARCHAR}, 
+      #{industryID,jdbcType=VARCHAR}, #{estateCategoryID,jdbcType=INTEGER}, #{tagID,jdbcType=INTEGER}, 
+      #{website,jdbcType=VARCHAR}, #{bonus,jdbcType=VARCHAR}, #{businScope,jdbcType=LONGVARCHAR}, 
+      #{companyDesc,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     insert into pc_company
@@ -266,6 +269,9 @@
       <if test="registeredCapital != null">
         RegisteredCapital,
       </if>
+      <if test="registeredCapitalType != null">
+        RegisteredCapitalType,
+      </if>
       <if test="signInPoliticalArea != null">
         SignInPoliticalArea,
       </if>
@@ -373,6 +379,9 @@
       <if test="registeredCapital != null">
         #{registeredCapital,jdbcType=DECIMAL},
       </if>
+      <if test="registeredCapitalType != null">
+        #{registeredCapitalType,jdbcType=INTEGER},
+      </if>
       <if test="signInPoliticalArea != null">
         #{signInPoliticalArea,jdbcType=VARCHAR},
       </if>
@@ -489,6 +498,9 @@
       <if test="row.registeredCapital != null">
         RegisteredCapital = #{row.registeredCapital,jdbcType=DECIMAL},
       </if>
+      <if test="row.registeredCapitalType != null">
+        RegisteredCapitalType = #{row.registeredCapitalType,jdbcType=INTEGER},
+      </if>
       <if test="row.signInPoliticalArea != null">
         SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
       </if>
@@ -547,6 +559,7 @@
       openId = #{row.openId,jdbcType=VARCHAR},
       EstablishmentTime = #{row.establishmentTime,jdbcType=TIMESTAMP},
       RegisteredCapital = #{row.registeredCapital,jdbcType=DECIMAL},
+      RegisteredCapitalType = #{row.registeredCapitalType,jdbcType=INTEGER},
       SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
       IndustryID = #{row.industryID,jdbcType=VARCHAR},
       EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
@@ -588,6 +601,7 @@
       openId = #{row.openId,jdbcType=VARCHAR},
       EstablishmentTime = #{row.establishmentTime,jdbcType=TIMESTAMP},
       RegisteredCapital = #{row.registeredCapital,jdbcType=DECIMAL},
+      RegisteredCapitalType = #{row.registeredCapitalType,jdbcType=INTEGER},
       SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
       IndustryID = #{row.industryID,jdbcType=VARCHAR},
       EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
@@ -679,6 +693,9 @@
       <if test="registeredCapital != null">
         RegisteredCapital = #{registeredCapital,jdbcType=DECIMAL},
       </if>
+      <if test="registeredCapitalType != null">
+        RegisteredCapitalType = #{registeredCapitalType,jdbcType=INTEGER},
+      </if>
       <if test="signInPoliticalArea != null">
         SignInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
       </if>
@@ -734,6 +751,7 @@
       openId = #{openId,jdbcType=VARCHAR},
       EstablishmentTime = #{establishmentTime,jdbcType=TIMESTAMP},
       RegisteredCapital = #{registeredCapital,jdbcType=DECIMAL},
+      RegisteredCapitalType = #{registeredCapitalType,jdbcType=INTEGER},
       SignInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
       IndustryID = #{industryID,jdbcType=VARCHAR},
       EstateCategoryID = #{estateCategoryID,jdbcType=INTEGER},
@@ -772,6 +790,7 @@
       openId = #{openId,jdbcType=VARCHAR},
       EstablishmentTime = #{establishmentTime,jdbcType=TIMESTAMP},
       RegisteredCapital = #{registeredCapital,jdbcType=DECIMAL},
+      RegisteredCapitalType = #{registeredCapitalType,jdbcType=INTEGER},
       SignInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
       IndustryID = #{industryID,jdbcType=VARCHAR},
       EstateCategoryID = #{estateCategoryID,jdbcType=INTEGER},

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

@@ -160,8 +160,15 @@
             :label-col="{ span: 8 }"
             name="registeredCapital"
           >
-            <a-input-number :min="0" style="width: 100%" v-model:value="dataModel.registeredCapital" addon-after="万元"
+            <a-input-number :min="0" style="width: 60%;" v-model:value="dataModel.registeredCapital"
                             :controls="false"></a-input-number>
+            <a-select style="width:40%;" name="registeredCapitalType"
+              ref="select"
+              v-model:value="dataModel.registeredCapitalType"
+              :options="registeredCapitalTypeList"
+              :field-names="{ label: 'name', value: 'value' }"
+            >
+            </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="8">
@@ -469,6 +476,7 @@ export default defineComponent(
       //   showDateTime.value = dayjs(new Date().toLocaleDateString().replaceAll("/", "-"));
       // }
       const companyStatusList = ref<SelectProps['options']>();
+      const registeredCapitalTypeList = ref<SelectProps['options']>();
       const estateCategoryList = ref<SelectProps['options']>();
       const shortageStatusList = ref<SelectProps['options']>([
         {value: 1, name: '是'},
@@ -537,6 +545,11 @@ export default defineComponent(
         const data: any = await getSysDictionaryList("CompanyStatus");
         companyStatusList.value = data;
       }
+      const getRegisteredCapitalTypeList = async function () {
+        const data: any = await getSysDictionaryList("RegisteredCapitalType");
+        registeredCapitalTypeList.value = data;
+      }
+
 
       const getEstateCategoryList = async function () {
         const data: any = await getSysDictionaryList("CompanyEstateCategory");
@@ -727,6 +740,7 @@ export default defineComponent(
         getCompanyModelList();
         getCompanyTypeList();
         getCompanyStatusList();
+        getRegisteredCapitalTypeList();
         getEstateCategoryList();
         getFirstIndustryList();
         getInfo().then((loginUserInfo:any)=>{
@@ -809,6 +823,7 @@ export default defineComponent(
         companyTypeList,
         companyModelList,
         companyStatusList,
+        registeredCapitalTypeList,
         showDateTime,
         regionChange,
         setFileList,