lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,154 @@ package org.jeecg.modules.mdc.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; 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.modules.mdc.entity.MdcEquipmentOvertime; import org.jeecg.modules.mdc.service.IMdcEquipmentOvertimeService; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; /** * @Description: 设å¤å ç管ç * @Author: Lius * @Date: 2023-08-25 * @Version: V1.0 */ @Slf4j @Api(tags = "设å¤å ç管ç") @RestController @RequestMapping("/mdc/mdcEquipmentOvertime") public class MdcEquipmentOvertimeController extends JeecgController<MdcEquipmentOvertime, IMdcEquipmentOvertimeService> { @Resource private IMdcEquipmentOvertimeService mdcEquipmentOvertimeService; /** * å页å表æ¥è¯¢ * * @param mdcEquipmentOvertime * @param pageNo * @param pageSize * @param req * @return */ @AutoLog(value = "设å¤å ç管ç-å页å表æ¥è¯¢") @ApiOperation(value = "设å¤å ç管ç-å页å表æ¥è¯¢", notes = "设å¤å ç管ç-å页å表æ¥è¯¢") @GetMapping(value = "/list") public Result<?> queryPageList(MdcEquipmentOvertime mdcEquipmentOvertime, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { QueryWrapper<MdcEquipmentOvertime> queryWrapper = QueryGenerator.initQueryWrapper(mdcEquipmentOvertime, req.getParameterMap()); Page<MdcEquipmentOvertime> page = new Page<MdcEquipmentOvertime>(pageNo, pageSize); IPage<MdcEquipmentOvertime> pageList = mdcEquipmentOvertimeService.page(page, queryWrapper); return Result.OK(pageList); } /** * æ·»å * * @param mdcEquipmentOvertime * @return */ @AutoLog(value = "设å¤å ç管ç-æ·»å ") @ApiOperation(value = "设å¤å ç管ç-æ·»å ", notes = "设å¤å ç管ç-æ·»å ") @PostMapping(value = "/add") public Result<?> add(@RequestBody MdcEquipmentOvertime mdcEquipmentOvertime) { mdcEquipmentOvertimeService.save(mdcEquipmentOvertime); return Result.OK("æ·»å æåï¼"); } /** * ç¼è¾ * * @param mdcEquipmentOvertime * @return */ @AutoLog(value = "设å¤å ç管ç-ç¼è¾") @ApiOperation(value = "设å¤å ç管ç-ç¼è¾", notes = "设å¤å ç管ç-ç¼è¾") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result<?> edit(@RequestBody MdcEquipmentOvertime mdcEquipmentOvertime) { mdcEquipmentOvertimeService.updateById(mdcEquipmentOvertime); return Result.OK("ç¼è¾æå!"); } /** * éè¿idå é¤ * * @param id * @return */ @AutoLog(value = "设å¤å ç管ç-éè¿idå é¤") @ApiOperation(value = "设å¤å ç管ç-éè¿idå é¤", notes = "设å¤å ç管ç-éè¿idå é¤") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name = "id", required = true) String id) { mdcEquipmentOvertimeService.removeById(id); return Result.OK("å 餿å!"); } /** * æ¹éå é¤ * * @param ids * @return */ @AutoLog(value = "设å¤å ç管ç-æ¹éå é¤") @ApiOperation(value = "设å¤å ç管ç-æ¹éå é¤", notes = "设å¤å ç管ç-æ¹éå é¤") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.mdcEquipmentOvertimeService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("æ¹éå 餿åï¼"); } /** * éè¿idæ¥è¯¢ * * @param id * @return */ @AutoLog(value = "设å¤å ç管ç-éè¿idæ¥è¯¢") @ApiOperation(value = "设å¤å ç管ç-éè¿idæ¥è¯¢", notes = "设å¤å ç管ç-éè¿idæ¥è¯¢") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { MdcEquipmentOvertime mdcEquipmentOvertime = mdcEquipmentOvertimeService.getById(id); return Result.OK(mdcEquipmentOvertime); } /** * 导åºexcel * * @param request * @param mdcEquipmentOvertime */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, MdcEquipmentOvertime mdcEquipmentOvertime) { return super.exportXls(request, mdcEquipmentOvertime, MdcEquipmentOvertime.class, "设å¤å ç管ç"); } /** * éè¿excelå¯¼å ¥æ°æ® * * @param request * @param response * @return */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, MdcEquipmentOvertime.class); } } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java
@@ -115,9 +115,13 @@ * @param mdcVacationManagement * @return */ @AutoLog(value = "åæç®¡ç-导åºexcel") @ApiOperation(value = "åæç®¡ç-导åºexcel",notes = "åæç®¡ç-导åºexcel") @RequestMapping("/exportXls") public ModelAndView exportXls(HttpServletRequest request, MdcVacationManagement mdcVacationManagement) { return super.exportXls(request, mdcVacationManagement, MdcVacationManagement.class, "åæç®¡ç导åº"); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = user.getId(); return mdcVacationManagementService.exportXls(userId, mdcVacationManagement); } /** lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,60 @@ package org.jeecg.modules.mdc.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; /** * @Description: 设å¤å ç管ç * @Author: Lius * @Date: 2023-08-25 * @Version: V1.0 */ @Data @TableName("mdc_equipment_overtime") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @ApiModel(value = "mdc_equipment_overtime对象", description = "设å¤å ç管ç") public class MdcEquipmentOvertime extends JeecgEntity implements Serializable { private static final long serialVersionUID = -7163039765166584824L; /** * 设å¤ç¼ç */ @Excel(name = "设å¤ç¼ç ", width = 15) @ApiModelProperty(value = "设å¤ç¼ç ") private String equipmentId; /** * çææ¥æ */ @Excel(name = "çææ¥æ", width = 15) @ApiModelProperty(value = "çææ¥æ") private String effectiveDate; /** * å¼å§æ¶é´ */ @Excel(name = "å¼å§æ¶é´", width = 20, format = "yyyy-MM-dd HH:mm:ss") @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; /** * ç»ææ¶é´ */ @Excel(name = "ç»ææ¶é´", width = 20, format = "yyyy-MM-dd HH:mm:ss") @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; } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentOvertimeMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,15 @@ package org.jeecg.modules.mdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime; /** * @Description: 设å¤å ç管ç * @Author: Lius * @Date: 2023-08-25 * @Version: V1.0 */ public interface MdcEquipmentOvertimeMapper extends BaseMapper<MdcEquipmentOvertime> { } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!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"> </mapper> lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentOvertimeService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,15 @@ package org.jeecg.modules.mdc.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime; /** * @Description: 设å¤å ç管ç * @Author: Lius * @Date: 2023-08-25 * @Version: V1.0 */ public interface IMdcEquipmentOvertimeService extends IService<MdcEquipmentOvertime> { } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.mdc.entity.MdcVacationManagement; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -17,6 +18,7 @@ /** * æ ¹æ®idæ¥è¯¢ * * @param id * @return */ @@ -24,6 +26,7 @@ /** * æ°å¢åæç®¡ç * * @param mdcVacationManagement * @return */ @@ -31,6 +34,7 @@ /** * ç¼è¾åæç®¡ç * * @param mdcVacationManagement * @return */ @@ -38,6 +42,7 @@ /** * æ ¹æ®idå é¤ * * @param id * @return */ @@ -45,6 +50,7 @@ /** * æ¹éå é¤ * * @param ids * @return */ @@ -52,17 +58,27 @@ /** * å页æ¥è¯¢ * * @param userId * @param page * @param req * @param mdcVacationManagement * @return */ IPage<MdcVacationManagement> pageList(String userId, Page page, HttpServletRequest req,MdcVacationManagement mdcVacationManagement); IPage<MdcVacationManagement> pageList(String userId, Page page, HttpServletRequest req, MdcVacationManagement mdcVacationManagement); /** * çæå伿¥ä»»å¡ */ void generateWeekDays(); /** * å¯¼åº * * @param userId * @param mdcVacationManagement * @return */ ModelAndView exportXls(String userId, MdcVacationManagement mdcVacationManagement); } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,19 @@ package org.jeecg.modules.mdc.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime; import org.jeecg.modules.mdc.mapper.MdcEquipmentOvertimeMapper; import org.jeecg.modules.mdc.service.IMdcEquipmentOvertimeService; import org.springframework.stereotype.Service; /** * @Description: 设å¤å ç管ç * @Author: Lius * @Date: 2023-08-25 * @Version: V1.0 */ @Service public class MdcEquipmentOvertimeServiceImpl extends ServiceImpl<MdcEquipmentOvertimeMapper, MdcEquipmentOvertime> implements IMdcEquipmentOvertimeService { } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcVacationManagementServiceImpl.java
@@ -6,15 +6,22 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.saxon.expr.Component; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.mdc.entity.MdcEquipment; import org.jeecg.modules.mdc.entity.MdcStandardProcessDuration; import org.jeecg.modules.mdc.entity.MdcVacationManagement; 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.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import java.text.ParseException; @@ -145,4 +152,60 @@ } } @Override public ModelAndView exportXls(String userId, MdcVacationManagement mdcVacationManagement) { LambdaQueryWrapper<MdcVacationManagement> queryWrapper = new LambdaQueryWrapper<>(); //æ¥è¯¢ç¨æ·ææ¥æç设å¤ä¿¡æ¯ 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.getEquipmentIdsProduction(userId, mdcVacationManagement.getParentId()); } } else if (StringUtils.isNotEmpty(mdcVacationManagement.getEquipmentId())) { //åå°è®¾å¤ä¿¡æ¯ mdcVacationManagement.setMdcSectionIds(Collections.singletonList(mdcVacationManagement.getEquipmentId())); } else { //æ¥è¯¢ç¨æ·ææ¥æç设å¤ä¿¡æ¯ if ("2".equals(mdcVacationManagement.getTypeTree())) { //é¨é¨å±çº§ equipmentIds = equipmentService.getEquipmentIdsByDepart(userId, null); } else { equipmentIds = equipmentService.getEquipmentIdsProduction(userId, null); } } if (mdcVacationManagement.getMdcSectionIds() == null || mdcVacationManagement.getMdcSectionIds().isEmpty()) { mdcVacationManagement.setMdcSectionIds(equipmentIds); } if (mdcVacationManagement.getMdcSectionIds() == null || mdcVacationManagement.getMdcSectionIds().isEmpty()) { return null; } else { queryWrapper.in(MdcVacationManagement::getEquipmentId, mdcVacationManagement.getMdcSectionIds()); } if (StringUtils.isNotEmpty(mdcVacationManagement.getEquipmentId())) { queryWrapper.like(MdcVacationManagement::getEquipmentId, mdcVacationManagement.getEquipmentId()); } if (StringUtils.isNotEmpty(mdcVacationManagement.getEquipmentName())) { queryWrapper.like(MdcVacationManagement::getEquipmentName, mdcVacationManagement.getEquipmentName()); } if (StringUtils.isNotEmpty(mdcVacationManagement.getStartTime()) && StringUtils.isNotEmpty(mdcVacationManagement.getEndTime())) { queryWrapper.between(MdcVacationManagement::getVacationDate, mdcVacationManagement.getStartTime(), mdcVacationManagement.getEndTime()); } queryWrapper.orderByAsc(MdcVacationManagement::getVacationDate); // Step.2 AutoPoi 导åºExcel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); List<MdcVacationManagement> mdcStandardProcessDurations = this.baseMapper.selectList(queryWrapper); // å¯¼åºæä»¶åç§° mv.addObject(NormalExcelConstants.FILE_NAME, "åæç®¡çå表"); mv.addObject(NormalExcelConstants.CLASS, MdcVacationManagement.class); //è·åå½åç»å½ç¨æ· LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("åæç®¡çåè¡¨æ°æ®", "导åºäºº:" + user.getRealname(), "åæç®¡ç")); mv.addObject(NormalExcelConstants.DATA_LIST, mdcStandardProcessDurations); return mv; } }