list=new ArrayList<>();
if (standId==null || standId.size()==0){
list = null;
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 39d3810c..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 = sarStandProjectLibraryService.queryStandId(id);
- List list1 = new ArrayList();
- for(SarStandProjectLibrary s:list){
- list1.add(s.getStandId());
- }
- System.out.println(list1);
- IPage list2 = sarStandProjectLibraryService.queryStandInfo(current,pageSize,id);
- return Result.success("200",list2);
+// List list = sarStandProjectLibraryService.queryStandId(id);
+// List list1 = new ArrayList();
+// for(SarStandProjectLibrary s:list){
+// list1.add(s.getStandId());
+// }
+// System.out.println(list1);
+ IPage list = sarStandProjectLibraryService.queryStandInfo(current,pageSize,id);
+ return Result.success("200",list);
}
/**
- *
+ *
* @param id
- * @return
- * @author zj
- * date 2021-07-15
- **/
+ * @return
+ * @author zj
+ * date 2021-07-15
+ **/
@PostMapping("/deleteByIds")
@ApiOperation("批量删除标准")
public ResponseMessage deleteByIds(String id){
@@ -134,12 +131,12 @@ public class SarStandProjectLibraryController extends BaseController list){
@@ -147,16 +144,16 @@ public class SarStandProjectLibraryController extends BaseController data= sarStandProjectLibraryService.exportStandAttrInfoExcel(standAttrInfoExcelDto);
+ List data= sarStandProjectLibraryService.exportStandAttrInfoExcel(standAttrInfoExcelDto,id);
// 这里需要设置不关闭流
- EasyExcel.write(response.getOutputStream(), StandAttrInfoDto.class).autoCloseStream(Boolean.FALSE).sheet("sheet1")
+ EasyExcel.write(response.getOutputStream(), StandAttrInfoDto.class).useDefaultStyle(false).autoCloseStream(Boolean.FALSE).sheet("sheet1")
.doWrite(data);
} catch (Exception e) {
System.out.println(e);
@@ -179,6 +176,4 @@ public class SarStandProjectLibraryController extends BaseController queryStandInfo(int current, int pageSize, String standId);
void deleteByIds(List ids);
void batchInsert(@Param("ids") List list);
- List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto);
+ List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId);
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
index f88e9faa..f3b765f9 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
@@ -1,6 +1,4 @@
package com.adc.da.slrs.sarStandProjectLibrary.service.impl;
-
-
import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
@@ -14,14 +12,12 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-
/**
*
* 服务实现类
@@ -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,47 +149,46 @@ 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_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();
for(SarStandardsInfo s:list1){
StandAttrInfoDto p =new StandAttrInfoDto();
p.setStandId(s.getId());
+ p.setStandNumber(s.getStandNumber());
+ p.setStandSort(s.getStandSort());
+ p.setStandYear(s.getStandYear());
p.setStandName(s.getStandName());
p.setStandEnName(s.getStandEnName());
for (SarStandAttrInfo a:list2){
- if(s.getId().equals(a.getStandId())){
- p.setCYCVPPSBM(a.getCycvppsbm());
- p.setCYCVPPSCN(a.getCycvppscn());
- p.setSSRQ(a.getSsrq());
- p.setXCXSSRQGJ(a.getXcxssrqgj());
- p.setZCCSSRQGJ(a.getZccssrqgj());
- p.setKCCVPPSBM(a.getKccvppsbm());
- p.setKCCVPPSCN(a.getKccvppscn());
- p.setZRBM(a.getZrbm());
- }
+ if(s.getId().equals(a.getStandId())){
+ p.setCYCVPPSBM(a.getCycvppsbm());
+ p.setCYCVPPSCN(a.getCycvppscn());
+ p.setSSRQ(a.getSsrq());
+ p.setXCXSSRQGJ(a.getXcxssrq());
+ p.setZCCSSRQGJ(a.getZccssrq());
+ p.setKCCVPPSBM(a.getKccvppsbm());
+ p.setKCCVPPSCN(a.getKccvppscn());
+ p.setZRBM(a.getZrbm());
+ }
}
list.add(p);
- System.out.println(list);
}
IPage userIPage = new Page<>();
userIPage.setRecords(list);
@@ -210,79 +197,52 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl ids) {
sarStandProjectLibraryDao.deleteByIds(ids);
}
-
@Override
public void batchInsert(List list) {
sarStandProjectLibraryDao.batchInsert(list);
}
-
@Override
- public List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto) {
+ public List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto ,String id) {
List ids = standAttrInfoExcelDto.getIds();
List list = new ArrayList<>();
- if (ids==null||ids.size()==0){
- QueryWrapper wrapper1 = new QueryWrapper<>();
- wrapper1.select("ID","STAND_NAME","STAND_EN_NAME");
- wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.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");
- List userList2 = sarStandAttrInfoDao.selectList(wrapper2);
- for(SarStandardsInfo s:userList1){
- StandAttrInfoDto p =new StandAttrInfoDto();
- p.setStandId(s.getId());
- 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());
- p.setSSRQ(a.getSsrq());
- p.setXCXSSRQGJ(a.getXcxssrqgj());
- p.setZCCSSRQGJ(a.getZccssrqgj());
- 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));
}
- }
- list.add(p);
- }
- }else {
- String idmis=String.join(",",ids);
- System.out.println(idmis);
- QueryWrapper wrapper1 = new QueryWrapper<>();
- wrapper1.select("ID","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 +")");
- 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 +")");
- List userList2 = sarStandAttrInfoDao.selectList(wrapper2);
- for(SarStandardsInfo s:userList1){
- StandAttrInfoDto p =new StandAttrInfoDto();
- p.setStandId(s.getId());
- 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());
- p.setSSRQ(a.getSsrq());
- p.setXCXSSRQGJ(a.getXcxssrqgj());
- p.setZCCSSRQGJ(a.getZccssrqgj());
- p.setKCCVPPSBM(a.getKccvppsbm());
- p.setKCCVPPSCN(a.getKccvppscn());
- p.setZRBM(a.getZrbm());
+ 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/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
index 347f77df..7158dc30 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
@@ -81,7 +81,7 @@ public class SarStandUnqualified extends BaseEntity {
@TableField("CREATE_BY_ID")
private String createById;
- @ExcelProperty(value = "创建时间",converter = TimestampConverter.class)
+ @ExcelIgnore
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -100,7 +100,7 @@ public class SarStandUnqualified extends BaseEntity {
@TableField("ACTUAL_CLOSE_TIME")
private Date actualCloseTime;
- @ExcelProperty(value = "计划关闭时间",converter = TimestampConverter.class)
+ @ExcelIgnore
@ApiModelProperty(value = "计划关闭时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -126,8 +126,6 @@ public class SarStandUnqualified extends BaseEntity {
@TableField("DUTY_ENGINEER")
private String dutyEngineer;
-
-
@ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class)
@ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）")
@TableField("PRODUCT_TYPE")
@@ -138,7 +136,6 @@ public class SarStandUnqualified extends BaseEntity {
@TableId(type = IdType.UUID)
private String id;
-
@ApiModelProperty(value = "质量工程师")
@TableField(exist=false)
private String qaEngineerName;
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 1c73a0d7..71be68e1 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
@@ -1,5 +1,7 @@
package com.adc.da.slrs.sarStandUnqualified.service.impl;
+import com.adc.da.slrs.sarLawsDetailedList.Util.BeanConverUtil;
+import com.adc.da.slrs.sarLawsDetailedList.entity.ExcelDto;
import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
import com.adc.da.slrs.sarStandUnqualified.dao.SarStandUnqualifiedDao;
import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualifiedPage;
@@ -10,16 +12,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.stereotype.Service;
import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
*
@@ -43,11 +42,12 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
if(sarStandUnqualifiedPage.getStandId()!=null){
- sarStandUnqualifiedQueryWrapper
- .like("stand_id",sarStandUnqualifiedPage.getStandId())
- .like("stand_name",sarStandUnqualifiedPage.getStandId());
+ 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){
@@ -74,9 +74,12 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
if(sarStandUnqualifiedPage.getStandId()!=null){
- sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name",sarStandUnqualifiedPage.getStandId()));
+ 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,38 @@ 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 list = new ArrayList<>();
+ list = BeanConverUtil.converList(stand,ExcelDto.class);
+ for (int a=0;a getDicTypeList() {
+ return dicTypeList;
+ }
+
+ public void setDicTypeList(List dicTypeList) {
+ this.dicTypeList = dicTypeList;
+ }
+
+ public List getAttrInfoList() {
+ return attrInfoList;
+ }
+
+ public void setAttrInfoList(List attrInfoList) {
+ this.attrInfoList = attrInfoList;
+ }
+
+ public Map getAttrInfoMap() {
+ return attrInfoMap;
+ }
+
+ public void setAttrInfoMap(Map attrInfoMap) {
+ this.attrInfoMap = attrInfoMap;
+ }
+
+ public Map getAttrInfoCaseMap() {
+ return attrInfoCaseMap;
+ }
+
+ public void setAttrInfoCaseMap(Map attrInfoCaseMap) {
+ this.attrInfoCaseMap = attrInfoCaseMap;
+ }
+
+ public String getSarStandAttrEOStr() {
+ return sarStandAttrEOStr;
+ }
+
+ public void setSarStandAttrEOStr(String sarStandAttrEOStr) {
+ this.sarStandAttrEOStr = sarStandAttrEOStr;
+ }
+
+ public String getMenuId() {
+ return menuId;
+ }
+
+ public void setMenuId(String menuId) {
+ this.menuId = menuId;
+ }
+
+ public int getUpReplaceNumFlag() {
+ return upReplaceNumFlag;
+ }
+
+ public void setUpReplaceNumFlag(int upReplaceNumFlag) {
+ this.upReplaceNumFlag = upReplaceNumFlag;
+ }
+
+ public int getUpNumFlag() {
+ return upNumFlag;
+ }
+
+ public void setUpNumFlag(int upNumFlag) {
+ this.upNumFlag = upNumFlag;
+ }
+
+ public String getFileIds() {
+ return fileIds;
+ }
+
+ public void setFileIds(String fileIds) {
+ this.fileIds = fileIds;
+ }
+
+ public Date getNewCarPutTime() {
+ return newCarPutTime;
+ }
+
+ public void setNewCarPutTime(Date newCarPutTime) {
+ this.newCarPutTime = newCarPutTime;
+ }
+
+ public List getItemsList() {
+ return itemsList;
+ }
+
+ public void setItemsList(List itemsList) {
+ this.itemsList = itemsList;
+ }
+
+ public String getRelateStand() {
+ return relateStand;
+ }
+
+ public void setRelateStand(String relateStand) {
+ this.relateStand = relateStand;
+ }
+
+ public String getAccessCountry() {
+ return accessCountry;
+ }
+
+ public void setAccessCountry(String accessCountry) {
+ this.accessCountry = accessCountry;
+ }
+
+ public String getProcessNum() {
+ return processNum;
+ }
+
+ public void setProcessNum(String processNum) {
+ this.processNum = processNum;
+ }
+
+ public String getMenuType() {
+ return menuType;
+ }
+
+ public void setMenuType(String menuType) {
+ this.menuType = menuType;
+ }
+
+ public String getAllPutTime() {
+ return allPutTime;
+ }
+
+ public void setAllPutTime(String allPutTime) {
+ this.allPutTime = allPutTime;
+ }
+
+ public String getJspg() {
+ return jspg;
+ }
+
+ public void setJspg(String jspg) {
+ this.jspg = jspg;
+ }
+
+ public String getCHJL() {
+ return CHJL;
+ }
+
+ public void setCHJL(String CHJL) {
+ this.CHJL = CHJL;
+ }
+
+ public String getPutTime2() {
+ return putTime2;
+ }
+
+ public void setPutTime2(String putTime2) {
+ this.putTime2 = putTime2;
+ }
+
+ public String getStandSystemName() {
+ return standSystemName;
+ }
+
+ public void setStandSystemName(String standSystemName) {
+ this.standSystemName = standSystemName;
+ }
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index b496c928..63b78fb7 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -10,6 +10,7 @@ import com.adc.da.mq.service.CreateStandMQService;
import com.adc.da.person.dao.PersonCollectEODao;
import com.adc.da.person.dao.PersonShareEODao;
import com.adc.da.person.service.IPersonCollectEOService;
+import com.adc.da.search.service.StandLawsSearchService;
import com.adc.da.slrs.sarLawsInfo.entity.SarLawsInfo;
import com.adc.da.slrs.sarLawsInfo.page.SarLawsInfoEOPage;
import com.adc.da.slrs.sarLawsInfo.page.SarLawsItemsEOPage;
@@ -58,6 +59,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.util.PDFTextStripper;
+import org.apache.pdfbox.util.PDFTextStripperByArea;
+import org.apache.poi.hwpf.extractor.WordExtractor;
+import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
@@ -73,6 +81,7 @@ import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.io.File;
+import java.io.FileInputStream;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Modifier;
@@ -182,6 +191,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl attrInfoMap) {
-
+ Set keys = attrInfoMap.keySet();
+ for (String key:keys) {
+ String value = String.valueOf(attrInfoMap.get(key));
+ if (com.adc.da.util.utils.StringUtils.isNotBlank(value) && !"null".equals(value) && !"SVPPS".equals(key)){
+ value = value.replace(" , ",",");
+ value = value.replace(","," , ");
+ attrInfoMap.put(key,value);
+ }
+ }
+ // 根据文件attid 读取文件内容
+ if (org.apache.commons.lang.StringUtils.isNotEmpty(String.valueOf(attrInfoMap.get("content")))) {
+ String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(" , ");
+ StringBuilder content = new StringBuilder("");
+ for (int i = 0; i < attidlist.length; i++) {
+ if(org.apache.commons.lang.StringUtils.isNotEmpty(attidlist[i]) ){
+ AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
+ //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
+ String readFilePath = "E:\\上汽企标流程总览.pdf";
+ try {
+ // 判断文件是docx还是PDF
+ if (null != attFileEO.getFileSuffix() && (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("ppt") || attFileEO.getFileSuffix().equals("pptx"))) {
+ if(attFileEO.getFileSuffix().equals("doc")){
+ FileInputStream fis = new FileInputStream(readFilePath);
+ WordExtractor wordExtractor = new WordExtractor(fis);
+ String txt = wordExtractor.getText();
+ content.append(txt);
+ }else {
+ OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
+ XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);
+ String txt = extractor.getText();
+ content.append(txt);
+ }
+ } else {
+ PDDocument document = PDDocument.load(new File(readFilePath));
+ document.getClass();
+ if (!document.isEncrypted()) {
+ PDFTextStripperByArea stripper = new PDFTextStripperByArea();
+ stripper.setSortByPosition(true);
+ PDFTextStripper tStripper = new PDFTextStripper();
+ String pdfFileInText = tStripper.getText(document);
+ // String[] lines = pdfFileInText.split("\\r?\\n");
+ content.append(pdfFileInText);
+ }
+ }
+ } catch (Exception e) {
+ logger.error("搜索中心新增数据读取文档内容时失败");
+ logger.error(e.getMessage(),e);
+ }
+ attrInfoMap.put("content",content.toString());
+ }
+ }
+ }
+ else{
+ attrInfoMap.put("content","");
+ }
+ standLawsSearchService.addStandLawsSearchForMap(attrInfoMap);
}
@Override
public void updateIntoIndexForMap(Map attrInfoMap) {
-
+ Set keys = attrInfoMap.keySet();
+ for (String key:keys) {
+ String value = String.valueOf(attrInfoMap.get(key));
+ if (com.adc.da.util.utils.StringUtils.isNotBlank(value) && !"null".equals(value) && !"SVPPS".equals(key) && !"content".equals(key)){
+ value = value.replace(" , ",",");
+ value = value.replace(","," , ");
+ attrInfoMap.put(key,value);
+ }
+ }
+ // 根据文件attid 读取文件内容
+ if (org.apache.commons.lang.StringUtils.isNotEmpty(String.valueOf(attrInfoMap.get("content")))) {
+ String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(" , ");
+ StringBuilder content = new StringBuilder("");
+ for (int i = 0; i < attidlist.length; i++) {
+ if(org.apache.commons.lang.StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i])){
+ AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
+ //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
+ try {
+ // 判断文件是docx还是PDF
+ /*if (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc")) {
+ if(attFileEO.getFileSuffix().equals("doc")){
+ FileInputStream fis = new FileInputStream(readFilePath);
+ WordExtractor wordExtractor = new WordExtractor(fis);
+ String txt = wordExtractor.getText();
+ content.append(txt);
+ }else {
+ OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
+ XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);
+ String txt = extractor.getText();
+ content.append(txt);
+ }
+ } else if (attFileEO.getFileSuffix().equals("pdf")){
+ PDDocument document = PDDocument.load(new File(readFilePath));
+ document.getClass();
+ if (!document.isEncrypted()) {
+ PDFTextStripperByArea stripper = new PDFTextStripperByArea();
+ stripper.setSortByPosition(true);
+ PDFTextStripper tStripper = new PDFTextStripper();
+ String pdfFileInText = tStripper.getText(document);
+ // String[] lines = pdfFileInText.split("\\r?\\n");
+ content.append(pdfFileInText);
+ }
+ }*/
+ String readFilePath = "E:\\上汽企标流程总览.pdf";
+ FileInputStream fis = new FileInputStream(readFilePath);
+ WordExtractor wordExtractor = new WordExtractor(fis);
+ String txt = wordExtractor.getText();
+ content.append(txt);
+ } catch (Exception e) {
+ logger.error("搜索中心修改数据读取文档内容时失败");
+ logger.error(e.getMessage(),e);
+ }
+ attrInfoMap.put("content",content.toString());
+ }
+ }
+ }
+ else{
+ attrInfoMap.put("content","");
+ }
+ standLawsSearchService.updateStandLawsSearchForMap(attrInfoMap);
}
//
// @Override
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/search/SearchController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/search/SearchController.java
new file mode 100644
index 00000000..1377523d
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/search/SearchController.java
@@ -0,0 +1,27 @@
+package com.adc.da.slrs.search;
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.tsDictionaryType.entity.TsSearchMenu;
+import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/${restPath}/search")
+public class SearchController {
+
+ @Autowired
+ private ITsDicTypeService iTsDictypeService;
+
+ @ApiOperation("获取筛选条件")
+ @PostMapping("/getMenu")
+ public ResponseMessage> getSearchMenu(){
+ return Result.success(iTsDictypeService.getSearchMenu());
+ }
+}
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
index a77962cc..121a16f4 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
@@ -646,7 +646,6 @@
select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer
from SAR_STAND_ITEMS
where FILE_TYPE=#{type}
-
and STAND_ID in
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
index 87f689cd..745bb3e1 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
@@ -3,8 +3,9 @@
+
+
+
@@ -67,7 +83,9 @@
order by number
+
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml
index 86f5a6f0..288146c0 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml
@@ -26,7 +26,14 @@
TS_DICTYPE.id,TS_DICTYPE.parent_id, TS_DICTYPE.dic_type_code, TS_DICTYPE.dic_type_name, TS_DICTYPE.dic_id,
- TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,TS_DICTYPE.show_index,tree_pid
+ TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,TS_DICTYPE.show_index,
+ tree_pid
+
+
+
+
+ TS_DICTYPE.id,TS_DICTYPE.parent_id, TS_DICTYPE.dic_type_code, TS_DICTYPE.dic_type_name, TS_DICTYPE.dic_id,
+ TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,(@rownum :=@rownum + 1) AS rownum,TS_DICTYPE.show_index,tree_pid
@@ -34,6 +41,11 @@
a.id,a.parent_id, a.dic_type_code, a.dic_type_name, a.dic_id,a.valid_flag,a.creation_time,a.modify_time,a.describes,a.show_index
+
+
+ a.id,a.parent_id, a.dic_type_code, a.dic_type_name, a.dic_id,a.valid_flag,a.creation_time,a.modify_time,a.rownum,a.describes,a.show_index
+
+
u.*, ur.id as type_id,
ur.dic_type_code as dic_type_code,
@@ -294,19 +306,20 @@
@@ -461,8 +474,9 @@
AND SAR_LAWS_ITEM_VAL.VALID_FLAG =0
union
select count(*) from SAR_BUSSIONESS_STAND
- where (SAR_BUSSIONESS_STAND.STAND_GENERA = #{dicTypeCode} or
- SAR_BUSSIONESS_STAND.STAND_SUBCLASS = #{dicTypeCode} or
+ where (
+
+
SAR_BUSSIONESS_STAND.STAND_STATUS = #{dicTypeCode} or
SAR_BUSSIONESS_STAND.STAND_SORT = #{dicTypeCode})
and SAR_BUSSIONESS_STAND.VALID_FLAG =0