From 3d4c9292ec8c9f7fa2ee6f438222d09ef75a9c31 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 11 Sep 2023 10:22:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=B1=BB=E6=8B=93=E5=B1=95OA?= =?UTF-8?q?=E9=83=A8=E9=97=A8id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qs/serve/modules/bms/entity/BmsDutyInfo.java | 3 +++ .../serve/modules/bms/service/BmsDutyInfoService.java | 2 ++ .../bms/service/impl/BmsDutyInfoServiceImpl.java | 7 +++++++ .../tbs/controller/TbsCostContractController.java | 11 +++++++++++ .../qs/serve/modules/tbs/entity/TbsCostContract.java | 3 +++ 5 files changed, 26 insertions(+) diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsDutyInfo.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsDutyInfo.java index 03961e0d..55b13d43 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsDutyInfo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsDutyInfo.java @@ -39,6 +39,9 @@ public class BmsDutyInfo implements Serializable { @Length(max = 255,message = "税号长度不能超过255字") private String dutyCode; + /** 致远的部门id */ + private String oaDeptId; + /** 是否显示 */ private Integer showFlag; diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsDutyInfoService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsDutyInfoService.java index c4d1a7df..773beb17 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/BmsDutyInfoService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsDutyInfoService.java @@ -10,5 +10,7 @@ import com.qs.serve.modules.bms.entity.BmsDutyInfo; */ public interface BmsDutyInfoService extends IService { + BmsDutyInfo getByDutyNumber(String code); + } diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsDutyInfoServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsDutyInfoServiceImpl.java index 35a93e2c..ab0fe333 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsDutyInfoServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsDutyInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.bms.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -18,5 +19,11 @@ import com.qs.serve.modules.bms.mapper.BmsDutyInfoMapper; @AllArgsConstructor public class BmsDutyInfoServiceImpl extends ServiceImpl implements BmsDutyInfoService { + @Override + public BmsDutyInfo getByDutyNumber(String code) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(BmsDutyInfo::getDutyCode,code); + return getOne(lqw,false); + } } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java index eccd9569..2b2b9395 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java @@ -10,6 +10,8 @@ import com.qs.serve.common.util.CollectionUtil; import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.StringUtils; +import com.qs.serve.modules.bms.entity.BmsDutyInfo; +import com.qs.serve.modules.bms.service.BmsDutyInfoService; import com.qs.serve.modules.sys.entity.SysAttach; import com.qs.serve.modules.sys.service.SysAttachService; import com.qs.serve.modules.tbs.entity.bo.TbsCostContractBo; @@ -38,6 +40,7 @@ public class TbsCostContractController { private TbsCostContractService tbsCostContractService; private SysAttachService attachService; + private BmsDutyInfoService bmsDutyInfoService; /** * 列表 @@ -123,6 +126,10 @@ public class TbsCostContractController { contract.setExpireTime(param.getExpireTime()); contract.setBusinessCompany(param.getBusinessCompany()); contract.setDutyNumber(param.getDutyNumber()); + BmsDutyInfo bmsDutyInfo = bmsDutyInfoService.getByDutyNumber(param.getDutyNumber()); + if(bmsDutyInfo!=null){ + contract.setOaDeptId(bmsDutyInfo.getOaDeptId()); + } boolean result = tbsCostContractService.updateById(contract); return R.isTrue(result); } @@ -157,6 +164,10 @@ public class TbsCostContractController { contract.setFileNum(param.getFileNum()); contract.setBusinessCompany(param.getBusinessCompany()); contract.setDutyNumber(param.getDutyNumber()); + BmsDutyInfo bmsDutyInfo = bmsDutyInfoService.getByDutyNumber(param.getDutyNumber()); + if(bmsDutyInfo!=null){ + contract.setOaDeptId(bmsDutyInfo.getOaDeptId()); + } } if(contract.getId()==null){ tbsCostContractService.save(contract); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java index d4b884be..187536e5 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java @@ -73,6 +73,9 @@ public class TbsCostContract implements Serializable { /** 税号 */ private String dutyNumber; + /** 致远的部门id */ + private String oaDeptId; + /** 创建时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")