Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -88,7 +88,8 @@ public enum BizExceptionCode implements BaseExceptionCode {
     CHECK_SETACOUNT_EXIS(74006, "不能删除单据日期小于等于结账期间<u>%s</u>的单据"),
     VERIFICATION_CHECK_BALANCE(74007,"核销金额不能大于未核销金额"),
     DELETE_NOT_EXIS(74008,"删除失败，当前单据不存在!"),
-    DOCUMENTS_AUDITED(74009,"单据已审核"),
+    DOCUMENTS_AUDITED(74009,"审核失败，存在已审核单据"),
+    DOCUMENTS_UNAUDITED(74009,"反审核失败，存在未审核单据"),
 
 
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/FundtransferServiceImpl.java

@@ -305,6 +305,10 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Fundtransfer fundtransfers = fundtransferMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
+            if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(fundtransfers.getFt_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+            }
             this.unAudit(Math.toIntExact(docBaseDTO.getId()));
         }
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthreceiptsServiceImpl.java

@@ -359,6 +359,10 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Othreceipts othreceipts1 = othreceiptsMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
+            if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(othreceipts1.getOr_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+            }
             this.unAudit(Math.toIntExact(docBaseDTO.getId()));
         }
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthspendingsServiceImpl.java

@@ -354,6 +354,10 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Othspendings othspendings1 = othspendingsMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
+            if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(othspendings1.getOs_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+            }
             this.unAudit(Math.toIntExact(docBaseDTO.getId()));
         }
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -465,6 +465,10 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Paybalance paybalance1 = paybalanceMapper.selectByPrimaryKey(docBaseDTO.getId());
+            if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(paybalance1.getPb_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+            }
             this.unAudit(Math.toIntExact(docBaseDTO.getId()));
         }
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java

@@ -470,6 +470,10 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Recbalance recbalance1 = recbalanceMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
+            if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(recbalance1.getRb_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+            }
             this.unAudit(docBaseDTO.getId());
         }
     }