diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/event/ApplyEventListener.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/event/ApplyEventListener.java
index fc3c7e25..96149965 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/event/ApplyEventListener.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/event/ApplyEventListener.java
@@ -407,7 +407,7 @@ public class ApplyEventListener {
details.setPreNum(directApplyDetails.getDirectNum());
details.setAuditNum(directApplyDetails.getDirectNum());
details.setNum(directApplyDetails.getUseNum() == null ?
- BigDecimal.ZERO : BigDecimal.valueOf(directApplyDetails.getUseNum()));
+ BigDecimal.ZERO : directApplyDetails.getUseNum());
details.setStatus(String.valueOf(BackTaskStatusEnum.BACK_TASK_IN_FINISHED.getStatus()));
details.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
details.setCreateTime(DateUtils.getNowDate());
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyDetails.java
index 42dca93a..d47d2669 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyDetails.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyDetails.java
@@ -46,7 +46,14 @@ public class DirectApplyDetails extends BaseEntity {
private String unitName;
- private Integer useNum;
+ @ApiModelProperty(value = "在用数量")
+ private BigDecimal useNum;
+
+ @ApiModelProperty(value = "待转数量")
+ private BigDecimal waitTransNum;
+
+ @ApiModelProperty(value = "可转数量")
+ private BigDecimal transNum;
private String companyId;
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java
index dca1fa36..dcaee0c1 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java
@@ -1111,7 +1111,7 @@ public class DirectRotationImpl implements DirectRotationService {
details.setPreNum(directApplyDetails.getDirectNum());
details.setAuditNum(directApplyDetails.getDirectNum());
details.setNum(directApplyDetails.getUseNum() == null ?
- BigDecimal.ZERO : BigDecimal.valueOf(directApplyDetails.getUseNum()));
+ BigDecimal.ZERO : directApplyDetails.getUseNum());
details.setStatus(String.valueOf(BackTaskStatusEnum.BACK_TASK_IN_FINISHED.getStatus()));
details.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
details.setCreateTime(DateUtils.getNowDate());
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java
index 487e6af3..20f37ee4 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java
@@ -1714,7 +1714,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
details.setPreNum(directApplyDetails.getDirectNum());
details.setAuditNum(directApplyDetails.getDirectNum());
details.setNum(directApplyDetails.getUseNum() == null ?
- BigDecimal.ZERO : BigDecimal.valueOf(directApplyDetails.getUseNum()));
+ BigDecimal.ZERO : directApplyDetails.getUseNum());
details.setStatus(String.valueOf(BackTaskStatusEnum.BACK_TASK_IN_FINISHED.getStatus()));
details.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
details.setCreateTime(DateUtils.getNowDate());
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml
index 981c2aee..0a8903d5 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml
@@ -225,7 +225,8 @@
DATE(sai.start_time) as startTime,
mt.manage_type as manageType,
dai.back_agreement_id as backAgreementId,
- dai.lease_agreement_id as leaseAgreementId
+ dai.lease_agreement_id as leaseAgreementId,
+ dad.use_num as transNum
FROM
direct_apply_info dai
LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml
index 3efc227c..ba66eede 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml
@@ -102,8 +102,8 @@
- insert into direct_apply_details(direct_id,type_id,ma_id,direct_num,create_time)
- values (#{directId},#{typeId},#{maId}, #{directNum},NOW())
+ insert into direct_apply_details(direct_id,type_id,ma_id,direct_num,create_time, use_num)
+ values (#{directId},#{typeId},#{maId}, #{directNum},NOW(), #{transNum})