From c4d5699264e80a109282ee9f3335bafabcabadb9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 25 十一月 2024 15:37:02 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 8 +++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java | 5 +++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
index df4f44f..4d2465c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -135,7 +135,13 @@
}
if(param.getAddBillList()!=null && param.getAddBillList().size()>0){
for(YwContractBill bill: param.getAddBillList()){
- if(bill.getCostType() == null){
+ if(bill.getCostType() == null
+ ||bill.getFeeType() == null
+ ||bill.getReceivableFee() == null
+ ||bill.getCompanyId() == null
+ ||bill.getPlanPayDate() == null
+ ||(Constants.equalsInteger(bill.getFeeType(),Constants.ZERO)
+ && (bill.getStartDate() ==null || bill.getEndDate() ==null) )){
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
index 4027840..f4c95e9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
@@ -185,8 +185,9 @@
update.setDispatchUserId(update.getEditor());
update.setDispatchDate(update.getEditDate());
update.setDispatchInfo(ywWorkorder.getDispatchInfo());
+ update.setDealUserId(ywWorkorder.getDealUserId());
ywWorkorderMapper.updateById(update);
- dealLogBiz(model,Constants.YwLogType.WORKORDER_DISPATCH,model.getLoginUserInfo().getRealname(),user.getRealname());//璁板綍鏂板缓鏃ュ織
+ dealLogBiz(model,Constants.YwLogType.WORKORDER_DISPATCH,ywWorkorder.getLoginUserInfo().getRealname(),user.getRealname());//璁板綍鏂板缓鏃ュ織
}
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -212,7 +213,7 @@
update.setDealDate(update.getEditDate());
update.setDealInfo(ywWorkorder.getDispatchInfo());
ywWorkorderMapper.updateById(update);
- dealLogBiz(model,Constants.YwLogType.WORKORDER_DEAL,model.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
+ dealLogBiz(model,Constants.YwLogType.WORKORDER_DEAL,ywWorkorder.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
}
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
--
Gitblit v1.9.3