diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributor.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributor.java index 1d33ebc4f0..1603efd718 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributor.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributor.java @@ -98,4 +98,18 @@ public class BaseDistributor extends BaseEntity { private String disLevelKey; @ApiModelProperty("级别value") private String disLevelValue; + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("环节定义的sid") + private String nodeSid; + @ApiModelProperty("流程实例的id") + private String procInstId; + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("任务id") + private String taskId; + @ApiModelProperty("使用组织全路径") + private String orgSidPath; + @ApiModelProperty("办结日期") + private Date closingDate; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDetailsVo.java index 99541a864a..8629d64dfa 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDetailsVo.java @@ -24,7 +24,7 @@ public class BaseDistributorDetailsVo implements Vo { @ApiModelProperty("统一社会信用代码") private String registNum; @ApiModelProperty("成立时间") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date setUpTime; @ApiModelProperty("注册(登记)地址") private String registDetailAddress; @@ -71,7 +71,7 @@ public class BaseDistributorDetailsVo implements Vo { @ApiModelProperty("是否担保 0是/1否") private String isGuarantee; @ApiModelProperty("开始合作日期") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date startCoopDate; @ApiModelProperty("创建组织") private String createOrg; @@ -101,4 +101,11 @@ public class BaseDistributorDetailsVo implements Vo { private List frsfzList; @ApiModelProperty("其他资料附件list") private List qtzlList; + @ApiModelProperty("taskId") + private String taskId; // taskId + @ApiModelProperty("流程实例的sid") + private String procInsId; // 流程实例的sid + @ApiModelProperty("userSid") + private String userSid; + private String orgSidPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java index ca99df98a4..2f6987158a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java @@ -108,4 +108,5 @@ public class BaseDistributorDto implements Dto { private List frsfzList; @ApiModelProperty("其他资料附件list") private List qtzlList; + private String orgSidPath; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java index 98106f87f5..e4965fae94 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java @@ -1,12 +1,14 @@ package com.yxt.anrui.base.api.basedistributor; import com.yxt.anrui.base.api.basedistributor.app.*; +import com.yxt.anrui.base.api.basedistributor.flow.*; 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 io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; @@ -82,8 +84,46 @@ public interface BaseDistributorFeign { @ApiOperation("PC端-中介人员-经销商列表") @PostMapping("/getDistributors") ResultBean> getDistributors(@RequestBody BaseDistributorsListQuery pagerQuery); - //---------------------------------------移动端-------------------------------------------------// + //---------------------------------------------- 流程接口 --------------------------------------------------/ + @ApiOperation("经销商备案提交") + @PostMapping("/submit") + public ResultBean submitRecordApplication(@RequestBody @Valid SubmitBaseDistributorApplyDto dto); + + @ApiOperation(value = "办理(同意)") + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody BaseDistributorCompleteDto dto); + + //分公司到风控中心同意 + @ApiOperation(value = "办理(同意)") + @PostMapping("/companyToDivisionOperate") + public ResultBean companyToDivisionOperate(@Valid @RequestBody BaseDistributorCompleteDto query); + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody BaseDistributorTaskQuery query); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody BaseDistributorTaskQuery query); + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") + public ResultBean breakProcess(@RequestBody BaseDistributorTaskQuery query); + + @ApiOperation(value = "流程历史流转记录") + @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}") + public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); + + //---------------------------------------移动端-------------------------------------------------// @ApiOperation("移动端-销售订单-经销商分页列 表") @PostMapping("/getDistributorList") ResultBean> getDistributorList(@RequestBody PagerQuery pagerQuery); @@ -142,13 +182,18 @@ public interface BaseDistributorFeign { @ApiOperation("查询所有经销商信息") @GetMapping("/selectAllDisList") - ResultBean> selectAllDisList(@RequestParam("orgSid") String orgSid,@RequestParam("staffSid") String staffSid); + ResultBean> selectAllDisList(@RequestParam("orgSid") String orgSid, @RequestParam("staffSid") String staffSid); @ApiOperation("移动端查询经销商和客户信息") @GetMapping("/invoiceName") - ResultBean> invoiceName(@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath,@RequestParam(value = "search",required = false) String search); + ResultBean> invoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search); @ApiOperation("根据sid查询所有经销商信息") @GetMapping("/selectDisListBySid/{sid}") ResultBean selectDisListBySid(@PathVariable("sid") String sid); + + //---------------------------------------移动端流程---------------------------------------------// + @ApiOperation("经销商备案提交") + @PostMapping("/submitDistributor") + public ResultBean submitDistributor(@RequestBody @Valid AppSubmitDistributorApplyDto dto); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java index de95d0f4f4..8f2e2f8b36 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.api.basedistributor; import com.yxt.anrui.base.api.basedistributor.app.*; +import com.yxt.anrui.base.api.basedistributor.flow.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -82,6 +83,51 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign { return null; } + @Override + public ResultBean submitRecordApplication(SubmitBaseDistributorApplyDto dto) { + return null; + } + + @Override + public ResultBean complete(BaseDistributorCompleteDto dto) { + return null; + } + + @Override + public ResultBean companyToDivisionOperate(BaseDistributorCompleteDto query) { + return null; + } + + @Override + public ResultBean revokeProcess(BaseDistributorTaskQuery query) { + return null; + } + + @Override + public ResultBean taskReject(BaseDistributorTaskQuery query) { + return null; + } + + @Override + public ResultBean breakProcess(BaseDistributorTaskQuery query) { + return null; + } + + @Override + public ResultBean flowRecord(String procInsId) { + return null; + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return null; + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return null; + } + @Override public ResultBean> getDistributorList(PagerQuery pagerQuery) { return null; @@ -167,5 +213,10 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign { return null; } + @Override + public ResultBean submitDistributor(AppSubmitDistributorApplyDto dto) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java index 8c3c617c99..96018d6534 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java @@ -102,4 +102,11 @@ public class BaseDistributorVo implements Vo { private String disLevelValue; @ApiModelProperty("是否关联(0未关联,1已关联)") private String isRelation; + @ApiModelProperty("备案状态") + private String state; + private String procDefId; + @ApiModelProperty("实例id") + private String procInstId; + @ApiModelProperty("流程状态") + private String nodeState; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDisDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDisDetailsVo.java index 49ac1bf739..773b9075f7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDisDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDisDetailsVo.java @@ -22,6 +22,7 @@ public class BaseDisDetailsVo implements Vo { private BaseFileVo fileInfo; @ApiModelProperty(value = "人员列表") private List records; - + private String procInstId; + private String taskId; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistribuDeailVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistribuDeailVo.java index 89f8fe6124..fe76a6da4d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistribuDeailVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistribuDeailVo.java @@ -20,7 +20,8 @@ public class BaseDistribuDeailVo implements Vo { private Integer invoiceInfoState; @ApiModelProperty(value = "文件信息状态") private Integer fileInfoState; - + private String procInstId; + private String taskId; private List records; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsVo.java index 3f75aa9f16..89b31a2269 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsVo.java @@ -31,4 +31,6 @@ public class BaseDistributorsVo implements Vo { private String invoPhone; @ApiModelProperty(value = "成立日期") private String setUpTime; + //private String nodeState; + private boolean updateBtn; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/AppSubmitDistributorApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/AppSubmitDistributorApplyDto.java new file mode 100644 index 0000000000..60810c8704 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/AppSubmitDistributorApplyDto.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.base.api.basedistributor.flow; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/7/14 9:15 + */ +@Data +public class AppSubmitDistributorApplyDto implements Dto { + @ApiModelProperty("distributorSid") + private String distributorSid; + @ApiModelProperty("任务id") + private String taskId; + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String instanceId; + +} 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 new file mode 100644 index 0000000000..c02d08103d --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/BaseDistributorCompleteDto.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.base.api.basedistributor.flow; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Map; + +/** + * @Author dimengzhe + * @Date 2022/6/28 9:01 + * @Description + */ +@Data +public class BaseDistributorCompleteDto implements Dto { + private static final long serialVersionUID = 3240453987322803352L; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误:userSid") + private String userSid; + @ApiModelProperty(value = "用户全路径sid") + private String orgSidPath; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误:taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误:taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误:instanceId") + private String instanceId; + @ApiModelProperty(value = "意见") + @NotBlank(message = "参数错误:comment") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误:businessSid") + private String businessSid; + @ApiModelProperty(value = "分支字段及业务字段") + private Map formVariables; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/BaseDistributorTaskQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/BaseDistributorTaskQuery.java new file mode 100644 index 0000000000..9715775bd1 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/BaseDistributorTaskQuery.java @@ -0,0 +1,56 @@ +package com.yxt.anrui.base.api.basedistributor.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/6/28 17:29 + * @Description 终止、撤回、驳回查询参数 + */ +@Data +public class BaseDistributorTaskQuery implements Query { + private static final long serialVersionUID = -4006020771892400451L; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误:taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误:businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + private String instanceId; + /*@ApiModelProperty("用户Id") + private String userId; + @ApiModelProperty("节点") + private String targetKey; + @ApiModelProperty("流程变量信息") + private Map values = new HashMap<>(); + @ApiModelProperty("审批人") + private String assignee; + @ApiModelProperty("候选人") + private List candidateUsers = new ArrayList<>(); + @ApiModelProperty("审批组") + private List candidateGroups = new ArrayList<>();*/ +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/GetNodeQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/GetNodeQuery.java new file mode 100644 index 0000000000..35032b4e74 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/GetNodeQuery.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.base.api.basedistributor.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Map; + +/** + * @Author dimengzhe + * @Date 2022/6/28 10:42 + * @Description + */ +@Data +public class GetNodeQuery implements Query { + private static final long serialVersionUID = -5674867230708197611L; + + @ApiModelProperty(value = "环节定义id") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + + @ApiModelProperty(value = "分支字段及业务字段") + private Map formVariables; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/GetNodeVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/GetNodeVo.java new file mode 100644 index 0000000000..94d40520c8 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/GetNodeVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.base.api.basedistributor.flow; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/28 11:09 + * @Description + */ +@Data +public class GetNodeVo implements Vo { + private static final long serialVersionUID = 8802774014747063504L; + @ApiModelProperty(value = "节点名称") + private String name; + @ApiModelProperty(value = "节点id") + private String id; + @ApiModelProperty(value = "审批组") + private List candidateGroups; + @ApiModelProperty(value = "是否是最后环节") + private String endTask; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/SubmitBaseDistributorApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/SubmitBaseDistributorApplyDto.java new file mode 100644 index 0000000000..20a755f9c9 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/SubmitBaseDistributorApplyDto.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.base.api.basedistributor.flow; + +import com.yxt.anrui.base.api.basedistributor.BaseDistributorDto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/27 13:38 + * @Description + */ +@Data +public class SubmitBaseDistributorApplyDto extends BaseDistributorDto { + private static final long serialVersionUID = 378585162071125756L; + @ApiModelProperty("流程实例id") + private String instanceId; + @ApiModelProperty("任务id") + private String taskId; + @ApiModelProperty("业务sid") + private String sid; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java index d0410c1f7c..2aa5b669b5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java @@ -136,4 +136,6 @@ public interface BaseDistributorMapper extends BaseMapper { BaseDistributorListVo selectDisListBySid(String sid); List selectAppAllDisList(@Param("sid") String sid, @Param("search") String search); + + int updateFlowFiled(Map map); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml index 1964ffaf6c..beeed4c8f7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml @@ -12,7 +12,14 @@ bd.invoBankNum, bd.setUpTime, bd.isGuarantee, - bd.pDistributorName + bd.pDistributorName, + bd.procDefId, + bd.procInstId, + bd.nodeState, + case bd.state + when 1 then '未报备' + when 3 then '报备中' + when 2 then '已报备' end as `state` FROM base_distributor bd ${ew.sqlSegment} @@ -95,7 +102,7 @@ SELECT bd.sid, bd.disName, - case bd.state - when 1 then '未备案' - when 2 then '已备案' end as state, + bd.nodeState as state, if(length(bd.pDistributorName)>0,bd.pDistributorName,'无') as pDistributorName, bd.registNum, bd.registDetailAddress, bd.invoPhone, + bd.nodeState, DATE_FORMAT(bd.setUpTime, '%Y-%m-%d') as setUpTime FROM base_distributor bd @@ -168,7 +174,7 @@ @@ -194,6 +200,21 @@ invoBank = #{invoBank} where sid = #{sid} + + UPDATE base_distributor + SET nodeState=#{nodeState} + , nodeSid=#{taskDefKey} + + , procDefId=#{procDefId} + + + , procInstId=#{procInsId} + + + , taskId=#{taskId} + + WHERE sid = #{sid} +