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

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/CommonController.java

@@ -55,7 +55,7 @@ public class CommonController {
 
 
         commonService.downZiliao(surveyInformationId,peasantHouseholdIds,processInstanceId,response);
-
+        System.out.println("zip下载成功");
     }
 
     /**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceCheckServiceImpl.java

@@ -66,8 +66,6 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
     FinancingInfoServiceImpl financingInfoService;
     @Autowired
     FinancingAuditingServiceImpl financingAuditingService;
-    @Autowired
-    CommonServiceImpl commonService;
 
 
     public Page<AcceptanceCheckDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/FinancingInfoServiceImpl.java

@@ -76,8 +76,6 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     @Autowired
     private PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
     @Autowired
-    private CommonServiceImpl commonService;
-    @Autowired
     private AcceptanceCheckServiceImpl acceptanceCheckService;
     @Autowired
     private AcceptanceCheckAuditingServiceImpl acceptanceCheckAuditingService;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/RectificationOrderAuditingServiceImpl.java

@@ -23,6 +23,7 @@ import javafx.beans.binding.MapBinding;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -45,7 +46,6 @@ public class RectificationOrderAuditingServiceImpl extends BaseService<Rectifica
     @Autowired
     private WorkFlowService workFlowService;
     @Autowired
-    CommonServiceImpl commonService;
 
     private static final String PROCESSKEY = "RectificationAudit";
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java

@@ -36,6 +36,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.component.emq.EmqKeeper;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java

@@ -40,6 +40,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -141,6 +142,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
     @Autowired
     WorkFlowService workFlowService;
     @Autowired
+    @Lazy
     CommonServiceImpl commonService;
     @Autowired
     AmosRequestContext amosRequestContext;