会议室预约移动端

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowProcessService.java

@@ -146,7 +146,7 @@ public class FlowProcessService {
         if (StringUtils.isNotBlank(type)) {
             if (type.equals("ydd")) {
                 // 创建一个包含需要保留的流程定义名称的集合
-                List<String> requiredNames = Arrays.asList("物资管理-领用申请", "物资管理-采购申请", "日常办公-请假申请", "离职申请", "离职交接申请", "会计-报销审批", "会计-发票申请", "报销申请", "发票申请");
+                List<String> requiredNames = Arrays.asList("物资管理-领用申请", "物资管理-采购申请", "日常办公-请假申请", "离职申请", "离职交接申请", "会计-报销审批", "会计-发票申请", "报销申请", "发票申请","会议室预约");
                 /**
                  * 移动端工作台数据处理
                  */

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowTaskService.java

@@ -426,6 +426,7 @@ public class FlowTaskService {
                 processName.equals("会计-报销审批") ||
                 processName.equals("会计-发票申请") ||
                 processName.equals("报销申请") ||
+                processName.equals("会议室预约") ||
                 processName.equals("发票申请")  ;
     }
 
@@ -671,7 +672,7 @@ public class FlowTaskService {
         if (StringUtils.isNotBlank(type)) {
             if (type.equals("ydd")) {
                 // 创建一个包含需要保留的流程定义名称的集合
-                List<String> requiredNames = Arrays.asList("物资管理-领用申请", "物资管理-采购申请", "日常办公-请假申请", "离职申请", "离职交接申请", "会计-报销审批", "会计-发票申请", "报销申请","发票申请");
+                List<String> requiredNames = Arrays.asList("物资管理-领用申请", "物资管理-采购申请", "日常办公-请假申请", "离职申请", "离职交接申请", "会计-报销审批", "会计-发票申请", "报销申请","发票申请","会议室预约");
                 /**
                  * 移动端工作台数据处理
                  */

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/meetingRoom/controller/MeetingRoomController.java

@@ -23,7 +23,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -85,8 +87,8 @@ public class MeetingRoomController {
      */
     @ApiOperation(value = "根据id修改状态status")
     @PostMapping(value = "/updateStatusById")
-    public void updateStatusById(String id,String status) {
-        meetingRoomService.updateStatusById(id,status);
+    public void updateStatusById(@RequestBody MeetingRoomDTO meetingRoomDTO) {
+        meetingRoomService.updateStatusById(meetingRoomDTO.getId(),meetingRoomDTO.getStatus());
     }
 
     /**

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/meetingRoom/service/MeetingRoomService.java

@@ -139,6 +139,17 @@ public class MeetingRoomService {
         meetingRoom.setUpdateTime(new Date());
         meetingRoom.setDelFlag(0);
 
+        /**
+         * 移动端保存所需
+         */
+        if (StringUtils.isNotBlank(meetingRoomDTO.getCreateById())) {
+            meetingRoom.setCreateById(meetingRoomDTO.getCreateById());
+            meetingRoom.setUpdateById(meetingRoomDTO.getCreateById());
+            //根据用户id查询用户所属的租户id
+            UserDTO dto = SpringUtil.getBean(IUserApi.class).getById(meetingRoomDTO.getCreateById());
+            meetingRoom.setTenantId(dto.getTenantDTO().getId());
+        }
+
 
         if (StringUtils.isNotBlank(meetingRoomDTO.getId())){
             meetingRoomMapper.updateById(meetingRoom);

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/meetingRoom/service/dto/MeetingRoomDTO.java

@@ -88,6 +88,8 @@ public class MeetingRoomDTO extends BaseDTO {
     @TableField(exist = false)
     private String officeName;
 
+    private String createById;
+
     private static final long serialVersionUID = 1L;