测站点问题修复

blade-service/blade-business/src/main/java/org/springblade/business/controller/DatumPointController.java

@@ -92,26 +92,27 @@ public class DatumPointController {
     }
 
     @ResponseBody
-    @RequestMapping(value = "/queryData",method=RequestMethod.POST)
-    public R<DatumPointVo> queryData(HttpServletRequest request,String queryName,String contractId ,Integer type){
+    @GetMapping("/queryData")
+    public R<DatumPointVo> queryData(String queryName,String contractId ,Integer type){
         if(StringUtil.isEmpty(queryName)||StringUtil.isEmpty(contractId)||StringUtil.isEmpty(type)){
             return R.fail("缺少参数");
         }
-
        LambdaQueryWrapper<DatumPoint> wrapper = Wrappers.<DatumPoint>lambdaQuery().eq(DatumPoint::getName,queryName).eq(DatumPoint::getContractId,contractId).eq(DatumPoint::getType,type);
         DatumPoint dap = this.service.getOne(wrapper);
         DatumPointVo vo = new DatumPointVo();
-        BeanUtils.copyProperties(dap,vo);
+        if(dap!=null) {
+            BeanUtils.copyProperties(dap, vo);
+        }
         return R.data(vo);
     }
 
 
     @PostMapping("/import")
-    public R<String> importXy(@RequestParam("file") MultipartFile file, Integer type , Long contractId) throws Exception {
-        if(file != null&& type!=null && contractId!=null) {
+    public R<String> importXy(@RequestParam("file") MultipartFile file, Integer type , Long contractId,Long projectId) throws Exception {
+        if(file != null&& type!=null && contractId!=null&&projectId!=null) {
             String fileName = Objects.requireNonNull(file.getOriginalFilename());
-            if(Pattern.matches(".(\\.xls)x?$",fileName.toLowerCase(Locale.ROOT))) {
-                return R.success(this.service.importData(file,contractId,type));
+            if(Pattern.matches(".+(\\.xls)x?$",fileName.toLowerCase(Locale.ROOT))) {
+                return R.success(this.service.importData(file,contractId,projectId,type));
             } else {
                 R.fail("文件格式不正确，请上传Excel文件");
             }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/DatumPointService.java

@@ -25,7 +25,7 @@ public class DatumPointService extends BaseServiceImpl<DatumPointMapper, DatumPo
 
 
 
-    public String importData(MultipartFile file,  Long contractId, Integer dataType) throws Exception {
+    public String importData(MultipartFile file,  Long contractId,Long projectId, Integer dataType) throws Exception {
         List<String> level=new ArrayList<>();
         level.add("一级");
         level.add("二级");
@@ -101,6 +101,7 @@ public class DatumPointService extends BaseServiceImpl<DatumPointMapper, DatumPo
 
                     }
                     obj.setContractId(contractId);
+                    obj.setProjectId(projectId);
                     obj.setCreateTime(new Date());
                     obj.setType(dataType);
                     importList.add(obj);
@@ -156,6 +157,7 @@ public class DatumPointService extends BaseServiceImpl<DatumPointMapper, DatumPo
 
                     }
                     obj.setContractId(contractId);
+                    obj.setProjectId(projectId);
                     obj.setCreateTime(new Date());
                     obj.setType(dataType);
                     importList.add(obj);
@@ -172,7 +174,7 @@ public class DatumPointService extends BaseServiceImpl<DatumPointMapper, DatumPo
 
     //导出数据
     public List<DatumPoint>  exportExcel( String contractId , Integer type, String search){
-      return   this.list(Wrappers.<DatumPoint>lambdaQuery().eq(DatumPoint::getType,type).and(e->e.like(DatumPoint::getName,search).or().like(DatumPoint::getRemark,search)));
+      return   this.list(Wrappers.<DatumPoint>lambdaQuery().eq(DatumPoint::getType,type).eq(DatumPoint::getContractId,contractId).and(e->e.like(DatumPoint::getName,search).or().like(DatumPoint::getRemark,search)));
     }
 
 }