SJ vor 1 Jahr
Ursprung
Commit
6ae7381dde
21 geänderte Dateien mit 168 neuen und 38 gelöschten Zeilen
  1. 2 2
      jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActTaskController.java
  2. 13 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/activiti/listener/ListenerApplySeal.java
  3. 42 34
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/activiti/listener/ListenerMaterialApply.java
  4. 9 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/CarController.java
  5. 10 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/MaterialController.java
  6. 9 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/MeetingRoomController.java
  7. 4 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/ConferenceApply.java
  8. 4 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/ConferenceMinutes.java
  9. 3 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/ReceivedDetail.java
  10. 2 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/CarMapper.java
  11. 9 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/MaterialMapper.java
  12. 1 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/MeetingRoomMapper.java
  13. 6 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/CarMapper.xml
  14. 6 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/MaterialMapper.xml
  15. 6 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/MeetingRoomMapper.xml
  16. 4 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/ICarService.java
  17. 4 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/IMaterialService.java
  18. 4 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/IMeetingRoomService.java
  19. 10 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/CarServiceImpl.java
  20. 10 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/MaterialServiceImpl.java
  21. 10 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/MeetingRoomServiceImpl.java

+ 2 - 2
jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActTaskController.java

@@ -546,8 +546,8 @@ public class ActTaskController {
             map.put("url","/activiti/applyList");
             map.put("taskId",task.getId());
 //            森语取消所有审批消息
-//            actZprocessService.sendMessage(loginUser,user,ActivitiConstant.MESSAGE_PASS_CONTENT,
-//                    String.format("您的 【%s】 申请已通过!",actBusiness.getTitle()),sendMessage, sendSms, sendEmail,map);
+            actZprocessService.sendMessage(loginUser,user,ActivitiConstant.MESSAGE_PASS_CONTENT,
+                    String.format("您的 【%s】 申请已通过!",actBusiness.getTitle()),sendMessage, sendSms, sendEmail,map);
             //修改公司id
             List<String> listTaskId=new ArrayList<>();
             listTaskId.add(task.getId());

+ 13 - 2
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/activiti/listener/ListenerApplySeal.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.activiti.listener;
 
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.activiti.engine.delegate.*;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.api.ISysBaseAPI;
@@ -11,6 +12,7 @@ import org.jeecg.modules.oa.entity.SealTurn;
 import org.jeecg.modules.oa.mapper.SealArchivesMapper;
 import org.jeecg.modules.oa.mapper.SealTurnMapper;
 import org.jeecg.modules.oa.service.IActivitiService;
+import org.jeecg.modules.oa.service.ISealArchivesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
@@ -24,7 +26,7 @@ import java.util.Map;
 public class ListenerApplySeal implements TaskListener, ExecutionListener {
 
     @Autowired
-    private SealArchivesMapper sealArchivesMapper;
+    private ISealArchivesService sealArchivesService;
 
     /**
      * 执行监听
@@ -68,6 +70,15 @@ public class ListenerApplySeal implements TaskListener, ExecutionListener {
                 }
                 file = file.substring(0, file.length() - 1);
             }
+
+            QueryWrapper<SealArchives> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("seal_name", name);
+            queryWrapper.eq("seal_status", "正在使用");
+            SealArchives one = sealArchivesService.getOne(queryWrapper);
+            if (one != null) {
+                throw new RuntimeException("当前有同名印章正在使用");
+            }
+
             SealArchives sealArchives = new SealArchives();
             sealArchives.setSealName(name);
             sealArchives.setSealType(carvingType);
@@ -78,7 +89,7 @@ public class ListenerApplySeal implements TaskListener, ExecutionListener {
             sealArchives.setCustodianDept(custodyDepartment);
             sealArchives.setEngravingDate(engravingDate);
             sealArchives.setFile(file);
-            sealArchivesMapper.insert(sealArchives);
+            sealArchivesService.save(sealArchives);
         } else if ("take".equals(eventName)) {
             // 连线监听器
         }

+ 42 - 34
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/activiti/listener/ListenerMaterialApply.java

@@ -17,7 +17,9 @@ import org.springframework.stereotype.Component;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 //流程监听,固资在转移、报废等操作时回写状态
 @Component
@@ -38,46 +40,52 @@ public class ListenerMaterialApply implements TaskListener, ExecutionListener {
         String eventName = delegateExecution.getEventName();
         if ("start".equals(eventName)) {
             // 流程开始
+            Map<String, Object> variables = delegateExecution.getVariables();
+            //子表List
+            List<Map<String, Object>> applyDetails = this.materialMapper.getApplyDetail(variables.get("tableId").toString());
+            //审批单据占用List
+            List<Map<String, Object>> occupancy = materialMapper.getOccupancy();
+            Map<String, BigDecimal> occupyDetails = occupancy.stream().collect(Collectors.toMap(key -> {
+                return key.get("materialName").toString();
+            }, val -> {
+                return new BigDecimal(val.get("amount").toString());
+            }));
+            //库存List
+            List<Material> inventory = this.materialMapper.selectList(new QueryWrapper<>());
+            Map<String, BigDecimal> inventoryDetails = inventory.stream().collect(Collectors.toMap(Material::getMaterialName,Material::getQuantity));
+
+            String msg = "";
+            for(Map<String,Object> detail : applyDetails){
+                String materialName = detail.get("materialName").toString();
+                BigDecimal amount = new BigDecimal(detail.get("amount").toString());
+                BigDecimal subtract = amount.add(occupyDetails.getOrDefault(materialName, BigDecimal.ZERO)).subtract(inventoryDetails.getOrDefault(materialName, BigDecimal.ZERO));
+                if (subtract.compareTo(BigDecimal.ZERO) > 0) {
+                    msg += materialName + " 现有库存:" + inventoryDetails.getOrDefault(materialName, BigDecimal.ZERO) + " 单据占用:" + occupyDetails.getOrDefault(materialName, BigDecimal.ZERO) + " 缺失:" + subtract +"   ";
+                }
+            };
+            if (StringUtils.isNotBlank(msg)) {
+                throw new RuntimeException(msg);
+            }
+
+
         } else if ("end".equals(eventName)) {
-            //todo
             Map<String, Object> variables = delegateExecution.getVariables();
             //子表List
-            String sublist = String.valueOf(variables.get("sublist"));
+            List<Map<String, Object>> applyDetails = this.materialMapper.getApplyDetail(variables.get("tableId").toString());
 
+            for(Map<String,Object> detail : applyDetails){
+                String materialName = detail.get("materialName").toString();
+                BigDecimal amount = new BigDecimal(detail.get("amount").toString());
 
-            if(StringUtils.isNotBlank(sublist)){
-                //sublist格式
-//            [{"material_name2":"物料名称1","amount":500,"unit":"计量单位1","notes3":"测试","key":1687761773306},
-//            {"material_name2":"物料名称2","amount":50000,"unit":"计量单位2","notes3":"测试","key":1687761778679}]
-                JSONArray ay= JSONArray.parseArray(sublist);
-                for(int i=0;i<ay.size();i++) {
-                    //物料名称
-                    String materialName = (String) ay.getJSONObject(i).get("material_name2");
-                    //申请数量
-                    BigDecimal amount;
-                    Object amount1 = ay.getJSONObject(i).get("amount");
-                    if(amount1 instanceof Integer){
-                        amount = new BigDecimal((Integer) ay.getJSONObject(i).get("amount"));
-                    }else{
-                        amount = (BigDecimal) amount1;
-                    }
-                    //计量单位
-                    String unit = (String) ay.getJSONObject(i).get("unit");
-                    QueryWrapper<Material> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("material_name",materialName);
-                    queryWrapper.eq("unit",unit);
-                    Material material = materialMapper.selectOne(queryWrapper);
-                    if(material==null){
-                        throw new Exception("物料名称为"+materialName+";计量单位为"+unit+"的物料不存在");
-                    }
-                    BigDecimal  quantity = material.getQuantity();
-                    if(quantity.compareTo(amount)==-1){
-                        throw new Exception("物料名称为"+materialName+";计量单位为"+unit+"的物料库存数量小于申请数量!");
-                    }
-                    material.setQuantity(material.getQuantity().subtract(amount));
-                    materialMapper.updateById(material);
+                QueryWrapper<Material> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("material_name",materialName);
+                Material material = materialMapper.selectOne(queryWrapper);
+                if(material==null){
+                    throw new RuntimeException("物料名称为"+materialName+"的物料不存在");
                 }
-            }
+                material.setQuantity(material.getQuantity().subtract(amount));
+                materialMapper.updateById(material);
+            };
         } else if ("take".equals(eventName)) {
             // 连线监听器
         }

+ 9 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/CarController.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.oa.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -95,6 +96,10 @@ public class CarController extends JeecgController<Car, ICarService> {
 	@ApiOperation(value="车辆信息-通过id删除", notes="车辆信息-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		int useage = this.carService.getUseage(Lists.newArrayList(id));
+		if (useage > 0) {
+			return Result.error("该车已存在于申请流程中,不能删除");
+		}
 		carService.removeById(id);
 		return Result.ok("删除成功!");
 	}
@@ -109,6 +114,10 @@ public class CarController extends JeecgController<Car, ICarService> {
 	@ApiOperation(value="车辆信息-批量删除", notes="车辆信息-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		int useage = this.carService.getUseage(Arrays.asList(ids.split(",")));
+		if (useage > 0) {
+			return Result.error("已存在于申请流程中的车辆,不能删除");
+		}
 		this.carService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.ok("批量删除成功!");
 	}

+ 10 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/MaterialController.java

@@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.google.common.collect.Lists;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -110,6 +112,10 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
 	@ApiOperation(value="物料档案-通过id删除", notes="物料档案-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		int useage = this.materialService.getUseage(Lists.newArrayList(id));
+		if (useage > 0) {
+			return Result.error("该物料已存在于申请流程中,不能删除");
+		}
 		materialService.removeById(id);
 		return Result.ok("删除成功!");
 	}
@@ -124,6 +130,10 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
 	@ApiOperation(value="物料档案-批量删除", notes="物料档案-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		int useage = this.materialService.getUseage(Arrays.asList(ids.split(",")));
+		if (useage > 0) {
+			return Result.error("已存在于申请流程中的物料,不能删除");
+		}
 		this.materialService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.ok("批量删除成功!");
 	}

+ 9 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/MeetingRoomController.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.oa.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -95,6 +96,10 @@ public class MeetingRoomController extends JeecgController<MeetingRoom, IMeeting
 	@ApiOperation(value="会议室管理-通过id删除", notes="会议室管理-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		int useage = this.meetingRoomService.getUseage(Lists.newArrayList(id));
+		if (useage > 0) {
+			return Result.error("该会议室已存在于申请流程中,不能删除");
+		}
 		meetingRoomService.removeById(id);
 		return Result.ok("删除成功!");
 	}
@@ -109,6 +114,10 @@ public class MeetingRoomController extends JeecgController<MeetingRoom, IMeeting
 	@ApiOperation(value="会议室管理-批量删除", notes="会议室管理-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		int useage = this.meetingRoomService.getUseage(Arrays.asList(ids.split(",")));
+		if (useage > 0) {
+			return Result.error("已存在于申请流程中的会议室,不能删除");
+		}
 		this.meetingRoomService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.ok("批量删除成功!");
 	}

+ 4 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/ConferenceApply.java

@@ -119,4 +119,8 @@ public class ConferenceApply implements Serializable {
 	@Excel(name = "附件", width = 15)
     @ApiModelProperty(value = "附件")
     private String file;
+    /**会议类别*/
+    @Excel(name = "会议类别", width = 15)
+    @ApiModelProperty(value = "会议类别")
+    private String conferenceType;
 }

+ 4 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/ConferenceMinutes.java

@@ -89,4 +89,8 @@ public class ConferenceMinutes implements Serializable {
 	@Excel(name = "附件", width = 15)
     @ApiModelProperty(value = "附件")
     private String file;
+    /**会议类别*/
+    @Excel(name = "会议类别", width = 15)
+    @ApiModelProperty(value = "会议类别")
+    private String conferenceType;
 }

+ 3 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/ReceivedDetail.java

@@ -73,4 +73,7 @@ public class ReceivedDetail implements Serializable {
 	/**外键*/
 	@ApiModelProperty(value = "外键")
 	private String mainId;
+	/**签字图片*/
+	@ApiModelProperty(value = "签字图片")
+	private String signature;
 }

+ 2 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/CarMapper.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.oa.mapper;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
@@ -14,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CarMapper extends BaseMapper<Car> {
 
+    int getUseage(@Param("idList") List<String> idList);
 }

+ 9 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/MaterialMapper.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.oa.mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.oa.entity.Material;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +17,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MaterialMapper extends BaseMapper<Material> {
 
+    int getUseage(@Param("idList") List<String> idList);
+
+    @Select("select afb.material_name2 as materialName ,sum(afb.amount) as amount  from act_z_business azb,application_form_b afb where azb.table_id = afb.application_form_id and azb.status =1 group by afb.material_name2")
+    List<Map<String,Object>> getOccupancy();
+    @Select("select afb.material_name2 as materialName ,sum(afb.amount) as amount  from application_form_b afb where afb.application_form_id = #{mainId} group by afb.material_name2")
+    List<Map<String,Object>> getApplyDetail(@Param("mainId")String mainId);
 }

+ 1 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/MeetingRoomMapper.java

@@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MeetingRoomMapper extends BaseMapper<MeetingRoom> {
 
+    int getUseage(@Param("idList") List<String> idList);
 }

+ 6 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/CarMapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.oa.mapper.CarMapper">
 
+    <select id="getUseage" resultType="java.lang.Integer">
+        select count(*) from car_apply a, car c where a.car_arrange=c.number and c.id in
+        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 </mapper>

+ 6 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/MaterialMapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.oa.mapper.MaterialMapper">
 
+    <select id="getUseage" resultType="java.lang.Integer">
+        select count(*) from application_form_b b, cd_material cm  where b.material_name2 = cm.material_name  and cm.id in
+        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 </mapper>

+ 6 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/MeetingRoomMapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.oa.mapper.MeetingRoomMapper">
 
+    <select id="getUseage" resultType="java.lang.Integer">
+        select count(*) from cd_meeting_room cmr , conference_apply ca  where cmr.name = ca.conference_address  and cmr.id in
+        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 </mapper>

+ 4 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/ICarService.java

@@ -3,6 +3,9 @@ package org.jeecg.modules.oa.service;
 import org.jeecg.modules.oa.entity.Car;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description: 车辆信息
  * @Author: jeecg-boot
@@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICarService extends IService<Car> {
 
+    int getUseage(List<String> idList);
 }

+ 4 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/IMaterialService.java

@@ -3,6 +3,9 @@ package org.jeecg.modules.oa.service;
 import org.jeecg.modules.oa.entity.Material;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description: 物料档案
  * @Author: jeecg-boot
@@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IMaterialService extends IService<Material> {
 
+    int getUseage(List<String> idList);
 }

+ 4 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/IMeetingRoomService.java

@@ -3,6 +3,9 @@ package org.jeecg.modules.oa.service;
 import org.jeecg.modules.oa.entity.MeetingRoom;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description: 会议室管理
  * @Author: jeecg-boot
@@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IMeetingRoomService extends IService<MeetingRoom> {
 
+    int getUseage(List<String> idList);
 }

+ 10 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/CarServiceImpl.java

@@ -3,10 +3,14 @@ package org.jeecg.modules.oa.service.impl;
 import org.jeecg.modules.oa.entity.Car;
 import org.jeecg.modules.oa.mapper.CarMapper;
 import org.jeecg.modules.oa.service.ICarService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description: 车辆信息
  * @Author: jeecg-boot
@@ -15,5 +19,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarService {
+    @Autowired
+    private CarMapper carMapper;
 
+    @Override
+    public int getUseage(List<String> idList) {
+        return this.carMapper.getUseage(idList);
+    }
 }

+ 10 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/MaterialServiceImpl.java

@@ -3,10 +3,13 @@ package org.jeecg.modules.oa.service.impl;
 import org.jeecg.modules.oa.entity.Material;
 import org.jeecg.modules.oa.mapper.MaterialMapper;
 import org.jeecg.modules.oa.service.IMaterialService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 物料档案
  * @Author: jeecg-boot
@@ -16,4 +19,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements IMaterialService {
 
+    @Autowired
+    private MaterialMapper materialMapper;
+
+    @Override
+    public int getUseage(List<String> idList) {
+        return this.materialMapper.getUseage(idList);
+    }
 }

+ 10 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/MeetingRoomServiceImpl.java

@@ -3,10 +3,13 @@ package org.jeecg.modules.oa.service.impl;
 import org.jeecg.modules.oa.entity.MeetingRoom;
 import org.jeecg.modules.oa.mapper.MeetingRoomMapper;
 import org.jeecg.modules.oa.service.IMeetingRoomService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 会议室管理
  * @Author: jeecg-boot
@@ -16,4 +19,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class MeetingRoomServiceImpl extends ServiceImpl<MeetingRoomMapper, MeetingRoom> implements IMeetingRoomService {
 
+    @Autowired
+    private MeetingRoomMapper meetingRoomMapper;
+
+    @Override
+    public int getUseage(List<String> idList) {
+        return meetingRoomMapper.getUseage(idList);
+    }
 }