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

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/organize/domain/vo/SysDeptExt.java

@@ -11,16 +11,16 @@ public class SysDeptExt {
     /** Id */
     private Long deptId;
 
-    /** Id */
-    private String workdayHourStart;
+    /** 上班打卡开始时间 */
+    private String onDutyHourStart;
 
-    /** Id */
-    private String workdayHourEnd;
+    /** 上班打卡结束时间 */
+    private String onDutyHourEnd;
 
-    /** Id */
-    private String weekendHourStart;
+    /** 下班打卡开始时间 */
+    private String offDutyHourStart;
 
-    /** Id */
-    private String weekendHourEnd;
+    /** 下班打卡结束时间 */
+    private String offDutyHourEnd;
 
 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/manager/impl/DmDigitalmanManager.java

@@ -118,6 +118,8 @@ public class DmDigitalmanManager extends BaseManagerImpl<DmDigitalmanQuery, DmDi
 
         DmDigitalmanExtPo extPo = digitalmanExtMapper.selectByManCode(manCode);
         DmSyncDigitalmanDto sdmdto = new DmSyncDigitalmanDto();
+        System.err.println(extPo);
+        System.err.println(extPo.getDeptId());
         if (null != extPo && null != extPo.getDeptId()) {
             SysDeptExt deptExt = sysDeptExtMapper.selectWorkTimeByDeptId(extPo.getDeptId());
             sdmdto.setWorkdayHour(deptExt);//考勤时间

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/organize/domain/po/SysDeptExtPo.java

@@ -21,19 +21,19 @@ public class SysDeptExtPo extends TBaseEntity {
 
 
     private Long deptId;
-    /** 工作日上班时间 */
-    @Excel(name = "工作日上班时间")
-    protected String workdayHourStart;
+    /** 上班打卡开始时间 */
+    @Excel(name = "上班打卡开始时间")
+    protected String onDutyHourStart;
 
-    /** 工作日下班时间 */
-    @Excel(name = "工作日下班时间")
-    protected String workdayHourEnd;
+    /** 上班打卡结束时间 */
+    @Excel(name = "上班打卡结束时间")
+    protected String onDutyHourEnd;
 
-    /** 休息日上班时间 */
-    @Excel(name = "休息日上班时间")
-    protected String weekendHourStart;
+    /** 下班打卡开始时间 */
+    @Excel(name = "下班打卡开始时间")
+    protected String offDutyHourStart;
 
-    /** 休息日下班时间 */
-    @Excel(name = "休息日下班时间")
-    protected String weekendHourEnd;
+    /** 下班打卡结束时间 */
+    @Excel(name = "下班打卡结束时间")
+    protected String offDutyHourEnd;
 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorInnerApiController.java

@@ -329,6 +329,8 @@ public class DmVisitorInnerApiController extends BaseApiController {
                 }
             }
 
+        } else {
+            return AjaxResult.error("请检查发送短信的配置").toJson();
         }
         return AjaxResult.success().toJson();
     }

xueyi-modules/xueyi-system/src/main/resources/mapper/deptExt/SysDeptExtMapper.xml

@@ -6,29 +6,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="SysDeptExt" id="SysDeptExtResult">
         <result property="deptId"      column="dept_id"       />
-        <result property="workdayHourStart"      column="workday_hour_start"       />
-        <result property="workdayHourEnd"      column="workday_hour_end"       />
-        <result property="weekendHourStart"      column="weekend_hour_start"       />
-        <result property="weekendHourEnd"      column="weekend_hour_end"       />
+        <result property="onDutyHourStart"      column="on_duty_hour_start"       />
+        <result property="onDutyHourEnd"      column="on_duty_hour_end"       />
+        <result property="offDutyHourStart"      column="off_duty_hour_start"       />
+        <result property="weekendHourEnd"      column="off_duty_hour_end"       />
     </resultMap>
 
     <select id="selectWorkTimeByDeptId" parameterType="java.lang.Long" resultMap="SysDeptExtResult">
-        select dept_id, workday_hour_start, workday_hour_end, weekend_hour_start, weekend_hour_end from sys_dept_ext u
+        select dept_id, on_duty_hour_start, on_duty_hour_end, off_duty_hour_start, off_duty_hour_end from sys_dept_ext u
         where dept_id = #{deptId}
     </select>
 
     <insert id="insertWorkTimeByDeptId" parameterType="SysDeptExt">
-        insert into sys_dept_ext (dept_id,workday_hour_start,workday_hour_end,weekend_hour_start,weekend_hour_end)
-        values (#{deptId},#{workdayHourStart},#{workdayHourEnd},#{weekendHourStart},#{weekendHourEnd})
+        insert into sys_dept_ext (dept_id,on_duty_hour_start,on_duty_hour_end,off_duty_hour_start,off_duty_hour_end)
+        values (#{deptId},#{workdayHourStart},#{workdayHourEnd},#{offDutyHourStart},#{weekendHourEnd})
     </insert>
 
     <update id="updateWorkTimeByDeptId" parameterType="SysDeptExt">
         update sys_dept_ext
         <set>
-            <if test="workdayHourStart != null  ">workday_hour_start = #{workdayHourStart},</if>
-            <if test="workdayHourEnd != null  ">workday_hour_end = #{workdayHourEnd},</if>
-            <if test="weekendHourStart != null  ">weekend_hour_start = #{weekendHourStart},</if>
-            <if test="weekendHourEnd != null  ">weekend_hour_end = #{weekendHourEnd},</if>
+            <if test="workdayHourStart != null  ">on_duty_hour_start = #{workdayHourStart},</if>
+            <if test="workdayHourEnd != null  ">on_duty_hour_end = #{workdayHourEnd},</if>
+            <if test="offDutyHourStart != null  ">off_duty_hour_start = #{weekendHourStart},</if>
+            <if test="offDutyHourEnd != null  ">off_duty_hour_end = #{offDutyHourEnd},</if>
         </set>
         where dept_id = #{deptId}
     </update>