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/service/impl/FundtransferServiceImpl.java

@@ -61,13 +61,21 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
 
         Long id = fundtransfer.getId();
 
-        if (fundtransfer.getId() > 0){
+        DocBaseDTO baseDTO = new DocBaseDTO();
+        if (id > 0){
             fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
+            baseDTO = getBaseDTOById(id);
+            //日志记录
+            messageLogService.update(baseDTO);
         }else {
             fundtransfer.setCompanyId(BaseContextHolder.getCompanyId());
             fundtransfer.setFt_recorder(BaseContextHolder.getUserName());
             fundtransferMapper.insertSelective(fundtransfer);
             id = fundtransfer.getId();
+
+            baseDTO = getBaseDTOById(id);
+            //日志记录
+            messageLogService.save(baseDTO);
         }
 
         Iterator isdet = fundtransferdetails.iterator();
@@ -82,9 +90,6 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
                 fundtransferdetailMapper.insertSelective(fundtransferdetail);
             }
         }
-        DocBaseDTO baseDTO = getBaseDTOById(id);
-        //日志记录
-        messageLogService.save(baseDTO);
         return baseDTO;
     }
 
@@ -161,7 +166,7 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
         }
         DocBaseDTO baseDTO = getBaseDTOById(id);
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.audit(baseDTO);
         return baseDTO;
     }
 
@@ -219,7 +224,7 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
 
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.unAudit(baseDTO);
     }
 
 
@@ -229,7 +234,7 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
         fundtransferdetailMapper.deleteByPrimaryKey(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.delete(baseDTO);
     }
 
     @Override
@@ -237,7 +242,7 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
         fundtransferdetailMapper.deleteItem(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.deleteDetail(baseDTO);
     }
 
     @Override

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

@@ -69,13 +69,20 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
 
         Long id = othreceipts.getId();
 
+        DocBaseDTO baseDTO = new DocBaseDTO();
         if (othreceipts.getId() > 0){
             othreceiptsMapper.updateByPrimaryKeySelective(othreceipts);
+            baseDTO = getBaseDTOById(id);
+            //日志记录
+            messageLogService.update(baseDTO);
         }else {
             othreceipts.setCompanyId(BaseContextHolder.getCompanyId());
             othreceipts.setOr_recorder(BaseContextHolder.getUserName());
             othreceiptsMapper.insertSelective(othreceipts);
             id = othreceipts.getId();
+            baseDTO = getBaseDTOById(id);
+            //日志记录
+            messageLogService.save(baseDTO);
         }
 
         Iterator isdet = othreceiptsdetail.iterator();
@@ -90,9 +97,6 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
                 othreceiptsdetailMapper.insertSelective(othreceiptsdetail1);
             }
         }
-        DocBaseDTO baseDTO = getBaseDTOById(id);
-        //日志记录
-        messageLogService.save(baseDTO);
         return baseDTO;
     }
 
@@ -183,7 +187,7 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
 //                "rb_id="+baseDTO.getId(),"rb_status","rb_statuscode",
 //                "rb_auditdate","rb_auditman");
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.audit(baseDTO);
         return baseDTO;
     }
 
@@ -224,7 +228,7 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         }
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.unAudit(baseDTO);
     }
 
     @Override
@@ -233,14 +237,14 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         othreceiptsdetailMapper.deleteByPrimaryKey(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.delete(baseDTO);
     }
 
     public void deleteItem(int id) {
         othreceiptsdetailMapper.deleteItem(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.deleteDetail(baseDTO);
     }
 
     @Override

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

@@ -64,13 +64,21 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         Long id = othspendings.getId();
 
 
+        DocBaseDTO baseDTO = new DocBaseDTO();
         if (othspendings.getId() > 0){
             othspendingsMapper.updateByPrimaryKeySelective(othspendings);
+            baseDTO = getBaseDTOById(id);
+            //日志记录
+            messageLogService.update(baseDTO);
         }else {
             othspendings.setCompanyId(BaseContextHolder.getCompanyId());
             othspendings.setOs_recorder(BaseContextHolder.getUserName());
             othspendingsMapper.insertSelective(othspendings);
             id = othspendings.getId();
+
+            baseDTO = getBaseDTOById(id);
+            //日志记录
+            messageLogService.save(baseDTO);
         }
 
         Iterator isdet = othspendingsdetails.iterator();
@@ -85,9 +93,6 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
                 othspendingsdetailMapper.insertSelective(othspendingsdetail);
             }
         }
-        DocBaseDTO baseDTO = getBaseDTOById(id);
-        //日志记录
-        messageLogService.save(baseDTO);
         return baseDTO;
     }
 
@@ -97,7 +102,7 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         othspendingsdetailMapper.deleteItem(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.delete(baseDTO);
     }
 
     @Override
@@ -105,7 +110,7 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         othspendingsdetailMapper.deleteItem(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.deleteDetail(baseDTO);
     }
 
     @Override
@@ -210,7 +215,7 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         }
         DocBaseDTO baseDTO = getBaseDTOById(id);
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.audit(baseDTO);
         return baseDTO;
     }
 
@@ -287,7 +292,7 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
 
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.unAudit(baseDTO);
     }
 
     @Override

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

@@ -68,14 +68,21 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         //校验数据
         checkPaybalance(pay);
 
-        if (paybalance.getId() > 0){
+        DocBaseDTO baseDTO = new DocBaseDTO();
+
+        if (pbId > 0){
             paybalanceMapper.updateByPrimaryKeySelective(paybalance);
+            baseDTO = getBaseDTOById(pbId);
+            //日志记录
+            messageLogService.update(baseDTO);
         }else {
             paybalance.setCompanyId(BaseContextHolder.getCompanyId());
             paybalance.setPb_recorder(BaseContextHolder.getUserName());
             paybalanceMapper.insertSelective(paybalance);
             pbId = paybalance.getId();
-            System.out.println("rbid:" + pbId);
+            baseDTO = getBaseDTOById(pbId);
+            //日志记录
+            messageLogService.save(baseDTO);
         }
 
         Iterator isdet = paybalancedet.iterator();
@@ -103,9 +110,6 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
                 paybalancedetailMapper.insertSelective(paybalancedetail1);
             }
         }
-        DocBaseDTO baseDTO = getBaseDTOById(pbId);
-        //日志记录
-        messageLogService.save(baseDTO);
         return baseDTO;
     }
 
@@ -270,7 +274,7 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
 //                "pb_id="+baseDTO.getId(),"pb_status","pb_statuscode",
 //                "pb_auditdate","pb_auditman");
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.audit(baseDTO);
         return baseDTO;
     }
 
@@ -353,7 +357,7 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         }
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.unAudit(baseDTO);
     }
 
     public void delete(int id){
@@ -362,7 +366,7 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         paybalancedetMapper.deleteByPrimaryKey(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.delete(baseDTO);
     }
 
     @Override
@@ -370,7 +374,7 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         paybalancedetMapper.deleteItem(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.deleteDetail(baseDTO);
     }
 
     @Override
@@ -378,7 +382,7 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         paybalancedetailMapper.deleteItem(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.deleteDetail(baseDTO);
     }
 
     public Pay select(int id){

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

@@ -66,14 +66,22 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         //校验数据
         checkRecbalance(rec);
 
+        DocBaseDTO baseDTO = new DocBaseDTO();
         Long rbId = recbalance.getId();
         if (rbId > 0){
             recbalanceMapper.updateByPrimaryKeySelective(recbalance);
+            baseDTO = getBaseDTOById(rbId);
+            //日志记录
+            messageLogService.update(baseDTO);
         }else {
             recbalance.setCompanyId(BaseContextHolder.getCompanyId());
             recbalance.setRb_recorder(BaseContextHolder.getUserName());
             recbalanceMapper.insertSelective(recbalance);
             rbId = recbalance.getId();
+
+            baseDTO = getBaseDTOById(rbId);
+            //日志记录
+            messageLogService.save(baseDTO);
         }
 
         Iterator isdet = recbalancedet.iterator();
@@ -101,9 +109,6 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
                 recbalancedetailMapper.insertSelective(recbalancedetail1);
             }
         }
-        DocBaseDTO baseDTO = getBaseDTOById(rbId);
-        //日志记录
-        messageLogService.save(baseDTO);
         return baseDTO;
     }
 
@@ -177,7 +182,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         recbalancedetailMapper.deleteByPrimaryKey(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.delete(baseDTO);
     }
 
     @Override
@@ -197,7 +202,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         recbalancedetMapper.deleteItem(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.deleteDetail(baseDTO);
     }
 
     @Override
@@ -205,7 +210,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         recbalancedetailMapper.deleteItem(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.deleteDetail(baseDTO);
     }
 
     @Override
@@ -306,7 +311,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
 //                "rb_id="+baseDTO.getId(),"rb_status","rb_statuscode",
 //                "rb_auditdate","rb_auditman");
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.audit(baseDTO);
         return baseDTO;
     }
 
@@ -390,7 +395,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         }
         DocBaseDTO baseDTO = getBaseDTOById(id);
         //日志记录
-        messageLogService.save(baseDTO);
+        messageLogService.unAudit(baseDTO);
     }
 
     public PageInfo<Recbalance> selectList(PageRequest page, ListReqDTO reqDTO) {