员工表添加两个字段

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java

@@ -114,6 +114,7 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
     @Override
     public boolean hasChildByDeptId(Long deptId) {
         List<DeptEntity> list = this.find(new DeptQuery().parentId(deptId));
+
         return list.size() > 0 ? true : false;
     }
 

attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceGroupFixedworkMapper.xml

@@ -45,8 +45,8 @@
         <result property="className" column="className" />
         <result property="addWay" column="addWay" />
         <result property="specialTime" column="specialTime" />
-        <result property="specialTimeStart" column="specialTimeStart" />
-        <result property="specialTimeEnd" column="specialTimeEnd" />
+        <result property="specialStartTime" column="specialStartTime" />
+        <result property="specialEndTime" column="specialEndTime" />
         <result property="remark" column="remark" />
         <result property="createUserId" column="createUserId" />
         <result property="createTime" column="createTime" />
@@ -153,7 +153,7 @@
     <!-- 子表所有列 -->
     <sql id="_columns_sub">
         <trim suffixOverrides="," suffix="">
-            b.id,b.fixedWorkId,b.must,b.classId,b.className,b.addWay,b.specialTime,b.specialTimeStart,b.specialTimeEnd,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime,
+            b.id,b.fixedWorkId,b.must,b.classId,b.className,b.addWay,b.specialTime,b.specialStartTime,b.specialEndTime,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime,
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->

db/menu.sql

@@ -546,5 +546,6 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacatio
 INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '8', '例假', 1, 4, 0, 'type', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '9', '哺乳假', 1, 4, 0, 'type', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '10', '丧假', 1, 4, 0, 'type', NULL, NULL, NULL);
+
 INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '1', '增加', 1, 4, 0, 'subAddType', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '2', '扣除', 1, 4, 0, 'subAddType', NULL, NULL, NULL);
\ No newline at end of file