受欢迎菜品

src/main/java/com/sky/ioc/controller/security/PersonController.java

@@ -60,8 +60,9 @@ public class PersonController {
 
     @ApiOperation("今日值班情况")
     @PostMapping("/getDuty")
-    public ReturnMsg getDuty(@RequestParam(value = "type", required=true)  Integer type){
-        return securityPersonService.getPersonList(type);
+    public ReturnMsg getDuty(@RequestParam(value = "type", required=true)  Integer type,
+                             @RequestParam(value = "name", required=false)String name){
+        return securityPersonService.getPersonList(type,name);
     }
 
 

src/main/java/com/sky/ioc/entity/domain/carbon/CarCarbon.java

@@ -0,0 +1,11 @@
+package com.sky.ioc.entity.domain.carbon;
+
+import lombok.Data;
+/**
+ * 车辆排放
+ * */
+@Data
+public class CarCarbon {
+
+    private Integer id;
+}

src/main/java/com/sky/ioc/entity/domain/carbon/Carbon.java

@@ -0,0 +1,32 @@
+package com.sky.ioc.entity.domain.carbon;
+
+import lombok.Data;
+
+@Data
+public class Carbon {
+    private Integer id;
+    /**
+     * 时间
+     * */
+    private String time;
+    /**
+     * 部门id
+     * */
+    private Integer deptId;
+
+    /**
+     * 排放量
+     * */
+    private String discharge;
+
+    /**
+     * 减排
+     * */
+    private String deEmission;
+    /**
+     * 排放源
+     * */
+    private String sourceType;
+
+
+}

src/main/java/com/sky/ioc/entity/domain/carbon/CarbonQuota.java

@@ -0,0 +1,15 @@
+package com.sky.ioc.entity.domain.carbon;
+
+import lombok.Data;
+
+@Data
+public class CarbonQuota {
+
+    private Integer id;
+    private Integer dept_id;
+
+    private String stock;
+    private String expend;
+
+    private String time;
+}

src/main/java/com/sky/ioc/entity/domain/security/SecurityPersonDuty.java

@@ -0,0 +1,16 @@
+package com.sky.ioc.entity.domain.security;
+
+import lombok.Data;
+
+@Data
+public class SecurityPersonDuty {
+    private Integer id;
+    /** 工号 */
+    private String workNumber;
+    /** 工作区域 */
+    private String scope;
+
+    private String startTime;
+
+    private String endTime;
+}

src/main/java/com/sky/ioc/service/canteen/impl/RestaurantServiceImpl.java

@@ -146,7 +146,7 @@ public class RestaurantServiceImpl implements RestaurantService {
             cuisine.setCuisineImg(map.get("cuisine_img"));
             cuisine.setCuisineName(map.get("p_name"));
             cuisine.setPrice(map.get("price"));
-            cuisine.setSaleNumber(map.get("total"));
+            cuisine.setSaleNumber(String.valueOf(map.get("total")));
             cuisineList.add(cuisine);
         }
         return ReturnMsg.ok(cuisineList);

src/main/java/com/sky/ioc/service/security/SecurityPersonService.java

@@ -5,5 +5,5 @@ import com.sky.ioc.tool.ReturnMsg;
 
 public interface SecurityPersonService {
 
-    ReturnMsg getPersonList(Integer type);
+    ReturnMsg getPersonList(Integer type,String name);
 }

src/main/java/com/sky/ioc/service/security/impl/SecurityPersonServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sky.ioc.service.security.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sky.ioc.entity.domain.meeting.MeetingRecord;
 import com.sky.ioc.entity.domain.security.SecurityPerson;
 import com.sky.ioc.mapper.SecurityPersonMapper;
 import com.sky.ioc.service.security.SecurityPersonService;
@@ -18,8 +19,11 @@ public class SecurityPersonServiceImpl implements SecurityPersonService {
 
 
     @Override
-    public ReturnMsg getPersonList(Integer type) {
-        List<SecurityPerson> list  = securityPersonMapper.selectList(new LambdaQueryWrapper<SecurityPerson>().eq(SecurityPerson::getType,type));
+    public ReturnMsg getPersonList(Integer type,String name) {
+        LambdaQueryWrapper<SecurityPerson> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SecurityPerson::getType,type);
+        queryWrapper.like((name!=null&&!name.isEmpty()),SecurityPerson::getName,name);
+        List<SecurityPerson> list  = securityPersonMapper.selectList(queryWrapper);
         return ReturnMsg.ok(list);
     }
 }