修改bug

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/InformationQueryVO1.java

@@ -0,0 +1,16 @@
+package org.springblade.system.user.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("u_information_query")
+public class InformationQueryVO1 {
+    @TableField("id")
+    private String id;
+    @TableField("name")
+    private String name;
+    @TableField("pdf_url")
+    private String pdfUrl;
+}

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/WbsTreeController.java

@@ -18,6 +18,7 @@ import org.springblade.manager.vo.PrivateTreeVO;
 import org.springblade.manager.vo.PrivateTreeVO2;
 import org.springblade.manager.vo.WbsTreeContractLazyVO;
 import org.springblade.system.user.service.IUserService;
+import org.springblade.system.user.vo.InformationQueryVO1;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.web.bind.annotation.*;
@@ -130,6 +131,17 @@ public class WbsTreeController extends BladeController {
         return R.data(iUserService.queryContractWbsTreeByFirstInfo(parentId, contractId, contractIdRelation));
     }
 
+
+    @GetMapping("/informationWriteQuery/queryInformationByContractIdAndName")
+    @ApiOperation("根据合同段Id，模糊文件名查询")
+    @ApiImplicitParams(value = {
+        @ApiImplicitParam(name = "contractId",value = "合同段Id"),
+        @ApiImplicitParam(name="name",value = "文件名")
+    })
+    public R<List<InformationQueryVO1>> queryInformationByContractIdAndName(@RequestParam String contractId, @RequestParam(required = false) String name){
+        return R.data(iUserService.queryInformationByContractIdAndName(contractId,name));
+    }
+
 //    /**
 //     * 项目全加载树
 //     *

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java

@@ -25,6 +25,7 @@ import org.springblade.business.vo.InformationQueryVO;
 import org.springblade.manager.vo.PrivateTreeVO2;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.excel.UserExcel;
+import org.springblade.system.user.vo.InformationQueryVO1;
 import org.springblade.system.user.vo.UserContractInfoVO;
 import org.springblade.system.user.vo.UserVO;
 
@@ -76,4 +77,6 @@ public interface UserMapper extends BaseMapper<User> {
     List<InformationQuery> selectInformationQueryPageTwo(@Param("query") InformationQueryVO vo);
 
     List<PrivateTreeVO2> getAllNode(@Param("projectId") String projectId);
+
+    List<InformationQueryVO1> queryInformationByContractIdAndName(@Param("contractId")String contractId, @Param("name")String name);
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -231,4 +231,12 @@
         ORDER BY sort
     </select>
 
+    <select id="queryInformationByContractIdAndName"
+            resultType="org.springblade.system.user.vo.InformationQueryVO1">
+    SELECT id,name,pdf_url FROM u_information_query where contract_id=#{contractId} AND status=2
+        <if test="name!=null and name!=''">
+        AND name  LIKE CONCAT('%', #{name}, '%')
+        </if>
+    </select>
+
 </mapper>

blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java

@@ -16,6 +16,7 @@ import org.springblade.system.user.entity.UserInfo;
 import org.springblade.system.user.entity.UserOauth;
 import org.springblade.system.user.enums.UserEnum;
 import org.springblade.system.user.excel.UserExcel;
+import org.springblade.system.user.vo.InformationQueryVO1;
 import org.springblade.system.user.vo.UserVO;
 
 import java.util.List;
@@ -242,4 +243,5 @@ public interface IUserService extends BaseService<User> {
     List<PrivateTreeVO2> treePrivate2(String projectId);
 
 
+    List<InformationQueryVO1> queryInformationByContractIdAndName(String contractId, String name);
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -63,6 +63,7 @@ import org.springblade.system.user.service.IUserOauthService;
 import org.springblade.system.user.service.IUserService;
 import org.springblade.system.user.util.FileUtils;
 import org.springblade.system.user.util.ForestNodeMerger;
+import org.springblade.system.user.vo.InformationQueryVO1;
 import org.springblade.system.user.vo.UserVO;
 import org.springblade.system.user.wrapper.UserWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1172,6 +1173,21 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         return vo2;
     }
 
+    @Override
+    public List<InformationQueryVO1> queryInformationByContractIdAndName(String contractId, String name) {
+        if (StringUtil.isEmpty(contractId)) {
+            throw new ServiceException("未获取到合同段id");
+        }
+        ContractInfo contract = jdbcTemplate.query("SELECT * FROM m_contract_info WHERE id = " + contractId, new BeanPropertyRowMapper<>(ContractInfo.class)).stream().findAny().orElse(null);
+        if (ObjectUtil.isEmpty(contract)) {
+            throw new ServiceException("获取合同段信息失败");
+        }
+        if(!contract.getPId().equals("1792760669353865218")){
+            throw new ServiceException("请输入正确的合同段id");
+        }
+
+        return baseMapper.queryInformationByContractIdAndName(contractId,name);
+    }
 
 
     private List<PrivateTreeVO> buildTree(List<WbsTreePrivate> wbsTreePrivatesNodes, String projectId) {