优化工作

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -52,11 +52,14 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh
 import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
 import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService;
 import com.yxt.anrui.fin.biz.finfundscarriedforwardveh.FinFundsCarriedForwardVehService;
 import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
+import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService;
 import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
 import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService;
 import com.yxt.anrui.fin.biz.kingdee.otherreceivablebill.OtherReceivableBillService;
@@ -147,6 +150,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
     private OtherReceivableBillService otherReceivableBillService;
     @Autowired
     private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro;
+    @Autowired
+    private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
 
     public PagerVo<FinFundsCarriedForwardApplyVo> listPageVo(PagerQuery<FinFundsCarriedForwardApplyQuery> pq) {
         FinFundsCarriedForwardApplyQuery query = pq.getParams();
@@ -467,6 +472,10 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 finSelectedReceivablesDetailed.setSubscribedOf(yxysFinFundsCarriedForwardYXYSKXVo.getSubscribedOf());
                 finSelectedReceivablesDetailed.setCollSid(finFundsCarriedForwardApply.getSid());
                 finSelectedReceivablesDetailed.setKxState("01");
+                String receivablesSid = yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid();
+                FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(receivablesSid);
+                finSelectedReceivablesDetailed.setPurchaseSystemSid(finUncollectedReceivablesDetailed.getPurchaseSystemSid());
+                finSelectedReceivablesDetailed.setPurchaseSystemName(finUncollectedReceivablesDetailed.getPurchaseSystemName());
                 if ("已办结".equals(finFundsCarriedForwardApply.getNodeState())) {
                     finSelectedReceivablesDetailed.setAuditState(3);
                 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -611,7 +611,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
                 record.setState("正常");
             }else if ("02".equals(record.getState())){
                 record.setState("退车");
-            }else {
+            }else if ("03".equals(record.getState())){
                 record.setState("作废");
             }
         }