Pārlūkot izejas kodu

fix(项目):开启授信决议修改

liutao 5 mēneši atpakaļ
vecāks
revīzija
c9ebf9d558

+ 1 - 1
build.gradle

@@ -9,7 +9,7 @@ targetCompatibility = 1.8
 
 jar {
     baseName = 'factoring-trade-prod'
-    version = '1.0.33'
+    version = '1.0.34'
 }
 
 springBoot {

+ 3 - 1
src/main/java/com/sunxung/factoring/service/creditresolution/ICreditResolutionService.java

@@ -25,10 +25,12 @@ public interface ICreditResolutionService extends IService<CreditResolution> {
 
     /**
      * 开启老授信的授信决议流程
+     *
      * @param cProjectInformationId
      * @param oldCoreEnterpriseId
+     * @param estimatedAccountingPeriod
      */
-    void startProcessOld(Long cProjectInformationId, Long oldCoreEnterpriseId);
+    void startProcessOld(Long cProjectInformationId, Long oldCoreEnterpriseId, Long estimatedAccountingPeriod);
 
     /**
      * 根据id查询

+ 3 - 9
src/main/java/com/sunxung/factoring/service/creditresolution/impl/CreditResolutionServiceImpl.java

@@ -13,19 +13,13 @@ import com.sunxung.factoring.entity.creditresolution.*;
 import com.sunxung.factoring.entity.entprise.Enterprise;
 import com.sunxung.factoring.entity.project.*;
 import com.sunxung.factoring.entity.project.vo.SearchBusinessProcessingTask;
-import com.sunxung.factoring.entity.supplier.DueDiligenceAllocation;
 import com.sunxung.factoring.entity.supplier.SupplierInfo;
-import com.sunxung.factoring.entity.supplier.VideoDueDiligence;
-import com.sunxung.factoring.entity.supplier.VideoDueDiligenceComprehensiveEvaluation;
 import com.sunxung.factoring.entity.sys.*;
 import com.sunxung.factoring.mapper.creditresolution.CreditResolutionMapper;
 import com.sunxung.factoring.service.creditresolution.*;
 import com.sunxung.factoring.service.entprise.IEnterpriseService;
 import com.sunxung.factoring.service.project.*;
-import com.sunxung.factoring.service.supplier.IDueDiligenceAllocationService;
 import com.sunxung.factoring.service.supplier.ISupplierInfoService;
-import com.sunxung.factoring.service.supplier.IVideoDueDiligenceComprehensiveEvaluationService;
-import com.sunxung.factoring.service.supplier.IVideoDueDiligenceService;
 import com.sunxung.factoring.service.sys.*;
 import com.sunxung.factoring.service.sys.flowable.FlowableService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -190,7 +184,7 @@ public class CreditResolutionServiceImpl extends ServiceImpl<CreditResolutionMap
     }
 
     @Override
-    public void startProcessOld(Long cProjectInformationId, Long oldCoreEnterpriseId) {
+    public void startProcessOld(Long cProjectInformationId, Long oldCoreEnterpriseId, Long estimatedAccountingPeriod) {
         if(oldCoreEnterpriseId == null){
             throw new ServiceException(CodeUtil.FAIL,"项目核心企业id为空,无法开启授信决议流程!");
         }
@@ -230,8 +224,8 @@ public class CreditResolutionServiceImpl extends ServiceImpl<CreditResolutionMap
             creditResolution.setCurrency("CNY");
             creditResolution.setProposedCreditTerm(360);
             creditResolution.setStatusStr(ProjectInitiationStatusDict.ChildEnum.PROCESSING.getCode());
-            creditResolution.setUpstreamAccountingPeriod(projectInformation.getEstimatedAccountingPeriod() * 30 + 60);
-            creditResolution.setFactoringFinancingPeriod(projectInformation.getEstimatedAccountingPeriod() * 30 + 60);
+            creditResolution.setUpstreamAccountingPeriod(estimatedAccountingPeriod * 30 + 60);
+            creditResolution.setFactoringFinancingPeriod(estimatedAccountingPeriod * 30 + 60);
             creditResolution.setCreditReport(1);
             baseMapper.add(creditResolution);
             //开启流程

+ 2 - 2
src/main/java/com/sunxung/factoring/web/creditresolution/CreditResolutionController.java

@@ -58,8 +58,8 @@ public class CreditResolutionController {
      * @param id
      */
     @RequestMapping("startProcessOld")
-    public void startProcess(@RequestParam Long id,@RequestParam Long oldCoreEnterpriseId){
-        creditResolutionService.startProcessOld(id,oldCoreEnterpriseId);
+    public void startProcess(@RequestParam Long id,@RequestParam Long oldCoreEnterpriseId,@RequestParam Long estimatedAccountingPeriod){
+        creditResolutionService.startProcessOld(id,oldCoreEnterpriseId,estimatedAccountingPeriod);
     }
 
     /**