diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index 4e5bc11d..52b2a4b0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -140,7 +140,7 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { // 设置制单人签名url if (StringUtils.isNotBlank(backApplyInfo.getSignUrl())) { if (!backApplyInfo.getSignUrl().startsWith("http")) { - backApplyInfo.setSignUrl("data:image/png;base64," + backApplyInfo.getBackSignUrl()); + backApplyInfo.setSignUrl("data:image/png;base64," + backApplyInfo.getSignUrl()); } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java index 68574082..ef7ac372 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java @@ -123,9 +123,10 @@ public interface LeaseApplyInfoMapper { /** * 查询领料单的领料单出库签名 * @param id + * @param publishTask * @return */ - List selectLeaseApplyOutList(Long id); + List selectLeaseApplyOutList(@Param("id") Long id, @Param("publishTask") String publishTask); /** * 修改领用发布签名 @@ -174,7 +175,7 @@ public interface LeaseApplyInfoMapper { * @param id * @return */ - List selectOutList(@Param("id") Long id, @Param("leaseSignId") String leaseSignId); + List selectOutList(@Param("id") Long id, @Param("leaseSignId") String leaseSignId, @Param("publishTask") String publishTask); /** * 查询领用单的领用单出库签名 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index ca3b5ebe..52292d89 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -286,7 +286,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { } // 步骤11: 查询出库库管员电子签名详情 long step11Start = System.currentTimeMillis(); - List outSignList = leaseApplyInfoMapper.selectLeaseApplyOutList(id); + List outSignList = leaseApplyInfoMapper.selectLeaseApplyOutList(id, publishTask); if (!CollectionUtils.isEmpty(outSignList)) { for (LeaseOutSign applyInfo : outSignList) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { @@ -301,7 +301,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { // 步骤12: 查询领料人电子签名详情 long step12Start = System.currentTimeMillis(); - List signList = leaseApplyInfoMapper.selectOutList(id, null); + List signList = leaseApplyInfoMapper.selectOutList(id, null, publishTask); if (!CollectionUtils.isEmpty(signList)) { for (LeaseOutSign applyInfo : signList) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { @@ -531,7 +531,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { } // 步骤11: 查询出库库管员电子签名详情 long step11Start = System.currentTimeMillis(); - List outSignList = leaseApplyInfoMapper.selectLeaseApplyOutList(id); + List outSignList = leaseApplyInfoMapper.selectLeaseApplyOutList(id, publishTask); if (!CollectionUtils.isEmpty(outSignList)) { for (LeaseOutSign applyInfo : outSignList) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { @@ -546,7 +546,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { // 步骤12: 查询领料人电子签名详情 long step12Start = System.currentTimeMillis(); - List signList = leaseApplyInfoMapper.selectOutList(id, null); + List signList = leaseApplyInfoMapper.selectOutList(id, null, publishTask); if (!CollectionUtils.isEmpty(signList)) { for (LeaseOutSign applyInfo : signList) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { @@ -654,7 +654,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { } // 根据id查询领料出库情况,查询出库人电子签名详情 - List outSignList = leaseApplyInfoMapper.selectLeaseApplyOutList(bean.getId()); + List outSignList = leaseApplyInfoMapper.selectLeaseApplyOutList(bean.getId(), bean.getPublishTask()); if (!CollectionUtils.isEmpty(outSignList)) { for (LeaseOutSign applyInfo : outSignList) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { @@ -680,7 +680,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { } // 根据id查询领料出库情况,查询出库人电子签名详情 - List signList = leaseApplyInfoMapper.selectOutList(bean.getId(), bean.getLeaseSignId()); + List signList = leaseApplyInfoMapper.selectOutList(bean.getId(), bean.getLeaseSignId(), bean.getPublishTask()); if (!CollectionUtils.isEmpty(signList)) { for (LeaseOutSign applyInfo : signList) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java index ca7711e8..74944ecc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java @@ -251,5 +251,7 @@ public class SltAgreementInfo extends BaseEntity { private String repairCode; + private String unitValue; + } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml index 413dacfb..f89c47e3 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml @@ -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 WHERE lod.parent_id = #{id} AND su.sign_url IS NOT NULL + + AND lod.publish_task = #{publishTask} + GROUP BY su.user_id @@ -623,6 +626,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and lsi.id = #{leaseSignId} + + and lod.publish_task = #{publishTask} + GROUP BY lod.lease_sign_id @@ -666,7 +672,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.`code` AS CODE, lai.create_by AS createBy, lai.create_time AS createTime, - lai.lease_person AS leasePerson, + a.lease_person AS leasePerson, lai.phone AS phone, a.unit_id AS leaseUnitId, a.project_id AS leaseProjectId, @@ -686,7 +692,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lease_out_details lod 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 (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 and a.publish_task = lod.publish_task LEFT JOIN bm_unit bu ON bu.unit_id = a.unit_id diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml index 522702d9..855e346f 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml @@ -64,6 +64,7 @@ sai.ma_id as maId, sai.type_id as typeId, lai.create_time as createTime, + mt.unit_value as unitValue, sai.* FROM slt_agreement_info sai