Merge remote-tracking branch 'origin/master'

h5app/src/api/company/index.ts

@@ -113,6 +113,16 @@ export function saveCompanyInfo(data: any) {
     })
 }
 
+export function saveCompany(data: any) {
+    return request<object>({
+        url: 'companyService/company/saveCompany',
+        method: 'post',
+        data: data
+    }, {
+        isNew: true,
+    })
+}
+
 export function getCurrentDate() {
     const now = new Date();
     const year = now.getFullYear();

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

@@ -302,7 +302,14 @@ import {defineComponent, ref, reactive, computed, toRefs} from "vue";
 import {useRoute,useRouter} from "vue-router";
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import {useVuelidate} from "@vuelidate/core";
-import {getCompanyById,getRegionList, getSiteList, getStreeList,normalFirm,saveCompanyInfo} from "@/api/company";
+import {
+  getCompanyById,
+  getRegionList,
+  getSiteList,
+  getStreeList,
+  normalFirm,
+  saveCompany
+} from "@/api/company";
 import {required} from "@vuelidate/validators";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import dayjs from "dayjs";
@@ -589,7 +596,7 @@ export default defineComponent({
       companyCodeValidate();
       inputDataValidate();
       if(isAllowCommit.value){
-        saveCompanyInfo(formState.dataModel).then(result => {
+        saveCompany(formState.dataModel).then(result => {
           if (result) {
               router.push({path: './postList', query: {reload:1,id:formState.dataModel.companyID,status:3}});
           }

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

@@ -99,13 +99,18 @@ public class CompanyController {
         String loginUserID = data.loginUserID;
         try {
             loginUserID = accountService.getLoginUserID();
-        }
-        catch (Exception e){
+        } catch (Exception e) {
         }
         var result = companyService.save(data, loginUserID);
         return RespGenerstor.success(result);
     }
 
+    @PostMapping("/saveCompany")
+    public BaseResponse<Integer> saveCompany(@RequestBody CompanyVo data) {
+        var result = companyService.save(data, accountService.getLoginUserID());
+        return RespGenerstor.success(result);
+    }
+
     @ResponseBody
     @PostMapping("/delete")
     public BaseResponse<Integer> delete(@RequestBody List<String> ids) {

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

@@ -412,9 +412,19 @@ public class CompanyServiceImpl implements CompanyService {
 
         // 匹配数据
         companyVo.setFrName(pcFirm.getDbrName());
-        companyVo.setRegisteredCapital(Double.valueOf(pcFirm.getRegisteredCapital()));
+        if (pcFirm.getRegisteredCapital() != null && !pcFirm.getRegisteredCapital().trim().isBlank()) {
+            try {
+                companyVo.setRegisteredCapital(Double.valueOf(pcFirm.getRegisteredCapital()));
+            } catch (Exception e) {
+            }
+        }
         companyVo.setCompanyCode(pcFirm.getCompanyCode());
-        companyVo.setInsuredCount(Integer.valueOf(pcFirm.getInsuredCount()));
+        if (pcFirm.getInsuredCount() != null && !pcFirm.getInsuredCount().trim().isBlank()) {
+            try {
+                companyVo.setInsuredCount(Integer.valueOf(pcFirm.getInsuredCount()));
+            } catch (Exception e) {
+            }
+        }
         companyVo.setUserMobile(pcFirm.getLxMobile());
         companyVo.setCompanyEmail(pcFirm.getEmail());
         companyVo.setCompanyAddress(pcFirm.getLatestAddress());

vue/src/api/companyService/company.ts

@@ -36,6 +36,18 @@ export function save(data: any) {
   })
 }
 
+export function saveCompany(data: any) {
+  return request<object>({
+    url: 'companyService/company/saveCompany',
+    method: 'post',
+    data: data
+  }, {
+    isNew: true,
+    successMsg: '提交成功！',
+    errorMsg: '提交失败！'
+  })
+}
+
 export function del(ids) {
   return request<object>(
     {

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

@@ -398,7 +398,7 @@ import {useTabsViewStore} from '@/store/modules/tabsView';
 import type {SelectProps} from 'ant-design-vue';
 import BUploadFile from '@/components/file/uploadFile.vue';
 import {getRegionCodeList, getStreetCodeList} from "@/api/system/area/index";
-import {save, getCompanyById, normalFirmByCompanyName} from '@/api/companyService/company';
+import {getCompanyById, normalFirmByCompanyName, saveCompany} from '@/api/companyService/company';
 import {getSiteByID, getSiteList} from '@/api/baseSettings/siteInfo';
 import {getSysDictionaryList} from '@/api/system/dictionary';
 import {getInfo} from '@/api/account';
@@ -570,7 +570,7 @@ export default defineComponent(
         inputDataValidate();
         console.log("isAllowCommit",isAllowCommit.value);
         if(isAllowCommit.value){
-          save(formState.dataModel).then(result => {
+          saveCompany(formState.dataModel).then(result => {
             if (result) {
               tabsViewStore.closeCurrentTab(fullPath);
               tabsViewStore.addTabByPath('/companyService/enterprise/index', {reload: 1});