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

机具优化

This commit is contained in:
mashuai 2025-09-24 16:15:16 +08:00
parent 9dab95e001
commit 9236606439
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
View File

@ -140,7 +140,7 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
// 设置制单人签名url // 设置制单人签名url
if (StringUtils.isNotBlank(backApplyInfo.getSignUrl())) { if (StringUtils.isNotBlank(backApplyInfo.getSignUrl())) {
if (!backApplyInfo.getSignUrl().startsWith("http")) { if (!backApplyInfo.getSignUrl().startsWith("http")) {
backApplyInfo.setSignUrl("data:image/png;base64," + backApplyInfo.getBackSignUrl()); backApplyInfo.setSignUrl("data:image/png;base64," + backApplyInfo.getSignUrl());
} }
} }

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

@ -123,9 +123,10 @@ public interface LeaseApplyInfoMapper {
/** /**
* 查询领料单的领料单出库签名 * 查询领料单的领料单出库签名
* @param id * @param id
* @param publishTask
* @return * @return
*/ */
List<LeaseOutSign> selectLeaseApplyOutList(Long id); List<LeaseOutSign> selectLeaseApplyOutList(@Param("id") Long id, @Param("publishTask") String publishTask);
/** /**
* 修改领用发布签名 * 修改领用发布签名
@ -174,7 +175,7 @@ public interface LeaseApplyInfoMapper {
* @param id * @param id
* @return * @return
*/ */
List<LeaseOutSign> selectOutList(@Param("id") Long id, @Param("leaseSignId") String leaseSignId); List<LeaseOutSign> selectOutList(@Param("id") Long id, @Param("leaseSignId") String leaseSignId, @Param("publishTask") String publishTask);
/** /**
* 查询领用单的领用单出库签名 * 查询领用单的领用单出库签名

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

@ -286,7 +286,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
} }
// 步骤11: 查询出库库管员电子签名详情 // 步骤11: 查询出库库管员电子签名详情
long step11Start = System.currentTimeMillis(); long step11Start = System.currentTimeMillis();
List<LeaseOutSign> outSignList = leaseApplyInfoMapper.selectLeaseApplyOutList(id); List<LeaseOutSign> outSignList = leaseApplyInfoMapper.selectLeaseApplyOutList(id, publishTask);
if (!CollectionUtils.isEmpty(outSignList)) { if (!CollectionUtils.isEmpty(outSignList)) {
for (LeaseOutSign applyInfo : outSignList) { for (LeaseOutSign applyInfo : outSignList) {
if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) {
@ -301,7 +301,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
// 步骤12: 查询领料人电子签名详情 // 步骤12: 查询领料人电子签名详情
long step12Start = System.currentTimeMillis(); long step12Start = System.currentTimeMillis();
List<LeaseOutSign> signList = leaseApplyInfoMapper.selectOutList(id, null); List<LeaseOutSign> signList = leaseApplyInfoMapper.selectOutList(id, null, publishTask);
if (!CollectionUtils.isEmpty(signList)) { if (!CollectionUtils.isEmpty(signList)) {
for (LeaseOutSign applyInfo : signList) { for (LeaseOutSign applyInfo : signList) {
if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) {
@ -531,7 +531,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
} }
// 步骤11: 查询出库库管员电子签名详情 // 步骤11: 查询出库库管员电子签名详情
long step11Start = System.currentTimeMillis(); long step11Start = System.currentTimeMillis();
List<LeaseOutSign> outSignList = leaseApplyInfoMapper.selectLeaseApplyOutList(id); List<LeaseOutSign> outSignList = leaseApplyInfoMapper.selectLeaseApplyOutList(id, publishTask);
if (!CollectionUtils.isEmpty(outSignList)) { if (!CollectionUtils.isEmpty(outSignList)) {
for (LeaseOutSign applyInfo : outSignList) { for (LeaseOutSign applyInfo : outSignList) {
if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) {
@ -546,7 +546,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
// 步骤12: 查询领料人电子签名详情 // 步骤12: 查询领料人电子签名详情
long step12Start = System.currentTimeMillis(); long step12Start = System.currentTimeMillis();
List<LeaseOutSign> signList = leaseApplyInfoMapper.selectOutList(id, null); List<LeaseOutSign> signList = leaseApplyInfoMapper.selectOutList(id, null, publishTask);
if (!CollectionUtils.isEmpty(signList)) { if (!CollectionUtils.isEmpty(signList)) {
for (LeaseOutSign applyInfo : signList) { for (LeaseOutSign applyInfo : signList) {
if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) {
@ -654,7 +654,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
} }
// 根据id查询领料出库情况，查询出库人电子签名详情 // 根据id查询领料出库情况，查询出库人电子签名详情
List<LeaseOutSign> outSignList = leaseApplyInfoMapper.selectLeaseApplyOutList(bean.getId()); List<LeaseOutSign> outSignList = leaseApplyInfoMapper.selectLeaseApplyOutList(bean.getId(), bean.getPublishTask());
if (!CollectionUtils.isEmpty(outSignList)) { if (!CollectionUtils.isEmpty(outSignList)) {
for (LeaseOutSign applyInfo : outSignList) { for (LeaseOutSign applyInfo : outSignList) {
if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) {
@ -680,7 +680,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
} }
// 根据id查询领料出库情况，查询出库人电子签名详情 // 根据id查询领料出库情况，查询出库人电子签名详情
List<LeaseOutSign> signList = leaseApplyInfoMapper.selectOutList(bean.getId(), bean.getLeaseSignId()); List<LeaseOutSign> signList = leaseApplyInfoMapper.selectOutList(bean.getId(), bean.getLeaseSignId(), bean.getPublishTask());
if (!CollectionUtils.isEmpty(signList)) { if (!CollectionUtils.isEmpty(signList)) {
for (LeaseOutSign applyInfo : signList) { for (LeaseOutSign applyInfo : signList) {
if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) {

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java
View File

@ -251,5 +251,7 @@ public class SltAgreementInfo extends BaseEntity {
private String repairCode; private String repairCode;
private String unitValue;
} }

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

@ -396,6 +396,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN lease_out_details lod ON su.user_id = lod.create_by LEFT JOIN lease_out_details lod ON su.user_id = lod.create_by
WHERE WHERE
lod.parent_id = #{id} AND su.sign_url IS NOT NULL lod.parent_id = #{id} AND su.sign_url IS NOT NULL
<if test="publishTask != null and publishTask != ''">
AND lod.publish_task = #{publishTask}
</if>
GROUP BY GROUP BY
su.user_id su.user_id
</select> </select>
@ -623,6 +626,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="leaseSignId != null"> <if test="leaseSignId != null">
and lsi.id = #{leaseSignId} and lsi.id = #{leaseSignId}
</if> </if>
<if test="publishTask != null and publishTask != ''">
and lod.publish_task = #{publishTask}
</if>
GROUP BY GROUP BY
lod.lease_sign_id lod.lease_sign_id
</select> </select>
@ -666,7 +672,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.`code` AS CODE, a.`code` AS CODE,
lai.create_by AS createBy, lai.create_by AS createBy,
lai.create_time AS createTime, lai.create_time AS createTime,
lai.lease_person AS leasePerson, a.lease_person AS leasePerson,
lai.phone AS phone, lai.phone AS phone,
a.unit_id AS leaseUnitId, a.unit_id AS leaseUnitId,
a.project_id AS leaseProjectId, a.project_id AS leaseProjectId,
@ -686,7 +692,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
lease_out_details lod lease_out_details lod
LEFT JOIN lease_apply_info lai ON lai.id = lod.parent_id LEFT JOIN lease_apply_info lai ON lai.id = lod.parent_id
LEFT JOIN tm_task tt ON lai.task_id = tt.task_id LEFT JOIN tm_task tt ON lai.task_id = tt.task_id
LEFT JOIN (SELECT parent_id, unit_id,project_id,create_time,`code`,publish_task from lease_publish_details LEFT JOIN (SELECT parent_id, unit_id,project_id,create_time,`code`,publish_task,lease_person from lease_publish_details
GROUP BY parent_id,publish_task) a ON a.parent_id = lod.parent_id GROUP BY parent_id,publish_task) a ON a.parent_id = lod.parent_id
and a.publish_task = lod.publish_task and a.publish_task = lod.publish_task
LEFT JOIN bm_unit bu ON bu.unit_id = a.unit_id LEFT JOIN bm_unit bu ON bu.unit_id = a.unit_id

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

@ -64,6 +64,7 @@
sai.ma_id as maId, sai.ma_id as maId,
sai.type_id as typeId, sai.type_id as typeId,
lai.create_time as createTime, lai.create_time as createTime,
mt.unit_value as unitValue,
sai.* sai.*
FROM FROM
slt_agreement_info sai slt_agreement_info sai