diff --git a/adc-da-slrs/pom.xml b/adc-da-slrs/pom.xml index 951b761a..a0370e61 100644 --- a/adc-da-slrs/pom.xml +++ b/adc-da-slrs/pom.xml @@ -127,6 +127,12 @@ hanlp portable-1.7.5 + + com.google.guava + guava + 19.0 + compile + \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java index e03fc1cd..986f4737 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java @@ -21,4 +21,5 @@ public interface SarBussStandValDao extends BaseMapper { int deleteDataByStandId(String standId); int insertForeach(List list); //批量新增 + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 0750f6c6..e5fd8b62 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -10,6 +10,7 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.collect.Lists; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; @@ -109,13 +110,24 @@ public class SarPublicIdeaAllController extends BaseController for (SarPublicIdeaAll sarPublicIdeaAll:data){ GetExcelDto getExcelDto=GetExcelDto.builder() .partCode(sarPublicIdeaAll.getPartCode()) - .content(sarPublicIdeaAll.getContent()) + .oldText(sarPublicIdeaAll.getOldText()) + .newText(sarPublicIdeaAll.getNewText()) + .reason(sarPublicIdeaAll.getReason()) .userName(sarPublicIdeaAll.getUserName()) .deptName(sarPublicIdeaAll.getDeptName()) .build(); standExcel.add(getExcelDto); } - EasyExcel.write(response.getOutputStream(),GetExcelDto.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + + List> headList=new ArrayList>(); + headList.add(Lists.newArrayList("章节编号")); + headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改前")); + headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改后")); + headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改理由")); + headList.add(Lists.newArrayList("提出部门")); + headList.add(Lists.newArrayList("提出人")); + + EasyExcel.write(response.getOutputStream(),GetExcelDto.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(standExcel); } catch (Exception e) { response.reset(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java index 37b2a020..80e65918 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandIdea.entity; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentLoopMerge; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -23,13 +24,20 @@ import lombok.NoArgsConstructor; @ColumnWidth(15) public class GetExcelDto { - @ExcelProperty("章节编号") +// @ExcelProperty("章节编号") private String partCode; - @ExcelProperty("修改意见内容(包括理由或依据)") - private String content; - @ExcelProperty("提出人") - private String userName; - @ExcelProperty("所在部门") +// @ExcelProperty("修改意见内容(包括理由或依据)") +// private String content; + private String oldText; + + private String newText; + + private String reason; +// @ExcelProperty("提出部门") private String deptName; +// @ExcelProperty("提出人") + private String userName; + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 74abe2e0..cc48b8d5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -41,6 +41,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl queryItemsByList(SarStandItemsEOPage page, String resType){ List itemsEOList = dao.queryItemsByList(page); @@ -179,6 +181,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl sarStandItems) { + if (null!=sarStandItems && sarStandItems.size()>0) { + sarStandItemsDao.deleteByStandIdAndFileType(sarStandItems.get(0).getStandId(), sarStandItems.get(0).getFileType()); + } boolean flag=this.saveBatch(sarStandItems); if (flag){ return "0"; 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 968efad0..61e87707 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 @@ -114,14 +114,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 list = sarStandProjectLibraryService.queryStandInfo(current,pageSize,id); + IPage list = sarStandProjectLibraryService.queryStandInfo(current,pageSize,id,cars); return Result.success("200",list); } /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index dbf3a185..c079727f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -25,4 +25,5 @@ public interface SarStandProjectLibraryDao extends BaseMapper selectPagesWorkFlow(@Param("page")Integer page, @Param("size")Integer size,@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag); Integer selectCountWorkFlow(@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag); List getAllStands(); + List getAllStand(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 56140cad..6ac5a723 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -14,7 +14,7 @@ public interface SarStandProjectLibraryService { IPage queryProjectManager(int current, int pageSize); List queryByProductLine(String productLine); List queryStandId(String standId); - IPage queryStandInfo(int current, int pageSize, String standId); + IPage queryStandInfo(int current, int pageSize, String standId, String cars); void deleteByIds(List ids); void batchInsert(@Param("ids") List list); 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 17c88668..a7cb5326 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 @@ -13,6 +13,8 @@ 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 redis.clients.jedis.ScanResult; + import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -159,8 +161,17 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryStandInfo(int current, int pageSize, String standId) { - List ids=sarStandProjectLibraryDao.getAllStands(); + public IPage queryStandInfo(int current, int pageSize, String standId, String cars) { + + System.out.println(cars); + List ids =new ArrayList<>(); + if ("1".equals(cars)){ + ids=sarStandProjectLibraryDao.getAllStand(); + } + else { + ids=sarStandProjectLibraryDao.getAllStands(); + } + String id=""; for (String s:ids) { id="'"+s+"',"+id; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index edbe218c..48d3f09f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -163,7 +163,7 @@ public class SarStandardComplianceAssessResultController { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); -// if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); + if (eo.getProductId() != null) queryWrapper.like("product_id", eo.getProductId()); // if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java index c91afc56..dbd7514c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java @@ -22,6 +22,10 @@ public class SarStandardComplianceProductAssessEO{ @TableField("type") private String type; + @ApiModelProperty(value = "项目编号") + @TableField("product_id") + private String productId; + @ApiModelProperty(value = "'项目名称'") private String productName; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index f67877f2..36f8b9de 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -249,6 +249,10 @@ ) + + diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java index eeff3433..18b5d117 100644 --- a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java @@ -57,7 +57,6 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { @Value("${OCR.convertType}") private String convertType; @Autowired - @Qualifier(value = "remoteRestTemplate") private RestTemplate restTemplate; @Autowired private OkHttpUtil okHttpUtil;