From 829d4130939602a6880b9f66796651237153ae5f Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Thu, 2 Jan 2025 20:07:41 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=BB=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkorderPermissionCheckitemController.java | 171 ++++++++++++++++++++ .../entity/WorkorderPermissionCheckitem.java | 60 +++++++ .../mapper/WorkorderPermissionCheckitemMapper.java | 17 ++ .../xml/WorkorderPermissionCheckitemMapper.xml | 5 + .../IWorkorderPermissionCheckitemService.java | 14 ++ .../WorkorderPermissionCheckitemServiceImpl.java | 19 +++ .../vue/WorkorderPermissionCheckitemList.vue | 178 +++++++++++++++++++++ .../modules/WorkorderPermissionCheckitemForm.vue | 109 +++++++++++++ ...korderPermissionCheckitemModal.Style#Drawer.vue | 84 ++++++++++ .../modules/WorkorderPermissionCheckitemModal.vue | 60 +++++++ .../vue3/WorkorderPermissionCheckitem.api.ts | 61 +++++++ .../vue3/WorkorderPermissionCheckitem.data.ts | 39 +++++ .../vue3/WorkorderPermissionCheckitemList.vue | 162 +++++++++++++++++++ .../WorkorderPermissionCheckitemModal.vue | 58 +++++++ .../WorkorderPermissionStepController.java | 171 ++++++++++++++++++++ .../entity/WorkorderPermissionStep.java | 60 +++++++ .../mapper/WorkorderPermissionStepMapper.java | 17 ++ .../mapper/xml/WorkorderPermissionStepMapper.xml | 5 + .../service/IWorkorderPermissionStepService.java | 14 ++ .../impl/WorkorderPermissionStepServiceImpl.java | 19 +++ .../vue/WorkorderPermissionStepList.vue | 178 +++++++++++++++++++++ .../vue/modules/WorkorderPermissionStepForm.vue | 109 +++++++++++++ .../WorkorderPermissionStepModal.Style#Drawer.vue | 84 ++++++++++ .../vue/modules/WorkorderPermissionStepModal.vue | 60 +++++++ .../vue3/WorkorderPermissionStep.api.ts | 61 +++++++ .../vue3/WorkorderPermissionStep.data.ts | 39 +++++ .../vue3/WorkorderPermissionStepList.vue | 162 +++++++++++++++++++ .../components/WorkorderPermissionStepModal.vue | 58 +++++++ .../workorderController/TemplateController.java | 32 ++-- .../jeecg/modules/apiService/TemplateService.java | 16 +- .../apiService/impl/TemplateServiceImpl.java | 123 +++++++++++++- 31 files changed, 2213 insertions(+), 32 deletions(-) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/controller/WorkorderPermissionCheckitemController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/entity/WorkorderPermissionCheckitem.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/mapper/WorkorderPermissionCheckitemMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/mapper/xml/WorkorderPermissionCheckitemMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/service/IWorkorderPermissionCheckitemService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/service/impl/WorkorderPermissionCheckitemServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/WorkorderPermissionCheckitemList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/modules/WorkorderPermissionCheckitemForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/modules/WorkorderPermissionCheckitemModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/modules/WorkorderPermissionCheckitemModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/WorkorderPermissionCheckitem.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/WorkorderPermissionCheckitem.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/WorkorderPermissionCheckitemList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/components/WorkorderPermissionCheckitemModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/controller/WorkorderPermissionStepController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/entity/WorkorderPermissionStep.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/mapper/WorkorderPermissionStepMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/mapper/xml/WorkorderPermissionStepMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/service/IWorkorderPermissionStepService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/service/impl/WorkorderPermissionStepServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/WorkorderPermissionStepList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/modules/WorkorderPermissionStepForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/modules/WorkorderPermissionStepModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/modules/WorkorderPermissionStepModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/WorkorderPermissionStep.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/WorkorderPermissionStep.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/WorkorderPermissionStepList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/components/WorkorderPermissionStepModal.vue diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/controller/WorkorderPermissionCheckitemController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/controller/WorkorderPermissionCheckitemController.java new file mode 100644 index 0000000..428e4dc --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/controller/WorkorderPermissionCheckitemController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.workorderPermissionCheckitem.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.workorderPermissionCheckitem.entity.WorkorderPermissionCheckitem; +import org.jeecg.modules.workorderPermissionCheckitem.service.IWorkorderPermissionCheckitemService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 检查项目权限关联表 + * @Author: jeecg-boot + * @Date: 2025-01-02 + * @Version: V1.0 + */ +@Api(tags="检查项目权限关联表") +@RestController +@RequestMapping("/workorderPermissionCheckitem/workorderPermissionCheckitem") +@Slf4j +public class WorkorderPermissionCheckitemController extends JeecgController { + @Autowired + private IWorkorderPermissionCheckitemService workorderPermissionCheckitemService; + + /** + * 分页列表查询 + * + * @param workorderPermissionCheckitem + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "检查项目权限关联表-分页列表查询") + @ApiOperation(value="检查项目权限关联表-分页列表查询", notes="检查项目权限关联表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(WorkorderPermissionCheckitem workorderPermissionCheckitem, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(workorderPermissionCheckitem, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = workorderPermissionCheckitemService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param workorderPermissionCheckitem + * @return + */ + @AutoLog(value = "检查项目权限关联表-添加") + @ApiOperation(value="检查项目权限关联表-添加", notes="检查项目权限关联表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody WorkorderPermissionCheckitem workorderPermissionCheckitem) { + workorderPermissionCheckitemService.save(workorderPermissionCheckitem); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param workorderPermissionCheckitem + * @return + */ + @AutoLog(value = "检查项目权限关联表-编辑") + @ApiOperation(value="检查项目权限关联表-编辑", notes="检查项目权限关联表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody WorkorderPermissionCheckitem workorderPermissionCheckitem) { + workorderPermissionCheckitemService.updateById(workorderPermissionCheckitem); + 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) { + workorderPermissionCheckitemService.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.workorderPermissionCheckitemService.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) { + WorkorderPermissionCheckitem workorderPermissionCheckitem = workorderPermissionCheckitemService.getById(id); + if(workorderPermissionCheckitem==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(workorderPermissionCheckitem); + } + + /** + * 导出excel + * + * @param request + * @param workorderPermissionCheckitem + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, WorkorderPermissionCheckitem workorderPermissionCheckitem) { + return super.exportXls(request, workorderPermissionCheckitem, WorkorderPermissionCheckitem.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, WorkorderPermissionCheckitem.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/entity/WorkorderPermissionCheckitem.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/entity/WorkorderPermissionCheckitem.java new file mode 100644 index 0000000..30f69f2 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/entity/WorkorderPermissionCheckitem.java @@ -0,0 +1,60 @@ +package org.jeecg.modules.workorderPermissionCheckitem.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 检查项目权限关联表 + * @Author: jeecg-boot + * @Date: 2025-01-02 + * @Version: V1.0 + */ +@Data +@TableName("workorder_permission_checkitem") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="workorder_permission_checkitem对象", description="检查项目权限关联表") +public class WorkorderPermissionCheckitem implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**关联角色id*/ + @Excel(name = "关联角色id", width = 15, dictTable = "workorder_role", dicText = "name", dicCode = "id") + @Dict(dictTable = "workorder_role", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "关联角色id") + private java.lang.String roleId; + /**关联检查项目id*/ + @Excel(name = "关联检查项目id", width = 15, dictTable = "workorder_item_check", dicText = "name", dicCode = "id") + @Dict(dictTable = "workorder_item_check", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "关联检查项目id") + private java.lang.String checkItemId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/mapper/WorkorderPermissionCheckitemMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/mapper/WorkorderPermissionCheckitemMapper.java new file mode 100644 index 0000000..1b6a2b4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/mapper/WorkorderPermissionCheckitemMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.workorderPermissionCheckitem.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.workorderPermissionCheckitem.entity.WorkorderPermissionCheckitem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 检查项目权限关联表 + * @Author: jeecg-boot + * @Date: 2025-01-02 + * @Version: V1.0 + */ +public interface WorkorderPermissionCheckitemMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/mapper/xml/WorkorderPermissionCheckitemMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/mapper/xml/WorkorderPermissionCheckitemMapper.xml new file mode 100644 index 0000000..d023dca --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/mapper/xml/WorkorderPermissionCheckitemMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/service/IWorkorderPermissionCheckitemService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/service/IWorkorderPermissionCheckitemService.java new file mode 100644 index 0000000..0995492 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/service/IWorkorderPermissionCheckitemService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.workorderPermissionCheckitem.service; + +import org.jeecg.modules.workorderPermissionCheckitem.entity.WorkorderPermissionCheckitem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 检查项目权限关联表 + * @Author: jeecg-boot + * @Date: 2025-01-02 + * @Version: V1.0 + */ +public interface IWorkorderPermissionCheckitemService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/service/impl/WorkorderPermissionCheckitemServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/service/impl/WorkorderPermissionCheckitemServiceImpl.java new file mode 100644 index 0000000..59e1887 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/service/impl/WorkorderPermissionCheckitemServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.workorderPermissionCheckitem.service.impl; + +import org.jeecg.modules.workorderPermissionCheckitem.entity.WorkorderPermissionCheckitem; +import org.jeecg.modules.workorderPermissionCheckitem.mapper.WorkorderPermissionCheckitemMapper; +import org.jeecg.modules.workorderPermissionCheckitem.service.IWorkorderPermissionCheckitemService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 检查项目权限关联表 + * @Author: jeecg-boot + * @Date: 2025-01-02 + * @Version: V1.0 + */ +@Service +public class WorkorderPermissionCheckitemServiceImpl extends ServiceImpl implements IWorkorderPermissionCheckitemService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/WorkorderPermissionCheckitemList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/WorkorderPermissionCheckitemList.vue new file mode 100644 index 0000000..3d6d1c1 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/WorkorderPermissionCheckitemList.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/modules/WorkorderPermissionCheckitemForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/modules/WorkorderPermissionCheckitemForm.vue new file mode 100644 index 0000000..229c9d9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/modules/WorkorderPermissionCheckitemForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/modules/WorkorderPermissionCheckitemModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/modules/WorkorderPermissionCheckitemModal.Style#Drawer.vue new file mode 100644 index 0000000..5438247 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/modules/WorkorderPermissionCheckitemModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/modules/WorkorderPermissionCheckitemModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/modules/WorkorderPermissionCheckitemModal.vue new file mode 100644 index 0000000..381b0bd --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue/modules/WorkorderPermissionCheckitemModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/WorkorderPermissionCheckitem.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/WorkorderPermissionCheckitem.api.ts new file mode 100644 index 0000000..ed697d7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/WorkorderPermissionCheckitem.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/workorderPermissionCheckitem/workorderPermissionCheckitem/list', + save='/workorderPermissionCheckitem/workorderPermissionCheckitem/add', + edit='/workorderPermissionCheckitem/workorderPermissionCheckitem/edit', + deleteOne = '/workorderPermissionCheckitem/workorderPermissionCheckitem/delete', + deleteBatch = '/workorderPermissionCheckitem/workorderPermissionCheckitem/deleteBatch', + importExcel = '/workorderPermissionCheckitem/workorderPermissionCheckitem/importExcel', + exportXls = '/workorderPermissionCheckitem/workorderPermissionCheckitem/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/WorkorderPermissionCheckitem.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/WorkorderPermissionCheckitem.data.ts new file mode 100644 index 0000000..0845f70 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/WorkorderPermissionCheckitem.data.ts @@ -0,0 +1,39 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '关联角色id', + align:"center", + dataIndex: 'roleId_dictText' + }, + { + title: '关联检查项目id', + align:"center", + dataIndex: 'checkItemId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '关联角色id', + field: 'roleId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"workorder_role,name,id" + }, + }, + { + label: '关联检查项目id', + field: 'checkItemId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"workorder_item_check,name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/WorkorderPermissionCheckitemList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/WorkorderPermissionCheckitemList.vue new file mode 100644 index 0000000..a01f0f4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/WorkorderPermissionCheckitemList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/components/WorkorderPermissionCheckitemModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/components/WorkorderPermissionCheckitemModal.vue new file mode 100644 index 0000000..2b2978f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionCheckitem/vue3/components/WorkorderPermissionCheckitemModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/controller/WorkorderPermissionStepController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/controller/WorkorderPermissionStepController.java new file mode 100644 index 0000000..8f0cc03 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/controller/WorkorderPermissionStepController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.workorderPermissionStep.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.workorderPermissionStep.entity.WorkorderPermissionStep; +import org.jeecg.modules.workorderPermissionStep.service.IWorkorderPermissionStepService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 常规参数权限关联表 + * @Author: jeecg-boot + * @Date: 2025-01-02 + * @Version: V1.0 + */ +@Api(tags="常规参数权限关联表") +@RestController +@RequestMapping("/workorderPermissionStep/workorderPermissionStep") +@Slf4j +public class WorkorderPermissionStepController extends JeecgController { + @Autowired + private IWorkorderPermissionStepService workorderPermissionStepService; + + /** + * 分页列表查询 + * + * @param workorderPermissionStep + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "常规参数权限关联表-分页列表查询") + @ApiOperation(value="常规参数权限关联表-分页列表查询", notes="常规参数权限关联表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(WorkorderPermissionStep workorderPermissionStep, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(workorderPermissionStep, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = workorderPermissionStepService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param workorderPermissionStep + * @return + */ + @AutoLog(value = "常规参数权限关联表-添加") + @ApiOperation(value="常规参数权限关联表-添加", notes="常规参数权限关联表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody WorkorderPermissionStep workorderPermissionStep) { + workorderPermissionStepService.save(workorderPermissionStep); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param workorderPermissionStep + * @return + */ + @AutoLog(value = "常规参数权限关联表-编辑") + @ApiOperation(value="常规参数权限关联表-编辑", notes="常规参数权限关联表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody WorkorderPermissionStep workorderPermissionStep) { + workorderPermissionStepService.updateById(workorderPermissionStep); + 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) { + workorderPermissionStepService.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.workorderPermissionStepService.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) { + WorkorderPermissionStep workorderPermissionStep = workorderPermissionStepService.getById(id); + if(workorderPermissionStep==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(workorderPermissionStep); + } + + /** + * 导出excel + * + * @param request + * @param workorderPermissionStep + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, WorkorderPermissionStep workorderPermissionStep) { + return super.exportXls(request, workorderPermissionStep, WorkorderPermissionStep.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, WorkorderPermissionStep.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/entity/WorkorderPermissionStep.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/entity/WorkorderPermissionStep.java new file mode 100644 index 0000000..5aa4bb2 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/entity/WorkorderPermissionStep.java @@ -0,0 +1,60 @@ +package org.jeecg.modules.workorderPermissionStep.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 常规参数权限关联表 + * @Author: jeecg-boot + * @Date: 2025-01-02 + * @Version: V1.0 + */ +@Data +@TableName("workorder_permission_step") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="workorder_permission_step对象", description="常规参数权限关联表") +public class WorkorderPermissionStep implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**关联角色id*/ + @Excel(name = "关联角色id", width = 15, dictTable = "workorder_role", dicText = "name", dicCode = "id") + @Dict(dictTable = "workorder_role", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "关联角色id") + private java.lang.String roleId; + /**关联工序卡id*/ + @Excel(name = "关联工序卡id", width = 15, dictTable = "workorder_step", dicText = "name", dicCode = "id") + @Dict(dictTable = "workorder_step", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "关联工序卡id") + private java.lang.String stepId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/mapper/WorkorderPermissionStepMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/mapper/WorkorderPermissionStepMapper.java new file mode 100644 index 0000000..605e61a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/mapper/WorkorderPermissionStepMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.workorderPermissionStep.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.workorderPermissionStep.entity.WorkorderPermissionStep; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 常规参数权限关联表 + * @Author: jeecg-boot + * @Date: 2025-01-02 + * @Version: V1.0 + */ +public interface WorkorderPermissionStepMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/mapper/xml/WorkorderPermissionStepMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/mapper/xml/WorkorderPermissionStepMapper.xml new file mode 100644 index 0000000..a7b17e4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/mapper/xml/WorkorderPermissionStepMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/service/IWorkorderPermissionStepService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/service/IWorkorderPermissionStepService.java new file mode 100644 index 0000000..369980c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/service/IWorkorderPermissionStepService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.workorderPermissionStep.service; + +import org.jeecg.modules.workorderPermissionStep.entity.WorkorderPermissionStep; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 常规参数权限关联表 + * @Author: jeecg-boot + * @Date: 2025-01-02 + * @Version: V1.0 + */ +public interface IWorkorderPermissionStepService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/service/impl/WorkorderPermissionStepServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/service/impl/WorkorderPermissionStepServiceImpl.java new file mode 100644 index 0000000..8373bdb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/service/impl/WorkorderPermissionStepServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.workorderPermissionStep.service.impl; + +import org.jeecg.modules.workorderPermissionStep.entity.WorkorderPermissionStep; +import org.jeecg.modules.workorderPermissionStep.mapper.WorkorderPermissionStepMapper; +import org.jeecg.modules.workorderPermissionStep.service.IWorkorderPermissionStepService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 常规参数权限关联表 + * @Author: jeecg-boot + * @Date: 2025-01-02 + * @Version: V1.0 + */ +@Service +public class WorkorderPermissionStepServiceImpl extends ServiceImpl implements IWorkorderPermissionStepService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/WorkorderPermissionStepList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/WorkorderPermissionStepList.vue new file mode 100644 index 0000000..08e8e36 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/WorkorderPermissionStepList.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/modules/WorkorderPermissionStepForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/modules/WorkorderPermissionStepForm.vue new file mode 100644 index 0000000..82ed1fb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/modules/WorkorderPermissionStepForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/modules/WorkorderPermissionStepModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/modules/WorkorderPermissionStepModal.Style#Drawer.vue new file mode 100644 index 0000000..c918620 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/modules/WorkorderPermissionStepModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/modules/WorkorderPermissionStepModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/modules/WorkorderPermissionStepModal.vue new file mode 100644 index 0000000..351ccc3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue/modules/WorkorderPermissionStepModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/WorkorderPermissionStep.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/WorkorderPermissionStep.api.ts new file mode 100644 index 0000000..d66aa36 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/WorkorderPermissionStep.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/workorderPermissionStep/workorderPermissionStep/list', + save='/workorderPermissionStep/workorderPermissionStep/add', + edit='/workorderPermissionStep/workorderPermissionStep/edit', + deleteOne = '/workorderPermissionStep/workorderPermissionStep/delete', + deleteBatch = '/workorderPermissionStep/workorderPermissionStep/deleteBatch', + importExcel = '/workorderPermissionStep/workorderPermissionStep/importExcel', + exportXls = '/workorderPermissionStep/workorderPermissionStep/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/WorkorderPermissionStep.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/WorkorderPermissionStep.data.ts new file mode 100644 index 0000000..ba54f48 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/WorkorderPermissionStep.data.ts @@ -0,0 +1,39 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '关联角色id', + align:"center", + dataIndex: 'roleId_dictText' + }, + { + title: '关联工序卡id', + align:"center", + dataIndex: 'stepId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '关联角色id', + field: 'roleId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"workorder_role,name,id" + }, + }, + { + label: '关联工序卡id', + field: 'stepId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"workorder_step,name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/WorkorderPermissionStepList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/WorkorderPermissionStepList.vue new file mode 100644 index 0000000..25ccb2f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/WorkorderPermissionStepList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/components/WorkorderPermissionStepModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/components/WorkorderPermissionStepModal.vue new file mode 100644 index 0000000..41c91bf --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStep/vue3/components/WorkorderPermissionStepModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/TemplateController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/TemplateController.java index 7c565cd..59c4937 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/TemplateController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/TemplateController.java @@ -113,50 +113,50 @@ public class TemplateController { @ApiOperation(value="工单信息-修改常规参数-工序卡1(选配)", notes="工单信息-修改常规参数-修改工序卡1(选配)") @RequestMapping(value = "/updateGeneralStepOne", method = {RequestMethod.POST}) - public Result updateGeneralStepOne(WorkorderGeneralStepone generalStepone){ - return templateService.updateGeneralStepOne(generalStepone); + public Result updateGeneralStepOne(WorkorderGeneralStepone generalStepone, String roleId){ + return templateService.updateGeneralStepOne(generalStepone, roleId); } @ApiOperation(value="工单信息-修改常规参数-工序卡2", notes="工单信息-修改常规参数-修改工序卡2") @RequestMapping(value = "/updateGeneralStepTwo", method = {RequestMethod.POST}) - public Result updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo){ - return templateService.updateGeneralStepTwo(generalSteptwo); + public Result updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo, String roleId){ + return templateService.updateGeneralStepTwo(generalSteptwo, roleId); } @ApiOperation(value="工单信息-修改常规参数-工序卡3", notes="工单信息-修改常规参数-修改工序卡3") @RequestMapping(value = "/updateGeneralStepThree", method = {RequestMethod.POST}) - public Result updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree){ - return templateService.updateGeneralStepThree(generalStepthree); + public Result updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree, String roleId){ + return templateService.updateGeneralStepThree(generalStepthree, roleId); } @ApiOperation(value="工单信息-修改常规参数-工序卡4(总成)", notes="工单信息-修改常规参数-修改工序卡4(总成)") @RequestMapping(value = "/updateGeneralStepFour", method = {RequestMethod.POST}) - public Result updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour){ - return templateService.updateGeneralStepFour(generalStepfour); + public Result updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour, String roleId){ + return templateService.updateGeneralStepFour(generalStepfour, roleId); } @ApiOperation(value="工单信息-修改工序参数-工序卡1(选配)", notes="工单信息-修改常规参数-修改工序卡1(选配)") @RequestMapping(value = "/updateParamStepOne", method = {RequestMethod.POST}) - public Result updateParamStepOne(WorkorderParamStepone paramStepone){ - return templateService.updateParamStepOne(paramStepone); + public Result updateParamStepOne(WorkorderParamStepone paramStepone, String roleId){ + return templateService.updateParamStepOne(paramStepone, roleId); } @ApiOperation(value="工单信息-修改工序参数-工序卡2", notes="工单信息-修改常规参数-修改工序卡2") @RequestMapping(value = "/updateParamStepTwo", method = {RequestMethod.POST}) - public Result updateParamStepTwo(WorkorderParamSteptwo paramSteptwo){ - return templateService.updateParamStepTwo(paramSteptwo); + public Result updateParamStepTwo(WorkorderParamSteptwo paramSteptwo, String roleId){ + return templateService.updateParamStepTwo(paramSteptwo, roleId); } @ApiOperation(value="工单信息-修改工序参数-工序卡3", notes="工单信息-修改常规参数-修改工序卡3") @RequestMapping(value = "/updateParamStepThree", method = {RequestMethod.POST}) - public Result updateParamStepThree(WorkorderParamStepthree paramStepthree){ - return templateService.updateParamStepThree(paramStepthree); + public Result updateParamStepThree(WorkorderParamStepthree paramStepthree, String roleId){ + return templateService.updateParamStepThree(paramStepthree, roleId); } @ApiOperation(value="工单信息-修改工序参数-工序卡4(总成)", notes="工单信息-修改常规参数-修改工序卡4(总成)") @RequestMapping(value = "/updateParamStepFour", method = {RequestMethod.POST}) - public Result updateParamStepFour(WorkorderParamStepfour paramStepfour){ - return templateService.updateParamStepFour(paramStepfour); + public Result updateParamStepFour(WorkorderParamStepfour paramStepfour, String roleId){ + return templateService.updateParamStepFour(paramStepfour, roleId); } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/TemplateService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/TemplateService.java index be589a7..3f7a718 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/TemplateService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/TemplateService.java @@ -80,55 +80,55 @@ public interface TemplateService { * @param generalStepone * @return */ - public Result updateGeneralStepOne(WorkorderGeneralStepone generalStepone); + public Result updateGeneralStepOne(WorkorderGeneralStepone generalStepone, String roleId); /** * 工单信息-修改常规参数-工序卡2 * @param generalSteptwo * @return */ - public Result updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo); + public Result updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo, String roleId); /** * 工单信息-修改常规参数-工序卡3 * @param generalStepthree * @return */ - public Result updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree); + public Result updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree, String roleId); /** * 工单信息-修改常规参数-工序卡4 * @param generalStepfour * @return */ - public Result updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour); + public Result updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour, String roleId); /** * 工单信息-修改工序参数-工序卡1 * @param paramStepone * @return */ - public Result updateParamStepOne(WorkorderParamStepone paramStepone); + public Result updateParamStepOne(WorkorderParamStepone paramStepone, String roleId); /** * 工单信息-修改工序参数-工序卡2 * @param paramSteptwo * @return */ - public Result updateParamStepTwo(WorkorderParamSteptwo paramSteptwo); + public Result updateParamStepTwo(WorkorderParamSteptwo paramSteptwo, String roleId); /** * 工单信息-修改工序参数-工序卡3 * @param paramStepthree * @return */ - public Result updateParamStepThree(WorkorderParamStepthree paramStepthree); + public Result updateParamStepThree(WorkorderParamStepthree paramStepthree, String roleId); /** * 工单信息-修改工序参数-工序卡4 * @param paramStepfour * @return */ - public Result updateParamStepFour(WorkorderParamStepfour paramStepfour); + public Result updateParamStepFour(WorkorderParamStepfour paramStepfour, String roleId); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java index f0682d8..9b5e2c3 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java @@ -25,6 +25,10 @@ import org.jeecg.modules.workorderParamStepthree.entity.WorkorderParamStepthree; import org.jeecg.modules.workorderParamStepthree.service.IWorkorderParamStepthreeService; import org.jeecg.modules.workorderParamSteptwo.entity.WorkorderParamSteptwo; import org.jeecg.modules.workorderParamSteptwo.service.IWorkorderParamSteptwoService; +import org.jeecg.modules.workorderPermissionCheckitem.entity.WorkorderPermissionCheckitem; +import org.jeecg.modules.workorderPermissionCheckitem.service.IWorkorderPermissionCheckitemService; +import org.jeecg.modules.workorderPermissionStep.entity.WorkorderPermissionStep; +import org.jeecg.modules.workorderPermissionStep.service.IWorkorderPermissionStepService; import org.jeecg.modules.workorderProcess.entity.WorkorderProcess; import org.jeecg.modules.workorderProcess.service.IWorkorderProcessService; import org.jeecg.modules.workorderStatus.entity.WorkorderStatus; @@ -66,6 +70,14 @@ public class TemplateServiceImpl implements TemplateService { @Resource private IWorkorderItemCheckService workorderItemCheckService; + //检查项目权限关联信息 + @Resource + private IWorkorderPermissionCheckitemService workorderPermissionCheckitemService; + + //常规参数权限关联信息 + @Resource + private IWorkorderPermissionStepService workorderPermissionStepService; + //工序卡常规参数 @Resource private IWorkorderGeneralSteponeService workorderGeneralSteponeService; @@ -511,8 +523,15 @@ public class TemplateServiceImpl implements TemplateService { /******************************************工单修改*****************************************************************/ //工单信息-修改常规参数-工序卡1(选配) @Override - public Result updateGeneralStepOne(WorkorderGeneralStepone generalStepone) { + public Result updateGeneralStepOne(WorkorderGeneralStepone generalStepone, String roleId) { + //判断是否有工序操作权限 + boolean permission = judgePermissionGeneral(roleId, generalStepone.getStepId()); + if(!permission){ + return Result.error("没有该工序的操作权限"); + } + boolean flag = workorderGeneralSteponeService.saveOrUpdate(generalStepone); + if(flag){ return Result.OK("新增/修改常规参数-工序卡1成功！"); }else { @@ -522,7 +541,13 @@ public class TemplateServiceImpl implements TemplateService { //工单信息-修改常规参数-工序卡2 @Override - public Result updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo) { + public Result updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo, String roleId) { + //判断是否有工序操作权限 + boolean permission = judgePermissionGeneral(roleId, generalSteptwo.getStepId()); + if(!permission){ + return Result.error("没有该工序的操作权限"); + } + boolean flag = workorderGeneralSteptwoService.saveOrUpdate(generalSteptwo); if(flag){ return Result.OK("新增/修改常规参数-工序卡2成功！"); @@ -533,7 +558,13 @@ public class TemplateServiceImpl implements TemplateService { //工单信息-修改常规参数-工序卡3 @Override - public Result updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree) { + public Result updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree, String roleId) { + //判断是否有工序操作权限 + boolean permission = judgePermissionGeneral(roleId, generalStepthree.getStepId()); + if(!permission){ + return Result.error("没有该工序的操作权限"); + } + boolean flag = workorderGeneralStepthreeService.saveOrUpdate(generalStepthree); if(flag){ return Result.OK("新增/修改常规参数-工序卡3成功！"); @@ -544,7 +575,13 @@ public class TemplateServiceImpl implements TemplateService { //工单信息-修改常规参数-工序卡4(总成) @Override - public Result updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour) { + public Result updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour, String roleId) { + //判断是否有工序操作权限 + boolean permission = judgePermissionGeneral(roleId, generalStepfour.getStepId()); + if(!permission){ + return Result.error("没有该工序的操作权限"); + } + boolean flag = workorderGeneralStepfourService.saveOrUpdate(generalStepfour); if(flag){ return Result.OK("新增/修改常规参数-工序卡4成功！"); @@ -555,7 +592,13 @@ public class TemplateServiceImpl implements TemplateService { //工单信息-修改工序参数-工序卡1(选配) @Override - public Result updateParamStepOne(WorkorderParamStepone paramStepone) { + public Result updateParamStepOne(WorkorderParamStepone paramStepone, String roleId) { + //判断是否有工序操作权限 + boolean permission = judgePermissionParam(roleId, paramStepone.getProcessId()); + if(!permission){ + return Result.error("没有该工序的操作权限"); + } + boolean flag = workorderParamSteponeService.saveOrUpdate(paramStepone); if(flag){ return Result.OK("新增/修改工序参数-工序卡1成功！"); @@ -566,7 +609,13 @@ public class TemplateServiceImpl implements TemplateService { //工单信息-修改工序参数-工序卡2 @Override - public Result updateParamStepTwo(WorkorderParamSteptwo paramSteptwo) { + public Result updateParamStepTwo(WorkorderParamSteptwo paramSteptwo, String roleId) { + //判断是否有工序操作权限 + boolean permission = judgePermissionParam(roleId, paramSteptwo.getProcessId()); + if(!permission){ + return Result.error("没有该工序的操作权限"); + } + boolean flag = workorderParamSteptwoService.saveOrUpdate(paramSteptwo); if(flag){ return Result.OK("新增/修改工序参数-工序卡2成功！"); @@ -577,7 +626,13 @@ public class TemplateServiceImpl implements TemplateService { //工单信息-修改工序参数-工序卡3 @Override - public Result updateParamStepThree(WorkorderParamStepthree paramStepthree) { + public Result updateParamStepThree(WorkorderParamStepthree paramStepthree, String roleId) { + //判断是否有工序操作权限 + boolean permission = judgePermissionParam(roleId, paramStepthree.getProcessId()); + if(!permission){ + return Result.error("没有该工序的操作权限"); + } + boolean flag = workorderParamStepthreeService.saveOrUpdate(paramStepthree); if(flag){ return Result.OK("新增/修改工序参数-工序卡3成功！"); @@ -588,7 +643,13 @@ public class TemplateServiceImpl implements TemplateService { //工单信息-修改工序参数-工序卡4(总成) @Override - public Result updateParamStepFour(WorkorderParamStepfour paramStepfour) { + public Result updateParamStepFour(WorkorderParamStepfour paramStepfour, String roleId) { + //判断是否有工序操作权限 + boolean permission = judgePermissionParam(roleId, paramStepfour.getProcessId()); + if(!permission){ + return Result.error("没有该工序的操作权限"); + } + boolean flag = workorderParamStepfourService.saveOrUpdate(paramStepfour); if(flag){ return Result.OK("新增/修改工序参数-工序卡4成功！"); @@ -597,6 +658,52 @@ public class TemplateServiceImpl implements TemplateService { } } + //工单信息-检查项目参数修改权限判断 + public Boolean judgePermissionParam(String roleId, String checkItemId) { + + //返回结果 + boolean result = false; + + //根据角色id获取拥有的权限 + List permissionList = workorderPermissionCheckitemService + .lambdaQuery() + .eq(WorkorderPermissionCheckitem::getRoleId, roleId) + .list(); + + //判断是否有修改的权限 + for (WorkorderPermissionCheckitem permission : permissionList) { + if(checkItemId.equals(permission.getCheckItemId())){ + result = true; + break; + } + } + + return result; + } + + //工单信息-检查项目参数修改权限判断 + public Boolean judgePermissionGeneral(String roleId, String stepId) { + + //返回结果 + boolean result = false; + + //根据角色id获取拥有的权限 + List permissionList = workorderPermissionStepService + .lambdaQuery() + .eq(WorkorderPermissionStep::getRoleId, roleId) + .list(); + + //判断是否有修改的权限 + for (WorkorderPermissionStep permission : permissionList) { + if(stepId.equals(permission.getStepId())){ + result = true; + break; + } + } + + return result; + } + /*********************************************************************************************************/ //工单信息-查询工单详情 @Override