FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update：修改标准查询

Browse Source
This commit is contained in:
zzy
2021-07-27 17:04:30 +08:00
parent 1007321491
commit 0540325f35
3 changed files with 116 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+44 -77
View File
@@ -82,89 +82,60 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
switch (addDetailedDto.getSortKey()) {
case "1":
sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea());
if (addDetailedDto.getInforlist()!=null){
if (addDetailedDto.getInforlist().contains(",")){
String[] id = addDetailedDto.getInforlist().split(",");
String[] putTime = addDetailedDto.getInforlist1().split(",");
String[] zcc = addDetailedDto.getInforlist2().split(",");
String[] xcx = addDetailedDto.getInforlist3().split(",");
for (int a =0;a< id.length;a++){
TimeDto dto = new TimeDto();
dto.setStandId(id[a]);
if (null==putTime[a]){
dto.setPutTime(null);
}else {
dto.setPutTime(putTime[a]);
}
if (null == xcx[a]){
dto.setXcxssrqgj(null);
}else {
dto.setXcxssrqgj(xcx[a]);
}
if (null == zcc[a]){
dto.setZccssrqgj(null);
}else {
dto.setZccssrqgj(zcc[a]);
}
timeDto.add(dto);
}
}else {
TimeDto dto = new TimeDto();
dto.setStandId(addDetailedDto.getInforlist());
dto.setPutTime(addDetailedDto.getInforlist1());
dto.setXcxssrqgj(addDetailedDto.getInforlist2());
dto.setZccssrqgj(addDetailedDto.getInforlist3());
timeDto.add(dto);
}
}else {
timeDto=null;
}
break;
case "2":
sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName());
if (addDetailedDto.getInforlist() != null){
if (addDetailedDto.getInforlist().contains(",")){
String[] id = addDetailedDto.getInforlist().split(",");
for (String standId:id){
TimeDto dto = new TimeDto();
dto.setStandId(standId);
timeDto.add(dto);
}
}else {
TimeDto dto = new TimeDto();
dto.setStandId(addDetailedDto.getInforlist());
timeDto.add(dto);
}
}else {
timeDto=null;
}
break;
case "3":
sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList());
if (addDetailedDto.getInforlist() != null){
if (addDetailedDto.getInforlist().contains(",")){
String[] id = addDetailedDto.getInforlist().split(",");
for (String standId:id){
TimeDto dto = new TimeDto();
dto.setStandId(standId);
timeDto.add(dto);
}
}else {
TimeDto dto = new TimeDto();
dto.setStandId(addDetailedDto.getInforlist());
timeDto.add(dto);
}
}else {
timeDto=null;
}
break;
default:
break;
}
if ("admin".equals(getUserName()))sarLawsDetailedList.setUpdatePeople("管理员");
else {sarLawsDetailedList.setUpdatePeople(getUserName());}
if (addDetailedDto.getInforlist()!=null){
if (addDetailedDto.getInforlist().contains(",")){
String[] id = addDetailedDto.getInforlist().split(",");
String[] putTime = addDetailedDto.getInforlist1().split(",");
String[] zcc = addDetailedDto.getInforlist2().split(",");
String[] xcx = addDetailedDto.getInforlist3().split(",");
for (int a =0;a< id.length;a++){
TimeDto dto = new TimeDto();
dto.setStandId(id[a]);
if (null==putTime[a]){
dto.setPutTime(null);
}else {
dto.setPutTime(putTime[a]);
}
if (null == xcx[a]){
dto.setXcxssrqgj(null);
}else {
dto.setXcxssrqgj(xcx[a]);
}
if (null == zcc[a]){
dto.setZccssrqgj(null);
}else {
dto.setZccssrqgj(zcc[a]);
}
timeDto.add(dto);
}
}else {
TimeDto dto = new TimeDto();
dto.setStandId(addDetailedDto.getInforlist());
dto.setPutTime(addDetailedDto.getInforlist1());
dto.setXcxssrqgj(addDetailedDto.getInforlist2());
dto.setZccssrqgj(addDetailedDto.getInforlist3());
timeDto.add(dto);
}
}else {
timeDto=null;
}
sarLawsDetailedListDao.insert(sarLawsDetailedList);
service.insertDetailedList(sarLawsDetailedList.getId(),timeDto);
@@ -288,34 +259,30 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
for (int a = 0; a < id.length; a++) {
TimeDto dto = new TimeDto();
dto.setStandId(id[a]);
if ("\"".equals(putTime[a])) {
if (putTime[a]==null) {
dto.setPutTime(null);
} else {
dto.setPutTime(putTime[a]);
}
if ("\"".equals(putTime[a])) {
if (putTime[a]==null) {
dto.setXcxssrqgj(null);
} else {
dto.setXcxssrqgj(xcx[a]);
}
if ("\"".equals(putTime[a])) {
if (putTime[a]==null) {
dto.setZccssrqgj(null);
} else {
dto.setZccssrqgj(zcc[a]);
}
timeDto.add(dto);
}
} else if ("1".equals(detailedUpDto.getSortKey())){
} else {
TimeDto dto = new TimeDto();
dto.setStandId(detailedUpDto.getInforlist());
dto.setPutTime(detailedUpDto.getInforlist1());
dto.setXcxssrqgj(detailedUpDto.getInforlist2());
dto.setZccssrqgj(detailedUpDto.getInforlist3());
timeDto.add(dto);
}else {
TimeDto dto = new TimeDto();
dto.setStandId(detailedUpDto.getInforlist());
timeDto.add(dto);
}
service.updateDetailedLaws(detailedUpDto.getId(), timeDto);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java
+50 -27
View File
@@ -41,35 +41,58 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl<SarPublicIdeaAllDao
@Override
public IPage<SarPublicIdeaAllSUD> selectAll(DetAllStandDto detAllStandDto){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date Time = null;
try {
Time = sdf.parse(detAllStandDto.getEndTime());
} catch (ParseException e) {
e.printStackTrace();
if (detAllStandDto.getEndTime()!=null){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date Time = null;
try {
Time = sdf.parse(detAllStandDto.getEndTime());
} catch (ParseException e) {
e.printStackTrace();
}
QueryWrapper<SarPublicIdeaAll> wrapper = new QueryWrapper<>();
wrapper.eq("CID",detAllStandDto.getCid());
Page<SarPublicIdeaAll> page = new Page<>(detAllStandDto.getPage(),detAllStandDto.getSize());
IPage<SarPublicIdeaAll> userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper);
System.out.println("总条数"+userIPage.getTotal());
System.out.println("总页数"+userIPage.getPages());
List<SarPublicIdeaAll> list= userIPage.getRecords();
List<SarPublicIdeaAllSUD> list1 = new ArrayList<>();
list1 = BeanConverUtil.converList(list, SarPublicIdeaAllSUD.class);
for (SarPublicIdeaAllSUD sud:list1){
if (Time.compareTo(new Date())>=0)sud.setIdeaKey(0);
else {sud.setIdeaKey(1);}
}
IPage<SarPublicIdeaAllSUD> userIPage1 = new Page<>();
userIPage1.setPages(userIPage.getPages());
userIPage1.setSize(userIPage.getSize());
userIPage1.setTotal(userIPage.getTotal());
userIPage1.setCurrent(userIPage.getCurrent());
userIPage1.setRecords(list1);
return userIPage1;
}else {
QueryWrapper<SarPublicIdeaAll> wrapper = new QueryWrapper<>();
wrapper.eq("CID",detAllStandDto.getCid());
Page<SarPublicIdeaAll> page = new Page<>(detAllStandDto.getPage(),detAllStandDto.getSize());
IPage<SarPublicIdeaAll> userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper);
System.out.println("总条数"+userIPage.getTotal());
System.out.println("总页数"+userIPage.getPages());
List<SarPublicIdeaAll> list= userIPage.getRecords();
List<SarPublicIdeaAllSUD> list1 = new ArrayList<>();
list1 = BeanConverUtil.converList(list, SarPublicIdeaAllSUD.class);
for (SarPublicIdeaAllSUD sud:list1){
sud.setIdeaKey(0);
}
IPage<SarPublicIdeaAllSUD> userIPage1 = new Page<>();
userIPage1.setPages(userIPage.getPages());
userIPage1.setSize(userIPage.getSize());
userIPage1.setTotal(userIPage.getTotal());
userIPage1.setCurrent(userIPage.getCurrent());
userIPage1.setRecords(list1);
return userIPage1;
}
QueryWrapper<SarPublicIdeaAll> wrapper = new QueryWrapper<>();
wrapper.eq("CID",detAllStandDto.getCid());
Page<SarPublicIdeaAll> page = new Page<>(detAllStandDto.getPage(),detAllStandDto.getSize());
IPage<SarPublicIdeaAll> userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper);
System.out.println("总条数"+userIPage.getTotal());
System.out.println("总页数"+userIPage.getPages());
List<SarPublicIdeaAll> list= userIPage.getRecords();
List<SarPublicIdeaAllSUD> list1 = new ArrayList<>();
list1 = BeanConverUtil.converList(list, SarPublicIdeaAllSUD.class);
for (SarPublicIdeaAllSUD sud:list1){
if (Time.compareTo(new Date())>=0)sud.setIdeaKey(0);
else {sud.setIdeaKey(1);}
}
IPage<SarPublicIdeaAllSUD> userIPage1 = new Page<>();
userIPage1.setPages(userIPage.getPages());
userIPage1.setSize(userIPage.getSize());
userIPage1.setTotal(userIPage.getTotal());
userIPage1.setCurrent(userIPage.getCurrent());
userIPage1.setRecords(list1);
return userIPage1;
}
@Override
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+22 -3
View File
@@ -1,13 +1,15 @@
package com.adc.da.slrs.sarStandItems.service.impl;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao;
import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
import com.adc.da.slrs.sarStandItems.entity.*;
import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao;
import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService;
import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController;
import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -32,11 +34,12 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
@Autowired
private SarStandItemsDao dao;
@Autowired
private SysInfoEOService sysInfoEOService;
@Autowired
private SarLawsAttrDetailedListDao sarLawsAttrDetailedListDao;
@Autowired
private SarStandardsInfoController sarStandardsInfoController;
public List<ActSarItemsEO> queryItemsByList(SarStandItemsEOPage page, String resType){
List<SarStandItems> itemsEOList = dao.queryItemsByList(page);
@@ -144,7 +147,23 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
@Override
public IPage<LawsDto> selectLawDto(FindStandDto findStandDto) {
List<String> standId = dao.selectStandId((findStandDto.getPage())-1, findStandDto.getSize());
SarStandardsInfoEOPage page = new SarStandardsInfoEOPage();
page.setPage(findStandDto.getPage());
page.setPageSize(findStandDto.getSize());
page.setUserId(null);
List<SarStandardsInfo> pageInfo = null;
try {
pageInfo = sarStandardsInfoController.getSarStandardsInfoPage(page).getData().getList();
} catch (Exception e) {
e.printStackTrace();
}
List<String> standId = new ArrayList<>();
for (SarStandardsInfo standardsInfo : pageInfo){
if (standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){
standId.add(standardsInfo.getId());
}
}
List<LawsDto> list=new ArrayList<>();
if (standId==null || standId.size()==0){
list = null;