From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java
index ab6ebbd..0ad7ede 100644
--- a/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java
@@ -11,14 +11,18 @@
import doumeemes.dao.business.model.Company;
import doumeemes.dao.business.model.CompanyLog;
import doumeemes.dao.business.model.CompanyOpen;
+import doumeemes.dao.ext.vo.CompanyExtListVO;
import doumeemes.service.business.CompanyLogService;
import doumeemes.service.business.CompanyOpenService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import doumeemes.service.ext.DepartmentExtService;
import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -43,6 +47,10 @@
@Autowired
CompanyLogService companyLogService;
+
+ @Autowired
+ @Lazy
+ private DepartmentExtService departmentExtService;
@Override
public Integer create(CompanyOpen companyOpen) {
@@ -82,6 +90,7 @@
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
UpdateWrapper<CompanyOpen> wrapper = new UpdateWrapper<>();
wrapper.lambda().eq(CompanyOpen::getCompanyId,companyOpen.getCompanyId())
+ .set(CompanyOpen::getUserNum,companyOpen.getUserNum())
.set(CompanyOpen::getValidDate,companyOpen.getValidDate())
.set(CompanyOpen::getOepnType,companyOpen.getOepnType());
companyOpenMapper.update(null,wrapper);
@@ -89,8 +98,9 @@
company.setId(companyOpen.getCompanyId());
company.setOepnValidDate(companyOpen.getValidDate());
company.setOepnType(companyOpen.getOepnType());
+ company.setOpenUserNum(companyOpen.getUserNum());
companyMapper.updateById(company);
-
+ Company company1 = companyMapper.selectById(companyOpen.getCompanyId());
CompanyLog companyLog = new CompanyLog();
companyLog.setDeleted((byte) Constants.ZERO);
@@ -101,8 +111,18 @@
companyLog.setRemark("鏈夋晥鏈熶粠"+format.format(cyResult.getOepnValidDate())+"鏃ヨ皟鏁磋嚦"+format.format(companyOpen.getValidDate()));
companyLog.setCompanyId(company.getId());
companyLog.setUpdateType(Constants.CompanyUpdateType.UPDATE_VAIL_DATE.getKey());
- companyLog.setDetail("鏈夋晥鏈熶粠"+format.format(cyResult.getOepnValidDate())+"鏃ヨ皟鏁磋嚦"+format.format(companyOpen.getValidDate()));
+ companyLog.setDetail("鏈夋晥鏈熶粠"+format.format(cyResult.getOepnValidDate())+"鏃ヨ皟鏁磋嚦"+format.format(companyOpen.getValidDate())+"\n"+
+ "鐢ㄦ埛寮�閫氫汉鏁颁粠"+cyResult.getOpenUserNum()+"璋冩暣鑷�"+companyOpen.getUserNum());
companyLogService.create(companyLog);
+
+ initRedisCache(company1);
+ }
+
+ private void initRedisCache(Company com) {
+ CompanyExtListVO c = new CompanyExtListVO();
+ BeanUtils.copyProperties(com,c);
+ departmentExtService.loadComDepart(c);
+ departmentExtService.initCompnayCodesByCom(com);
}
@Override
@@ -131,7 +151,7 @@
QueryWrapper<CompanyOpen> wrapper = new QueryWrapper<>(companyOpen);
return companyOpenMapper.selectList(wrapper);
}
-
+
@Override
public PageData<CompanyOpen> findPage(PageWrap<CompanyOpen> pageWrap) {
IPage<CompanyOpen> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
--
Gitblit v1.9.3