From 4379ede739eff0e4c83625e6b71422432b8ad74c Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 26 Jan 2022 23:02:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E7=BC=96=E8=BE=91=E6=97=B6=20=E4=BB=A3?= =?UTF-8?q?=E6=9B=BF=E6=A0=87=E5=87=86=E5=8F=B7=E5=9C=A8=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E4=B8=AD=E6=97=B6,=E6=AD=A4=E6=A0=87?= =?UTF-8?q?=E5=87=86=E4=B9=9F=E5=B0=86=E6=8F=92=E5=85=A5=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-slrs/pom.xml | 2 +- .../sarStandMenu/entity/SarStandMenu.java | 3 + .../entity/SarStandardsInfoEOPage.java | 5 ++ .../impl/SarStandardsInfoServiceImpl.java | 68 +++++++++++++++++-- .../SarStandMenu/SarStandMenuMapper.xml | 54 +++++++++++++-- .../adc/da/person/dao/PersonCollectEODao.java | 2 + .../com/adc/da/person/entity/StandInfo.java | 11 +++ .../service/IPersonCollectEOService.java | 7 ++ .../impl/PersonCollectEOServiceImpl.java | 6 ++ .../mapper/person/PersonCollectEOMapper.xml | 47 +++++++++++++ 10 files changed, 195 insertions(+), 10 deletions(-) create mode 100644 adc-da-sys/src/main/java/com/adc/da/person/entity/StandInfo.java diff --git a/adc-da-slrs/pom.xml b/adc-da-slrs/pom.xml index a0370e61..da394151 100644 --- a/adc-da-slrs/pom.xml +++ b/adc-da-slrs/pom.xml @@ -135,4 +135,4 @@ - \ No newline at end of file + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java index a1421881..83100e02 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java @@ -61,4 +61,7 @@ public class SarStandMenu extends BaseEntity { @TableField(exist = false) private String menuName; + @TableField(exist = false) + private String standCode; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java index 9cac67eb..99d9d949 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java @@ -108,4 +108,9 @@ public class SarStandardsInfoEOPage extends BasePage { * 标准添加到体系中的id多个 */ private String menuIds; + + /** + * 标准号 + */ + private String standCode; } 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 55c15c85..d4db7c04 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 @@ -1,6 +1,8 @@ package com.adc.da.slrs.sarStandardsInfo.service.impl; import com.adc.da.att.entity.AttFileEO; +import com.adc.da.person.entity.StandInfo; +import com.adc.da.person.entity.TsPersonCollect; import com.adc.da.slrs.sarPosition.entity.TsPosition; import com.adc.da.slrs.sarPosition.service.ITsPositionService; import com.adc.da.slrs.sarStandWarning.dao.WarningDateDao; @@ -814,6 +816,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Optional.ofNullable(JSONObject.fromObject(standEO.getSarStandAttrEOStr()))) + .flatMap(attrMap -> Optional.ofNullable(attrMap.get("DTBJH"))) + .map(str -> str.toString()) + .orElse(""); + + if (!"".equals(DTBJH)){ + + for (String s : DTBJH.split(",")) { + + /** + * 以逗号分割的代替标准号,只要其中一个存在于我的收藏之中,此标准就插入我的收藏 + */ + + StandInfo query = new StandInfo(); + + //用户id + query.setUserId(LoginUserUtil.getUserId()); + query.setStandCode(s); + if (personCollectEOService.countPersonCollectByStandInfo(query)>0){ + + TsPersonCollect tsPersonCollect = new TsPersonCollect(); + tsPersonCollect.setId(UUIDUtils.randomUUID20()); + tsPersonCollect.setValidFlag(0); + tsPersonCollect.setCreationTime(new Date()); + tsPersonCollect.setModifyTime(new Date()); + tsPersonCollect.setCollectResId(standInfo.getId()); + tsPersonCollect.setCollectType(standInfo.getStandType()+"_STAND"); + tsPersonCollect.setCollectTitle(standInfo.getStandName() +"(编号:"+ standInfo.getStandSort()+" "+standInfo.getStandNumber()+"-"+standInfo.getStandYear()+ ")"); + tsPersonCollect.setUserId(LoginUserUtil.getUserId()); + QueryWrapper ew = new QueryWrapper<>(); + ew.eq("COLLECT_RES_ID",standInfo.getId()) + .eq("VALID_FLAG",'0'); + personCollectEOService.saveOrUpdate(tsPersonCollect,ew); + + break; + } + + } + + + } + + } /*** @@ -1466,8 +1521,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java index db55614f..02f75a9d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java @@ -1,6 +1,7 @@ package com.adc.da.person.dao; import com.adc.da.base.page.BasePage; +import com.adc.da.person.entity.StandInfo; import com.adc.da.person.entity.TsPersonCollect; import com.adc.da.person.page.PersonCollectEOPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -38,4 +39,5 @@ public interface PersonCollectEODao extends BaseMapper { int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect); + int countPersonCollectByStandInfo(StandInfo standInfo); } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/entity/StandInfo.java b/adc-da-sys/src/main/java/com/adc/da/person/entity/StandInfo.java new file mode 100644 index 00000000..db5d229f --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/entity/StandInfo.java @@ -0,0 +1,11 @@ +package com.adc.da.person.entity; + +import lombok.Data; + +@Data +public class StandInfo { + + private String userId; + + private String standCode; +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java index de22ce6c..a68eefaf 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java @@ -1,6 +1,7 @@ package com.adc.da.person.service; import com.adc.da.http.ResponseMessage; +import com.adc.da.person.entity.StandInfo; import com.adc.da.person.entity.TsPersonCollect; import com.adc.da.person.page.PersonCollectEOPage; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -29,4 +30,10 @@ public interface IPersonCollectEOService extends IService { public ResponseMessage> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle,String modeType, String userId); + /** + * 通过标准号和用户id查询是否收藏此标准 + * @param standInfo + * @return + */ + public int countPersonCollectByStandInfo(StandInfo standInfo); } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java index 9dd19ed2..bb0cd153 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java @@ -5,6 +5,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.person.dao.PersonCollectEODao; import com.adc.da.person.dao.PersonNoteEODao; +import com.adc.da.person.entity.StandInfo; import com.adc.da.person.entity.TsPersonCollect; import com.adc.da.person.entity.PersonNoteEO; import com.adc.da.person.page.PersonCollectEOPage; @@ -156,4 +157,9 @@ public class PersonCollectEOServiceImpl extends ServiceImpl + From f6cbfdf17842423a1aa8f73df0fc34646e526005 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 27 Jan 2022 22:38:34 +0800 Subject: [PATCH 2/2] feat: There is no way the, --- .../da/FeignClient/workFlowFeignClient.java | 9 +++++++++ .../workFlowFeignClientImpl.java | 15 +++++++++++++++ .../controller/WorkFlowController.java | 18 ++++++++++++++++++ .../entity/BusProcessEvaluationHis.java | 4 +++- .../service/ActSarItemsBussEOService.java | 2 +- 5 files changed, 46 insertions(+), 2 deletions(-) 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 808a1999..8ee5f7f2 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 @@ -37,6 +37,15 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOne",method = RequestMethod.GET) BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId); + @RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisListByOne",method = RequestMethod.GET) + BusProcessEvaluationHis evaluationHisListByOne(@RequestParam("pid") String pid,@RequestParam("taskInfo") String taskInfo); + + @RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisListRepSum",method = RequestMethod.GET) + Map evaluationHisListRepSum(@RequestParam("pid") String pid); + + @RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisListRep",method = RequestMethod.GET) + List evaluationHisListRep(@RequestParam("pid") String pid); + @RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisList",method = RequestMethod.GET) List evaluationHisList(@RequestParam("pid") String pid); 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 1552ca62..e8dbc35d 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 @@ -55,6 +55,21 @@ public class workFlowFeignClientImpl { return stringWrapper; } + public BusProcessEvaluationHis evaluationHisListByOne(@RequestParam("pid") String pid,@RequestParam("taskInfo") String taskInfo){ + BusProcessEvaluationHis stringWrapper = workFlowFeignClient.evaluationHisListByOne(pid,taskInfo); + return stringWrapper; + } + + public Map evaluationHisListRepSum(@RequestParam("pid") String pid){ + Map stringWrapper = workFlowFeignClient.evaluationHisListRepSum(pid); + return stringWrapper; + } + + public List evaluationHisListRep(@RequestParam("pid") String pid){ + List stringWrapper = workFlowFeignClient.evaluationHisListRep(pid); + return stringWrapper; + } + public List evaluationHisList(@RequestParam("pid") String pid){ List stringWrapper = workFlowFeignClient.evaluationHisList(pid); return stringWrapper; 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 9668cd53..becda6d0 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 @@ -170,6 +170,24 @@ public class WorkFlowController { return workFlowFeignClient.processModelHisOne(pid,taskId); } + @ApiOperation(value = "根据pid 节点信息查询") + @GetMapping("/evaluationHisListByOne") + public BusProcessEvaluationHis evaluationHisListByOne(@RequestParam("pid") String pid,@RequestParam("taskInfo") String taskInfo){ + return workFlowFeignClient.evaluationHisListByOne(pid,taskInfo); + } + + @ApiOperation(value = "查询流程父节点所有评分(去重)返回节点评分总数") + @GetMapping("/evaluationHisListRepSum") + public Map evaluationHisListRepSum(@RequestParam("pid") String pid){ + return workFlowFeignClient.evaluationHisListRepSum(pid); + } + + @ApiOperation(value = "查询流程父节点所有评分(去重)") + @GetMapping("/evaluationHisListRep") + public List evaluationHisListRep(@RequestParam("pid") String pid){ + return workFlowFeignClient.evaluationHisListRep(pid); + } + @ApiOperation(value = "查询流程父节点所有评分") @GetMapping("/evaluationHisList") public List evaluationHisList(@RequestParam("pid") String pid){ diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java index e8597c46..b7caf58e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java @@ -86,5 +86,7 @@ public class BusProcessEvaluationHis implements Serializable { @TableField(exist = false) private String downLoadUrl; - + @ApiModelProperty(value = "处理人姓名") + @TableField(exist = false) + private String userName; } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 341e3159..b6d73c45 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -290,7 +290,7 @@ public class ActSarItemsBussEOService { // 按 相同数据分组 listMap = evaluationHisFilter.stream().collect( - Collectors.groupingBy(a -> Utils.format("{0}#{1}", a.getPId(),a.getTaskInfo()))); + Collectors.groupingBy(a -> Utils.format("{0}#{1}#{2}", a.getPId(),a.getTaskInfo(),a.getUserId()))); List evaluations = new ArrayList<>(); if(!listMap.isEmpty()){