From a86638a9a61275a3fdb82288bb8ee60ceb8a5064 Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Sat, 26 Jul 2025 13:22:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=94=B5=E5=AD=90=E7=AD=BE?= =?UTF-8?q?=E5=90=8D=E9=80=9A=E7=9F=A5=E6=9D=90=E6=96=99=E5=91=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/domain/lease/LeaseApplyInfo.java | 4 ++++ .../lease/mapper/LeaseApplyInfoMapper.java | 23 +++++++++---------- .../impl/LeaseApplyInfoServiceImpl.java | 22 ++++++++++++++++++ .../material/lease/LeaseApplyInfoMapper.xml | 23 +++++++++++++++++++ 4 files changed, 60 insertions(+), 12 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java index 5567299e..27d7dfb1 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java @@ -336,4 +336,8 @@ public class LeaseApplyInfo extends BaseEntity{ @ApiModelProperty(value = "发布人id") private Long publisher; + @ApiModelProperty(value = "账号") + private String cno; + + } 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 2ce7d2bf..3104a998 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 @@ -10,14 +10,14 @@ import org.apache.ibatis.annotations.Param; /** * 领料任务Mapper接口 - * + * * @author xsheng * @date 2024-10-16 */ public interface LeaseApplyInfoMapper { /** * 查询领料任务 - * + * * @param leaseApplyInfo * @return 领料任务 */ @@ -25,7 +25,7 @@ public interface LeaseApplyInfoMapper { /** * 查询领料任务列表 - * + * * @param leaseApplyInfo 领料任务 * @return 领料任务集合 */ @@ -33,7 +33,7 @@ public interface LeaseApplyInfoMapper { /** * 新增领料任务 - * + * * @param leaseApplyInfo 领料任务 * @return 结果 */ @@ -41,7 +41,7 @@ public interface LeaseApplyInfoMapper { /** * 修改领料任务 - * + * * @param leaseApplyInfo 领料任务 * @return 结果 */ @@ -61,7 +61,7 @@ public interface LeaseApplyInfoMapper { /** * 删除领料任务 - * + * * @param id 领料任务主键 * @return 结果 */ @@ -69,7 +69,7 @@ public interface LeaseApplyInfoMapper { /** * 批量删除领料任务 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ @@ -170,10 +170,9 @@ public interface LeaseApplyInfoMapper { */ List selectPublish(LeaseApplyInfo leaseApplyInfo); - /** - * 根据id去查询出库数量 - * @param applyInfo - * @return - */ + List getUserList(LeaseApplyInfo leaseApplyInfo); + + LeaseApplyInfo getUserPhoneById(LeaseApplyInfo item); + LeaseApplyInfo getOutList(LeaseApplyInfo applyInfo); } 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 fee5fd88..4d75cdc8 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 @@ -7,7 +7,11 @@ import java.util.*; import java.util.stream.Collectors; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.json.JSONObject; +import com.ah.sbd.SmsTool; +import com.ah.sbd.utils.param.BatchSmsByContentParam; import com.bonus.common.biz.config.PoiOutPage; +import com.bonus.common.biz.constant.BmConfigItems; import com.bonus.common.biz.constant.MaterialConstants; import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.common.biz.domain.lease.*; @@ -1132,6 +1136,24 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { } } } + + List userList = leaseApplyInfoMapper.getUserList(leaseApplyInfo); + // 省公司短信发送 + List mobileList = new ArrayList(); + if(userList !=null && userList.size()>0){ + for (LeaseApplyInfo item : userList){ + LeaseApplyInfo item1 = leaseApplyInfoMapper.getUserPhoneById(item); + mobileList.add(item1.getPhone()); + } + } + if (mobileList != null && mobileList.size() > 0){ + JSONObject sendResult = SmsTool.sendSms(new BatchSmsByContentParam(mobileList, "您有一条待确认的领料信息，请尽快登录机具系统进行确认！"), BmConfigItems.ANHUI_COMPANY_SMS_KEY); + if (sendResult != null) { + // 短信发送成功 + result =1; + } + } + return result; } 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 4a97e9ba..6a5d506b 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 @@ -803,4 +803,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_confirm = 2 where id = #{id} + + + +