From 040914ea8ab4f59a08a0049cf2016155b100b1b7 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Tue, 14 Jan 2025 15:15:46 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=9A=20=E5=85=B0?= =?UTF-8?q?=E5=9D=AAIOS=E7=AC=AC=E4=BA=8C=E8=BD=AE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entry/service/EntryPersonServiceImpl.java | 14 ++ .../mapper/entry/EntryPersonMapper.xml | 3 +- modules/bmw/pom.xml | 6 + .../bmw/basic/controller/UserController.java | 10 ++ .../bonus/bmw/basic/entity/BankCardBean.java | 37 ++++++ .../bonus/bmw/basic/service/UserService.java | 8 ++ .../bmw/basic/service/UserServiceImpl.java | 123 ++++++++++++++++++ .../service/LocalSysFileServiceImpl.java | 4 +- 8 files changed, 202 insertions(+), 3 deletions(-) create mode 100644 modules/bmw/src/main/java/com/bonus/bmw/basic/entity/BankCardBean.java diff --git a/modules/app/src/main/java/com/bonus/app/entry/service/EntryPersonServiceImpl.java b/modules/app/src/main/java/com/bonus/app/entry/service/EntryPersonServiceImpl.java index 8051648..a89198a 100644 --- a/modules/app/src/main/java/com/bonus/app/entry/service/EntryPersonServiceImpl.java +++ b/modules/app/src/main/java/com/bonus/app/entry/service/EntryPersonServiceImpl.java @@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.UUID; import com.bonus.app.entry.dao.EntryPersonDao; import com.bonus.app.entry.entity.*; +import com.bonus.app.pay.dao.PayCardDao; +import com.bonus.app.pay.entity.PayCardBean; import com.bonus.app.person.dao.BasePersonDao; import com.bonus.app.person.entity.BasePersonBean; import com.bonus.common.core.constant.Constants; @@ -32,6 +34,9 @@ public class EntryPersonServiceImpl implements EntryPersonService{ @Resource(name = "basePersonDao") private BasePersonDao basePersonDao; + @Resource(name = "payCardDao") + private PayCardDao payCardDao; + BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); @Override @@ -142,6 +147,15 @@ public class EntryPersonServiceImpl implements EntryPersonService{ }else{ entryPersonDao.insertBasePersonBankData(o); } + if(o.getEntryBankBean() != null && StringUtils.isNotEmpty(o.getEntryBankBean().getBankPhoto())) { + PayCardBean payCardBean = new PayCardBean(); + payCardBean.setIdNumber(o.getEntryIdNumberBean().getIdNumber()); + payCardBean.setPath(o.getEntryBankBean().getBankPhoto()); + String currentDatetime = DateUtil.format(DateUtil.date(), "yyyy-MM-dd HH:mm:ss"); + payCardBean.setUploadTime(currentDatetime); + payCardBean.setUploadDate(currentDatetime); + payCardDao.uploadBankWiness(payCardBean); + } if(StringUtils.isNotEmpty(o.getEntryContractBean().getContractCode())){ if(StringUtils.isEmpty(o.getEntryContractBean().getContractId())){ o.getEntryContractBean().setContractId(UUID.randomUUID().toString()); diff --git a/modules/app/src/main/resources/mapper/entry/EntryPersonMapper.xml b/modules/app/src/main/resources/mapper/entry/EntryPersonMapper.xml index 5d2b194..a78a022 100644 --- a/modules/app/src/main/resources/mapper/entry/EntryPersonMapper.xml +++ b/modules/app/src/main/resources/mapper/entry/EntryPersonMapper.xml @@ -289,7 +289,8 @@ left join bm_worker_bank bwb on bwb.id_number = bw.id_number and bwb.is_active = 1 left join bm_worker_payroll bwp on bwp.ID_NUMBER = bw.ID_NUMBER and bwp.is_active = 1 where bw.id_number = #{idNumber} - GROUP BY bw.id_number + order by bwp.upload_time desc + limit 1