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 25d62124..81041d83 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 @@ -13,7 +13,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -@FeignClient(value = "bat-wkflow") +//@FeignClient(value = "bat-wkflow") +@FeignClient(value = "shan") public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 82c9b863..fb80de88 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -15,7 +15,7 @@ public class ActDefineStartMap { Map map = new TreeMap<>(); map.put("1","standardLibraryWkflow"); - + map.put("3","standardregulatoryinventory"); return map.get(type); } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/BusMes.java b/adc-da-activiti/src/main/java/com/adc/da/common/BusMes.java index 1945d9c1..5e9dbad6 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/BusMes.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/BusMes.java @@ -1,13 +1,19 @@ package com.adc.da.common; +import io.swagger.annotations.ApiModelProperty; + public class BusMes { + @ApiModelProperty(value = "用户id") private String userId; + @ApiModelProperty(value = "任务id") private String taskId; + @ApiModelProperty(value = "json") private String json; + @ApiModelProperty(value = "任务ids") private String taskIds; private String pId; 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 c6643978..b72e68c9 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 @@ -213,7 +213,7 @@ public class WorkFlowController { @ApiOperation(value = "完成任务") @PostMapping("/completeTask") - public Wrapper completeTaskByUserId(BusMes busMes){ + public Wrapper completeTaskByUserId(@RequestBody BusMes busMes){ Wrapper str = workFlowFeignClient.completeTaskByUserId(busMes); if(str.getCode() == 500){ str.setSuccess(false); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index 94ac74de..5f0d7846 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -101,6 +102,13 @@ public class SarLawsDetailedListController extends BaseController selectAllP(Integer pages,Integer size,String sortKey); String updateList(DetailedUpDto detailedUpDto); + + SarLawsDetailedList selSarLawDetailById(@Param("id")String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index b4793979..630485b4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -1,7 +1,6 @@ package com.adc.da.slrs.sarLawsDetailedList.service.impl; import com.adc.da.att.service.IAttFileEOService; -import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarDetailedIdAttFileDao; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; import com.adc.da.slrs.sarLawsAttrDetailedList.service.impl.SarLawsAttrDetailedListServiceImpl; @@ -16,7 +15,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -62,7 +60,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl