diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusToDoNumQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusToDoNumQuery.java new file mode 100644 index 0000000000..ff3e83bc0f --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusToDoNumQuery.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.buscenter.api.busvalcustfiling; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/3/3 10:38 + * @Description + */ +@Data +public class BusToDoNumQuery { + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织机构sid") + private String orgPath; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingFeign.java index 60161b5abd..ea26d2b39e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingFeign.java @@ -111,4 +111,9 @@ public interface BusValcustFilingFeign { @PostMapping("/selectByContractNoAndVinNo") @ResponseBody ResultBean selectByContractNoAndVinNo(@RequestParam("contractNo") String contractNo,@RequestParam("vinNo") String vinNo); + + @ApiOperation("手机端-查询本分公司下代办数量:切换机构") + @GetMapping("/getToDoNum") + @ResponseBody + public ResultBean getToDoNum(@SpringQueryMap BusToDoNumQuery appToDoNumQuery); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingVo.java index fd98d765cb..b2051ae3a2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingVo.java @@ -83,4 +83,6 @@ public class BusValcustFilingVo implements Vo { private String procInstId; @ApiModelProperty("0高开,1低开") private String isGdk; + @ApiModelProperty("销售订单sid") + private String saleOrderSid; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java index 4b13a582d3..905c7ef624 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java @@ -73,4 +73,6 @@ public interface BusValcustFilingMapper extends BaseMapper { void updateGkBySid(@Param("ysMoney") String ysMoney, @Param("ssMoney") String ssMoney, @Param("remarks") String remarks, @Param("dtoSid") String dtoSid); void updateDkBySid(@Param("remarks") String remarks, @Param("dtoSid") String dtoSid); + + int getToDoNum(@Param("orgPath") String orgPath,@Param("userSid") String userSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml index 6e862417dd..f3bf2b0b96 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml @@ -19,7 +19,8 @@ bf.`ssMoney`, bf.`procDefId`, bf.`procInstId`, - bf.isGdk + bf.isGdk, + bo.sid AS saleOrderSid FROM bus_valcust_filing bf LEFT JOIN bus_sales_order bo @@ -79,4 +80,12 @@ set remarks = #{remarks} where sid = #{dtoSid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingRest.java index 5773f1626d..9dfcb8c98f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.buscenter.biz.busvalcustfiling; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.buscenter.api.busvalcustfiling.*; import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.*; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; @@ -38,12 +39,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFiling; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingQuery; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingVo; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingDetailsVo; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingDto; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingFeign; /** * Project: anrui-buscenter(价值客户备案申请)
@@ -144,4 +139,9 @@ public class BusValcustFilingRest implements BusValcustFilingFeign { public ResultBean selectByContractNoAndVinNo(String contractNo, String vinNo) { return busValcustFilingService.selectByContractNoAndVinNo(contractNo,vinNo); } + + @Override + public ResultBean getToDoNum(BusToDoNumQuery appToDoNumQuery) { + return busValcustFilingService.getToDoNum(appToDoNumQuery); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java index 8135047db2..3b5521fd9c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java @@ -46,6 +46,7 @@ import com.yxt.anrui.buscenter.api.busfile.BusFileDto; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; +import com.yxt.anrui.buscenter.api.busvalcustfiling.*; import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingNodeQuery; import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingNodeVo; import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingTaskQuery; @@ -84,6 +85,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -100,12 +102,6 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFiling; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingQuery; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingVo; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingDetailsVo; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingDto; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -174,6 +170,8 @@ public class BusValcustFilingService extends MybatisBaseService listPageVo(PagerQuery pq) { BusValcustFilingQuery query = pq.getParams(); @@ -271,10 +269,10 @@ public class BusValcustFilingService extends MybatisBaseService busFileDtos = busFileService.getPathByLinkSid(sid); List fjImages = new ArrayList<>(); for (BusFileDto busFileDto : busFileDtos) { @@ -350,7 +355,7 @@ public class BusValcustFilingService extends MybatisBaseService appMap = new HashMap<>(); - appMap.put("sid",businessSid); + appMap.put("sid", businessSid); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 variables.put("app", appMap); //流程定义id @@ -428,7 +433,7 @@ public class BusValcustFilingService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid",businessSid); + appMap.put("sid", businessSid); variables.put("app", appMap); FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); if (StringUtils.isBlank(busValcustFiling.getProcDefId())) { @@ -483,7 +488,7 @@ public class BusValcustFilingService extends MybatisBaseService busBillVehicleVos = busBillVehicleService.fetchVehBySid(busBillApplication.getSid()); List busBillTrailerVos = busBillTrailerService.fetchByMainSid(busBillApplication.getSid()); @@ -508,10 +513,10 @@ public class BusValcustFilingService extends MybatisBaseService finBillVehicleVos = finBillVehicleFeign.fetchVehBySid(busValcustFiling.getBusSid()).getData(); List finBillTrailerVos = finBillTrailerFeign.fetchByMainSid(busValcustFiling.getBusSid()).getData(); @@ -733,7 +738,7 @@ public class BusValcustFilingService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid",businessSid); + appMap.put("sid", businessSid); variables.put("app", appMap); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); @@ -838,7 +843,15 @@ public class BusValcustFilingService extends MybatisBaseService selectByContractNoAndVinNo(String contractNo, String vinNo) { ResultBean rb = ResultBean.fireFail(); - BusValcustFiling busValcustFiling = baseMapper.selectByContractNoAndVinNo(contractNo,vinNo); + BusValcustFiling busValcustFiling = baseMapper.selectByContractNoAndVinNo(contractNo, vinNo); return rb.success().setData(busValcustFiling); } + + public ResultBean getToDoNum(BusToDoNumQuery appToDoNumQuery) { + ResultBean rb = ResultBean.fireFail(); + String userSid = appToDoNumQuery.getUserSid(); + String orgPath = appToDoNumQuery.getOrgPath(); + int count = baseMapper.getToDoNum(orgPath, userSid); + return rb.success().setData(String.valueOf(count)); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 14b48565a0..cfde0de6e4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -2484,7 +2484,7 @@ public class FinCollectionConfirmationService extends MybatisBaseServiceactivation 1.1.1 + + com.yxt.anrui + anrui-buscenter-api + 0.0.1-SNAPSHOT + compile + diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java index d1380c5bd4..d6bba6d94f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java @@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.anrui.portal" }) @EnableDiscoveryClient -@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.terminal", "com.yxt.anrui.base", "com.yxt.anrui.scm", "com.yxt.anrui.fin"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.terminal", "com.yxt.anrui.base", "com.yxt.anrui.scm", "com.yxt.anrui.fin", "com.yxt.anrui.buscenter"}) public class PortalApplication { public static void main(String[] args) { diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java index f7ac01a842..f030ef57e1 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java @@ -49,7 +49,9 @@ public class AppIndexEnum { PK("608e72d3-9f34-4b44-85c4-d6be41de8f76", "盘库"), XJ("ae160247-195e-4f2c-a167-ae50a2e50c81", "巡检"), SC("92659535-38f6-4456-a45a-ab5e9ced3fac", "收车"), - HTSH("f4d75ebc-cbab-4c44-bf93-2d38f70c1c15", "合同审核"); + HTSH("f4d75ebc-cbab-4c44-bf93-2d38f70c1c15", "合同审核"), + JZKHBA("6a80aa48-c988-4880-b0a0-f2a406d8cad5", "价值客户备案"), + ; /** * code值 diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java index e82326a3e5..e5d211fe4b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java @@ -5,6 +5,8 @@ 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.buscenter.api.busvalcustfiling.BusToDoNumQuery; +import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingFeign; import com.yxt.anrui.portal.api.index.AppIndexNewListVo; import com.yxt.anrui.portal.api.index.AppIndexNewVo; import com.yxt.anrui.portal.api.index.AppIndexNumQuery; @@ -60,6 +62,8 @@ public class AppIndexService { @Autowired private CommonContractFeign commonContractFeign; + @Autowired + private BusValcustFilingFeign busValcustFilingFeign; public ResultBean> getBusinessList(String userSid, String appSid, String orgPath) { ResultBean> rb = ResultBean.fireFail(); @@ -120,7 +124,9 @@ public class AppIndexService { appToDoNumQuery.setUserSid(userSid); appToDoNumQuery.setOrgPath(orgPath); CommonToDoNumQuery commonToDoNumQuery = new CommonToDoNumQuery(); + BusToDoNumQuery busToDoNumQuery = new BusToDoNumQuery(); BeanUtil.copyProperties(appToDoNumQuery, commonToDoNumQuery); + BeanUtil.copyProperties(appToDoNumQuery, busToDoNumQuery); //根据appSid查询菜单的信息 List sysMobileMenus = sysMobileMenuService.getMenu(appSid); List list = new ArrayList<>(); @@ -170,6 +176,11 @@ public class AppIndexService { String num = commonContractFeign.getToDoNum(commonToDoNumQuery).getData(); appIndexNumVo.setNum(num); } + //价值客户 + if (AppIndexEnum.AppMenu.JZKHBA.getRemarks().equals(menu.getTitle())) { + String num = busValcustFilingFeign.getToDoNum(busToDoNumQuery).getData(); + appIndexNumVo.setNum(num); + } list.add(appIndexNumVo); }