新增考勤统计

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/AttendanceStatDao.java

@@ -2,7 +2,7 @@ package com.mortals.xhx.module.attendance.dao;
 
 import com.mortals.framework.dao.ICRUDDao;
 import com.mortals.xhx.module.attendance.model.AttendanceStatEntity;
-import java.util.List;
+
 /**
 * 考勤汇总信息Dao
 * 考勤汇总信息 DAO接口
@@ -12,6 +12,9 @@ import java.util.List;
 */
 
 public interface  AttendanceStatDao extends ICRUDDao<AttendanceStatEntity,Long>{
-
+    /**
+     * 通过员工id查询
+     * */
+    AttendanceStatEntity queryEntity(Long staffId);
 
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/AttendanceVacationBalanceDao.java

@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao;
 
 import com.mortals.framework.dao.ICRUDDao;
 import com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceEntity;
-import java.util.List;
 /**
 * 员工假期余额信息Dao
 * 员工假期余额信息 DAO接口
@@ -13,5 +12,8 @@ import java.util.List;
 
 public interface  AttendanceVacationBalanceDao extends ICRUDDao<AttendanceVacationBalanceEntity,Long>{
 
-
+    /**
+     * 通过员工id查询
+     * */
+    AttendanceVacationBalanceEntity queryEntity(Long staffId);
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/ibatis/AttendanceStatDaoImpl.java

 package com.mortals.xhx.module.attendance.dao.ibatis;
 
 
-import org.springframework.stereotype.Repository;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import com.mortals.xhx.module.attendance.dao.AttendanceStatDao;
 import com.mortals.xhx.module.attendance.model.AttendanceStatEntity;
-import java.util.Date;
-import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
-import java.util.List;
+import org.springframework.stereotype.Repository;
 /**
 * 考勤汇总信息DaoImpl DAO接口
 *
@@ -17,5 +15,8 @@ import java.util.List;
 public class AttendanceStatDaoImpl extends BaseCRUDDaoMybatis<AttendanceStatEntity,Long> implements AttendanceStatDao {
 
 
-
+    @Override
+    public AttendanceStatEntity queryEntity(Long staffId) {
+        return getSqlSession().selectOne(getSqlId("queryEntity"),staffId);
+    }
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/ibatis/AttendanceVacationBalanceDaoImpl.java

 package com.mortals.xhx.module.attendance.dao.ibatis;
 
 
-import org.springframework.stereotype.Repository;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import com.mortals.xhx.module.attendance.dao.AttendanceVacationBalanceDao;
 import com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceEntity;
-import java.util.Date;
-import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
-import java.util.List;
+import org.springframework.stereotype.Repository;
 /**
 * 员工假期余额信息DaoImpl DAO接口
 *
@@ -17,5 +15,8 @@ import java.util.List;
 public class AttendanceVacationBalanceDaoImpl extends BaseCRUDDaoMybatis<AttendanceVacationBalanceEntity,Long> implements AttendanceVacationBalanceDao {
 
 
-
+    @Override
+    public AttendanceVacationBalanceEntity queryEntity(Long staffId) {
+        return getSqlSession().selectOne(getSqlId("queryEntity"),staffId);
+    }
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceStatEntity.java

@@ -857,7 +857,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
 
     public void initAttrValue(){
 
-        this.windowCategory = "";
+        this.windowCategory = "考勤机打卡";
 
         this.staffId = null;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/dao/DeptDao.java

@@ -36,8 +36,5 @@ public interface  DeptDao extends ICRUDDao<DeptEntity,Long>{
      * */
     DeptEntity queryDeptParient(String parentCode);
 
-    /**
-     *
-     * */
-    int queryDeptParentId(Long deptId);
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/dao/ibatis/DeptDaoImpl.java

@@ -37,10 +37,7 @@ public class DeptDaoImpl extends BaseCRUDDaoMybatis<DeptEntity,Long> implements
         return getSqlSession().selectOne(getSqlId("queryDeptParient"),parentCode);
     }
 
-    @Override
-    public int queryDeptParentId(Long deptId) {
-        return getSqlSession().selectOne(getSqlId("queryDeptParentId"),deptId);
-    }
+
 
 
 }

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

@@ -51,6 +51,4 @@ public interface DeptService extends ICRUDService<DeptEntity,Long>{
 
 
 
-    int queryParentId(Long deptId);
-
 }
\ No newline at end of file

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

@@ -56,7 +56,7 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
         DeptEntity newParentEntity = this.get(entity.getParentId());
         DeptEntity oldEntity = this.get(entity.getId());
         if (!ObjectUtils.isEmpty(newParentEntity) && !ObjectUtils.isEmpty(oldEntity)) {
-            String newAncestors = newParentEntity.getAncestors() + "," + newParentEntity.getId();
+            String newAncestors = newParentEntity.getAncestors() + "," +entity.getId();
             String oldAncestors = oldEntity.getAncestors();
             entity.setAncestors(newAncestors);
             updateDeptChildren(entity.getId(), newAncestors, oldAncestors, context);
@@ -154,7 +154,6 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
         if (returnList.isEmpty()) {
             returnList = list;
         }
-
         return returnList.stream().map(DeptTreeSelect::new).collect(Collectors.toList());
     }
 
@@ -209,9 +208,5 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
 
 
 
-    @Override
-    public int queryParentId(Long deptId) {
-        return dao.queryDeptParentId(deptId);
-    }
 
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java

@@ -132,8 +132,17 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
 
     @Override
     protected int doListAfter(DeptEntity query, Map<String, Object> model, Context context) throws AppException {
-        int Allperson =staffService.queryAllPerson();
-        model.put("AllPerson",Allperson);
+        int allPerson =staffService.queryAllPerson();
+        model.put("allPerson",allPerson);
+
         return super.doListAfter(query, model, context);
     }
+
+
+
+
+
+
+
+
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/StaffDao.java

@@ -52,11 +52,6 @@ public interface  StaffDao extends ICRUDDao<StaffEntity,Long>{
      * */
     int queryConcurrently();
 
-    /**
-     * 统计部门
-     * */
-    int queryPersonNum(Long deptId);
-
 
     /**
      *  查询部门信息

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/ibatis/StaffDaoImpl.java

@@ -53,10 +53,6 @@ public class StaffDaoImpl extends BaseCRUDDaoMybatis<StaffEntity,Long> implement
         return this.getSqlSession().selectOne(this.getSqlId("queryConcurrently"));
     }
 
-    @Override
-    public int queryPersonNum(Long deptId) {
-        return this.getSqlSession().selectOne(this.getSqlId("queryPersonNum"),deptId);
-    }
 
     @Override
     public StaffEntity queryHik(String remarkId) {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffVo.java

@@ -18,5 +18,4 @@ public class StaffVo extends BaseEntityLong {
 
     private List<StaffInfoVo>staffInfoVos;
 
-    private Integer personNum;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/StaffService.java

@@ -15,7 +15,6 @@ public interface StaffService extends ICRUDCacheService<StaffEntity,Long> {
 
     StaffInfoVo queryAll();
 
-    int queryDeptNum(Long deptId);
 
     int queryAllPerson();
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java

@@ -54,10 +54,6 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
         return staffInfoVo;
     }
 
-    @Override
-    public int queryDeptNum(Long deptId) {
-        return staffDao.queryPersonNum(deptId);
-    }
 
     @Override
     public int queryAllPerson() {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java

@@ -4,6 +4,9 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.dept.model.DeptEntity;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.model.DeptTreeSelect;
 import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.job.model.JobQuery;
 import com.mortals.xhx.module.job.service.JobService;
@@ -50,7 +53,9 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
         this.addDict(model, "staffType", paramService.getParamBySecondOrganize("Staff","staffType"));
         this.addDict(model, "status", paramService.getParamBySecondOrganize("Staff","status"));
         this.addDict(model, "positionId", jobService.find(new JobQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(),y->y.getJobName(),(o,n)->n)));
-
+        List<DeptEntity> list = deptService.find(new DeptQuery());
+        List<DeptTreeSelect> treeSelects = deptService.buildDeptTreeSelect(list);
+        this.addDict(model,"deptPerson",treeSelects);
         super.init(model, context);
     }
 

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

@@ -2562,4 +2562,7 @@
             </trim>
         </if>
     </sql>
+    <select id="queryEntity" resultType="com.mortals.xhx.module.attendance.model.AttendanceStatEntity">
+        select * from mortals_xhx_attendance_vacation_balance where staffId = #{staffId}
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -1800,4 +1800,7 @@
             </trim>
         </if>
     </sql>
+    <select id="queryEntity" resultType="com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceEntity">
+        select * from mortals_xhx_attendance_vacation_balance where staffId = #{staffId}
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -884,7 +884,5 @@
     <select id="queryDeptParient" resultType="com.mortals.xhx.module.dept.model.DeptEntity">
         select * from mortals_xhx_dept where deptCode = #{parentCode}
     </select>
-    <select id="queryDeptParentId" resultType="integer">
-        select parentId from mortals_xhx_dept where deptId = #{deptId}
-    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -1417,9 +1417,6 @@
         select count(1) pricateStaff from mortals_xhx_staff where staffType = 3
     </select>
 
-    <select id="queryPersonNum" resultType="integer">
-        select count(1) personNum from mortals_xhx_staff where deptId = #{deptId}
-    </select>
     <select id="queryHik" resultType="com.mortals.xhx.module.staff.model.StaffEntity">
         select * from mortals_xhx_staff where remarkId = #{remarkId}
     </select>