1、工单详情接口处理

2、登录携带角色权限信息

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/controller/WorkorderGeneralSteponeController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 常规信息参数表_工序卡1(选配)
  * @Author: jeecg-boot
- * @Date:   2024-11-26
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Api(tags="常规信息参数表_工序卡1(选配)")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/entity/WorkorderGeneralStepone.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 常规信息参数表_工序卡1(选配)
  * @Author: jeecg-boot
- * @Date:   2024-11-26
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Data
@@ -84,4 +84,9 @@ public class WorkorderGeneralStepone implements Serializable {
 	@Dict(dictTable = "workorder_template", dicText = "task_no", dicCode = "id")
     @ApiModelProperty(value = "关联工单id")
     private java.lang.String templateId;
+	/**关联工序卡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;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/mapper/WorkorderGeneralSteponeMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 常规信息参数表_工序卡1(选配)
  * @Author: jeecg-boot
- * @Date:   2024-11-26
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface WorkorderGeneralSteponeMapper extends BaseMapper<WorkorderGeneralStepone> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/service/IWorkorderGeneralSteponeService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 常规信息参数表_工序卡1(选配)
  * @Author: jeecg-boot
- * @Date:   2024-11-26
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface IWorkorderGeneralSteponeService extends IService<WorkorderGeneralStepone> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/service/impl/WorkorderGeneralSteponeServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 常规信息参数表_工序卡1(选配)
  * @Author: jeecg-boot
- * @Date:   2024-11-26
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/vue/WorkorderGeneralSteponeList.vue

@@ -167,6 +167,11 @@
             align:"center",
             dataIndex: 'templateId_dictText'
           },
+          {
+            title:'关联工序卡id',
+            align:"center",
+            dataIndex: 'stepId_dictText'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -210,6 +215,7 @@
         fieldList.push({type:'string',value:'scribing2',text:'划片料号2',dictCode:''})
         fieldList.push({type:'string',value:'operator',text:'中试作业员',dictCode:''})
         fieldList.push({type:'string',value:'templateId',text:'关联工单id',dictCode:"workorder_template,task_no,id"})
+        fieldList.push({type:'string',value:'stepId',text:'关联工序卡id',dictCode:"workorder_step,name,id"})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/vue/modules/WorkorderGeneralSteponeForm.vue

@@ -48,6 +48,11 @@
               <j-dict-select-tag type="list" v-model="model.templateId" dictCode="workorder_template,task_no,id" placeholder="请选择关联工单id" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联工序卡id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stepId">
+              <j-dict-select-tag type="list" v-model="model.stepId" dictCode="workorder_step,name,id" placeholder="请选择关联工序卡id" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/vue3/WorkorderGeneralStepone.data.ts

@@ -49,6 +49,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'templateId_dictText'
    },
+   {
+    title: '关联工序卡id',
+    align:"center",
+    dataIndex: 'stepId_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -103,4 +108,12 @@ export const formSchema: FormSchema[] = [
         dictCode:"workorder_template,task_no,id"
      },
   },
+  {
+    label: '关联工序卡id',
+    field: 'stepId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"workorder_step,name,id"
+     },
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderItemCheck/entity/WorkorderItemCheck.java

@@ -4,11 +4,23 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.workorderGeneralStepfour.entity.WorkorderGeneralStepfour;
+import org.jeecg.modules.workorderGeneralStepone.entity.WorkorderGeneralStepone;
+import org.jeecg.modules.workorderGeneralStepthree.entity.WorkorderGeneralStepthree;
+import org.jeecg.modules.workorderGeneralSteptwo.entity.WorkorderGeneralSteptwo;
+import org.jeecg.modules.workorderParam.entity.WorkorderParam;
+import org.jeecg.modules.workorderParamStepfour.entity.WorkorderParamStepfour;
+import org.jeecg.modules.workorderParamStepone.entity.WorkorderParamStepone;
+import org.jeecg.modules.workorderParamStepthree.entity.WorkorderParamStepthree;
+import org.jeecg.modules.workorderParamSteptwo.entity.WorkorderParamSteptwo;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -60,4 +72,17 @@ public class WorkorderItemCheck implements Serializable {
 	@Excel(name = "排序字段", width = 15)
     @ApiModelProperty(value = "排序字段")
     private java.lang.Integer orderNo;
+
+    //工序卡1(选配)工序参数表
+    @TableField(exist = false)
+    private List<WorkorderParamStepone> workorderParamSteponeList;
+    //工序卡1(选配)工序参数表
+    @TableField(exist = false)
+    private List<WorkorderParamSteptwo> workorderParamSteptwoList;
+    //工序卡1(选配)工序参数表
+    @TableField(exist = false)
+    private List<WorkorderParamStepthree> workorderParamStepthreeList;
+    //工序卡1(选配)工序参数表
+    @TableField(exist = false)
+    private List<WorkorderParamStepfour> workorderParamStepfourList;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionRole/controller/WorkorderPermissionRoleController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.workorderPermissionRole.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.workorderPermissionRole.entity.WorkorderPermissionRole;
+import org.jeecg.modules.workorderPermissionRole.service.IWorkorderPermissionRoleService;
+
+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:   2024-11-28
+ * @Version: V1.0
+ */
+@Api(tags="角色权限配置表")
+@RestController
+@RequestMapping("/workorderPermissionRole/workorderPermissionRole")
+@Slf4j
+public class WorkorderPermissionRoleController extends JeecgController<WorkorderPermissionRole, IWorkorderPermissionRoleService> {
+	@Autowired
+	private IWorkorderPermissionRoleService workorderPermissionRoleService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param workorderPermissionRole
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "角色权限配置表-分页列表查询")
+	@ApiOperation(value="角色权限配置表-分页列表查询", notes="角色权限配置表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<WorkorderPermissionRole>> queryPageList(WorkorderPermissionRole workorderPermissionRole,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<WorkorderPermissionRole> queryWrapper = QueryGenerator.initQueryWrapper(workorderPermissionRole, req.getParameterMap());
+		Page<WorkorderPermissionRole> page = new Page<WorkorderPermissionRole>(pageNo, pageSize);
+		IPage<WorkorderPermissionRole> pageList = workorderPermissionRoleService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param workorderPermissionRole
+	 * @return
+	 */
+	@AutoLog(value = "角色权限配置表-添加")
+	@ApiOperation(value="角色权限配置表-添加", notes="角色权限配置表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody WorkorderPermissionRole workorderPermissionRole) {
+		workorderPermissionRoleService.save(workorderPermissionRole);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param workorderPermissionRole
+	 * @return
+	 */
+	@AutoLog(value = "角色权限配置表-编辑")
+	@ApiOperation(value="角色权限配置表-编辑", notes="角色权限配置表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody WorkorderPermissionRole workorderPermissionRole) {
+		workorderPermissionRoleService.updateById(workorderPermissionRole);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "角色权限配置表-通过id删除")
+	@ApiOperation(value="角色权限配置表-通过id删除", notes="角色权限配置表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		workorderPermissionRoleService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "角色权限配置表-批量删除")
+	@ApiOperation(value="角色权限配置表-批量删除", notes="角色权限配置表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.workorderPermissionRoleService.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<WorkorderPermissionRole> queryById(@RequestParam(name="id",required=true) String id) {
+		WorkorderPermissionRole workorderPermissionRole = workorderPermissionRoleService.getById(id);
+		if(workorderPermissionRole==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(workorderPermissionRole);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param workorderPermissionRole
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, WorkorderPermissionRole workorderPermissionRole) {
+        return super.exportXls(request, workorderPermissionRole, WorkorderPermissionRole.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, WorkorderPermissionRole.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionRole/entity/WorkorderPermissionRole.java

@@ -0,0 +1,65 @@
+package org.jeecg.modules.workorderPermissionRole.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.TableField;
+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:   2024-11-28
+ * @Version: V1.0
+ */
+@Data
+@TableName("workorder_permission_role")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="workorder_permission_role对象", description="角色权限配置表")
+public class WorkorderPermissionRole 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_permission", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "workorder_permission", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联权限id")
+    private java.lang.String permissionId;
+
+    //权限名称
+    @TableField(exist = false)
+    private java.lang.String permissionName;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionRole/mapper/WorkorderPermissionRoleMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.workorderPermissionRole.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.workorderPermissionRole.entity.WorkorderPermissionRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 角色权限配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+public interface WorkorderPermissionRoleMapper extends BaseMapper<WorkorderPermissionRole> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionRole/mapper/xml/WorkorderPermissionRoleMapper.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.workorderPermissionRole.mapper.WorkorderPermissionRoleMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionRole/service/IWorkorderPermissionRoleService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.workorderPermissionRole.service;
+
+import org.jeecg.modules.workorderPermissionRole.entity.WorkorderPermissionRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 角色权限配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+public interface IWorkorderPermissionRoleService extends IService<WorkorderPermissionRole> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionRole/service/impl/WorkorderPermissionRoleServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.workorderPermissionRole.service.impl;
+
+import org.jeecg.modules.workorderPermissionRole.entity.WorkorderPermissionRole;
+import org.jeecg.modules.workorderPermissionRole.mapper.WorkorderPermissionRoleMapper;
+import org.jeecg.modules.workorderPermissionRole.service.IWorkorderPermissionRoleService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 角色权限配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-28
+ * @Version: V1.0
+ */
+@Service
+public class WorkorderPermissionRoleServiceImpl extends ServiceImpl<WorkorderPermissionRoleMapper, WorkorderPermissionRole> implements IWorkorderPermissionRoleService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionRole/vue/WorkorderPermissionRoleList.vue

@@ -0,0 +1,178 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('角色权限配置表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <workorder-permission-role-modal ref="modalForm" @ok="modalFormOk"></workorder-permission-role-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import WorkorderPermissionRoleModal from './modules/WorkorderPermissionRoleModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'WorkorderPermissionRoleList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      WorkorderPermissionRoleModal
+    },
+    data () {
+      return {
+        description: '角色权限配置表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'关联角色id',
+            align:"center",
+            dataIndex: 'roleId_dictText'
+          },
+          {
+            title:'关联权限id',
+            align:"center",
+            dataIndex: 'permissionId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/workorderPermissionRole/workorderPermissionRole/list",
+          delete: "/workorderPermissionRole/workorderPermissionRole/delete",
+          deleteBatch: "/workorderPermissionRole/workorderPermissionRole/deleteBatch",
+          exportXlsUrl: "/workorderPermissionRole/workorderPermissionRole/exportXls",
+          importExcelUrl: "workorderPermissionRole/workorderPermissionRole/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'roleId',text:'关联角色id',dictCode:"workorder_role,name,id"})
+        fieldList.push({type:'string',value:'permissionId',text:'关联权限id',dictCode:"workorder_permission,name,id"})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionRole/vue/modules/WorkorderPermissionRoleForm.vue

@@ -0,0 +1,109 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="关联角色id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="roleId">
+              <j-dict-select-tag type="list" v-model="model.roleId" dictCode="workorder_role,name,id" placeholder="请选择关联角色id" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联权限id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="permissionId">
+              <j-dict-select-tag type="list" v-model="model.permissionId" dictCode="workorder_permission,name,id" placeholder="请选择关联权限id" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'WorkorderPermissionRoleForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/workorderPermissionRole/workorderPermissionRole/add",
+          edit: "/workorderPermissionRole/workorderPermissionRole/edit",
+          queryById: "/workorderPermissionRole/workorderPermissionRole/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionRole/vue/modules/WorkorderPermissionRoleModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <workorder-permission-role-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></workorder-permission-role-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import WorkorderPermissionRoleForm from './WorkorderPermissionRoleForm'
+
+  export default {
+    name: 'WorkorderPermissionRoleModal',
+    components: {
+      WorkorderPermissionRoleForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionRole/vue/modules/WorkorderPermissionRoleModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <workorder-permission-role-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></workorder-permission-role-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import WorkorderPermissionRoleForm from './WorkorderPermissionRoleForm'
+  export default {
+    name: 'WorkorderPermissionRoleModal',
+    components: {
+      WorkorderPermissionRoleForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionRole/vue3/WorkorderPermissionRole.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/workorderPermissionRole/workorderPermissionRole/list',
+  save='/workorderPermissionRole/workorderPermissionRole/add',
+  edit='/workorderPermissionRole/workorderPermissionRole/edit',
+  deleteOne = '/workorderPermissionRole/workorderPermissionRole/delete',
+  deleteBatch = '/workorderPermissionRole/workorderPermissionRole/deleteBatch',
+  importExcel = '/workorderPermissionRole/workorderPermissionRole/importExcel',
+  exportXls = '/workorderPermissionRole/workorderPermissionRole/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});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionRole/vue3/WorkorderPermissionRole.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: 'permissionId_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '关联角色id',
+    field: 'roleId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"workorder_role,name,id"
+     },
+  },
+  {
+    label: '关联权限id',
+    field: 'permissionId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"workorder_permission,name,id"
+     },
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionRole/vue3/WorkorderPermissionRoleList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <WorkorderPermissionRoleModal @register="registerModal" @success="handleSuccess"></WorkorderPermissionRoleModal>
+  </div>
+</template>
+
+<script lang="ts" name="workorderPermissionRole-workorderPermissionRole" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import WorkorderPermissionRoleModal from './components/WorkorderPermissionRoleModal.vue'
+  import {columns, searchFormSchema} from './workorderPermissionRole.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './workorderPermissionRole.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '角色权限配置表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"角色权限配置表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionRole/vue3/components/WorkorderPermissionRoleModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../workorderPermissionRole.data';
+    import {saveOrUpdate} from '../workorderPermissionRole.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderProcess/entity/WorkorderProcess.java

@@ -4,11 +4,16 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.workorderItemCheck.entity.WorkorderItemCheck;
+import org.jeecg.modules.workorderParamStepone.entity.WorkorderParamStepone;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -60,4 +65,8 @@ public class WorkorderProcess implements Serializable {
 	@Excel(name = "排序编号", width = 15)
     @ApiModelProperty(value = "排序编号")
     private java.lang.Integer orderNo;
+
+    //检查项目参数表
+    @TableField(exist = false)
+    private List<WorkorderItemCheck> workorderItemCheckList;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderRole/controller/WorkorderRoleController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 用户角色表
  * @Author: jeecg-boot
- * @Date:   2024-11-21
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Api(tags="用户角色表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderRole/entity/WorkorderRole.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 用户角色表
  * @Author: jeecg-boot
- * @Date:   2024-11-21
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Data
@@ -51,9 +51,4 @@ public class WorkorderRole implements Serializable {
 	@Excel(name = "角色名称", width = 15)
     @ApiModelProperty(value = "角色名称")
     private java.lang.String name;
-	/**权限(编辑)*/
-	@Excel(name = "权限(编辑)", width = 15, dicCode = "is_edit")
-	@Dict(dicCode = "is_edit")
-    @ApiModelProperty(value = "权限(编辑)")
-    private java.lang.String isEdit;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderRole/mapper/WorkorderRoleMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 用户角色表
  * @Author: jeecg-boot
- * @Date:   2024-11-21
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface WorkorderRoleMapper extends BaseMapper<WorkorderRole> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderRole/service/IWorkorderRoleService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 用户角色表
  * @Author: jeecg-boot
- * @Date:   2024-11-21
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface IWorkorderRoleService extends IService<WorkorderRole> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderRole/service/impl/WorkorderRoleServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 用户角色表
  * @Author: jeecg-boot
- * @Date:   2024-11-21
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderRole/vue/WorkorderRoleList.vue

@@ -99,7 +99,6 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import WorkorderRoleModal from './modules/WorkorderRoleModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'WorkorderRoleList',
@@ -127,11 +126,6 @@
             align:"center",
             dataIndex: 'name'
           },
-          {
-            title:'权限(编辑)',
-            align:"center",
-            dataIndex: 'isEdit_dictText'
-          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -167,7 +161,6 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'name',text:'角色名称',dictCode:''})
-        fieldList.push({type:'string',value:'isEdit',text:'权限(编辑)',dictCode:'is_edit'})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderRole/vue/modules/WorkorderRoleForm.vue

@@ -8,11 +8,6 @@
               <a-input v-model="model.name" placeholder="请输入角色名称"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="权限(编辑)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isEdit">
-              <j-dict-select-tag type="list" v-model="model.isEdit" dictCode="is_edit" placeholder="请选择权限(编辑)" />
-            </a-form-model-item>
-          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderRole/vue3/WorkorderRole.data.ts

@@ -9,11 +9,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'name'
    },
-   {
-    title: '权限(编辑)',
-    align:"center",
-    dataIndex: 'isEdit_dictText'
-   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -25,12 +20,4 @@ export const formSchema: FormSchema[] = [
     field: 'name',
     component: 'Input',
   },
-  {
-    label: '权限(编辑)',
-    field: 'isEdit',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:"is_edit"
-     },
-  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderStep/controller/WorkorderStepController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 工序流程表
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Api(tags="工序流程表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderStep/entity/WorkorderStep.java

@@ -4,11 +4,20 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.workorderGeneralStepfour.entity.WorkorderGeneralStepfour;
+import org.jeecg.modules.workorderGeneralStepone.entity.WorkorderGeneralStepone;
+import org.jeecg.modules.workorderGeneralStepthree.entity.WorkorderGeneralStepthree;
+import org.jeecg.modules.workorderGeneralSteptwo.entity.WorkorderGeneralSteptwo;
+import org.jeecg.modules.workorderItemCheck.entity.WorkorderItemCheck;
+import org.jeecg.modules.workorderProcess.entity.WorkorderProcess;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -20,7 +29,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 工序流程表
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Data
@@ -51,4 +60,21 @@ public class WorkorderStep implements Serializable {
 	@Excel(name = "工序流程名称", width = 15)
     @ApiModelProperty(value = "工序流程名称")
     private java.lang.String name;
+
+    //工序流程表
+    @TableField(exist = false)
+    private List<WorkorderProcess> workorderProcessList;
+
+    //常规参数表1
+    @TableField(exist = false)
+    private List<WorkorderGeneralStepone> workorderGeneralSteponeList;
+    //常规参数表2
+    @TableField(exist = false)
+    private List<WorkorderGeneralSteptwo> workorderGeneralSteptwoList;
+    //常规参数表3
+    @TableField(exist = false)
+    private List<WorkorderGeneralStepthree> workorderGeneralStepthreeList;
+    //常规参数表4
+    @TableField(exist = false)
+    private List<WorkorderGeneralStepfour> workorderGeneralStepfourList;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderStep/mapper/WorkorderStepMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 工序流程表
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface WorkorderStepMapper extends BaseMapper<WorkorderStep> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderStep/service/IWorkorderStepService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 工序流程表
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface IWorkorderStepService extends IService<WorkorderStep> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderStep/service/impl/WorkorderStepServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 工序流程表
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/controller/WorkorderTemplateController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 工单信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-18
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Api(tags="工单信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/entity/WorkorderTemplate.java

@@ -12,8 +12,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.workorderGeneralStepfour.entity.WorkorderGeneralStepfour;
 import org.jeecg.modules.workorderGeneralStepone.entity.WorkorderGeneralStepone;
 import org.jeecg.modules.workorderParamStepone.entity.WorkorderParamStepone;
+import org.jeecg.modules.workorderStatus.entity.WorkorderStatus;
+import org.jeecg.modules.workorderStep.entity.WorkorderStep;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -25,7 +28,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 工单信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-18
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Data
@@ -82,128 +85,14 @@ public class WorkorderTemplate implements Serializable {
 	@Dict(dictTable = "workorder_status", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "关联状态id")
     private java.lang.String statusId;
-	/**选配*/
-	@Excel(name = "选配", width = 15)
-    private transient java.lang.String choiceString;
 
-    private byte[] choice;
-
-    public byte[] getChoice(){
-        if(choiceString==null){
-            return null;
-        }
-        try {
-            return choiceString.getBytes("UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public String getChoiceString(){
-        if(choice==null || choice.length==0){
-            return "";
-        }
-        try {
-            return new String(choice,"UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-	/**工序1*/
-	@Excel(name = "工序1", width = 15)
-    private transient java.lang.String steponeString;
-
-    private byte[] stepone;
-
-    public byte[] getStepone(){
-        if(steponeString==null){
-            return null;
-        }
-        try {
-            return steponeString.getBytes("UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public String getSteponeString(){
-        if(stepone==null || stepone.length==0){
-            return "";
-        }
-        try {
-            return new String(stepone,"UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-	/**工序2*/
-	@Excel(name = "工序2", width = 15)
-    private transient java.lang.String steptwoString;
-
-    private byte[] steptwo;
-
-    public byte[] getSteptwo(){
-        if(steptwoString==null){
-            return null;
-        }
-        try {
-            return steptwoString.getBytes("UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public String getSteptwoString(){
-        if(steptwo==null || steptwo.length==0){
-            return "";
-        }
-        try {
-            return new String(steptwo,"UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-	/**总成*/
-	@Excel(name = "总成", width = 15)
-    private transient java.lang.String assemblyString;
-
-    private byte[] assembly;
-
-    public byte[] getAssembly(){
-        if(assemblyString==null){
-            return null;
-        }
-        try {
-            return assemblyString.getBytes("UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public String getAssemblyString(){
-        if(assembly==null || assembly.length==0){
-            return "";
-        }
-        try {
-            return new String(assembly,"UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-
-    //工序卡1(选配)常规参数表
+	//工单状态描述
     @TableField(exist = false)
-    private WorkorderGeneralStepone workorderGeneralStepone;
+    private java.lang.String statusDescribe;
 
-    //工序卡1(选配)参数表
+    //工序卡列表
     @TableField(exist = false)
-    private List<WorkorderParamStepone> workorderParamSteponeList;
+    private List<WorkorderStep> workorderStepList;
+
+
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/mapper/WorkorderTemplateMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 工单信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-18
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface WorkorderTemplateMapper extends BaseMapper<WorkorderTemplate> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/IWorkorderTemplateService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 工单信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-18
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface IWorkorderTemplateService extends IService<WorkorderTemplate> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/WorkorderTemplateServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 工单信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-18
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/vue/WorkorderTemplateList.vue

@@ -157,26 +157,6 @@
             align:"center",
             dataIndex: 'statusId_dictText'
           },
-          {
-            title:'选配',
-            align:"center",
-            dataIndex: 'choiceString'
-          },
-          {
-            title:'工序1',
-            align:"center",
-            dataIndex: 'steponeString'
-          },
-          {
-            title:'工序2',
-            align:"center",
-            dataIndex: 'steptwoString'
-          },
-          {
-            title:'总成',
-            align:"center",
-            dataIndex: 'assemblyString'
-          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -218,10 +198,6 @@
         fieldList.push({type:'string',value:'isEmergency',text:'是否紧急',dictCode:'emergency_flag'})
         fieldList.push({type:'Text',value:'remark',text:'备注',dictCode:''})
         fieldList.push({type:'string',value:'statusId',text:'关联状态id',dictCode:"workorder_status,name,id"})
-        fieldList.push({type:'Blob',value:'choice',text:'选配',dictCode:''})
-        fieldList.push({type:'Blob',value:'stepone',text:'工序1',dictCode:''})
-        fieldList.push({type:'Blob',value:'steptwo',text:'工序2',dictCode:''})
-        fieldList.push({type:'Blob',value:'assembly',text:'总成',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/vue/modules/WorkorderTemplateForm.vue

@@ -38,26 +38,6 @@
               <j-dict-select-tag type="list" v-model="model.statusId" dictCode="workorder_status,name,id" placeholder="请选择关联状态id" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="选配" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="choiceString">
-              <j-upload v-model="model.choice"   ></j-upload>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="工序1" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="steponeString">
-              <j-upload v-model="model.stepone"   ></j-upload>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="工序2" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="steptwoString">
-              <j-upload v-model="model.steptwo"   ></j-upload>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="总成" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="assemblyString">
-              <j-upload v-model="model.assembly"   ></j-upload>
-            </a-form-model-item>
-          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/vue3/WorkorderTemplate.data.ts

@@ -39,26 +39,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'statusId_dictText'
    },
-   {
-    title: '选配',
-    align:"center",
-    dataIndex: 'choiceString'
-   },
-   {
-    title: '工序1',
-    align:"center",
-    dataIndex: 'steponeString'
-   },
-   {
-    title: '工序2',
-    align:"center",
-    dataIndex: 'steptwoString'
-   },
-   {
-    title: '总成',
-    align:"center",
-    dataIndex: 'assemblyString'
-   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -106,32 +86,4 @@ export const formSchema: FormSchema[] = [
         dictCode:"workorder_status,name,id"
      },
   },
-  {
-    label: '选配',
-    field: 'choice',
-    component: 'JUpload',
-    componentProps:{
-     },
-  },
-  {
-    label: '工序1',
-    field: 'stepone',
-    component: 'JUpload',
-    componentProps:{
-     },
-  },
-  {
-    label: '工序2',
-    field: 'steptwo',
-    component: 'JUpload',
-    componentProps:{
-     },
-  },
-  {
-    label: '总成',
-    field: 'assembly',
-    component: 'JUpload',
-    componentProps:{
-     },
-  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/controller/WorkorderUserController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 用户信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-16
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Api(tags="用户信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/entity/WorkorderUser.java

@@ -1,15 +1,14 @@
 package org.jeecg.modules.workorderUser.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 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.jeecg.modules.workorderPermissionRole.entity.WorkorderPermissionRole;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
@@ -20,7 +19,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 用户信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-16
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Data
@@ -64,4 +63,12 @@ public class WorkorderUser implements Serializable {
 	@Dict(dictTable = "workorder_role", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "关联角色id")
     private java.lang.String roleId;
+
+    //角色名称
+    @TableField(exist = false)
+    private java.lang.String roleName;
+
+    //角色权限列表
+    @TableField(exist = false)
+    private List<WorkorderPermissionRole> permissionRoleList;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/mapper/WorkorderUserMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 用户信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-16
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface WorkorderUserMapper extends BaseMapper<WorkorderUser> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/service/IWorkorderUserService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 用户信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-16
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 public interface IWorkorderUserService extends IService<WorkorderUser> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/service/impl/WorkorderUserServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 用户信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-16
+ * @Date:   2024-11-28
  * @Version: V1.0
  */
 @Service

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/UserController.java

@@ -51,7 +51,7 @@ public class UserController {
     }
 
     @ApiOperation(value="用户信息-登录", notes="用户信息-登录")
-    @RequestMapping(value = "/login", method = {RequestMethod.GET})
+    @RequestMapping(value = "/login", method = {RequestMethod.POST})
     public Result<?> login(String userName, String password){
 
         String message = "";
@@ -70,7 +70,7 @@ public class UserController {
     }
 
     @ApiOperation(value="用户信息-注册", notes="用户信息-注册")
-    @RequestMapping(value = "/register", method = {RequestMethod.GET})
+    @RequestMapping(value = "/register", method = {RequestMethod.POST})
     public Result<?> register(UserBean userBean){
 
         //将注册信息注入到实体bean中
@@ -78,7 +78,9 @@ public class UserController {
         workorderUser.setName(userBean.getName());
         workorderUser.setPassword(userBean.getPassword());
         workorderUser.setImage(userBean.getImage());
-        workorderUser.setRoleId(userBean.getRoleId());
+        if(StringUtils.isNotEmpty(userBean.getRoleId())){
+            workorderUser.setRoleId(userBean.getRoleId());
+        }
 
         //返回信息
         String message = "";

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java

@@ -13,6 +13,8 @@ import org.jeecg.modules.workorderGeneralStepthree.entity.WorkorderGeneralStepth
 import org.jeecg.modules.workorderGeneralStepthree.service.IWorkorderGeneralStepthreeService;
 import org.jeecg.modules.workorderGeneralSteptwo.entity.WorkorderGeneralSteptwo;
 import org.jeecg.modules.workorderGeneralSteptwo.service.IWorkorderGeneralSteptwoService;
+import org.jeecg.modules.workorderItemCheck.entity.WorkorderItemCheck;
+import org.jeecg.modules.workorderItemCheck.service.IWorkorderItemCheckService;
 import org.jeecg.modules.workorderParamStepfour.entity.WorkorderParamStepfour;
 import org.jeecg.modules.workorderParamStepfour.service.IWorkorderParamStepfourService;
 import org.jeecg.modules.workorderParamStepone.entity.WorkorderParamStepone;
@@ -21,6 +23,12 @@ 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.workorderProcess.entity.WorkorderProcess;
+import org.jeecg.modules.workorderProcess.service.IWorkorderProcessService;
+import org.jeecg.modules.workorderStatus.entity.WorkorderStatus;
+import org.jeecg.modules.workorderStatus.service.IWorkorderStatusService;
+import org.jeecg.modules.workorderStep.entity.WorkorderStep;
+import org.jeecg.modules.workorderStep.service.IWorkorderStepService;
 import org.jeecg.modules.workorderStepfour.entity.WorkorderStepfour;
 import org.jeecg.modules.workorderStepfour.service.IWorkorderStepfourService;
 import org.jeecg.modules.workorderStepone.entity.WorkorderStepone;
@@ -34,15 +42,32 @@ import org.jeecg.modules.workorderTemplate.service.IWorkorderTemplateService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class TemplateServiceImpl implements TemplateService {
 
+    //工单状态
+    @Resource
+    private IWorkorderStatusService workorderStatusService;
+
     //工单信息
     @Resource
     private IWorkorderTemplateService workorderTemplateService;
 
+    //工序卡信息
+    @Resource
+    private IWorkorderStepService workorderStepService;
+
+    //工序流程信息
+    @Resource
+    private IWorkorderProcessService workorderProcessService;
+
+    //检查项目信息
+    @Resource
+    private IWorkorderItemCheckService workorderItemCheckService;
+
     //工序卡常规参数
     @Resource
     private IWorkorderGeneralSteponeService workorderGeneralSteponeService;
@@ -113,32 +138,29 @@ public class TemplateServiceImpl implements TemplateService {
     }
 
     //工单信息-查询工单详情
-    @Override
-    public Result<?> queryTemplateById(String templateId) {
-        //查询公告信息详情
-        WorkorderTemplate template = workorderTemplateService
-                .lambdaQuery()
-                .eq(WorkorderTemplate::getId, templateId)
-                .one();
-
-        //工序卡1
-        //常规参数
-        WorkorderGeneralStepone generalStepone = workorderGeneralSteponeService
-                .lambdaQuery()
-                .eq(WorkorderGeneralStepone::getTemplateId, templateId)
-                .one();
-
-        //列表参数
-        List<WorkorderParamStepone> paramStepone = workorderParamSteponeService
-                .lambdaQuery()
-                .eq(WorkorderParamStepone::getTemplateId, templateId)
-                .list();
-
-        template.setWorkorderGeneralStepone(generalStepone);
-        template.setWorkorderParamSteponeList(paramStepone);
-
-        return Result.OK("工单详情", template);
-    }
+//    @Override
+//    public Result<?> queryTemplateById(String templateId) {
+//        //查询工单信息详情
+//        WorkorderTemplate template = workorderTemplateService
+//                .lambdaQuery()
+//                .eq(WorkorderTemplate::getId, templateId)
+//                .one();
+//
+//        //工序卡1
+//        //常规参数
+//        WorkorderGeneralStepone generalStepone = workorderGeneralSteponeService
+//                .lambdaQuery()
+//                .eq(WorkorderGeneralStepone::getTemplateId, templateId)
+//                .one();
+//
+//        //列表参数
+//        List<WorkorderParamStepone> paramStepone = workorderParamSteponeService
+//                .lambdaQuery()
+//                .eq(WorkorderParamStepone::getTemplateId, templateId)
+//                .list();
+//
+//        return Result.OK("工单详情", template);
+//    }
 
     //工单信息-修改工单
     @Override
@@ -331,4 +353,184 @@ public class TemplateServiceImpl implements TemplateService {
         }
     }
 
+    /*********************************************************************************************************/
+    //工单信息-查询工单详情
+    @Override
+    public Result<?> queryTemplateById(String templateId){
+
+        //查询工单信息
+        WorkorderTemplate workorderTemplate = workorderTemplateService
+                .lambdaQuery()
+                .eq(WorkorderTemplate::getId, templateId)
+                .one();
+
+        //查询工序卡信息
+        List<WorkorderStep> stepList = workorderStepService
+                .lambdaQuery()
+                .list();
+
+        //查询工序信息
+        List<WorkorderProcess> processList = workorderProcessService
+                .lambdaQuery()
+                .list();
+
+        //查询检查项目信息
+        List<WorkorderItemCheck> itemCheckList = workorderItemCheckService
+                .lambdaQuery()
+                .list();
+
+        //根据工单id查询常规参数
+        List<WorkorderGeneralStepone> GeneralSteponeList = workorderGeneralSteponeService
+                .lambdaQuery()
+                .eq(WorkorderGeneralStepone::getTemplateId, templateId)
+                .list();
+        List<WorkorderGeneralSteptwo> GeneralSteptwoList = workorderGeneralSteptwoService
+                .lambdaQuery()
+                .eq(WorkorderGeneralSteptwo::getTemplateId, templateId)
+                .list();
+        List<WorkorderGeneralStepthree> GeneralStepthreeList = workorderGeneralStepthreeService
+                .lambdaQuery()
+                .eq(WorkorderGeneralStepthree::getTemplateId, templateId)
+                .list();
+        List<WorkorderGeneralStepfour> GeneralStepfourList = workorderGeneralStepfourService
+                .lambdaQuery()
+                .eq(WorkorderGeneralStepfour::getTemplateId, templateId)
+                .list();
+
+        //根据工单id查询检查项目参数
+        List<WorkorderParamStepone> paramSteponeList = workorderParamSteponeService
+                .lambdaQuery()
+                .eq(WorkorderParamStepone::getTemplateId, templateId)
+                .list();
+        List<WorkorderParamSteptwo> paramSteptwoList = workorderParamSteptwoService
+                .lambdaQuery()
+                .eq(WorkorderParamSteptwo::getTemplateId, templateId)
+                .list();
+        List<WorkorderParamStepthree> paramStepthreeList = workorderParamStepthreeService
+                .lambdaQuery()
+                .eq(WorkorderParamStepthree::getTemplateId, templateId)
+                .list();
+        List<WorkorderParamStepfour> paramStepfourList = workorderParamStepfourService
+                .lambdaQuery()
+                .eq(WorkorderParamStepfour::getTemplateId, templateId)
+                .list();
+
+        //一、将检查项目参数对象放入对应检查项目对象下
+        for (WorkorderItemCheck workorderItemCheck : itemCheckList) {
+            //工序卡1
+            List<WorkorderParamStepone> workorderParamSteponeList = new ArrayList<>();
+            for (WorkorderParamStepone workorderParamStepone : paramSteponeList) {
+                if(workorderParamStepone.getProcessId().equals(workorderItemCheck.getId()) ){
+                    workorderParamSteponeList.add(workorderParamStepone);
+                }
+            }
+            workorderItemCheck.setWorkorderParamSteponeList(workorderParamSteponeList);
+
+            //工序卡2
+            List<WorkorderParamSteptwo> workorderParamSteptwoList = new ArrayList<>();
+            for (WorkorderParamSteptwo workorderParamSteptwo : paramSteptwoList) {
+                if(workorderParamSteptwo.getProcessId().equals(workorderItemCheck.getId())){
+                    workorderParamSteptwoList.add(workorderParamSteptwo);
+                }
+            }
+            workorderItemCheck.setWorkorderParamSteptwoList(workorderParamSteptwoList);
+
+            //工序卡3
+            List<WorkorderParamStepthree> workorderParamStepthreeList = new ArrayList<>();
+            for (WorkorderParamStepthree workorderParamStepthree : paramStepthreeList) {
+                if(workorderParamStepthree.getProcessId().equals(workorderItemCheck.getId())){
+                    workorderParamStepthreeList.add(workorderParamStepthree);
+                }
+            }
+            workorderItemCheck.setWorkorderParamStepthreeList(workorderParamStepthreeList);
+
+            //工序卡4
+            List<WorkorderParamStepfour> workorderParamStepfourList = new ArrayList<>();
+            for (WorkorderParamStepfour workorderParamStepfour : paramStepfourList) {
+                if(workorderParamStepfour.getProcessId().equals(workorderItemCheck.getId())){
+                    workorderParamStepfourList.add(workorderParamStepfour);
+                }
+            }
+            workorderItemCheck.setWorkorderParamStepfourList(workorderParamStepfourList);
+
+        }
+
+        //二、将检查项目对象放入对应工序流程对象下
+        for (WorkorderProcess workorderProcess : processList) {
+            List<WorkorderItemCheck> workorderItemCheckList = new ArrayList<>();
+            for (WorkorderItemCheck workorderItemCheck : itemCheckList) {
+                if(workorderItemCheck.getProcessId().equals(workorderProcess.getId())){
+                    workorderItemCheckList.add(workorderItemCheck);
+                }
+            }
+            workorderProcess.setWorkorderItemCheckList(workorderItemCheckList);
+        }
+
+        //三、将工序流程对象放入对应工序卡对象下
+        for (WorkorderStep workorderStep : stepList) {
+            //工序参数
+            List<WorkorderProcess> workorderProcessList = new ArrayList<>();
+            for (WorkorderProcess workorderProcess : processList) {
+                if(workorderProcess.getStepId().equals(workorderStep.getId())){
+                    workorderProcessList.add(workorderProcess);
+                }
+            }
+            workorderStep.setWorkorderProcessList(workorderProcessList);
+
+            //常规参数(待优化--冗余list)
+            //工序卡1
+            List<WorkorderGeneralStepone> workorderGeneralSteponeList = new ArrayList<>();
+            for (WorkorderGeneralStepone generalStepone : GeneralSteponeList) {
+                if(generalStepone.getStepId().equals(workorderStep.getId())){
+                    workorderGeneralSteponeList.add(generalStepone);
+                }
+            }
+            workorderStep.setWorkorderGeneralSteponeList(workorderGeneralSteponeList);
+
+            //工序卡2
+            List<WorkorderGeneralSteptwo> workorderGeneralSteptwoList = new ArrayList<>();
+            for (WorkorderGeneralSteptwo generalSteptwo : GeneralSteptwoList) {
+                if(generalSteptwo.getStepId().equals(workorderStep.getId())){
+                    workorderGeneralSteptwoList.add(generalSteptwo);
+                }
+            }
+            workorderStep.setWorkorderGeneralSteptwoList(workorderGeneralSteptwoList);
+
+            //工序卡3
+            List<WorkorderGeneralStepthree> workorderGeneralStepthreeList = new ArrayList<>();
+            for (WorkorderGeneralStepthree generalStepthree : GeneralStepthreeList) {
+                if(generalStepthree.getStepId().equals(workorderStep.getId())){
+                    workorderGeneralStepthreeList.add(generalStepthree);
+                }
+            }
+            workorderStep.setWorkorderGeneralStepthreeList(workorderGeneralStepthreeList);
+
+            //工序卡4
+            List<WorkorderGeneralStepfour> workorderGeneralStepfourList = new ArrayList<>();
+            for (WorkorderGeneralStepfour generalStepfour : GeneralStepfourList) {
+                if(generalStepfour.getStepId().equals(workorderStep.getId())){
+                    workorderGeneralStepfourList.add(generalStepfour);
+                }
+            }
+            workorderStep.setWorkorderGeneralStepfourList(workorderGeneralStepfourList);
+
+        }
+
+        //四、将工序卡对象放入对应工单对象下
+        workorderTemplate.setWorkorderStepList(stepList);
+
+        //补充工单状态描述
+        List<WorkorderStatus> workorderStatus = workorderStatusService
+                .lambdaQuery()
+                .list();
+        for (WorkorderStatus status : workorderStatus) {
+            if(workorderTemplate.getStatusId().equals(status.getId())){
+                workorderTemplate.setStatusDescribe(status.getName());
+                break;
+            }
+        }
+
+        return Result.OK("工单详情！", workorderTemplate);
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java

@@ -4,11 +4,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.UserService;
+import org.jeecg.modules.workorderPermission.entity.WorkorderPermission;
+import org.jeecg.modules.workorderPermission.service.IWorkorderPermissionService;
+import org.jeecg.modules.workorderPermissionRole.entity.WorkorderPermissionRole;
+import org.jeecg.modules.workorderPermissionRole.service.IWorkorderPermissionRoleService;
+import org.jeecg.modules.workorderRole.entity.WorkorderRole;
+import org.jeecg.modules.workorderRole.service.IWorkorderRoleService;
 import org.jeecg.modules.workorderUser.entity.WorkorderUser;
 import org.jeecg.modules.workorderUser.service.IWorkorderUserService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 @Service
 public class UserServiceImpl implements UserService {
@@ -16,6 +24,18 @@ public class UserServiceImpl implements UserService {
     //个人信息
     @Resource
     private IWorkorderUserService workorderUserService;
+
+    //角色信息
+    @Resource
+    private IWorkorderRoleService workorderRoleService;
+
+    //权限信息
+    @Resource
+    private IWorkorderPermissionService workorderPermissionService;
+
+    //角色权限信息
+    @Resource
+    private IWorkorderPermissionRoleService workorderPermissionRoleService;
     /*************************************************************************************/
 
     //查询用户列表
@@ -46,16 +66,44 @@ public class UserServiceImpl implements UserService {
     @Override
     public Result<?> login(String userName, String password) {
         //查询用户信息详情
-        WorkorderUser one = workorderUserService
+        WorkorderUser user = workorderUserService
                 .lambdaQuery()
                 .eq(WorkorderUser::getName, userName)
                 .eq(WorkorderUser::getPassword, password)
                 .one();
 
-        if(null != one){
-            return Result.OK("用户登录成功", one);
+        if(null != user){
+            //获取用户角色信息
+            WorkorderRole role = workorderRoleService
+                    .lambdaQuery()
+                    .eq(WorkorderRole::getId, user.getRoleId())
+                    .one();
+            user.setRoleName(role.getName());
+
+            //获取角色权限信息
+            //1、获取权限信息
+            List<WorkorderPermission> permissionList = workorderPermissionService
+                    .lambdaQuery()
+                    .list();
+            //2、获取角色关联权限
+            List<WorkorderPermissionRole> permissionRoleList = workorderPermissionRoleService
+                    .lambdaQuery()
+                    .eq(WorkorderPermissionRole::getRoleId, role.getId())
+                    .list();
+
+            //添加权限名称
+            for (WorkorderPermissionRole workorderPermissionRole : permissionRoleList) {
+                for (WorkorderPermission permission : permissionList) {
+                    if(workorderPermissionRole.getPermissionId().equals(permission.getId())){
+                        workorderPermissionRole.setPermissionName(permission.getName());
+                    }
+                }
+            }
+            user.setPermissionRoleList(permissionRoleList);
+
+            return Result.OK("用户登录成功", user);
         }else {
-            return Result.error("该用户不存在", one);
+            return Result.error("该用户不存在", user);
         }
 
     }