更新

src/main/java/com/template/api/ApplicationProcedureControllerAPI.java

@@ -39,5 +39,8 @@ public interface ApplicationProcedureControllerAPI {
     CommonResult statusDropDown();
 
 
+    @GetMapping("/appletRecordList")
+    @ApiOperation(value = "小程序-流程管理记录展示", notes = "小程序-流程管理记录展示", httpMethod = "GET")
+    CommonResult appletRecordList(@RequestParam Integer department,@RequestParam Integer userId,String startTime,String endTime,String status,int page, int size);
 
 }

src/main/java/com/template/controller/ApplicationProcedureController.java

@@ -1,12 +1,10 @@
 package com.template.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.template.api.ApplicationProcedureControllerAPI;
 import com.template.model.dto.AppletApprovalProcessDto;
 import com.template.model.dto.ApplicationProcedureDto;
@@ -15,13 +13,9 @@ import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.ApplicationProcedureVo;
-import com.template.model.vo.HouseVo;
 import com.template.services.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
@@ -55,7 +49,8 @@ public class ApplicationProcedureController implements ApplicationProcedureContr
     @Autowired
     AdminMenuService adminMenuService;
 
-
+    @Autowired
+    ApplicationProcedureTemporaryService applicationProcedureTemporaryService;
     @Override
     public CommonResult save(ApplicationProcedureDto applicationProcedureDto) {
         if (ObjectUtils.isEmpty(applicationProcedureDto)) {
@@ -418,7 +413,39 @@ public class ApplicationProcedureController implements ApplicationProcedureContr
         return CommonResult.ok(list);
     }
 
+    @Override
+    public CommonResult appletRecordList( Integer department,Integer userId,String startTime, String endTime, String status, int page, int size) {
+        if (ObjectUtils.isEmpty(page) || page <= 0) {
+            page = 1;
+        }
+        if (ObjectUtils.isEmpty(size) || size <= 0) {
+            size = 10;
+        }
 
+        //教职工
+        if (department==4) {
+            LambdaQueryWrapper<ApplicationProcedure> wrapper=new LambdaQueryWrapper<>();
+            wrapper.eq(ApplicationProcedure::getUsersId,userId)
+                            .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedure::getSubmissionTime,startTime,endTime)
+                                    .eq(ObjectUtils.isNotEmpty(status),ApplicationProcedure::getStatus,status);
+
+//            IPage<ApplicationProcedure> page1 = applicationProcedureService.appletRecordPage(new Page<>(page, size), wrapper);
+            IPage<ApplicationProcedure> page1 = applicationProcedureService.page(new Page<>(page, size), wrapper);
+            return CommonResult.ok(page1);
+
+        }else if (department==7){
+//          临时人员
+            LambdaQueryWrapper<ApplicationProcedureTemporary> wrapper=new LambdaQueryWrapper<>();
+            wrapper.eq(ApplicationProcedureTemporary::getUsersId,userId)
+                            .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime)
+                                    .eq(ObjectUtils.isNotEmpty(status),ApplicationProcedureTemporary::getStatus,status);
+//            applicationProcedureTemporaryService.appletRecordPage(new Page<>(page, size), wrapper);
+            applicationProcedureTemporaryService.page(new Page<>(page, size), wrapper);
+        }
+
+
+        return CommonResult.fail("无访问权限");
+    }
 
 }
 

src/main/java/com/template/controller/ApplicationProcedureTemporaryController.java

@@ -1,31 +1,27 @@
 package com.template.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.template.api.ApplicationProcedureSettingControllerApi;
 import com.template.api.ApplicationProcedureTemporaryControllerAPI;
 import com.template.model.dto.AppletApprovalProcessDto;
-import com.template.model.dto.ApplicationProcedureDto;
 import com.template.model.dto.ApplicationProcedureTemporaryDto;
 import com.template.model.dto.ApprovalProcessDto;
-import com.template.model.pojo.*;
+import com.template.model.pojo.AdminMenu;
+import com.template.model.pojo.ApplicationProcedureSetting;
+import com.template.model.pojo.ApplicationProcedureTemporary;
+import com.template.model.pojo.PermissionSetting;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.ApplicationProcedureTemporaryVo;
-import com.template.model.vo.ApplicationProcedureVo;
 import com.template.services.AdminMenuService;
 import com.template.services.ApplicationProcedureSettingService;
 import com.template.services.ApplicationProcedureTemporaryService;
 import com.template.services.PermissionSettingService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
@@ -401,5 +397,6 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
     }
 
 
+
 }
 

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -693,8 +693,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 users1.setUserName(name);
                 users1.setPhone(phone);
                 users1.setCardNumber(cardNumber);
-                users1.setUserMenuId("1");
-                users1.setDepartment("0");
+                users1.setUserMenuId("4");
+                users1.setDepartment("7");
                 boolean save = usersService.save(users1);
                 houseOrder.setReserveUserId(users1.getId() + "");
             } else {
@@ -812,7 +812,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             String orderNumber = checkIdCardDto.getOrderNumber();
 
             LambdaQueryWrapper<HouseOrder> wrapperHo = new LambdaQueryWrapper<>();
-            wrapperHo.eq(HouseOrder::getHouseOrderNumber, orderNumber);
+            wrapperHo.eq(HouseOrder::getOrderNumber, orderNumber);
             HouseOrder houseOrder = houseOrderService.getOne(wrapperHo);
 
 
@@ -870,6 +870,9 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             LambdaQueryWrapper<HouseLock> wrapperHl = new LambdaQueryWrapper<>();
             wrapperHl.eq(HouseLock::getHouseNumberId, houseNumberId);
             HouseLock houseLock = houseLockService.getOne(wrapperHl);
+            if (ObjectUtils.isEmpty(houseLock)) {
+                return CommonResult.fail("请先绑定设备");
+            }
             String equipmentState = houseLock.getEquipmentState();
 
             //      修改房间状态

src/main/java/com/template/controller/HouseOrderController.java

@@ -668,14 +668,14 @@ public class HouseOrderController implements HouseOrderAPI {
         String liveTime = checkIdCardDto.getLiveTime();
         String leaveTime = checkIdCardDto.getLeaveTime();
         //       管理端 计算总金额
-        PriceVo priceVo = houseOrderService.reservePrice(houseId, cardNumber, liveTime, leaveTime);
-        BigDecimal totalPrice = priceVo.getTotalPrice();
-
-        BigDecimal payPrice = checkIdCardDto.getPayPrice();
-//        返回的结果是int类型,-1表示小于，0是等于，1是大于。
-        if (payPrice.compareTo(totalPrice) != 0) {
-            return CommonResult.fail("需付金额异常");
-        }
+//        PriceVo priceVo = houseOrderService.reservePrice(houseId, cardNumber, liveTime, leaveTime);
+//        BigDecimal totalPrice = priceVo.getTotalPrice();
+//
+//        BigDecimal payPrice = checkIdCardDto.getPayPrice();
+////        返回的结果是int类型,-1表示小于，0是等于，1是大于。
+//        if (payPrice.compareTo(totalPrice) != 0) {
+//            return CommonResult.fail("需付金额异常");
+//        }
 
         //        获取该时间段内的该房间的使用情况
         List<HouseNumberState> houseNumberStateList = houseNumberStateService.beBooked(houseNumberId, liveTime, leaveTime);
@@ -707,30 +707,30 @@ public class HouseOrderController implements HouseOrderAPI {
             String orderNumber = checkIdCardDto.getOrderNumber();
 
             LambdaQueryWrapper<HouseOrder> wrapperHo = new LambdaQueryWrapper<>();
-            wrapperHo.eq(HouseOrder::getHouseOrderNumber, orderNumber);
-            HouseOrder houseOrder1 = houseOrderService.getOne(wrapperHo);
-
-            HouseOrder houseOrder = new HouseOrder();
-            if (ObjectUtils.isEmpty(houseOrder1)) {
-                //        订单号
-                String orderNumber1 = UUID.randomUUID().toString();
-                orderNumber1 = orderNumber1.replace("-", "");
-                houseOrder.setOrderNumber(orderNumber1);
-                houseOrder.setHouseId(houseId);
-                houseOrder.setHouseNumberId(houseNumberId);
-                houseOrder.setReserveName(liveName);
-                houseOrder.setReservePhone(phone);
-                houseOrder.setReserveLiveTime(liveTime);
-                houseOrder.setReserveLeaveTime(leaveTime);
-                houseOrder.setPrice(priceVo.getPrice());
-                houseOrder.setPayPrice(priceVo.getTotalPrice());
-                houseOrder.setHouseOrderNumber(1);
-                houseOrder.setLiveDay(checkIdCardDto.getLiveDay() + "");
-                houseOrder.setOrderChannel("2");
+            wrapperHo.eq(HouseOrder::getOrderNumber, orderNumber);
+            HouseOrder houseOrder = houseOrderService.getOne(wrapperHo);
 
-            } else {
-                BeanUtils.copyProperties(houseOrder1, houseOrder);
-            }
+//            HouseOrder houseOrder = new HouseOrder();
+//            if (ObjectUtils.isEmpty(houseOrder1)) {
+//                //        订单号
+//                String orderNumber1 = UUID.randomUUID().toString();
+//                orderNumber1 = orderNumber1.replace("-", "");
+//                houseOrder.setOrderNumber(orderNumber1);
+//                houseOrder.setHouseId(houseId);
+//                houseOrder.setHouseNumberId(houseNumberId);
+//                houseOrder.setReserveName(liveName);
+//                houseOrder.setReservePhone(phone);
+//                houseOrder.setReserveLiveTime(liveTime);
+//                houseOrder.setReserveLeaveTime(leaveTime);
+//                houseOrder.setPrice(priceVo.getPrice());
+//                houseOrder.setPayPrice(priceVo.getTotalPrice());
+//                houseOrder.setHouseOrderNumber(1);
+//                houseOrder.setLiveDay(checkIdCardDto.getLiveDay() + "");
+//                houseOrder.setOrderChannel("2");
+//
+//            } else {
+//                BeanUtils.copyProperties(houseOrder1, houseOrder);
+//            }
             //            入住人id
             if (ObjectUtils.isEmpty(users)) {
                 Users users1 = new Users();
@@ -740,7 +740,7 @@ public class HouseOrderController implements HouseOrderAPI {
                 users1.setFingerprint(fingerprint);
                 users1.setIdCard(idCard);
                 users1.setIdCardInformation(idCardInformation);
-                users1.setUserMenuId("1");
+                users1.setUserMenuId("4");
                 boolean save = usersService.save(users1);
                 houseOrder.setLiveUsersId(users1.getId() + "");
             } else {

src/main/java/com/template/model/pojo/Users.java

@@ -1,19 +1,14 @@
 package com.template.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  *