fix: 完善质量检验接口与质检员分配

liu

6 天以前 f8ccc5ab312ab7c5d6c7eb7fac4e37924f513869

 src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java

@@ -9,6 +9,8 @@
import com.ruoyi.quality.service.IQualityInspectFileService;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
import com.ruoyi.quality.util.QualityInspectionValueValidator;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

@@ -25,6 +27,9 @@

    @Resource
    private IQualityInspectParamService qualityInspectParamService;

    @Resource
    private IQualityInspectService qualityInspectService;

    /**
     * 详情
@@ -44,6 +49,31 @@
     */
    @PostMapping("/update")
    public AjaxResult update(@RequestBody List<QualityInspectParam> qualityInspectParams) {
        if (CollectionUtils.isEmpty(qualityInspectParams)) {
            return AjaxResult.error("检验项目不能为空");
        }
        Long inspectId = qualityInspectParams.get(0).getInspectId();
        if (inspectId == null) {
            return AjaxResult.error("检验记录ID不能为空");
        }
        QualityInspect inspect = qualityInspectService.getById(inspectId);
        if (inspect == null) {
            return AjaxResult.error("检验记录不存在");
        }
        if (Integer.valueOf(1).equals(inspect.getInspectState())) {
            return AjaxResult.error("已提交的检验记录不能修改");
        }
        for (QualityInspectParam parameter : qualityInspectParams) {
            if (StringUtils.isBlank(parameter.getTestValue())) {
                return AjaxResult.error("请填写“" + parameter.getParameterItem() + "”的检验值");
            }
        }
        if ("合格".equals(inspect.getCheckResult())) {
            String valueMessage = QualityInspectionValueValidator.validateQualified(qualityInspectParams);
            if (valueMessage != null) {
                return AjaxResult.error(valueMessage);
            }
        }
        return AjaxResult.success(qualityInspectParamService.updateBatchById(qualityInspectParams));
    }