elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

程序修改

dev_shibei_match
zhaoqifeng 4 years ago
parent
74f5984564
commit
bfa9bc3689
5 changed files with 65 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
  2. 32
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
  3. 25
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
  4. 4
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java
  5. 18
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

25
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
View File

@ -30,10 +30,12 @@ import com.epmet.dto.IcPartyActivityDTO;
import com.epmet.dto.form.PartyActivityFormDTO;
import com.epmet.excel.IcPartyActivityExcel;
import com.epmet.service.IcPartyActivityService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@ -82,17 +84,20 @@ public class IcPartyActivityController {
@GetMapping("export")
public void export(@RequestBody PartyActivityFormDTO formDTO, HttpServletResponse response) throws Exception {
List<IcPartyActivityDTO> list = icPartyActivityService.list(formDTO);
List<IcPartyActivityExcel> excelList = new ArrayList<>();
AtomicInteger i = new AtomicInteger(0);
List<IcPartyActivityExcel> excelList = list.stream().map(item -> {
IcPartyActivityExcel excel = new IcPartyActivityExcel();
excel.setIndex(i.getAndIncrement());
excel.setUnitName(item.getUnitName());
excel.setTitle(item.getTitle());
excel.setAddress(item.getAddress());
excel.setPeopleCount(item.getPeopleCount());
excel.setActivityTime(item.getActivityTime());
return excel;
}).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(list)) {
excelList = list.stream().map(item -> {
IcPartyActivityExcel excel = new IcPartyActivityExcel();
excel.setIndex(i.getAndIncrement());
excel.setUnitName(item.getUnitName());
excel.setTitle(item.getTitle());
excel.setAddress(item.getAddress());
excel.setPeopleCount(item.getPeopleCount());
excel.setActivityTime(item.getActivityTime());
return excel;
}).collect(Collectors.toList());
}
ExcelUtils.exportExcelToTarget(response, null, excelList, IcPartyActivityExcel.class);
}
}

32
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
View File

@ -33,10 +33,12 @@ import com.epmet.dto.form.demand.ServiceQueryFormDTO;
import com.epmet.dto.result.demand.OptionDTO;
import com.epmet.excel.IcPartyUnitExcel;
import com.epmet.service.IcPartyUnitService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@ -90,21 +92,23 @@ public class IcPartyUnitController {
@GetMapping("export")
public void export(@RequestBody PartyUnitFormDTO formDTO, HttpServletResponse response) throws Exception {
List<IcPartyUnitDTO> list = icPartyUnitService.list(formDTO);
List<IcPartyUnitExcel> excelList = new ArrayList<>();
AtomicInteger i = new AtomicInteger(0);
List<IcPartyUnitExcel> excelList = list.stream().map(item -> {
IcPartyUnitExcel excel = new IcPartyUnitExcel();
excel.setIndex(i.getAndIncrement());
excel.setUnitName(item.getUnitName());
excel.setContact(item.getContact());
excel.setContactMobile(item.getContactMobile());
excel.setType(item.getType());
excel.setMemberCount(item.getMemberCount());
excel.setRemark(item.getRemark());
excel.setSatisfaction(item.getSatisfaction());
excel.setServiceMatter(String.join(String.valueOf((char)10), item.getServiceMatterList()));
return excel;
}).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(list)) {
excelList = list.stream().map(item -> {
IcPartyUnitExcel excel = new IcPartyUnitExcel();
excel.setIndex(i.getAndIncrement());
excel.setUnitName(item.getUnitName());
excel.setContact(item.getContact());
excel.setContactMobile(item.getContactMobile());
excel.setType(item.getType());
excel.setMemberCount(item.getMemberCount());
excel.setRemark(item.getRemark());
excel.setSatisfaction(item.getSatisfaction());
excel.setServiceMatter(String.join(String.valueOf((char) 10), item.getServiceMatterList()));
return excel;
}).collect(Collectors.toList());
}
ExcelUtils.exportExcelToTarget(response, null, excelList, IcPartyUnitExcel.class);
}

25
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
View File

@ -31,10 +31,12 @@ import com.epmet.modules.partymember.excel.IcPartymemberStyleExcel;
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 org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
@ -84,17 +86,20 @@ public class IcPartymemberStyleController {
@PostMapping("export")
public void export(@RequestBody PartyMemberStyleFormDTO formDTO, HttpServletResponse response) throws Exception {
List<IcPartymemberStyleDTO> list = icPartymemberStyleService.search(formDTO).getList();
List<IcPartymemberStyleDTO> list = icPartymemberStyleService.list(formDTO);
List<IcPartymemberStyleExcel> result = new ArrayList<>();
AtomicInteger i = new AtomicInteger(NumConstant.ONE);
List<IcPartymemberStyleExcel> result = list.stream().map(item -> {
IcPartymemberStyleExcel excel = new IcPartymemberStyleExcel();
excel.setIndex(i.getAndIncrement());
excel.setGridName(item.getGridName());
excel.setName(item.getName());
excel.setMainDeed(item.getMainDeed());
return excel;
}).collect(Collectors.toList());
ExcelUtils.exportExcelToTarget(response, null, list, IcPartymemberStyleExcel.class);
if (CollectionUtils.isNotEmpty(list)) {
result = list.stream().map(item -> {
IcPartymemberStyleExcel excel = new IcPartymemberStyleExcel();
excel.setIndex(i.getAndIncrement());
excel.setGridName(item.getGridName());
excel.setName(item.getName());
excel.setMainDeed(item.getMainDeed());
return excel;
}).collect(Collectors.toList());
}
ExcelUtils.exportExcelToTarget(response, null, result, IcPartymemberStyleExcel.class);
}
@PostMapping("list")

4
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java
View File

@ -48,12 +48,12 @@ public interface IcPartymemberStyleService extends BaseService<IcPartymemberStyl
/**
* 默认查询
*
* @param params
* @param formDTO
* @return java.util.List<IcPartymemberStyleDTO>
* @author generator
* @date 2021-11-18
*/
List<IcPartymemberStyleDTO> list(Map<String, Object> params);
List<IcPartymemberStyleDTO> list(PartyMemberStyleFormDTO formDTO);
/**
* 单条查询

18
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java
View File

@ -73,10 +73,22 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
}
@Override
public List<IcPartymemberStyleDTO> list(Map<String, Object> params) {
List<IcPartymemberStyleEntity> entityList = baseDao.selectList(getWrapper(params));
public List<IcPartymemberStyleDTO> list(PartyMemberStyleFormDTO formDTO) {
//分页查询
LambdaQueryWrapper<IcPartymemberStyleEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(IcPartymemberStyleEntity::getAgencyId, formDTO.getAgencyId());
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());
List<IcPartymemberStyleEntity> list = baseDao.selectList(wrapper);
List<IcPartymemberStyleDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartymemberStyleDTO.class);
//设置网格名
dtoList.forEach(item -> {
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
item.setGridName(gridInfo.getGridName());
});
return ConvertUtils.sourceToTarget(entityList, IcPartymemberStyleDTO.class);
return dtoList;
}
private QueryWrapper<IcPartymemberStyleEntity> getWrapper(Map<String, Object> params){

Write Preview
Loading…
Cancel
Save