From 3474649cd571507f5514bbc30df3d72bb4199369 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 23 Nov 2021 09:48:09 +0800 Subject: [PATCH 1/7] =?UTF-8?q?ocr=E6=96=B0=E6=8C=89=E9=92=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandFileEOController.java | 8 +++++ .../service/SarStandFileEOService.java | 2 ++ .../impl/SarStandFileEOServiceImpl.java | 33 ++++++++++++++++--- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java index 7ab8d9ff..bcedaae0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java @@ -144,4 +144,12 @@ public class SarStandFileEOController extends BaseController { return Result.success(sarStandFileEOS); } + @ApiOperation(value = "查询文本信息") + @GetMapping("/queryFileInfoNew") + public ResponseMessage> queryFileInfoNew(@RequestParam("standId") String standId,@RequestParam("type") String type){ + + List sarStandFileEOS = sarStandFileEOService.selectFileByStandIdOCR(standId,type); + return Result.success(sarStandFileEOS); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java index 4d876d41..4811a744 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java @@ -25,4 +25,6 @@ public interface SarStandFileEOService { List selectFileByStandId(String standId); + List selectFileByStandIdOCR(String standId,String type); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index 4e6217d5..1d2c9d55 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -1,6 +1,5 @@ package com.adc.da.slrs.standardSplit.service.impl; -import com.adc.da.slrs.standardSplit.dao.SarStandAttrDetailsEODao; import com.adc.da.slrs.standardSplit.dao.SarStandFileEODao; import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; @@ -12,17 +11,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class SarStandFileEOServiceImpl implements SarStandFileEOService { - private static final Logger logger = LoggerFactory.getLogger(SarStandFileEOServiceImpl.class); @Autowired private SarStandFileEODao sarStandFileEODao; - @Autowired - private SarStandAttrDetailsEODao sarStandAttrDetailsEODao; + @Override public List getStandFileListByPage(SarStandFileEOPage stand){ @@ -80,8 +78,33 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { }); return sarStandFileEOS; + } + //type == 0 是pdf type==1 是doc + @Override + public List selectFileByStandIdOCR(String standId , String type) { + QueryWrapper queryWrapper= new QueryWrapper<>(); -// return sarStandFileEODao.selectFileByStandId(standId);r + queryWrapper.eq("STAND_ID",standId); + List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); + + if ("0".equals(type)){ + List remove=new ArrayList<>(); + sarStandFileEOS.forEach(sarStandFileEO -> { + if (!sarStandFileEO.getFileName().contains(".PDF") && !sarStandFileEO.getFileName().contains(".pdf") ){ + remove.add(sarStandFileEO); + } + }); + sarStandFileEOS.removeAll(remove); + }else { + List remove=new ArrayList<>(); + sarStandFileEOS.forEach(sarStandFileEO -> { + if (!sarStandFileEO.getFileName().contains(".DOC") && !sarStandFileEO.getFileName().contains(".doc") ){ + remove.add(sarStandFileEO); + } + }); + sarStandFileEOS.removeAll(remove); + } + return sarStandFileEOS; } } From 48bde6960bac6fab3a64ab42b4f5faa30574c166 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 23 Nov 2021 10:46:54 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=AF=94=E5=AF=B9?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=92=8C=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarFileSplitInfoEOServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index d2f18ceb..46462a44 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -4,6 +4,8 @@ import com.adc.da.att.service.IAttFileEOService; import com.adc.da.person.entity.PersonMsgEO; import com.adc.da.slrs.sarStandAttrDetails.service.ISarStandAttrDetailsService; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.standardSplit.dao.*; import com.adc.da.slrs.standardSplit.service.SarLawsInfoEOService; import com.adc.da.att.entity.AttFileEO; @@ -52,6 +54,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService @Autowired private ISarStandAttrDetailsService sarStandAttrDetailsEOService; + @Autowired + private ISarStandardsInfoService sarStandardsInfoService; @Autowired private IAttFileEOService attFileEOService; @@ -122,8 +126,11 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService //用来往标准分解单里添加数据 List standList = new ArrayList<>(); - + SarStandardsInfo sarStandardsInfo=sarStandardsInfoService.getById(sarFileSplitInfoEO.getStandId()); // 拆分文件主表中插入数据 + sarFileSplitInfoEO.setStandName(sarStandardsInfo.getStandName()); + sarFileSplitInfoEO.setStandNameSplit(sarStandardsInfo.getStandName()); + sarFileSplitInfoEO.setStandNumSplit(sarStandardsInfo.getStandSort()+" "+sarStandardsInfo.getStandNumber()+"-"+sarStandardsInfo.getStandYear()); sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20()); sarFileSplitInfoEO.setValidFlag(0); sarFileSplitInfoEO.setCreationTime(new Date()); From ce7a6656b40a6d811f834693056b9c50c7e61dca Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 23 Nov 2021 13:49:44 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E7=A8=8B=E5=BA=A6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardComplianceAssessResultController.java | 2 +- .../entity/SarInterpretationNationalStandard.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 d83b45e4..0c6639cd 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 @@ -79,7 +79,7 @@ public class SarStandardComplianceAssessResultController { if (eo.getPosition() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,risk_degree"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java index 94acce6d..ea428fed 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java @@ -93,4 +93,9 @@ public class SarInterpretationNationalStandard extends BaseEntity { @TableField("ID") private String id; + + @ApiModelProperty(value = "风险程度") + @TableField("risk_degree") + private String riskDegree; + } From 32fc6eb43a2281ca2a7596fc08650c53298b6dd6 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 23 Nov 2021 14:46:47 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E7=A8=8B=E5=BA=A6=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=20=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E6=98=AF=E6=A0=B9=E6=8D=AE=E6=95=B0=E6=8D=AE=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=87=8D=E7=82=B9=E6=98=AF=E6=97=B6?= =?UTF-8?q?=E9=97=B4=20=E5=9B=A0=E4=B8=BA=E6=97=B6=E9=97=B4=E8=83=BD?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E6=95=B0=E6=8D=AE=E7=9A=84=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarInterpretationNationalStandardController.java | 12 ++++++++++++ .../dao/SarInterpretationNationalStandardDao.java | 3 +++ .../ISarInterpretationNationalStandardService.java | 2 ++ ...SarInterpretationNationalStandardServiceImpl.java | 9 +++++++-- .../SarInterpretationNationalStandardMapper.xml | 8 ++++++++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java index 872681f5..50e9f4e9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java @@ -1,6 +1,8 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.controller; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl.SarInterpretationNationalStandardServiceImpl; import io.swagger.annotations.ApiOperation; @@ -37,4 +39,14 @@ public class SarInterpretationNationalStandardController extends BaseController< return sarInterpretationNationalStandardService.saveBath(findStandDto); } + @ApiOperation(value = "修改技术评估结果") + @PostMapping("/updateById") + public ResponseMessage updateById(@RequestBody SarInterpretationNationalStandard findStandDto){ + if (sarInterpretationNationalStandardService.updateData(findStandDto)) { + return Result.success("success"); + }else { + return Result.error("error"); + } + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java index b01295a6..5b0f285a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.dao; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -13,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SarInterpretationNationalStandardDao extends BaseMapper { + boolean updateData(@Param("find") SarInterpretationNationalStandard findStandDto); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java index 6a604f3f..3efb40f5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java @@ -16,4 +16,6 @@ import java.util.List; public interface ISarInterpretationNationalStandardService extends IService { String saveBath(List sarInterpretationNationalStandards); + + boolean updateData(SarInterpretationNationalStandard findStandDto); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java index b65b6539..b5137a93 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java @@ -24,8 +24,8 @@ import java.util.List; @Service public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl implements ISarInterpretationNationalStandardService { -// @Autowired -// SarStandardComplianceProductAssessDao sarStandardComplianceProductAssessDao; + @Autowired + SarInterpretationNationalStandardDao sarInterpretationNationalStandardDao; @Override public String saveBath(List sarInterpretationNationalStandards) { @@ -50,4 +50,9 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl select distinct STAND_ID as standard_id, STAND_NUMBER as standard_number, STAND_NAME as standard_name, STAND_TYPE as standard_type, INTERPRETATION_TIME from sar_interpretation_national_standard + + + update sar_interpretation_national_standard set risk_degree = #{find.riskDegree} + where sar_interpretation_national_standard.STAND_ID = #{find.standId} + and sar_interpretation_national_standard.STAND_NUMBER =#{find.standNumber} + and sar_interpretation_national_standard.STAND_NAME=#{find.standName} + and sar_interpretation_national_standard.INTERPRETATION_TIME = #{find.interpretationTime} + From 79f0dd6c9048ba150c98241f2198712c75f039c7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 23 Nov 2021 16:33:49 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=BD=93=E6=96=87=E4=BB=B6=E8=A2=AB?= =?UTF-8?q?=E6=8B=86=E5=88=86=E5=90=8E=E6=89=8D=E5=9C=A8=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=86=E8=A7=A3=E5=8D=95=E6=8C=89=E9=92=AE?= =?UTF-8?q?,=E5=8F=96=E6=B6=88=E6=8B=86=E5=88=86=E5=90=8E=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=AF=BC=E5=85=A5=E5=88=86=E8=A7=A3=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandardsInfoServiceImpl.java | 25 +++++++------- .../impl/SarFileSplitInfoEOServiceImpl.java | 33 ++++++++++--------- 2 files changed, 30 insertions(+), 28 deletions(-) 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 0e714994..608b3ed3 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 @@ -53,6 +53,9 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.slrs.standardSplit.dao.SarFileSplitInfoEODao; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao; import com.adc.da.slrs.tsDictionaryType.dao.TsDictionaryDao; @@ -539,16 +542,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); Map getAttrMap = row.getAttrInfoMap(); if (getAttrMap != null && getAttrMap.size() > 0) { - //存在的分解单文本名称列表 - LinkedList itemExistList = new LinkedList<>(); + //判断文本是否已被拆分,把已被拆分过的文件给前端判断是否显示分解单 + SarFileSplitInfoEOPage sarFileSplitInfoEOPage = new SarFileSplitInfoEOPage(); + sarFileSplitInfoEOPage.setStandId(row.getId()); + List sarFileSplitInfoEOS = sarFileSplitInfoEODao.queryByPageOwn(sarFileSplitInfoEOPage); + List itemExistList = sarFileSplitInfoEOS.stream() + .map(item -> item.getFileType()) + .collect(Collectors.toList()); getAttrMap.put("itemExistList",itemExistList); + for (Map.Entry entry : getAttrMap.entrySet()) { String name = entry.getKey(); String value = ""; @@ -557,15 +567,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl fileObj = attFileEOService.getMultiFileInfos(value); entry.setValue(fileObj); - //以标准id和文本类型查询分解单表 有数据设标记为为 1 - FindSarItemsPageReqDTO sarItemCount = new FindSarItemsPageReqDTO(); - sarItemCount.setStandId(row.getId()); - sarItemCount.setFileType(name); - Integer sarItemsCount = standItemsDao.sarItemCount(sarItemCount); - if (sarItemsCount>0){ - //存在分解单的文本名称存入列表 - itemExistList.add(name); - } } }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { value = entry.getValue().toString(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index 46462a44..b0f15bbd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -375,22 +375,23 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService sarFileSplitItemsValEODao.insertForeach(itemValList); - //用来往标准分解单插入数据 - messageList.forEach(item -> { - //new一个对象 - SarStandItems standItems1 = new SarStandItems(); - //standItems1里的这个值为messageList里的ItermsConditions - standItems1.setId(UUIDUtils.randomUUID20()) - .setFileType(sarFileSplitInfoEO.getFileType()) - .setStandId(sarFileSplitInfoEO.getStandId()) - .setItemsNum(item.getItemsNum()) - .setItemsName(item.getItemsName()) - .setTermsConditions(item.getItermsConditions()) - .setEditFlag(item.getEditFlag()); - - standList.add(standItems1); - }); - sarFileSplitItemsEODao.insertStandSplitForeach(standList); +// 2021/11/23改用标准详情手动插入 +// //用来往标准分解单插入数据 +// messageList.forEach(item -> { +// //new一个对象 +// SarStandItems standItems1 = new SarStandItems(); +// //standItems1里的这个值为messageList里的ItermsConditions +// standItems1.setId(UUIDUtils.randomUUID20()) +// .setFileType(sarFileSplitInfoEO.getFileType()) +// .setStandId(sarFileSplitInfoEO.getStandId()) +// .setItemsNum(item.getItemsNum()) +// .setItemsName(item.getItemsName()) +// .setTermsConditions(item.getItermsConditions()) +// .setEditFlag(item.getEditFlag()); +// +// standList.add(standItems1); +// }); +// sarFileSplitItemsEODao.insertStandSplitForeach(standList); } else { From 0f8bc78441b7b2882a7d08930cdfa46023f42127 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 23 Nov 2021 17:02:16 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E5=8A=9E?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E6=8E=A5=E5=8F=A3=20=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E6=A0=87=E5=87=86=E5=8F=B7=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=90=8D=E7=A7=B0=20=E5=92=8C=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E7=9A=84=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/FeignClient/workFlowFeignClient.java | 3 +++ .../workFlowFeignClientImpl.java | 5 +++++ .../controller/WorkFlowController.java | 21 +++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 5a30aed5..88a26c51 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -44,6 +44,9 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/todoTaskList",method = RequestMethod.POST) List todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); + @RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST) + List todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery); + @RequestMapping(value = "/bat-wkflow/completeTask",method = RequestMethod.POST) Wrapper completeTaskByUserId(@RequestBody BusMes busMes); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 6942a7c7..80c35fdd 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -64,6 +64,11 @@ public class workFlowFeignClientImpl { return mapWrapper; } + public List todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery){ + List mapWrapper = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); + return mapWrapper; + } + /** * 开始分页 * @param list diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 36a98550..134b17ab 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -280,6 +280,27 @@ public class WorkFlowController { return pageInfo; } + @ApiOperation(value = "我的待办任务列表") + @PostMapping("/todoTaskListNew") + public PageInfo todoTaskListNew(@RequestBody TaskCommonQuery taskCommonQuery){ + List busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); + List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); + PageInfo pageInfo= new PageInfo(); + if(busProcessNames!=null){ + pageInfo.setList(list1); + pageInfo.setPageNo(taskCommonQuery.getCurrent()); + pageInfo.setCount(Long.valueOf(busProcessNames.size())); + pageInfo.setPageSize(taskCommonQuery.getSize()); + }else{ + List list = new ArrayList<>(); + pageInfo.setList(list); + pageInfo.setPageNo(taskCommonQuery.getCurrent()); + pageInfo.setCount(Long.valueOf(0)); + pageInfo.setPageSize(taskCommonQuery.getSize()); + } + return pageInfo; + } + @ApiOperation(value = "完成任务") @PostMapping("/completeTask") public Wrapper completeTaskByUserId( BusMes busMes){ From 9fcb1aa84fa710d3746171a18b01ea25d947d604 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 23 Nov 2021 20:54:12 +0800 Subject: [PATCH 7/7] commit --- .../dao/EarlyWarningEODao.java | 5 +++ .../entity/EarlyWarningEO.java | 10 ++++++ .../mapper/sarStandWarning/EarlyWraningEO.xml | 33 +++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEO.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java index 8311d235..ff0617e0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java @@ -2,9 +2,14 @@ package com.adc.da.slrs.sarStandWarning.dao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Param; public interface EarlyWarningEODao extends BaseMapper { + IPage selectWarningPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 20aeca75..f00b2cdf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -72,5 +72,15 @@ public class EarlyWarningEO extends BaseEntity { @TableField("POWER") private String power; + @TableField(exist = false) + private String issueTime; + @TableField(exist = false) + private String SSRQ; + + @TableField(exist = false) + private String XCXSSRQ; + + @TableField(exist = false) + private String ZCCSSRQ; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEO.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEO.xml new file mode 100644 index 00000000..a3a868fd --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEO.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +