优化

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

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<BusValcustFiling> selectByContractNoAndVinNo(@RequestParam("contractNo") String contractNo,@RequestParam("vinNo") String vinNo);
+
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum")
+    @ResponseBody
+    public ResultBean<String> getToDoNum(@SpringQueryMap BusToDoNumQuery appToDoNumQuery);
 }

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

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<BusValcustFiling> {
     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);
 }

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}
     </update>
+
+    <select id="getToDoNum" resultType="int">
+        SELECT count(*)
+        FROM bus_valcust_filing
+        WHERE createBySid = #{userSid}
+          and orgSidPath = #{orgPath}
+          and nodeState = '待提交'
+    </select>
 </mapper>

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(价值客户备案申请) <br/>
@@ -144,4 +139,9 @@ public class BusValcustFilingRest implements BusValcustFilingFeign {
 	public ResultBean<BusValcustFiling> selectByContractNoAndVinNo(String contractNo, String vinNo) {
 		return busValcustFilingService.selectByContractNoAndVinNo(contractNo,vinNo);
 	}
+
+	@Override
+	public ResultBean<String> getToDoNum(BusToDoNumQuery appToDoNumQuery) {
+		return busValcustFilingService.getToDoNum(appToDoNumQuery);
+	}
 }

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<BusValcustFiling
     private BusBillVehicleService busBillVehicleService;
     @Autowired
     private BusBillTrailerService busBillTrailerService;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
     public PagerVo<BusValcustFilingVo> listPageVo(PagerQuery<BusValcustFilingQuery> pq) {
         BusValcustFilingQuery query = pq.getParams();
@@ -271,10 +269,10 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
             return rb.success().setData(sid);
         }
         String isGdk = dto.getIsGdk();
-        if ("0".equals(isGdk)){//高开
+        if ("0".equals(isGdk)) {//高开
-            baseMapper.updateGkBySid(dto.getYsMoney(),dto.getSsMoney(),dto.getRemarks(),dtoSid);
+            baseMapper.updateGkBySid(dto.getYsMoney(), dto.getSsMoney(), dto.getRemarks(), dtoSid);
-        }else {
+        } else {
-            baseMapper.updateDkBySid(dto.getRemarks(),dtoSid);
+            baseMapper.updateDkBySid(dto.getRemarks(), dtoSid);
         }
         busFileService.delByLinkSid(dtoSid);
         for (String fjImage : fjImages) {
@@ -312,6 +310,13 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
         BusValcustFiling entity = fetchBySid(sid);
         BusValcustFilingDetailsVo vo = new BusValcustFilingDetailsVo();
         BeanUtil.copyProperties(entity, vo);
+        String vinNo = vo.getVinNo();
+        String[] vinNos = vinNo.split(",");
+        String shortVinNo = "";
+        for (String no : vinNos) {
+            shortVinNo = shortVinNo + no.substring(no.length() - 8) + ",";
+        }
+        vo.setVinNo(shortVinNo.substring(0, shortVinNo.lastIndexOf(",")));
         List<BusFileDto> busFileDtos = busFileService.getPathByLinkSid(sid);
         List<String> fjImages = new ArrayList<>();
         for (BusFileDto busFileDto : busFileDtos) {
@@ -350,7 +355,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
         bv.setUserSid(busValcustFiling.getCreateBySid());
         //若app移动端有此功能，则传递appMap参数
         Map<String, Object> 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<BusValcustFiling
         BusValcustFiling busValcustFiling = fetchBySid(businessSid);
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> 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<BusValcustFiling
                         finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
                     }
                 } else {
-                    if ("1".equals(busValcustFiling.getBusSource())){
+                    if ("1".equals(busValcustFiling.getBusSource())) {
                         BusBillApplication busBillApplication = busBillApplicationService.fetchBySid(busValcustFiling.getBusSid());
                         List<BusBillVehicleVo> busBillVehicleVos = busBillVehicleService.fetchVehBySid(busBillApplication.getSid());
                         List<BusBillTrailerVo> busBillTrailerVos = busBillTrailerService.fetchByMainSid(busBillApplication.getSid());
@@ -508,10 +513,10 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                                 finVehicleInvoiceDto.setInvoicingName(busBillVehicleVo.getOpenTickName());
                                 finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid());
                                 BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyService.selComByVehSid(busBillVehicleVo.getVehSid()).getData();
-                                if (busArrearsCarryVehicleApplyVo == null){
+                                if (busArrearsCarryVehicleApplyVo == null) {
                                     finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey());
                                     finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue());
-                                }else {
+                                } else {
                                     finVehicleInvoiceDto.setBusinessStateKey("005");
                                     finVehicleInvoiceDto.setBusinessState("欠款提车");
                                 }
@@ -575,7 +580,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                                 }
                             }
                         }
-                    }else {
+                    } else {
                         FinBillApplication finBillApplication = finBillApplicationFeign.fetchBySid(busValcustFiling.getBusSid()).getData();
                         List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleFeign.fetchVehBySid(busValcustFiling.getBusSid()).getData();
                         List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerFeign.fetchByMainSid(busValcustFiling.getBusSid()).getData();
@@ -733,7 +738,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                 BeanUtil.copyProperties(query, flowTaskVo);
                 Map<String, Object> variables = new HashMap<>();
                 Map<String, Object> appMap = new HashMap<>();
-                appMap.put("sid",businessSid);
+                appMap.put("sid", businessSid);
                 variables.put("app", appMap);
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
@@ -838,7 +843,15 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
 
     public ResultBean<BusValcustFiling> 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<String> 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));
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -2484,7 +2484,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             }
             //项目类别key、value
             arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
-            arReceivebill.setF_PAEZ_AssistantKey("006");
+            arReceivebill.setF_PAEZ_AssistantKey("061");
             arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
             if (one) {
                 arReceivebill.setFBillNo(confirmation.getBillNo());
@@ -2699,7 +2699,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             uncollSid = vvvv.getReceivablesSid();
             //项目类别key、value
             arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
-            arReceivebill.setF_PAEZ_AssistantKey("006");
+            arReceivebill.setF_PAEZ_AssistantKey("061");
             arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
             if (one) {
                 arReceivebill.setFBillNo(confirmation.getBillNo());

anrui-portal/anrui-portal-biz/pom.xml

@@ -136,6 +136,12 @@
             <artifactId>activation</artifactId>
             <version>1.1.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.yxt.anrui</groupId>
+            <artifactId>anrui-buscenter-api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
 
     </dependencies>

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) {

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值

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<List<AppIndexNewVo>> getBusinessList(String userSid, String appSid, String orgPath) {
         ResultBean<List<AppIndexNewVo>> 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<SysMobileMenu> sysMobileMenus = sysMobileMenuService.getMenu(appSid);
         List<AppIndexNumVo> 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);
             }