diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java index f3154ed9d9..c37dcb8494 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java @@ -219,4 +219,9 @@ public interface CommonContractFeign { @ApiOperation(value = "第二环节办理") @PostMapping("/completeBy") public ResultBean completeBy(@Valid @RequestBody CommonContractCompleteDto query); + + @ApiOperation("手机端-查询本分公司下代办数量:切换机构") + @GetMapping("/getToDoNum") + @ResponseBody + public ResultBean getToDoNum(@SpringQueryMap CommonToDoNumQuery appToDoNumQuery); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java index 55bb4534c1..d5ae8db70f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java @@ -1,6 +1,5 @@ package com.yxt.anrui.base.api.commoncontract; -import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo; import com.yxt.anrui.base.api.commoncontract.flowable.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -233,4 +232,9 @@ public class CommonContractFeignFallback implements CommonContractFeign { public ResultBean completeBy(CommonContractCompleteDto query) { return null; } + + @Override + public ResultBean getToDoNum(CommonToDoNumQuery appToDoNumQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonToDoNumQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonToDoNumQuery.java new file mode 100644 index 0000000000..584fdfb240 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonToDoNumQuery.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.base.api.commoncontract; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/3/3 10:38 + * @Description + */ +@Data +public class CommonToDoNumQuery { + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织机构sid") + private String orgPath; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java index 1ace358396..5997064597 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.commoncontract.*; -import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.*; import java.util.List; @@ -94,4 +93,6 @@ public interface CommonContractMapper extends BaseMapper { CommonContract selectByNo(String contractNo); IPage getAppContractList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + int getToDoNum(@Param("userSid") String userSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml index 4e5b670046..370208256a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml @@ -28,25 +28,25 @@ contractNo, contractTypeKey, contractType, - staffName, - partyA, - partyB, - modelSid, - modelName, - num, - price, - oneDeposit, - contractAmount, - sceneSignUrl, - customerSid, - deposit, + staffName, + partyA, + partyB, + modelSid, + modelName, + num, + price, + oneDeposit, + contractAmount, + sceneSignUrl, + customerSid, + deposit, if(length(nodeState) > 0, nodeState, '待提交') as nodeState, - DATE_FORMAT(createDate,'%Y-%m-%d') as createDate, - address, - remarks, - partyC, - procDefId, - procInstId + DATE_FORMAT(createDate, '%Y-%m-%d') as createDate, + address, + remarks, + partyC, + procDefId, + procInstId FROM common_contract ${ew.customSqlSegment} @@ -196,4 +196,11 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java index 27d2e1687d..eb88c65af5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java @@ -598,4 +598,9 @@ public class CommonContractRest implements CommonContractFeign { public ResultBean completeBy(CommonContractCompleteDto query) { return commonContractService.completeBy(query); } + + @Override + public ResultBean getToDoNum(CommonToDoNumQuery appToDoNumQuery) { + return commonContractService.getToDoNum(appToDoNumQuery); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index ab0345a262..0b639150ee 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -2034,7 +2034,7 @@ public class CommonContractService extends MybatisBaseService getToDoNum(CommonToDoNumQuery appToDoNumQuery) { + ResultBean rb = ResultBean.fireFail(); + String userSid = appToDoNumQuery.getUserSid(); + String orgPath = appToDoNumQuery.getOrgPath(); + if (StringUtils.isBlank(orgPath)) { + orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } else { + orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } + int count = baseMapper.getToDoNum(userSid); + return rb.success().setData(String.valueOf(count)); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java index 52af2bb1bf..3d2d1382ad 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java @@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.api.bussalesorder.app.order; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo; @@ -151,4 +152,7 @@ public class AppBusSalesOrderVo implements Vo { @ApiModelProperty(value = "合同编号") private String contractId; + + private String saler; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 9a38f29ced..df2c44b0f5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -59,7 +59,8 @@ bo.nodeState is null as showDeleteBtn, 0 as showFinancialBtn, bo.type, - contractNo as contractId + bo.contractNo as contractId, + bo.staffName as saler FROM bus_sales_order bo left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid @@ -68,15 +69,16 @@ and concat(IFNULL(bo.customerName , '') - ,IFNULL(bo.staffName - , '') - , ifnull(bo.billNo + , IFNULL(bo.staffName + , '') + , ifnull(bo.billNo , '')) LIKE concat('%' , #{name} , '%') - and LENGTH(bo.nodeState)>0 + and LENGTH(bo.nodeState) + >0 order by bo.id desc @@ -332,11 +334,12 @@