20200724-zlp-1

幼儿考勤管理

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildCheckinDetailController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.benyi.controller;
 
+import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.utils.SecurityUtils;
@@ -48,6 +49,10 @@ public class ByChildCheckinDetailController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(ByChildCheckinDetail byChildCheckinDetail) {
         startPage();
+        System.out.println("checkintime=" + byChildCheckinDetail.getCreateTime());
+        if (byChildCheckinDetail.getCreateTime() == null) {
+            byChildCheckinDetail.setCreateTime(new Date());
+        }
         List<ByChildCheckinDetail> list = byChildCheckinDetailService.selectByChildCheckinDetailList(byChildCheckinDetail);
         return getDataTable(list);
     }
@@ -89,7 +94,7 @@ public class ByChildCheckinDetailController extends BaseController {
                 for (int i = 0; i < strArr.length; i++) {
                     Long cid = Long.parseLong(strArr[i]);
                     byChildCheckinDetail.setChildid(cid);
-                    ByChild byChild=byChildService.selectByChildById(cid);
+                    ByChild byChild = byChildService.selectByChildById(cid);
                     byChildCheckinDetail.setChildname(byChild.getName());
                     byChildCheckinDetail.setClassid(byChild.getClassid());
                     byChildCheckinDetail.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildController.java

@@ -48,6 +48,16 @@ public class ByChildController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询幼儿考勤列表
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:checkindetail:list')")
+    @GetMapping("/listByCheck")
+    public TableDataInfo listByCheck(ByChild byChild) {
+        List<ByChild> list = byChildService.selectByCheckList(byChild);
+        return getDataTable(list);
+    }
+
     /**
      * 导出幼儿信息列表
      */

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathController.java

@@ -74,6 +74,9 @@ public class ByMathController extends BaseController
     @GetMapping("/treeselect")
     public AjaxResult treeselect(ByMath byMath) {
         List<ByMath> byMathDetails = byMathService.selectByMathListTree(byMath);
+//        for(int i=0;i<byMathDetails.size();i++){
+//            System.out.println("parentid="+byMathDetails.get(i).getParentId());
+//        }
         return AjaxResult.success(byMathService.buildMathTreeSelect(byMathDetails));
     }
 

ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByChildMapper.java

@@ -27,6 +27,14 @@ public interface ByChildMapper {
      */
     public List<ByChild> selectByChildList(ByChild byChild);
 
+    /**
+     * 查询幼儿信息列表-用于考勤
+     *
+     * @param byChild 幼儿信息
+     * @return 幼儿信息集合
+     */
+    public List<ByChild> selectByCheckList(ByChild byChild);
+
     /**
      * 新增幼儿信息
      *

ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByChildService.java

@@ -27,6 +27,14 @@ public interface IByChildService {
      */
     public List<ByChild> selectByChildList(ByChild byChild);
 
+    /**
+     * 查询幼儿信息列表-用于考勤
+     *
+     * @param byChild 幼儿信息
+     * @return 幼儿信息集合
+     */
+    public List<ByChild> selectByCheckList(ByChild byChild);
+
     /**
      * 新增幼儿信息
      *

ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByChildServiceImpl.java

@@ -42,6 +42,17 @@ public class ByChildServiceImpl implements IByChildService {
         return byChildMapper.selectByChildList(byChild);
     }
 
+    /**
+     * 查询幼儿信息列表-用于考勤
+     *
+     * @param byChild 幼儿信息
+     * @return 幼儿信息集合
+     */
+    @Override
+    public List<ByChild> selectByCheckList(ByChild byChild) {
+        return byChildMapper.selectByCheckList(byChild);
+    }
+
     /**
      * 新增幼儿信息
      *

ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeServiceImpl.java

@@ -74,7 +74,7 @@ public class ByThemeServiceImpl implements IByThemeService {
         }
         for (Iterator<ByTheme> iterator = byThemes.iterator(); iterator.hasNext(); ) {
             ByTheme item = (ByTheme) iterator.next();
-            //System.out.println("test==="+!tempList.contains(byDayFlowDetail.getParentId()));
+            //System.out.println("test==="+!tempList.contains(item.getParentId()));
             // 如果是顶级节点, 遍历该父节点的所有子节点
             if (!tempList.contains(item.getParentId())) {
                 recursionFn(byThemes, item);

ruoyi/src/main/resources/mybatis/benyi/ByChildCheckinDetailMapper.xml

@@ -29,6 +29,7 @@
             <if test="childname != null  and childname != ''">and childname like concat('%', #{childname}, '%')</if>
             <if test="type != null  and type != ''">and type = #{type}</if>
             <if test="createuserid != null ">and createuserid = #{createuserid}</if>
+            <if test="createTime != null ">and to_days(create_time) =to_days(#{createTime})</if>
         </where>
     </select>
 

ruoyi/src/main/resources/mybatis/benyi/ByChildMapper.xml

@@ -120,6 +120,73 @@
         </where>
     </select>
 
+    <select id="selectByCheckList" parameterType="ByChild" resultMap="ByChildResult">
+        select a.* from by_child a
+        where id not in (select childid from by_child_checkin_detail where to_days(create_time) = to_days(now()))
+        <if test="schoolid != null ">and schoolid = #{schoolid}</if>
+        <if test="classid != null  and classid != ''">and classid = #{classid}</if>
+        <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+        <if test="enName != null  and enName != ''">and en_name like concat('%', #{enName}, '%')</if>
+        <if test="infantName != null  and infantName != ''">and infant_name like concat('%', #{infantName}, '%')
+        </if>
+        <if test="phone != null  and phone != ''">and phone = #{phone}</if>
+        <if test="xb != null  and xb != ''">and xb = #{xb}</if>
+        <if test="mz != null  and mz != ''">and mz = #{mz}</if>
+        <if test="zjhm != null  and zjhm != ''">and zjhm = #{zjhm}</if>
+        <if test="csrq != null ">and csrq = #{csrq}</if>
+        <if test="birthProvince != null  and birthProvince != ''">and birth_province = #{birthProvince}</if>
+        <if test="birthProvincename != null  and birthProvincename != ''">and birth_provincename like concat('%',
+            #{birthProvincename}, '%')
+        </if>
+        <if test="birthCity != null  and birthCity != ''">and birth_city = #{birthCity}</if>
+        <if test="birthCityname != null  and birthCityname != ''">and birth_cityname like concat('%',
+            #{birthCityname}, '%')
+        </if>
+        <if test="birthArea != null  and birthArea != ''">and birth_area = #{birthArea}</if>
+        <if test="birthAreaname != null  and birthAreaname != ''">and birth_areaname like concat('%',
+            #{birthAreaname}, '%')
+        </if>
+        <if test="registeredProvince != null  and registeredProvince != ''">and registered_province =
+            #{registeredProvince}
+        </if>
+        <if test="registeredProvincename != null  and registeredProvincename != ''">and registered_provincename like
+            concat('%', #{registeredProvincename}, '%')
+        </if>
+        <if test="registeredCity != null  and registeredCity != ''">and registered_city = #{registeredCity}</if>
+        <if test="registeredCityname != null  and registeredCityname != ''">and registered_cityname like concat('%',
+            #{registeredCityname}, '%')
+        </if>
+        <if test="registeredArea != null  and registeredArea != ''">and registered_area = #{registeredArea}</if>
+        <if test="registeredAreaname != null  and registeredAreaname != ''">and registered_areaname like concat('%',
+            #{registeredAreaname}, '%')
+        </if>
+        <if test="addrProvince != null  and addrProvince != ''">and addr_province = #{addrProvince}</if>
+        <if test="addrProvincename != null  and addrProvincename != ''">and addr_provincename like concat('%',
+            #{addrProvincename}, '%')
+        </if>
+        <if test="addrCity != null  and addrCity != ''">and addr_city = #{addrCity}</if>
+        <if test="addrCityname != null  and addrCityname != ''">and addr_cityname like concat('%', #{addrCityname},
+            '%')
+        </if>
+        <if test="addrArea != null  and addrArea != ''">and addr_area = #{addrArea}</if>
+        <if test="addrAreaname != null  and addrAreaname != ''">and addr_areaname like concat('%', #{addrAreaname},
+            '%')
+        </if>
+        <if test="addrDetail != null  and addrDetail != ''">and addr_detail = #{addrDetail}</if>
+        <if test="everSchool != null  and everSchool != ''">and ever_school = #{everSchool}</if>
+        <if test="learnEnglish != null  and learnEnglish != ''">and learn_english = #{learnEnglish}</if>
+        <if test="source != null  and source != ''">and source = #{source}</if>
+        <if test="status != null  and status != ''">and status = #{status}</if>
+        <if test="enterDate != null ">and enter_date = #{enterDate}</if>
+        <if test="outDate != null ">and out_date = #{outDate}</if>
+        <if test="firstLanguage != null  and firstLanguage != ''">and first_language = #{firstLanguage}</if>
+        <if test="seconderLanguage != null  and seconderLanguage != ''">and seconder_language =
+            #{seconderLanguage}
+        </if>
+        <if test="otherLanguage != null  and otherLanguage != ''">and other_language = #{otherLanguage}</if>
+        <if test="createuserid != null ">and createuserid = #{createuserid}</if>
+    </select>
+
     <select id="selectByChildById" parameterType="Long" resultMap="ByChildResult">
         <include refid="selectByChildVo"/>
         where id = #{id}

ruoyi/src/main/resources/mybatis/benyi/ByMathMapper.xml

@@ -13,6 +13,7 @@
         <result property="classtypeId" column="classtype_id"/>
         <result property="sort" column="sort"/>
         <result property="createTime" column="create_time"/>
+        <result property="parentId" column="parent_id"/>
     </resultMap>
 
     <sql id="selectByMathVo">