Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -53,6 +53,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
@@ -181,6 +182,7 @@ public class CommonServiceImpl implements ICommonService {
     JgUseRegistrationServiceImpl jgUseRegistrationServiceImpl;
 
     @Autowired
+    @Lazy
     JgEquipTransferServiceImpl jgEquipTransferServiceImpl;
 
     @Autowired

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -1248,9 +1248,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         iIdxBizJgConstructionInfoService.saveOrUpdateData(constructionInfo);
 
         //注册登记
-        IdxBizJgRegisterInfo equipmentClassRegisterInfo = JSON.parseObject(JSON.toJSONString(equipmentClassForm), IdxBizJgRegisterInfo.class);
+        // IdxBizJgRegisterInfo equipmentClassRegisterInfo = JSON.parseObject(JSON.toJSONString(equipmentClassForm), IdxBizJgRegisterInfo.class);
         IdxBizJgRegisterInfo registerInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgRegisterInfo.class);
-        Bean.copyExistPropertis(equipmentClassRegisterInfo, registerInfo);
+        // Bean.copyExistPropertis(equipmentClassRegisterInfo, registerInfo);
         registerInfo.setRecord(record);
         registerInfo.setRecDate(date);
         registerInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("REGISTERINFO_SEQ")));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEquipTransferServiceImpl.java

@@ -26,6 +26,7 @@ import com.yeejoin.amos.feign.workflow.model.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.util.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,11 +59,13 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     private final JgEquipTransferEqMapper jgEquipTransferEqMapper;
     private final RedisUtils redisUtils;
     private final TzsServiceFeignClient tzsServiceFeignClient;
-    private final CommonServiceImpl commonService;
+
     private final CmWorkflowServiceImpl cmWorkflowService;
     private final IJgInstallationNoticeService jrmInstallationNoticeService;
     private final IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
 
+    @Lazy
+    private final CommonServiceImpl commonService;
     /**
      * 保存和保存并提交
      *

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/utils/FileExporter.java

@@ -13,7 +13,7 @@ public class FileExporter {
             response.reset();
             response.setCharacterEncoding("utf-8");
             response.setContentType(fileType.getContentType());
-            fileName = fileName.replaceAll("\\.", "·");
+            fileName = fileName.replaceAll("\\..*", "");
             fileName = URLEncoder.encode(fileName + fileType.getFileSufix(), "UTF-8");
             response.setHeader("Content-Disposition", "attachment; filename=" + fileName + "");
             response.getOutputStream().write(data);