Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpInspectionController.java

@@ -8,6 +8,7 @@ import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabWhitelist;
 import com.zd.laboratory.domain.XxpClassify;
+import com.zd.laboratory.domain.XxpDuty;
 import com.zd.laboratory.domain.XxpInspection;
 import com.zd.laboratory.domain.vo.XxpInspectionVO;
 import com.zd.laboratory.service.IXxpClassifyService;
@@ -67,7 +68,7 @@ public class LabXxpInspectionController extends BaseController
         Map<String,XxpInspectionVO> allMap = new LinkedHashMap<>();
         //startPage();
         //获取时间段内签到人员总数
-        List<XxpInspectionVO> signinList = xxpInspectionService.selectListSignin(inspectionVO);
+        List<XxpInspectionVO> signinList = xxpInspectionService.selectListSigninCount(inspectionVO);
         Optional.ofNullable(signinList).orElseGet(Collections::emptyList)
                 .stream()
                 .forEach(a->{
@@ -76,7 +77,7 @@ public class LabXxpInspectionController extends BaseController
                 });
 
         //获取时间段内签到人员总数
-        List<XxpInspectionVO> notSigninLlist = xxpInspectionService.selectListNotSignin(inspectionVO);
+        List<XxpInspectionVO> notSigninLlist = xxpInspectionService.selectListNotSigninCount(inspectionVO);
         Optional.ofNullable(notSigninLlist).orElseGet(Collections::emptyList)
                 .stream()
                 .forEach(a->{
@@ -96,6 +97,37 @@ public class LabXxpInspectionController extends BaseController
                 .collect(Collectors.toList());
     }
 
+    /***
+     * 签到列表-正常
+     * @param xxpInspection
+     * @return
+     */
+    // @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXP_INSPECTION + PerFun.LIST)
+    @GetMapping("/listStandard")
+    @ApiOperation(value = "查询巡查列表-正常")
+    public TableDataInfo<XxpInspection> listStandard(XxpInspection xxpInspection)
+    {
+        startPage();
+        List<XxpInspection> list = xxpInspectionService.selectListSignin(xxpInspection);
+        return getDataTable(list);
+    }
+
+
+    /***
+     * 签到列表-正常
+     * @param xxpDuty
+     * @return
+     */
+    // @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXP_INSPECTION + PerFun.LIST)
+    @GetMapping("/listAbnormal")
+    @ApiOperation(value = "查询巡查列表-异常")
+    public TableDataInfo<XxpDuty> listAbnormal(XxpDuty xxpDuty)
+    {
+        startPage();
+        List<XxpDuty> list = xxpInspectionService.selectListAbnormal(xxpDuty);
+        return getDataTable(list);
+    }
+
     /**
      * 导出巡查列表
      */

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabSubject.java

@@ -195,8 +195,41 @@ public class LabSubject extends BaseEntity implements QCInterface {
 
     private String safeUserNames;
 
-    private Integer bottleTotal;//实验室气瓶总数
-    private Integer bottleUserTotal;//实验室单人气瓶总数
+    /**
+     * 实验室气瓶总数
+     */
+    private Integer bottleTotal;
+
+    /**
+     * 实验室单人气瓶总数
+     */
+    private Integer bottleUserTotal;
+
+    /***
+     *巡查人员,穿戴检查项
+     */
+    private String inspectCheckIn;
+
+    /***
+     *巡查人员,穿戴检查可跳过（0 否，1 是）
+     */
+    private String inspectSkipped;
+
+    /***
+     *巡查人员,穿戴检查识别上限
+     */
+    private String inspectCheckCount;
+
+    /***
+     *巡查人员,签到有效时间
+     */
+    private String inspectSignTime;
+
+    /***
+     *实验室详情
+     */
+    private String details;
+
     private List<Long> deptIds;
 
     /**
@@ -528,4 +561,44 @@ public class LabSubject extends BaseEntity implements QCInterface {
     public void setRoomName(String roomName) {
         this.roomName = roomName;
     }
+
+    public String getInspectCheckIn() {
+        return inspectCheckIn;
+    }
+
+    public void setInspectCheckIn(String inspectCheckIn) {
+        this.inspectCheckIn = inspectCheckIn;
+    }
+
+    public String getInspectSkipped() {
+        return inspectSkipped;
+    }
+
+    public void setInspectSkipped(String inspectSkipped) {
+        this.inspectSkipped = inspectSkipped;
+    }
+
+    public String getInspectCheckCount() {
+        return inspectCheckCount;
+    }
+
+    public void setInspectCheckCount(String inspectCheckCount) {
+        this.inspectCheckCount = inspectCheckCount;
+    }
+
+    public String getInspectSignTime() {
+        return inspectSignTime;
+    }
+
+    public void setInspectSignTime(String inspectSignTime) {
+        this.inspectSignTime = inspectSignTime;
+    }
+
+    public String getDetails() {
+        return details;
+    }
+
+    public void setDetails(String details) {
+        this.details = details;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/XxpInspectionMapper.java

@@ -1,6 +1,7 @@
 package com.zd.laboratory.mapper;
 
 import com.zd.laboratory.domain.XxpClassify;
+import com.zd.laboratory.domain.XxpDuty;
 import com.zd.laboratory.domain.XxpInspection;
 import com.zd.laboratory.domain.vo.XxpInspectionVO;
 
@@ -68,13 +69,26 @@ public interface XxpInspectionMapper
      * @param inspectionVO
      * @return
      */
-    public List<XxpInspectionVO> selectListSignin(XxpInspectionVO inspectionVO);
+    public List<XxpInspectionVO> selectListSigninCount(XxpInspectionVO inspectionVO);
 
     /***
      * 查询某时间段内未签到人数集合
      * @param inspectionVO
      * @return
      */
-    public List<XxpInspectionVO> selectListNotSignin(XxpInspectionVO inspectionVO);
+    public List<XxpInspectionVO> selectListNotSigninCount(XxpInspectionVO inspectionVO);
 
+    /***
+     * 正常签到列表
+     * @param inspection
+     * @return
+     */
+    public List<XxpInspection> selectListSignin(XxpInspection inspection);
+
+    /***
+     * 异常签到列表
+     * @param xxpDuty
+     * @return
+     */
+    public List<XxpDuty> selectListAbnormal(XxpDuty xxpDuty);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/IXxpInspectionService.java

@@ -1,5 +1,6 @@
 package com.zd.laboratory.service;
 
+import com.zd.laboratory.domain.XxpDuty;
 import com.zd.laboratory.domain.XxpInspection;
 import com.zd.laboratory.domain.vo.XxpInspectionVO;
 
@@ -70,12 +71,26 @@ public interface IXxpInspectionService
      * @param inspectionVO
      * @return
      */
-    public List<XxpInspectionVO> selectListSignin(XxpInspectionVO inspectionVO);
+    public List<XxpInspectionVO> selectListSigninCount(XxpInspectionVO inspectionVO);
 
     /***
      * 查询某时间段内未签到人数集合
      * @param inspectionVO
      * @return
      */
-    public List<XxpInspectionVO> selectListNotSignin(XxpInspectionVO inspectionVO);
+    public List<XxpInspectionVO> selectListNotSigninCount(XxpInspectionVO inspectionVO);
+
+    /***
+     * 正常签到列表
+     * @param inspection
+     * @return
+     */
+    public List<XxpInspection> selectListSignin(XxpInspection inspection);
+
+    /***
+     * 异常签到列表
+     * @param xxpDuty
+     * @return
+     */
+    public List<XxpDuty> selectListAbnormal(XxpDuty xxpDuty);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/XxpInspectionServiceImpl.java

@@ -1,8 +1,10 @@
 package com.zd.laboratory.service.impl;
 
+import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.laboratory.domain.XxpClassify;
+import com.zd.laboratory.domain.XxpDuty;
 import com.zd.laboratory.domain.XxpInspection;
 import com.zd.laboratory.domain.vo.XxpInspectionVO;
 import com.zd.laboratory.mapper.XxpClassifyMapper;
@@ -50,20 +52,7 @@ public class XxpInspectionServiceImpl implements IXxpInspectionService
      */
     @Override
     public List<XxpInspection> selectXxpInspectionList(XxpInspection xxpInspection) {
-        List<XxpInspection> list = xxpInspectionMapper.selectXxpInspectionList(xxpInspection);
-        String timeStr=null;
-        for (XxpInspection ins:list) {
-            if(StringUtils.isNotEmpty(ins.getResidenceTime())){
-                String[] time =  ins.getResidenceTime().split(":");
-                for (int i=0; i<time.length;i++){
-                    timeStr=time[0]+"时";
-                    timeStr+=time[1]+"分";
-                    timeStr+=time[2]+"秒";
-                    ins.setResidenceTime(timeStr);
-                }
-            }
-        }
-        return list;
+        return xxpInspectionMapper.selectXxpInspectionList(xxpInspection);
     }
 
     /**
@@ -116,8 +105,8 @@ public class XxpInspectionServiceImpl implements IXxpInspectionService
      * @return
      */
     @Override
-    public List<XxpInspectionVO> selectListSignin(XxpInspectionVO inspectionVO) {
-        return xxpInspectionMapper.selectListSignin(inspectionVO);
+    public List<XxpInspectionVO> selectListSigninCount(XxpInspectionVO inspectionVO) {
+        return xxpInspectionMapper.selectListSigninCount(inspectionVO);
     }
 
     /***
@@ -126,7 +115,43 @@ public class XxpInspectionServiceImpl implements IXxpInspectionService
      * @return
      */
     @Override
-    public List<XxpInspectionVO> selectListNotSignin(XxpInspectionVO inspectionVO) {
-        return xxpInspectionMapper.selectListNotSignin(inspectionVO);
+    public List<XxpInspectionVO> selectListNotSigninCount(XxpInspectionVO inspectionVO) {
+        return xxpInspectionMapper.selectListNotSigninCount(inspectionVO);
+    }
+
+    /***
+     * 正常签到列表
+     * @param inspection
+     * @return
+     */
+    @Override
+    public List<XxpInspection> selectListSignin(XxpInspection inspection) {
+        List<XxpInspection> list = xxpInspectionMapper.selectListSignin(inspection);
+        String timeStr=null;
+        for (XxpInspection ins:list) {
+            if(StringUtils.isNotEmpty(ins.getResidenceTime())){
+                String[] time =  ins.getResidenceTime().split(":");
+                for (int i=0; i<time.length;i++){
+                    timeStr=time[0]+"时";
+                    timeStr+=time[1]+"分";
+                    timeStr+=time[2]+"秒";
+                    ins.setResidenceTime(timeStr);
+                }
+            }
+        }
+        return list;
+    }
+
+    /***
+     * 异常签到列表
+     * @param xxpDuty
+     * @return
+     */
+    @Override
+    public List<XxpDuty> selectListAbnormal(XxpDuty xxpDuty) {
+        if(StringUtils.isNull(xxpDuty.getDutyTime()) ){
+            throw new ServiceException("时间不能为空！");
+        }
+        return xxpInspectionMapper.selectListAbnormal(xxpDuty);
     }
 }

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

@@ -26,6 +26,12 @@
         <result property="safeUserId" column="safe_user_id"/>
         <result property="moldId" column="mold_id"/>
         <result property="moldName" column="moldName"/>
+
+        <result property="inspectCheckIn" column="inspect_check_in"/>
+        <result property="inspectSkipped" column="inspect_skipped"/>
+        <result property="inspectCheckCount" column="inspect_check_count"/>
+        <result property="inspectSignTime" column="inspect_sign_time"/>
+        <result property="details" column="details"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSubjectVO" id="LabSubjectResultVO">
@@ -70,6 +76,11 @@
         <result property="moldName" column="moldName"/>
         <result property="adminNameAndPhone" column="adminNameAndPhone"/>
         <result property="safeUserNameAdminPhone" column="safeUserNameAdminPhone"/>
+        <result property="inspectCheckIn" column="inspect_check_in"/>
+        <result property="inspectSkipped" column="inspect_skipped"/>
+        <result property="inspectCheckCount" column="inspect_check_count"/>
+        <result property="inspectSignTime" column="inspect_sign_time"/>
+        <result property="details" column="details"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSubjectDetailVO" id="subjectAndInfoResult">
@@ -107,6 +118,11 @@
         <result property="skipped" column="skipped"/>
         <result property="checkCount" column="check_count"/>
         <result property="signTime" column="sign_time"/>
+        <result property="inspectCheckIn" column="inspect_check_in"/>
+        <result property="inspectSkipped" column="inspect_skipped"/>
+        <result property="inspectCheckCount" column="inspect_check_count"/>
+        <result property="inspectSignTime" column="inspect_sign_time"/>
+        <result property="details" column="details"/>
 
         <collection property="hazardSubjectRelations" column="id"
                     ofType="com.zd.laboratory.domain.LabHazardSubjectRelation"
@@ -150,6 +166,11 @@
                skipped,
                check_count,
                sign_time,
+               inspect_check_in,
+               inspect_skipped,
+               inspect_check_count,
+               inspect_sign_time,
+               details,
                (SELECT GROUP_CONCAT(ur.nick_name)
                 FROM sys_user ur
                 WHERE ur.`user_id`
@@ -230,6 +251,11 @@
                t.skipped,
                t.check_count,
                t.sign_time,
+               t.inspect_check_in,
+               t.inspect_skipped,
+               t.inspect_check_count,
+               t.inspect_sign_time,
+               t.details,
                CONCAT(su.nick_name, '@', su.phonenumber)                      AS          adminNameAndPhone,
 
                (select d.dept_name from sys_dept d where t.build_id = d.dept_id)          buildName,
@@ -280,7 +306,12 @@
                t.qr_code,
                su.nick_name   as                                                                admin_name,
                su.phonenumber as                                                                adminPhone,
-               sd.dept_name   as                                                                dept_name
+               sd.dept_name   as                                                                dept_name,
+               t.inspect_check_in,
+               t.inspect_skipped,
+               t.inspect_check_count,
+               t.inspect_sign_time,
+               t.details
         from lab_subject t
                  left join sys_user su on su.user_id = t.admin_id
                  left join sys_dept sd on sd.dept_id = t.dept_id
@@ -425,8 +456,12 @@
 
         (select d.dept_name from sys_dept d where t.build_id = d.dept_id) buildName,
         (select b.name from lab_building b where b.id = t.floor_id) floorName,
-        (SELECT l.room FROM lab_subject_layout l WHERE l.id = t.layout_id ) roomName
-
+        (SELECT l.room FROM lab_subject_layout l WHERE l.id = t.layout_id ) roomName,
+        t.inspect_check_in,
+        t.inspect_skipped,
+        t.inspect_check_count,
+        t.inspect_sign_time,
+        t.details
         from lab_subject t
         left join sys_user su on su.user_id = t.admin_id AND su.`del_flag`=0
         left join sys_dept sd on sd.dept_id = t.dept_id
@@ -544,6 +579,12 @@
             <if test="skipped != null">`skipped`,</if>
             <if test="checkCount != null">`check_count`,</if>
             <if test="moldId != null">`mold_id`,</if>
+
+            <if test="inspectCheckIn != null">inspect_check_in,</if>
+            <if test="inspectSkipped != null">inspect_skipped,</if>
+            <if test="inspectCheckCount != null">inspect_check_count,</if>
+            <if test="inspectSignTime != null">inspect_sign_time,</if>
+            <if test="details != null">details,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -578,6 +619,12 @@
             <if test="skipped != null">#{skipped},</if>
             <if test="checkCount != null">#{checkCount},</if>
             <if test="moldId != null">#{moldId},</if>
+
+            <if test="inspectCheckIn != null">#{inspectCheckIn},</if>
+            <if test="inspectSkipped != null">#{inspectSkipped},</if>
+            <if test="inspectCheckCount != null">#{inspectCheckCount},</if>
+            <if test="inspectSignTime != null">#{inspectSignTime},</if>
+            <if test="details != null">#{details},</if>
         </trim>
     </insert>
 
@@ -616,6 +663,12 @@
             <if test="checkCount != null">`check_count` = #{checkCount},</if>
             <if test="signTime != null">`sign_time` = #{signTime},</if>
             <if test="moldId != null">`mold_id` = #{moldId},</if>
+
+            <if test="inspectCheckIn != null">inspect_check_in = #{inspectCheckIn},</if>
+            <if test="inspectSkipped != null">inspect_skipped = #{inspectSkipped},</if>
+            <if test="inspectCheckCount != null">inspect_check_count = #{inspectCheckCount},</if>
+            <if test="inspectSignTime != null">inspect_sign_time = #{inspectSignTime},</if>
+            <if test="details != null">details = #{details},</if>
         </trim>
         where id = #{id}
     </update>
@@ -1040,11 +1093,7 @@
         </where>
 
     </select>
-    <select id="selectLabSubjectListPage" resultType="com.zd.laboratory.domain.vo.LabSubjectVO">
-        select *
-        from lab_subject
 
-    </select>
     <select id="selectLabSubjectListByLayout" parameterType="com.zd.laboratory.domain.LabSubject"
             resultMap="LabSubjectResult">
         select

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

@@ -41,7 +41,7 @@
             <if test="userName != null and userName != ''">and t.user_name = #{userName}</if>
             <if test="subjectId != null ">and t.subject_id = #{subjectId}</if>
             <if test="subjectName != null and subjectName != '' ">and t.subject_name = #{subjectName}</if>
-            <if test="signIn != null ">and t.sign_in = #{signIn}</if>
+            <if test="signIn != null ">and date_format(t.sign_in, '%Y-%m-%d') =date_format(#{signIn}, '%Y-%m-%d')</if>
             <if test="signOut != null ">and t.sign_out = #{signOut}</if>
             <if test="deptId != null ">and t.dept_id = #{deptId}</if>
             <if test="deptName != null ">and t.dept_name = #{deptName}</if>
@@ -130,14 +130,14 @@
         </foreach>
     </delete>
 
-    <select id="selectListSignin" parameterType="com.zd.laboratory.domain.XxpInspection"
+    <!-- 签到总数-->
+    <select id="selectListSigninCount" parameterType="com.zd.laboratory.domain.XxpInspection"
             resultType="com.zd.laboratory.domain.vo.XxpInspectionVO">
         select dutyTime, count(1) signInCount
         from (
         select date_format(sign_in, '%Y-%m-%d') dutyTime, user_id
         from xxp_inspection i
-        where sign_out is not null
-        and sign_in is not null
+        where sign_in is not null
         and sign_in &gt;= #{beginTime}
         and sign_in &lt;= #{endTime}
         <if test="deptId != null ">and ( i.dept_id in (SELECT dt.dept_id FROM sys_dept dt WHERE find_in_set(#{deptId}
@@ -149,7 +149,8 @@
         ORDER by dutyTime
     </select>
 
-    <select id="selectListNotSignin" parameterType="com.zd.laboratory.domain.XxpInspection"
+    <!-- 未签到总数-->
+    <select id="selectListNotSigninCount" parameterType="com.zd.laboratory.domain.XxpInspection"
             resultType="com.zd.laboratory.domain.vo.XxpInspectionVO">
         select dutyTime, count(1) noSignedInCount
         from (
@@ -174,4 +175,40 @@
         ORDER BY dutyTime
     </select>
 
+    <!-- 正常签到列表-->
+    <select id="selectListSignin" parameterType="com.zd.laboratory.domain.XxpInspection"
+            resultMap="XxpInspectionResult">
+        <include refid="selectXxpInspection"/>
+        where sign_in is not null and sign_out is not null
+        <if test="signIn != null">and date_format(t.sign_in, '%Y-%m-%d') =date_format(#{signIn}, '%Y-%m-%d')</if>
+    </select>
+
+    <!-- 异常签到列表-->
+    <select id="selectListAbnormal" parameterType="com.zd.laboratory.domain.XxpDuty"
+            resultType="com.zd.laboratory.domain.XxpDuty">
+        select d.user_name, d.user_phone, d.subject_name, '巡查后未签退' remark
+        from xxp_inspection i
+                 LEFT JOIN xxp_duty d
+                           on i.user_id = d.user_id and i.subject_id = d.subject_id and
+                              date_format(i.sign_in, '%Y-%m-%d') = d.duty_time
+        where sign_out is null
+          and date_format(i.sign_in, '%Y-%m-%d') = date_format(#{dutyTime}, '%Y-%m-%d')
+
+        UNION all
+
+        select user_name, user_phone, subject_name, '未巡查' remark
+        from (
+                 select du.user_name,
+                        du.user_phone,
+                        du.subject_name,
+                        (select count(1)
+                         from xxp_inspection i
+                         where i.user_id = du.user_id
+                           and date_format(i.sign_in, '%Y-%m-%d') = date_format(du.duty_time, '%Y-%m-%d')
+                           and i.subject_id = du.subject_id) noSignedInCount
+                 from xxp_duty du
+                 where du.duty_time = date_format(#{dutyTime}, '%Y-%m-%d')
+             ) t
+        where noSignedInCount = 0
+    </select>
 </mapper>

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/SysLogoConfig.java

@@ -69,6 +69,15 @@ public class SysLogoConfig extends BaseEntity
     @ApiModelProperty(value = "气瓶标签配置 1是有，0是无")
     private Integer airBottle;
 
+    @ApiModelProperty(value = "返回时间")
+    private Integer returnTime;
+
+    @ApiModelProperty(value = "注销时间")
+    private Integer logoutTime;
+
+    @ApiModelProperty(value = "是否启用信息牌 0不启用 1启用")
+    private Integer isStart;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -183,6 +192,30 @@ public class SysLogoConfig extends BaseEntity
         this.airBottle = airBottle;
     }
 
+    public Integer getReturnTime() {
+        return returnTime;
+    }
+
+    public void setReturnTime(Integer returnTime) {
+        this.returnTime = returnTime;
+    }
+
+    public Integer getLogoutTime() {
+        return logoutTime;
+    }
+
+    public void setLogoutTime(Integer logoutTime) {
+        this.logoutTime = logoutTime;
+    }
+
+    public Integer getIsStart() {
+        return isStart;
+    }
+
+    public void setIsStart(Integer isStart) {
+        this.isStart = isStart;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.system.mapper.SysLogoConfigMapper">
 
     <resultMap type="com.zd.system.domain.SysLogoConfig" id="SysLogoConfigResult">
@@ -18,78 +18,124 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userType" column="user_type"/>
         <result property="smartLock" column="smart_lock"/>
         <result property="airBottle" column="air_bottle"/>
+        <result property="returnTime" column="return_time"/>
+        <result property="logoutTime" column="logout_time"/>
+        <result property="isStart" column="is_start"/>
 
     </resultMap>
 
     <sql id="selectSysLogoConfigVo">
-        select id, school_name, circular_logo, rectangle_logo, lot_control, sign_map, video_cover, operation_guide, login_banner, homepage_banner,user_type,smart_lock,
-            air_bottle
+        select id,
+               school_name,
+               circular_logo,
+               rectangle_logo,
+               lot_control,
+               sign_map,
+               video_cover,
+               operation_guide,
+               login_banner,
+               homepage_banner,
+               user_type,
+               smart_lock,
+               air_bottle,
+               return_time,
+               logout_time,
+               is_start
         from sys_logo_config
     </sql>
     <sql id="selectSysLogoConfigListVo">
-        select t.id, t.school_name, t.circular_logo, t.rectangle_logo, t.lot_control, t.sign_map, t.video_cover, t.operation_guide, t.login_banner, t.homepage_banner,t.user_type from sys_logo_config as t
+        select t.id,
+               t.school_name,
+               t.circular_logo,
+               t.rectangle_logo,
+               t.lot_control,
+               t.sign_map,
+               t.video_cover,
+               t.operation_guide,
+               t.login_banner,
+               t.homepage_banner,
+               t.user_type,
+               t.return_time,
+               t.logout_time,
+               t.is_start
+        from sys_logo_config as t
     </sql>
-    <select id="selectSysLogoConfigList" parameterType="com.zd.system.domain.SysLogoConfig" resultMap="SysLogoConfigResult">
+    <select id="selectSysLogoConfigList" parameterType="com.zd.system.domain.SysLogoConfig"
+            resultMap="SysLogoConfigResult">
         <include refid="selectSysLogoConfigVo"/>
         <where>
-            <if test="schoolName != null  and schoolName != ''"> and school_name like concat('%', #{schoolName}, '%')</if>
-            <if test="circularLogo != null  and circularLogo != ''"> and circular_logo = #{circularLogo}</if>
-            <if test="rectangleLogo != null  and rectangleLogo != ''"> and rectangle_logo = #{rectangleLogo}</if>
-            <if test="lotControl != null  and lotControl != ''"> and lot_control = #{lotControl}</if>
-            <if test="signMap != null  and signMap != ''"> and sign_map = #{signMap}</if>
-            <if test="videoCover != null  and videoCover != ''"> and video_cover = #{videoCover}</if>
-            <if test="operationGuide != null  and operationGuide != ''"> and operation_guide = #{operationGuide}</if>
-            <if test="loginBanner != null  and loginBanner != ''"> and login_banner = #{loginBanner}</if>
-            <if test="homepageBanner != null  and homepageBanner != ''"> and homepage_banner = #{homepageBanner}</if>
+            <if test="schoolName != null  and schoolName != ''">and school_name like concat('%', #{schoolName}, '%')
+            </if>
+            <if test="circularLogo != null  and circularLogo != ''">and circular_logo = #{circularLogo}</if>
+            <if test="rectangleLogo != null  and rectangleLogo != ''">and rectangle_logo = #{rectangleLogo}</if>
+            <if test="lotControl != null  and lotControl != ''">and lot_control = #{lotControl}</if>
+            <if test="signMap != null  and signMap != ''">and sign_map = #{signMap}</if>
+            <if test="videoCover != null  and videoCover != ''">and video_cover = #{videoCover}</if>
+            <if test="operationGuide != null  and operationGuide != ''">and operation_guide = #{operationGuide}</if>
+            <if test="loginBanner != null  and loginBanner != ''">and login_banner = #{loginBanner}</if>
+            <if test="homepageBanner != null  and homepageBanner != ''">and homepage_banner = #{homepageBanner}</if>
+            <if test="returnTime != null">and return_time = #{returnTime}</if>
+            <if test="logoutTime != null">and logout_time = #{logoutTime}</if>
+            <if test="isStart != null">and is_start = #{isStart}</if>
         </where>
     </select>
 
-    <select id="selectSysLogoConfigById"  resultMap="SysLogoConfigResult">
+    <select id="selectSysLogoConfigById" resultMap="SysLogoConfigResult">
         <include refid="selectSysLogoConfigVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertSysLogoConfig" parameterType="com.zd.system.domain.SysLogoConfig" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSysLogoConfig" parameterType="com.zd.system.domain.SysLogoConfig" useGeneratedKeys="true"
+            keyProperty="id">
         insert into sys_logo_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="schoolName != null">school_name,</if>
+            <if test="schoolName != null">school_name,</if>
 
-    <if test="circularLogo != null">circular_logo,</if>
+            <if test="circularLogo != null">circular_logo,</if>
 
-    <if test="rectangleLogo != null">rectangle_logo,</if>
+            <if test="rectangleLogo != null">rectangle_logo,</if>
 
-    <if test="lotControl != null">lot_control,</if>
+            <if test="lotControl != null">lot_control,</if>
 
-    <if test="signMap != null">sign_map,</if>
+            <if test="signMap != null">sign_map,</if>
 
-    <if test="videoCover != null">video_cover,</if>
+            <if test="videoCover != null">video_cover,</if>
 
-    <if test="operationGuide != null">operation_guide,</if>
+            <if test="operationGuide != null">operation_guide,</if>
 
-    <if test="loginBanner != null">login_banner,</if>
+            <if test="loginBanner != null">login_banner,</if>
 
-    <if test="homepageBanner != null">homepage_banner,</if>
+            <if test="homepageBanner != null">homepage_banner,</if>
 
-    <if test="userType != null">user_type,</if>
+            <if test="userType != null">user_type,</if>
 
-    <if test="smartLock != null">smart_lock,</if>
+            <if test="smartLock != null">smart_lock,</if>
 
-    <if test="airBottle != null">air_bottle,</if>
-         </trim>
+            <if test="airBottle != null">air_bottle,</if>
+
+            <if test="returnTime != null">return_time,</if>
+
+            <if test="logoutTime != null">logout_time,</if>
+
+            <if test="isStart != null">is_start,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="schoolName != null">#{schoolName},</if>
-    <if test="circularLogo != null">#{circularLogo},</if>
-    <if test="rectangleLogo != null">#{rectangleLogo},</if>
-    <if test="lotControl != null">#{lotControl},</if>
-    <if test="signMap != null">#{signMap},</if>
-    <if test="videoCover != null">#{videoCover},</if>
-    <if test="operationGuide != null">#{operationGuide},</if>
-    <if test="loginBanner != null">#{loginBanner},</if>
-    <if test="homepageBanner != null">#{homepageBanner},</if>
-    <if test="userType != null">#{userType},</if>
-    <if test="smartLock != null">#{smartLock},</if>
-    <if test="airBottle != null">#{airBottle},</if>
-         </trim>
+            <if test="schoolName != null">#{schoolName},</if>
+            <if test="circularLogo != null">#{circularLogo},</if>
+            <if test="rectangleLogo != null">#{rectangleLogo},</if>
+            <if test="lotControl != null">#{lotControl},</if>
+            <if test="signMap != null">#{signMap},</if>
+            <if test="videoCover != null">#{videoCover},</if>
+            <if test="operationGuide != null">#{operationGuide},</if>
+            <if test="loginBanner != null">#{loginBanner},</if>
+            <if test="homepageBanner != null">#{homepageBanner},</if>
+            <if test="userType != null">#{userType},</if>
+            <if test="smartLock != null">#{smartLock},</if>
+            <if test="airBottle != null">#{airBottle},</if>
+            <if test="returnTime != null">#{returnTime},</if>
+            <if test="logoutTime != null">#{logoutTime},</if>
+            <if test="isStart != null">#{isStart},</if>
+        </trim>
     </insert>
 
     <update id="updateSysLogoConfig" parameterType="com.zd.system.domain.SysLogoConfig">
@@ -107,12 +153,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userType != null">user_type = #{userType},</if>
             <if test="smartLock != null">smart_lock = #{smartLock},</if>
             <if test="airBottle != null">air_bottle = #{airBottle},</if>
+
+            <if test="returnTime != null">return_time = #{returnTime},</if>
+            <if test="logoutTime != null">logout_time = #{logoutTime},</if>
+            <if test="isStart != null">is_start = #{isStart},</if>
         </trim>
         where id = #{id}
     </update>
 
-    <delete id="deleteSysLogoConfigById" >
-        delete from sys_logo_config where id = #{id}
+    <delete id="deleteSysLogoConfigById">
+        delete
+        from sys_logo_config
+        where id = #{id}
     </delete>
 
     <delete id="deleteSysLogoConfigByIds">