Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/outint/controller/StudentOutInRecordController.java

@@ -10,6 +10,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.LocalDateTimeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.outint.dto.AddStudentOutInRecordDto;
@@ -35,6 +36,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.text.SimpleDateFormat;
 import java.util.List;
 
 /**
@@ -58,18 +60,22 @@ public class StudentOutInRecordController {
     public RT<PageOutput<StudentOutInRecordPageVo>> page(@Valid StudentOutInRecordPageDto dto){
 
         MPJLambdaWrapper<StudentOutInRecord> queryWrapper = MPJWrappers.<StudentOutInRecord>lambdaJoin()
+                .disableSubLogicDel()
                     .orderByDesc(StudentOutInRecord::getId)
                 .like(StrUtil.isNotBlank(dto.getName()), XjrUser::getName,dto.getName())
                 .like(StrUtil.isNotBlank(dto.getIdentityCard()), XjrUser::getCredentialNumber,dto.getIdentityCard())
                .eq(StrUtil.isNotBlank(dto.getStduyStatus()), BaseStudentSchoolRoll::getStduyStatus,dto.getStduyStatus())
-                .ge(ObjectUtil.isNotNull(dto.getStartTime()), StudentOutInRecord::getRecordTime,dto.getStartTime()+" 00:00:00")
-                .le(ObjectUtil.isNotNull(dto.getStartTime()),StudentOutInRecord::getRecordTime,dto.getStartTime()+" 23:59:59")
-                .eq(ObjectUtil.isNotNull(dto.getStatus()), StudentOutInRecord::getStatus, dto.getStatus())
+                .ge(ObjectUtil.isNotNull(dto.getStartTime()), StudentOutInRecord::getRecordTime,LocalDateTimeUtil.format(dto.getStartTime(),"yyyy-MM-dd")+" 00:00:00")
+                .le(ObjectUtil.isNotNull(dto.getStartTime()),StudentOutInRecord::getRecordTime,LocalDateTimeUtil.format(dto.getStartTime(),"yyyy-MM-dd")+" 23:59:59")
+                .eq(ObjectUtil.isNotEmpty(dto.getStatus()), StudentOutInRecord::getStatus, dto.getStatus())
                 .eq(ObjectUtil.isNotNull(dto.getClassId())&&dto.getClassId()!=0, StudentOutInRecord::getClassId, dto.getClassId())
+                .eq(ObjectUtil.isNotNull(dto.getUserId())&&dto.getUserId()!=0, StudentOutInRecord::getUserId, dto.getUserId())
                 .select(StudentOutInRecord::getId)
                 .select(StudentOutInRecord.class,x -> VoToColumnUtil.fieldsToColumns(StudentOutInRecordPageVo.class).contains(x.getProperty()))
-                .select(XjrUser::getName,XjrUser::getMobile,XjrUser::getCredentialNumber)
-                .leftJoin(XjrUser.class,XjrUser::getId,StudentOutInRecord::getUserId)
+                .leftJoin(XjrUser.class,XjrUser::getId,StudentOutInRecord::getUserId,
+                        ext->ext.selectAs(XjrUser::getCredentialNumber,StudentOutInRecordPageVo::getIdentityCard)
+                                .selectAs(XjrUser::getMobile,StudentOutInRecordPageVo::getPhone)
+                                .select(XjrUser::getName))
                 .leftJoin(BaseClass.class,BaseClass::getId,StudentOutInRecord::getClassId,ext->ext.selectAs(BaseClass::getName,StudentOutInRecordPageVo::getClassCn))
                 .leftJoin(XjrUser.class,XjrUser::getId,StudentOutInRecord::getTeacherId,ext->ext.selectAs(XjrUser::getName,StudentOutInRecordPageVo::getTeacherCn))
                 .leftJoin(BaseStudentSchoolRoll.class,BaseStudentSchoolRoll::getUserId,StudentOutInRecord::getUserId)

src/main/java/com/xjrsoft/module/outint/controller/TeacherOutInRecordController.java

@@ -10,13 +10,16 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.LocalDateTimeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.outint.dto.AddTeacherOutInRecordDto;
 import com.xjrsoft.module.outint.dto.TeacherOutInRecordPageDto;
 import com.xjrsoft.module.outint.dto.UpdateTeacherOutInRecordDto;
+import com.xjrsoft.module.outint.entity.StudentOutInRecord;
 import com.xjrsoft.module.outint.entity.TeacherOutInRecord;
 import com.xjrsoft.module.outint.service.ITeacherOutInRecordService;
+import com.xjrsoft.module.outint.vo.StudentOutInRecordPageVo;
 import com.xjrsoft.module.outint.vo.TeacherOutInRecordPageVo;
 import com.xjrsoft.module.outint.vo.TeacherOutInRecordVo;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
@@ -57,15 +60,21 @@ public class TeacherOutInRecordController {
     public RT<PageOutput<TeacherOutInRecordPageVo>> page(@Valid TeacherOutInRecordPageDto dto){
 
         MPJLambdaWrapper<TeacherOutInRecord> queryWrapper= MPJWrappers.<TeacherOutInRecord>lambdaJoin()
+                .disableSubLogicDel()
                 .orderByDesc(TeacherOutInRecord::getId)
                 .like(StrUtil.isNotBlank(dto.getName()), XjrUser::getName,dto.getName())
-                .ge(ObjectUtil.isNotNull(dto.getStartTime()),TeacherOutInRecord::getRecordTime,dto.getStartTime()+" 00:00:00")
-                .le(ObjectUtil.isNotNull(dto.getStartTime()),TeacherOutInRecord::getRecordTime,dto.getStartTime()+" 23:59:59")
-                .eq(ObjectUtil.isNotNull(dto.getStatus()), TeacherOutInRecord::getStatus, dto.getStatus())
+                .ge(ObjectUtil.isNotNull(dto.getStartTime()),TeacherOutInRecord::getRecordTime, LocalDateTimeUtil.format(dto.getStartTime(),"yyyy-MM-dd")+" 00:00:00")
+                .le(ObjectUtil.isNotNull(dto.getStartTime()),TeacherOutInRecord::getRecordTime,LocalDateTimeUtil.format(dto.getStartTime(),"yyyy-MM-dd")+" 23:59:59")
+                .eq(ObjectUtil.isNotEmpty(dto.getStatus()), TeacherOutInRecord::getStatus, dto.getStatus())
+                .eq(ObjectUtil.isNotNull(dto.getUserId())&&dto.getUserId()!=0, StudentOutInRecord::getUserId, dto.getUserId())
                 .select(TeacherOutInRecord::getId)
                 .select(TeacherOutInRecord.class,x -> VoToColumnUtil.fieldsToColumns(TeacherOutInRecordPageVo.class).contains(x.getProperty()))
-                .select(XjrUser::getName,XjrUser::getMobile,XjrUser::getCredentialNumber)
-                .leftJoin(XjrUser.class,XjrUser::getId,TeacherOutInRecord::getUserId)
+
+                .leftJoin(XjrUser.class,XjrUser::getId,TeacherOutInRecord::getUserId,
+                        ext->ext.selectAs(XjrUser::getCredentialNumber, TeacherOutInRecordPageVo::getIdentityCard)
+                        .selectAs(XjrUser::getMobile,TeacherOutInRecordPageVo::getPhone)
+                        .select(XjrUser::getName))
+
                 .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode, XjrUser::getGender, ext->ext.selectAs(DictionaryDetail::getName, TeacherOutInRecordPageVo::getGender));
 
         if(ObjectUtil.isNotNull(dto.getDeptId()) && dto.getDeptId() != 0){

src/main/java/com/xjrsoft/module/outint/dto/StudentOutInRecordPageDto.java

@@ -59,4 +59,10 @@ public class StudentOutInRecordPageDto extends PageInput {
      */
     @ApiModelProperty("就读方式(xjr_dictionary_item[stduy_status])")
     private String stduyStatus;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty("用户id")
+    private Long userId;
 }

src/main/java/com/xjrsoft/module/outint/dto/TeacherOutInRecordPageDto.java

@@ -47,5 +47,10 @@ public class TeacherOutInRecordPageDto extends PageInput {
      */
     @ApiModelProperty("部门ID")
     private Long deptId;
+    /**
+     * 用户id
+     */
+    @ApiModelProperty("用户id")
+    private Long userId;
 
 }

src/main/java/com/xjrsoft/module/outint/vo/TeacherOutInRecordPageVo.java

@@ -63,7 +63,7 @@ public class TeacherOutInRecordPageVo {
     * 人脸照片
     */
     @ApiModelProperty("人脸照片")
-    private Long facePhoto;
+    private String facePhoto;
     /**
     * 进出状态(0:进 1:出)
     */

src/main/java/com/xjrsoft/module/student/controller/BaseStudentPostController.java

@@ -64,7 +64,7 @@ public class BaseStudentPostController {
         queryWrapper
                 .select(BaseStudentPost::getId)
                 .eq(ObjectUtil.isNotNull(dto.getLevel()), BaseStudentPost::getLevel, dto.getLevel())
-                .eq(BaseStudentPost::getStatus,0)
+                .eq(BaseStudentPost::getStatus,1)
                 .orderByDesc(BaseStudentPost::getId)
                 .select(BaseStudentPost.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentPostListVo.class).contains(x.getProperty()));