1、swagger文档配置修改

2、shiro配置修改

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

@@ -37,12 +37,12 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 工序卡1(选配)常规参数表
+ * @Description: 常规信息参数表_工序卡1(选配)
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-11-26
  * @Version: V1.0
  */
-@Api(tags="工序卡1(选配)常规参数表")
+@Api(tags="常规信息参数表_工序卡1(选配)")
 @RestController
 @RequestMapping("/workorderGeneralStepone/workorderGeneralStepone")
 @Slf4j
@@ -59,8 +59,8 @@ public class WorkorderGeneralSteponeController extends JeecgController<Workorder
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "工序卡1(选配)常规参数表-分页列表查询")
-	@ApiOperation(value="工序卡1(选配)常规参数表-分页列表查询", notes="工序卡1(选配)常规参数表-分页列表查询")
+	//@AutoLog(value = "常规信息参数表_工序卡1(选配)-分页列表查询")
+	@ApiOperation(value="常规信息参数表_工序卡1(选配)-分页列表查询", notes="常规信息参数表_工序卡1(选配)-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<WorkorderGeneralStepone>> queryPageList(WorkorderGeneralStepone workorderGeneralStepone,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -78,8 +78,8 @@ public class WorkorderGeneralSteponeController extends JeecgController<Workorder
 	 * @param workorderGeneralStepone
 	 * @return
 	 */
-	@AutoLog(value = "工序卡1(选配)常规参数表-添加")
-	@ApiOperation(value="工序卡1(选配)常规参数表-添加", notes="工序卡1(选配)常规参数表-添加")
+	@AutoLog(value = "常规信息参数表_工序卡1(选配)-添加")
+	@ApiOperation(value="常规信息参数表_工序卡1(选配)-添加", notes="常规信息参数表_工序卡1(选配)-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody WorkorderGeneralStepone workorderGeneralStepone) {
 		workorderGeneralSteponeService.save(workorderGeneralStepone);
@@ -92,8 +92,8 @@ public class WorkorderGeneralSteponeController extends JeecgController<Workorder
 	 * @param workorderGeneralStepone
 	 * @return
 	 */
-	@AutoLog(value = "工序卡1(选配)常规参数表-编辑")
-	@ApiOperation(value="工序卡1(选配)常规参数表-编辑", notes="工序卡1(选配)常规参数表-编辑")
+	@AutoLog(value = "常规信息参数表_工序卡1(选配)-编辑")
+	@ApiOperation(value="常规信息参数表_工序卡1(选配)-编辑", notes="常规信息参数表_工序卡1(选配)-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody WorkorderGeneralStepone workorderGeneralStepone) {
 		workorderGeneralSteponeService.updateById(workorderGeneralStepone);
@@ -106,8 +106,8 @@ public class WorkorderGeneralSteponeController extends JeecgController<Workorder
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "工序卡1(选配)常规参数表-通过id删除")
-	@ApiOperation(value="工序卡1(选配)常规参数表-通过id删除", notes="工序卡1(选配)常规参数表-通过id删除")
+	@AutoLog(value = "常规信息参数表_工序卡1(选配)-通过id删除")
+	@ApiOperation(value="常规信息参数表_工序卡1(选配)-通过id删除", notes="常规信息参数表_工序卡1(选配)-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		workorderGeneralSteponeService.removeById(id);
@@ -120,8 +120,8 @@ public class WorkorderGeneralSteponeController extends JeecgController<Workorder
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "工序卡1(选配)常规参数表-批量删除")
-	@ApiOperation(value="工序卡1(选配)常规参数表-批量删除", notes="工序卡1(选配)常规参数表-批量删除")
+	@AutoLog(value = "常规信息参数表_工序卡1(选配)-批量删除")
+	@ApiOperation(value="常规信息参数表_工序卡1(选配)-批量删除", notes="常规信息参数表_工序卡1(选配)-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.workorderGeneralSteponeService.removeByIds(Arrays.asList(ids.split(",")));
@@ -134,8 +134,8 @@ public class WorkorderGeneralSteponeController extends JeecgController<Workorder
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "工序卡1(选配)常规参数表-通过id查询")
-	@ApiOperation(value="工序卡1(选配)常规参数表-通过id查询", notes="工序卡1(选配)常规参数表-通过id查询")
+	//@AutoLog(value = "常规信息参数表_工序卡1(选配)-通过id查询")
+	@ApiOperation(value="常规信息参数表_工序卡1(选配)-通过id查询", notes="常规信息参数表_工序卡1(选配)-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<WorkorderGeneralStepone> queryById(@RequestParam(name="id",required=true) String id) {
 		WorkorderGeneralStepone workorderGeneralStepone = workorderGeneralSteponeService.getById(id);
@@ -153,7 +153,7 @@ public class WorkorderGeneralSteponeController extends JeecgController<Workorder
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, WorkorderGeneralStepone workorderGeneralStepone) {
-        return super.exportXls(request, workorderGeneralStepone, WorkorderGeneralStepone.class, "工序卡1(选配)常规参数表");
+        return super.exportXls(request, workorderGeneralStepone, WorkorderGeneralStepone.class, "常规信息参数表_工序卡1(选配)");
     }
 
     /**

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

@@ -18,16 +18,16 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 工序卡1(选配)常规参数表
+ * @Description: 常规信息参数表_工序卡1(选配)
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-11-26
  * @Version: V1.0
  */
 @Data
 @TableName("workorder_general_stepone")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="workorder_general_stepone对象", description="工序卡1(选配)常规参数表")
+@ApiModel(value="workorder_general_stepone对象", description="常规信息参数表_工序卡1(选配)")
 public class WorkorderGeneralStepone implements Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -7,9 +7,9 @@ import org.jeecg.modules.workorderGeneralStepone.entity.WorkorderGeneralStepone;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @Description: 工序卡1(选配)常规参数表
+ * @Description: 常规信息参数表_工序卡1(选配)
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-11-26
  * @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

@@ -4,9 +4,9 @@ import org.jeecg.modules.workorderGeneralStepone.entity.WorkorderGeneralStepone;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * @Description: 工序卡1(选配)常规参数表
+ * @Description: 常规信息参数表_工序卡1(选配)
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-11-26
  * @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

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

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

@@ -12,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('工序卡1(选配)常规参数表')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('常规信息参数表_工序卡1(选配)')">导出</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>
@@ -109,7 +109,7 @@
     },
     data () {
       return {
-        description: '工序卡1(选配)常规参数表管理页面',
+        description: '常规信息参数表_工序卡1(选配)管理页面',
         // 表头
         columns: [
           {

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

@@ -53,7 +53,7 @@
   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
-           title: '工序卡1(选配)常规参数表',
+           title: '常规信息参数表_工序卡1(选配)',
            api: list,
            columns,
            canResize:false,
@@ -70,7 +70,7 @@
             },
       },
        exportConfig: {
-            name:"工序卡1(选配)常规参数表",
+            name:"常规信息参数表_工序卡1(选配)",
             url: getExportUrl,
           },
           importConfig: {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderParamStepone/controller/WorkorderParamSteponeController.java

@@ -37,12 +37,12 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 工序卡1(选配)参数表
+ * @Description: 检查项目参数表_工序卡1(选配)
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-11-26
  * @Version: V1.0
  */
-@Api(tags="工序卡1(选配)参数表")
+@Api(tags="检查项目参数表_工序卡1(选配)")
 @RestController
 @RequestMapping("/workorderParamStepone/workorderParamStepone")
 @Slf4j
@@ -59,8 +59,8 @@ public class WorkorderParamSteponeController extends JeecgController<WorkorderPa
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "工序卡1(选配)参数表-分页列表查询")
-	@ApiOperation(value="工序卡1(选配)参数表-分页列表查询", notes="工序卡1(选配)参数表-分页列表查询")
+	//@AutoLog(value = "检查项目参数表_工序卡1(选配)-分页列表查询")
+	@ApiOperation(value="检查项目参数表_工序卡1(选配)-分页列表查询", notes="检查项目参数表_工序卡1(选配)-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<WorkorderParamStepone>> queryPageList(WorkorderParamStepone workorderParamStepone,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -78,8 +78,8 @@ public class WorkorderParamSteponeController extends JeecgController<WorkorderPa
 	 * @param workorderParamStepone
 	 * @return
 	 */
-	@AutoLog(value = "工序卡1(选配)参数表-添加")
-	@ApiOperation(value="工序卡1(选配)参数表-添加", notes="工序卡1(选配)参数表-添加")
+	@AutoLog(value = "检查项目参数表_工序卡1(选配)-添加")
+	@ApiOperation(value="检查项目参数表_工序卡1(选配)-添加", notes="检查项目参数表_工序卡1(选配)-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody WorkorderParamStepone workorderParamStepone) {
 		workorderParamSteponeService.save(workorderParamStepone);
@@ -92,8 +92,8 @@ public class WorkorderParamSteponeController extends JeecgController<WorkorderPa
 	 * @param workorderParamStepone
 	 * @return
 	 */
-	@AutoLog(value = "工序卡1(选配)参数表-编辑")
-	@ApiOperation(value="工序卡1(选配)参数表-编辑", notes="工序卡1(选配)参数表-编辑")
+	@AutoLog(value = "检查项目参数表_工序卡1(选配)-编辑")
+	@ApiOperation(value="检查项目参数表_工序卡1(选配)-编辑", notes="检查项目参数表_工序卡1(选配)-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody WorkorderParamStepone workorderParamStepone) {
 		workorderParamSteponeService.updateById(workorderParamStepone);
@@ -106,8 +106,8 @@ public class WorkorderParamSteponeController extends JeecgController<WorkorderPa
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "工序卡1(选配)参数表-通过id删除")
-	@ApiOperation(value="工序卡1(选配)参数表-通过id删除", notes="工序卡1(选配)参数表-通过id删除")
+	@AutoLog(value = "检查项目参数表_工序卡1(选配)-通过id删除")
+	@ApiOperation(value="检查项目参数表_工序卡1(选配)-通过id删除", notes="检查项目参数表_工序卡1(选配)-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		workorderParamSteponeService.removeById(id);
@@ -120,8 +120,8 @@ public class WorkorderParamSteponeController extends JeecgController<WorkorderPa
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "工序卡1(选配)参数表-批量删除")
-	@ApiOperation(value="工序卡1(选配)参数表-批量删除", notes="工序卡1(选配)参数表-批量删除")
+	@AutoLog(value = "检查项目参数表_工序卡1(选配)-批量删除")
+	@ApiOperation(value="检查项目参数表_工序卡1(选配)-批量删除", notes="检查项目参数表_工序卡1(选配)-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.workorderParamSteponeService.removeByIds(Arrays.asList(ids.split(",")));
@@ -134,8 +134,8 @@ public class WorkorderParamSteponeController extends JeecgController<WorkorderPa
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "工序卡1(选配)参数表-通过id查询")
-	@ApiOperation(value="工序卡1(选配)参数表-通过id查询", notes="工序卡1(选配)参数表-通过id查询")
+	//@AutoLog(value = "检查项目参数表_工序卡1(选配)-通过id查询")
+	@ApiOperation(value="检查项目参数表_工序卡1(选配)-通过id查询", notes="检查项目参数表_工序卡1(选配)-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<WorkorderParamStepone> queryById(@RequestParam(name="id",required=true) String id) {
 		WorkorderParamStepone workorderParamStepone = workorderParamSteponeService.getById(id);
@@ -153,7 +153,7 @@ public class WorkorderParamSteponeController extends JeecgController<WorkorderPa
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, WorkorderParamStepone workorderParamStepone) {
-        return super.exportXls(request, workorderParamStepone, WorkorderParamStepone.class, "工序卡1(选配)参数表");
+        return super.exportXls(request, workorderParamStepone, WorkorderParamStepone.class, "检查项目参数表_工序卡1(选配)");
     }
 
     /**

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderParamStepone/entity/WorkorderParamStepone.java

@@ -18,16 +18,16 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 工序卡1(选配)参数表
+ * @Description: 检查项目参数表_工序卡1(选配)
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-11-26
  * @Version: V1.0
  */
 @Data
 @TableName("workorder_param_stepone")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="workorder_param_stepone对象", description="工序卡1(选配)参数表")
+@ApiModel(value="workorder_param_stepone对象", description="检查项目参数表_工序卡1(选配)")
 public class WorkorderParamStepone implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -51,85 +51,85 @@ public class WorkorderParamStepone implements Serializable {
 	@Excel(name = "规格", width = 15)
     @ApiModelProperty(value = "规格")
     private java.lang.String specs;
-	/**1*/
-	@Excel(name = "1", width = 15)
-    @ApiModelProperty(value = "1")
+	/**参数1*/
+	@Excel(name = "参数1", width = 15)
+    @ApiModelProperty(value = "参数1")
     private java.lang.String param1;
-	/**2*/
-	@Excel(name = "2", width = 15)
-    @ApiModelProperty(value = "2")
+	/**参数2*/
+	@Excel(name = "参数2", width = 15)
+    @ApiModelProperty(value = "参数2")
     private java.lang.String param2;
-	/**3*/
-	@Excel(name = "3", width = 15)
-    @ApiModelProperty(value = "3")
+	/**参数3*/
+	@Excel(name = "参数3", width = 15)
+    @ApiModelProperty(value = "参数3")
     private java.lang.String param3;
-	/**4*/
-	@Excel(name = "4", width = 15)
-    @ApiModelProperty(value = "4")
+	/**参数4*/
+	@Excel(name = "参数4", width = 15)
+    @ApiModelProperty(value = "参数4")
     private java.lang.String param4;
-	/**5*/
-	@Excel(name = "5", width = 15)
-    @ApiModelProperty(value = "5")
+	/**参数5*/
+	@Excel(name = "参数5", width = 15)
+    @ApiModelProperty(value = "参数5")
     private java.lang.String param5;
-	/**6*/
-	@Excel(name = "6", width = 15)
-    @ApiModelProperty(value = "6")
+	/**参数6*/
+	@Excel(name = "参数6", width = 15)
+    @ApiModelProperty(value = "参数6")
     private java.lang.String param6;
-	/**7*/
-	@Excel(name = "7", width = 15)
-    @ApiModelProperty(value = "7")
+	/**参数7*/
+	@Excel(name = "参数7", width = 15)
+    @ApiModelProperty(value = "参数7")
     private java.lang.String param7;
-	/**8*/
-	@Excel(name = "8", width = 15)
-    @ApiModelProperty(value = "8")
+	/**参数8*/
+	@Excel(name = "参数8", width = 15)
+    @ApiModelProperty(value = "参数8")
     private java.lang.String param8;
-	/**9*/
-	@Excel(name = "9", width = 15)
-    @ApiModelProperty(value = "9")
+	/**参数9*/
+	@Excel(name = "参数9", width = 15)
+    @ApiModelProperty(value = "参数9")
     private java.lang.String param9;
-	/**10*/
-	@Excel(name = "10", width = 15)
-    @ApiModelProperty(value = "10")
+	/**参数10*/
+	@Excel(name = "参数10", width = 15)
+    @ApiModelProperty(value = "参数10")
     private java.lang.String param10;
-	/**11*/
-	@Excel(name = "11", width = 15)
-    @ApiModelProperty(value = "11")
+	/**参数11*/
+	@Excel(name = "参数11", width = 15)
+    @ApiModelProperty(value = "参数11")
     private java.lang.String param11;
-	/**12*/
-	@Excel(name = "12", width = 15)
-    @ApiModelProperty(value = "12")
+	/**参数12*/
+	@Excel(name = "参数12", width = 15)
+    @ApiModelProperty(value = "参数12")
     private java.lang.String param12;
-	/**13*/
-	@Excel(name = "13", width = 15)
-    @ApiModelProperty(value = "13")
+	/**参数13*/
+	@Excel(name = "参数13", width = 15)
+    @ApiModelProperty(value = "参数13")
     private java.lang.String param13;
-	/**14*/
-	@Excel(name = "14", width = 15)
-    @ApiModelProperty(value = "14")
+	/**参数14*/
+	@Excel(name = "参数14", width = 15)
+    @ApiModelProperty(value = "参数14")
     private java.lang.String param14;
-	/**15*/
-	@Excel(name = "15", width = 15)
-    @ApiModelProperty(value = "15")
+	/**参数15*/
+	@Excel(name = "参数15", width = 15)
+    @ApiModelProperty(value = "参数15")
     private java.lang.String param15;
-	/**16*/
-	@Excel(name = "16", width = 15)
-    @ApiModelProperty(value = "16")
+	/**参数16*/
+	@Excel(name = "参数16", width = 15)
+    @ApiModelProperty(value = "参数16")
     private java.lang.String param16;
-	/**17*/
-	@Excel(name = "17", width = 15)
-    @ApiModelProperty(value = "17")
+	/**参数17*/
+	@Excel(name = "参数17", width = 15)
+    @ApiModelProperty(value = "参数17")
     private java.lang.String param17;
-	/**18*/
-	@Excel(name = "18", width = 15)
-    @ApiModelProperty(value = "18")
+	/**参数18*/
+	@Excel(name = "参数18", width = 15)
+    @ApiModelProperty(value = "参数18")
     private java.lang.String param18;
-	/**19*/
-	@Excel(name = "19", width = 15)
-    @ApiModelProperty(value = "19")
+	/**参数19*/
+	@Excel(name = "参数19", width = 15)
+    @ApiModelProperty(value = "参数19")
     private java.lang.String param19;
-	/**20*/
-	@Excel(name = "20", width = 15)
-    @ApiModelProperty(value = "20")
+	/**参数20*/
+	@Excel(name = "参数20", width = 15)
+    @ApiModelProperty(value = "参数20")
     private java.lang.String param20;
 	/**备注*/
 	@Excel(name = "备注", width = 15)

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderParamStepone/mapper/WorkorderParamSteponeMapper.java

@@ -7,9 +7,9 @@ import org.jeecg.modules.workorderParamStepone.entity.WorkorderParamStepone;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @Description: 工序卡1(选配)参数表
+ * @Description: 检查项目参数表_工序卡1(选配)
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-11-26
  * @Version: V1.0
  */
 public interface WorkorderParamSteponeMapper extends BaseMapper<WorkorderParamStepone> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderParamStepone/service/IWorkorderParamSteponeService.java

@@ -4,9 +4,9 @@ import org.jeecg.modules.workorderParamStepone.entity.WorkorderParamStepone;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * @Description: 工序卡1(选配)参数表
+ * @Description: 检查项目参数表_工序卡1(选配)
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-11-26
  * @Version: V1.0
  */
 public interface IWorkorderParamSteponeService extends IService<WorkorderParamStepone> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderParamStepone/service/impl/WorkorderParamSteponeServiceImpl.java

@@ -8,9 +8,9 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @Description: 工序卡1(选配)参数表
+ * @Description: 检查项目参数表_工序卡1(选配)
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-11-26
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderParamStepone/vue/WorkorderParamSteponeList.vue

@@ -12,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('工序卡1(选配)参数表')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('检查项目参数表_工序卡1(选配)')">导出</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>
@@ -109,7 +109,7 @@
     },
     data () {
       return {
-        description: '工序卡1(选配)参数表管理页面',
+        description: '检查项目参数表_工序卡1(选配)管理页面',
         // 表头
         columns: [
           {
@@ -128,102 +128,102 @@
             dataIndex: 'specs'
           },
           {
-            title:'1',
+            title:'参数1',
             align:"center",
             dataIndex: 'param1'
           },
           {
-            title:'2',
+            title:'参数2',
             align:"center",
             dataIndex: 'param2'
           },
           {
-            title:'3',
+            title:'参数3',
             align:"center",
             dataIndex: 'param3'
           },
           {
-            title:'4',
+            title:'参数4',
             align:"center",
             dataIndex: 'param4'
           },
           {
-            title:'5',
+            title:'参数5',
             align:"center",
             dataIndex: 'param5'
           },
           {
-            title:'6',
+            title:'参数6',
             align:"center",
             dataIndex: 'param6'
           },
           {
-            title:'7',
+            title:'参数7',
             align:"center",
             dataIndex: 'param7'
           },
           {
-            title:'8',
+            title:'参数8',
             align:"center",
             dataIndex: 'param8'
           },
           {
-            title:'9',
+            title:'参数9',
             align:"center",
             dataIndex: 'param9'
           },
           {
-            title:'10',
+            title:'参数10',
             align:"center",
             dataIndex: 'param10'
           },
           {
-            title:'11',
+            title:'参数11',
             align:"center",
             dataIndex: 'param11'
           },
           {
-            title:'12',
+            title:'参数12',
             align:"center",
             dataIndex: 'param12'
           },
           {
-            title:'13',
+            title:'参数13',
             align:"center",
             dataIndex: 'param13'
           },
           {
-            title:'14',
+            title:'参数14',
             align:"center",
             dataIndex: 'param14'
           },
           {
-            title:'15',
+            title:'参数15',
             align:"center",
             dataIndex: 'param15'
           },
           {
-            title:'16',
+            title:'参数16',
             align:"center",
             dataIndex: 'param16'
           },
           {
-            title:'17',
+            title:'参数17',
             align:"center",
             dataIndex: 'param17'
           },
           {
-            title:'18',
+            title:'参数18',
             align:"center",
             dataIndex: 'param18'
           },
           {
-            title:'19',
+            title:'参数19',
             align:"center",
             dataIndex: 'param19'
           },
           {
-            title:'20',
+            title:'参数20',
             align:"center",
             dataIndex: 'param20'
           },
@@ -277,26 +277,26 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'specs',text:'规格',dictCode:''})
-        fieldList.push({type:'string',value:'param1',text:'1',dictCode:''})
-        fieldList.push({type:'string',value:'param2',text:'2',dictCode:''})
-        fieldList.push({type:'string',value:'param3',text:'3',dictCode:''})
-        fieldList.push({type:'string',value:'param4',text:'4',dictCode:''})
-        fieldList.push({type:'string',value:'param5',text:'5',dictCode:''})
-        fieldList.push({type:'string',value:'param6',text:'6',dictCode:''})
-        fieldList.push({type:'string',value:'param7',text:'7',dictCode:''})
-        fieldList.push({type:'string',value:'param8',text:'8',dictCode:''})
-        fieldList.push({type:'string',value:'param9',text:'9',dictCode:''})
-        fieldList.push({type:'string',value:'param10',text:'10',dictCode:''})
-        fieldList.push({type:'string',value:'param11',text:'11',dictCode:''})
-        fieldList.push({type:'string',value:'param12',text:'12',dictCode:''})
-        fieldList.push({type:'string',value:'param13',text:'13',dictCode:''})
-        fieldList.push({type:'string',value:'param14',text:'14',dictCode:''})
-        fieldList.push({type:'string',value:'param15',text:'15',dictCode:''})
-        fieldList.push({type:'string',value:'param16',text:'16',dictCode:''})
-        fieldList.push({type:'string',value:'param17',text:'17',dictCode:''})
-        fieldList.push({type:'string',value:'param18',text:'18',dictCode:''})
-        fieldList.push({type:'string',value:'param19',text:'19',dictCode:''})
-        fieldList.push({type:'string',value:'param20',text:'20',dictCode:''})
+        fieldList.push({type:'string',value:'param1',text:'参数1',dictCode:''})
+        fieldList.push({type:'string',value:'param2',text:'参数2',dictCode:''})
+        fieldList.push({type:'string',value:'param3',text:'参数3',dictCode:''})
+        fieldList.push({type:'string',value:'param4',text:'参数4',dictCode:''})
+        fieldList.push({type:'string',value:'param5',text:'参数5',dictCode:''})
+        fieldList.push({type:'string',value:'param6',text:'参数6',dictCode:''})
+        fieldList.push({type:'string',value:'param7',text:'参数7',dictCode:''})
+        fieldList.push({type:'string',value:'param8',text:'参数8',dictCode:''})
+        fieldList.push({type:'string',value:'param9',text:'参数9',dictCode:''})
+        fieldList.push({type:'string',value:'param10',text:'参数10',dictCode:''})
+        fieldList.push({type:'string',value:'param11',text:'参数11',dictCode:''})
+        fieldList.push({type:'string',value:'param12',text:'参数12',dictCode:''})
+        fieldList.push({type:'string',value:'param13',text:'参数13',dictCode:''})
+        fieldList.push({type:'string',value:'param14',text:'参数14',dictCode:''})
+        fieldList.push({type:'string',value:'param15',text:'参数15',dictCode:''})
+        fieldList.push({type:'string',value:'param16',text:'参数16',dictCode:''})
+        fieldList.push({type:'string',value:'param17',text:'参数17',dictCode:''})
+        fieldList.push({type:'string',value:'param18',text:'参数18',dictCode:''})
+        fieldList.push({type:'string',value:'param19',text:'参数19',dictCode:''})
+        fieldList.push({type:'string',value:'param20',text:'参数20',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
         fieldList.push({type:'string',value:'processId',text:'关联检查项目id',dictCode:"workorder_item_check,name,id"})
         fieldList.push({type:'string',value:'templateId',text:'关联工单id',dictCode:"workorder_template,task_no,id"})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderParamStepone/vue/modules/WorkorderParamSteponeForm.vue

@@ -9,103 +9,103 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="1" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param1">
-              <a-input v-model="model.param1" placeholder="请输入1"  ></a-input>
+            <a-form-model-item label="参数1" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param1">
+              <a-input v-model="model.param1" placeholder="请输入参数1"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="2" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param2">
-              <a-input v-model="model.param2" placeholder="请输入2"  ></a-input>
+            <a-form-model-item label="参数2" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param2">
+              <a-input v-model="model.param2" placeholder="请输入参数2"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="3" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param3">
-              <a-input v-model="model.param3" placeholder="请输入3"  ></a-input>
+            <a-form-model-item label="参数3" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param3">
+              <a-input v-model="model.param3" placeholder="请输入参数3"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="4" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param4">
-              <a-input v-model="model.param4" placeholder="请输入4"  ></a-input>
+            <a-form-model-item label="参数4" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param4">
+              <a-input v-model="model.param4" placeholder="请输入参数4"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="5" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param5">
-              <a-input v-model="model.param5" placeholder="请输入5"  ></a-input>
+            <a-form-model-item label="参数5" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param5">
+              <a-input v-model="model.param5" placeholder="请输入参数5"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="6" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param6">
-              <a-input v-model="model.param6" placeholder="请输入6"  ></a-input>
+            <a-form-model-item label="参数6" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param6">
+              <a-input v-model="model.param6" placeholder="请输入参数6"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="7" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param7">
-              <a-input v-model="model.param7" placeholder="请输入7"  ></a-input>
+            <a-form-model-item label="参数7" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param7">
+              <a-input v-model="model.param7" placeholder="请输入参数7"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="8" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param8">
-              <a-input v-model="model.param8" placeholder="请输入8"  ></a-input>
+            <a-form-model-item label="参数8" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param8">
+              <a-input v-model="model.param8" placeholder="请输入参数8"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="9" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param9">
-              <a-input v-model="model.param9" placeholder="请输入9"  ></a-input>
+            <a-form-model-item label="参数9" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param9">
+              <a-input v-model="model.param9" placeholder="请输入参数9"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="10" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param10">
-              <a-input v-model="model.param10" placeholder="请输入10"  ></a-input>
+            <a-form-model-item label="参数10" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param10">
+              <a-input v-model="model.param10" placeholder="请输入参数10"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="11" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param11">
-              <a-input v-model="model.param11" placeholder="请输入11"  ></a-input>
+            <a-form-model-item label="参数11" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param11">
+              <a-input v-model="model.param11" placeholder="请输入参数11"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="12" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param12">
-              <a-input v-model="model.param12" placeholder="请输入12"  ></a-input>
+            <a-form-model-item label="参数12" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param12">
+              <a-input v-model="model.param12" placeholder="请输入参数12"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="13" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param13">
-              <a-input v-model="model.param13" placeholder="请输入13"  ></a-input>
+            <a-form-model-item label="参数13" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param13">
+              <a-input v-model="model.param13" placeholder="请输入参数13"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="14" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param14">
-              <a-input v-model="model.param14" placeholder="请输入14"  ></a-input>
+            <a-form-model-item label="参数14" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param14">
+              <a-input v-model="model.param14" placeholder="请输入参数14"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="15" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param15">
-              <a-input v-model="model.param15" placeholder="请输入15"  ></a-input>
+            <a-form-model-item label="参数15" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param15">
+              <a-input v-model="model.param15" placeholder="请输入参数15"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="16" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param16">
-              <a-input v-model="model.param16" placeholder="请输入16"  ></a-input>
+            <a-form-model-item label="参数16" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param16">
+              <a-input v-model="model.param16" placeholder="请输入参数16"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="17" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param17">
-              <a-input v-model="model.param17" placeholder="请输入17"  ></a-input>
+            <a-form-model-item label="参数17" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param17">
+              <a-input v-model="model.param17" placeholder="请输入参数17"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="18" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param18">
-              <a-input v-model="model.param18" placeholder="请输入18"  ></a-input>
+            <a-form-model-item label="参数18" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param18">
+              <a-input v-model="model.param18" placeholder="请输入参数18"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="19" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param19">
-              <a-input v-model="model.param19" placeholder="请输入19"  ></a-input>
+            <a-form-model-item label="参数19" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param19">
+              <a-input v-model="model.param19" placeholder="请输入参数19"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="20" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param20">
-              <a-input v-model="model.param20" placeholder="请输入20"  ></a-input>
+            <a-form-model-item label="参数20" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param20">
+              <a-input v-model="model.param20" placeholder="请输入参数20"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderParamStepone/vue3/WorkorderParamStepone.data.ts

@@ -10,102 +10,102 @@ export const columns: BasicColumn[] = [
     dataIndex: 'specs'
    },
    {
-    title: '1',
+    title: '参数1',
     align:"center",
     dataIndex: 'param1'
    },
    {
-    title: '2',
+    title: '参数2',
     align:"center",
     dataIndex: 'param2'
    },
    {
-    title: '3',
+    title: '参数3',
     align:"center",
     dataIndex: 'param3'
    },
    {
-    title: '4',
+    title: '参数4',
     align:"center",
     dataIndex: 'param4'
    },
    {
-    title: '5',
+    title: '参数5',
     align:"center",
     dataIndex: 'param5'
    },
    {
-    title: '6',
+    title: '参数6',
     align:"center",
     dataIndex: 'param6'
    },
    {
-    title: '7',
+    title: '参数7',
     align:"center",
     dataIndex: 'param7'
    },
    {
-    title: '8',
+    title: '参数8',
     align:"center",
     dataIndex: 'param8'
    },
    {
-    title: '9',
+    title: '参数9',
     align:"center",
     dataIndex: 'param9'
    },
    {
-    title: '10',
+    title: '参数10',
     align:"center",
     dataIndex: 'param10'
    },
    {
-    title: '11',
+    title: '参数11',
     align:"center",
     dataIndex: 'param11'
    },
    {
-    title: '12',
+    title: '参数12',
     align:"center",
     dataIndex: 'param12'
    },
    {
-    title: '13',
+    title: '参数13',
     align:"center",
     dataIndex: 'param13'
    },
    {
-    title: '14',
+    title: '参数14',
     align:"center",
     dataIndex: 'param14'
    },
    {
-    title: '15',
+    title: '参数15',
     align:"center",
     dataIndex: 'param15'
    },
    {
-    title: '16',
+    title: '参数16',
     align:"center",
     dataIndex: 'param16'
    },
    {
-    title: '17',
+    title: '参数17',
     align:"center",
     dataIndex: 'param17'
    },
    {
-    title: '18',
+    title: '参数18',
     align:"center",
     dataIndex: 'param18'
    },
    {
-    title: '19',
+    title: '参数19',
     align:"center",
     dataIndex: 'param19'
    },
    {
-    title: '20',
+    title: '参数20',
     align:"center",
     dataIndex: 'param20'
    },
@@ -136,102 +136,102 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '1',
+    label: '参数1',
     field: 'param1',
     component: 'Input',
   },
   {
-    label: '2',
+    label: '参数2',
     field: 'param2',
     component: 'Input',
   },
   {
-    label: '3',
+    label: '参数3',
     field: 'param3',
     component: 'Input',
   },
   {
-    label: '4',
+    label: '参数4',
     field: 'param4',
     component: 'Input',
   },
   {
-    label: '5',
+    label: '参数5',
     field: 'param5',
     component: 'Input',
   },
   {
-    label: '6',
+    label: '参数6',
     field: 'param6',
     component: 'Input',
   },
   {
-    label: '7',
+    label: '参数7',
     field: 'param7',
     component: 'Input',
   },
   {
-    label: '8',
+    label: '参数8',
     field: 'param8',
     component: 'Input',
   },
   {
-    label: '9',
+    label: '参数9',
     field: 'param9',
     component: 'Input',
   },
   {
-    label: '10',
+    label: '参数10',
     field: 'param10',
     component: 'Input',
   },
   {
-    label: '11',
+    label: '参数11',
     field: 'param11',
     component: 'Input',
   },
   {
-    label: '12',
+    label: '参数12',
     field: 'param12',
     component: 'Input',
   },
   {
-    label: '13',
+    label: '参数13',
     field: 'param13',
     component: 'Input',
   },
   {
-    label: '14',
+    label: '参数14',
     field: 'param14',
     component: 'Input',
   },
   {
-    label: '15',
+    label: '参数15',
     field: 'param15',
     component: 'Input',
   },
   {
-    label: '16',
+    label: '参数16',
     field: 'param16',
     component: 'Input',
   },
   {
-    label: '17',
+    label: '参数17',
     field: 'param17',
     component: 'Input',
   },
   {
-    label: '18',
+    label: '参数18',
     field: 'param18',
     component: 'Input',
   },
   {
-    label: '19',
+    label: '参数19',
     field: 'param19',
     component: 'Input',
   },
   {
-    label: '20',
+    label: '参数20',
     field: 'param20',
     component: 'Input',
   },

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderParamStepone/vue3/WorkorderParamSteponeList.vue

@@ -53,7 +53,7 @@
   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
-           title: '工序卡1(选配)参数表',
+           title: '检查项目参数表_工序卡1(选配)',
            api: list,
            columns,
            canResize:false,
@@ -70,7 +70,7 @@
             },
       },
        exportConfig: {
-            name:"工序卡1(选配)参数表",
+            name:"检查项目参数表_工序卡1(选配)",
             url: getExportUrl,
           },
           importConfig: {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/entity/WorkorderTemplate.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.workorderGeneralStepone.entity.WorkorderGeneralStepone;
+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;
@@ -193,4 +198,12 @@ public class WorkorderTemplate implements Serializable {
         }
         return "";
     }
+
+    //工序卡1(选配)常规参数表
+    @TableField(exist = false)
+    private WorkorderGeneralStepone workorderGeneralStepone;
+
+    //工序卡1(选配)参数表
+    @TableField(exist = false)
+    private List<WorkorderParamStepone> workorderParamSteponeList;
 }

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.BannerService;
 import org.jeecg.modules.apiService.ConfigService;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,4 +36,34 @@ public class ConfigController {
         return configService.privacyInfo();
     }
 
+    @ApiOperation(value="配置信息-查询用户角色配置信息", notes="配置信息-查询用户角色配置信息")
+    @RequestMapping(value = "/userRoleInfo", method = {RequestMethod.GET})
+    public Result<?> userRoleInfo(PageBean pageBean){
+        return configService.userRoleInfo(pageBean);
+    }
+
+    @ApiOperation(value="配置信息-查询工单状态配置", notes="配置信息-查询工单状态配置")
+    @RequestMapping(value = "/templateStatusInfo", method = {RequestMethod.GET})
+    public Result<?> templateStatusInfo(PageBean pageBean){
+        return configService.templateStatusInfo(pageBean);
+    }
+
+    @ApiOperation(value="配置信息-查询工序信息配置", notes="配置信息-查询工序信息配置")
+    @RequestMapping(value = "/stepInfo", method = {RequestMethod.GET})
+    public Result<?> stepInfo(PageBean pageBean){
+        return configService.stepInfo(pageBean);
+    }
+
+    @ApiOperation(value="配置信息-查询工序流程配置", notes="配置信息-查询工序流程配置")
+    @RequestMapping(value = "/processInfo", method = {RequestMethod.GET})
+    public Result<?> processInfo(PageBean pageBean){
+        return configService.processInfo(pageBean);
+    }
+
+    @ApiOperation(value="配置信息-查询检查项目配置", notes="配置信息-查询检查项目配置")
+    @RequestMapping(value = "/itemCheckInfo", method = {RequestMethod.GET})
+    public Result<?> itemCheckInfo(PageBean pageBean){
+        return configService.itemCheckInfo(pageBean);
+    }
+
 }

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

@@ -9,6 +9,14 @@ import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiBean.QueryTemplateBean;
 import org.jeecg.modules.apiBean.UpdateTemplateBean;
 import org.jeecg.modules.apiService.TemplateService;
+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.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.jeecg.modules.workorderStepfour.entity.WorkorderStepfour;
 import org.jeecg.modules.workorderStepone.entity.WorkorderStepone;
 import org.jeecg.modules.workorderStepthree.entity.WorkorderStepthree;
@@ -19,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Api(tags="工单信息相关接口")
 @RestController
@@ -96,28 +105,52 @@ public class TemplateController {
         return templateService.queryStepFour(templateId);
     }
 
-    @ApiOperation(value="工单信息-修改工序卡1(选配)", notes="工单信息-修改工序卡1(选配)")
-    @RequestMapping(value = "/updateStepOne", method = {RequestMethod.POST})
-    public Result<?> updateStepOne(WorkorderStepone workorderStepone){
-        return templateService.updateStepOne(workorderStepone);
+    @ApiOperation(value="工单信息-修改常规参数-工序卡1(选配)", notes="工单信息-修改常规参数-修改工序卡1(选配)")
+    @RequestMapping(value = "/updateGeneralStepOne", method = {RequestMethod.POST})
+    public Result<?> updateGeneralStepOne(WorkorderGeneralStepone generalStepone){
+        return templateService.updateGeneralStepOne(generalStepone);
     }
 
-    @ApiOperation(value="工单信息-修改工序卡2", notes="工单信息-修改工序卡2")
-    @RequestMapping(value = "/updateStepTwo", method = {RequestMethod.POST})
-    public Result<?> updateStepTwo(WorkorderSteptwo workorderSteptwo){
-        return templateService.updateStepTwo(workorderSteptwo);
+    @ApiOperation(value="工单信息-修改常规参数-工序卡2", notes="工单信息-修改常规参数-修改工序卡2")
+    @RequestMapping(value = "/updateGeneralStepTwo", method = {RequestMethod.POST})
+    public Result<?> updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo){
+        return templateService.updateGeneralStepTwo(generalSteptwo);
     }
 
-    @ApiOperation(value="工单信息-修改工序卡3", notes="工单信息-修改工序卡3")
-    @RequestMapping(value = "/updateStepThree", method = {RequestMethod.POST})
-    public Result<?> updateStepThree(WorkorderStepthree workorderStepthree){
-        return templateService.updateStepThree(workorderStepthree);
+    @ApiOperation(value="工单信息-修改常规参数-工序卡3", notes="工单信息-修改常规参数-修改工序卡3")
+    @RequestMapping(value = "/updateGeneralStepThree", method = {RequestMethod.POST})
+    public Result<?> updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree){
+        return templateService.updateGeneralStepThree(generalStepthree);
     }
 
-    @ApiOperation(value="工单信息-修改工序卡4(总成)", notes="工单信息-修改工序卡4(总成)")
-    @RequestMapping(value = "/updateStepFour", method = {RequestMethod.POST})
-    public Result<?> updateStepFour(WorkorderStepfour workorderStepfour){
-        return templateService.updateStepFour(workorderStepfour);
+    @ApiOperation(value="工单信息-修改常规参数-工序卡4(总成)", notes="工单信息-修改常规参数-修改工序卡4(总成)")
+    @RequestMapping(value = "/updateGeneralStepFour", method = {RequestMethod.POST})
+    public Result<?> updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour){
+        return templateService.updateGeneralStepFour(generalStepfour);
+    }
+
+    @ApiOperation(value="工单信息-修改工序参数-工序卡1(选配)", notes="工单信息-修改常规参数-修改工序卡1(选配)")
+    @RequestMapping(value = "/updateParamStepOne", method = {RequestMethod.POST})
+    public Result<?> updateParamStepOne(WorkorderParamStepone paramStepone){
+        return templateService.updateParamStepOne(paramStepone);
+    }
+
+    @ApiOperation(value="工单信息-修改工序参数-工序卡2", notes="工单信息-修改常规参数-修改工序卡2")
+    @RequestMapping(value = "/updateParamStepTwo", method = {RequestMethod.POST})
+    public Result<?> updateParamStepTwo(WorkorderParamSteptwo paramSteptwo){
+        return templateService.updateParamStepTwo(paramSteptwo);
+    }
+
+    @ApiOperation(value="工单信息-修改工序参数-工序卡3", notes="工单信息-修改常规参数-修改工序卡3")
+    @RequestMapping(value = "/updateParamStepThree", method = {RequestMethod.POST})
+    public Result<?> updateParamStepThree(WorkorderParamStepthree paramStepthree){
+        return templateService.updateParamStepThree(paramStepthree);
+    }
+
+    @ApiOperation(value="工单信息-修改工序参数-工序卡4(总成)", notes="工单信息-修改常规参数-修改工序卡4(总成)")
+    @RequestMapping(value = "/updateParamStepFour", method = {RequestMethod.POST})
+    public Result<?> updateParamStepFour(WorkorderParamStepfour paramStepfour){
+        return templateService.updateParamStepFour(paramStepfour);
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/StepFourBean.java

@@ -0,0 +1,23 @@
+package org.jeecg.modules.apiBean;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import org.jeecg.modules.workorderGeneralStepfour.entity.WorkorderGeneralStepfour;
+import org.jeecg.modules.workorderGeneralStepone.entity.WorkorderGeneralStepone;
+import org.jeecg.modules.workorderParamStepfour.entity.WorkorderParamStepfour;
+import org.jeecg.modules.workorderParamStepone.entity.WorkorderParamStepone;
+
+import java.util.List;
+
+@Data
+public class StepFourBean {
+
+    //工序卡1(选配)常规参数表
+    @TableField(exist = false)
+    private WorkorderGeneralStepfour workorderGeneralStepfour;
+
+    //工序卡1(选配)参数表
+    @TableField(exist = false)
+    private List<WorkorderParamStepfour> workorderParamStepfourList;
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/StepOneBean.java

@@ -5,6 +5,8 @@ import lombok.Data;
 import org.jeecg.modules.workorderGeneralStepone.entity.WorkorderGeneralStepone;
 import org.jeecg.modules.workorderParamStepone.entity.WorkorderParamStepone;
 
+import java.util.List;
+
 @Data
 public class StepOneBean {
 
@@ -14,6 +16,6 @@ public class StepOneBean {
 
     //工序卡1(选配)参数表
     @TableField(exist = false)
-    private WorkorderParamStepone workorderParamStepone;
+    private List<WorkorderParamStepone> workorderParamSteponeList;
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/StepThreeBean.java

@@ -0,0 +1,23 @@
+package org.jeecg.modules.apiBean;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import org.jeecg.modules.workorderGeneralStepone.entity.WorkorderGeneralStepone;
+import org.jeecg.modules.workorderGeneralStepthree.entity.WorkorderGeneralStepthree;
+import org.jeecg.modules.workorderParamStepone.entity.WorkorderParamStepone;
+import org.jeecg.modules.workorderParamStepthree.entity.WorkorderParamStepthree;
+
+import java.util.List;
+
+@Data
+public class StepThreeBean {
+
+    //工序卡1(选配)常规参数表
+    @TableField(exist = false)
+    private WorkorderGeneralStepthree workorderGeneralStepthree;
+
+    //工序卡1(选配)参数表
+    @TableField(exist = false)
+    private List<WorkorderParamStepthree> workorderParamStepthreeList;
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/StepTwoBean.java

@@ -0,0 +1,23 @@
+package org.jeecg.modules.apiBean;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import org.jeecg.modules.workorderGeneralStepone.entity.WorkorderGeneralStepone;
+import org.jeecg.modules.workorderGeneralSteptwo.entity.WorkorderGeneralSteptwo;
+import org.jeecg.modules.workorderParamStepone.entity.WorkorderParamStepone;
+import org.jeecg.modules.workorderParamSteptwo.entity.WorkorderParamSteptwo;
+
+import java.util.List;
+
+@Data
+public class StepTwoBean {
+
+    //工序卡1(选配)常规参数表
+    @TableField(exist = false)
+    private WorkorderGeneralSteptwo workorderGeneralSteptwo;
+
+    //工序卡1(选配)参数表
+    @TableField(exist = false)
+    private List<WorkorderParamSteptwo> workorderParamSteptwoList;
+
+}

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.apiService;
 
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
 
 public interface ConfigService {
 
@@ -16,4 +17,34 @@ public interface ConfigService {
      */
     public Result<?> privacyInfo();
 
+    /**
+     * 查询用户角色配置信息
+     * @return
+     */
+    public Result<?> userRoleInfo(PageBean pageBean);
+
+    /**
+     * 查询工单状态配置
+     * @return
+     */
+    public Result<?> templateStatusInfo(PageBean pageBean);
+
+    /**
+     * 查询工序信息配置
+     * @return
+     */
+    public Result<?> stepInfo(PageBean pageBean);
+
+    /**
+     * 查询工序流程配置
+     * @return
+     */
+    public Result<?> processInfo(PageBean pageBean);
+
+    /**
+     * 查询检查项目配置
+     * @return
+     */
+    public Result<?> itemCheckInfo(PageBean pageBean);
+
 }

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

@@ -3,12 +3,18 @@ package org.jeecg.modules.apiService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiBean.QueryTemplateBean;
-import org.jeecg.modules.workorderStepfour.entity.WorkorderStepfour;
-import org.jeecg.modules.workorderStepone.entity.WorkorderStepone;
-import org.jeecg.modules.workorderStepthree.entity.WorkorderStepthree;
-import org.jeecg.modules.workorderSteptwo.entity.WorkorderSteptwo;
+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.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.jeecg.modules.workorderTemplate.entity.WorkorderTemplate;
 
+import java.util.List;
+
 public interface TemplateService {
 
     /**
@@ -63,31 +69,59 @@ public interface TemplateService {
     public Result<?> queryStepFour(String templateId);
 
     /**
-     * 工单信息-修改工序卡1
-     * @param workorderStepone
+     * 工单信息-修改常规参数-工序卡1
+     * @param generalStepone
+     * @return
+     */
+    public Result<?> updateGeneralStepOne(WorkorderGeneralStepone generalStepone);
+
+    /**
+     * 工单信息-修改常规参数-工序卡2
+     * @param generalSteptwo
+     * @return
+     */
+    public Result<?> updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo);
+
+    /**
+     * 工单信息-修改常规参数-工序卡3
+     * @param generalStepthree
+     * @return
+     */
+    public Result<?> updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree);
+
+    /**
+     * 工单信息-修改常规参数-工序卡4
+     * @param generalStepfour
+     * @return
+     */
+    public Result<?> updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour);
+
+    /**
+     * 工单信息-修改工序参数-工序卡1
+     * @param paramStepone
      * @return
      */
-    public Result<?> updateStepOne(WorkorderStepone workorderStepone);
+    public Result<?> updateParamStepOne(WorkorderParamStepone paramStepone);
 
     /**
-     * 工单信息-修改工序卡2
-     * @param workorderSteptwo
+     * 工单信息-修改工序参数-工序卡2
+     * @param paramSteptwo
      * @return
      */
-    public Result<?> updateStepTwo(WorkorderSteptwo workorderSteptwo);
+    public Result<?> updateParamStepTwo(WorkorderParamSteptwo paramSteptwo);
 
     /**
-     * 工单信息-修改工序卡3
-     * @param workorderStepthree
+     * 工单信息-修改工序参数-工序卡3
+     * @param paramStepthree
      * @return
      */
-    public Result<?> updateStepThree(WorkorderStepthree workorderStepthree);
+    public Result<?> updateParamStepThree(WorkorderParamStepthree paramStepthree);
 
     /**
-     * 工单信息-修改工序卡4
-     * @param workorderStepfour
+     * 工单信息-修改工序参数-工序卡4
+     * @param paramStepfour
      * @return
      */
-    public Result<?> updateStepFour(WorkorderStepfour workorderStepfour);
+    public Result<?> updateParamStepFour(WorkorderParamStepfour paramStepfour);
 
 }

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

@@ -1,12 +1,24 @@
 package org.jeecg.modules.apiService.impl;
 
+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.ConfigService;
 import org.jeecg.modules.workorderBanner.service.IWorkorderBannerService;
 import org.jeecg.modules.workorderCollection.service.IWorkorderCollectionService;
 import org.jeecg.modules.workorderConfig.entity.WorkorderConfig;
 import org.jeecg.modules.workorderConfig.service.IWorkorderConfigService;
+import org.jeecg.modules.workorderItemCheck.entity.WorkorderItemCheck;
+import org.jeecg.modules.workorderItemCheck.service.IWorkorderItemCheckService;
 import org.jeecg.modules.workorderNews.entity.WorkorderNews;
+import org.jeecg.modules.workorderProcess.entity.WorkorderProcess;
+import org.jeecg.modules.workorderProcess.service.IWorkorderProcessService;
+import org.jeecg.modules.workorderRole.entity.WorkorderRole;
+import org.jeecg.modules.workorderRole.service.IWorkorderRoleService;
+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.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -18,6 +30,26 @@ public class ConfigServiceImpl implements ConfigService {
     //轮播图信息
     @Resource
     private IWorkorderConfigService workorderConfigService;
+
+    //用户角色信息
+    @Resource
+    private IWorkorderRoleService workorderRoleService;
+
+    //工单状态信息
+    @Resource
+    private IWorkorderStatusService workorderStatusService;
+
+    //工序信息
+    @Resource
+    private IWorkorderStepService workorderStepService;
+
+    //工序流程信息
+    @Resource
+    private IWorkorderProcessService workorderProcessService;
+
+    //检查项目信息
+    @Resource
+    private IWorkorderItemCheckService workorderItemCheckService;
     /*************************************************************************************/
 
     //配置信息-帮助中心
@@ -36,6 +68,62 @@ public class ConfigServiceImpl implements ConfigService {
         return Result.OK("隐私条例", one);
     }
 
+    //查询用户角色配置信息
+    @Override
+    public Result<?> userRoleInfo(PageBean pageBean) {
+        Page<WorkorderRole> page = new Page<WorkorderRole>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<WorkorderRole> pageList = workorderRoleService
+                .lambdaQuery()
+                .page(page);
+
+        return Result.OK("用户角色配置信息列表", pageList);
+    }
+
+    //查询工单状态配置
+    @Override
+    public Result<?> templateStatusInfo(PageBean pageBean) {
+        Page<WorkorderStatus> page = new Page<WorkorderStatus>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<WorkorderStatus> pageList = workorderStatusService
+                .lambdaQuery()
+                .page(page);
+
+        return Result.OK("工单状态配置信息列表", pageList);
+    }
+
+    //查询工序信息配置
+    @Override
+    public Result<?> stepInfo(PageBean pageBean) {
+        Page<WorkorderStep> page = new Page<WorkorderStep>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<WorkorderStep> pageList = workorderStepService
+                .lambdaQuery()
+                .page(page);
+
+        return Result.OK("工序信息配置信息列表", pageList);
+    }
+
+    //查询工序流程配置
+    @Override
+    public Result<?> processInfo(PageBean pageBean) {
+        Page<WorkorderProcess> page = new Page<WorkorderProcess>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<WorkorderProcess> pageList = workorderProcessService
+                .lambdaQuery()
+                .page(page);
+
+        return Result.OK("工序流程配置信息列表", pageList);
+    }
+
+    //查询检查项目配置
+    @Override
+    public Result<?> itemCheckInfo(PageBean pageBean) {
+        Page<WorkorderItemCheck> page = new Page<WorkorderItemCheck>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<WorkorderItemCheck> pageList = workorderItemCheckService
+                .lambdaQuery()
+                .page(page);
+
+        return Result.OK("查询检查项目配置", pageList);
+    }
+
+    /*************************************************************************************/
     //公共方法
     public WorkorderConfig getConfigInfo(String paramCode) {
 

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

@@ -3,9 +3,24 @@ package org.jeecg.modules.apiService.impl;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 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.apiBean.QueryTemplateBean;
+import org.jeecg.modules.apiBean.*;
 import org.jeecg.modules.apiService.TemplateService;
+import org.jeecg.modules.workorderGeneralStepfour.entity.WorkorderGeneralStepfour;
+import org.jeecg.modules.workorderGeneralStepfour.service.IWorkorderGeneralStepfourService;
+import org.jeecg.modules.workorderGeneralStepone.entity.WorkorderGeneralStepone;
+import org.jeecg.modules.workorderGeneralStepone.service.IWorkorderGeneralSteponeService;
+import org.jeecg.modules.workorderGeneralStepthree.entity.WorkorderGeneralStepthree;
+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.workorderParamStepfour.entity.WorkorderParamStepfour;
+import org.jeecg.modules.workorderParamStepfour.service.IWorkorderParamStepfourService;
+import org.jeecg.modules.workorderParamStepone.entity.WorkorderParamStepone;
+import org.jeecg.modules.workorderParamStepone.service.IWorkorderParamSteponeService;
+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.workorderStepfour.entity.WorkorderStepfour;
 import org.jeecg.modules.workorderStepfour.service.IWorkorderStepfourService;
 import org.jeecg.modules.workorderStepone.entity.WorkorderStepone;
@@ -19,6 +34,7 @@ import org.jeecg.modules.workorderTemplate.service.IWorkorderTemplateService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 public class TemplateServiceImpl implements TemplateService {
@@ -27,6 +43,26 @@ public class TemplateServiceImpl implements TemplateService {
     @Resource
     private IWorkorderTemplateService workorderTemplateService;
 
+    //工序卡常规参数
+    @Resource
+    private IWorkorderGeneralSteponeService workorderGeneralSteponeService;
+    @Resource
+    private IWorkorderGeneralSteptwoService workorderGeneralSteptwoService;
+    @Resource
+    private IWorkorderGeneralStepthreeService workorderGeneralStepthreeService;
+    @Resource
+    private IWorkorderGeneralStepfourService workorderGeneralStepfourService;
+
+    //工序卡列表参数
+    @Resource
+    private IWorkorderParamSteponeService workorderParamSteponeService;
+    @Resource
+    private IWorkorderParamSteptwoService workorderParamSteptwoService;
+    @Resource
+    private IWorkorderParamStepthreeService workorderParamStepthreeService;
+    @Resource
+    private IWorkorderParamStepfourService workorderParamStepfourService;
+
     //工序卡1
     @Resource
     private IWorkorderSteponeService workorderSteponeService;
@@ -39,7 +75,7 @@ public class TemplateServiceImpl implements TemplateService {
     @Resource
     private IWorkorderStepthreeService workorderStepthreeService;
 
-    //工序卡1
+    //工序卡4
     @Resource
     private IWorkorderStepfourService workorderStepfourService;
     /*************************************************************************************/
@@ -80,12 +116,28 @@ public class TemplateServiceImpl implements TemplateService {
     @Override
     public Result<?> queryTemplateById(String templateId) {
         //查询公告信息详情
-        WorkorderTemplate one = workorderTemplateService
+        WorkorderTemplate template = workorderTemplateService
                 .lambdaQuery()
                 .eq(WorkorderTemplate::getId, templateId)
                 .one();
 
-        return Result.OK("工单详情", 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);
     }
 
     //工单信息-修改工单
@@ -103,91 +155,180 @@ public class TemplateServiceImpl implements TemplateService {
     @Override
     public Result<?> queryStepOne(String templateId) {
         //查询工序卡1(选配)详情
-        WorkorderStepone one = workorderSteponeService
+        //常规参数
+        WorkorderGeneralStepone generalStepone = workorderGeneralSteponeService
                 .lambdaQuery()
-                .eq(WorkorderStepone::getTemplateId, templateId)
+                .eq(WorkorderGeneralStepone::getTemplateId, templateId)
                 .one();
 
-        return Result.OK("工序卡1(选配)详情", one);
+        //列表参数
+        List<WorkorderParamStepone> paramStepone = workorderParamSteponeService
+                .lambdaQuery()
+                .eq(WorkorderParamStepone::getTemplateId, templateId)
+                .list();
+
+        StepOneBean stepOne = new StepOneBean();
+        stepOne.setWorkorderGeneralStepone(generalStepone);
+        stepOne.setWorkorderParamSteponeList(paramStepone);
+
+        return Result.OK("工序卡1(选配)详情", stepOne);
     }
 
     //工单信息-工序卡2详情
     @Override
     public Result<?> queryStepTwo(String templateId) {
         //查询工序卡1(选配)详情
-        WorkorderSteptwo one = workorderSteptwoService
+        //常规参数
+        WorkorderGeneralSteptwo generalStepone = workorderGeneralSteptwoService
                 .lambdaQuery()
-                .eq(WorkorderSteptwo::getTemplateId, templateId)
+                .eq(WorkorderGeneralSteptwo::getTemplateId, templateId)
                 .one();
 
-        return Result.OK("工序卡2详情", one);
+        //列表参数
+        List<WorkorderParamSteptwo> paramStepone = workorderParamSteptwoService
+                .lambdaQuery()
+                .eq(WorkorderParamSteptwo::getTemplateId, templateId)
+                .list();
+
+        StepTwoBean stepTwo = new StepTwoBean();
+        stepTwo.setWorkorderGeneralSteptwo(generalStepone);
+        stepTwo.setWorkorderParamSteptwoList(paramStepone);
+
+        return Result.OK("工序卡2详情", stepTwo);
     }
 
     //工单信息-工序卡3详情
     @Override
     public Result<?> queryStepThree(String templateId) {
         //查询工序卡1(选配)详情
-        WorkorderStepthree one = workorderStepthreeService
+        //常规参数
+        WorkorderGeneralStepthree generalStepthree = workorderGeneralStepthreeService
                 .lambdaQuery()
-                .eq(WorkorderStepthree::getTemplateId, templateId)
+                .eq(WorkorderGeneralStepthree::getTemplateId, templateId)
                 .one();
 
-        return Result.OK("工序卡3详情", one);
+        //列表参数
+        List<WorkorderParamStepthree> paramStepthree = workorderParamStepthreeService
+                .lambdaQuery()
+                .eq(WorkorderParamStepthree::getTemplateId, templateId)
+                .list();
+
+        StepThreeBean stepThree = new StepThreeBean();
+        stepThree.setWorkorderGeneralStepthree(generalStepthree);
+        stepThree.setWorkorderParamStepthreeList(paramStepthree);
+
+        return Result.OK("工序卡3详情", stepThree);
     }
 
     //工单信息-工序卡4(总成)详情
     @Override
     public Result<?> queryStepFour(String templateId) {
         //查询工序卡1(选配)详情
-        WorkorderStepfour one = workorderStepfourService
+        //常规参数
+        WorkorderGeneralStepfour generalStepfour = workorderGeneralStepfourService
                 .lambdaQuery()
-                .eq(WorkorderStepfour::getTemplateId, templateId)
+                .eq(WorkorderGeneralStepfour::getTemplateId, templateId)
                 .one();
 
-        return Result.OK("工序卡4(总成)详情", one);
+        //列表参数
+        List<WorkorderParamStepfour> paramStepfour = workorderParamStepfourService
+                .lambdaQuery()
+                .eq(WorkorderParamStepfour::getTemplateId, templateId)
+                .list();
+
+        StepFourBean stepFourBean = new StepFourBean();
+        stepFourBean.setWorkorderGeneralStepfour(generalStepfour);
+        stepFourBean.setWorkorderParamStepfourList(paramStepfour);
+
+        return Result.OK("工序卡4(总成)详情", stepFourBean);
+    }
+
+    //工单信息-修改常规参数-工序卡1(选配)
+    @Override
+    public Result<?> updateGeneralStepOne(WorkorderGeneralStepone generalStepone) {
+        boolean flag = workorderGeneralSteponeService.saveOrUpdate(generalStepone);
+        if(flag){
+            return Result.OK("新增/修改常规参数-工序卡1成功！");
+        }else {
+            return Result.error("新增/修改常规参数-工序卡1失败！");
+        }
+    }
+
+    //工单信息-修改常规参数-工序卡2
+    @Override
+    public Result<?> updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo) {
+        boolean flag = workorderGeneralSteptwoService.saveOrUpdate(generalSteptwo);
+        if(flag){
+            return Result.OK("新增/修改常规参数-工序卡2成功！");
+        }else {
+            return Result.error("新增/修改常规参数-工序卡2失败！");
+        }
     }
 
-    //工单信息-修改工序卡1(选配)
+    //工单信息-修改常规参数-工序卡3
     @Override
-    public Result<?> updateStepOne(WorkorderStepone workorderStepone) {
-        boolean flag = workorderSteponeService.saveOrUpdate(workorderStepone);
+    public Result<?> updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree) {
+        boolean flag = workorderGeneralStepthreeService.saveOrUpdate(generalStepthree);
         if(flag){
-            return Result.OK("新增/修改工序卡1成功！");
+            return Result.OK("新增/修改常规参数-工序卡3成功！");
         }else {
-            return Result.error("新增/修改工序卡1失败！");
+            return Result.error("新增/修改常规参数-工序卡3失败！");
         }
     }
 
-    //工单信息-修改工序卡2
+    //工单信息-修改常规参数-工序卡4(总成)
     @Override
-    public Result<?> updateStepTwo(WorkorderSteptwo workorderSteptwo) {
-        boolean flag = workorderSteptwoService.saveOrUpdate(workorderSteptwo);
+    public Result<?> updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour) {
+        boolean flag = workorderGeneralStepfourService.saveOrUpdate(generalStepfour);
         if(flag){
-            return Result.OK("新增/修改工序卡2成功！");
+            return Result.OK("新增/修改常规参数-工序卡4成功！");
         }else {
-            return Result.error("新增/修改工序卡2失败！");
+            return Result.error("新增/修改常规参数-工序卡4失败！");
         }
     }
 
-    //工单信息-修改工序卡3
+    //工单信息-修改工序参数-工序卡1(选配)
     @Override
-    public Result<?> updateStepThree(WorkorderStepthree workorderStepthree) {
-        boolean flag = workorderStepthreeService.saveOrUpdate(workorderStepthree);
+    public Result<?> updateParamStepOne(WorkorderParamStepone paramStepone) {
+        boolean flag = workorderParamSteponeService.saveOrUpdate(paramStepone);
         if(flag){
-            return Result.OK("新增/修改工序卡3成功！");
+            return Result.OK("新增/修改工序参数-工序卡1成功！");
         }else {
-            return Result.error("新增/修改工序卡3失败！");
+            return Result.error("新增/修改工序参数-工序卡1失败！");
         }
     }
 
-    //工单信息-修改工序卡4(总成)
+    //工单信息-修改工序参数-工序卡2
     @Override
-    public Result<?> updateStepFour(WorkorderStepfour workorderStepfour) {
-        boolean flag = workorderStepfourService.saveOrUpdate(workorderStepfour);
+    public Result<?> updateParamStepTwo(WorkorderParamSteptwo paramSteptwo) {
+        boolean flag = workorderParamSteptwoService.saveOrUpdate(paramSteptwo);
         if(flag){
-            return Result.OK("新增/修改工序卡4成功！");
+            return Result.OK("新增/修改工序参数-工序卡2成功！");
         }else {
-            return Result.error("新增/修改工序卡4失败！");
+            return Result.error("新增/修改工序参数-工序卡2失败！");
         }
     }
+
+    //工单信息-修改工序参数-工序卡3
+    @Override
+    public Result<?> updateParamStepThree(WorkorderParamStepthree paramStepthree) {
+        boolean flag = workorderParamStepthreeService.saveOrUpdate(paramStepthree);
+        if(flag){
+            return Result.OK("新增/修改工序参数-工序卡3成功！");
+        }else {
+            return Result.error("新增/修改工序参数-工序卡3失败！");
+        }
+    }
+
+    //工单信息-修改工序参数-工序卡4(总成)
+    @Override
+    public Result<?> updateParamStepFour(WorkorderParamStepfour paramStepfour) {
+        boolean flag = workorderParamStepfourService.saveOrUpdate(paramStepfour);
+        if(flag){
+            return Result.OK("新增/修改工序参数-工序卡4成功！");
+        }else {
+            return Result.error("新增/修改工序参数-工序卡4失败！");
+        }
+    }
+
 }

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

@@ -45,7 +45,7 @@ public class UserServiceImpl implements UserService {
     //登录
     @Override
     public Result<?> login(String userName, String password) {
-        //查询公告信息详情
+        //查询用户信息详情
         WorkorderUser one = workorderUserService
                 .lambdaQuery()
                 .eq(WorkorderUser::getName, userName)
@@ -63,6 +63,17 @@ public class UserServiceImpl implements UserService {
     //注册
     @Override
     public Result<?> register(WorkorderUser workorderUser) {
+
+        //查询是否有同名用户(不能注册同名用户)
+        WorkorderUser one = workorderUserService
+                .lambdaQuery()
+                .eq(WorkorderUser::getName, workorderUser.getName())
+                .one();
+
+        if(null != one){
+            return Result.error("用户名已存在！");
+        }
+
         boolean flag = workorderUserService.save(workorderUser);
         if(flag){
             return Result.OK("注册成功！");