修改bug

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/controller/NuConfigSuppliersApplyController.java

@@ -123,7 +123,7 @@ public class NuConfigSuppliersApplyController extends JeecgController<NuConfigSu
 			configSuppliersInfo.setId(nuConfigSuppliersApply.getSuppliersId());
 			configSuppliersInfoService.save(configSuppliersInfo);
 		}
-		return Result.OK("编辑成功!");
+		return Result.OK("审核成功!");
 	}
 
 	/**

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderSub.java

@@ -1,6 +1,7 @@
 package com.nu.modules.biz.order.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -152,4 +153,9 @@ public class DirectiveOrderSub implements Serializable {
     /**实际执行人名称（多个）； 主要执行人+协助人*/
     private String optNames;
 
+    @TableField(exist = false)
+    private String immediateFile;
+    @TableField(exist = false)
+    private String immediateFileFous;
+
 }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderSubMapper.java

@@ -1,6 +1,8 @@
 package com.nu.modules.biz.order.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.nu.modules.biz.order.entity.DirectiveOrder;
 import com.nu.modules.biz.order.entity.DirectiveOrderSub;
 import org.apache.ibatis.annotations.Param;
@@ -16,4 +18,6 @@ import java.util.List;
 public interface DirectiveOrderSubMapper extends BaseMapper<DirectiveOrderSub> {
     List<DirectiveOrderSub> getDirectiveList(@Param("directiveId") String directiveId);
     List<DirectiveOrderSub> getSubDirectiveList(@Param("packageId") String packageId);
+
+    List<DirectiveOrderSub> queryOrderInfoList(@Param(Constants.WRAPPER) QueryWrapper<DirectiveOrderSub> queryWrapper);
 }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml

@@ -58,4 +58,10 @@
           and b.iz_enabled = 'Y'
     </select>
 
+
+    <select id="queryOrderInfoList" resultType="com.nu.modules.biz.order.entity.DirectiveOrderSub">
+        select a.*,b.immediate_file,b.immediate_file_focus from nu_biz_nu_directive_order_sub a left join nu_config_service_directive b on a.directive_id = b.id
+        ${ew.customSqlSegment}
+    </select>
+
 </mapper>

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java

@@ -108,7 +108,7 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
         DirectiveOrderSub directiveOrderSub = new DirectiveOrderSub();
         BeanUtils.copyProperties(directiveOrderSubEntity, directiveOrderSub);
         QueryWrapper<DirectiveOrderSub> queryWrapper = QueryGenerator.initQueryWrapper(directiveOrderSub, req.getParameterMap());
-        List<DirectiveOrderSub> list = directiveOrderSubMapper.selectList(queryWrapper);
+        List<DirectiveOrderSub> list = directiveOrderSubMapper.queryOrderInfoList(queryWrapper);
         List<DirectiveOrderSubEntity> list1 = new ArrayList<>();
         list1 = BeanUtil.copyToList(list, DirectiveOrderSubEntity.class);
         return list1;