月考勤导出添加备注
This commit is contained in:
parent
ec07f51615
commit
e8e7a6ea69
|
|
@ -225,7 +225,7 @@ public interface AttSourceDataDao {
|
|||
* @param nowDate
|
||||
* @param i
|
||||
*/
|
||||
void updateMonthReportRequiredDay(@Param("userId") String userId, @Param("nowDate") String nowDate, @Param("requiredDays") Long requiredDays, @Param("requiredDaysRemark") String requiredDaysRemark);
|
||||
void updateMonthReportRequiredDay(@Param("userId") String userId, @Param("nowDate") String nowDate, @Param("requiredDays") Long requiredDays, @Param("requiredDayRemark") String requiredDayRemark);
|
||||
|
||||
/**
|
||||
* 查询考勤人员基础数据
|
||||
|
|
|
|||
|
|
@ -145,5 +145,5 @@ public class AttMonthReportBean {
|
|||
private String endMonth;
|
||||
|
||||
/**考勤组成卑职*/
|
||||
private String requiredDaysRemark;
|
||||
private String requiredDayRemark;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,9 +103,9 @@ public interface AttCalService {
|
|||
* @param userId
|
||||
* @param nowDate
|
||||
* @param i
|
||||
* @param requiredDaysRemark
|
||||
* @param requiredDayRemark
|
||||
*/
|
||||
void updateMonthReportRequiredDay(String userId, String nowDate, Long i, String requiredDaysRemark);
|
||||
void updateMonthReportRequiredDay(String userId, String nowDate, Long i, String requiredDayRemark);
|
||||
|
||||
/**
|
||||
* 月半才第一次加入考勤组
|
||||
|
|
|
|||
|
|
@ -226,7 +226,7 @@ public class AttGroupServiceImpl implements AttGroupService {
|
|||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
|
||||
String currentYearMonth = sdf.format(new Date());
|
||||
list.get(0).setAttCurrentMonth(currentYearMonth);
|
||||
list.get(0).setRequiredDaysRemark(requiredDaysRemark.toString());
|
||||
list.get(0).setRequiredDayRemark(requiredDaysRemark.toString());
|
||||
attCalService.insertMonthHalfReportTempData(list);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -189,9 +189,7 @@ public class SysUserController extends BaseController {
|
|||
return error("修改用户'" + user.getUserName() + "'失败，用户名已存在");
|
||||
}
|
||||
user.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getSysUser().getUserId()));
|
||||
|
||||
// 修改leave_apply中的org_id
|
||||
|
||||
return toAjax(userService.updateUser(user));
|
||||
} catch (Exception e) {
|
||||
logger.error(e.toString(),e);
|
||||
|
|
|
|||
|
|
@ -309,8 +309,6 @@ public class SysUserServiceImpl implements SysUserService
|
|||
//删除用户与组织关联
|
||||
//旧组织
|
||||
Long[] orgIdsByUserId = userMapper.getOrgIdsByUserId(userId);
|
||||
//新组织
|
||||
Long[] orgIds = user.getOrgIds();
|
||||
userMapper.deleteUserOrgByUserId(userId);
|
||||
insertUserOrg(user);
|
||||
//处理人员组织变更，休假/外出/等审批组织
|
||||
|
|
@ -391,9 +389,7 @@ public class SysUserServiceImpl implements SysUserService
|
|||
* @param user 退出组织的用户信息，包含用户ID等必要数据
|
||||
*/
|
||||
private void dealOrgUserLeave(Long[] orgIdsByUserId, SysUser user) {
|
||||
|
||||
//比较老旧组织的是否发生改变
|
||||
|
||||
Map<Long, Long> oldOrgArray = arrayToMapUsingElementToList(orgIdsByUserId);
|
||||
Map<Long, Long> newOrgArray = arrayToMapUsingElementToList(user.getOrgIds());
|
||||
boolean isSame = compareSameMaps(oldOrgArray, newOrgArray);
|
||||
|
|
|
|||
|
|
@ -676,7 +676,7 @@ public class ExportFileController {
|
|||
List<AttMonthReportBean> attDayReportList = attendanceDetailsService.getAttMonthReportList(bean);
|
||||
Sheet departmentSheet1 = exporter.createSheet("月报表详情");
|
||||
List<String> departmentHeaders1 = Arrays.asList("序号", "姓名", "所属部门", "考勤月","打卡记录", "应考勤天数", "正常打卡天数",
|
||||
"迟到天数", "早退天数", "旷工天数", "请假天数", "打卡地异常天数", "出入异常天数", "轮休天数", "临时外出天数", "出差天数", "培训天数", "外勤天数");
|
||||
"迟到天数", "早退天数", "旷工天数", "请假天数", "打卡地异常天数", "出入异常天数", "轮休天数", "临时外出天数", "出差天数", "培训天数", "外勤天数", "考勤天数备注");
|
||||
exporter.addHeaderRowAndTitle(departmentSheet1, departmentHeaders1, title);
|
||||
List<Map<String, Object>> departmentData1 = new ArrayList<>();
|
||||
for (int i = 0; i < attDayReportList.size(); i++) {
|
||||
|
|
@ -699,6 +699,7 @@ public class ExportFileController {
|
|||
map.put("出差天数", attDayReportList.get(i).getBusinessTripNum());
|
||||
map.put("培训天数", attDayReportList.get(i).getTrainNum());
|
||||
map.put("外勤天数", attDayReportList.get(i).getOutsideAttNum());
|
||||
map.put("考勤天数备注", attDayReportList.get(i).getRequiredDayRemark());
|
||||
departmentData1.add(map);
|
||||
}
|
||||
exporter.addDataRows(departmentSheet1, departmentData1, departmentHeaders1);
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
values
|
||||
<foreach collection="list" item="params" separator=",">
|
||||
(#{params.userId}, #{params.userName}, #{params.orgId}, #{params.orgName},
|
||||
#{params.attCurrentMonth}, #{params.requiredDays}, #{params.requiredDaysRemark}
|
||||
#{params.attCurrentMonth}, #{params.requiredDays}, #{params.requiredDayRemark}
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
|
|
@ -182,7 +182,7 @@
|
|||
</update>
|
||||
<update id="updateMonthReportRequiredDay">
|
||||
update att_month_report
|
||||
set required_days = #{requiredDays},required_day_remark = #{requiredDaysRemark}
|
||||
set required_days = #{requiredDays},required_day_remark = #{requiredDayRemark}
|
||||
where user_id = #{userId}
|
||||
and att_current_month = DATE_FORMAT(#{nowDate}, '%Y-%m')
|
||||
</update>
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@
|
|||
</foreach>
|
||||
</insert>
|
||||
<delete id="deleteUserOrgByUserId">
|
||||
delete
|
||||
from sys_user_org
|
||||
update sys_user_org
|
||||
set is_active = '0'
|
||||
where user_id = #{userId}
|
||||
</delete>
|
||||
<delete id="deleteUserPostByUserId">
|
||||
|
|
|
|||
Loading…
Reference in New Issue