增加装备类型配置搜索

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/service/impl/ApprovalEngineServiceImpl.java

@@ -242,18 +242,15 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
      */
     private AjaxResult handlePass(ApprovalInstance instance, ApprovalNode currentNode) {
         // 查询下一个节点
-        ApprovalNode nextNode = nodeMapper.selectNodeByOrder(
+        ApprovalNode nextNode = nodeMapper.selectNodeByOrder(instance.getProcessId(), currentNode.getNodeOrder() + 1);
-                instance.getProcessId(), currentNode.getNodeOrder() + 1);
 
         if (nextNode == null) {
             // 没有下一个节点，审批流程结束
             instanceMapper.updateInstanceStatus(instance.getId(), ApprovalStatusEnum.APPROVED.getCode());
-
             log.info("审批实例[{}]审批通过", instance.getInstanceCode());
 
             // 执行通过回调
             executeCallback(instance, ApprovalStatusEnum.APPROVED.getCode());
-
             return AjaxResult.success("审批通过，流程结束");
         } else {
             // 流转到下一个节点

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/domain/EquipmentTypeQuery.java

@@ -16,6 +16,7 @@ import lombok.Data;
  */
 @Data
 public class EquipmentTypeQuery {
+    private String deviceName;
     private Long parentId;
     private String typeName;
     private String status;

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentTypeMapper.xml

@@ -21,6 +21,9 @@
         SELECT <include refid="Base_Column_List" />
         FROM ma_type
         <where>
+            <if test="deviceName != null and deviceName != '' ">
+                AND type_name LIKE CONCAT('%', #{deviceName}, '%')
+            </if>
             <if test="parentId != null">
                 AND parent_id = #{parentId}
             </if>
@@ -39,6 +42,9 @@
         SELECT COUNT(*)
         FROM ma_type
         <where>
+            <if test="deviceName != null and deviceName != '' ">
+                AND type_name LIKE CONCAT('%', #{deviceName}, '%')
+            </if>
             <if test="parentId != null">
                 AND parent_id = #{parentId}
             </if>