Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈

云

7 小时以前 620bb4712a31791231c4381581f0f60088f079fe

 src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java

@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagementFile;
import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementFileService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.service.IQualityInspectFileService;
import org.springframework.util.CollectionUtils;
@@ -23,7 +22,7 @@
 */
@RestController
@RequestMapping("/rulesRegulationsManagementFile")
public class RulesRegulationsManagementFileController extends BaseController {
public class RulesRegulationsManagementFileController {

    @Resource
    private RulesRegulationsManagementFileService rulesRegulationsManagementFileService;
@@ -35,8 +34,8 @@
     * @return
     */
    @PostMapping("/add")
    public R<?> add(@RequestBody RulesRegulationsManagementFile rulesRegulationsManagementFile) {
        return R.ok(rulesRegulationsManagementFileService.save(rulesRegulationsManagementFile));
    public AjaxResult add(@RequestBody RulesRegulationsManagementFile rulesRegulationsManagementFile) {
        return AjaxResult.success(rulesRegulationsManagementFileService.save(rulesRegulationsManagementFile));
    }

    /**
@@ -45,12 +44,12 @@
     * @return
     */
    @DeleteMapping("/del")
    public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
    public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return R.fail("请选择至少一条数据");
            return AjaxResult.error("请选择至少一条数据");
        }
        //删除检验附件
        return R.ok(rulesRegulationsManagementFileService.removeBatchByIds(ids));
        return AjaxResult.success(rulesRegulationsManagementFileService.removeBatchByIds(ids));
    }

    /**
@@ -60,8 +59,8 @@
     * @return
     */
    @GetMapping("/listPage")
    public R<?> listPage(Page page, RulesRegulationsManagementFile rulesRegulationsManagementFile) {
        return R.ok(rulesRegulationsManagementFileService.listPage(page, rulesRegulationsManagementFile));
    public AjaxResult listPage(Page page, RulesRegulationsManagementFile rulesRegulationsManagementFile) {
        return AjaxResult.success(rulesRegulationsManagementFileService.listPage(page, rulesRegulationsManagementFile));
    }

}