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}