修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -66,6 +66,7 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessageFlowVo;
 import com.yxt.messagecenter.api.message.MessageFlowableQuery;
+import com.yxt.messagecenter.api.message.MessageFlowableQueryForCC;
 import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import com.yxt.messagecenter.api.messagetype.MessageTypeFeign;
 import org.apache.commons.lang3.StringUtils;
@@ -978,13 +979,35 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         String modelId = busVehicleApply.getProcDefId();
         //移动端的参数
         String taskId = busVehicleApply.getTaskId();
+        Map<String, Object> appMap = new HashMap<>();
         ResultBean<Map<String,Object>> resultBean = flowableFeign.selectFlowVaributes(taskId);
         if(!resultBean.getData().isEmpty()){
-            Map<String,Object> appMap =  (Map<String, Object>)resultBean.getData().get("app");
+            appMap =  (Map<String, Object>)resultBean.getData().get("app");
         }
         log.info("分享方法-resultBean:{}", JSONObject.toJSONString(resultBean));
-
-        //
-        return null;
+        ShareUserQuery shareUserQuery1 = new ShareUserQuery();
+        shareUserQuery1.setMemberSids(memberSidList);
+        shareUserQuery1.setOrgSids(orgSidList);
+        ResultBean<List<String>> shareResultBean = sysUserFeign.shareSelectUser(shareUserQuery1);
+        StringBuilder userSids = new StringBuilder();
+        shareResultBean.getData().forEach(f->{
+            userSids.append(f).append(",");
+        });
+        userSids.deleteCharAt(userSids.length() - 1);
+        MessageFlowableQueryForCC mfq = new MessageFlowableQueryForCC();
+        /*MessageFlowVo messageFlowVo = new MessageFlowVo();
+        BeanUtil.copyProperties(uff, messageFlowVo);
+        mfq.setUfVo(messageFlowVo);*/
+        mfq.setAppMap(appMap);
+        mfq.setBusinessSid(busVehicleApply.getSid());
+        mfq.setMsgContent("分享的流程审批，请查看");
+
+        ResultBean<String> stringResultBean = messageFeign.pushMessageCC(mfq);
+        log.info("分享成功-resultBean:{}", resultBean);
+        if (!resultBean.getSuccess()) {
+            log.info("分享失败，同送消息异常！:{}", JSONObject.toJSONString(stringResultBean));
+            return rb.setMsg("分享失败，同送消息异常！");
+        }
+        return rb.success().setMsg("分享成功！");
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.busmaindeposit;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -87,7 +88,10 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.portal.api.sysuser.*;
+import com.yxt.anrui.portal.api.sysuser.SysUser;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign;
 import com.yxt.anrui.portal.config.DictCommonType;
@@ -103,6 +107,8 @@ import com.yxt.messagecenter.api.message.MessageFlowVo;
 import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tomcat.util.threads.ThreadPoolExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -130,7 +136,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapper, BusMainDeposit> {
-
+    Logger log = LoggerFactory.getLogger(BusMainDepositService.class);
     @Autowired
     private SysUserFeign sysUserFeign;
 
@@ -2122,6 +2128,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         bv.setFormVariables(variables);
         if (bv.getTaskId().equals(busMainDeposit.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            log.info("流程返回：{}", JSONObject.toJSONString(resultBean));
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java

@@ -11,7 +11,7 @@ import java.util.Map;
 @Component
 public class FlowableFallback implements FlowableFeign {
     @Override
-    public ResultBean cc(Map<String,Object> map) {
+    public ResultBean cc(Map<String,Object> map,String taskDefKey) {
         return null;
     }
 

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java

@@ -25,7 +25,7 @@ public interface FlowableFeign {
      * @return
      */
     @PostMapping("/cc")
-    public ResultBean cc(@RequestBody Map<String,Object> map);
+    public ResultBean cc(@RequestBody Map<String,Object> map,@RequestParam("taskDefKey") String taskDefKey);
     /**
      * 业务系统发起流程申请
      *

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -109,7 +109,7 @@ public class FlowableRest implements FlowableFeign {
      * @return
      */
     @Override
-    public ResultBean cc(Map<String, Object> map) {
+    public ResultBean cc(Map<String, Object> map,String taskDefKey) {
         ResultBean rb = ResultBean.fireFail();
         log.info("FlowableRest-cc:{}", JSONObject.toJSONString(map));
         Object bv1 = map.get("bv");
@@ -118,6 +118,7 @@ public class FlowableRest implements FlowableFeign {
         Object uff1 = map.get("uff");
         UpdateFlowFieldVo uff = new UpdateFlowFieldVo();
         BeanUtil.copyProperties(uff1, uff);
+        uff.setTaskDefKey(taskDefKey);
 
         //流程定义的id
         String modelId = bv.getModelId();
@@ -313,8 +314,10 @@ public class FlowableRest implements FlowableFeign {
     public ResultBean<UpdateFlowFieldVo> handleProsess(BusinessVariables dto) {
         ResultBean<UpdateFlowFieldVo> rb = ResultBean.fireFail();
         ResultBean<UpdateFlowFieldVo> updateFlowFieldVoResultBean = handleProsess(dto, true);
+        log.info("流程返回：{}",JSONObject.toJSONString(updateFlowFieldVoResultBean));
         //需要判断办结后再执行 TODO
         if (updateFlowFieldVoResultBean.getSuccess()) {
+            log.info("流程返回：{}",JSONObject.toJSONString(updateFlowFieldVoResultBean));
            if ("Event_end".equals(updateFlowFieldVoResultBean.getData().getTaskDefKey())) {
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@@ -327,9 +330,8 @@ public class FlowableRest implements FlowableFeign {
                         HashMap<String, Object> map = new HashMap<>();
                         map.put("bv", dto);
                         UpdateFlowFieldVo ufVo = updateFlowFieldVoResultBean.getData();
-                        ufVo.setTaskDefKey(dto.getTaskDefKey());
                         map.put("uff", ufVo);
-                        cc(map);
+                        cc(map,dto.getTaskDefKey());
                     });
                 } catch (Exception e) {
                     e.printStackTrace();

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java

@@ -122,6 +122,11 @@ public interface SysStaffinfoFeign {
     @PostMapping("/searchAppContactsList")
     public ResultBean<PagerVo<SysStaffinfoAppContactsSearchVo>> searchAppContactsList(@RequestBody PagerQuery<SysStaffinfoQuery> pq);
 
+    @ApiOperation("App通讯录搜索2")
+    @ResponseBody
+    @PostMapping("/searchAppContactsList2")
+    public ResultBean<PagerVo<SysStaffinfoAppContactsSearchVo>> searchAppContactsList2(@RequestBody PagerQuery<SysStaffinfoQuery> pq);
+
     @ApiOperation("销售订单-内部推荐人下拉框")
     @ResponseBody
     @GetMapping("/selectStaffList")

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java

@@ -78,6 +78,11 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         return ResultBean.fireFail().setMsg("接口anrui_portal/searchAppContactsList无法访问");
     }
 
+    @Override
+    public ResultBean<PagerVo<SysStaffinfoAppContactsSearchVo>> searchAppContactsList2(PagerQuery<SysStaffinfoQuery> pq) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<PcSysStaffVo>> selectStaffList(PcSysStaffQuery pcSysStaffQuery) {
         return null;

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java

@@ -188,6 +188,16 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         return new ResultBean<PagerVo<SysStaffinfoAppContactsSearchVo>>().success().setData(pv_result);
     }
 
+    @Override
+    public ResultBean<PagerVo<SysStaffinfoAppContactsSearchVo>> searchAppContactsList2(PagerQuery<SysStaffinfoQuery> pq) {
+        PagerVo<SysStaffinfoAppContactsSearchVo> page1 = new PagerVo<>();
+        IPage<SysStaffinfoAppContactsSearchVo> iPage = sysStaffinfoService.searchAppContactsList2(pq);
+        //把Ipage转换为PageVo
+        PagerVo<SysStaffinfoAppContactsSearchVo> pv_result = PagerUtil.pageToVo(iPage, page1);
+        pv_result.setMsg("找到 " + pv_result.getTotal() + " 个联系人 ");
+        return new ResultBean<PagerVo<SysStaffinfoAppContactsSearchVo>>().success().setData(pv_result);
+    }
+
     @Override
     public ResultBean<List<PcSysStaffVo>> selectStaffList(PcSysStaffQuery pcSysStaffQuery) {
         return sysStaffinfoService.selectStaffList(pcSysStaffQuery);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -119,12 +119,61 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
             if (StringUtils.isNotBlank(vo.getHeadImage())) {
                 vo.setHeadImage(fileUploadComponent.getUrlPrefix() + vo.getHeadImage());
             }
+            List<String> stringList = sysUserService.getPost(vo.getSid());
+            stringList.removeAll(Collections.singleton(null));
+            if (!stringList.isEmpty()) {
+                vo.setPosition(String.join("|", stringList));
+            }
         });
         map.put("list", list);
         map.put("info", "找到 " + iPage.getRecords().size() + " 个联系人 ");
         return iPage;
     }
 
+    public IPage<SysStaffinfoAppContactsSearchVo> searchAppContactsList2(PagerQuery<SysStaffinfoQuery> pagerQuery) {
+        String names = pagerQuery.getParams().getName();
+        Map<String, Object> map = new HashMap<>();
+        List<String> paramList = new ArrayList<>();
+        String chnStr = ""; // 中文查询字符串
+        String mobileStr = ""; // 中文查询字符串
+        if (StringUtils.isNotBlank(names)) {
+            if (names.matches("^\\d*$")) { // 数字
+                mobileStr = names;
+            } else {
+                String[] namesArray = names.split("");
+                for (int i = 0; i < namesArray.length; i++) {
+                    if (StringUtils.isNotBlank(namesArray[i])) {
+                        if (namesArray[i].matches("^[\u4e00-\u9fa5]+$")) { // 中文
+                            chnStr = chnStr + namesArray[i];
+                        }
+                        String pinYinName = PinYinUtils.getPinYinName(namesArray[i]);
+                        if (pinYinName.equals("_") || pinYinName.equals("%")) {
+                            pinYinName = "\\" + pinYinName;
+                        }
+                        paramList.add(pinYinName);
+                    }
+                }
+            }
+        }
+        IPage<SysStaffinfoQuery> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<SysStaffinfoAppContactsSearchVo> iPage = baseMapper.searchAppContactsPageList(page, paramList, chnStr, mobileStr);
+        List<SysStaffinfoAppContactsSearchVo> list = iPage.getRecords();
+        list.stream().forEach(vo -> {
+            if (StringUtils.isNotBlank(vo.getHeadImage())) {
+                vo.setHeadImage(fileUploadComponent.getUrlPrefix() + vo.getHeadImage());
+            }
+            List<String> stringList = sysUserService.getPost(vo.getSid());
+            stringList.removeAll(Collections.singleton(null));
+            if (!stringList.isEmpty()) {
+                vo.setPosition(String.join("|", stringList));
+            }
+        });
+        map.put("list", list);
+        map.put("info", "找到 " + iPage.getRecords().size() + " 个联系人 ");
+        return iPage;
+    }
+
+
     public AppContactsDetailsVo selectAppContactsVO(String staffSid) {
         return baseMapper.selectAppContactsVO(staffSid);
     }