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

领料出库签字

This commit is contained in:
mashuai 2025-07-08 18:30:57 +08:00
parent 6de4ee15c1
commit 16774174ff
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java
View File

@ -307,4 +307,12 @@ public class LeaseApplyInfo extends BaseEntity{
@ApiModelProperty(value = "有无电子签名 0 否，1 是")
private Integer hasSign;
@ApiModelProperty(value = "签字人")
private String signPerson;
@ApiModelProperty(value = "领料出库id集合")
private String ids;
private Long leaseSignId;
}

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
View File

@ -206,12 +206,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
}
}
if (!CollectionUtils.isEmpty(list)) {
if (leaseApplyInfo.getHasSign() != null && leaseApplyInfo.getHasSign() == 1) {
// 将list集合中leaseSignUrl不为null的数据过滤出来
list = list.stream()
.filter(info -> StringUtils.isNotBlank(info.getLeaseSignUrl()))
.collect(Collectors.toList());
} else if (leaseApplyInfo.getHasSign() != null && leaseApplyInfo.getHasSign() == 0) {
if (leaseApplyInfo.getHasSign() != null && leaseApplyInfo.getHasSign() == 0) {
list = leaseApplyInfoMapper.selectNoSignList(leaseApplyInfo);
}
}

2
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
View File

@ -380,7 +380,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
AND mt1.del_flag = '0'
WHERE
1 = 1
lod.lease_sign_id is null
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
<![CDATA[ AND DATE_FORMAT( lai.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
</if>