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

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SlOpendoorApplyController.java

@@ -43,9 +43,6 @@ public class SlOpendoorApplyController extends BaseController
     @Autowired
     private TokenService tokenService;
 
-    @Autowired
-    private SmartlockUtil smartlockUtil;
-
     /**
      * 查询申请开门列表
      */
@@ -55,7 +52,8 @@ public class SlOpendoorApplyController extends BaseController
     public TableDataInfo<SlOpendoorApplyVo> list(SlOpendoorApplyVo slOpendoorApply)
     {
         //获取登录用户
-        SysUser sysUser = tokenService.getLoginUser().getSysUser();
+        // SysUser sysUser = tokenService.getLoginUser().getSysUser();
+
         startPage("creat_time","descending");
         List<SlOpendoorApplyVo> list = slOpendoorApplyService.selectSlOpendoorApplyList(slOpendoorApply);
         for (SlOpendoorApplyVo vo:list) {

zd-modules/zd-algorithm/src/main/resources/mapper/smartlock/SlOpendoorApplyMapper.xml

@@ -119,7 +119,11 @@
             <if test="safeUserName != null  and position != ''">and t.safe_user_name = #{safeUserName}</if>
             <if test="position != null  and position != ''">and t.position = #{position}</if>
             <if test="college != null  and college != ''">and t.college = #{college}</if>
-            <if test="applyStatus != null ">and t.apply_status = #{applyStatus}</if>
+            <if test="applyStatus != null ">
+                <if test="applyStatus == 1 ">and t.creat_time &gt; now() </if>
+
+                <if test="applyStatus == 2 ">and t.creat_time &lt; now() </if>
+            </if>
             <if test="applyNumber != null ">and t.apply_number = #{applyNumber}</if>
             <if test="illustrate != null ">and t.illustrate = #{illustrate}</if>
             <if test="approvalUser != null ">and t.approval_user = #{approvalUser}</if>

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElChapterLearnRecordServiceImpl.java

@@ -6,6 +6,7 @@ import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SaveUtil;
 import com.zd.common.core.utils.SecurityUtils;
+import com.zd.common.core.utils.StringUtils;
 import com.zd.exam.domain.ElChapterLearnRecord;
 import com.zd.exam.domain.ElConvertRecord;
 import com.zd.exam.domain.ElCourseChapter;
@@ -259,7 +260,7 @@ public class ElChapterLearnRecordServiceImpl implements IElChapterLearnRecordSer
                             learnStatus = 0;
                             break;
                         }else if(chapter.getLearnStatus() == 1) {
-                            if(chapter.getIsAssess() == 1 && chapter.getAssessStatus() == 0){
+                            if(StringUtils.isNotNull(chapter.getIsAssess()) && chapter.getIsAssess() == 1 && chapter.getAssessStatus() == 0){
                                 learnStatus = 3;
                             }
                         }else {

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElCourseServiceImpl.java

@@ -275,7 +275,7 @@ public class ElCourseServiceImpl implements IElCourseService {
                         learnStatus = 0;
                         break;
                     }else if(chapter.getLearnStatus() == 1) {
-                        if(chapter.getIsAssess() == 1 && chapter.getAssessStatus() == 0){
+                        if(StringUtils.isNotNull(chapter.getIsAssess()) && chapter.getIsAssess() == 1 && chapter.getAssessStatus() == 0){
                             learnStatus = 3;
                         }
                     }else {

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabControlMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.zd.laboratory.domain.vo.LabControlVO" id="LabControlVOResult">
         <result property="subjectName"    column="subject_name"    />
+        <result property="hardwareType"    column="hardware_type"  typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"  />
 <!--        <result property="hardwareTypeEnum"    column="hardware_type_enum"    />-->
 
     </resultMap>
@@ -74,11 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ancestors) ))
             </if>
             <if test="subjectId != null and subjectId != ''"> and xx.subject_id = #{subjectId}</if>
-            <if test="beginTime != null ">
-                and str_to_date(xx.create_time,'%Y-%m-%d') >= #{beginTime}
+            <if test="beginTimeStr != null ">
+                and str_to_date(xx.create_time,'%Y-%m-%d') >= #{beginTimeStr}
             </if>
-            <if test="endTime != null ">
-                and str_to_date(xx.create_time,'%Y-%m-%d') &lt;= #{endTime}
+            <if test="endTimeStr != null ">
+                and str_to_date(xx.create_time,'%Y-%m-%d') &lt;= #{endTimeStr}
             </if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysClassMapper.xml

@@ -5,14 +5,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.system.mapper.SysClassMapper">
 
     <resultMap type="com.zd.system.domain.SysClass" id="SysClassResult">
-        <result property="id"    column="id"    />
-        <result property="className"    column="class_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="className" column="class_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectSysClassVo">

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysLogoConfigMapper.xml

@@ -5,18 +5,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.system.mapper.SysLogoConfigMapper">
 
     <resultMap type="com.zd.system.domain.SysLogoConfig" id="SysLogoConfigResult">
-        <result property="id"    column="id"    />
-        <result property="schoolName"    column="school_name"    />
-        <result property="circularLogo"    column="circular_logo"    />
-        <result property="rectangleLogo"    column="rectangle_logo"    />
-        <result property="signMap"    column="sign_map"    />
-        <result property="videoCover"    column="video_cover"    />
-        <result property="operationGuide"    column="operation_guide"    />
-        <result property="loginBanner"    column="login_banner"    />
-        <result property="homepageBanner"    column="homepage_banner"    />
-        <result property="userType"    column="user_type"    />
-        <result property="smartLock"    column="smart_lock"    />
-        <result property="airBottle"    column="air_bottle"    />
+        <result property="id" column="id"/>
+        <result property="schoolName" column="school_name"/>
+        <result property="circularLogo" column="circular_logo"/>
+        <result property="rectangleLogo" column="rectangle_logo"/>
+        <result property="signMap" column="sign_map"/>
+        <result property="videoCover" column="video_cover"/>
+        <result property="operationGuide" column="operation_guide"/>
+        <result property="loginBanner" column="login_banner"/>
+        <result property="homepageBanner" column="homepage_banner"/>
+        <result property="userType" column="user_type"/>
+        <result property="smartLock" column="smart_lock"/>
+        <result property="airBottle" column="air_bottle"/>
 
     </resultMap>
 

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysMajorMapper.xml

@@ -5,12 +5,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.system.mapper.SysMajorMapper">
 
     <resultMap type="com.zd.system.domain.SysMajor" id="SysMajorResult">
-        <result property="id"    column="id"    />
-        <result property="majorName"    column="major_name"    />
-        <result property="majorCode"    column="major_code"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="majorName" column="major_name"/>
+        <result property="majorCode" column="major_code"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectSysMajorVo">

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysPermitMenuMapper.xml

@@ -11,15 +11,11 @@
         <result property="userId" column="user_id"/>
         <result property="type" column="type"/>
         <result property="dataScope" column="data_scope"/>
-
         <result property="parentId" column="parent_id"/>
         <result property="menuType" column="menu_type"/>
-
         <result property="deptIdsList" column="deptIdsList"/>
-
         <collection property="deptIds" column="id" ofType="list"
                     select="com.zd.system.mapper.SysPermitMenuDeptMapper.selectDeptIdsByPermitMenuId"/>
-
     </resultMap>
 
     <resultMap type="com.zd.model.entity.SysPermitInfo" id="SysPermitInfo">
@@ -27,7 +23,6 @@
         <result property="menuId" column="menu_id"/>
         <result property="dataScope" column="data_scope"/>
         <result property="menuPerms" column="menuPerms"/>
-
         <collection property="deptIds" column="id" ofType="list"
                     select="com.zd.system.mapper.SysPermitMenuDeptMapper.selectDeptIdsByPermitMenuId"/>
     </resultMap>