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-15 10:06:22 +08:00
parent ec9578a99f
commit fa6d7d58b8
5 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/BmTeamServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.bonus.material.clz.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.PhoneUtil;
import com.bonus.common.biz.constant.MaterialConstants;
import com.bonus.common.biz.enums.HttpCodeEnum;
import com.bonus.common.core.utils.StringUtils;
import com.bonus.common.core.utils.encryption.Sm4Utils;
@ -154,6 +155,12 @@ public class BmTeamServiceImpl implements BmTeamService {
*/
@Override
public AjaxResult getListByIdCard(BmTeam tbTeam) {
if (StringUtils.isNotBlank(tbTeam.getIdCard())) {
// 校验身份证号是否符合正则格式
if (!tbTeam.getIdCard().matches(MaterialConstants.CREDENTIALS_CODE_PATTERN)) {
tbTeam.setIdCard(null);
}
}
return AjaxResult.success(bmTeamMapper.queryByPage(tbTeam));
}

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java
View File

@ -250,4 +250,11 @@ public interface SelectMapper {
* @return
*/
List<String> getProjectId(String departId);
/**
* 获取材料站退料往来单位id和标段工程id获取协议信息
* @param dto
* @return
*/
List<AgreementVo> getAgreementInfoByIdBack(SelectDto dto);
}

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
View File

@ -274,7 +274,7 @@ public class SelectServiceImpl implements SelectService {
if (dto != null && dto.getTeamId() != null) {
dto.setUnitId(Integer.parseInt(dto.getTeamId()));
}
List<AgreementVo> list = mapper.getAgreementInfoById(dto);
List<AgreementVo> list = mapper.getAgreementInfoByIdBack(dto);
if (CollectionUtils.isNotEmpty(list)) {
vo = list.get(0);
}

2
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml
View File

@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createUser != null">
and t.create_by = #{createUser}
</if>
<if test="idCard != null">
<if test="idCard != null and idCard != ''">
and t.bzz_idcard = #{idCard}
</if>
<if test="keyWord != null and keyWord != ''">

10
bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
View File

@ -190,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT agreement_id AS agreementId,
agreement_code AS agreementCode,
is_slt AS isSlt
FROM clz_bm_agreement_info
FROM bm_agreement_info
WHERE unit_id = #{unitId} AND project_id = #{projectId} AND status = '1'
</select>
@ -576,4 +576,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND project_dept_id = #{departId}
</if>
</select>
<select id="getAgreementInfoByIdBack" resultType="com.bonus.material.common.domain.vo.AgreementVo">
SELECT agreement_id AS agreementId,
agreement_code AS agreementCode,
is_slt AS isSlt
FROM clz_bm_agreement_info
WHERE unit_id = #{unitId} AND project_id = #{projectId} AND status = '1'
</select>
</mapper>