Browse Source

八爪鱼选中即将到期后,增加勾选项【仅显示已签约】

yurk 2 years ago
parent
commit
df36fad3e7

+ 4 - 1
fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/controller/CompanyController.java

@@ -65,7 +65,7 @@ public class CompanyController {
      * @return
      */
     @RequestMapping("getList")
-    public HttpRespMsg getList(String companyName, @RequestParam(required = false, defaultValue = "false") Boolean isMeal, Integer pageIndex, Integer pageSize,@RequestParam(defaultValue = "0") Integer key) {
+    public HttpRespMsg getList(String companyName, @RequestParam(required = false, defaultValue = "false") Boolean isMeal, Integer pageIndex, Integer pageSize,@RequestParam(defaultValue = "0") Integer key,@RequestParam(defaultValue = "false") Boolean keyForIsMeal) {
         QueryWrapper<Company> queryWrapper = new QueryWrapper<Company>();
         if (!StringUtils.isEmpty(companyName)) {
             queryWrapper.like("company_name", companyName);
@@ -77,6 +77,9 @@ public class CompanyController {
             LocalDateTime now= LocalDate.now().atTime(LocalTime.MIN);
             queryWrapper.between("expiration_date",now,now.plusMonths(3));
             queryWrapper.orderByAsc("expiration_date");
+            if (keyForIsMeal) {
+                queryWrapper.eq("set_meal", 1);
+            }
         }
         queryWrapper.orderByDesc("id");
         HttpRespMsg msg = new HttpRespMsg();