From dcffd347f5ab47d3d158afddb86249fe8bc7e3e7 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期三, 12 七月 2023 13:56:56 +0800
Subject: [PATCH] 扭矩配置导入导出分页列表接口bug修复
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyShiftVo.java | 22 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java | 6 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcVacationManagementMapper.xml | 32 +++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/GenerateWeekDaysJob.java | 35 +++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyShiftListDto.java | 40 ++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 44 ++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java | 3
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcVacationManagementServiceImpl.java | 68 ++++++++-----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcVacationManagement.java | 12 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java | 11 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java | 3
12 files changed, 234 insertions(+), 44 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java
index f518d2b..874b959 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java
@@ -10,6 +10,7 @@
import org.jeecg.modules.mdc.service.MdcEfficiencyReportService;
import org.jeecg.modules.mdc.vo.MdcEfficiencyReportQueryVo;
import org.jeecg.modules.mdc.vo.MdcEfficiencyReportShiftQueryVo;
+import org.jeecg.modules.mdc.vo.MdcEfficiencyShiftVo;
import org.jeecg.modules.mdc.vo.MdcEfficiencyVo;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -56,7 +57,7 @@
public Result efficiencyShiftList(MdcEfficiencyReportShiftQueryVo vo) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
- MdcEfficiencyVo result = mdcEfficiencyReportService.efficiencyShiftList(userId, vo);
+ MdcEfficiencyShiftVo result = mdcEfficiencyReportService.efficiencyShiftList(userId, vo);
return Result.OK(result);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java
index 77413c3..0037c02 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java
@@ -27,7 +27,7 @@
@Slf4j
@RestController
@Api(tags = "鍋囨湡绠＄悊")
-@RequestMapping("/mdc/MdcVacationManagement")
+@RequestMapping("/mdc/mdcVacationManagement")
public class MdcVacationManagementController extends JeecgController<MdcVacationManagement, IMdcVacationManagementService> {
@Resource
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyShiftListDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyShiftListDto.java
new file mode 100644
index 0000000..200180d
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyShiftListDto.java
@@ -0,0 +1,40 @@
+package org.jeecg.modules.mdc.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author: LiuS
+ * @create: 2023-07-10 15:10
+ */
+@Data
+public class MdcEfficiencyShiftListDto {
+
+ private String level1;
+
+ private String level2;
+
+ private String level3;
+
+ /**
+ * 璁惧缂栫爜
+ */
+ private String equipmentId;
+ /**
+ * 璁惧鍚嶇О
+ */
+ private String equipmentName;
+ /**
+ * 璁惧绫诲瀷
+ */
+ private String equipmentType;
+ /**
+ * 鐝鍚嶇О
+ */
+ private String shiftSubName;
+ /**
+ * 鍒╃敤鐜囨暟鎹�
+ */
+ private List<MdcEfficiencyResultDto> dataList;
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcVacationManagement.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcVacationManagement.java
index 689408d..e8c5771 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcVacationManagement.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcVacationManagement.java
@@ -104,6 +104,18 @@
private String updateBy;
/**
+ * 寮�濮嬫椂闂�
+ */
+ @TableField(exist = false)
+ private String startTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @TableField(exist = false)
+ private String endTime;
+
+ /**
* 鍓嶅彴浼犲叆锛屽垽鏂瘡涓猧d
*/
@TableField(exist = false)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/GenerateWeekDaysJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/GenerateWeekDaysJob.java
new file mode 100644
index 0000000..6d2114e
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/GenerateWeekDaysJob.java
@@ -0,0 +1,35 @@
+package org.jeecg.modules.mdc.job;
+
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.mdc.service.IMdcVacationManagementService;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import javax.annotation.Resource;
+
+/**
+ * 鐢熸垚鍙屼紤鏃ュ畾鏃朵换鍔�
+ *
+ * @author: LiuS
+ * @create: 2023-07-11 15:17
+ */
+@Slf4j
+public class GenerateWeekDaysJob implements Job {
+
+ @Resource
+ private IMdcVacationManagementService mdcVacationManagementService;
+
+ @Override
+ public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+ log.info("瀹氭椂鐢熸垚鍙屼紤鏃ヤ换鍔� GenerateWeekDaysJob start! 鏃堕棿:" + DateUtils.now());
+ try {
+ mdcVacationManagementService.generateWeekDays();
+ log.info("瀹氭椂鐢熸垚鍙屼紤鏃ヤ换鍔� GenerateWeekDaysJob 鎵ц鎴愬姛!");
+ } catch (Exception e) {
+ log.error("瀹氭椂鐢熸垚鍙屼紤鏃ヤ换鍔� GenerateWeekDaysJob 鎵ц澶辫触!");
+ log.error(e.getMessage(), e);
+ }
+ }
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcVacationManagementMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcVacationManagementMapper.xml
index 82fab0e..ffcdd56 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcVacationManagementMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcVacationManagementMapper.xml
@@ -3,18 +3,24 @@
<mapper namespace="org.jeecg.modules.mdc.mapper.MdcVacationManagementMappper">
<!--鏍规嵁杞﹂棿灞傜骇鏌ヨ鍋囨湡鍒楄〃-->
<select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcVacationManagement">
- select mvm.* from mdc_vacation_management mvm,mdc_equipment me where mvm.equipment_id=me.equipment_id
- <if test="vacation.equipmentName != null and vacation.equipmentName != '' ">
- and mvm.equipment_name like concat(concat('%',#{vacation.equipmentName}),'%')
- </if>
- <if test="vacation.equipmentId != null and vacation.equipmentId !='' ">
- and mvm.equipment_id like concat(concat('%',#{vacation.equipmentId}),'%')
- </if>
- <if test="vacation.mdcSectionIds != null || vacation.mdcSectionIds.size() > 0 ">
- and mvm.equipment_id in
- <foreach collection="vacation.mdcSectionIds" item="id" index="index" open="(" close=")" separator=",">
- #{id}
- </foreach>
- </if>
+ select * from mdc_vacation_management
+ <where>
+ <if test="vacation.equipmentName != null and vacation.equipmentName != '' ">
+ and equipment_name like concat(concat('%',#{vacation.equipmentName}),'%')
+ </if>
+ <if test="vacation.equipmentId != null and vacation.equipmentId !='' ">
+ and equipment_id like concat(concat('%',#{vacation.equipmentId}),'%')
+ </if>
+ <if test="vacation.startTime != null and vacation.endTime != null">
+ and vacation_date between #{ vacation.startTime } and #{ vacation.endTime }
+ </if>
+ <if test="vacation.mdcSectionIds != null || vacation.mdcSectionIds.size() > 0 ">
+ and equipment_id in
+ <foreach collection="vacation.mdcSectionIds" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </if>
+ order by vacation_date asc
+ </where>
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java
index 9e66b47..acc60c2 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java
@@ -59,4 +59,10 @@
* @return
*/
IPage<MdcVacationManagement> pageList(String userId, Page page, HttpServletRequest req,MdcVacationManagement mdcVacationManagement);
+
+ /**
+ * 鐢熸垚鍙屼紤鏃ヤ换鍔�
+ */
+ void generateWeekDays();
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java
index 496075f..068b6f5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java
@@ -2,6 +2,7 @@
import org.jeecg.modules.mdc.vo.MdcEfficiencyReportQueryVo;
import org.jeecg.modules.mdc.vo.MdcEfficiencyReportShiftQueryVo;
+import org.jeecg.modules.mdc.vo.MdcEfficiencyShiftVo;
import org.jeecg.modules.mdc.vo.MdcEfficiencyVo;
/**
@@ -35,5 +36,5 @@
* @param vo
* @return
*/
- MdcEfficiencyVo efficiencyShiftList(String userId, MdcEfficiencyReportShiftQueryVo vo);
+ MdcEfficiencyShiftVo efficiencyShiftList(String userId, MdcEfficiencyReportShiftQueryVo vo);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
index 7cddfa0..2e732c1 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -13,6 +13,7 @@
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.MdcEfficiencyReportQueryVo;
import org.jeecg.modules.mdc.vo.MdcEfficiencyReportShiftQueryVo;
+import org.jeecg.modules.mdc.vo.MdcEfficiencyShiftVo;
import org.jeecg.modules.mdc.vo.MdcEfficiencyVo;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysDepart;
@@ -414,8 +415,47 @@
* @return
*/
@Override
- public MdcEfficiencyVo efficiencyShiftList(String userId, MdcEfficiencyReportShiftQueryVo vo) {
- return null;
+ public MdcEfficiencyShiftVo efficiencyShiftList(String userId, MdcEfficiencyReportShiftQueryVo vo) {
+ MdcEfficiencyShiftVo result = new MdcEfficiencyShiftVo();
+ List<MdcEfficiencyShiftListDto> listDtos = new ArrayList<>();
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(vo.getParentId()) && StringUtils.isEmpty(vo.getEquipmentId())) {
+ if ("2".equals(vo.getTypeTree())) {
+ // 閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, vo.getParentId());
+ } else {
+ // 浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, vo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(vo.getEquipmentId())) {
+ // 鍗曞彴璁惧淇℃伅
+ vo.setEquipmentIdList(Collections.singletonList(vo.getEquipmentId()));
+ } else {
+ // 鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(vo.getTypeTree())) {
+ // 閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ // 浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+ if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
+ vo.setEquipmentIdList(equipmentIds);
+ }
+
+ List<String> dates = DateUtils.getDatesStringList2(DateUtils.getShortDate2(vo.getStartTime()), DateUtils.getShortDate2(vo.getEndTime()));
+ result.setDates(dates);
+
+ if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
+ result.setMdcEfficiencyList(listDtos);
+ } else {
+ // 鐝鍒╃敤鐜囩瓑绾�
+ List<MdcUtilizationRate> mdcUtilizationRateList = mdcUtilizationRateService.listByType("kdl");
+
+ }
+
+ return result;
}
private MdcEfficiencyResultDto efficiencyRate(List<MdcEfficiencyDto> efficiencyList, String date, String equipmentId, List<MdcUtilizationRate> mdcUtilizationRateList) {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcVacationManagementServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcVacationManagementServiceImpl.java
index 75df63e..f064d96 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcVacationManagementServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcVacationManagementServiceImpl.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.mdc.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,12 +9,17 @@
import org.jeecg.modules.mdc.mapper.MdcVacationManagementMappper;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcVacationManagementService;
+import org.jeecg.modules.mdc.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
import java.util.*;
/**
@@ -54,45 +60,55 @@
@Override
public IPage<MdcVacationManagement> pageList(String userId, Page page, HttpServletRequest req, MdcVacationManagement mdcVacationManagement) {
- //鏄剧ず鍙屼紤鏃�
- Date vacationDate=mdcVacationManagement.getVacationDate();
- String type= mdcVacationManagement.getType();
- Calendar c=Calendar.getInstance();
- c.setTime(vacationDate);
- int day=c.get(Calendar.DAY_OF_WEEK)-1;
- System.out.println(day);
- if (day==6||day==7){
- System.out.println("鍙屼紤鏃�");
- mdcVacationManagement.setType("鍙屼紤鏃�");
- }
//鏌ヨ鐢ㄦ埛鎵�鎷ユ湁鐨勮澶囦俊鎭�
- List<String> equipmentIds=new ArrayList<>();
- if (StringUtils.isNotEmpty(mdcVacationManagement.getParentId()) && StringUtils.isEmpty(mdcVacationManagement.getEquipmentId())){
- if ("2".equals(mdcVacationManagement.getTypeTree())){
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(mdcVacationManagement.getParentId()) && StringUtils.isEmpty(mdcVacationManagement.getEquipmentId())) {
+ if ("2".equals(mdcVacationManagement.getTypeTree())) {
//閮ㄩ棬灞傜骇
- equipmentIds=equipmentService.getEquipmentIdsByDepart(userId,mdcVacationManagement.getParentId());
- }else {
+ equipmentIds = equipmentService.getEquipmentIdsByDepart(userId, mdcVacationManagement.getParentId());
+ } else {
//浜х嚎灞傜骇
- equipmentIds=equipmentService.getEquipmentIdsProduction(userId,mdcVacationManagement.getParentId());
+ equipmentIds = equipmentService.getEquipmentIdsProduction(userId, mdcVacationManagement.getParentId());
}
- }else if (StringUtils.isNotEmpty(mdcVacationManagement.getEquipmentId())){
+ } else if (StringUtils.isNotEmpty(mdcVacationManagement.getEquipmentId())) {
//鍗曞彴璁惧淇℃伅
mdcVacationManagement.setMdcSectionIds(Collections.singletonList(mdcVacationManagement.getEquipmentId()));
- }else {
+ } else {
//鏌ヨ鐢ㄦ埛鎵�鎷ユ湁鐨勮澶囦俊鎭�
- if ("2".equals(mdcVacationManagement.getTypeTree())){
+ if ("2".equals(mdcVacationManagement.getTypeTree())) {
//閮ㄩ棬灞傜骇
- equipmentIds=equipmentService.getEquipmentIdsByDepart(userId,null);
- }else {
- equipmentIds=equipmentService.getEquipmentIdsProduction(userId,null);
+ equipmentIds = equipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ equipmentIds = equipmentService.getEquipmentIdsProduction(userId, null);
}
}
- if (mdcVacationManagement.getMdcSectionIds() == null || mdcVacationManagement.getMdcSectionIds().isEmpty()){
+ if (mdcVacationManagement.getMdcSectionIds() == null || mdcVacationManagement.getMdcSectionIds().isEmpty()) {
mdcVacationManagement.setMdcSectionIds(equipmentIds);
}
- if (mdcVacationManagement.getMdcSectionIds() == null || mdcVacationManagement.getMdcSectionIds().isEmpty()){
+ if (mdcVacationManagement.getMdcSectionIds() == null || mdcVacationManagement.getMdcSectionIds().isEmpty()) {
return null;
}
- return this.baseMapper.pageList(page,mdcVacationManagement);
+ return this.baseMapper.pageList(page, mdcVacationManagement);
+ }
+
+ /**
+ * 鐢熸垚鍙屼紤鏃�
+ */
+ @Override
+ public void generateWeekDays() {
+ MdcVacationManagement mdcVacationManagement = this.baseMapper.selectOne(new LambdaQueryWrapper<MdcVacationManagement>().eq(MdcVacationManagement::getType, "鍙屼紤鏃�").orderByDesc(MdcVacationManagement::getVacationDate).last("limit 1"));
+ // 鑾峰彇鐢熸垚寮�濮嬫椂闂村拰缁撴潫鏃堕棿
+ LocalDate startDate;
+ LocalDate endDate;
+ if (mdcVacationManagement == null) {
+ startDate = LocalDate.now();
+ endDate = LocalDate.of(DateUtils.getYear(), DateUtils.getMonth(), DateUtils.getDayOfMonth());
+ } else {
+ LocalDate vacationDate = mdcVacationManagement.getVacationDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusMonths(1);
+ startDate = vacationDate.with(TemporalAdjusters.firstDayOfMonth());
+ endDate = vacationDate.with(TemporalAdjusters.lastDayOfMonth());
+ }
+ // 鑾峰彇寮�濮嬫椂闂村拰缁撴潫鏃堕棿鐨勪腑闂村弻浼戞棩闆嗗悎
+ List<Date> dateList = DateUtils.getWeekDays(startDate, endDate);
}
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
index 8f37912..18aca87 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
@@ -5,6 +5,7 @@
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.util.*;
import java.util.regex.Pattern;
@@ -972,4 +973,14 @@
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return sd.format(date);
}
+
+ /**
+ *
+ * @param startDate
+ * @param endDate
+ * @return
+ */
+ public static List<Date> getWeekDays(LocalDate startDate, LocalDate endDate) {
+ return null;
+ }
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyShiftVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyShiftVo.java
new file mode 100644
index 0000000..1a3efdc
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyShiftVo.java
@@ -0,0 +1,22 @@
+package org.jeecg.modules.mdc.vo;
+
+import lombok.Data;
+import org.jeecg.modules.mdc.dto.MdcEfficiencyShiftListDto;
+
+import java.util.List;
+
+/**
+ * @author: LiuS
+ * @create: 2023-07-10 14:59
+ */
+@Data
+public class MdcEfficiencyShiftVo {
+
+ /**
+ * 鐝鍒╃敤鐜囨暟鎹�
+ */
+ private List<MdcEfficiencyShiftListDto> mdcEfficiencyList;
+
+ private List<String> dates;
+
+}
--
Gitblit v1.9.3