|
|
@ -60,6 +60,7 @@ import com.epmet.modules.partymember.service.IcPartymemberStyleService; |
|
|
|
import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO; |
|
|
|
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO; |
|
|
|
import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO; |
|
|
|
import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO; |
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
@ -72,10 +73,8 @@ import org.apache.http.entity.ContentType; |
|
|
|
import org.apache.poi.ss.usermodel.Workbook; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.scheduling.annotation.Async; |
|
|
|
import org.springframework.scheduling.annotation.EnableAsync; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
|
import org.springframework.web.multipart.commons.CommonsMultipartFile; |
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
@ -131,7 +130,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember |
|
|
|
dtoList.forEach(item -> { |
|
|
|
if (StringUtils.isNotBlank(item.getGridId())) { |
|
|
|
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId()); |
|
|
|
if(gridInfo == null) { |
|
|
|
if (gridInfo == null) { |
|
|
|
log.warn("未找到网格信息:{}", item.getGridId()); |
|
|
|
return; |
|
|
|
} |
|
|
@ -145,8 +144,8 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember |
|
|
|
return dtoList; |
|
|
|
} |
|
|
|
|
|
|
|
private QueryWrapper<IcPartymemberStyleEntity> getWrapper(Map<String, Object> params){ |
|
|
|
String id = (String)params.get(FieldConstant.ID_HUMP); |
|
|
|
private QueryWrapper<IcPartymemberStyleEntity> getWrapper(Map<String, Object> params) { |
|
|
|
String id = (String) params.get(FieldConstant.ID_HUMP); |
|
|
|
|
|
|
|
QueryWrapper<IcPartymemberStyleEntity> wrapper = new QueryWrapper<>(); |
|
|
|
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); |
|
|
@ -168,7 +167,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember |
|
|
|
IcPartymemberStyleEntity entity = ConvertUtils.sourceToTarget(dto, IcPartymemberStyleEntity.class); |
|
|
|
entity.setCustomerId(tokenDto.getCustomerId()); |
|
|
|
// CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
|
|
|
|
GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(dto.getGridId()); |
|
|
|
GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(dto.getGridId()); |
|
|
|
entity.setAgencyId(gridInfoCache.getPid()); |
|
|
|
entity.setGridPids(gridInfoCache.getPids()); |
|
|
|
|
|
|
@ -225,7 +224,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember |
|
|
|
wrapper.eq(StringUtils.isNotBlank(formDTO.getGridId()), IcPartymemberStyleEntity::getGridId, formDTO.getGridId()); |
|
|
|
wrapper.like(StringUtils.isNotBlank(formDTO.getName()), IcPartymemberStyleEntity::getName, formDTO.getName()); |
|
|
|
wrapper.like(StringUtils.isNotBlank(formDTO.getMainDeed()), IcPartymemberStyleEntity::getMainDeed, formDTO.getMainDeed()); |
|
|
|
wrapper.eq(StringUtils.isNotBlank(formDTO.getCategoryId()),IcPartymemberStyleEntity::getCategoryId,formDTO.getCategoryId()); |
|
|
|
wrapper.eq(StringUtils.isNotBlank(formDTO.getCategoryId()), IcPartymemberStyleEntity::getCategoryId, formDTO.getCategoryId()); |
|
|
|
wrapper.orderByDesc(IcPartymemberStyleEntity::getCreatedTime); |
|
|
|
List<IcPartymemberStyleEntity> list = baseDao.selectList(wrapper); |
|
|
|
PageInfo<IcPartymemberStyleEntity> pageInfo = new PageInfo<>(list); |
|
|
@ -295,7 +294,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember |
|
|
|
} |
|
|
|
Map<String, String> gridMap = gridOptionResult.getData().stream().collect(Collectors.toMap(CustomerGridDTO::getGridName, CustomerGridDTO::getId)); |
|
|
|
//获取党员风采所有分类:key:分类名称;
|
|
|
|
Map<String,IcPartymemberStyleCategoryDictEntity> categoryDictMap=icPartymemberStyleCategoryDictService.getCategoryDictMap(tokenDto.getCustomerId()); |
|
|
|
Map<String, IcPartymemberStyleCategoryDictEntity> categoryDictMap = icPartymemberStyleCategoryDictService.getCategoryDictMap(tokenDto.getCustomerId()); |
|
|
|
//1.数据校验 只允许导入当前组织下的网格的数据
|
|
|
|
//网格名称不一样的数据舍弃或者分类名称不存在也舍弃
|
|
|
|
Iterator<IcPartymemberStyleImportExcel> iterator = result.iterator(); |
|
|
@ -346,7 +345,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember |
|
|
|
} |
|
|
|
entity.setName(item.getName()); |
|
|
|
entity.setMainDeed(item.getMainDeed()); |
|
|
|
IcPartymemberStyleCategoryDictEntity dictEntity=categoryDictMap.get(item.getCategoryName()); |
|
|
|
IcPartymemberStyleCategoryDictEntity dictEntity = categoryDictMap.get(item.getCategoryName()); |
|
|
|
entity.setCategoryId(null == dictEntity ? StrConstant.EPMETY_STR : dictEntity.getId()); |
|
|
|
entity.setCategoryCode(null == dictEntity ? StrConstant.EPMETY_STR : dictEntity.getCategoryCode()); |
|
|
|
AtomicInteger i = new AtomicInteger(); |
|
|
@ -420,6 +419,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember |
|
|
|
} |
|
|
|
return url; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Author sun |
|
|
|
* @Description 党员风采导入修改导入任务状态 |
|
|
@ -451,11 +451,21 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public PageData<IcPartymemberStyleDTO> showList(StyleShowListFormDTO formDTO) { |
|
|
|
CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); |
|
|
|
String customerId = formDTO.getCustomerId(); |
|
|
|
CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(customerId, formDTO.getUserId()); |
|
|
|
if (null == staff || StringUtils.isBlank(staff.getAgencyId())) { |
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前工作人员缓存信息失败", "查询用户信息异常"); |
|
|
|
} |
|
|
|
PageInfo<IcPartymemberStyleDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectShowList(staff.getAgencyId(), formDTO.getCustomerId())); |
|
|
|
return showListByAgency(formDTO.getPageNo(), formDTO.getPageSize(), staff.getAgencyId(), customerId); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageData<IcPartymemberStyleDTO> showListByAgency(StyleShowListResiFormDTO formDto) { |
|
|
|
return showListByAgency(formDto.getPageNo(), formDto.getPageSize(), formDto.getAgencyId(), formDto.getCustomerId()); |
|
|
|
} |
|
|
|
|
|
|
|
private PageData<IcPartymemberStyleDTO> showListByAgency(int pageNo, int pageSize, String agencyId, String customerId) { |
|
|
|
PageInfo<IcPartymemberStyleDTO> pageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> baseDao.selectShowList(agencyId, customerId)); |
|
|
|
if (CollectionUtils.isNotEmpty(pageInfo.getList())) { |
|
|
|
//赋值网格名称
|
|
|
|
for (IcPartymemberStyleDTO dto : pageInfo.getList()) { |
|
|
@ -468,5 +478,4 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember |
|
|
|
} |
|
|
|
return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|