页面展示调整

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/domain/dto/ReimbursementDTO.java

@@ -53,7 +53,7 @@ public class ReimbursementDTO extends TreeEntity<ReimbursementDTO> {
     private String remarks;    //备注
     private Integer type;    //状态
     private String reimbursementRatio;    //报销比例
-    private String allAlreadyReimbursementQuota;    //总报销额度
+    private String allAlreadyReimbursementQuota;    //总报销额度（已报金额）
     private String canReimbursementAmount;    //可报销额度
     private String surplusReimbursementAmount;    //剩余报销额度
     private String reimbursementType;    //报销比例

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/service/impl/ReimbursementSysServiceImpl.java

@@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementDTO;
 import com.jeeplus.test.reimbursementsys.mapper.ReimbursementSysMapper;
+import com.jeeplus.test.reimbursementsys.service.ReimbursementBusinessService;
 import com.jeeplus.test.reimbursementsys.service.ReimbursementSysService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -25,6 +26,8 @@ public class ReimbursementSysServiceImpl implements ReimbursementSysService {
 
     @Resource
     private ReimbursementSysMapper mapper;
+    @Resource
+    private ReimbursementBusinessService reimbursementBusinessService;
 
 
     @Override
@@ -65,6 +68,12 @@ public class ReimbursementSysServiceImpl implements ReimbursementSysService {
                                 info.setChildren(children);
                             }
                         }
+                        ReimbursementDTO businessById = reimbursementBusinessService.getBusinessById(info.getId());
+                        if(null != businessById){
+                            info.setAllAlreadyReimbursementQuota(businessById.getAllAlreadyReimbursementQuota());
+                            info.setCanReimbursementAmount(businessById.getCanReimbursementAmount());
+                            info.setSurplusReimbursementAmount(businessById.getSurplusReimbursementAmount());
+                        }
                     }
                 }
             }else{
@@ -92,6 +101,12 @@ public class ReimbursementSysServiceImpl implements ReimbursementSysService {
                                 info.setChildren(children);
                             }
                         }
+                        ReimbursementDTO businessById = reimbursementBusinessService.getBusinessById(info.getId());
+                        if(null != businessById){
+                            info.setAllAlreadyReimbursementQuota(businessById.getAllAlreadyReimbursementQuota());
+                            info.setCanReimbursementAmount(businessById.getCanReimbursementAmount());
+                            info.setSurplusReimbursementAmount(businessById.getSurplusReimbursementAmount());
+                        }
                     }
                 }
             }
@@ -320,7 +335,9 @@ public class ReimbursementSysServiceImpl implements ReimbursementSysService {
                 //查询该发票信息
                 ReimbursementDTO reimbursementDTO = mapper.queryInvoiceById(id);
                 //如果所有的发票均已收款，则将业务信息添加全部收款状态
-                mapper.updateGatheringStatusById(reimbursementDTO.getParentId());
+                if(null != reimbursementDTO){
+                    mapper.updateGatheringStatusById(reimbursementDTO.getParentId());
+                }
             }
         }