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

优化

This commit is contained in:
mashuai 2025-08-08 15:30:24 +08:00
parent 4f67ac7f80
commit da3cc8fbaf
11 changed files with 78 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java
View File

@ -610,7 +610,9 @@ public class ArchivesServiceImpl implements ArchivesService {
ElcSignatureInfo elcSignatureInfo = archivesMapper.getSign(info);
if (elcSignatureInfo != null) {
if (StringUtils.isNotBlank(elcSignatureInfo.getSignUrl())) {
elcSignatureInfo.setSignUrl("data:image/png;base64," + elcSignatureInfo.getSignUrl());
if (!elcSignatureInfo.getSignUrl().startsWith("http")) {
elcSignatureInfo.setSignUrl("data:image/png;base64," + elcSignatureInfo.getSignUrl());
}
}
}
return AjaxResult.success(elcSignatureInfo);

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedTeamTotalVo.java
View File

@ -35,4 +35,10 @@ public class MaterialRetainedTeamTotalVo {
@ApiModelProperty(value = "关键字")
private String keyWord;
@ApiModelProperty(value = "身份证号码")
private String idCard;
@ApiModelProperty(value = "实施单位id")
private String impUnit;
}

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialBackApplyInfoServiceImpl.java
View File

@ -248,7 +248,9 @@ public class MaterialBackApplyInfoServiceImpl implements MaterialBackApplyInfoSe
//先根据外层id查询上层信息
MaterialBackApplyInfo backApplyInfo = materialBackInfoMapper.selectBackApplyInfoById(id);
if (StringUtils.isNotBlank(backApplyInfo.getBackSignUrl())) {
backApplyInfo.setBackSignUrl("data:image/png;base64," + backApplyInfo.getBackSignUrl());
if (!backApplyInfo.getBackSignUrl().startsWith("http")) {
backApplyInfo.setBackSignUrl("data:image/png;base64," + backApplyInfo.getBackSignUrl());
}
}
backApplyRequestVo.setBackApplyInfo(backApplyInfo);
//查询退料详情信息

16
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java
View File

@ -1094,7 +1094,7 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService {
*/
@Override
public int updateLeaseApplyInfoSign(MaterialLeaseApplyInfo leaseApplyInfo) {
leaseApplyInfo.setUpdateBy(SecurityUtils.getLoginUser().getUserid().toString());
leaseApplyInfo.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
leaseApplyInfo.setUpdateTime(DateUtils.getNowDate());
return materialLeaseInfoMapper.updateLeaseApplyInfoSign(leaseApplyInfo);
}
@ -1488,7 +1488,10 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService {
MaterialLeaseApplyInfo info = materialLeaseInfoMapper.selectLeaseApplyInfoById(leaseApplyInfo);
// 电子签名进行base64拼接
if (StringUtils.isNotBlank(info.getLeaseSignUrl())) {
info.setLeaseSignUrl("data:image/png;base64," + info.getLeaseSignUrl());
//如果info.getLeaseSignUrl()以http开头，则直接返回，否则进行拼接
if (!info.getLeaseSignUrl().startsWith("http")) {
info.setLeaseSignUrl("data:image/png;base64," + info.getLeaseSignUrl());
}
}
MaterialLeaseApplyRequestVo leaseApplyRequestVo = new MaterialLeaseApplyRequestVo();
leaseApplyRequestVo.setLeaseApplyInfo(info);
@ -1509,9 +1512,12 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService {
List<MaterialLeaseMaCodeDto> detailsList = materialLeaseInfoMapper.getList(leaseApplyInfo.getId(), details.get(0).getTypeId());
LeaseOutSign leaseOutSign = new LeaseOutSign(0, null);
if (CollectionUtil.isNotEmpty(detailsList)) {
//获取maCodeVoList第一个对象
leaseOutSign = new LeaseOutSign(detailsList.get(0).getSignType(),
"data:image/png;base64," + detailsList.get(0).getSignUrl());
if (!detailsList.get(0).getSignUrl().startsWith("http")) {
leaseOutSign = new LeaseOutSign(detailsList.get(0).getSignType(),
"data:image/png;base64," + detailsList.get(0).getSignUrl());
} else {
leaseOutSign = new LeaseOutSign(detailsList.get(0).getSignType(), detailsList.get(0).getSignUrl());
}
}
leaseApplyRequestVo.setLeaseOutSign(leaseOutSign);
}

43
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
View File

@ -614,28 +614,41 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
// 根据用户名查询项目部信息
String departId = mapper.getDepartId(username);
// 根据项目部id查询工程信息
List<String> projectIdList = mapper.getProjectId(departId);
List<BmProject> list = new ArrayList<>();
list = mapper.getProjectInfo(new BmProject());
List<MaterialRetainedTeamTotalVo> teamNumList = materialMachineMapper.getTeamNumList(bean);
if (CollectionUtils.isNotEmpty(list)) {
if (CollectionUtils.isNotEmpty(projectIdList)) {
if (StringUtils.isNotBlank(departId)) {
List<String> projectIdList = mapper.getProjectId(departId);
List<BmProject> list = mapper.getProjectInfo(new BmProject());
if (CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(projectIdList)) {
// 找出list中projectId与projectIdList中相同的数据
list = list.stream().filter(info -> projectIdList.contains(info.getProjectId())).collect(Collectors.toList());
}
if (CollectionUtils.isNotEmpty(list)) {
// 获取list中的projectId
List<String> collect = list.stream().map(BmProject::getProjectId).distinct().collect(Collectors.toList());
// 根据i8工程id查询班组信息
List<IwsTeamUserVo> iwsTeamUserVos = iwsTeamUserMapper.selectProjectTeamInfoByProjectIds(collect);
if (CollectionUtil.isNotEmpty(iwsTeamUserVos)) {
if (CollectionUtil.isNotEmpty(teamNumList)) {
// 筛选出teamNumList中班组名称和iwsTeamUserVos中班组名称相同的数据
teamNumList = teamNumList.stream().filter(item -> iwsTeamUserVos.stream().anyMatch(info -> info.getTeamName().equals(item.getTeamName()))).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(list)) {
// 获取list中的projectId
List<String> collect = list.stream().map(BmProject::getProjectId).distinct().collect(Collectors.toList());
// 根据i8工程id查询班组信息
List<IwsTeamUserVo> iwsTeamUserVos = iwsTeamUserMapper.selectProjectTeamInfoByProjectIds(collect);
if (CollectionUtil.isNotEmpty(iwsTeamUserVos)) {
if (CollectionUtil.isNotEmpty(teamNumList)) {
// 筛选出teamNumList中班组名称和iwsTeamUserVos中班组名称相同的数据
teamNumList = teamNumList.stream().filter(item -> iwsTeamUserVos.stream().anyMatch(info -> info.getTeamName().equals(item.getTeamName()))).collect(Collectors.toList());
}
}
}
}
}
// 根据用户名判断用户是否为班组长
BmTeam teamData = materialMachineMapper.getTeamData(username);
Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
if (CollectionUtils.isNotEmpty(teamNumList)) {
if (deptId != null) {
// 删除元素
teamNumList.removeIf(m -> !deptId.toString().equals(m.getImpUnit()));
}
if (teamData != null) {
return teamNumList.stream().filter(item -> {
return StringUtils.isNotBlank(item.getIdCard()) && item.getIdCard().equals(username);
}).collect(Collectors.toList());
}
}
return teamNumList;
}

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

@ -181,7 +181,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
}
// 电子签名进行base64拼接
if (StringUtils.isNotBlank(info.getLeaseSignUrl())) {
info.setLeaseSignUrl("data:image/png;base64," + info.getLeaseSignUrl());
if (!info.getLeaseSignUrl().startsWith("http")) {
info.setLeaseSignUrl("data:image/png;base64," + info.getLeaseSignUrl());
}
}
/** 设置发料单位 防止代码冲突 **/
stepTimes.put("设置签名和单位信息", System.currentTimeMillis() - step7Start);
@ -261,7 +263,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
if (!CollectionUtils.isEmpty(approveSignList)) {
for (LeaseOutSign leaseOutSign : approveSignList) {
if (StringUtils.isNotBlank(leaseOutSign.getOutSignUrl())) {
leaseOutSign.setOutSignUrl("data:image/png;base64," + leaseOutSign.getOutSignUrl());
if (!leaseOutSign.getOutSignUrl().startsWith("http")) {
leaseOutSign.setOutSignUrl("data:image/png;base64," + leaseOutSign.getOutSignUrl());
}
}
}
leaseApplyRequestVo.setApproveSignList(approveSignList);
@ -277,7 +281,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
if (!CollectionUtils.isEmpty(outSignList)) {
for (LeaseOutSign applyInfo : outSignList) {
if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) {
applyInfo.setOutSignUrl("data:image/png;base64," + applyInfo.getOutSignUrl());
if (!applyInfo.getOutSignUrl().startsWith("http")) {
applyInfo.setOutSignUrl("data:image/png;base64," + applyInfo.getOutSignUrl());
}
}
}
leaseApplyRequestVo.setKgSignList(outSignList);
@ -290,7 +296,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
if (!CollectionUtils.isEmpty(signList)) {
for (LeaseOutSign applyInfo : signList) {
if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) {
applyInfo.setOutSignUrl("data:image/png;base64," + applyInfo.getOutSignUrl());
if (!applyInfo.getOutSignUrl().startsWith("http")) {
applyInfo.setOutSignUrl("data:image/png;base64," + applyInfo.getOutSignUrl());
}
}
}
leaseApplyRequestVo.setOutSignList(signList);

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java
View File

@ -240,4 +240,7 @@ public class Type extends BaseEntity {
@ApiModelProperty(value = "库管员id")
private Long keeperUserId;
@ApiModelProperty(value = "是否检验（0不检验，1检验）")
private String isCheck;
}

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java
View File

@ -45,4 +45,7 @@ public class MachineVo extends Machine {
@ApiModelProperty("机具类型（1机具，2安全工器具）")
private int jiJuType;
@ApiModelProperty(value = "是否检验（0不检验，1检验）")
private String isCheck;
}

5
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
View File

@ -769,11 +769,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bu.unit_id as teamId,
bu.unit_name as teamName,
bu.link_man as teamLeaderIdCard,
SUM( sai.num ) as usNum
SUM( sai.num ) as usNum,
bu.bzz_idcard as idCard,
bp.imp_unit as impUnit
FROM
bm_unit bu
LEFT JOIN clz_bm_agreement_info bai ON bu.unit_id = bai.unit_id
LEFT JOIN clz_slt_agreement_info sai ON bai.agreement_id = sai.agreement_id
LEFT JOIN bm_project bp ON bp.pro_id = bai.project_id
WHERE
sai.`status` = 0 and bu.type_id = 1731
<if test="keyWord != null and keyWord != ''">

1
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
View File

@ -76,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ma.inspect_status as inspectStatus,
ma.phone as phone,
mt.jiju_type as jijuType,
mt.is_check as isCheck,
CASE
WHEN RIGHT(ma.ma_code, 4) REGEXP '^[0-9]{4}$' THEN CAST(RIGHT(ma.ma_code, 4) AS UNSIGNED)
WHEN RIGHT(ma.ma_code, 3) REGEXP '^[0-9]{3}$' THEN CAST(RIGHT(ma.ma_code, 3) AS UNSIGNED)

5
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
View File

@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="samplingRatio" column="sampling_ratio" />
<result property="isEnter" column="is_enter" />
<result property="keeperUserId" column="keep_user_id" />
<result property="isCheck" column="is_check" />
</resultMap>
<resultMap type="com.bonus.material.ma.domain.vo.MaTypeVo" id="MaTypeVoResult">
@ -174,7 +175,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP_CONCAT(distinct su2.user_name) as repair_nick_name,
GROUP_CONCAT(distinct su2.user_id) as repairerId,
hi.house_name,
t.sampling_ratio
t.sampling_ratio,
t.is_check
FROM ma_type AS t
left join ma_type mt2 on t.parent_id = mt2.type_id
left join ma_type mt3 on mt2.parent_id = mt3.type_id
@ -332,6 +334,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="notTaxPrice != null">notax_price = #{notTaxPrice},</if>
<if test="isEnter != null">is_enter = #{isEnter},</if>
<if test="keeperUserId != null">keep_user_id = #{keeperUserId},</if>
<if test="isCheck != null and isCheck != ''">is_check = #{isCheck},</if>
</trim>
where type_id = #{typeId}
</update>