优化工作

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

@@ -359,11 +359,13 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         finFundsCarriedForwardApplyDetailsVo.setPublishInfo(sysOrganizationVo.getName() + "-" + sysUserVo.getName());
         finFundsCarriedForwardApplyDetailsVo.setCreateByDate(DateUtil.formatDate(new Date()));
         FinCollectionConfirmation finCollectionConfirmation = null;
+        FinFundsCarriedForwardApply finFundsCarriedForwardApply = null;
         for (String busSid : busSids) {
             FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo = new FinFundsCarriedForwardVehDetailsVo();
             finFundsCarriedForwardVehDetailsVo.setBusSid(busSid);
             FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchYeBySid(busSid);
             finCollectionConfirmation = finCollectionConfirmationService.fetchBySid(finSelectedReceivablesDetailed.getCollSid());
+            finFundsCarriedForwardApply = fetchBySid(finSelectedReceivablesDetailed.getCollSid());
             finFundsCarriedForwardVehDetailsVo.setBusBillNo(finSelectedReceivablesDetailed.getContractNo());
             finFundsCarriedForwardVehDetailsVo.setCustomerSid(finSelectedReceivablesDetailed.getCustomerSid());
             finFundsCarriedForwardVehDetailsVo.setCustomerName(finSelectedReceivablesDetailed.getCustomerName());
@@ -371,11 +373,18 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             finFundsCarriedForwardVehDetailsVo.setBalance(finSelectedReceivablesDetailed.getBalance());
             finFundsCarriedForwardVehDetailsVos.add(finFundsCarriedForwardVehDetailsVo);
         }
-        finFundsCarriedForwardApplyDetailsVo.setSaleDeptSid(finCollectionConfirmation.getStaffDeptSid());
-        finFundsCarriedForwardApplyDetailsVo.setSaleDeptName(finCollectionConfirmation.getStaffDeptName());
-        SysUserVo sysUserVo1 = sysUserFeign.fetchBySid(finCollectionConfirmation.getStaffUserSid()).getData();
+        SysUserVo sysUserVo1 = null;
+        if (finCollectionConfirmation != null){
+            finFundsCarriedForwardApplyDetailsVo.setSaleDeptSid(finCollectionConfirmation.getStaffDeptSid());
+            finFundsCarriedForwardApplyDetailsVo.setSaleDeptName(finCollectionConfirmation.getStaffDeptName());
+            sysUserVo1 = sysUserFeign.fetchBySid(finCollectionConfirmation.getStaffUserSid()).getData();
+        }else {
+            finFundsCarriedForwardApplyDetailsVo.setSaleDeptSid(finFundsCarriedForwardApply.getSaleDeptSid());
+            finFundsCarriedForwardApplyDetailsVo.setSaleDeptName(finFundsCarriedForwardApply.getSaleDeptName());
+            sysUserVo1 = sysUserFeign.fetchBySid(finFundsCarriedForwardApply.getCreateBySid()).getData();
+        }
         finFundsCarriedForwardApplyDetailsVo.setStaffSid(sysUserVo1.getStaffSid());
-        finFundsCarriedForwardApplyDetailsVo.setStaffName(finCollectionConfirmation.getStaffName());
+        finFundsCarriedForwardApplyDetailsVo.setStaffName(sysUserVo1.getName());
         finFundsCarriedForwardApplyDetailsVo.setSource(finFundsCarriedForwardApplyInitQuery.getSource());
         finFundsCarriedForwardApplyDetailsVo.setFinFundsCarriedForwardVehDetailsVos(finFundsCarriedForwardVehDetailsVos);
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(finFundsCarriedForwardApplyInitQuery.getOrgSidPath()).getData();
@@ -456,6 +465,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 finSelectedReceivablesDetailed.setUseOrgSid(dto.getUseOrgSid());
                 finSelectedReceivablesDetailed.setSubscribedOf(yxysFinFundsCarriedForwardYXYSKXVo.getSubscribedOf());
                 finSelectedReceivablesDetailed.setCollSid(finFundsCarriedForwardApply.getSid());
+                finSelectedReceivablesDetailed.setKxState("01");
                 if ("已办结".equals(finFundsCarriedForwardApply.getNodeState())) {
                     finSelectedReceivablesDetailed.setAuditState(3);
                 }

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

@@ -606,6 +606,13 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
             String useOrgSid = record.getUseOrgSid();
             String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName();
             record.setUseOrgName(useOrgName);
+            if ("01".equals(record.getState())){
+                record.setState("正常");
+            }else if ("02".equals(record.getState())){
+                record.setState("退车");
+            }else {
+                record.setState("作废");
+            }
         }
         PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> p = PagerUtil.pageToVo(pagging, null);
         return p;