log(IcEnterpri

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java

@@ -76,6 +76,10 @@ public class IcEnterpriseChangeRecordEntity extends BaseEpmetEntity {
      */
 	private String scale;
 
+	/**
+	 * 规模，手输数字
+	 */
+	private Integer scaleTotal;
     /**
      * 场所负责人
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java

@@ -1,7 +1,6 @@
 package com.epmet.service.impl;
 
 import com.alibaba.excel.EasyExcel;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,7 +12,6 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.CommonOperateTypeEnum;
 import com.epmet.commons.tools.enums.CoveragePlaceTypeEnum;
-import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -534,13 +532,13 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
 
         CustomerGridEntity originGrid = customerGridDao.selectById(origin.getGridId());
 
-        Map<String, String> scaleMap;
+        /*Map<String, String> scaleMap;
         Result<Map<String, String>> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode());
         if (!result.success() || null == result.getData()) {
             throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result));
         } else {
             scaleMap = result.getData();
-        }
+        }*/
 
         if (formDTO != null) {
             if (!origin.getPlaceType().equals(formDTO.getPlaceType())) {
@@ -562,12 +560,16 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
             if (!origin.getPlaceOrgName().equals(formDTO.getPlaceOrgName())) {
                 record.setPlaceOrgName(origin.getPlaceOrgName().concat("->").concat(formDTO.getPlaceOrgName()));
             }
-            if (!origin.getScale().equals(formDTO.getScale())) {
+            /*if (!origin.getScale().equals(formDTO.getScale())) {
                 record.setScale(scaleMap.get(origin.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale())));
             } else {
                 record.setScale(scaleMap.get(origin.getScale()));
+            }*/
+            if (origin.getScaleTotal() != formDTO.getScaleTotal()) {
+                record.setScale(origin.getScaleTotal().toString().concat("->").concat(formDTO.getScaleTotal().toString()));
+            } else {
+                record.setScale(origin.getScaleTotal().toString());
             }
-
             if (!origin.getPersonInCharge().equals(formDTO.getPersonInCharge())) {
                 record.setPersonInCharge(origin.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge()));
             }
@@ -586,6 +588,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
         record.setUpdatedTime(null);
         record.setOriginId(origin.getId());
         record.setType(type);
+
         icEnterpriseChangeRecordService.insert(record);
     }