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

增加直转数据标识

This commit is contained in:
hayu 2025-10-09 16:57:20 +08:00
parent d93c4a38f9
commit 47e5755fc5
4 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackApplyInfo.java
View File

@ -219,4 +219,7 @@ public class MaterialBackApplyInfo implements Serializable {
@ApiModelProperty(value = "是否电子签名 0 是，1 否") @ApiModelProperty(value = "是否电子签名 0 是，1 否")
private Integer isElectronicSign; private Integer isElectronicSign;
@ApiModelProperty(value = "是否直转 0 否，1 是")
private Integer isZz;
} }

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyInfo.java
View File

@ -335,4 +335,7 @@ public class MaterialLeaseApplyInfo extends BaseEntity {
@ApiModelProperty(value = "领料类型：0：班组，1：项目部") @ApiModelProperty(value = "领料类型：0：班组，1：项目部")
private String pickType; private String pickType;
@ApiModelProperty(value = "是否直转 0 否，1 是")
private Integer isZz;
} }

14
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml
View File

@ -228,6 +228,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.external_id AS externalId, bp.external_id AS externalId,
bp.imp_unit AS impUnit, bp.imp_unit AS impUnit,
bt.bzz_idcard AS idCard, bt.bzz_idcard AS idCard,
bai.direct_id as directId,
CASE
WHEN bai.direct_id is null THEN
'0'
ELSE
'1'
END isZz,
CASE WHEN bai.back_sign_url IS NOT NULL CASE WHEN bai.back_sign_url IS NOT NULL
THEN 0 THEN 0
ELSE 1 ELSE 1
@ -327,6 +334,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bai.print_status as printStatus, bai.print_status as printStatus,
bp.external_id AS externalId, bp.external_id AS externalId,
bp.imp_unit AS impUnit, bp.imp_unit AS impUnit,
bai.direct_id as directId,
CASE
WHEN bai.direct_id is null THEN
'0'
ELSE
'1'
END isZz,
bu.bzz_idcard AS idCard bu.bzz_idcard AS idCard
FROM FROM
back_apply_info bai back_apply_info bai

21
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
View File

@ -88,6 +88,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bai.unit_id, bai.unit_id,
bai.project_id as projectId, bai.project_id as projectId,
bt.link_man as relName, bt.link_man as relName,
lai.direct_id as directId,
CASE
WHEN lai.direct_id is null THEN
'0'
ELSE
'1'
END isZz,
CASE WHEN lai.lease_sign_url IS NOT NULL CASE WHEN lai.lease_sign_url IS NOT NULL
THEN 0 THEN 0
ELSE 1 ELSE 1
@ -538,6 +545,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.external_id AS externalId, bp.external_id AS externalId,
bu.bzz_idcard AS idCard, bu.bzz_idcard AS idCard,
bp.imp_unit AS impUnit, bp.imp_unit AS impUnit,
lai.direct_id as directId,
CASE
WHEN lai.direct_id is null THEN
'0'
ELSE
'1'
END isZz,
lai.remark as remark, lai.remark as remark,
CASE CASE
WHEN MAX(IFNULL(lad.is_update, 0)) = 1 THEN 1 WHEN MAX(IFNULL(lad.is_update, 0)) = 1 THEN 1
@ -1196,6 +1210,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.external_id AS externalId, bp.external_id AS externalId,
bu.bzz_idcard AS idCard, bu.bzz_idcard AS idCard,
bp.imp_unit AS impUnit, bp.imp_unit AS impUnit,
lai.direct_id as directId,
CASE
WHEN lai.direct_id is null THEN
'0'
ELSE
'1'
END isZz,
lpd.remark as remark, lpd.remark as remark,
CASE CASE
WHEN MAX(IFNULL(lpd.is_update, 0)) = 1 THEN 1 WHEN MAX(IFNULL(lpd.is_update, 0)) = 1 THEN 1