From 91a09485873354627cf0ed7497a4c01e7bca9d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 25 Apr 2022 04:24:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ctrl/XmTaskSbillDetailController.java | 20 ++++++++++++++++++- .../service/XmTaskSbillDetailService.java | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java index f4b8bfe9..b9c624c4 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java @@ -3,6 +3,7 @@ package com.xm.core.ctrl; import java.util.*; import java.util.stream.Collectors; +import com.mdp.core.utils.ResponseHelper; import com.xm.core.entity.XmTaskSbill; import com.xm.core.service.XmTaskSbillService; import org.slf4j.Logger; @@ -172,6 +173,12 @@ public class XmTaskSbillDetailController { Set fields=new HashSet<>(); fields.add("id"); + fields.add("samt"); + fields.add("quoteAt"); + fields.add("tactAt"); + fields.add("userid"); + fields.add("taskId"); + fields.add("projectId"); for (String fieldName : xmTaskSbillDetailMap.keySet()) { if(fields.contains(fieldName)){ return failed(fieldName+"-no-edit",fieldName+"不允许修改"); @@ -188,6 +195,17 @@ public class XmTaskSbillDetailController { if(xmTaskSbillDetailsDb==null ||xmTaskSbillDetailsDb.size()==0){ return failed("data-0","记录已不存在"); } + if(fieldKey.contains("othFee")){ + if(xmTaskSbillDetailsDb.size()>1){ + return failed("data-not-1","其他费用的修改只能一次修改一条记录，不能批量修改"); + }else{ + XmTaskSbillDetail detail=xmTaskSbillDetailsDb.get(0); + this.xmTaskSbillDetailService.preCalcSamt(detail); + this.xmTaskSbillDetailService.updateSomeFieldByPk(detail); + this.xmTaskSbillService.updateBySbillDetailList(Arrays.asList(detail.getSbillId())); + return ResponseHelper.ok("成功"); + } + } List can=new ArrayList<>(); List no=new ArrayList<>(); User user = LoginUtils.getCurrentUserInfo(); @@ -263,7 +281,7 @@ public class XmTaskSbillDetailController { } List msgs=new ArrayList<>(); if(can.size()>0){ - xmTaskSbillDetailService.batchDoDelete(xmTaskSbillDetails); + xmTaskSbillDetailService.batchDoDelete(can); msgs.add(String.format("成功删除%s条数据.",can.size())); } diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java index 5dffe9c5..ae0a91e8 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java @@ -55,7 +55,7 @@ public class XmTaskSbillDetailService extends BaseService { @Transactional public void doEditSomeFields(Map xmTaskSbillDetailMap,List sbillIds) { super.editSomeFields(xmTaskSbillDetailMap); - if(xmTaskSbillDetailMap.containsKey("samt")){ + if(xmTaskSbillDetailMap.containsKey("othFee")){ xmTaskSbillService.updateBySbillDetailList(sbillIds); } }