焊工管理，页面，新增，修改，删除，查看

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -95,6 +95,7 @@ public class ControllerAop {
 
         // 不需要校验token的接口直接返回
         if (joinPoint.getSignature() instanceof MethodSignature) {
+            return;
         }
 
         // 平台studio配置的下载接口token从url里取

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WelderController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WelderDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectMapper;
@@ -13,6 +14,7 @@ import com.yeejoin.amos.boot.module.ugp.biz.service.impl.ProjectServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.WelderServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -39,17 +41,20 @@ public class WelderController extends BaseController {
 
     @Autowired
     WelderServiceImpl welderServiceImpl;
+
+    @Autowired
+    OrgServiceImpl orgServiceImpl;
     /**
-     * 新增焊工信息
+     * 新增/修改焊工信息
      *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/saveWelder", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增焊工信息", notes = "新增焊工信息")
-    public ResponseModel<Object> saveWelder(@RequestParam String isWelder, @RequestBody WelderDto welderDto) {
-
-        return ResponseHelper.buildResponse(null);
+    public ResponseModel<OrgUsrDto> saveWelder(@RequestBody JSONObject jsonObject, @RequestParam String bizOrgType ,
+                                            @RequestParam(required = false) String sequenceNbr) {
+        return ResponseHelper.buildResponse(orgServiceImpl.dataHandling(jsonObject,bizOrgType,sequenceNbr));
     }
 
     /**
@@ -87,4 +92,48 @@ public class WelderController extends BaseController {
         return ResponseHelper.buildResponse(welderServiceImpl.getpageInfo());
     }
 
+    /**
+     * 当前登陆人所在公司/单位/企业 下的 所有焊工人员分页查询
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "当前登陆人所在公司/单位/企业下的所有焊工人员分页列表", notes = "当前登陆人所在公司/单位/企业下的所有焊工人员分页查询列表")
+    @GetMapping(value = "/getCompanyWelder")
+    public ResponseModel<IPage> getCompanyWelder(
+            @RequestParam(value = "current") int current,
+            @RequestParam(value = "size") int size
+    ){
+        Page page = new Page();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(orgServiceImpl.getCompanyWelder(page));
+    }
+
+    /**
+     * 根据sequenceNbr查询焊工信息
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询项目焊工信息表", notes = "根据sequenceNbr查询项目焊工信息表")
+    public ResponseModel<Map> selectOneById(@PathVariable String sequenceNbr) {
+        return ResponseHelper.buildResponse(orgServiceImpl.getdetialInfo(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr删除焊工信息
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr删除项目焊工信息表", notes = "根据sequenceNbr删除项目焊工信息表")
+    public void deleteOneById(@PathVariable String sequenceNbr) throws Exception {
+        orgServiceImpl.delectInfo(sequenceNbr);
+    }
 }