From 0d582fa0b9879bd24a30deb3582f3d67ff265812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 8 Jul 2022 09:52:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=B7=A5=E6=97=B6=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xm/core/ctrl/XmTaskSbillController.java | 2 ++ .../mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java index a548dea7..de4f065f 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java @@ -273,6 +273,8 @@ public class XmTaskSbillController { detail.setSschemel(xmTask.getSettleSchemel()); detail.setShareFee(xmTask.getShareFee()); detail.setOshare(xmTask.getOshare()); + detail.setTaskName(xmTask.getName()); + detail.setUniPrice("1".equals(xmTask.getTaskOut())?xmTask.getUniOutPrice():xmTask.getUniInnerPrice()); detailMap.put(xmTaskWorkload.getUserid()+"-"+xmTaskWorkload.getTaskId(),detail); }else{ detail.setWorkload(detail.getWorkload().add(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO))); diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml index c94db07a..d6ab8562 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml @@ -218,7 +218,7 @@ - update xm_task_workload res set res.sstatus='1',res.detail_id=null + update xm_task_workload res set res.sstatus='1',res.detail_id=null,res.sbill_id=null where res.detail_id in #{item}