Merge remote-tracking branch 'origin/master'

zss

2024-06-07 49cc211213ce71bd6e5bb8eeeffbda46c0bf98d8

Merge remote-tracking branch 'origin/master'

 framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java

@@ -60,8 +60,8 @@
    @Override
    protected void addInterceptors(InterceptorRegistry registry) {
        // TODO: 2024/6/4 访问swagger需关下面拦截器
//        registry.addInterceptor(fiferConfig).addPathPatterns("/**");
//        registry.addInterceptor(powerConfig).addPathPatterns("/**");
        registry.addInterceptor(fiferConfig).addPathPatterns("/**");
        registry.addInterceptor(powerConfig).addPathPatterns("/**");
        registry.addInterceptor(logConfig).addPathPatterns("/**");
        super.addInterceptors(registry);
    }

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java

@@ -66,7 +66,8 @@
    @ValueClassify("检验下单")
    @ApiOperation(value = "添加检验下单数据")
    @PostMapping("/addInsOrder")
    public Result<?> addInsOrder(@RequestBody Map<String, Object> map) {
    public Result<?> addInsOrder(String str) {
        Map<String, Object> map = JSON.parseObject(str, Map.class);
        JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
        List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
        InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java

@@ -90,7 +90,7 @@
        return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
    }

    @ValueClassify("检验任务")
    @ValueAuth
    @ApiOperation(value = "校验检验任务提交")
    @PostMapping("/checkSubmitPlan")
    public Result<?> checkSubmitPlan(Integer orderId, String laboratory) {
@@ -114,7 +114,7 @@
        return Result.success();
    }

    @ValueClassify("检验任务")
    @ValueAuth
    @ApiOperation(value = "查看检验单下的附件列表")
    @PostMapping("/getFileList")
    public Result<?> getFileList(@RequestBody Map<String, Object> data) throws Exception {
@@ -138,6 +138,7 @@
        return Result.success(insOrderFileService.removeById(id));
    }

    @ValueAuth
    @ValueClassify("检验任务")
    @ApiOperation(value = "下载附件")
    @PostMapping("/downFile")

 user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java

@@ -23,7 +23,6 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

@RestController
@AllArgsConstructor
@@ -43,13 +42,13 @@

    @ValueClassify("用户管理")
    @PostMapping("/getSampleUser")
    @ApiOperation(value = "直接获取与自己相同单位的人员列表")
    @ApiOperation(value = "查看指定部门的人事系统组织架构")
    public Result<?> getSampleUser(){
        return Result.success();
    }

    @ValueClassify("用户管理")
    @ApiOperation(value = "获取人事系统组织架构")
    @ApiOperation(value = "查看人事系统组织架构")
    @GetMapping(value = "/selectCompaniesList")
    public Result<List<Company>> selectCompaniesList() {
        //判断是否有直接获取第三方部门的权限