Merge remote-tracking branch 'origin/master'

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseNoticeController.java

@@ -8,7 +8,6 @@ import com.ozs.base.domain.BaseNoticeType;
 import com.ozs.base.service.BaseNoticeService;
 import com.ozs.base.service.BaseNoticeTypeService;
 import com.ozs.base.vo.BaseNoticePageReqVo;
-import com.ozs.base.vo.BaseNoticeTypePageReqVo;
 import com.ozs.base.vo.BaseNoticeVo;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.ModularConstans;
@@ -130,4 +129,5 @@ public class BaseNoticeController extends BaseController {
 
         return success(baseNoticeVo);
     }
+
 }

purchase-admin/src/main/java/com/ozs/web/controller/base/BasePolicyController.java

@@ -165,12 +165,5 @@ public class BasePolicyController extends BaseController {
         return success(basePolicyService.getById(id));
     }
 
-    public static void main(String[] args) {
-        String  filePath ="/home/purchase/uploadPath/upload";
 
-        String  upload = "/profile/upload/2023/02/14/bookinfo应用_20230214124044A001.pdf";
-        String filePathStr = filePath + upload.substring("/profile/upload".length(),upload.length());
-        System.out.println(filePathStr);
-        System.out.println(upload.indexOf("/profile/upload"));
-    }
 }

purchase-admin/src/main/java/com/ozs/web/controller/plan/MonthlyReconciliationController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.base.domain.BaseNoticeType;
+import com.ozs.base.vo.BasePolicyPageReqVo;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.Constants;
 import com.ozs.common.constant.ModularConstans;
@@ -178,4 +179,15 @@ public class MonthlyReconciliationController extends BaseController {
         return success(vo);
     }
 
+    @ApiOperation(value = "根据项目名称模糊查询项目信息-代理抽取查询用")
+    @PostMapping("/listProjectInfoLikeName")
+    @Log(title = ModularConstans.monthly, businessType = BusinessType.QUERY)
+    public AjaxResult listProjectInfoLikeName(@NotEmpty(message = "数据为空")
+                                              @RequestBody BasePolicyPageReqVo vo) {
+        LambdaQueryWrapper<MonthlyReconciliation> lw = new LambdaQueryWrapper<>();
+        if (!StringUtils.isBlank(vo.getName())) {
+            lw.like(MonthlyReconciliation::getProjectName, vo.getName());
+        }
+        return success(monthlyReconciliationService.list(lw));
+    }
 }