diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/BaseDistributorCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/BaseDistributorCompleteDto.java index c02d08103d..cfdf811ddd 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/BaseDistributorCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/BaseDistributorCompleteDto.java @@ -37,4 +37,6 @@ public class BaseDistributorCompleteDto implements Dto { private String businessSid; @ApiModelProperty(value = "分支字段及业务字段") private Map formVariables; + @ApiModelProperty(value = "是否能判定 01是 02否") + private String isDecided; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java index aff816c32f..70b65ddbdf 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java @@ -17,6 +17,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -206,8 +207,12 @@ public class BaseDistributorRest implements BaseDistributorFeign { public ResultBean complete(BaseDistributorCompleteDto dto) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(dto, bv); + String isDecide = ""; + if (StringUtils.isNotBlank(dto.getIsDecided())) { + isDecide = dto.getIsDecided(); + } bv.setModelId(ProcDefEnum.DEALERFILINGAPPLY.getProDefId()); - return baseDistributorService.complete(bv); + return baseDistributorService.complete(bv,isDecide); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 4bc09ed93e..1b4a520092 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -1223,7 +1223,7 @@ public class BaseDistributorService extends MybatisBaseService formVariables = new HashMap<>(); + formVariables.put("isDecide", isDecided); + bv.setFormVariables(formVariables); BaseDistributor baseDistributor = this.fetchBySid(businessSid); if (bv.getTaskId().equals(baseDistributor.getTaskId())) { bv.setOrgSidPath(baseDistributor.getOrgSidPath()); @@ -1420,7 +1430,7 @@ public class BaseDistributorService extends MybatisBaseService