bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
mashuai 2026-02-06 14:56:44 +08:00
parent 40e1d1874a
commit d8c999665b
6 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/event/ApplyEventListener.java
View File

@ -407,7 +407,7 @@ public class ApplyEventListener {
details.setPreNum(directApplyDetails.getDirectNum()); details.setPreNum(directApplyDetails.getDirectNum());
details.setAuditNum(directApplyDetails.getDirectNum()); details.setAuditNum(directApplyDetails.getDirectNum());
details.setNum(directApplyDetails.getUseNum() == null ? 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.setStatus(String.valueOf(BackTaskStatusEnum.BACK_TASK_IN_FINISHED.getStatus()));
details.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName()); details.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
details.setCreateTime(DateUtils.getNowDate()); details.setCreateTime(DateUtils.getNowDate());

9
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyDetails.java
View File

@ -46,7 +46,14 @@ public class DirectApplyDetails extends BaseEntity {
private String unitName; private String unitName;
private Integer useNum; @ApiModelProperty(value = "在用数量")
private BigDecimal useNum;
@ApiModelProperty(value = "待转数量")
private BigDecimal waitTransNum;
@ApiModelProperty(value = "可转数量")
private BigDecimal transNum;
private String companyId; private String companyId;

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java
View File

@ -1111,7 +1111,7 @@ public class DirectRotationImpl implements DirectRotationService {
details.setPreNum(directApplyDetails.getDirectNum()); details.setPreNum(directApplyDetails.getDirectNum());
details.setAuditNum(directApplyDetails.getDirectNum()); details.setAuditNum(directApplyDetails.getDirectNum());
details.setNum(directApplyDetails.getUseNum() == null ? 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.setStatus(String.valueOf(BackTaskStatusEnum.BACK_TASK_IN_FINISHED.getStatus()));
details.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName()); details.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
details.setCreateTime(DateUtils.getNowDate()); details.setCreateTime(DateUtils.getNowDate());

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java
View File

@ -1714,7 +1714,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
details.setPreNum(directApplyDetails.getDirectNum()); details.setPreNum(directApplyDetails.getDirectNum());
details.setAuditNum(directApplyDetails.getDirectNum()); details.setAuditNum(directApplyDetails.getDirectNum());
details.setNum(directApplyDetails.getUseNum() == null ? 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.setStatus(String.valueOf(BackTaskStatusEnum.BACK_TASK_IN_FINISHED.getStatus()));
details.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName()); details.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
details.setCreateTime(DateUtils.getNowDate()); details.setCreateTime(DateUtils.getNowDate());

3
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml
View File

@ -225,7 +225,8 @@
DATE(sai.start_time) as startTime, DATE(sai.start_time) as startTime,
mt.manage_type as manageType, mt.manage_type as manageType,
dai.back_agreement_id as backAgreementId, dai.back_agreement_id as backAgreementId,
dai.lease_agreement_id as leaseAgreementId dai.lease_agreement_id as leaseAgreementId,
dad.use_num as transNum
FROM FROM
direct_apply_info dai direct_apply_info dai
LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id

4
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml
View File

@ -102,8 +102,8 @@
</insert> </insert>
<insert id="saveDirectApplyDetails" parameterType="com.bonus.material.ma.domain.DirectApplyDetails"> <insert id="saveDirectApplyDetails" parameterType="com.bonus.material.ma.domain.DirectApplyDetails">
insert into direct_apply_details(direct_id,type_id,ma_id,direct_num,create_time) insert into direct_apply_details(direct_id,type_id,ma_id,direct_num,create_time, use_num)
values (#{directId},#{typeId},#{maId}, #{directNum},NOW()) values (#{directId},#{typeId},#{maId}, #{directNum},NOW(), #{transNum})
</insert> </insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.bonus.common.biz.domain.lease.LeaseApplyInfo" useGeneratedKeys="true"> <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.bonus.common.biz.domain.lease.LeaseApplyInfo" useGeneratedKeys="true">