bonus
/
gz_att
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改请假临时外出，上午还是下午

This commit is contained in:
史宗金 2025-01-03 15:35:32 +08:00
parent dc0de44ac3
commit d158a84a98
28 changed files with 184 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttDetailByMonthController.java
View File

@ -115,7 +115,7 @@ public class AttDetailByMonthController extends BaseController {
headers.put("4", "早退详情");
headers.put("5", "轮休详情");
headers.put("6", "请假详情");
headers.put("7", "外出办事");
headers.put("7", "临时外出");
headers.put("8", "出入异常");
headers.put("9", "打卡地异常");
headers.put("99", "工作外出");

14
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttExceptionHandleController.java
View File

@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 轮休外出办事异常数据
* 轮休临时外出异常数据
*
* @author hongchao
*/
@ -35,7 +35,7 @@ public class AttExceptionHandleController extends BaseController {
@RequiresPermissions("att:exception:query")
@GetMapping("/list")
@Log(title = "异常处理->轮休外出办事异常数据->列表查询", businessType = BusinessType.QUERY)
@Log(title = "异常处理->轮休临时外出异常数据->列表查询", businessType = BusinessType.QUERY)
public TableDataInfo list(AttExceptionBean data) {
startPage();
// List<AttExceptionBean> list = attExceptionHandle.selectAttExceptionList(data);
@ -44,7 +44,7 @@ public class AttExceptionHandleController extends BaseController {
@RequiresPermissions("att:exception:query")
@GetMapping("/getDetailException")
@Log(title = "异常处理->轮休外出办事异常报表->列表查询", businessType = BusinessType.QUERY)
@Log(title = "异常处理->轮休临时外出异常报表->列表查询", businessType = BusinessType.QUERY)
public TableDataInfo getDetailException(AttExceptionBean data) {
startPage();
List<AttExceptionBean> list = attExceptionHandle.getDetailException(data);
@ -62,7 +62,7 @@ public class AttExceptionHandleController extends BaseController {
@RequiresPermissions("att:exception:query")
@GetMapping("/getDetailExceptionOut")
@Log(title = "异常处理->外出办事异常报表未申请详情->列表查询", businessType = BusinessType.QUERY)
@Log(title = "异常处理->临时外出异常报表未申请详情->列表查询", businessType = BusinessType.QUERY)
public TableDataInfo getDetailExceptionOut(AttDetailLeaveBean data) {
startPage();
List<AttDetailLeaveBean> list = attExceptionHandle.getDetailExceptionOut(data);
@ -71,7 +71,7 @@ public class AttExceptionHandleController extends BaseController {
@RequiresPermissions("att:exception:query")
@GetMapping("/getDetailExceptionAll")
@Log(title = "异常处理->轮休和外出办事异常报表未申请详情->列表查询", businessType = BusinessType.QUERY)
@Log(title = "异常处理->轮休和临时外出异常报表未申请详情->列表查询", businessType = BusinessType.QUERY)
public TableDataInfo getDetailExceptionAll(AttDetailLeaveBean data) {
startPage();
List<AttDetailLeaveBean> list = attExceptionHandle.getDetailExceptionAll(data);
@ -84,7 +84,7 @@ public class AttExceptionHandleController extends BaseController {
try{
List<AttExceptionBean> list = attExceptionHandle.getDetailException(data);
ExcelUtil<AttExceptionBean> util = new ExcelUtil<AttExceptionBean>(AttExceptionBean.class);
util.exportExcel(response, list, "轮休外出办事异常报表");
util.exportExcel(response, list, "轮休临时外出异常报表");
}catch (Exception e){
log.error(e.toString(),e);
}
@ -96,7 +96,7 @@ public class AttExceptionHandleController extends BaseController {
* @return
*/
@PostMapping("/examineRemind")
@Log(title = "异常处理->外出办事异常报表->审批提醒", businessType = BusinessType.QUERY)
@Log(title = "异常处理->临时外出异常报表->审批提醒", businessType = BusinessType.QUERY)
public AjaxResult examineRemind(@Validated @RequestBody AttExRemindBean vo) {
return attExceptionHandle.examineRemind(vo);
}

16
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttExceptionHandleDao.java
View File

@ -7,40 +7,40 @@ import java.util.List;
import java.util.Map;
/**
* 轮休外出办事异常数据-数据访问层
* 轮休临时外出异常数据-数据访问层
* @author hongchao
*/
@Repository("attExceptionHandleDao")
public interface AttExceptionHandleDao {
/**
* 获取轮休外出办事异常数据
* 获取轮休临时外出异常数据
* @param data 参数
* @return list bean
*/
AttExceptionBean selectAttExceptionList(AttExceptionBean data);
/**
* 轮休外出办事异常月份
* 轮休临时外出异常月份
* @return
*/
List<Map<String,Object>> selectAttExceptionMonth();
/**
* 轮休外出办事异常未处理月份
* 轮休临时外出异常未处理月份
* @return
*/
List<Map<String,Object>> selectAttExceptionNoHandleMonth();
/**
* 获取轮休外出办事异常数据详情
* 获取轮休临时外出异常数据详情
* @param data 参数
* @return list bean
*/
List<AttExceptionBean> getDetailException(AttExceptionBean data);
/**
* 获取轮休外出办事异常数据详情
* 获取轮休临时外出异常数据详情
* @param data 参数
* @return list bean
*/
@ -54,14 +54,14 @@ public interface AttExceptionHandleDao {
List<AttDetailLeaveBean> getDetailExceptionRest(AttDetailLeaveBean data);
/**
* 获取外出办事异常报表未申请详情
* 获取临时外出异常报表未申请详情
* @param data 参数
* @return list bean
*/
List<AttDetailLeaveBean> getDetailExceptionOut(AttDetailLeaveBean data);
/**
* 获取轮休和外出办事异常报表未申请详情
* 获取轮休和临时外出异常报表未申请详情
* @param data 参数
* @return list bean
*/

4
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttExceptionBean.java
View File

@ -77,9 +77,9 @@ public class AttExceptionBean {
private int errorRestCount;
/**
* 外出办事未审批条数
* 临时外出未审批条数
*/
@Excel(name = "外出办事未审批条数")
@Excel(name = "临时外出未审批条数")
private int errorOutCount;
private int[] orgIds;

10
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttExceptionHandleService.java
View File

@ -7,20 +7,20 @@ import com.bonus.system.att.entity.*;
import java.util.List;
/**
* 轮休外出办事异常数据-业务层
* 轮休临时外出异常数据-业务层
* @author hongchao
*/
public interface AttExceptionHandleService {
/**
* 获取轮休外出办事异常数据
* 获取轮休临时外出异常数据
* @param data 参数
* @return list bean
*/
TableDataInfo selectAttExceptionList(AttExceptionBean data);
/**
* 获取轮休外出办事异常数据详情
* 获取轮休临时外出异常数据详情
* @param data 参数
* @return list bean
*/
@ -34,14 +34,14 @@ public interface AttExceptionHandleService {
List<AttDetailLeaveBean> getDetailExceptionRest(AttDetailLeaveBean data);
/**
* 获取外出办事异常报表未申请详情
* 获取临时外出异常报表未申请详情
* @param data 参数
* @return list bean
*/
List<AttDetailLeaveBean> getDetailExceptionOut(AttDetailLeaveBean data);
/**
* 获取轮休和外出办事异常报表未申请详情
* 获取轮休和临时外出异常报表未申请详情
* @param data 参数
* @return list bean
*/

12
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttExceptionHandleServiceImpl.java
View File

@ -28,7 +28,7 @@ import java.util.Map;
import java.util.stream.Collectors;
/**
* 轮休外出办事异常数据-业务层
* 轮休临时外出异常数据-业务层
* @author hongchao
*/
@Service("attExceptionHandle")
@ -76,7 +76,7 @@ public class AttExceptionHandleServiceImpl implements AttExceptionHandleService{
}
} catch (Exception e) {
log.error("查询轮休外出办事异常数据", e);
log.error("查询轮休临时外出异常数据", e);
}
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(HttpStatus.SUCCESS);
@ -150,7 +150,7 @@ public class AttExceptionHandleServiceImpl implements AttExceptionHandleService{
// }
//
// } catch (Exception e) {
// log.error("查询轮休外出办事异常数据详细信息", e);
// log.error("查询轮休临时外出异常数据详细信息", e);
// }
// return list;
// }
@ -180,7 +180,7 @@ public class AttExceptionHandleServiceImpl implements AttExceptionHandleService{
}
} catch (Exception e) {
log.error("查询轮休外出办事异常数据详细信息", e);
log.error("查询轮休临时外出异常数据详细信息", e);
}
return list;
}
@ -216,7 +216,7 @@ public class AttExceptionHandleServiceImpl implements AttExceptionHandleService{
list = attExceptionHandleDao.getDetailExceptionOut(data);
} catch (Exception e) {
log.error("查询外出办事异常报表未申请详情", e);
log.error("查询临时外出异常报表未申请详情", e);
}
return list;
}
@ -234,7 +234,7 @@ public class AttExceptionHandleServiceImpl implements AttExceptionHandleService{
list = attExceptionHandleDao.getDetailExceptionAll(data);
} catch (Exception e) {
log.error("查询轮休和外出办事异常报表未申请详情", e);
log.error("查询轮休和临时外出异常报表未申请详情", e);
}
return list;
}

7
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java
View File

@ -60,7 +60,7 @@ public class AttTasks {
private volatile boolean executed = false; // 标志位，表示任务是否已经执行过
// @Scheduled(cron = "0 0/10 * * * ?")
// @Scheduled(initialDelay = 60000, fixedDelay = 60000 * 10)
@Scheduled(initialDelay = 60000, fixedDelay = 60000 * 10)
@Async
public void getAttTasks() {
log.info("--------考勤定时器开启------");
@ -72,7 +72,7 @@ public class AttTasks {
/**
* 历史考勤数据
*/
@Scheduled(initialDelay = 6000 * 4,fixedDelay = 60000 * 30)
// @Scheduled(initialDelay = 6000 * 4,fixedDelay = 60000 * 30)
@Async
public void getHisAttTasks() {
log.info("--------考勤定时器开启------");
@ -119,7 +119,6 @@ public class AttTasks {
}
}
private void delHisData(String date) {
//查询基础数据是否完备
int i = attSourceDataDao.getFirstAttendanceData(date);
@ -139,7 +138,7 @@ public class AttTasks {
*/
private void pushAttData(String pushDate, int pushType) {
//获取黔送云的考勤数据
// getQsyAttendanceData(pushDate, pushType);
getQsyAttendanceData(pushDate, pushType);
//获取考勤机中的考勤数据
getMachineAttendanceData(pushDate, pushType);
// //查出每一个考勤组的应出勤天数以及考勤组的规则

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/HolidayTasks.java
View File

@ -70,7 +70,7 @@ public class HolidayTasks {
/**
* 考勤组变更更新数据
*/
@Scheduled(fixedDelay = 60000 * 60)
// @Scheduled(fixedDelay = 60000 * 60)
@Async
public void getOrgChange(){
OrgChangeBean bean = new OrgChangeBean();

12
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/MsgTasks.java
View File

@ -121,22 +121,22 @@ public class MsgTasks {
}
/**
* 轮休外出办事异常统计消息推送
* 轮休临时外出异常统计消息推送
* 每月1号7点执行的任务
*/
@Scheduled(cron = "0 0 7 1 * ?")
@Async
public void getHolidayTask(){
log.info("--------轮休外出办事异常推送定时器开启------");
log.info("--------轮休临时外出异常推送定时器开启------");
//1.查询月异常报表需要推送的人员（查询有权限查看这个模块的角色）
List<Long> userList = noticeService.getUserIdByModelName("轮休外出办事异常报表");
List<Long> userList = noticeService.getUserIdByModelName("轮休临时外出异常报表");
// 将 List 转换为数组
Long[] userIds = userList.toArray(new Long[0]);
SysNotice o = new SysNotice();
o.setUserIds(userIds);
o.setUserId(1L);
o.setTitle("月轮休外出办事异常统计");
o.setContent("月轮休外出办事异常统计");
o.setTitle("月轮休临时外出异常统计");
o.setContent("月轮休临时外出异常统计");
o.setType("63");
// 获取当前日期
DateTime currentDate = DateUtil.date();
@ -147,7 +147,7 @@ public class MsgTasks {
o.setValue(formattedDate);
////推送消息
noticeService.insertNotice(o);
log.info("--------轮休外出办事异常推送定时器开启------");
log.info("--------轮休临时外出异常推送定时器开启------");
}
}

35
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/WechatTasks.java
View File

@ -1,36 +1,23 @@
package com.bonus.system.att.tasks;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.bonus.common.core.utils.DateTimeHelper;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.utils.FastJsonHelper;
import com.bonus.common.core.utils.StringUtils;
import com.bonus.common.core.utils.encryption.AESCBCUtil;
import com.bonus.common.core.utils.encryption.AesCbcUtils;
import com.bonus.system.api.domain.SysUser;
import com.bonus.system.att.dao.AttGroupDao;
import com.bonus.system.att.dao.AttSourceDataDao;
import com.bonus.system.att.dao.WechatPushDao;
import com.bonus.system.att.entity.*;
import com.bonus.system.att.utils.AddressCoordinateFormatUtil;
import com.bonus.system.att.entity.AttFaceBean;
import com.bonus.system.att.entity.AttSourceDataBean;
import com.bonus.system.att.utils.DistanceCalculator;
import com.bonus.system.att.utils.IpAndPathConfig;
import com.bonus.system.att.utils.WorkdayCalculator;
import com.bonus.system.basic.domain.SysOrg;
import com.bonus.system.evection.entity.EvectionBean;
import com.bonus.system.holiday.entity.HolidayBean;
import com.bonus.system.index.entity.MapBean;
import lombok.extern.slf4j.Slf4j;
import okhttp3.*;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.MappedPropertyDescriptor;
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync;
@ -39,19 +26,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import javax.annotation.Resource;
import java.io.IOException;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import static com.bonus.system.att.utils.DistanceCalculator.calculateDistance;
@ -77,7 +52,7 @@ public class WechatTasks {
* 人员基础数据同步定时器
*/
// @Scheduled(cron = "0 0/10 * * * ?")
@Scheduled(initialDelay = 60000,fixedDelay = 60000 * 10)
@Scheduled(initialDelay = 60000,fixedDelay = 60000 * 30)
@Async
public void pushPersonTask() {
log.info("--------人员基础数据同步定时器开启------");
@ -106,7 +81,7 @@ public class WechatTasks {
/**
* 休假出差数据同步定时器
*/
@Scheduled(initialDelay = 60000 * 2,fixedDelay = 60000 * 10)
@Scheduled(initialDelay = 60000 * 2,fixedDelay = 60000 * 30)
@Async
public void leaveTask() {
log.info("--------休假出差数据定时器开启------");
@ -177,7 +152,7 @@ public class WechatTasks {
/**
* 考勤数据同步定时器
*/
@Scheduled(initialDelay = 60000 * 3,fixedDelay = 60000 * 10)
@Scheduled(initialDelay = 60000 * 3,fixedDelay = 60000 * 30)
@Async
public void wechatAttTask() {
log.info("--------考勤数据定时器开启------");

12
bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java
View File

@ -81,7 +81,7 @@ public class ExportFileController {
private SubOrgService subOrgService;
/**
* 轮休、请假、外出办事导出
* 轮休、请假、临时外出导出
*/
@Resource(name = "HolidayService")
private HolidayService holidayService;
@ -164,7 +164,7 @@ public class ExportFileController {
}
/**
* 轮休、请假、外出办事导出
* 轮休、请假、临时外出导出
*
* @param response
* @param bean
@ -204,7 +204,7 @@ public class ExportFileController {
vo.setLeaveDate(dateString);
personExportVoList.add(vo);
}
extracted(personExportVoList, HolidayBean.class, "轮休外出办事导出", "轮休外出办事导出", "轮休外出办事导出", response);
extracted(personExportVoList, HolidayBean.class, "轮休临时外出导出", "轮休临时外出导出", "轮休临时外出导出", response);
} catch (Exception e) {
log.error(e.toString(), e);
}
@ -447,7 +447,7 @@ public class ExportFileController {
headers.put("4", "早退详情");
headers.put("5", "轮休详情");
headers.put("6", "请假详情");
headers.put("7", "外出办事");
headers.put("7", "临时外出");
headers.put("8", "出入异常");
headers.put("9", "打卡地异常");
//工作外出单独一个，序号不占用考勤状态
@ -586,7 +586,7 @@ public class ExportFileController {
headers.put("4", "早退详情");
headers.put("5", "轮休详情");
headers.put("6", "请假详情");
headers.put("7", "外出办事");
headers.put("7", "临时外出");
headers.put("8", "出入异常");
headers.put("9", "打卡地异常");
headers.put("99", "工作外出");
@ -912,7 +912,7 @@ public class ExportFileController {
attStatus = "请假";
break;
case "7":
attStatus = "外出办事";
attStatus = "临时外出";
break;
case "8":
attStatus = "出入异常";

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ImportFileController.java
View File

@ -49,7 +49,7 @@ public class ImportFileController {
/**
* 轮休、请假、外出办事导出
* 轮休、请假、临时外出导出
*/
@Resource(name = "HolidayService")
private HolidayService holidayService;

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/HolidayController.java
View File

@ -28,7 +28,7 @@ import java.util.Collections;
import java.util.List;
/**
* 轮休、外出办事、请假
* 轮休、临时外出、请假
*
* @author fly
*/

6
bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/WorkReportController.java
View File

@ -105,7 +105,7 @@ public class WorkReportController extends BaseController {
List<WorkReportBean> list = service.getWorkReportList(bean);
//轮休数据
List<WorkReportBean> listLeave=new ArrayList<>();
//外出办事数据
//临时外出数据
List<WorkReportBean> listOut=new ArrayList<>();
//出差数据
List<WorkReportBean> listBusiness=new ArrayList<>();
@ -138,11 +138,11 @@ public class WorkReportController extends BaseController {
List<WorkReportBean> list1 = service.getDetailsList(bean1);
listLeave.addAll(list1);
//查询外出办事人员
//查询临时外出人员
WorkReportBean bean2 = new WorkReportBean();
bean2.setMonth(list.get(i).getMonth());
bean2.setOrgId(list.get(i).getOrgId());
bean2.setType("外出办事");
bean2.setType("临时外出");
List<WorkReportBean> list2 = service.getDetailsList(bean2);
listOut.addAll(list2);

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/entity/WorkReportBean.java
View File

@ -58,7 +58,7 @@ public class WorkReportBean extends BaseBean {
private String leaveNum;
/**
* 外出办事人数
* 临时外出人数
*/
private String outNum;

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/RequestReportServiceImpl.java
View File

@ -67,7 +67,7 @@ public class RequestReportServiceImpl implements RequestReportService {
//查询登陆人的角色
if (StringHelper.isNotEmpty(bean.getLeaveTypes())){
if ("临时外出".equals(bean.getLeaveTypes())){
bean.setLeaveTypes("外出办事");
bean.setLeaveTypes("临时外出");
} else if ("出差".equals(bean.getLeaveTypes())){
bean.setLeaveTypes("出差报备");
}

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/index/dao/HomePageDao.java
View File

@ -27,7 +27,7 @@ public interface HomePageDao {
IndexAbnormalBean getTodayAbnormalData(String date);
/**
* 当月轮休、外出办事异常情况
* 当月轮休、临时外出异常情况
* @param month 月份
* @return bean
*/

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/index/entity/IndexDataBean.java
View File

@ -27,7 +27,7 @@ public class IndexDataBean {
private IndexAbnormalBean todayAbnormalBean = new IndexAbnormalBean();
/**
* 当月轮休、外出办事异常情况
* 当月轮休、临时外出异常情况
*/
private IndexMonthAbnormalBean monthAbnormalBean = new IndexMonthAbnormalBean();

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/index/entity/IndexMonthAbnormalBean.java
View File

@ -3,7 +3,7 @@ package com.bonus.system.index.entity;
import lombok.Data;
/**
* 首页-当月轮休、外出办事异常情况
* 首页-当月轮休、临时外出异常情况
* @author zys
*/
@Data

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/index/service/HomePageServiceImpl.java
View File

@ -26,7 +26,7 @@ public class HomePageServiceImpl implements HomePageService{
IndexTodayAttBean todayAttBean = homePageDao.getTodayAttData(date);
//今日异常统计
IndexAbnormalBean todayAbnormalBean = homePageDao.getTodayAbnormalData(date);
//当月轮休、外出办事异常情况
//当月轮休、临时外出异常情况
IndexMonthAbnormalBean monthAbnormalBean = homePageDao.getMonthAbnormalData(month);
//组织人员
List<IndexOrgNumBean> orgNumBean = homePageDao.getOrgNumData();

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/wechat/controller/WechatController.java
View File

@ -141,7 +141,7 @@ public class WechatController extends BaseController {
attStatus = "请假";
break;
case "7":
attStatus = "外出办事";
attStatus = "临时外出";
break;
case "8":
attStatus = "出入异常";

18
bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml
View File

@ -6,10 +6,24 @@
<insert id="insertLeaveReporting">
INSERT INTO leave_apply(user_id, user_name, org_id, org_name, leave_type, type, leave_reason,
leave_start_date, leave_start_interval, leave_end_date, leave_end_interval,
leave_start_date,
<if test="leaveStartInterval != null">
leave_start_interval,
</if>
leave_end_date,
<if test="leave_end_interval != null">
leave_end_interval,
</if>
leave_duration, source, create_user_id, is_agree, location, host_user_id,host_user_name, remark,examine_status)
VALUES (#{userId}, #{userName}, #{orgId}, #{orgName}, '休假报备' , #{type}, #{leaveReason},
#{leaveStartDate}, #{leaveStartInterval}, #{leaveEndDate}, #{leaveEndInterval},
#{leaveStartDate},
<if test="leaveStartInterval != null">
#{leaveStartInterval},
</if>
#{leaveEndDate},
<if test="leaveEndInterval != null">
#{leaveEndInterval},
</if>
#{leaveDuration}, #{source}, #{createUserId}, #{isAgree}, #{location}, #{hostUserId},#{hostUserName}, #{remark},'1')
</insert>

44
bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml
View File

@ -10,23 +10,55 @@
</insert>
<insert id="insertWebLeave" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
insert into leave_apply(leave_form_id,submit_id,user_id,user_name,org_id,org_name,type,
leave_type,leave_reason,leave_start_date,leave_start_interval,leave_end_date,leave_end_interval,
leave_type,leave_reason,
leave_start_date,
<if test="leaveStartInterval != null">
leave_start_interval,
</if>
leave_end_date,
<if test="leave_end_interval != null">
leave_end_interval,
</if>
leave_duration,examine_user_id,examine_opinion,examine_time,examine_status,host_user_id,
host_user_name,is_agree,location,source,create_user_id,create_time,update_user_id,update_time,remark)
values(#{leaveFormId},#{submitId},#{userId},#{userName},#{orgId},#{orgName},#{type},
#{leaveType},#{leaveReason},#{leaveStartDate},#{leaveStartInterval},#{leaveEndDate},
#{leaveEndInterval},#{leaveDuration},#{examineUserId},#{examineOpinion},#{examineTime},
#{leaveType},#{leaveReason},
#{leaveStartDate},
<if test="leaveStartInterval != null">
#{leaveStartInterval},
</if>
#{leaveEndDate},
<if test="leaveEndInterval != null">
#{leaveEndInterval},
</if>
#{leaveDuration},#{examineUserId},#{examineOpinion},#{examineTime},
#{examineStatus},#{hostUserId},#{hostUserName},#{isAgree},#{location},#{source},
#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remark})
</insert>
<insert id="insertWechatLeave">
insert IGNORE into leave_apply(id,leave_form_id,submit_id,user_id,user_name,org_id,org_name,type,
leave_type,leave_reason,leave_start_date,leave_start_interval,leave_end_date,leave_end_interval,
leave_type,leave_reason,
leave_start_date,
<if test="leaveStartInterval != null">
leave_start_interval,
</if>
leave_end_date,
<if test="leave_end_interval != null">
leave_end_interval,
</if>
leave_duration,examine_user_id,examine_opinion,examine_time,examine_status,host_user_id,
host_user_name,is_agree,location,source,create_user_id,create_time,update_user_id,update_time,remark)
values(#{id}#{leaveFormId},#{submitId},#{userId},#{userName},#{orgId},#{orgName},#{type},
#{leaveType},#{leaveReason},#{leaveStartDate},#{leaveStartInterval},#{leaveEndDate},
#{leaveEndInterval},#{leaveDuration},#{examineUserId},#{examineOpinion},#{examineTime},
#{leaveType},#{leaveReason},
#{leaveStartDate},
<if test="leaveStartInterval != null">
#{leaveStartInterval},
</if>
#{leaveEndDate},
<if test="leaveEndInterval != null">
#{leaveEndInterval},
</if>
#{leaveDuration},#{examineUserId},#{examineOpinion},#{examineTime},
#{examineStatus},#{hostUserId},#{hostUserName},#{isAgree},#{location},#{source},
#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remark})
</insert>

2
bonus-modules/bonus-system/src/main/resources/mapper/basic/SysOrgDao.xml
View File

@ -97,7 +97,7 @@
<select id="getParentIdByName" resultType="java.lang.Long">
select id
from sys_organization
where org_name = #{orgName}
where org_name = #{orgName} and is_active = '1'
</select>
<select id="getOrgList" resultType="com.bonus.system.basic.domain.SysOrgImport">
SELECT org_name as `orgName`

18
bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml
View File

@ -6,11 +6,25 @@
<insert id="insertEvection">
INSERT INTO leave_apply(user_id, user_name, org_id, org_name, leave_type, leave_reason,
leave_start_date, leave_start_interval, leave_end_date, leave_end_interval,
leave_start_date,
<if test="leaveStartInterval != null">
leave_start_interval,
</if>
leave_end_date,
<if test="leave_end_interval != null">
leave_end_interval,
</if>
leave_duration, source, create_user_id, is_agree, location, host_user_id,host_user_name, remark
, leave_form_id, submit_id,examine_status,is_outside,is_xizang)
VALUES (#{userId}, #{userName}, #{orgId}, #{orgName}, '出差报备', #{leaveReason},
#{leaveStartDate}, #{leaveStartInterval}, #{leaveEndDate}, #{leaveEndInterval},
#{leaveStartDate},
<if test="leaveStartInterval != null">
#{leaveStartInterval},
</if>
#{leaveEndDate},
<if test="leaveEndInterval != null">
#{leaveEndInterval},
</if>
#{leaveDuration}, #{source}, #{createUserId}, #{isAgree}, #{location}, #{hostUserId},#{hostUserName}, #{remark},
#{uuid}, #{createUserId},'1',#{isOutside},#{isXizang})
</insert>

20
bonus-modules/bonus-system/src/main/resources/mapper/holiday/HolidayMapper.xml
View File

@ -5,11 +5,25 @@
<mapper namespace="com.bonus.system.holiday.dao.HolidayDao">
<insert id="insertHoliday" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
INSERT INTO leave_apply(user_id,user_name,org_id,org_name,leave_type,leave_reason,
leave_start_date,leave_start_interval,leave_end_date,leave_end_interval,
leave_start_date,
<if test="leaveStartInterval != null">
leave_start_interval,
</if>
leave_end_date,
<if test="leave_end_interval != null">
leave_end_interval,
</if>
leave_duration,examine_status,source,create_user_id,is_agree, location, host_user_id, remark,type)
VALUES(#{userId},#{userName},#{orgId},#{orgName},#{leaveType},#{leaveReason},
#{leaveStartDate},#{leaveStartInterval},#{leaveEndDate},#{leaveEndInterval},
#{leaveDuration},#{examineStatus},#{source},#{createUserId}, #{isAgree}, #{location}, #{hostUserId}, #{remark}, #{type})
#{leaveStartDate},
<if test="leaveStartInterval != null">
#{leaveStartInterval},
</if>
#{leaveEndDate},
<if test="leaveEndInterval != null">
#{leaveEndInterval},
</if>
#{leaveDuration},#{examineStatus},#{source},#{createUserId}, #{isAgree}, #{location}, #{hostUserId}, #{remark}, #{type})
</insert>
<update id="updateHoliday">
UPDATE leave_apply

20
bonus-modules/bonus-system/src/main/resources/mapper/holiday/RequestReportMapper.xml
View File

@ -5,10 +5,24 @@
<mapper namespace="com.bonus.system.holiday.dao.RequestReportDao">
<insert id="insertHoliday">
INSERT INTO leave_apply(user_id,user_name,org_id,org_name,leave_type,leave_reason,
leave_start_date,leave_start_interval,leave_end_date,leave_end_interval,
leave_start_date,
<if test="leaveStartInterval != null">
leave_start_interval,
</if>
leave_end_date,
<if test="leave_end_interval != null">
leave_end_interval,
</if>
leave_duration,examine_status,source,create_user_id,is_agree, location, host_user_id, remark,type)
VALUES(#{userId},#{userName},#{orgId},#{orgName},#{leaveType},#{leaveReason},
#{leaveStartDate},#{leaveStartInterval},#{leaveEndDate},#{leaveEndInterval},
#{leaveStartDate},
<if test="leaveStartInterval != null">
#{leaveStartInterval},
</if>
#{leaveEndDate},
<if test="leaveEndInterval != null">
#{leaveEndInterval},
</if>
#{leaveDuration},#{examineStatus},#{source},#{createUserId}, #{isAgree}, #{location}, #{hostUserId}, #{remark}, #{type})
</insert>
<insert id="insertWorkReportData">
@ -83,7 +97,7 @@
la.org_id as orgId,
SUM(CASE WHEN la.leave_type = '轮休' and la.examine_status='1' THEN 1 ELSE 0 END) AS leaveNum,
SUM(CASE WHEN la.leave_type = '出差报备' THEN 1 ELSE 0 END) AS businessTripNum,
SUM(CASE WHEN la.leave_type = '外出办事' and la.examine_status='1' THEN 1 ELSE 0 END) AS outNum,
SUM(CASE WHEN la.leave_type = '临时外出' and la.examine_status='1' THEN 1 ELSE 0 END) AS outNum,
SUM(
CASE
WHEN la.leave_type='病假' and la.source=2 THEN

20
bonus-modules/bonus-system/src/main/resources/mapper/holiday/WorkReportMapper.xml
View File

@ -5,10 +5,24 @@
<mapper namespace="com.bonus.system.holiday.dao.WorkReportDao">
<insert id="insertHoliday">
INSERT INTO leave_apply(user_id,user_name,org_id,org_name,leave_type,leave_reason,
leave_start_date,leave_start_interval,leave_end_date,leave_end_interval,
leave_start_date,
<if test="leaveStartInterval != null">
leave_start_interval,
</if>
leave_end_date,
<if test="leave_end_interval != null">
leave_end_interval,
</if>
leave_duration,examine_status,source,create_user_id,is_agree, location, host_user_id, remark,type)
VALUES(#{userId},#{userName},#{orgId},#{orgName},#{leaveType},#{leaveReason},
#{leaveStartDate},#{leaveStartInterval},#{leaveEndDate},#{leaveEndInterval},
#{leaveStartDate},
<if test="leaveStartInterval != null">
#{leaveStartInterval},
</if>
#{leaveEndDate},
<if test="leaveEndInterval != null">
#{leaveEndInterval},
</if>
#{leaveDuration},#{examineStatus},#{source},#{createUserId}, #{isAgree}, #{location}, #{hostUserId}, #{remark}, #{type})
</insert>
<insert id="insertWorkReportData">
@ -105,7 +119,7 @@
la.org_id as orgId,
SUM(CASE WHEN la.leave_type = '轮休' and (la.examine_status='1' or la.examine_status='0') THEN 1 ELSE 0 END) AS leaveNum,
SUM(CASE WHEN la.leave_type = '出差报备' THEN 1 ELSE 0 END) AS businessTripNum,
SUM(CASE WHEN la.leave_type = '外出办事' and (la.examine_status='1' or la.examine_status='0') THEN 1 ELSE 0 END) AS outNum,
SUM(CASE WHEN la.leave_type = '临时外出' and (la.examine_status='1' or la.examine_status='0') THEN 1 ELSE 0 END) AS outNum,
SUM(
CASE
WHEN la.leave_type='病假' and la.source=2 THEN