diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
index 432017a5..97c677f2 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
@@ -1,5 +1,4 @@
package com.adc.da.slrs.sarStandProjectLibrary.controller;
-
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
@@ -12,12 +11,10 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import com.adc.da.base.web.BaseController;
-
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder;
import java.util.*;
-
/**
*
* 前端控制器
@@ -33,14 +30,14 @@ public class SarStandProjectLibraryController extends BaseController list){
@@ -147,13 +144,13 @@ public class SarStandProjectLibraryController extends BaseController
* 服务实现类
@@ -32,15 +28,12 @@ import java.util.List;
*/
@Service
public class SarStandProjectLibraryServiceImpl extends ServiceImpl implements SarStandProjectLibraryService {
-
@Resource
private SarStandProjectLibraryDao sarStandProjectLibraryDao;
@Resource
private SarStandardsInfoDao SarStandardsInfoDao;
@Resource
private SarStandAttrInfoDao sarStandAttrInfoDao;
-
-
@Override
public IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) {
SarStandProjectLibrary sar = new SarStandProjectLibrary();
@@ -82,7 +75,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) {
SarStandProjectLibrary sar = new SarStandProjectLibrary();
@@ -124,7 +116,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryById(String id) {
QueryWrapper wrapper = new QueryWrapper<>();
@@ -132,7 +123,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl list = sarStandProjectLibraryDao.selectList(wrapper);
return list;
}
-
@Override
public IPage queryProjectManager(int current, int pageSize) {
QueryWrapper wrapper = new QueryWrapper<>();
@@ -144,7 +134,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryByProductLine(String productLine) {
QueryWrapper wrapper = new QueryWrapper<>();
@@ -152,7 +141,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl list = sarStandProjectLibraryDao.selectList(wrapper);
return list;
}
-
@Override
public List queryStandId(String standId) {
QueryWrapper wrapper = new QueryWrapper<>();
@@ -161,25 +149,22 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl list = sarStandProjectLibraryDao.selectList(wrapper);
return list;
}
-
@Override
public IPage queryStandInfo(int current, int pageSize, String standId) {
QueryWrapper wrapper1 = new QueryWrapper<>();
- wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME");
+ wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME");
wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='"+ standId+"'");
Page page1 = new Page<>(current, pageSize);
IPage userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1);
System.out.println("总条数"+userIPage1.getTotal());
System.out.println("总页数"+userIPage1.getPages());
-
QueryWrapper wrapper2 = new QueryWrapper<>();
- wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQGJ","ZCCSSRQGJ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN");
+ wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQ","ZCCSSRQ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN");
wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.project_id ='"+ standId+"'");
Page page2 = new Page<>(current, pageSize);
IPage userIPage2 = sarStandAttrInfoDao.selectPage(page2, wrapper2);
System.out.println("总条数"+userIPage2.getTotal());
System.out.println("总页数"+userIPage2.getPages());
-
List list = new ArrayList<>();
List list1 = userIPage1.getRecords();
List list2 = userIPage2.getRecords();
@@ -187,19 +172,21 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl ids) {
sarStandProjectLibraryDao.deleteByIds(ids);
}
-
@Override
public void batchInsert(List list) {
sarStandProjectLibraryDao.batchInsert(list);
}
-
@Override
public List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto ,String id) {
List ids = standAttrInfoExcelDto.getIds();
List list = new ArrayList<>();
- String idmis=String.join(",",ids);
- System.out.println(idmis);
- QueryWrapper wrapper1 = new QueryWrapper<>();
- wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME");
- wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'");
- List userList1 = SarStandardsInfoDao.selectList(wrapper1);
- QueryWrapper wrapper2 = new QueryWrapper<>();
- wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQGJ","ZCCSSRQGJ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN");
- wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'");
- List userList2 = sarStandAttrInfoDao.selectList(wrapper2);
- for(SarStandardsInfo s:userList1){
- StandAttrInfoDto p =new StandAttrInfoDto();
- p.setStandNumber(s.getStandNumber());
- p.setStandName(s.getStandName());
- p.setStandEnName(s.getStandEnName());
- for (SarStandAttrInfo a:userList2){
- if(s.getId().equals(a.getStandId())){
- p.setCYCVPPSBM(a.getCycvppsbm());
- p.setCYCVPPSCN(a.getCycvppscn());
- if (a.getSsrq()!=null){
- p.setSSRQ(a.getSsrq().substring(0,10));
- }
- if (a.getXcxssrqgj()!=null){
- p.setXCXSSRQGJ(a.getXcxssrqgj().substring(0,10));
- }
- if (a.getZccssrqgj()!=null){
- p.setZCCSSRQGJ(a.getZccssrqgj().substring(0,10));
- }
- p.setKCCVPPSBM(a.getKccvppsbm());
- p.setKCCVPPSCN(a.getKccvppscn());
- p.setZRBM(a.getZrbm());
+ String idmis=String.join(",",ids);
+ System.out.println(idmis);
+ QueryWrapper wrapper1 = new QueryWrapper<>();
+ wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME");
+ wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'");
+ List userList1 = SarStandardsInfoDao.selectList(wrapper1);
+ QueryWrapper wrapper2 = new QueryWrapper<>();
+ wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQ","ZCCSSRQ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN");
+ wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'");
+ List userList2 = sarStandAttrInfoDao.selectList(wrapper2);
+ for(SarStandardsInfo s:userList1){
+ StandAttrInfoDto p =new StandAttrInfoDto();
+ p.setStandNumber(s.getStandNumber());
+ p.setStandName(s.getStandName());
+ p.setStandEnName(s.getStandEnName());
+ for (SarStandAttrInfo a:userList2){
+ if(s.getId().equals(a.getStandId())){
+ p.setCYCVPPSBM(a.getCycvppsbm());
+ p.setCYCVPPSCN(a.getCycvppscn());
+ if (a.getSsrq()!=null){
+ p.setSSRQ(a.getSsrq().substring(0,10));
}
+ if (a.getXcxssrqgj()!=null){
+ p.setXCXSSRQGJ(a.getXcxssrq().substring(0,10));
+ }
+ if (a.getZccssrqgj()!=null){
+ p.setZCCSSRQGJ(a.getZccssrq().substring(0,10));
+ }
+ p.setKCCVPPSBM(a.getKccvppsbm());
+ p.setKCCVPPSCN(a.getKccvppscn());
+ p.setZRBM(a.getZrbm());
}
- list.add(p);
}
+ list.add(p);
+ }
return list;
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
index e5c91ca3..1270bef4 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
@@ -41,12 +41,13 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
- if(sarStandUnqualifiedPage.getStandId()!=null || sarStandUnqualifiedPage.getStandName()!=null){
- sarStandUnqualifiedQueryWrapper
- .like("stand_id",sarStandUnqualifiedPage.getStandId())
- .like("stand_name",sarStandUnqualifiedPage.getStandId());
+ if(sarStandUnqualifiedPage.getStandId()!=null){
+ sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId());
// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
}
+ if (sarStandUnqualifiedPage.getStandName()!=null){
+ sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
+ }
//仅查询未关闭的
sarStandUnqualifiedQueryWrapper.eq("close_state",1);
if(sarStandUnqualifiedPage.getProductName()!=null){
@@ -72,11 +73,13 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
- if(sarStandUnqualifiedPage.getStandId()!=null || sarStandUnqualifiedPage.getStandName()!=null){
- sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId())
- .like("stand_name",sarStandUnqualifiedPage.getStandId());
+ if(sarStandUnqualifiedPage.getStandId()!=null){
+ sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId());
// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
}
+ if (sarStandUnqualifiedPage.getStandName()!=null){
+ sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
+ }
//仅查询关闭的
sarStandUnqualifiedQueryWrapper.eq("close_state",2);
@@ -122,10 +125,12 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getStandUnqualifiedExcelData(StandUnqualifiedExcelVO standUnqualifiedExcelVO) {
QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
sarStandUnqualifiedQueryWrapper.eq("close_state",1);
- if(standUnqualifiedExcelVO.getIds()!=null&&standUnqualifiedExcelVO.getIds().size()>0){
+ if(standUnqualifiedExcelVO.getIds()!=null && standUnqualifiedExcelVO.getIds().size()>0){
sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds());
}
- return sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
+ List stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
+ List a = stand;
+ return a;
}
private boolean closeSarStandUnqualified(String standUnqualifiedId){