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

领料申请管理

This commit is contained in:
hongchao 2025-02-10 17:21:16 +08:00
parent 542d02a8d9
commit 1bffc4c4e3
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,9 @@ public class LeaseApplyInfo extends BaseEntity{
@Excel(name = "租赁单位") @Excel(name = "租赁单位")
private String leaseUnit; private String leaseUnit;
@ApiModelProperty(value = "发料单位")
private String sendUnit;
@ApiModelProperty(value = "领料id") @ApiModelProperty(value = "领料id")
private Integer leaseUnitId; private Integer leaseUnitId;

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java
View File

@ -70,4 +70,7 @@ public interface LeaseApplyInfoMapper {
/** 设置审批人签名url 防止代码冲突 **/ /** 设置审批人签名url 防止代码冲突 **/
String getDirectAuditUrl(LeaseApplyInfo leaseApplyInfo); String getDirectAuditUrl(LeaseApplyInfo leaseApplyInfo);
/** 设置发料单位 防止代码冲突 **/
String getSendUnit(LeaseApplyInfo leaseApplyInfo);
} }

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

@ -102,6 +102,14 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
String directAuditUrl = leaseApplyInfoMapper.getDirectAuditUrl(info); String directAuditUrl = leaseApplyInfoMapper.getDirectAuditUrl(info);
info.setDirectAuditSignUrl(directAuditUrl); info.setDirectAuditSignUrl(directAuditUrl);
/** 设置审批人签名url 防止代码冲突 **/ /** 设置审批人签名url 防止代码冲突 **/
/** 设置发料单位 防止代码冲突 **/
if(info.getDirectAuditBy() != null){
String sendUnit = leaseApplyInfoMapper.getSendUnit(info);
info.setSendUnit(sendUnit);
}
/** 设置发料单位 防止代码冲突 **/
leaseApplyRequestVo.setLeaseApplyInfo(info); leaseApplyRequestVo.setLeaseApplyInfo(info);
// 获取领料单详情 // 获取领料单详情
List<LeaseApplyDetails> details = leaseApplyDetailsMapper.selectLeaseApplyDetailsList(new LeaseApplyDetails(info.getId(), keyword, userId)); List<LeaseApplyDetails> details = leaseApplyDetailsMapper.selectLeaseApplyDetailsList(new LeaseApplyDetails(info.getId(), keyword, userId));

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

@ -248,4 +248,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_user su from sys_user su
where su.user_id = #{directAuditBy} and su.del_flag = 0 where su.user_id = #{directAuditBy} and su.del_flag = 0
</select> </select>
<!-- 设置发料单位 防止代码冲突-->
<select id="getSendUnit" resultType="java.lang.String">
select
sd.dept_name as sendUnit
from sys_user su
left join sys_dept sd on su.dept_id = sd.dept_id and sd.del_flag = 0
where su.user_id = #{directAuditBy} and su.del_flag = 0
</select>
</mapper> </mapper>