diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanDetailController.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanDetailController.java index b2c562b..22b4955 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanDetailController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanDetailController.java @@ -4,9 +4,12 @@ import java.util.List; import java.util.Arrays; import java.util.concurrent.TimeUnit; +import com.ruoyi.mts.domain.vo.GanttVO; import lombok.RequiredArgsConstructor; + import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; + import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -48,6 +51,18 @@ public class MesPlanDetailController extends BaseController { return R.ok(list); } + /** + * 查询生产计划甘特列表 + * + * @param bo + * @return + */ + @GetMapping("/queryGanttList") + public R> queryGanttList(MesPlanDetailBo bo) { + List list = iMesPlanDetailService.queryGanttList(bo); + return R.ok(list); + } + /** * 导出生产计划明细列表 */ @@ -67,7 +82,7 @@ public class MesPlanDetailController extends BaseController { @SaCheckPermission("mts:planDetail:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable Long id) { return R.ok(iMesPlanDetailService.queryById(id)); } diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/GanttVO.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/GanttVO.java new file mode 100644 index 0000000..1323c6c --- /dev/null +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/GanttVO.java @@ -0,0 +1,25 @@ +package com.ruoyi.mts.domain.vo; + +import cn.hutool.core.date.DatePattern; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class GanttVO { + private Long id; + + private Long parent; + + private String text; + + @JsonFormat(pattern = DatePattern.NORM_DATE_PATTERN) + @JsonProperty(value = "start_date") + private Date startDate; + + private Integer duration; + + private double progress; +} diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/mapper/MesPlanDetailMapper.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/mapper/MesPlanDetailMapper.java index ab4faea..60b1870 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/mapper/MesPlanDetailMapper.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/mapper/MesPlanDetailMapper.java @@ -1,9 +1,13 @@ package com.ruoyi.mts.mapper; import com.ruoyi.mts.domain.MesPlanDetail; +import com.ruoyi.mts.domain.bo.MesPlanDetailBo; +import com.ruoyi.mts.domain.vo.GanttVO; import com.ruoyi.mts.domain.vo.MesPlanDetailVo; import com.ruoyi.common.core.mapper.BaseMapperPlus; +import java.util.List; + /** * 生产计划明细Mapper接口 * @@ -12,4 +16,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus; */ public interface MesPlanDetailMapper extends BaseMapperPlus { + List queryGanttList(MesPlanDetailBo bo); } diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanDetailService.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanDetailService.java index 79e6fba..7cb5697 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanDetailService.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanDetailService.java @@ -1,6 +1,7 @@ package com.ruoyi.mts.service; import com.ruoyi.mts.domain.MesPlanDetail; +import com.ruoyi.mts.domain.vo.GanttVO; import com.ruoyi.mts.domain.vo.MesPlanDetailVo; import com.ruoyi.mts.domain.bo.MesPlanDetailBo; @@ -26,6 +27,14 @@ public interface IMesPlanDetailService { */ List queryList(MesPlanDetailBo bo); + /** + * 查询生产计划甘特列表 + * + * @param bo + * @return + */ + List queryGanttList(MesPlanDetailBo bo); + /** * 新增生产计划明细 */ diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java index 27caf08..4bd25e1 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.ruoyi.common.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.mts.domain.vo.GanttVO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.ruoyi.mts.domain.bo.MesPlanDetailBo; @@ -32,7 +33,7 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService { * 查询生产计划明细 */ @Override - public MesPlanDetailVo queryById(Long id){ + public MesPlanDetailVo queryById(Long id) { return baseMapper.selectVoById(id); } @@ -46,6 +47,18 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService { return baseMapper.selectVoList(lqw); } + /** + * 查询生产计划甘特列表 + * + * @param bo + * @return + */ + @Override + public List queryGanttList(MesPlanDetailBo bo) { + List ganttVOS = baseMapper.queryGanttList(bo); + return ganttVOS; + } + private LambdaQueryWrapper buildQueryWrapper(MesPlanDetailBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); @@ -84,7 +97,7 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(MesPlanDetail entity){ + private void validEntityBeforeSave(MesPlanDetail entity) { //TODO 做一些数据校验,如唯一约束 } @@ -93,7 +106,7 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteBatchIds(ids) > 0; diff --git a/ruoyi-demo/src/main/resources/mapper/mts/MesPlanDetailMapper.xml b/ruoyi-demo/src/main/resources/mapper/mts/MesPlanDetailMapper.xml index df83065..3c56254 100644 --- a/ruoyi-demo/src/main/resources/mapper/mts/MesPlanDetailMapper.xml +++ b/ruoyi-demo/src/main/resources/mapper/mts/MesPlanDetailMapper.xml @@ -18,5 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + diff --git a/ruoyi-ui-vue3/.env.development b/ruoyi-ui-vue3/.env.development index ac4d2c1..5183bac 100644 --- a/ruoyi-ui-vue3/.env.development +++ b/ruoyi-ui-vue3/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = RuoYi-Vue-Plus后台管理系统 +VITE_APP_TITLE = 墨者科技后台管理系统 # 开发环境配置 VITE_APP_ENV = 'development' diff --git a/ruoyi-ui-vue3/.env.production b/ruoyi-ui-vue3/.env.production index 18bb273..3644be7 100644 --- a/ruoyi-ui-vue3/.env.production +++ b/ruoyi-ui-vue3/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = RuoYi-Vue-Plus后台管理系统 +VITE_APP_TITLE = 墨者科技后台管理系统 # 生产环境配置 VITE_APP_ENV = 'production' diff --git a/ruoyi-ui-vue3/README.md b/ruoyi-ui-vue3/README.md index 199f196..b0b8d2a 100644 --- a/ruoyi-ui-vue3/README.md +++ b/ruoyi-ui-vue3/README.md @@ -1,7 +1,7 @@ ## 平台简介 * 本仓库为前端技术栈 [Vue3](https://v3.cn.vuejs.org) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev) 版本。 -* 配套后端代码仓库地址[RuoYi-Vue-Plus 4.X(注意版本号)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) +* 配套后端代码仓库地址[墨者科技 4.X(注意版本号)](https://gitee.com/JavaLionLi/墨者科技) * 5.X后端需要使用此项目 [plus-ui](https://gitee.com/JavaLionLi/plus-ui) ## 前端运行 diff --git a/ruoyi-ui-vue3/index.html b/ruoyi-ui-vue3/index.html index 3f0dcb5..96bd332 100644 --- a/ruoyi-ui-vue3/index.html +++ b/ruoyi-ui-vue3/index.html @@ -7,7 +7,7 @@ - RuoYi-Vue-Plus管理系统 + 墨者科技管理系统 diff --git a/ruoyi-ui-vue3/src/views/login.vue b/ruoyi-ui-vue3/src/views/login.vue index 4dd95d3..8f01774 100644 --- a/ruoyi-ui-vue3/src/views/login.vue +++ b/ruoyi-ui-vue3/src/views/login.vue @@ -1,7 +1,7 @@ diff --git a/ruoyi-ui-vue3/src/views/mts/planDetail/components/GanttComponent.vue b/ruoyi-ui-vue3/src/views/mts/planDetail/components/GanttComponent.vue new file mode 100644 index 0000000..04e8f3c --- /dev/null +++ b/ruoyi-ui-vue3/src/views/mts/planDetail/components/GanttComponent.vue @@ -0,0 +1,93 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue b/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue index e6744cb..e2d9e14 100644 --- a/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue +++ b/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue @@ -1,329 +1,173 @@ - + + diff --git a/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue.bak b/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue.bak new file mode 100644 index 0000000..0c95108 --- /dev/null +++ b/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue.bak @@ -0,0 +1,286 @@ + + + diff --git a/ruoyi-ui-vue3/src/views/register.vue b/ruoyi-ui-vue3/src/views/register.vue index 4948cff..26e7178 100644 --- a/ruoyi-ui-vue3/src/views/register.vue +++ b/ruoyi-ui-vue3/src/views/register.vue @@ -1,7 +1,7 @@