From 6bfedf8cfeed6f400a1527b45c6eec14bffd75d8 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期五, 01 九月 2023 10:24:50 +0800
Subject: [PATCH] 加班管理
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java | 7 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java | 47 +++++++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml | 22 +++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java | 28 ++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentOvertimeService.java | 16 +++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentOvertimeMapper.java | 12 ++++
6 files changed, 127 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java
index 2d8f11e..485e9b1 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java
@@ -7,10 +7,12 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime;
import org.jeecg.modules.mdc.service.IMdcEquipmentOvertimeService;
import org.springframework.web.bind.annotation.*;
@@ -52,9 +54,10 @@
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<MdcEquipmentOvertime> queryWrapper = QueryGenerator.initQueryWrapper(mdcEquipmentOvertime, req.getParameterMap());
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
Page<MdcEquipmentOvertime> page = new Page<MdcEquipmentOvertime>(pageNo, pageSize);
- IPage<MdcEquipmentOvertime> pageList = mdcEquipmentOvertimeService.page(page, queryWrapper);
+ IPage<MdcEquipmentOvertime> pageList = mdcEquipmentOvertimeService.pageList(userId, page, mdcEquipmentOvertime, req);
return Result.OK(pageList);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
index 8e07728..5876e4e 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.mdc.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -12,6 +13,8 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
/**
* @Description: 璁惧鍔犵彮绠＄悊
@@ -47,7 +50,7 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- private java.util.Date startTime;
+ private Date startTime;
/**
* 缁撴潫鏃堕棿
*/
@@ -55,6 +58,27 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- private java.util.Date endTime;
+ private Date endTime;
+
+ /**
+ * 鍓嶅彴浼犲叆 鍒ゆ柇姣忎釜id
+ */
+ @TableField(exist = false)
+ private String parentId;
+
+ /**
+ * 鍓嶅彴浼犲叆 杞﹂棿灞傜骇:1 閮ㄩ棬灞傜骇:2
+ */
+ @TableField(exist = false)
+ private String typeTree;
+
+ /**
+ * 閮ㄩ棬parentId 鍏宠仈瀛愰泦id
+ */
+ @TableField(exist = false)
+ private List<String> mdcSectionIds;
+
+ @TableField(exist = false)
+ private String equipmentIds;
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentOvertimeMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentOvertimeMapper.java
index 2824391..14c933b 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentOvertimeMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentOvertimeMapper.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime;
/**
@@ -12,4 +15,13 @@
*/
public interface MdcEquipmentOvertimeMapper extends BaseMapper<MdcEquipmentOvertime> {
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param page
+ * @param mdcEquipmentOvertime
+ * @return
+ */
+ IPage<MdcEquipmentOvertime> pageList(Page<MdcEquipmentOvertime> page, @Param("mdcEquipmentOvertime") MdcEquipmentOvertime mdcEquipmentOvertime);
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml
index edd1eae..d145722 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml
@@ -2,4 +2,26 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mdc.mapper.MdcEquipmentOvertimeMapper">
+ <!--鍒嗛〉鏌ヨ-->
+ <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentOvertime">
+ SELECT
+ *
+ FROM
+ mdc_equipment_overtime
+ <where>
+ <if test="mdcEquipmentOvertime.equipmentId != null and mdcEquipmentOvertime.equipmentId != '' ">
+ AND equipment_id LIKE CONCAT(CONCAT('%',#{mdcEquipmentOvertime.equipmentId}),'%')
+ </if>
+ <if test="mdcEquipmentOvertime.startTime != null and mdcEquipmentOvertime.endTime != null">
+ AND efficient_date BETWEEN #{ mdcEquipmentOvertime.startTime } AND #{ mdcEquipmentOvertime.endTime }
+ </if>
+ <if test="mdcEquipmentOvertime.mdcSectionIds != null and mdcEquipmentOvertime.mdcSectionIds.size() > 0 ">
+ AND equipment_id IN
+ <foreach collection="mdcEquipmentOvertime.mdcSectionIds" item="id" index="index" open="(" close=")" separator=",">
+ #{ id }
+ </foreach>
+ </if>
+ </where>
+ order by
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentOvertimeService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentOvertimeService.java
index 1c2fc7a..964ed73 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentOvertimeService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentOvertimeService.java
@@ -1,15 +1,29 @@
package org.jeecg.modules.mdc.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime;
+
+import javax.servlet.http.HttpServletRequest;
/**
* @Description: 璁惧鍔犵彮绠＄悊
* @Author: Lius
- * @Date: 2023-08-25
+ * @Date: 2023-08-25
* @Version: V1.0
*/
public interface IMdcEquipmentOvertimeService extends IService<MdcEquipmentOvertime> {
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param userId
+ * @param page
+ * @param mdcEquipmentOvertime
+ * @param req
+ * @return
+ */
+ IPage<MdcEquipmentOvertime> pageList(String userId, Page<MdcEquipmentOvertime> page, MdcEquipmentOvertime mdcEquipmentOvertime, HttpServletRequest req);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java
index 42cd183..06e7f9b 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java
@@ -1,11 +1,21 @@
package org.jeecg.modules.mdc.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime;
import org.jeecg.modules.mdc.mapper.MdcEquipmentOvertimeMapper;
import org.jeecg.modules.mdc.service.IMdcEquipmentOvertimeService;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
/**
* @Description: 璁惧鍔犵彮绠＄悊
@@ -16,4 +26,41 @@
@Service
public class MdcEquipmentOvertimeServiceImpl extends ServiceImpl<MdcEquipmentOvertimeMapper, MdcEquipmentOvertime> implements IMdcEquipmentOvertimeService {
+ @Resource
+ private IMdcEquipmentService mdcEquipmentService;
+
+ @Override
+ public IPage<MdcEquipmentOvertime> pageList(String userId, Page<MdcEquipmentOvertime> page, MdcEquipmentOvertime mdcEquipmentOvertime, HttpServletRequest req) {
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(mdcEquipmentOvertime.getParentId()) && StringUtils.isEmpty(mdcEquipmentOvertime.getEquipmentId())) {
+ if ("2".equals(mdcEquipmentOvertime.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcEquipmentOvertime.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcEquipmentOvertime.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(mdcEquipmentOvertime.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ mdcEquipmentOvertime.setMdcSectionIds(Collections.singletonList(mdcEquipmentOvertime.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(mdcEquipmentOvertime.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+
+ if (mdcEquipmentOvertime.getMdcSectionIds() == null || mdcEquipmentOvertime.getMdcSectionIds().isEmpty()) {
+ mdcEquipmentOvertime.setMdcSectionIds(equipmentIds);
+ }
+
+ if (mdcEquipmentOvertime.getMdcSectionIds() == null || mdcEquipmentOvertime.getMdcSectionIds().isEmpty()) {
+ return null;
+ }
+ return this.baseMapper.pageList(page, mdcEquipmentOvertime);
+ }
}
--
Gitblit v1.9.3