From 143719dccc73221797f51b23f00a3fb2402a56b7 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 17 Nov 2022 13:42:02 +0800 Subject: [PATCH 1/8] =?UTF-8?q?249-=E9=85=8D=E7=BD=AE=E6=A0=87=E5=87=86bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 31 +++++++++++--- .../impl/SarStandardsInfoServiceImpl.java | 40 ++++++++++++------- 2 files changed, 51 insertions(+), 20 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index c54094ce..6b67f662 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -62,6 +62,7 @@ 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.beanutils.BeanUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.json.JSONTokener; import org.slf4j.Logger; @@ -1333,6 +1334,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + List menuOldIds = new ArrayList<>(); for (int i = 0; i < standardsInfoEO.getIdlist().length; i++) { String standId = standardsInfoEO.getIdlist()[i]; sarStandMenuEO.setBussStandId(standId); @@ -1375,20 +1378,36 @@ public class SarBussionessStandServiceImpl extends ServiceImpl oldList = sarBussStandMenuEODao.selectList(queryWrapper); + if (CollectionUtils.isNotEmpty(oldList)) { + menuOldIds = oldList.stream().map(SarBussStandMenu::getMenuId).collect(Collectors.toList()); + if (!menuOldIds.contains(nowMenuId)) { + sarStandMenuEO.setId(UUIDUtils.randomUUID20()); + op = sarBussStandMenuEODao.insertSelective(sarStandMenuEO); + } + } } else { sarStandMenuEO.setOldMenuId(secondLevelId); - List menuOldIds = new ArrayList<>(); if(StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)) { menuOldIds = iSarMenuStandardService.getChildMenuList(secondLevelId); sarStandMenuEO.setMenuIds(menuOldIds); sarStandMenuEO.setId(getInfo.get(0).getId()); op = sarBussStandMenuEODao.updateById(sarStandMenuEO); }else { - menuOldIds= iTsResourceService.getChildMenuList(secondLevelId); - sarStandMenuEO.setMenuIds(menuOldIds); - op = sarBussStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); +// menuOldIds= iTsResourceService.getChildMenuList(secondLevelId); +// sarStandMenuEO.setMenuIds(menuOldIds); +// op = sarBussStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); + + queryWrapper.lambda().eq(SarBussStandMenu::getBussStandId, standId); + List oldList = sarBussStandMenuEODao.selectList(queryWrapper); + if (CollectionUtils.isNotEmpty(oldList)) { + menuOldIds = oldList.stream().map(SarBussStandMenu::getMenuId).collect(Collectors.toList()); + if (!menuOldIds.contains(nowMenuId)) { + sarStandMenuEO.setId(UUIDUtils.randomUUID20()); + op = sarBussStandMenuEODao.insertSelective(sarStandMenuEO); + } + } } } if(StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)) { 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 fb76f09c..ca1a179e 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 @@ -86,6 +86,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature; 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.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.util.PDFTextStripper; @@ -3099,6 +3100,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + List menuOldIds = new ArrayList<>(); for (int i = 0; i < standardsInfoEO.getIdlist().length; i++) { sarStandMenuEO.setStandId(standardsInfoEO.getIdlist()[i]); sarStandMenuEO.setId(null); @@ -3125,21 +3128,30 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl0){ -// return true; -// } - } else { - sarStandMenuEO.setOldMenuId(secondLevelId); - List menuOldIds = sarMenuEOService.getChildMenuList(secondLevelId); - sarStandMenuEO.setMenuIds(menuOldIds); - int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); -// if (size>0) { -// return true; -// } + queryWrapper.lambda().eq(SarStandMenu::getStandId, standardsInfoEO.getIdlist()[i]); + List oldList = sarStandMenuEODao.selectList(queryWrapper); + if (CollectionUtils.isNotEmpty(oldList)) { + menuOldIds = oldList.stream().map(SarStandMenu::getMenuId).collect(Collectors.toList()); + if (!menuOldIds.contains(nowMenuId)) { + sarStandMenuEO.setId(UUIDUtils.randomUUID20()); + int size = sarStandMenuEODao.insert(sarStandMenuEO); + } } +// if (getInfo == null || getInfo.isEmpty()) { +// sarStandMenuEO.setId(UUIDUtils.randomUUID20()); +// int size = sarStandMenuEODao.insert(sarStandMenuEO); +//// if (size>0){ +//// return true; +//// } +// } else { +// sarStandMenuEO.setOldMenuId(secondLevelId); +// List menuOldIds = sarMenuEOService.getChildMenuList(secondLevelId); +// sarStandMenuEO.setMenuIds(menuOldIds); +// int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); +//// if (size>0) { +//// return true; +//// } +// } } return true; } From 960528457a3a3b47226a0f784d744c0d3c07b941 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 18 Nov 2022 18:29:21 +0800 Subject: [PATCH 2/8] =?UTF-8?q?174-=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=92=8C=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EsRevisePlanController.java | 28 +++++++++++ .../esRevisePlan/dao/EsPrcRelationDao.java | 18 ++++++++ .../esRevisePlan/entity/EsPrcRelation.java | 37 +++++++++++++++ .../service/IEsPrcRelationService.java | 36 +++++++++++++++ .../impl/EsPrcRelationServiceImpl.java | 46 +++++++++++++++++++ .../esRevisePlan/EsPrcRelationMapper.xml | 13 ++++++ 6 files changed, 178 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsPrcRelationDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsPrcRelation.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsPrcRelationService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsPrcRelationServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsPrcRelationMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 3900718c..ea8b8897 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -4,6 +4,8 @@ package com.adc.da.slrs.esRevisePlan.controller; import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.esRevisePlan.entity.EsPrcRelation; +import com.adc.da.slrs.esRevisePlan.service.IEsPrcRelationService; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao.QualityEvaluationDao; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; @@ -37,6 +39,8 @@ public class EsRevisePlanController extends BaseController { IEsRevisePlanService iEsRevisePlanService; @Autowired private QualityEvaluationDao qualityEvaluationDao; + @Autowired + IEsPrcRelationService iEsPrcRelationService; @ApiOperation(value = "获取所有企标计划") @GetMapping("getAllPlans") @@ -174,4 +178,28 @@ public class EsRevisePlanController extends BaseController { public ResponseMessage delPlans(String ids){ return Result.success(iEsRevisePlanService.delPlans(ids)); } + + @ApiOperation(value = "查询企标计划和技术标准流程关联表") + @GetMapping("/listEsPrcRelationByWk") + public ResponseMessage listEsPrcRelation(String esId){ + return Result.success(iEsPrcRelationService.list(esId)); + } + + @ApiOperation(value = "新增企标计划和技术标准流程关联表") + @PostMapping("/addEsPrcRelationByWk") + public ResponseMessage addEsPrcRelation(EsPrcRelation esPrcRelation){ + return Result.success(iEsPrcRelationService.addEsPrcRelation(esPrcRelation)); + } + + @ApiOperation(value = "修改企标计划和技术标准流程关联表") + @PostMapping("/modEsPrcRelationByWk") + public ResponseMessage modEsPrcRelation(EsPrcRelation esPrcRelation){ + return Result.success(iEsPrcRelationService.modifyEsPrcRelation(esPrcRelation)); + } + + @ApiOperation(value = "删除企标计划和技术标准流程关联表") + @GetMapping("/delEsPrcRelationByWk") + public ResponseMessage delEsPrcRelation(String esId){ + return Result.success(iEsPrcRelationService.delEsPrcRelation(esId)); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsPrcRelationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsPrcRelationDao.java new file mode 100644 index 00000000..72e094df --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsPrcRelationDao.java @@ -0,0 +1,18 @@ +package com.adc.da.slrs.esRevisePlan.dao; + +import com.adc.da.slrs.esRevisePlan.entity.EsPrcRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 企标计划和技术标准流程关联表 Mapper 接口 + *

+ * + * @author iyawei + * @since 2022-11-18 + */ +@Repository +public interface EsPrcRelationDao extends BaseMapper { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsPrcRelation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsPrcRelation.java new file mode 100644 index 00000000..ad692196 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsPrcRelation.java @@ -0,0 +1,37 @@ +package com.adc.da.slrs.esRevisePlan.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@Accessors(chain = true) +@ApiModel(value="EsPrcRelation对象", description="企标计划和技术标准流程关联表") +public class EsPrcRelation extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "企标计划ID") + private String esId; + + @ApiModelProperty(value = "流程ID") + private String prcId; + + @ApiModelProperty(value = "创建时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsPrcRelationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsPrcRelationService.java new file mode 100644 index 00000000..4db5ce0a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsPrcRelationService.java @@ -0,0 +1,36 @@ +package com.adc.da.slrs.esRevisePlan.service; + +import com.adc.da.slrs.esRevisePlan.entity.EsPrcRelation; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IEsPrcRelationService extends IService { + /** + * + * @param esId + * @return + */ + List list(String esId); + + /** + * + * @param esPrcRelation + * @return + */ + int addEsPrcRelation(EsPrcRelation esPrcRelation); + + /** + * + * @param esPrcRelation + * @return + */ + int modifyEsPrcRelation(EsPrcRelation esPrcRelation); + + /** + * + * @param esId + * @return + */ + int delEsPrcRelation(String esId); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsPrcRelationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsPrcRelationServiceImpl.java new file mode 100644 index 00000000..bd887555 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsPrcRelationServiceImpl.java @@ -0,0 +1,46 @@ +package com.adc.da.slrs.esRevisePlan.service.impl; + +import com.adc.da.slrs.esRevisePlan.dao.EsPrcRelationDao; +import com.adc.da.slrs.esRevisePlan.entity.EsPrcRelation; +import com.adc.da.slrs.esRevisePlan.service.IEsPrcRelationService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.Date; +import java.util.List; + +public class EsPrcRelationServiceImpl extends ServiceImpl implements IEsPrcRelationService { + + @Override + public List list(String esId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(EsPrcRelation::getEsId, esId); + return this.baseMapper.selectList(queryWrapper); + } + + @Override + public int addEsPrcRelation(EsPrcRelation esPrcRelation) { + esPrcRelation.setId(UUIDUtils.randomUUID(32)); + Date date = new Date(); + esPrcRelation.setCreateTime(date); + esPrcRelation.setUpdateTime(date); + return this.baseMapper.insert(esPrcRelation); + } + + @Override + public int modifyEsPrcRelation(EsPrcRelation esPrcRelation) { + Date date = new Date(); + esPrcRelation.setUpdateTime(date); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(EsPrcRelation::getEsId, esPrcRelation.getEsId()); + return this.baseMapper.update(esPrcRelation, queryWrapper); + } + + @Override + public int delEsPrcRelation(String esId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(EsPrcRelation::getEsId, esId); + return this.baseMapper.delete(queryWrapper); + } +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsPrcRelationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsPrcRelationMapper.xml new file mode 100644 index 00000000..8c660b28 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsPrcRelationMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file From 66a7ea2ebda7623dfe4e942529e7e1092c2dc44b Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 21 Nov 2022 14:07:20 +0800 Subject: [PATCH 3/8] =?UTF-8?q?174-=E6=89=8B=E5=8A=A8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/esRevisePlan/service/IEsRevisePlanService.java | 3 ++- .../service/impl/EsRevisePlanServiceImpl.java | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java index 7b1e5eb7..17ca1694 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.esRevisePlan.service; +import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; import com.baomidou.mybatisplus.extension.service.IService; @@ -21,7 +22,7 @@ public interface IEsRevisePlanService extends IService { String modPlan(EsRevisePlan esRevisePlan);//编辑 String modPlanByState(EsRevisePlan esRevisePlan);//编辑 String modPlanByProcess(EsRevisePlan esRevisePlan);//编辑 - String addPlan(EsRevisePlan esRevisePlan);//插入 + ResponseMessage addPlan(EsRevisePlan esRevisePlan);//插入 int delPlan(String id);//删除 int delPlans(String ids);//批量删除 List getDataByName(EsRevisePlan esRevisePlan); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 519067be..cfd9a84c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -1,5 +1,7 @@ package com.adc.da.slrs.esRevisePlan.service.impl; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation; import com.adc.da.slrs.esMatingRelation.service.IEsMatingRelationService; @@ -150,11 +152,11 @@ public class EsRevisePlanServiceImpl extends ServiceImpl addPlan(EsRevisePlan esRevisePlan) { esRevisePlan.setId(UUIDUtils.randomUUID(32)); List esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan); if (esRevisePlans.size()>0){ - return "企标名称不能重复,请更换新的企标名称"; + return Result.success("企标名称不能重复,请更换新的企标名称"); }else { esRevisePlanDao.insertOne(esRevisePlan); //加日志 @@ -170,7 +172,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl Date: Mon, 21 Nov 2022 14:12:03 +0800 Subject: [PATCH 4/8] =?UTF-8?q?174-=E5=88=A0=E9=99=A4=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=92=8C=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=85=B3=E8=81=94=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EsRevisePlanController.java | 29 +----------- .../esRevisePlan/dao/EsPrcRelationDao.java | 18 -------- .../esRevisePlan/entity/EsPrcRelation.java | 37 --------------- .../service/IEsPrcRelationService.java | 36 --------------- .../impl/EsPrcRelationServiceImpl.java | 46 ------------------- .../esRevisePlan/EsPrcRelationMapper.xml | 13 ------ 6 files changed, 1 insertion(+), 178 deletions(-) delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsPrcRelationDao.java delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsPrcRelation.java delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsPrcRelationService.java delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsPrcRelationServiceImpl.java delete mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsPrcRelationMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index ea8b8897..576f387a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -4,8 +4,6 @@ package com.adc.da.slrs.esRevisePlan.controller; import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; -import com.adc.da.slrs.esRevisePlan.entity.EsPrcRelation; -import com.adc.da.slrs.esRevisePlan.service.IEsPrcRelationService; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao.QualityEvaluationDao; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; @@ -39,8 +37,6 @@ public class EsRevisePlanController extends BaseController { IEsRevisePlanService iEsRevisePlanService; @Autowired private QualityEvaluationDao qualityEvaluationDao; - @Autowired - IEsPrcRelationService iEsPrcRelationService; @ApiOperation(value = "获取所有企标计划") @GetMapping("getAllPlans") @@ -152,7 +148,7 @@ public class EsRevisePlanController extends BaseController { @ApiOperation(value = "添加企标计划") @PostMapping("addPlan") public ResponseMessage addPlan(EsRevisePlan esRevisePlan){ - return Result.success(iEsRevisePlanService.addPlan(esRevisePlan)); + return iEsRevisePlanService.addPlan(esRevisePlan); } @ApiOperation(value = "添加企标计划") @@ -179,27 +175,4 @@ public class EsRevisePlanController extends BaseController { return Result.success(iEsRevisePlanService.delPlans(ids)); } - @ApiOperation(value = "查询企标计划和技术标准流程关联表") - @GetMapping("/listEsPrcRelationByWk") - public ResponseMessage listEsPrcRelation(String esId){ - return Result.success(iEsPrcRelationService.list(esId)); - } - - @ApiOperation(value = "新增企标计划和技术标准流程关联表") - @PostMapping("/addEsPrcRelationByWk") - public ResponseMessage addEsPrcRelation(EsPrcRelation esPrcRelation){ - return Result.success(iEsPrcRelationService.addEsPrcRelation(esPrcRelation)); - } - - @ApiOperation(value = "修改企标计划和技术标准流程关联表") - @PostMapping("/modEsPrcRelationByWk") - public ResponseMessage modEsPrcRelation(EsPrcRelation esPrcRelation){ - return Result.success(iEsPrcRelationService.modifyEsPrcRelation(esPrcRelation)); - } - - @ApiOperation(value = "删除企标计划和技术标准流程关联表") - @GetMapping("/delEsPrcRelationByWk") - public ResponseMessage delEsPrcRelation(String esId){ - return Result.success(iEsPrcRelationService.delEsPrcRelation(esId)); - } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsPrcRelationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsPrcRelationDao.java deleted file mode 100644 index 72e094df..00000000 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsPrcRelationDao.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.adc.da.slrs.esRevisePlan.dao; - -import com.adc.da.slrs.esRevisePlan.entity.EsPrcRelation; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.springframework.stereotype.Repository; - -/** - *

- * 企标计划和技术标准流程关联表 Mapper 接口 - *

- * - * @author iyawei - * @since 2022-11-18 - */ -@Repository -public interface EsPrcRelationDao extends BaseMapper { - -} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsPrcRelation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsPrcRelation.java deleted file mode 100644 index ad692196..00000000 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsPrcRelation.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.adc.da.slrs.esRevisePlan.entity; - -import com.adc.da.base.entity.BaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -@Data -@Accessors(chain = true) -@ApiModel(value="EsPrcRelation对象", description="企标计划和技术标准流程关联表") -public class EsPrcRelation extends BaseEntity { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键") - private String id; - - @ApiModelProperty(value = "企标计划ID") - private String esId; - - @ApiModelProperty(value = "流程ID") - private String prcId; - - @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; -} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsPrcRelationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsPrcRelationService.java deleted file mode 100644 index 4db5ce0a..00000000 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsPrcRelationService.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.adc.da.slrs.esRevisePlan.service; - -import com.adc.da.slrs.esRevisePlan.entity.EsPrcRelation; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -public interface IEsPrcRelationService extends IService { - /** - * - * @param esId - * @return - */ - List list(String esId); - - /** - * - * @param esPrcRelation - * @return - */ - int addEsPrcRelation(EsPrcRelation esPrcRelation); - - /** - * - * @param esPrcRelation - * @return - */ - int modifyEsPrcRelation(EsPrcRelation esPrcRelation); - - /** - * - * @param esId - * @return - */ - int delEsPrcRelation(String esId); -} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsPrcRelationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsPrcRelationServiceImpl.java deleted file mode 100644 index bd887555..00000000 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsPrcRelationServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.adc.da.slrs.esRevisePlan.service.impl; - -import com.adc.da.slrs.esRevisePlan.dao.EsPrcRelationDao; -import com.adc.da.slrs.esRevisePlan.entity.EsPrcRelation; -import com.adc.da.slrs.esRevisePlan.service.IEsPrcRelationService; -import com.adc.da.util.UUIDUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import java.util.Date; -import java.util.List; - -public class EsPrcRelationServiceImpl extends ServiceImpl implements IEsPrcRelationService { - - @Override - public List list(String esId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(EsPrcRelation::getEsId, esId); - return this.baseMapper.selectList(queryWrapper); - } - - @Override - public int addEsPrcRelation(EsPrcRelation esPrcRelation) { - esPrcRelation.setId(UUIDUtils.randomUUID(32)); - Date date = new Date(); - esPrcRelation.setCreateTime(date); - esPrcRelation.setUpdateTime(date); - return this.baseMapper.insert(esPrcRelation); - } - - @Override - public int modifyEsPrcRelation(EsPrcRelation esPrcRelation) { - Date date = new Date(); - esPrcRelation.setUpdateTime(date); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(EsPrcRelation::getEsId, esPrcRelation.getEsId()); - return this.baseMapper.update(esPrcRelation, queryWrapper); - } - - @Override - public int delEsPrcRelation(String esId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(EsPrcRelation::getEsId, esId); - return this.baseMapper.delete(queryWrapper); - } -} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsPrcRelationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsPrcRelationMapper.xml deleted file mode 100644 index 8c660b28..00000000 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsPrcRelationMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file From 4cd34c749b2a70b85d9d426c48b9b8d10f333024 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 21 Nov 2022 17:39:02 +0800 Subject: [PATCH 5/8] =?UTF-8?q?174-OA=E5=BE=85=E5=8A=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/FeignClient/workFlowFeignClient.java | 3 +++ .../da/FeignClientImpl/workFlowFeignClientImpl.java | 5 +++++ .../adc/da/workFlow/controller/WorkFlowController.java | 6 ++++++ .../java/com/adc/da/login/security/WebMvcConfig.java | 2 ++ .../controller/EsRevisePlanController.java | 7 +++++++ .../esRevisePlan/service/IEsRevisePlanService.java | 2 ++ .../service/impl/EsRevisePlanServiceImpl.java | 10 ++++++++++ 7 files changed, 35 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 ff88272a..ab26227f 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 @@ -53,6 +53,9 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/oaTaskExec/execTask",method = RequestMethod.GET) Map execTask(@RequestParam("todoId") String todoId); + @RequestMapping(value = "/bat-wkflow/esPrcRelation/acceptTask",method = RequestMethod.GET) + Integer acceptTask(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId); + @RequestMapping(value = "/bat-wkflow/task/get_verify_by_instance",method = RequestMethod.GET) Map get_verify_by_instance(@RequestParam("taskId") String taskId, @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 5f0c3a90..f0caf3ae 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 @@ -80,6 +80,11 @@ public class workFlowFeignClientImpl { return stringWrapper; } + public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId){ + Integer integerWrapper = workFlowFeignClient.acceptTask(nowEsId,oaFlag,taskId); + return integerWrapper; + } + public Map get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ Map stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,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 a7b91966..d0f604ae 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 @@ -243,6 +243,12 @@ public class WorkFlowController { return workFlowFeignClient.execTask(todoId); } + @ApiOperation(value = "管控流程接收任务") + @GetMapping("/acceptTack") + public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId) { + return workFlowFeignClient.acceptTack(nowEsId,oaFlag,taskId); + } + @ApiOperation(value = "流程实例明细验证是否完成") @GetMapping("/get_verify_by_instance") public Map activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 22da1a26..1fb38073 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -59,6 +59,8 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/sarLawsInfo/exportStandardsInfoExcel"); // 提供自动发起复审流程 复审数据 addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStandState/getSarBussionessStandStateProcessList"); + // 提供企标计划数据 + addInterceptor.excludePathPatterns("/api/esRevisePlan/es-revise-plan/getAllPlansByWk"); //pcms项目数据下发开放接口 addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/save"); addInterceptor.excludePathPatterns("/api/sar-stand-project-team/save"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 576f387a..4de951b9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -46,6 +46,13 @@ public class EsRevisePlanController extends BaseController { return Result.success(pageInfo); } + @ApiOperation(value = "获取所有企标计划给流程") + @GetMapping("getAllPlansByWk") + public List getAllPlansByWk(){ + List esRevisePlans = iEsRevisePlanService.getAllPlansByWk(); + return esRevisePlans; + } + @ApiOperation(value = "多条件查询企标计划") @PostMapping("queryAllPlans") public ResponseMessage queryAllPlans(EsRevisePlan esRevisePlan){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java index 17ca1694..73bba267 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -26,4 +26,6 @@ public interface IEsRevisePlanService extends IService { int delPlan(String id);//删除 int delPlans(String ids);//批量删除 List getDataByName(EsRevisePlan esRevisePlan); + + List getAllPlansByWk(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index cfd9a84c..8f51a591 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -205,4 +205,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getDataByName(EsRevisePlan esRevisePlan) { return esRevisePlanDao.selectPageByName(esRevisePlan); } + + @Override + public List getAllPlansByWk() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List planStatus = new ArrayList<>(); + planStatus.add("1"); + planStatus.add("2"); + queryWrapper.lambda().in(EsRevisePlan::getPlanStatus, planStatus); + return esRevisePlanDao.selectList(queryWrapper); + } } From babad96a12818cb9e2c7f0df7e32f57fbfdda011 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 21 Nov 2022 19:48:04 +0800 Subject: [PATCH 6/8] =?UTF-8?q?174-=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B,?= =?UTF-8?q?=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=E8=8E=B7=E5=8F=96=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E8=AE=A1=E5=88=92ID=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EsRevisePlanController.java | 4 ++-- .../service/IEsRevisePlanService.java | 2 +- .../service/impl/EsRevisePlanServiceImpl.java | 16 +++++++++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 4de951b9..a8058830 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -48,8 +48,8 @@ public class EsRevisePlanController extends BaseController { @ApiOperation(value = "获取所有企标计划给流程") @GetMapping("getAllPlansByWk") - public List getAllPlansByWk(){ - List esRevisePlans = iEsRevisePlanService.getAllPlansByWk(); + public List getAllPlansByWk(String esName){ + List esRevisePlans = iEsRevisePlanService.getAllPlansByWk(esName); return esRevisePlans; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java index 73bba267..6d727bd3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -27,5 +27,5 @@ public interface IEsRevisePlanService extends IService { int delPlans(String ids);//批量删除 List getDataByName(EsRevisePlan esRevisePlan); - List getAllPlansByWk(); + List getAllPlansByWk(String esName); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 8f51a591..a7b22344 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -207,12 +207,18 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getAllPlansByWk() { + public List getAllPlansByWk(String esName) { QueryWrapper queryWrapper = new QueryWrapper<>(); - List planStatus = new ArrayList<>(); - planStatus.add("1"); - planStatus.add("2"); - queryWrapper.lambda().in(EsRevisePlan::getPlanStatus, planStatus); + + if (StringUtils.isNotBlank(esName)) { + queryWrapper.lambda().eq(EsRevisePlan::getEsName, esName); + } else { + List planStatus = new ArrayList<>(); + planStatus.add("1"); + planStatus.add("2"); + queryWrapper.lambda().in(EsRevisePlan::getPlanStatus, planStatus); + } + return esRevisePlanDao.selectList(queryWrapper); } } From f80541553634e69247d1cd17089322ceb74fe7fb Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 22 Nov 2022 15:07:48 +0800 Subject: [PATCH 7/8] =?UTF-8?q?174-=E6=8E=A5=E5=8F=97=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/FeignClient/workFlowFeignClient.java | 3 +++ .../com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 5 +++++ .../com/adc/da/workFlow/controller/WorkFlowController.java | 6 ++++++ 3 files changed, 14 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 ab26227f..1f1e8fa7 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 @@ -56,6 +56,9 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/esPrcRelation/acceptTask",method = RequestMethod.GET) Integer acceptTask(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId); + @RequestMapping(value = "/bat-wkflow/esPrcRelation/judgeAcceptTask",method = RequestMethod.GET) + Boolean judgeAcceptTask(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk); + @RequestMapping(value = "/bat-wkflow/task/get_verify_by_instance",method = RequestMethod.GET) Map get_verify_by_instance(@RequestParam("taskId") String taskId, @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 f0caf3ae..23e9ba94 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 @@ -85,6 +85,11 @@ public class workFlowFeignClientImpl { return integerWrapper; } + public Boolean judgeAcceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk){ + Boolean booleanWrapper = workFlowFeignClient.judgeAcceptTask(nowEsId,oaFlag,prcIdGk); + return booleanWrapper; + } + public Map get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ Map stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,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 d0f604ae..889b9a87 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 @@ -249,6 +249,12 @@ public class WorkFlowController { return workFlowFeignClient.acceptTack(nowEsId,oaFlag,taskId); } + @ApiOperation(value = "管控流程判断接收任务") + @GetMapping("/judgeAcceptTack") + public ResponseMessage judgeAcceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk) { + return Result.success(workFlowFeignClient.judgeAcceptTack(nowEsId,oaFlag,prcIdGk)); + } + @ApiOperation(value = "流程实例明细验证是否完成") @GetMapping("/get_verify_by_instance") public Map activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ From e68ff9b6584f96e943aee3eda31ce68a8427fafb Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 22 Nov 2022 20:03:57 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandProjectLibraryController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 00375a93..841c3917 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 @@ -329,11 +329,16 @@ public class SarStandProjectLibraryController extends BaseController