更新

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

@@ -3,9 +3,7 @@ package com.template.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.ApplicationProcedureTemporaryControllerAPI;
 import com.template.common.utils.TimeExchange;
 import com.template.model.dto.AppletApprovalProcessDto;
@@ -29,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController;
 import java.text.ParseException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -212,17 +209,23 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
 
 //      当只需要审核一次
         if ("1".equals(approverType)) {
-            if ("1".equals(status)) {
-                status="3";
-            }
-            applicationProcedure.setStatus(status);
-            applicationProcedure.setApproverId(adminId);
-            //        审批时间
-            applicationProcedure.setExamineAndApproveTime(LocalDateTime.now().format(dateTimeFormatter1));
+//            只有最高级才能审批
+            //        当为最高审批人
+            if (parentId==0) {
+                if ("1".equals(status)) {
+                    status="3";
+                }
+                applicationProcedure.setStatus(status);
+                applicationProcedure.setApproverId(adminId);
+                //        审批时间
+                applicationProcedure.setExamineAndApproveTime(LocalDateTime.now().format(dateTimeFormatter1));
 //            审批备注
-            applicationProcedure.setExamineAndApproveRemark(remark);
-            applicationProcedureTemporaryService.updateById(applicationProcedure);
-            return CommonResult.ok();
+                applicationProcedure.setExamineAndApproveRemark(remark);
+                applicationProcedureTemporaryService.updateById(applicationProcedure);
+                return CommonResult.ok();
+            }
+            return CommonResult.fail("权限不足");
+
         }
 
 //        当为最高审批人
@@ -255,7 +258,8 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         applicationProcedure.setSecondaryExamineAndApproveTime(LocalDateTime.now().format(dateTimeFormatter1));
 //            审批备注
         applicationProcedure.setSecondaryExamineAndApproveRemark(remark);
-        applicationProcedureTemporaryService.updateById(applicationProcedure);
+        boolean update = applicationProcedureTemporaryService.updateById(applicationProcedure);
+        System.out.println("update = " + update);
 
 
         return CommonResult.ok();
@@ -312,17 +316,23 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
 
 //      当只需要审核一次
         if ("1".equals(approverType)) {
-            if ("1".equals(status)) {
-                status="3";
-            }
-            applicationProcedure.setStatus(status);
-            applicationProcedure.setApproverId(adminId);
-            //        审批时间
-            applicationProcedure.setExamineAndApproveTime(LocalDateTime.now().format(dateTimeFormatter1));
+
+            //            只有最高级才能审批
+            //        当为最高审批人
+            if (parentId==0) {
+                if ("1".equals(status)) {
+                    status = "3";
+                }
+                applicationProcedure.setStatus(status);
+                applicationProcedure.setApproverId(adminId);
+                //        审批时间
+                applicationProcedure.setExamineAndApproveTime(LocalDateTime.now().format(dateTimeFormatter1));
 //            审批备注
-            applicationProcedure.setExamineAndApproveRemark(remark);
-            applicationProcedureTemporaryService.updateById(applicationProcedure);
-            return CommonResult.ok();
+                applicationProcedure.setExamineAndApproveRemark(remark);
+                applicationProcedureTemporaryService.updateById(applicationProcedure);
+                return CommonResult.ok();
+            }
+            return CommonResult.fail("权限不足");
         }
 
 //        当为最高审批人
@@ -377,48 +387,33 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         AdminMenu byId = adminMenuService.getById(adminMenuId);
         Integer parentId = byId.getParentId();
 
-        IPage<ApplicationProcedureTemporary> pageList=null;
+        PageUtils<ApplicationProcedureTemporaryVo> pageList=null;
         //审批一次，角色等级不为0
         if ("1".equals(approverType)) {
             if (parentId!=0) {
                 return CommonResult.ok("无审批权限");
             }else {
-                LambdaQueryWrapper<ApplicationProcedureTemporary> wrapper=new LambdaQueryWrapper<>();
-                wrapper.eq(ObjectUtils.isNotEmpty(status),ApplicationProcedureTemporary::getStatus,status)
-                        .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime)
-                        .orderByDesc(ApplicationProcedureTemporary::getSubmissionTime);
 
-                pageList=applicationProcedureTemporaryService.page(new Page<>(page,size),wrapper);
+                pageList=applicationProcedureTemporaryService.pageAppletList(startTime,endTime,status,page,size);
                 return CommonResult.ok(pageList);
+
             }
 
         }
 
         if (parentId==0) {
 
-            LambdaQueryWrapper<ApplicationProcedureTemporary> wrapper=new LambdaQueryWrapper<>();
-//            全部则是没有待审批的全部
+            //            全部则是没有待审批的全部
             if (ObjectUtils.isEmpty(status)) {
-                ArrayList<String> strings = new ArrayList<>();
-                strings.add("0");
-                strings.add("2");
-                strings.add("3");
-                wrapper.in(ApplicationProcedureTemporary::getStatus,strings);
-            }else {
-                wrapper.eq(ApplicationProcedureTemporary::getStatus,status);
+                status="0,2,3";
             }
 
-            wrapper.between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime)
-                    .orderByDesc(ApplicationProcedureTemporary::getSubmissionTime);
-            pageList=applicationProcedureTemporaryService.page(new Page<>(page,size),wrapper);
-            return CommonResult.ok(pageList);
+            pageList=applicationProcedureTemporaryService.parentAppletPageList(startTime,endTime,status,page,size);
 
+            return CommonResult.ok(pageList);
         }
-        LambdaQueryWrapper<ApplicationProcedureTemporary> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(ObjectUtils.isNotEmpty(status),ApplicationProcedureTemporary::getStatus,status)
-                .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime)
-                .orderByDesc(ApplicationProcedureTemporary::getSubmissionTime);
-        pageList=applicationProcedureTemporaryService.page(new Page<>(page,size),wrapper);
+
+        pageList=applicationProcedureTemporaryService.pageAppletList(startTime,endTime,status,page,size);
         return CommonResult.ok(pageList);
 
 

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

@@ -568,11 +568,17 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime start = LocalDateTime.parse(startTime, dateTimeFormatter1);
         LocalDateTime end = LocalDateTime.parse(endTime, dateTimeFormatter1);
+
+
         ArrayList<ReserveDayVo> reserveDayVos = new ArrayList<>();
         for (int i = 0; i <= 8; i++) {
             LocalDateTime localDateTime=null;
             if (i==0) {
-                localDateTime=LocalDateTime.now();
+                //        判断传过来的时间和当前时间比较
+                LocalDateTime now = LocalDateTime.now();
+                if (now.isAfter(start)) {
+                    localDateTime= now;
+                }
             }else {
                 localDateTime = start.plusDays(i);
             }
@@ -1378,7 +1384,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
 //            boolean effectiveDate = DateUtil.isEffectiveDate(new Date(), liveTime, endTime);
 //            if (!effectiveDate) {
-            HouseNumberState houseNumberStateData = houseNumberStateService.getData(new Date(), houseNumberId);
+            List<HouseNumberState> houseNumberStateData = houseNumberStateService.getData(new Date(), houseNumberId);
             if (ObjectUtils.isEmpty(houseNumberStateData)) {
                 houseOrder.setLeaveTime(Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter).atZone(ZoneId.systemDefault()).toInstant()));
                 //      获取水电消费金额和额度

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

@@ -1044,7 +1044,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
 //            boolean effectiveDate = DateUtil.isEffectiveDate(new Date(), liveTime, endTime);
 //            if (!effectiveDate) {
-            HouseNumberState houseNumberStateData = houseNumberStateService.getData(new Date(), houseNumberId);
+            List<HouseNumberState> houseNumberStateData = houseNumberStateService.getData(new Date(), houseNumberId);
             if (ObjectUtils.isNotEmpty(houseNumberStateData)) {
                 houseOrder.setLeaveTime(Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter).atZone(ZoneId.systemDefault()).toInstant()));
                 //      获取水电消费金额和额度
@@ -1559,6 +1559,8 @@ public class HouseOrderController implements HouseOrderAPI {
                     orderName = "已退房";
                 } else if ("9".equals(orderStart)) {
                     orderName = "已取消";
+                }else if ("10".equals(orderStart)) {
+                    orderName = "已支付未入住";
                 }
                 dataRow1.createCell(13).setCellValue(orderName);
                 dataRow1.createCell(14).setCellValue(vo.getRemark());
@@ -2396,7 +2398,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
 //            boolean effectiveDate = DateUtil.isEffectiveDate(new Date(), liveTime, endTime);
 //            if (!effectiveDate) {
-            HouseNumberState houseNumberStateData = houseNumberStateService.getData(new Date(), houseNumberId);
+            List<HouseNumberState> houseNumberStateData = houseNumberStateService.getData(new Date(), houseNumberId);
             if (ObjectUtils.isEmpty(houseNumberStateData)) {
                 houseOrder.setLeaveTime(Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter).atZone(ZoneId.systemDefault()).toInstant()));
                 //      获取水电消费金额和额度

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

@@ -10,6 +10,7 @@ import com.template.common.utils.RSAUtils;
 import com.template.common.utils.paramUtils;
 import com.template.config.MySecurity;
 import com.template.model.pojo.Admin;
+import com.template.model.pojo.AdminMenu;
 import com.template.model.pojo.PermissionSetting;
 import com.template.model.request.changePasswordRequest;
 import com.template.model.request.loginRequest;
@@ -17,6 +18,7 @@ import com.template.model.result.CommonResult;
 import com.template.model.vo.FunctionPointVo;
 import com.template.model.vo.LoginVO;
 import com.template.model.vo.MenuBarVo;
+import com.template.services.AdminMenuService;
 import com.template.services.AdminService;
 import com.template.services.PermissionSettingService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +47,8 @@ public class LoginController implements LoginControllerAPI {
     @Autowired
     PermissionSettingService permissionSettingService;
 
+    @Autowired
+    AdminMenuService adminMenuService;
 
     /**
      * 登录接口
@@ -86,6 +90,10 @@ public class LoginController implements LoginControllerAPI {
             wrapper.eq(PermissionSetting::getAdminMenuId, adminMenuId);
             PermissionSetting one = permissionSettingService.getOne(wrapper);
 
+//            获取角色
+            AdminMenu adminMenu = adminMenuService.getById(adminMenuId);
+
+
             String token = JWTUtil.getAdminToken(result);
             LoginVO login = new LoginVO();
             login.setToken(token);
@@ -95,6 +103,7 @@ public class LoginController implements LoginControllerAPI {
             login.setPermissionSettingId(one.getId());
             login.setUser_head(AesUtils.encrypt(result.getId() + ""));
             login.setPermissionSetting(one);
+            login.setAdminMenuParentId(adminMenu.getParentId());
             return CommonResult.ok("登录成功", login);
 
         } catch (Exception e) {

src/main/java/com/template/mapper/ApplicationProcedureTemporaryMapper.java

@@ -1,12 +1,11 @@
 package com.template.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.model.pojo.ApplicationProcedureTemporary;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.template.model.vo.ApplicationProcedureTemporaryRecordVo;
 import com.template.model.vo.ApplicationProcedureTemporaryVo;
-import com.template.model.vo.ApplicationProcedureVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,9 +23,9 @@ import java.util.List;
 @Mapper
 public interface ApplicationProcedureTemporaryMapper extends BaseMapper<ApplicationProcedureTemporary> {
 
-    IPage<ApplicationProcedureTemporaryVo> pageList(Page<ApplicationProcedureVo> pageVo, @Param("submissionStartTime") String submissionStartTime, @Param("submissionEndTime") String submissionEndTime, @Param("examineAndApproveStartTime") String examineAndApproveStartTime, @Param("examineAndApproveEndTime") String examineAndApproveEndTime, @Param("type") String type, @Param("department") String department, @Param("key") String key);
+    IPage<ApplicationProcedureTemporaryVo> pageList(Page<ApplicationProcedureTemporaryVo> pageVo, @Param("submissionStartTime") String submissionStartTime, @Param("submissionEndTime") String submissionEndTime, @Param("examineAndApproveStartTime") String examineAndApproveStartTime, @Param("examineAndApproveEndTime") String examineAndApproveEndTime, @Param("type") String type, @Param("department") String department, @Param("key") String key);
 
-    IPage<ApplicationProcedureTemporaryVo> parentPageList(Page<ApplicationProcedureVo> pageVo, @Param("submissionStartTime") String submissionStartTime, @Param("submissionEndTime") String submissionEndTime, @Param("examineAndApproveStartTime") String examineAndApproveStartTime, @Param("examineAndApproveEndTime") String examineAndApproveEndTime, @Param("type") String type, @Param("department") String department, @Param("key") String key);
+    IPage<ApplicationProcedureTemporaryVo> parentPageList(Page<ApplicationProcedureTemporaryVo> pageVo, @Param("submissionStartTime") String submissionStartTime, @Param("submissionEndTime") String submissionEndTime, @Param("examineAndApproveStartTime") String examineAndApproveStartTime, @Param("examineAndApproveEndTime") String examineAndApproveEndTime, @Param("type") String type, @Param("department") String department, @Param("key") String key);
 
 
     IPage<ApplicationProcedureTemporaryRecordVo> appletRecordPage(Page<ApplicationProcedureTemporaryRecordVo> pageVo, @Param("userId") Integer userId,@Param("startTime")  String startTime,@Param("endTime")  String endTime,@Param("status")  String status);
@@ -34,4 +33,8 @@ public interface ApplicationProcedureTemporaryMapper extends BaseMapper<Applicat
     ApplicationProcedureTemporaryVo appletDetail(@Param("id") Integer id);
 
     List<ApplicationProcedureTemporary> getDate(@Param("dateTime") LocalDateTime dateTime,@Param("userId") String userId);
+
+    IPage<ApplicationProcedureTemporaryVo> pageAppletList(Page<ApplicationProcedureTemporaryVo> pageVo,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("status") String status);
+
+    IPage<ApplicationProcedureTemporaryVo> parentAppletPageList(Page<ApplicationProcedureTemporaryVo> pageVo, @Param("startTime") String startTime,@Param("endTime") String endTime,@Param("status") String status);
 }

src/main/java/com/template/mapper/HouseNumberStateMapper.java

@@ -25,7 +25,7 @@ public interface HouseNumberStateMapper extends BaseMapper<HouseNumberState> {
     List<HouseNumberState> beBooked(@Param("ids") String ids,@Param("reserveLiveTime") String reserveLiveTime, @Param("reserveLeaveTime")String reserveLeaveTime);
 
 
-    HouseNumberState getData(@Param("date") Date date,@Param("houseNumberId") String houseNumberId);
+    List<HouseNumberState> getData(@Param("date") Date date,@Param("houseNumberId") String houseNumberId);
 
     HouseNumberState getLockHouseNumberState(@Param("houseNumberId")String houseNumberId,@Param("now") LocalDateTime now);
 

src/main/java/com/template/model/vo/LoginVO.java

@@ -39,4 +39,5 @@ public class LoginVO {
 
     private PermissionSetting permissionSetting;
 
+    private Integer adminMenuParentId;
 }

src/main/java/com/template/services/ApplicationProcedureTemporaryService.java

@@ -29,4 +29,8 @@ public interface ApplicationProcedureTemporaryService extends IService<Applicati
     ApplicationProcedureTemporaryVo appletDetail(Integer id);
 
     List<ApplicationProcedureTemporary> getDate(LocalDateTime dateTime, String userId);
+
+    PageUtils<ApplicationProcedureTemporaryVo> pageAppletList(String startTime, String endTime, String status, int page, int size);
+
+    PageUtils<ApplicationProcedureTemporaryVo> parentAppletPageList(String startTime, String endTime, String status, int page, int size);
 }

src/main/java/com/template/services/HouseNumberStateService.java

@@ -21,7 +21,7 @@ public interface HouseNumberStateService extends IService<HouseNumberState> {
 
     List<HouseNumberState> beBooked(String ids, String reserveLiveTime, String reserveLeaveTime);
 
-    HouseNumberState getData(Date date,String houseNumberId);
+    List<HouseNumberState> getData(Date date,String houseNumberId);
 
     HouseNumberState getLockHouseNumberState(String houseNumberId, LocalDateTime now);
 

src/main/java/com/template/services/impl/ApplicationProcedureTemporaryServiceImpl.java

@@ -8,7 +8,6 @@ import com.template.model.pojo.ApplicationProcedureTemporary;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.ApplicationProcedureTemporaryRecordVo;
 import com.template.model.vo.ApplicationProcedureTemporaryVo;
-import com.template.model.vo.ApplicationProcedureVo;
 import com.template.services.ApplicationProcedureTemporaryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,14 +31,14 @@ public class ApplicationProcedureTemporaryServiceImpl extends ServiceImpl<Applic
 
     @Override
     public PageUtils<ApplicationProcedureTemporaryVo> pageList(String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size) {
-        Page<ApplicationProcedureVo> pageVo = new Page<>(page,size);
+        Page<ApplicationProcedureTemporaryVo> pageVo = new Page<>(page,size);
         IPage<ApplicationProcedureTemporaryVo> result=applicationProcedureTemporaryMapper.pageList(pageVo,submissionStartTime,submissionEndTime,examineAndApproveStartTime,examineAndApproveEndTime,type,department,key);
         return new PageUtils(result);
     }
 
     @Override
     public PageUtils<ApplicationProcedureTemporaryVo> parentPageList(String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size) {
-        Page<ApplicationProcedureVo> pageVo = new Page<>(page,size);
+        Page<ApplicationProcedureTemporaryVo> pageVo = new Page<>(page,size);
         IPage<ApplicationProcedureTemporaryVo> result=applicationProcedureTemporaryMapper.parentPageList(pageVo,submissionStartTime,submissionEndTime,examineAndApproveStartTime,examineAndApproveEndTime,type,department,key);
         return new PageUtils(result);
     }
@@ -61,5 +60,19 @@ public class ApplicationProcedureTemporaryServiceImpl extends ServiceImpl<Applic
         return applicationProcedureTemporaryMapper.getDate(dateTime,userId);
     }
 
+    @Override
+    public PageUtils<ApplicationProcedureTemporaryVo> pageAppletList(String startTime, String endTime, String status, int page, int size) {
+        Page<ApplicationProcedureTemporaryVo> pageVo = new Page<>(page,size);
+        IPage<ApplicationProcedureTemporaryVo> result=applicationProcedureTemporaryMapper.pageAppletList(pageVo,startTime,endTime,status);
+        return new PageUtils(result);
+    }
+
+    @Override
+    public PageUtils<ApplicationProcedureTemporaryVo> parentAppletPageList(String startTime, String endTime, String status, int page, int size) {
+        Page<ApplicationProcedureTemporaryVo> pageVo = new Page<>(page,size);
+        IPage<ApplicationProcedureTemporaryVo> result=applicationProcedureTemporaryMapper.parentAppletPageList(pageVo,startTime,endTime,status);
+        return new PageUtils(result);
+    }
+
 
 }

src/main/java/com/template/services/impl/HouseNumberStateServiceImpl.java

@@ -36,7 +36,7 @@ public class HouseNumberStateServiceImpl extends ServiceImpl<HouseNumberStateMap
     }
 
     @Override
-    public HouseNumberState getData(Date date,String houseNumberId) {
+    public List<HouseNumberState> getData(Date date,String houseNumberId) {
         return houseNumberStateMapper.getData(date,houseNumberId);
     }
 

src/main/resources/mapper/template/ApplicationProcedureTemporaryMapper.xml

@@ -218,4 +218,66 @@
           AND #{dateTime} >= start_time
           AND end_time >= #{dateTime}
     </select>
+
+    <select id="pageAppletList" resultType="com.template.model.vo.ApplicationProcedureTemporaryVo">
+        SELECT
+            ap.id,
+            ap.users_id as usersId,
+            ap.start_time as startTime,
+            ap.end_time as endTime,
+            ap.department,
+            ap.reason_application as reasonApplication,
+            ap.submission_time as submissionTime,
+            ap.status,
+            ap.approver_id as approverId,
+            ap.examine_and_approve_time as examineAndApproveTime,
+            ap.examine_and_approve_remark as examineAndApproveRemark,
+            ap.secondary_approver_id as secondaryApproverId,
+            ap.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
+            ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
+            u.user_name as usersName
+        FROM
+            `application_procedure_temporary` ap
+                LEFT JOIN users u on u.id=ap.users_id and u.deleted=0
+        where
+            ap.deleted=0
+        <if test="startTime != null and startTime != ''  and  endTime != null and startTime != '' ">
+            AND ap.submission_time>=#{startTime} and #{endTime}>=ap.submission_time
+        </if>
+
+        <if test="status != null and status != ''">
+            AND ap.`status`=#{status}
+        </if>
+        ORDER BY ap.submission_time DESC
+    </select>
+
+    <select id="parentAppletPageList" resultType="com.template.model.vo.ApplicationProcedureTemporaryVo">
+        SELECT
+        ap.id,
+        ap.users_id as usersId,
+        ap.start_time as startTime,
+        ap.end_time as endTime,
+        ap.department,
+        ap.reason_application as reasonApplication,
+        ap.submission_time as submissionTime,
+        ap.status,
+        ap.approver_id as approverId,
+        ap.examine_and_approve_time as examineAndApproveTime,
+        ap.examine_and_approve_remark as examineAndApproveRemark,
+        ap.secondary_approver_id as secondaryApproverId,
+        ap.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
+        ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
+        u.user_name as usersName
+        FROM
+        `application_procedure_temporary` ap
+        LEFT JOIN users u on u.id=ap.users_id and u.deleted=0
+        where
+        ap.deleted=0
+        <if test="startTime != null and startTime != ''  and  endTime != null and startTime != '' ">
+            AND ap.submission_time>=#{startTime} and #{endTime}>=ap.submission_time
+        </if>
+        and FIND_IN_SET(ap.status,#{status})
+        ORDER BY ap.submission_time DESC
+    </select>
+
 </mapper>