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

云

5 天以前 0d7d874912d0147376826b55667a1deb6547ed91

 src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java

@@ -7,17 +7,18 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.officesupplies.pojo.OfficeSupplies;
import com.ruoyi.officesupplies.service.OfficeSuppliesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Date;
@@ -28,23 +29,23 @@
 * @date : 2025/9/4 14:16
 */
@RestController
@Api(tags = "办公物资")
@Tag(name = "办公物资")
@RequestMapping("/officeSupplies")
@AllArgsConstructor
public class OfficeSuppliesController extends BaseController {

    @Autowired
    private OfficeSuppliesService officeSuppliesService;

    @GetMapping("/listPage")
    @ApiOperation("办公物资-分页查询")
    public AjaxResult listPage(Page page, OfficeSupplies officeSupplies) {
    @Operation(summary = "办公物资-分页查询")
    public R<?> listPage(Page page, OfficeSupplies officeSupplies) {
        return officeSuppliesService.listPage(page, officeSupplies);
    }

    @PostMapping("/add")
    @ApiOperation("办公物资-添加")
    @Operation(summary = "办公物资-添加")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult add(@RequestBody OfficeSupplies officeSupplies) {
    public R<?> add(@RequestBody OfficeSupplies officeSupplies) {
        // 按照当前时间yyyyMMdd + 当天新增数量 + 1生成编号
        // 获取当天新增数量
        long count = officeSuppliesService.count(new LambdaQueryWrapper<OfficeSupplies>()
@@ -54,22 +55,22 @@
        officeSupplies.setCode(code);
        officeSupplies.setStatus(1);
        officeSupplies.setApplyTime(new Date());
        return officeSuppliesService.save(officeSupplies) ? success() : error();
        return officeSuppliesService.save(officeSupplies) ? R.ok() : R.fail();
    }

    @PostMapping("/update")
    @ApiOperation("办公物资-修改")
    @Operation(summary = "办公物资-修改")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult update(@RequestBody OfficeSupplies officeSupplies) {
        return officeSuppliesService.updateById(officeSupplies) ? success() : error();
    public R<?> update(@RequestBody OfficeSupplies officeSupplies) {
        return officeSuppliesService.updateById(officeSupplies) ? R.ok() : R.fail();
    }

    @DeleteMapping("/delete")
    @ApiOperation("办公物资-删除")
    @Operation(summary = "办公物资-删除")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult delete(@RequestBody List<Long> ids) {
        if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("请传入要删除的ID");
        return officeSuppliesService.removeBatchByIds(ids) ? success() : error();
    public R<?> delete(@RequestBody List<Long> ids) {
        if(CollectionUtils.isEmpty(ids)) return R.fail("请传入要删除的ID");
        return officeSuppliesService.removeBatchByIds(ids) ? R.ok() : R.fail();
    }

    /**
@@ -77,7 +78,7 @@
     */
    @Log(title = "导出办公物资", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ApiOperation("导出办公物资")
    @Operation(summary = "导出办公物资")
    public void export(HttpServletResponse response) {
        ExcelUtil<OfficeSupplies> util = new ExcelUtil<OfficeSupplies>(OfficeSupplies.class);
        List<OfficeSupplies> list = officeSuppliesService.list();