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..581dd4d9 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 @@ -18,8 +18,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -//@FeignClient(value = "bat-wkflow-test") -@FeignClient(value = "bat-wkflow") +@FeignClient(value = "bat-wkflow-test") +//@FeignClient(value = "bat-wkflow") //@FeignClient(value = "shan6") public interface workFlowFeignClient { 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 34233545..99a64b24 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 @@ -464,6 +464,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl userIPage = new Page<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index a1d27dfd..80492274 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -158,6 +158,14 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private String endTimes; + @ApiModelProperty(value = "符合数量") + @TableField(exist = false) + private Long isCount; + + @ApiModelProperty(value = "不涉及数量") + @TableField(exist = false) + private Long isOverCount; + // 以下为非表中字段 @TableField(exist = false)