Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -8572,8 +8572,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String customerSid = busSalesOrder.getCustomerSid();
         LoanPreloanCreditApply loanPreloanCreditApply = busSalesOrderBorrowerService.selectLoanApply(customerSid);
         if (loanPreloanCreditApply != null) {
-            if ((!"001".equals(loanPreloanCreditApply.getZffkjgKey()) && !"003".equals(loanPreloanCreditApply.getZffkjgKey())) || !"通过".equals(loanPreloanCreditApply.getSsjg())) {
+           /* if ((!"001".equals(loanPreloanCreditApply.getZffkjgKey()) && !"003".equals(loanPreloanCreditApply.getZffkjgKey())) || !"通过".equals(loanPreloanCreditApply.getSsjg())) {
                 return rb.setMsg("该客户资方审核未通过或未审核，请处理后再操作");
+            }*/
+            if("002".equals(loanPreloanCreditApply.getZffkjgKey())){
+                if(!"通过".equals(loanPreloanCreditApply.getSsjg())){
+                    return rb.setMsg("该客户资方审核未通过或未审核，请处理后再操作");
+                }
             }
         }
         busSalesOrderBorrower = new BusSalesOrderBorrower();

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java

@@ -69,6 +69,8 @@ public class FinPaymentapply extends BaseEntity {
     private String costRangeValue;
     @ApiModelProperty("是否事业部领导审批，1是0否")
     private String isLeaderSp;
+    @ApiModelProperty("是否事业部总经理审批，1是0否")
+    private String isManageSp;
     @ApiModelProperty("是否已销售，1是0否")
     private String isSales;
     @ApiModelProperty("款项是否已交清，1是0否")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java

@@ -28,11 +28,8 @@ package com.yxt.anrui.fin.api.finpaymentapply;
 
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
 import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo;
-import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto;
 import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
-import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
 import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
-import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -112,6 +109,8 @@ public class FinPaymentapplyDetailsVo implements Vo {
     private String costRangeValue;
     @ApiModelProperty("是否事业部领导审批，1是0否")
     private String isLeaderSp;
+    @ApiModelProperty("是否事业部总经理审批，1是0否")
+    private String isManageSp;
     @ApiModelProperty("是否已销售，1是0否")
     private String isSales;
     @ApiModelProperty("款项是否已交清，1是0否")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java

@@ -113,6 +113,8 @@ public class FinPaymentapplyDto implements Dto {
     private String costRangeValue;
     @ApiModelProperty("是否事业部领导审批，1是0否")
     private String isLeaderSp;
+    @ApiModelProperty("是否事业部总经理审批，1是0否")
+    private String isManageSp;
     @ApiModelProperty("是否已销售，1是0否")
     private String isSales;
     @ApiModelProperty("款项是否已交清，1是0否")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -458,18 +458,23 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         variables.put("app", appMap);
         //网关
         finPaymentapply = fetchBySid(businessSid);
-        if ("1".equals(finPaymentapply.getIsVeh())) {
-            if ("1".equals(finPaymentapply.getIsSettle())) {
-                variables.put("isAdj", false);
-            } else {
-                variables.put("isAdj", true);
-            }
-        } else if ("0".equals(finPaymentapply.getIsVeh())) {
-            if ("1".equals(finPaymentapply.getIsLeaderSp())) {
+        if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
+            if (finPaymentapply.getIsLeaderSp().equals("1")) {
                 variables.put("isAdj", true);
             } else {
                 variables.put("isAdj", false);
             }
+        } else {
+            variables.put("isAdj", false);
+        }
+        if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
+            if (finPaymentapply.getIsManageSp().equals("1")) {
+                variables.put("isManageSp", true);
+            } else {
+                variables.put("isManageSp", false);
+            }
+        } else {
+            variables.put("isManageSp", false);
         }
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
@@ -607,25 +612,30 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         FinPaymentapply finPaymentapply = fetchBySid(bv.getBusinessSid());
         bv.setModelId(finPaymentapply.getProcDefId());
         if (bv.getTaskId().equals(finPaymentapply.getTaskId())) {
-            Map<String, Object> vaributes = new HashMap<>();
+            Map<String, Object> variables = new HashMap<>();
             //网关
-            if ("1".equals(finPaymentapply.getIsVeh())) {
-                if ("1".equals(finPaymentapply.getIsSettle())) {
-                    vaributes.put("isAdj", false);
+            if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
+                if (finPaymentapply.getIsLeaderSp().equals("1")) {
+                    variables.put("isAdj", true);
                 } else {
-                    vaributes.put("isAdj", true);
+                    variables.put("isAdj", false);
                 }
-            } else if ("0".equals(finPaymentapply.getIsVeh())) {
-                if ("1".equals(finPaymentapply.getIsLeaderSp())) {
-                    vaributes.put("isAdj", true);
+            } else {
+                variables.put("isAdj", false);
+            }
+            if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
+                if (finPaymentapply.getIsManageSp().equals("1")) {
+                    variables.put("isManageSp", true);
                 } else {
-                    vaributes.put("isAdj", false);
+                    variables.put("isManageSp", false);
                 }
+            } else {
+                variables.put("isManageSp", false);
             }
             Map<String, Object> appMap = new HashMap<>();
             appMap.put("sid", bv.getBusinessSid());
-            vaributes.put("app", appMap);
-            bv.setFormVariables(vaributes);
+            variables.put("app", appMap);
+            bv.setFormVariables(variables);
             bv.setOrgSidPath(finPaymentapply.getOrgSidPath());
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -775,18 +785,23 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         //查询业务信息
         FinPaymentapply finPaymentapply = fetchBySid(query.getBusinessSid());
         //网关
-        if ("1".equals(finPaymentapply.getIsVeh())) {
-            if ("1".equals(finPaymentapply.getIsSettle())) {
-                variables.put("isAdj", false);
-            } else {
-                variables.put("isAdj", true);
-            }
-        } else if ("0".equals(finPaymentapply.getIsVeh())) {
-            if ("1".equals(finPaymentapply.getIsLeaderSp())) {
+        if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
+            if (finPaymentapply.getIsLeaderSp().equals("1")) {
                 variables.put("isAdj", true);
             } else {
                 variables.put("isAdj", false);
             }
+        } else {
+            variables.put("isAdj", false);
+        }
+        if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
+            if (finPaymentapply.getIsManageSp().equals("1")) {
+                variables.put("isManageSp", true);
+            } else {
+                variables.put("isManageSp", false);
+            }
+        } else {
+            variables.put("isManageSp", false);
         }
         bv.setModelId(finPaymentapply.getProcDefId());
         bv.setFormVariables(variables);
@@ -812,18 +827,23 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         //查询业务信息
         FinPaymentapply finPaymentapply = fetchBySid(query.getBusinessSid());
         //网关
-        if ("1".equals(finPaymentapply.getIsVeh())) {
-            if ("1".equals(finPaymentapply.getIsSettle())) {
-                variables.put("isAdj", false);
-            } else {
-                variables.put("isAdj", true);
-            }
-        } else if ("0".equals(finPaymentapply.getIsVeh())) {
-            if ("1".equals(finPaymentapply.getIsLeaderSp())) {
+        if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
+            if (finPaymentapply.getIsLeaderSp().equals("1")) {
                 variables.put("isAdj", true);
             } else {
                 variables.put("isAdj", false);
             }
+        } else {
+            variables.put("isAdj", false);
+        }
+        if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
+            if (finPaymentapply.getIsManageSp().equals("1")) {
+                variables.put("isManageSp", true);
+            } else {
+                variables.put("isManageSp", false);
+            }
+        } else {
+            variables.put("isManageSp", false);
         }
         bv.setModelId(finPaymentapply.getProcDefId());
         bv.setFormVariables(variables);
@@ -858,25 +878,30 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 }
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
-                Map<String, Object> vaributes = new HashMap<>();
+                Map<String, Object> variables = new HashMap<>();
                 Map<String, Object> appMap = new HashMap<>();
                 appMap.put("sid", query.getBusinessSid());
-                vaributes.put("app", appMap);
+                variables.put("app", appMap);
                 //网关
-                if ("1".equals(finPaymentapply.getIsVeh())) {
-                    if ("1".equals(finPaymentapply.getIsSettle())) {
-                        vaributes.put("isAdj", false);
+                if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
+                    if (finPaymentapply.getIsLeaderSp().equals("1")) {
+                        variables.put("isAdj", true);
                     } else {
-                        vaributes.put("isAdj", true);
+                        variables.put("isAdj", false);
                     }
-                } else if ("0".equals(finPaymentapply.getIsVeh())) {
-                    if ("1".equals(finPaymentapply.getIsLeaderSp())) {
-                        vaributes.put("isAdj", true);
+                } else {
+                    variables.put("isAdj", false);
+                }
+                if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
+                    if (finPaymentapply.getIsManageSp().equals("1")) {
+                        variables.put("isManageSp", true);
                     } else {
-                        vaributes.put("isAdj", false);
+                        variables.put("isManageSp", false);
                     }
+                } else {
+                    variables.put("isManageSp", false);
                 }
-                flowTaskVo.setValues(vaributes);
+                flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -23,7 +23,7 @@ public enum ProcDefEnum {
     //    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:4087504"),
     FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),
-    FINPAYAPPLY("付款申请", "process_gin2tntb:6:16692504"),
+    FINPAYAPPLY("付款申请", "process_gin2tntb:7:18505004"),
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:5:1742504"),
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java

@@ -292,4 +292,10 @@ public interface SysUserFeign {
     @ApiOperation("获取小程序客户用户信息")
     @GetMapping("/fetchBySidWx/{sid}")
     public ResultBean<SysUser> fetchBySidWx(@PathVariable("sid") String sid);
+
+    @ApiOperation(value = "根据部门sid和角色名查询用户")
+    @PostMapping(value = "/selectByDeptSidAndRoleName")
+    ResultBean<List<DeptUserVo>> selectByDeptSidAndRoleName(@RequestParam("deptSid") String deptSid,
+                                                          @RequestParam("roleNames") List<String> roleNames);
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java

@@ -280,4 +280,9 @@ public class SysUserFeignFallback implements SysUserFeign {
     public ResultBean<SysUser> fetchBySidWx(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<DeptUserVo>> selectByDeptSidAndRoleName(String deptSid, List<String> roleNames) {
+        return null;
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java

@@ -207,4 +207,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<Map<String, String>> getUserByDeptSid(String deptSid);
 
     List<DeptUserVo> getAllPeo(@Param("deptSid") String deptSid,@Param("name") String name);
+
+    List<DeptUserVo> selectByDeptSidAndRoleName(@Param("deptSid")String deptSid, @Param("roleNames")List<String> roleNames);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -489,4 +489,19 @@
             )
         </if>
     </select>
+    <select id="selectByDeptSidAndRoleName" resultType="com.yxt.anrui.portal.api.sysuser.DeptUserVo">
+        SELECT DISTINCT
+            u.sid,
+            st.`name`
+        FROM
+            sys_user as u
+                LEFT JOIN sys_staffinfo as st ON u.staffSid = st.sid
+                LEFT JOIN sys_staff_org as o ON st.sid = o.staffSid
+                LEFT JOIN sys_user_role as ur ON ur.userSid = u.sid
+                LEFT JOIN sys_role as r ON r.sid = ur.roleSid
+        WHERE o.orgSid = #{deptSid} and r.`name` IN
+        <foreach collection="roleNames" item="roleName" separator="," open="(" close=")">
+            #{roleName}
+        </foreach>
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@@ -724,4 +724,9 @@ public class SysUserRest implements SysUserFeign {
     public ResultBean<SysUser> fetchBySidWx(String sid) {
         return sysUserService.fetchBySidWx(sid);
     }
+
+    @Override
+    public ResultBean<List<DeptUserVo>> selectByDeptSidAndRoleName(String deptSid, List<String> roleNames) {
+        return sysUserService.selectByDeptSidAndRoleName(deptSid,roleNames);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -1724,4 +1724,11 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         List<DeptUserVo> allPeo = baseMapper.getAllPeo(deptSid, name);
         return rb.success().setData(allPeo);
     }
+
+    public ResultBean<List<DeptUserVo>> selectByDeptSidAndRoleName(String deptSid, List<String> roleNames) {
+        ResultBean rb = ResultBean.fireFail();
+        List<DeptUserVo> list = baseMapper.selectByDeptSidAndRoleName(deptSid,roleNames);
+        return rb.success().setData(list);
+
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.as.api.asappendix.AsAppendix;
 import com.yxt.anrui.as.api.asbusrepairbill.*;
 import com.yxt.anrui.as.api.asbusrepairbill.app.*;
@@ -52,10 +53,13 @@ import com.yxt.anrui.as.feign.file.AsFileEnum;
 import com.yxt.anrui.as.feign.fin.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
 import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.as.feign.fms.FmsReceivesettleFeign;
+import com.yxt.anrui.as.feign.message.MessageFeign;
+import com.yxt.anrui.as.feign.message.PushMessageQuery;
 import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.as.feign.portal.sysuser.DeptUserVo;
 import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
 import com.yxt.anrui.as.feign.portal.sysuser.SysUserVo;
 import com.yxt.anrui.as.feign.sms.SmsGoods;
@@ -74,6 +78,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -87,6 +92,8 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
 
 /**
  * @description:
@@ -96,6 +103,7 @@ import java.util.*;
 @Service
 public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMapper, AsBusrepairBill> {
 
+
     @Autowired
     private AsBusrepairBillInsuranceRecordService asBusrepairBillInsuranceRecordService;
     @Autowired
@@ -160,7 +168,8 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     private YxtCrmCustomerTempFeign yxtCrmCustomerTempFeign;
     @Autowired
     private WmsInventoryFeign wmsInventoryFeign;
-
+    @Autowired
+    private MessageFeign messageFeign;
     /**
      * 维修领料获取派工单
      *
@@ -1895,12 +1904,13 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                         amount = new BigDecimal(sitemVo.getAmount());
                     }
                     itemPdfVos.add(itemPdfVo);
-                    if (subject.equals("保内")) {
-                        sumMoney1.add(price);
-                    }
-                    if (subject.equals("保外")) {
-                        sumMoney1.add(amount);
-                    }
+//                    if (subject.equals("保内")) {
+//                        sumMoney1.add(price);
+//                    }
+//                    if (subject.equals("保外")) {
+//                        sumMoney1.add(amount);
+//                    }
+                  sumMoney1 = sumMoney1.add(amount);
                 }
                 vo.setItems(itemPdfVos);
             }
@@ -1924,13 +1934,15 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                         amount = new BigDecimal(goodsDetailsVo.getAmount());
                     }
                     goodsPdfVos.add(goodsPdfVo);
-                    if (subject.equals("保内")) {
-                        sumMoney2.add(price);
-                    }
-                    if (subject.equals("保外")) {
-                        sumMoney2.add(amount);
-                    }
+//                    if (subject.equals("保内")) {
+//                        sumMoney2.add(price);
+//                    }
+//                    if (subject.equals("保外")) {
+//                        sumMoney2.add(amount);
+//                    }
+                   sumMoney2 = sumMoney2.add(amount);
                 }
+                vo.setGoods(goodsPdfVos);
             }
             vo.setSumMoney2(sumMoney2.toString());
             String caps2 = bigDecimalToLocalStr(sumMoney2);
@@ -2014,7 +2026,11 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 if (price0) {
                     map.put("price", "0");
                 } else {
-                    map.put("price", itemPdfVo.getPrice());
+                    if (subject.equals("保内")) {
+                        map.put("price", itemPdfVo.getAmount());
+                    } else {
+                        map.put("price", itemPdfVo.getPrice());
+                    }
                 }
                 map.put("discount", itemPdfVo.getDiscount());
                 map.put("discountAmount", itemPdfVo.getDiscountAmount());
@@ -2241,6 +2257,37 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 if (null != detail) {
                     detail.setRepairState(2);
                     baseMapper.updateById(detail);
+                    //维修完毕后推送消息给配件管理员，完成配件出库确认
+                    List<String> role = new ArrayList<>();
+                    role.add("分公司配件主管");
+                    role.add("分公司配件库管员");
+                    List<DeptUserVo> userVos = sysUserFeign.selectByDeptSidAndRoleName(detail.getDeptSid(), role).getData();
+                    if (!userVos.isEmpty()) {
+                        List<String> userSids = userVos.stream().map(DeptUserVo::getSid).collect(Collectors.toList());
+                        try {
+                            ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                                    .setNameFormat("demo-pool-%d").build();
+                            ExecutorService pool = new ThreadPoolExecutor(1, 10,
+                                    1000, TimeUnit.MILLISECONDS,
+                                    new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                            Future future1 = pool.submit(() -> {
+                                PushMessageQuery pushMessageQuery = new PushMessageQuery();
+                                pushMessageQuery.setReceivedSids(userSids);
+                                pushMessageQuery.setModuleName("售后服务");
+                                pushMessageQuery.setMsgContent("维修单号："+ detail.getBillNo() + "已维修完毕，请进行配件出库确认");
+                                pushMessageQuery.setApp_type("2");
+                                pushMessageQuery.setModuleSid("fea6ee02-05cc-11ef-9a84-8032536963eb");
+                                pushMessageQuery.setMsgTitle("配件出库确认提醒");
+                                pushMessageQuery.setBusinessSid(detail.getSid());
+                                // 消息推送
+                                messageFeign.pushNoUriMessage(pushMessageQuery);
+                            });
+
+
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
                 }
             }
         }

yxt-as/src/main/java/com/yxt/anrui/as/feign/message/MessageFeign.java

@@ -23,4 +23,8 @@ public interface MessageFeign {
     @ApiOperation("流程审批推送消息")
     @PostMapping("/pushMessage")
     ResultBean<String> pushMessage(@RequestBody MessageFlowableQuery query);
+
+    @ApiOperation("推送无详情页的消息")
+    @PostMapping("/pushNoUriMessage")
+    ResultBean pushNoUriMessage(@RequestBody PushMessageQuery query);
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/sysuser/DeptUserVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.as.feign.portal.sysuser;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/16
+ **/
+@Data
+public class DeptUserVo {
+
+    private String sid;
+
+    private String name;
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/sysuser/SysUserFeign.java

@@ -6,10 +6,9 @@ import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @Api(tags = "用户表")
 @FeignClient(
@@ -30,4 +29,9 @@ public interface SysUserFeign {
     @PostMapping(value = "/selectPrivilegeLevelPath")
     ResultBean<PrivilegeVo> selectPrivilegeLevelPath(@RequestBody PrivilegeQuery query);
 
+    @ApiOperation(value = "根据部门sid和角色名查询用户")
+    @PostMapping(value = "/selectByDeptSidAndRoleName")
+    ResultBean<List<DeptUserVo>> selectByDeptSidAndRoleName(@RequestParam("deptSid") String deptSid,
+                                                            @RequestParam("roleNames") List<String> roleNames);
+
 }