From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java | 108 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 68 insertions(+), 40 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
index 4f040df..3d90109 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
@@ -17,26 +17,23 @@
package org.springblade.modules.place.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.param.CommonParamSet;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.service.IGridService;
-import org.springblade.modules.house.entity.HouseTenantEntity;
-import org.springblade.modules.house.vo.HouseTenantVO;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.entity.PlacePractitionerEntity;
+import org.springblade.modules.place.mapper.PlaceExtMapper;
+import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlacePractitionerService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceExtVO;
-import org.springblade.modules.place.mapper.PlaceExtMapper;
-import org.springblade.modules.place.service.IPlaceExtService;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.task.entity.TaskEntity;
-import org.springblade.modules.task.service.ITaskService;
+import org.springblade.modules.system.service.IDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
@@ -54,40 +51,63 @@
public class PlaceExtServiceImpl extends ServiceImpl<PlaceExtMapper, PlaceExtEntity> implements IPlaceExtService {
@Autowired
- private ITaskService taskService;
-
- @Autowired
private IPlaceService placeService;
@Autowired
private IPlacePractitionerService placePractitionerService;
- @Autowired
- private IGridService gridService;
+// @Autowired
+// private IGridService gridService;
+//
+// @Autowired
+// private IDeptService deptService;
/**
* 自定义查询
+ *
* @param page
* @param placeExt
* @return
*/
@Override
public IPage<PlaceExtVO> selectPlaceExtPage(IPage<PlaceExtVO> page, PlaceExtVO placeExt) {
- List<String> list = new ArrayList<>();
- if (null!=placeExt.getRoleName() && !placeExt.getRoleName().equals("")){
- if (placeExt.getRoleName().equals("网格员")){
- // 查询对应的房屋地址code
- list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
- }
- if (!placeExt.getRoleName().equals("系统管理员")){
- placeExt.setCreateUser(AuthUtil.getUserId());
- }
- }
- return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt,list));
+// List<String> list = new ArrayList<>();
+// String roleName = SpringUtils.getRequestParam("roleName");
+// String communityCode = SpringUtils.getRequestParam("communityCode");
+// if (!Strings.isBlank(communityCode)){
+// // 校验社区编号是否合规
+// if(null!=SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
+// placeExt.setCommunityCode(communityCode);
+// }
+// }
+// List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+// Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+// // 网格编号集合
+// List<String> gridCodeList = new ArrayList<>();
+// // 民警角色
+// if (!Strings.isBlank(roleName)){
+// placeExt.setRoleName(roleName);
+// if(roleName.equals("mj")) {
+// regionChildCodesList = SpringUtil.getBean(IPoliceAffairsGridService.class).getCommunityCodeListByUserId(AuthUtil.getUserId());
+// }
+// if (roleName.equals("wgy")) {
+// gridCodeList = SpringUtil.getBean(IGridService.class).getGridListByUserId(AuthUtil.getUserId());
+// }
+// }
+// if (AuthUtil.getUserAccount().equals("18879306957")) {
+// placeExt.setCommunityCode("361102003027");
+// placeExt.setCreateUser(null);
+// }
+ CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(PlaceExtVO.class, placeExt);
+
+
+ return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt,commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(),commonParamSet.getGridCodeList()));
}
/**
* 场所详情表 自定义更新
+ *
* @param placeExt
* @return
*/
@@ -107,7 +127,7 @@
updatePlaceInfo(placeExt);
// 查询对应已存在的从业人员
QueryWrapper<PlacePractitionerEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("place_id",placeExt.getPlaceId());
+ wrapper.eq("place_id", placeExt.getPlaceId());
List<PlacePractitionerEntity> oldList = placePractitionerService.list(wrapper);
List<PlacePractitionerEntity> list = placeExt.getPlacePractitioner();
// 申明新增，修改，删除集合
@@ -118,16 +138,16 @@
// 找出需要新增的，否则组成新集合进行比对
for (PlacePractitionerEntity practitionerEntity : list) {
practitionerEntity.setPlaceId(placeExt.getPlaceId());
- if (null==practitionerEntity.getId()){
+ if (null == practitionerEntity.getId()) {
// 新增
- PlacePractitionerEntity placePractitionerEntity= new PlacePractitionerEntity();
+ PlacePractitionerEntity placePractitionerEntity = new PlacePractitionerEntity();
placePractitionerEntity.setPlaceId(placeExt.getPlaceId());
placePractitionerEntity.setName(practitionerEntity.getName());
placePractitionerEntity.setTelephone(practitionerEntity.getTelephone());
placePractitionerEntity.setTempAddress(practitionerEntity.getTempAddress());
addList.add(placePractitionerEntity);
- }else {
+ } else {
newList.add(practitionerEntity);
}
}
@@ -140,15 +160,15 @@
e.getId()).collect(Collectors.toList()).contains(vo.getId())).collect(Collectors.toList());
// 批量新增
- if (addList.size()>0) {
+ if (addList.size() > 0) {
addFlag = placePractitionerService.saveBatch(addList);
}
// 批量修改
- if (updateList.size()>0) {
+ if (updateList.size() > 0) {
updateFlag = placePractitionerService.updateBatchById(updateList);
}
// 批量删除
- if (removeList.size()>0) {
+ if (removeList.size() > 0) {
removeFlag = placePractitionerService.removeBatchByIds(removeList);
}
// 返回
@@ -157,6 +177,7 @@
/**
* 更新场所表信息
+ *
* @param placeExt
*/
public void updatePlaceInfo(PlaceExtVO placeExt) {
@@ -178,6 +199,7 @@
/**
* 场所详情表 审核
+ *
* @param placeExt
* @return
*/
@@ -204,6 +226,7 @@
/**
* 场所详情表 新增
+ *
* @param placeExt
* @return
*/
@@ -220,26 +243,27 @@
// boolean save = taskService.save(taskEntity);
// if (save){
// placeExt.setTaskId(taskEntity.getId());
- placeExt.setConfirmFlag(1);
- placeExt.setCreateTime(new Date());
- placeExt.setUpdateTime(new Date());
- placeExt.setCreateUser(AuthUtil.getUserId());
- placeExt.setUpdateUser(AuthUtil.getUserId());
- // 新增场所详情
- boolean save = save(placeExt);
+ placeExt.setConfirmFlag(1);
+ placeExt.setCreateTime(new Date());
+ placeExt.setUpdateTime(new Date());
+ placeExt.setCreateUser(AuthUtil.getUserId());
+ placeExt.setUpdateUser(AuthUtil.getUserId());
+ // 新增场所详情
+ boolean save = save(placeExt);
// }
return save;
}
/**
* 场所详情表 自定义详情
+ *
* @param placeExt
* @return
*/
@Override
public PlaceExtVO getDetail(PlaceExtVO placeExt) {
PlaceExtVO detail = baseMapper.getDetail(placeExt);
- if (null!=detail) {
+ if (null != detail) {
// 查询从业人员信息
QueryWrapper<PlacePractitionerEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("place_id", placeExt.getPlaceId());
@@ -251,6 +275,10 @@
@Override
public Integer selectCount(Long userId, String neiCode, Integer confirmFlag) {
- return baseMapper.selectCount(userId, neiCode, confirmFlag);
+ PlaceExtVO placeExt = new PlaceExtVO();
+ placeExt.setConfirmFlag(confirmFlag);
+ placeExt.setNeiCode(neiCode);
+ CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(PlaceExtVO.class, placeExt);
+ return baseMapper.selectCount(placeExt,commonParamSet.getRegionChildCodesList(),commonParamSet.getIsAdministrator(),commonParamSet.getGridCodeList());
}
}
--
Gitblit v1.9.3