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

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/FundtransferController.java

@@ -2,6 +2,7 @@ package com.usoftchina.saas.money.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.po.Fundtran;
@@ -40,6 +41,23 @@ public class FundtransferController {
         return Result.success();
     }
 
+    @PostMapping("/batchDelete")
+    public Result funBatchDelete(@RequestBody BatchDealBaseDTO body){
+        fundtransferService.fundtransferDelete(body);
+        return Result.success();
+    }
+
+    @PostMapping("/batchAudit")
+    public Result funBatchAudit(@RequestBody BatchDealBaseDTO body){
+        fundtransferService.fundtransferBatchAudit(body);
+        return Result.success();
+    }
+
+    @PostMapping("/batchUnAudit")
+    public Result funBatchUnAudit(@RequestBody BatchDealBaseDTO body){
+        fundtransferService.fundtransferBatchUnAudit(body);
+        return Result.success();
+    }
 
     @GetMapping("/read/{id}")
     public Result read(@PathVariable("id")int id){
@@ -58,8 +76,8 @@ public class FundtransferController {
         return Result.success();
     }
 
-    @PostMapping("/unAudit")
-    public Result unAudit(@RequestBody int id){
+    @PostMapping("/unAudit/{id}")
+    public Result unAudit(@PathVariable("id") int id){
         fundtransferService.unAudit(id);
         return Result.success();
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/OthreceiptsController.java

@@ -2,6 +2,7 @@ package com.usoftchina.saas.money.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.po.Othreceipts;
@@ -51,15 +52,33 @@ public class OthreceiptsController {
         return Result.success(list);
     }
 
-//    @RequestMapping("/audit")
-//    public Result audit(@RequestBody Othte body){
-//        othreceiptsService.audit(body);
-//        return Result.success();
-//    }
-//
-//    @PostMapping("/unAudit")
-//    public Result unAudit(@RequestBody int id){
-//        othreceiptsService.unAudit(id);
-//        return Result.success();
-//    }
+    @RequestMapping("/audit")
+    public Result audit(@RequestBody Othte body){
+        othreceiptsService.audit(body);
+        return Result.success();
+    }
+
+    @PostMapping("/unAudit/{id}")
+    public Result unAudit(@PathVariable("id") int id){
+        othreceiptsService.unAudit(id);
+        return Result.success();
+    }
+
+    @PostMapping("/batchDelete")
+    public Result othreceiptsBatchDelete(@RequestBody BatchDealBaseDTO body){
+        othreceiptsService.othreceiptsDelete(body);
+        return Result.success();
+    }
+
+    @PostMapping("/batchAudit")
+    public Result othreceiptsBatchAudit(@RequestBody BatchDealBaseDTO body){
+        othreceiptsService.othreceiptsBatchAudit(body);
+        return Result.success();
+    }
+
+    @PostMapping("/batchUnAudit")
+    public Result othreceiptsBatchUnAudit(@RequestBody BatchDealBaseDTO body){
+        othreceiptsService.othreceiptsBatchUnAudit(body);
+        return Result.success();
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/OthspengdingsController.java

@@ -2,6 +2,7 @@ package com.usoftchina.saas.money.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.po.Othreceipts;
@@ -54,15 +55,33 @@ public class OthspengdingsController {
         return Result.success(list);
     }
 
-//    @RequestMapping("/audit")
-//    public Result audit(@RequestBody Othsp body){
-//        othspendingsService.audit(body);
-//        return Result.success();
-//    }
-//
-//    @PostMapping("/unAudit")
-//    public Result unAudit(@RequestBody int id){
-//        othspendingsService.unAudit(id);
-//        return Result.success();
-//    }
+    @RequestMapping("/audit")
+    public Result audit(@RequestBody Othsp body){
+        othspendingsService.audit(body);
+        return Result.success();
+    }
+
+    @PostMapping("/unAudit/{id}")
+    public Result unAudit(@PathVariable("id") int id){
+        othspendingsService.unAudit(id);
+        return Result.success();
+    }
+
+    @PostMapping("/batchDelete")
+    public Result othspendingsBatchDelete(@RequestBody BatchDealBaseDTO body){
+        othspendingsService.othspendingBatchDelete(body);
+        return Result.success();
+    }
+
+    @PostMapping("/batchAudit")
+    public Result othspendingsBatchAudit(@RequestBody BatchDealBaseDTO body){
+        othspendingsService.othspendingBatchAudit(body);
+        return Result.success();
+    }
+
+    @PostMapping("/batchUnAudit")
+    public Result othspendingsBatchUnAudit(@RequestBody BatchDealBaseDTO body){
+        othspendingsService.othspendingBatchUnAudit(body);
+        return Result.success();
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/PaybalanceController.java

@@ -2,6 +2,7 @@ package com.usoftchina.saas.money.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.po.Pay;
@@ -63,9 +64,27 @@ public class PaybalanceController {
         return Result.success();
     }
 
-    @PostMapping("/unAudit")
-    public Result unAudit(@RequestBody int id){
+    @PostMapping("/unAudit/{id}")
+    public Result unAudit(@PathVariable("id") int id){
         paybalanceService.unAudit(id);
         return Result.success();
     }
+
+    @PostMapping("/batchDelete")
+    public Result payBatchDelete(@RequestBody BatchDealBaseDTO body){
+        paybalanceService.paybalanceDelete(body);
+        return Result.success();
+    }
+
+    @PostMapping("/batchAudit")
+    public Result payBatchAudit(@RequestBody BatchDealBaseDTO body){
+        paybalanceService.paybalanceBatchAudit(body);
+        return Result.success();
+    }
+
+    @PostMapping("/batchUnAudit")
+    public Result payBatchUnAudit(@RequestBody BatchDealBaseDTO body){
+        paybalanceService.paybalanceBatchUnAudit(body);
+        return Result.success();
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/RecbalanceContorller.java

@@ -1,14 +1,19 @@
 package com.usoftchina.saas.money.controller;
 
 import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
+import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.money.po.Rec;
+import com.usoftchina.saas.money.po.Recbalance;
 import com.usoftchina.saas.money.service.RecbalanceService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Iterator;
+
 /**
  * @author heqw
  * @date 2018/10/23 15:40
@@ -27,7 +32,7 @@ public class RecbalanceContorller {
 
     @PostMapping("/delete/{id}")
     public Result delete(@PathVariable("id") int id){
-        recbalanceService.delect(id);
+        recbalanceService.delete(id);
         return Result.success();
     }
 
@@ -59,9 +64,27 @@ public class RecbalanceContorller {
         return Result.success();
     }
 
-    @PostMapping("/unAudit")
-    public Result unAudit(@RequestBody Long id){
+    @PostMapping("/unAudit/{id}")
+    public Result unAudit(@PathVariable("id") Long id){
         recbalanceService.unAudit(id);
         return Result.success();
     }
+
+    @PostMapping("/batchDelete")
+    public Result recbalanceBatchDelete(@RequestBody BatchDealBaseDTO body){
+        recbalanceService.recbalanceDelete(body);
+        return Result.success();
+    }
+
+    @PostMapping("/batchAudit")
+    public Result recbalanceBatchAudit(@RequestBody BatchDealBaseDTO body){
+        recbalanceService.recbalanceBatchAudit(body);
+        return Result.success();
+    }
+
+    @PostMapping("/batchUnAudit")
+    public Result recbalanceBatchUnAudit(@RequestBody BatchDealBaseDTO body){
+        recbalanceService.recbalanceBatchUnAudit(body);
+        return Result.success();
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationMapper.java

@@ -17,8 +17,6 @@ public interface VerificationMapper extends CommonBaseMapper<Verification> {
 
     int deleteByPrimaryKey(Integer vc_id);
 
-//    Long insert(Verification record);
-
     int insertSelective(Verification record);
 
     List<Verification> selectByExample(VerificationExample example);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetMapper.java

@@ -17,8 +17,6 @@ public interface VerificationdetMapper extends CommonBaseMapper<Verificationdet>
 
     int deleteByPrimaryKey(Integer vd_id);
 
-//    Long insert(Verificationdet record);
-
     int insertSelective(Verificationdet record);
 
     List<Verificationdet> selectByExample(VerificationdetExample example);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetailMapper.java

@@ -18,8 +18,6 @@ public interface VerificationdetailMapper extends CommonBaseMapper<Verificationd
 
     int deleteByPrimaryKey(Integer vcd_id);
 
-//    Long insert(Verificationdetail record);
-
     int insertSelective(Verificationdetail record);
 
     List<Verificationdetail> selectByExample(VerificationdetailExample example);

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.service;
 
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.po.Fundtran;
@@ -21,6 +22,13 @@ public interface FundtransferService {
     void delete(int id);
     void deleteItem(int id);
 
+
+    void fundtransferDelete(BatchDealBaseDTO baseDTO);
+
+    void fundtransferBatchAudit(BatchDealBaseDTO baseDTO);
+
+    void fundtransferBatchUnAudit(BatchDealBaseDTO baseDTO);
+
     Fundtran select(int id);
 
     PageInfo<Fundtransfer> selectList(PageRequest page, ListReqDTO reqDTO);

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.service;
 
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.po.Othreceipts;
@@ -16,9 +17,9 @@ import com.usoftchina.saas.page.PageRequest;
 public interface OthreceiptsService {
     DocBaseDTO insert(Othte othte);
 
-//    void audit(Othte othte);
-//
-//    void unAudit(int id);
+    void audit(Othte othte);
+
+    void unAudit(int id);
 
     void delete(int id);
 
@@ -27,4 +28,10 @@ public interface OthreceiptsService {
     Othte select(int id);
 
     PageInfo<Othreceipts> selectList(PageRequest page, ListReqDTO reqDTO);
+
+    void othreceiptsDelete(BatchDealBaseDTO baseDTO);
+
+    void othreceiptsBatchAudit(BatchDealBaseDTO baseDTO);
+
+    void othreceiptsBatchUnAudit(BatchDealBaseDTO baseDTO);
 }

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.service;
 
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.po.Othreceipts;
@@ -25,7 +26,13 @@ public interface OthspendingsService {
 
     PageInfo<Othspendings> selectList(PageRequest page, ListReqDTO reqDTO);
 
-//    void audit(Othsp othsp);
-//
-//    void unAudit(int id);
+    void audit(Othsp othsp);
+
+    void unAudit(int id);
+
+    void othspendingBatchDelete(BatchDealBaseDTO baseDTO);
+
+    void othspendingBatchAudit(BatchDealBaseDTO baseDTO);
+
+    void othspendingBatchUnAudit(BatchDealBaseDTO baseDTO);
 }

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.service;
 
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.po.Pay;
@@ -28,4 +29,10 @@ public interface PaybalanceService {
     Pay select(int id);
 
     PageInfo<Paybalance> selectList(PageRequest page, ListReqDTO reqDTO);
+
+    void paybalanceDelete(BatchDealBaseDTO baseDTO);
+
+    void paybalanceBatchAudit(BatchDealBaseDTO baseDTO);
+
+    void paybalanceBatchUnAudit(BatchDealBaseDTO baseDTO);
 }

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.service;
 
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.po.Rec;
@@ -14,7 +15,7 @@ import com.usoftchina.saas.page.PageRequest;
  **/
 public interface RecbalanceService {
     DocBaseDTO insert(Rec rec);
-    void delect(int id);
+    void delete(int id);
 
     void deleteItem(int id);
 
@@ -31,4 +32,9 @@ public interface RecbalanceService {
     PageInfo<Recbalance> selectList(PageRequest page, ListReqDTO reqDTO);
 
 
+    void recbalanceDelete(BatchDealBaseDTO baseDTO);
+
+    void recbalanceBatchAudit(BatchDealBaseDTO baseDTO);
+
+    void recbalanceBatchUnAudit(BatchDealBaseDTO baseDTO);
 }

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.money.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.api.MaxnumberService;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
@@ -12,10 +13,7 @@ import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.money.mapper.FundtransferMapper;
 import com.usoftchina.saas.money.mapper.FundtransferdetailMapper;
-import com.usoftchina.saas.money.po.Fundtran;
-import com.usoftchina.saas.money.po.Fundtransfer;
-import com.usoftchina.saas.money.po.Fundtransferdetail;
-import com.usoftchina.saas.money.po.Paybalance;
+import com.usoftchina.saas.money.po.*;
 import com.usoftchina.saas.money.service.FundtransferService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,7 +68,7 @@ public class FundtransferServiceImpl implements FundtransferService {
             fundtransferdetail.setCompanyId(BaseContextHolder.getCompanyId());
             fundtransferdetail.setFtd_ftid(Math.toIntExact(id));
             if (fundtransferdetail.getId() > 0 ){
-                fundtransferdetailMapper.updateByPrimaryKey(fundtransferdetail);
+                fundtransferdetailMapper.updateByPrimaryKeySelective(fundtransferdetail);
             }else {
                 fundtransferdetailMapper.insertSelective(fundtransferdetail);
             }
@@ -89,7 +87,7 @@ public class FundtransferServiceImpl implements FundtransferService {
         if ( fundtransfer == null || "".equals(fundtransfer)){
             this.insert(fundtran);
         }else {
-            fundtransferMapper.updateByPrimaryKey(fundtransfer);
+            fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
         }
     }
 
@@ -99,7 +97,7 @@ public class FundtransferServiceImpl implements FundtransferService {
         fundtransfer.setId(Long.valueOf(id));
         fundtransfer.setFt_status(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
         fundtransfer.setFt_statuscode(Status.UNAUDITED.name());
-        fundtransferMapper.updateByPrimaryKey(fundtransfer);
+        fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
     }
 
 
@@ -109,10 +107,42 @@ public class FundtransferServiceImpl implements FundtransferService {
         fundtransferdetailMapper.deleteByPrimaryKey(id);
     }
 
+    @Override
     public void deleteItem(int id) {
         fundtransferdetailMapper.deleteItem(id);
     }
 
+    @Override
+    public void fundtransferDelete(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            this.delete(Math.toIntExact(docBaseDTO.getId()));
+        }
+    }
+
+    @Override
+    public void fundtransferBatchAudit(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Fundtransfer fundtransfer = new Fundtransfer();
+            fundtransfer.setId(Long.valueOf(docBaseDTO.getId()));
+            fundtransfer.setFt_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
+            fundtransfer.setFt_statuscode(Status.AUDITED.name());
+            fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
+        }
+    }
+
+    @Override
+    public void fundtransferBatchUnAudit(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            this.unAudit(Math.toIntExact(docBaseDTO.getId()));
+        }
+    }
+
     @Override
     public Fundtran select(int id) {
         Fundtran fundtran = new Fundtran();

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.money.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.api.MaxnumberService;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
@@ -76,25 +77,29 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
         return new DocBaseDTO(id, or_code, BillCodeSeq.OTHRECEIPTS.getCaller());
     }
 
-//    @Override
-//    public void audit(Othte othte) {
-//        int id = Math.toIntExact(othte.getMain().getId());
-//        Othreceipts othreceipts = othreceiptsMapper.selectByPrimaryKey(id);
-//        if ( othreceipts == null || "".equals(othreceipts)){
-//            this.insert(othte);
-//        }else {
-//            othreceiptsMapper.updateByPrimaryKey(othreceipts);
-//        }
-//    }
-//
-//    @Override
-//    public void unAudit(int id) {
-//        Othreceipts othreceipts = new Othreceipts();
-//        othreceipts.set(id);
-//        othreceipts.setOrStatus(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
-//        othreceipts.setOrStatuscode(Status.UNAUDITED.name());
-//        othreceiptsMapper.updateByPrimaryKey(othreceipts);
-//    }
+    @Override
+    public void audit(Othte othte) {
+        Long companyId = BaseContextHolder.getCompanyId();
+        int id = Math.toIntExact(othte.getMain().getId());
+        Othreceipts othreceipts = othreceiptsMapper.selectByPrimaryKey(id);
+        othreceipts.setOr_status(Status.AUDITED.getDisplay());
+        othreceipts.setOr_statuscode(Status.AUDITED.name());
+        othreceipts.setCompanyId(companyId);
+        if ( othreceipts == null || "".equals(othreceipts)){
+            this.insert(othte);
+        }else {
+            othreceiptsMapper.updateByPrimaryKey(othreceipts);
+        }
+    }
+
+    @Override
+    public void unAudit(int id) {
+        Othreceipts othreceipts = new Othreceipts();
+        othreceipts.setId(Long.valueOf(id));
+        othreceipts.setOr_status(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
+        othreceipts.setOr_statuscode(Status.UNAUDITED.name());
+        othreceiptsMapper.updateByPrimaryKeySelective(othreceipts);
+    }
 
 
     @Override
@@ -130,6 +135,37 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
         return pageInfo;
     }
 
+    @Override
+    public void othreceiptsDelete(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            this.delete(Math.toIntExact(docBaseDTO.getId()));
+        }
+    }
+
+    @Override
+    public void othreceiptsBatchAudit(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Othreceipts othreceipts = new Othreceipts();
+            othreceipts.setId(Long.valueOf(docBaseDTO.getId()));
+            othreceipts.setOr_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
+            othreceipts.setOr_statuscode(Status.AUDITED.name());
+            othreceiptsMapper.updateByPrimaryKeySelective(othreceipts);
+        }
+    }
+
+    @Override
+    public void othreceiptsBatchUnAudit(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            this.unAudit(Math.toIntExact(docBaseDTO.getId()));
+        }
+    }
+
     /**
      * @Description: 检验获取并更新单号
      * @Param: [code, id]

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.money.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.api.MaxnumberService;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
@@ -108,25 +109,60 @@ public class OthspendingsServiceImpl implements OthspendingsService {
         return pageInfo;
     }
 
-//    @Override
-//    public void audit(Othsp othsp) {
-//        int id = othsp.getMain().getOsId();
-//        Othspendings othspendings = othspendingsMapper.selectByPrimaryKey(id);
-//        if ( othspendings == null || "".equals(othspendings)){
-//            this.insert(othsp);
-//        }else {
-//            othspendingsMapper.updateByPrimaryKey(othspendings);
-//        }
-//    }
-//
-//    @Override
-//    public void unAudit(int id) {
-//        Othspendings othspendings = new Othspendings();
-//        othspendings.setOsId(id);
-//        othspendings.setOsStatus(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
-//        othspendings.setOsStatuscode(Status.UNAUDITED.name());
-//        othspendingsMapper.updateByPrimaryKey(othspendings);
-//    }
+    @Override
+    public void audit(Othsp othsp) {
+        Long companyId = BaseContextHolder.getCompanyId();
+        int id = Math.toIntExact(othsp.getMain().getId());
+        Othspendings othspendings = othspendingsMapper.selectByPrimaryKey(id);
+        othspendings.setOs_status(Status.AUDITED.getDisplay());
+        othspendings.setOs_statuscode(Status.AUDITED.name());
+        othspendings.setCompanyId(companyId);
+        if ( othspendings == null || "".equals(othspendings)){
+            this.insert(othsp);
+        }else {
+            othspendingsMapper.updateByPrimaryKey(othspendings);
+        }
+    }
+
+    @Override
+    public void unAudit(int id) {
+        Othspendings othspendings = new Othspendings();
+        othspendings.setId(Long.valueOf(id));
+        othspendings.setOs_status(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
+        othspendings.setOs_statuscode(Status.UNAUDITED.name());
+        othspendingsMapper.updateByPrimaryKeySelective(othspendings);
+    }
+
+    @Override
+    public void othspendingBatchDelete(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            this.delete(Math.toIntExact(docBaseDTO.getId()));
+        }
+    }
+
+    @Override
+    public void othspendingBatchAudit(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Othspendings othspendings = new Othspendings();
+            othspendings.setId(Long.valueOf(docBaseDTO.getId()));
+            othspendings.setOs_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
+            othspendings.setOs_statuscode(Status.AUDITED.name());
+            othspendingsMapper.updateByPrimaryKeySelective(othspendings);
+        }
+    }
+
+    @Override
+    public void othspendingBatchUnAudit(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            this.unAudit(Math.toIntExact(docBaseDTO.getId()));
+        }
+    }
 
     /**
      * @Description: 检验获取并更新单号

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.money.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.api.MaxnumberService;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
@@ -109,7 +110,7 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         paybalance.setId(Long.valueOf(id));
         paybalance.setPb_status(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
         paybalance.setPb_statuscode(Status.UNAUDITED.name());
-        paybalanceMapper.updateByPrimaryKey(paybalance);
+        paybalanceMapper.updateByPrimaryKeySelective(paybalance);
     }
 
 
@@ -151,6 +152,37 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         return pageInfo;
     }
 
+    @Override
+    public void paybalanceDelete(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            this.delete(Math.toIntExact(docBaseDTO.getId()));
+        }
+    }
+
+    @Override
+    public void paybalanceBatchAudit(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Paybalance paybalance = new Paybalance();
+            paybalance.setId(Long.valueOf(docBaseDTO.getId()));
+            paybalance.setPb_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
+            paybalance.setPb_statuscode(Status.AUDITED.name());
+            paybalanceMapper.updateByPrimaryKeySelective(paybalance);
+        }
+    }
+
+    @Override
+    public void paybalanceBatchUnAudit(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            this.unAudit(Math.toIntExact(docBaseDTO.getId()));
+        }
+    }
+
     /**
      * @Description: 检验获取并更新单号
      * @Param: [code, id]

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.money.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.api.MaxnumberService;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
@@ -91,7 +92,7 @@ public class RecbalanceServiceImpl implements RecbalanceService {
     }
 
     @Override
-    public void delect(int id) {
+    public void delete(int id) {
         recbalanceMapper.deleteByPrimaryKey(id);
         recbalancedetMapper.deleteByPrimaryKey(id);
         recbalancedetailMapper.deleteByPrimaryKey(id);
@@ -157,6 +158,37 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         return pageInfo;
     }
 
+    @Override
+    public void recbalanceDelete(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            this.delete(Math.toIntExact(docBaseDTO.getId()));
+        }
+    }
+
+    @Override
+    public void recbalanceBatchAudit(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Recbalance recbalance = new Recbalance();
+            recbalance.setId(Long.valueOf(docBaseDTO.getId()));
+            recbalance.setRb_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
+            recbalance.setRb_statuscode(Status.AUDITED.name());
+            recbalanceMapper.updateByPrimaryKeySelective(recbalance);
+        }
+    }
+
+    @Override
+    public void recbalanceBatchUnAudit(BatchDealBaseDTO baseDTO){
+        Iterator isList = baseDTO.getBaseDTOs().iterator();
+        while (isList.hasNext()){
+            DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            this.unAudit(docBaseDTO.getId());
+        }
+    }
+
     /**
      * @Description: 检验获取并更新单号
      * @Param: [code, id]

applications/money/money-server/src/main/resources/mapper/PaybalancedetailMapper.xml

@@ -40,7 +40,7 @@
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from paybalancedetail
-    where rbd_rbid = #{id,jdbcType=INTEGER}
+    where pbd_pbid = #{id,jdbcType=INTEGER}
   </delete>
 
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Paybalancedetail" >

frontend/saas-web/app/util/BaseUtil.js

@@ -11,6 +11,7 @@ Ext.define('saas.util.BaseUtil', {
             method = config.method || 'GET',
             timeout = config.timeout || 8000,
             defaultHeaders = {
+                'Authorization': ' ',
                 'Access-Control-Allow-Origin': '*',
                 "Content-Type": 'application/json;charset=UTF-8' 
             };

frontend/saas-web/overrides/data/Connection.js

@@ -14,9 +14,6 @@ Ext.define('saas.override.data.Connection', {
               (!serverOptions.urlPattern || new RegExp(serverOptions.urlPattern).test(originUrl))) {
                 Ext.apply(options, {
                     url: serverOptions.basePath + (originUrl.indexOf('/') == 0 ? '' : '/') + originUrl,
-                    headers: {
-                        'Authorization': ' '
-                    }
                 });
             }
         }