2 Commits 1dd3986792 ... fee59d40b6

Auteur SHA1 Message Date
  liutao fee59d40b6 Merge remote-tracking branch 'origin/smb' into smb il y a 6 jours
  liutao fca7142bdf fix(苏商银行):字典类 il y a 6 jours

+ 0 - 53
src/main/java/com/sunxung/factoring/entity/smb/FinancingFromInvestorsNotice.java

@@ -120,27 +120,6 @@ public class FinancingFromInvestorsNotice extends BaseEntity {
     @TableField("limit_number")
     private String limitNumber;
 
-    /**
-     * 个人征信授权书
-     */
-    @TableField("type301SdossId")
-    private String type301SdossId;
-    /**
-     * 企业征信授权书
-     */
-    @TableField("type302SdossId")
-    private String type302SdossId;
-    /**
-     * 个人综合信息授权书
-     */
-    @TableField("type327SdossId")
-    private String type327SdossId;
-    /**
-     * 企业综合信息授权书
-     */
-    @TableField("type303SdossId")
-    private String type303SdossId;
-
     /**
      * 用户唯一标识
      */
@@ -199,38 +178,6 @@ public class FinancingFromInvestorsNotice extends BaseEntity {
         this.openId = openId;
     }
 
-    public String getType301SdossId() {
-        return type301SdossId;
-    }
-
-    public void setType301SdossId(String type301SdossId) {
-        this.type301SdossId = type301SdossId;
-    }
-
-    public String getType302SdossId() {
-        return type302SdossId;
-    }
-
-    public void setType302SdossId(String type302SdossId) {
-        this.type302SdossId = type302SdossId;
-    }
-
-    public String getType327SdossId() {
-        return type327SdossId;
-    }
-
-    public void setType327SdossId(String type327SdossId) {
-        this.type327SdossId = type327SdossId;
-    }
-
-    public String getType303SdossId() {
-        return type303SdossId;
-    }
-
-    public void setType303SdossId(String type303SdossId) {
-        this.type303SdossId = type303SdossId;
-    }
-
     public String getLimitNumber() {
         return limitNumber;
     }

+ 4 - 0
src/main/java/com/sunxung/factoring/service/project/impl/BusinessProcessingTaskServiceImpl.java

@@ -1134,6 +1134,10 @@ public class BusinessProcessingTaskServiceImpl implements BusinessProcessingTask
                     }
 
                     financingFromInvestorsNotice.setOpenId(financingFromInvestorsHistory.getOpenId());
+                    Dictionary apply = dictService.getByCode(financingFromInvestorsNotice.getApplyStatus());
+                    Dictionary limit = dictService.getByCode(financingFromInvestorsNotice.getLimitStatus());
+                    financingFromInvestorsNotice.setApplyStatus(apply.getName());
+                    financingFromInvestorsNotice.setLimitStatus(limit.getName());
                     BusinessHistoricDetailVo back = new BusinessHistoricDetailVo();
                     back.setFormBusinessName("苏商银行回调");
                     BusinessProcessingLogVo businessProcessingLogBack = new BusinessProcessingLogVo();

+ 8 - 1
src/main/java/com/sunxung/factoring/service/smb/impl/FinancingFromInvestorsServiceImpl.java

@@ -27,6 +27,7 @@ import com.sunxung.factoring.entity.smb.*;
 import com.sunxung.factoring.entity.smb.vo.FinancingFromInvestorsSearchVo;
 import com.sunxung.factoring.entity.supplier.*;
 import com.sunxung.factoring.entity.sys.*;
+import com.sunxung.factoring.entity.sys.Dictionary;
 import com.sunxung.factoring.mapper.smb.FinancingFromInvestorsMapper;
 import com.sunxung.factoring.service.customerinformation.IElectronicSignaturePersonalService;
 import com.sunxung.factoring.service.entprise.IEnterpriseService;
@@ -137,6 +138,9 @@ public class FinancingFromInvestorsServiceImpl extends ServiceImpl<FinancingFrom
     @Autowired
     private ICSalesDocumentsInfoHistoryService salesDocumentsInfoHistoryService;
 
+    @Autowired
+    private DictionaryService dictionaryService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void addInfo(FinancingFromInvestors financingFromInvestors) {
@@ -694,9 +698,12 @@ public class FinancingFromInvestorsServiceImpl extends ServiceImpl<FinancingFrom
                     financingFromInvestors.setCreditStatus(SmbCreditStatusEnum.STATUS_12.getCode());
                     this.updateById(financingFromInvestors);
                 }
+                Dictionary dictionary = dictionaryService.getByCode(financingFromInvestorsNotice.getLimitStatus());
+                financingFromInvestorsNotice.setLimitStatus(dictionary.getName());
                 financingFromInvestors.setFinancingFromInvestorsNotice(financingFromInvestorsNotice);
             }
-
+            Dictionary dictionary = dictionaryService.getByCode(financingFromInvestors.getCreditStatus());
+            financingFromInvestors.setCreditStatus(dictionary.getName());
         }
         return new GridPage<>(financingFromInvestorsSearchVo.getRows(), financingFromInvestorsSearchVo.getPage(), page.getTotal(), list);
     }