From b2fce0dc7dc4ea5dec9792a2bc3ceb9d33d6e07b Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 04 九月 2023 13:59:52 +0800
Subject: [PATCH] 修改后台社区动态加载不出来
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java | 105 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 81 insertions(+), 24 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java
index a602b7c..071de62 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,12 +11,10 @@
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.utlis.StringUtils;
-import com.panzhihua.service_community.dao.ComActDAO;
-import com.panzhihua.service_community.dao.ComActSocialOrgDao;
-import com.panzhihua.service_community.dao.ComStreetDAO;
+import com.panzhihua.service_community.dao.*;
+import com.panzhihua.service_community.entity.ComActColumn;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import com.panzhihua.service_community.entity.ComActSocialWorker;
-import com.panzhihua.service_community.dao.ComActSocialWorkerDao;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComStreetDO;
import com.panzhihua.service_community.service.ComActSocialWorkerService;
@@ -26,7 +25,12 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
import java.util.List;
+
+import static java.util.Objects.nonNull;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
/**
* 社工(ComActSocialWorker)表服务实现类
@@ -45,6 +49,10 @@
private ComActSocialOrgDao comActSocialOrgMapper;
@Resource
private ComActDAO comActDAO;
+ @Resource
+ private ComActActivityDAO comActActivityDAO;
+ @Resource
+ private ComActColumnDao comActColumnDao;
/**
* 新增社工
* @param comActSocialWorkerAddDTO
@@ -52,9 +60,22 @@
*/
@Override
public R add(ComActSocialWorkerAddDTO comActSocialWorkerAddDTO){
+ ComActSocialWorker comActSocialWorker = comActSocialWorkerMapper.selectOne(new LambdaQueryWrapper<ComActSocialWorker>()
+ .eq(ComActSocialWorker::getTelephone, comActSocialWorkerAddDTO.getTelephone())
+ .eq(ComActSocialWorker::getCommunityId, comActSocialWorkerAddDTO.getCommunityId()));
+ if (nonNull(comActSocialWorker)) {
+ return R.fail("手机号已存在");
+ }
+ ComActSocialWorker comActSocialWorker1 = comActSocialWorkerMapper.selectOne(new LambdaQueryWrapper<ComActSocialWorker>()
+ .eq(ComActSocialWorker::getIdCard, comActSocialWorkerAddDTO.getIdCard())
+ .eq(ComActSocialWorker::getCommunityId, comActSocialWorkerAddDTO.getCommunityId()));
+ if (nonNull(comActSocialWorker1)) {
+ return R.fail("当前身份证号码已存在社工");
+ }
ComActSocialWorker comActSocialWorkerDO = new ComActSocialWorker();
BeanUtils.copyProperties(comActSocialWorkerAddDTO, comActSocialWorkerDO);
comActSocialWorkerDO.setCreateBy(comActSocialWorkerAddDTO.getUserId());
+ comActSocialWorkerDO.setCreateAt(new Date());
if(comActSocialWorkerMapper.insert(comActSocialWorkerDO)>0){
return R.ok();
}
@@ -71,10 +92,37 @@
ComActSocialWorker comActSocialWorkerDO = new ComActSocialWorker();
BeanUtils.copyProperties(comActSocialWorkerEditDTO, comActSocialWorkerDO);
//comActSocialWorkerDO.setUpdateAt(new Date());
+ updateWorkerSkill(comActSocialWorkerDO);
if(comActSocialWorkerMapper.updateById(comActSocialWorkerDO)>0){
return R.ok();
}
return R.fail();
+ }
+
+ private void updateWorkerSkill(ComActSocialWorker socialWorker) {
+ String skillType = socialWorker.getSkillType();
+ if (isNotBlank(skillType)) {
+ List<String> skillList = Arrays.asList(skillType.split(","));
+ List<String> list = new ArrayList<String>(skillList);
+ list.remove(socialWorker.toString());
+ StringBuilder sb = new StringBuilder();
+ StringBuilder sb1 = new StringBuilder();
+ for (int i = 0; i < list.size(); i++) {
+ String skillId = list.get(i);
+ ComActColumn skillColumn = comActColumnDao.selectById(skillId);
+ if (i < list.size() - 1) {
+ sb.append(skillId);
+ sb.append(",");
+ sb1.append(skillColumn.getName());
+ sb1.append(",");
+ } else {
+ sb.append(skillId);
+ sb1.append(skillColumn.getName());
+ }
+ }
+ socialWorker.setSkillType(sb.toString());
+ socialWorker.setSkillTypeName(sb1.toString());
+ }
}
/**
@@ -110,14 +158,9 @@
* @return 查找结果
*/
@Override
- public R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(Long id){
- ComActSocialWorker comActSocialWorkerDO = comActSocialWorkerMapper.selectById(id);
- if(comActSocialWorkerDO!=null) {
- ComActSocialWorkerDetailsVO comActSocialWorkerDetailsVO = new ComActSocialWorkerDetailsVO();
- BeanUtils.copyProperties(comActSocialWorkerDO, comActSocialWorkerDetailsVO);
- return R.ok(comActSocialWorkerDetailsVO);
- }
- return R.fail();
+ public R<ComActSocialWorkerVO> comActSocialWorkerDetails(Long id){
+ ComActSocialWorkerVO comActSocialWorkerDO = comActSocialWorkerMapper.selectOneById(id);
+ return R.ok(comActSocialWorkerDO);
}
@Override
@@ -127,18 +170,6 @@
for(ComActSocialWorkerExcelVO comActSocialWorkerExcelVO:lis) {
ComActSocialWorker comActSocialWorkerDO = new ComActSocialWorker();
BeanUtils.copyProperties(comActSocialWorkerExcelVO,comActSocialWorkerDO);
- if (StringUtils.isNotEmpty(comActSocialWorkerExcelVO.getStreetId())) {
- ComStreetDO comStreetDO=comStreetDAO.selectOne(new QueryWrapper<ComStreetDO>().eq("name",comActSocialWorkerExcelVO.getStreetId()));
- if(comStreetDO!=null){
- comActSocialWorkerDO.setStreetId(comStreetDO.getStreetId());
- }
- }
- if (StringUtils.isNotEmpty(comActSocialWorkerExcelVO.getSocialOrgId())) {
- ComActSocialOrg comActSocialOrgDO=comActSocialOrgMapper.selectOne(new QueryWrapper<ComActSocialOrg>().eq("name",comActSocialWorkerExcelVO.getSocialOrgId()));
- if(comActSocialOrgDO!=null){
- comActSocialWorkerDO.setSocialOrgId(comActSocialOrgDO.getId());
- }
- }
if(StringUtils.isNotEmpty(comActSocialWorkerExcelVO.getCommunityId())){
ComActDO comActDO= comActDAO.selectOne(new QueryWrapper<ComActDO>().eq("name",comActSocialWorkerExcelVO.getCommunityId()));
if(comActDO!=null){
@@ -153,6 +184,22 @@
comActSocialWorkerDO.setGen(0);
}
}
+ if(StringUtils.isNotEmpty(comActSocialWorkerExcelVO.getCredential())){
+ if("是".equals(comActSocialWorkerExcelVO.getCredential())){
+ comActSocialWorkerDO.setCredential(1);
+ }
+ else {
+ comActSocialWorkerDO.setCredential(0);
+ }
+ }
+ if(StringUtils.isNotEmpty(comActSocialWorkerExcelVO.getCredential())){
+ if("是".equals(comActSocialWorkerExcelVO.getCredential())){
+ comActSocialWorkerDO.setCredential(1);
+ }
+ else {
+ comActSocialWorkerDO.setCredential(0);
+ }
+ }
list.add(comActSocialWorkerDO);
}
this.saveBatch(list);
@@ -160,4 +207,14 @@
return R.ok();
}
+
+ @Override
+ public R activity(CommonPage commonPage) {
+ return R.ok(comActSocialWorkerMapper.selectActivity(new Page(commonPage.getPage(),commonPage.getSize()),commonPage.getParamId()));
+ }
+
+ @Override
+ public R activityList(CommonPage commonPage) {
+ return R.ok(comActActivityDAO.selectActivityBySocialWorker(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
+ }
}
--
Gitblit v1.7.1