Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
7f168ad0a4
  1. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
  2. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java
  3. 18
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonToDoNumQuery.java
  4. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java
  5. 43
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
  6. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
  7. 15
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  8. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
  9. 19
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  10. 3
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java
  11. 31
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java
  12. 18
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java
  13. 20
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/baseInfo/AppAutoServiceBaseInfoQuery.java
  14. 17
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/baseInfo/AppAutoServiceBaseInfoVo.java
  15. 29
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/baseInfo/AppAutoserviceBaseInfoFeign.java
  16. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java
  17. 27
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/baseinfo/AppAutoServiceBaseInfoRest.java
  18. 39
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/baseinfo/AppAutoServiceBaseInfoService.java

5
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<String> getToDoNum(@SpringQueryMap CommonToDoNumQuery appToDoNumQuery);
}

6
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<String> getToDoNum(CommonToDoNumQuery appToDoNumQuery) {
return null;
}
}

18
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;
}

3
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> {
CommonContract selectByNo(String contractNo);
IPage<AppCommonContractListVo> getAppContractList(IPage<CommonContract> page,@Param(Constants.WRAPPER) QueryWrapper<CommonContract> qw);
int getToDoNum(@Param("userSid") String userSid);
}

43
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}
</select>
@ -196,4 +196,11 @@
${ew.sqlSegment}
</where>
</select>
<select id="getToDoNum" resultType="int">
SELECT count(*)
FROM common_contract
WHERE createBySid = #{userSid}
and (length(nodeState)=0 or nodeState = '销售专员申请' or length(nodeState) IS NULL)
</select>
</mapper>

5
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<String> getToDoNum(CommonToDoNumQuery appToDoNumQuery) {
return commonContractService.getToDoNum(appToDoNumQuery);
}
}

15
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<CommonContractMapp
commonContract.setStaffSid(appOrderDetailsVo.getStaffSid());
commonContract.setCreateBySid(appOrderDetailsVo.getUserSid());
commonContract.setStaffName(appOrderDetailsVo.getSellerName());
//分公司sid
//部门sid
commonContract.setOrgSid(appOrderDetailsVo.getOrgSid());
//业务表sid
commonContract.setBusSid(dto.getBusSid());
@ -2551,4 +2551,17 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
commonContractsVo.setUserSid(commonContract.getCreateBySid());
return rb.success().setData(commonContractsVo);
}
public ResultBean<String> 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));
}
}

4
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;
}

19
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 @@
<if test="name != null and name != ''">
and concat(IFNULL(bo.customerName
, '')
,IFNULL(bo.staffName
, '')
, ifnull(bo.billNo
, IFNULL(bo.staffName
, '')
, ifnull(bo.billNo
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
<if test="typeState != null and typeState != ''">
and LENGTH(bo.nodeState)>0
and LENGTH(bo.nodeState)
>0
</if>
</where>
order by bo.id desc
@ -332,11 +334,12 @@
</select>
<select id="selectTemporaryNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrdeVo">
select bv.temporaryNo,bo.contractNo
select bv.temporaryNo, bo.contractNo
from bus_sales_order bo
left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
where bo.nodeState = '已办结'
and bv.linkSid = #{vehSid} limit 1
and bv.linkSid = #{vehSid}
limit 1
</select>
<select id="selectOrderOne" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSaleOrderVehicleOutVo">
@ -359,7 +362,7 @@
bs.distributorPriceTwo as distributorPrice2,
bs.name,
bs.userSid,
bo.sid as salesOrderSid
bo.sid as salesOrderSid
from bus_sales_order bo
left join bus_sales_order_price bp on bo.sid = bp.salesOrderSid
left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid

3
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java

@ -48,7 +48,8 @@ public class AppIndexEnum {
YK("25b3dfb2-d3df-47c3-b689-8c38a7785391", "移库"),
PK("608e72d3-9f34-4b44-85c4-d6be41de8f76", "盘库"),
XJ("ae160247-195e-4f2c-a167-ae50a2e50c81", "巡检"),
SC("92659535-38f6-4456-a45a-ab5e9ced3fac", "收车");
SC("92659535-38f6-4456-a45a-ab5e9ced3fac", "收车"),
HTSH("f4d75ebc-cbab-4c44-bf93-2d38f70c1c15", "合同审核");
/**
* code值

31
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java

@ -11,6 +11,9 @@ import com.yxt.anrui.portal.biz.flow.FlowableService;
import com.yxt.anrui.portal.biz.formnotice.FormNoticeService;
import com.yxt.anrui.portal.biz.sysmobilemenurole.SysMobileMenuRoleService;
import com.yxt.anrui.portal.biz.sysuser.SysUserService;
import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoServiceBaseInfoQuery;
import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoServiceBaseInfoVo;
import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoserviceBaseInfoFeign;
import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoFeign;
import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoQuery;
import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoVo;
@ -60,6 +63,8 @@ public class AppIndexRest implements AppIndexFeign {
private AppIndexService appIndexService;
@Autowired
private SysMobileMenuRoleService sysMobileMenuRoleService;
@Autowired
private AppAutoserviceBaseInfoFeign appAutoserviceBaseInfoFeign;
@Override
public ResultBean<AppIndexVo> index(String userSid) {
@ -121,7 +126,7 @@ public class AppIndexRest implements AppIndexFeign {
// 待办数量
vo.setNotWorkNum(flowableService.getTodoNum(userSid, orgPath).getData());
// 待阅数量
vo.setNotReadNum(messageListFeign.selectUnReadCount("", userSid).getData());
vo.setNotReadNum(messageListFeign.selectUnReadCount("bc59c198-2d52-bb54-e4106aa38821a9ec", userSid).getData());
return rb.success().setData(vo);
}
@ -176,7 +181,29 @@ public class AppIndexRest implements AppIndexFeign {
}
item.setCornerNum(String.valueOf(count));
} else {
} else if("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028".equals(item.getAppSid())){
//业务
ResultBean<AppAutoServiceBaseInfoVo> indexCountVo = ResultBean.fireFail();
if (StringUtils.isNotBlank(orgPath)) {
//切换机构
AppAutoServiceBaseInfoQuery appAutoServiceBaseInfoQuery = new AppAutoServiceBaseInfoQuery();
appAutoServiceBaseInfoQuery.setOrgPath(orgPath);
appAutoServiceBaseInfoQuery.setUserSid(userSid);
indexCountVo = appAutoserviceBaseInfoFeign.getToDoNum(appAutoServiceBaseInfoQuery);
}
//查询该用户是否有权限
List<String> stringList = sysMobileMenuRoleService.selectMenuList(userSid, item.getAppSid());
int count = 0;
if (indexCountVo.getSuccess()) {
AppAutoServiceBaseInfoVo appAutoServiceBaseInfoVo = indexCountVo.getData();
if (stringList.contains(AppIndexEnum.AppMenu.HTSH.getRemarks())) {
if (StringUtils.isNotBlank(appAutoServiceBaseInfoVo.getCommonContractNum())) {
count = count + Integer.valueOf(appAutoServiceBaseInfoVo.getCommonContractNum()).intValue();
}
}
}
item.setCornerNum(String.valueOf(count));
}else{
item.setCornerNum("");
}

18
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java

@ -1,7 +1,10 @@
package com.yxt.anrui.portal.biz.index;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.api.commoncontract.CommonToDoNumQuery;
import com.yxt.anrui.portal.api.index.AppIndexNewListVo;
import com.yxt.anrui.portal.api.index.AppIndexNewVo;
import com.yxt.anrui.portal.api.index.AppIndexNumQuery;
@ -55,6 +58,9 @@ public class AppIndexService {
@Autowired
private SysUserService sysUserService;
@Autowired
private CommonContractFeign commonContractFeign;
public ResultBean<List<AppIndexNewVo>> getBusinessList(String userSid, String appSid, String orgPath) {
ResultBean<List<AppIndexNewVo>> rb = ResultBean.fireFail();
if (StringUtils.isBlank(userSid) || StringUtils.isBlank(appSid)) {
@ -113,6 +119,8 @@ public class AppIndexService {
AppToDoNumQuery appToDoNumQuery = new AppToDoNumQuery();
appToDoNumQuery.setUserSid(userSid);
appToDoNumQuery.setOrgPath(orgPath);
CommonToDoNumQuery commonToDoNumQuery = new CommonToDoNumQuery();
BeanUtil.copyProperties(appToDoNumQuery, commonToDoNumQuery);
//根据appSid查询菜单的信息
List<SysMobileMenu> sysMobileMenus = sysMobileMenuService.getMenu(appSid);
List<AppIndexNumVo> list = new ArrayList<>();
@ -154,6 +162,16 @@ public class AppIndexService {
}
} else if (AppIndexEnum.AppVersionSubAppSid.YW.getCode().equals(appSid)) {
//业务
for (SysMobileMenu menu : sysMobileMenus) {
AppIndexNumVo appIndexNumVo = new AppIndexNumVo();
appIndexNumVo.setSid(menu.getSid());
//合同审核
if (AppIndexEnum.AppMenu.HTSH.getRemarks().equals(menu.getTitle())) {
String num = commonContractFeign.getToDoNum(commonToDoNumQuery).getData();
appIndexNumVo.setNum(num);
}
list.add(appIndexNumVo);
}
}

20
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/baseInfo/AppAutoServiceBaseInfoQuery.java

@ -0,0 +1,20 @@
package com.yxt.anrui.terminal.api.autoservice.baseInfo;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/3 11:22
* @Description
*/
@Data
public class AppAutoServiceBaseInfoQuery implements Query {
private static final long serialVersionUID = 7725685847060148023L;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织机构sid")
private String orgPath;
}

17
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/baseInfo/AppAutoServiceBaseInfoVo.java

@ -0,0 +1,17 @@
package com.yxt.anrui.terminal.api.autoservice.baseInfo;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/3 11:30
* @Description
*/
@Data
public class AppAutoServiceBaseInfoVo implements Vo {
private static final long serialVersionUID = 1263242428921696833L;
//合同审核待办
private String commonContractNum;
}

29
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/baseInfo/AppAutoserviceBaseInfoFeign.java

@ -0,0 +1,29 @@
package com.yxt.anrui.terminal.api.autoservice.baseInfo;
import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoFeignFallback;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ResponseBody;
/**
* @Author dimengzhe
* @Date 2023/3/2 14:02
* @Description
*/
@FeignClient(
contextId = "anrui-terminal-AppAutoserviceBaseInfo",
name = "anrui-terminal",
path = "autoservice/v1/baseInfo",
fallback = AppScmBaseInfoFeignFallback.class)
public interface AppAutoserviceBaseInfoFeign {
@ApiOperation("获取业务各子应用模块待办数量:切换机构")
@GetMapping("/getToDoNum")
@ResponseBody
public ResultBean<AppAutoServiceBaseInfoVo> getToDoNum(@SpringQueryMap AppAutoServiceBaseInfoQuery baseInfoQuery);
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java

@ -1,5 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yxt.common.core.vo.Vo;
@ -111,4 +112,6 @@ public class BusOrderSalesVo implements Vo {
@ApiModelProperty(value = "合同编号")
private String contractId;
private String saler;
}

27
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/baseinfo/AppAutoServiceBaseInfoRest.java

@ -0,0 +1,27 @@
package com.yxt.anrui.terminal.biz.autoservice.baseinfo;
import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoServiceBaseInfoQuery;
import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoServiceBaseInfoVo;
import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoserviceBaseInfoFeign;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* @Author dimengzhe
* @Date 2023/3/3 11:24
* @Description
*/
@Controller
@RequestMapping("autoservice/v1/baseInfo")
public class AppAutoServiceBaseInfoRest implements AppAutoserviceBaseInfoFeign {
@Autowired
private AppAutoServiceBaseInfoService appAutoServiceBaseInfoService;
@Override
public ResultBean<AppAutoServiceBaseInfoVo> getToDoNum(AppAutoServiceBaseInfoQuery baseInfoQuery) {
return appAutoServiceBaseInfoService.getToDoNum(baseInfoQuery);
}
}

39
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/baseinfo/AppAutoServiceBaseInfoService.java

@ -0,0 +1,39 @@
package com.yxt.anrui.terminal.biz.autoservice.baseinfo;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.api.commoncontract.CommonToDoNumQuery;
import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoServiceBaseInfoQuery;
import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoServiceBaseInfoVo;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @Author dimengzhe
* @Date 2023/3/3 11:27
* @Description
*/
@Service
public class AppAutoServiceBaseInfoService {
@Autowired
private CommonContractFeign commonContractFeign;
public ResultBean<AppAutoServiceBaseInfoVo> getToDoNum(AppAutoServiceBaseInfoQuery baseInfoQuery) {
String orgPath = baseInfoQuery.getOrgPath();
String userSid = baseInfoQuery.getUserSid();
ResultBean<AppAutoServiceBaseInfoVo> rb = ResultBean.fireFail();
AppAutoServiceBaseInfoVo appAutoServiceBaseInfoVo = new AppAutoServiceBaseInfoVo();
String commonContractNum = "";
if(StringUtils.isNotBlank(orgPath)){
//切换机构
CommonToDoNumQuery appToDoNumQuery = new CommonToDoNumQuery();
appToDoNumQuery.setUserSid(userSid);
appToDoNumQuery.setOrgPath(orgPath);
//合同待办数量
commonContractNum = commonContractFeign.getToDoNum(appToDoNumQuery).getData();
}
appAutoServiceBaseInfoVo.setCommonContractNum(commonContractNum);
return rb.success().setData(appAutoServiceBaseInfoVo);
}
}
Loading…
Cancel
Save