来款开票

jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java

@@ -46,8 +46,11 @@ import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.project.mapper.PayCommonProjectMapper;
 import com.jero.project.mapper.PayWorkingGroupMapper;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
+import com.jero.temporary.entity.PayCompanyManagementTemporary;
+import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -96,6 +99,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     private PayMailBillProjectMapper payMailBillProjectMapper;
     @Resource
     PayCompanyManagementMapper payCompanyManagementMapper;
+    @Autowired
+    private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
 
     @Override
     public List<PayMailBill> selectMailBillVO(String projectId) {
@@ -131,7 +136,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
         //票据关联项目表
         List<PayMailBillProject> bmpList = payMailBill.getBmpList();
 
-        //校验不同项目是否属于同一个公司，开票金额是否大于当前欠未开票金额
+        //校验不同项目是否属于同一个公司，开票金额是否大于当前欠未开票金额，企业名称是否审核
         String res = checkCompanyProject(bmpList);
         if (!"success".equals(res)) {
             return Result.error(res);
@@ -276,7 +281,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     }
 
 
-    //校验不同项目是否属于同一个公司，开票金额是否大于当前欠未开票金额
+    //校验不同项目是否属于同一个公司，开票金额是否大于当前欠未开票金额，企业名称是否审核
     private String checkCompanyProject(List<PayMailBillProject> bmpList) {
         String standardCompanyId = null;//基准公司id
 
@@ -398,8 +403,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     break;
             }
 
-            PayCompanyManagement payCompanyManagement = payCompanyManagementMapper.selectById(standardCompanyId);
-            if(2 == payCompanyManagement.getStatus()){
+            PayCompanyManagementTemporary payCompanyManagement = payCompanyManagementTemporaryService.getById(standardCompanyId);
+            if("2".equals(payCompanyManagement.getStatus()) ){
                 return "企业名称未审核，需要审核后开票";
             }
         }