Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-07 c28d3bb363dde2afb44c168b93379b2bf6b1f67f

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

@@ -14,6 +14,7 @@
import org.json.JSONException;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -36,9 +37,9 @@

    @ApiOperation(value = "新增原材料检验单")
    @PostMapping("/addRawInspects")
    public Result addRawInspects(@RequestHeader("token") String token, @RequestBody RawInspectVo rawInspectVo) throws Exception {
    public Result addRawInspects(@RequestHeader("token") String token,@Validated @RequestBody RawInspectVo rawInspectVo) throws Exception {
        Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
        return Result.success(rawInspectService.addRawInspects(data.get("name").replaceAll("\"", ""), rawInspectVo));
        return Result.success(rawInspectService.addRawInspects(data.get("id").replaceAll("\"", ""), rawInspectVo));
    }

    @ApiOperation(value = "分页查询原材料检验单列表")
@@ -81,10 +82,5 @@
        }
        return Result.success(rawInspectService.updateRawInspectsById(id));
    }






}