Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 66e89415b0592169ce7e1d1c22c8fd78cc89a83c

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java

@@ -7,10 +7,11 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.QaReportTypeEnum;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.*;
import com.ruoyi.system.dto.BatchCollectSamplesDTO;
import com.ruoyi.system.dto.BatchSendSamplesDTO;
import com.ruoyi.system.dto.TSamplingRecordDTO;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TSamplingRecordQuery;
@@ -20,7 +21,6 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import java.text.SimpleDateFormat;
@@ -231,7 +231,7 @@
     */
    //@PreAuthorize("@ss.hasPermi('system:samplingRecord:sendSamples')")
    @Log(title = "取样记录信息-批量送样", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "批量送样")
    @ApiOperation(value = "批量送样",response = BatchSendSamplesDTO.class)
    @PostMapping(value = "/open/t-sampling-record/batchSendSamples")
    public R<Boolean> batchSendSamples(@RequestBody String param) {
        BatchSendSamplesDTO batchSendSamplesDTO = JSON.parseObject(param, BatchSendSamplesDTO.class);
@@ -251,7 +251,7 @@
     */
    //@PreAuthorize("@ss.hasPermi('system:samplingRecord:collectSamples')")
    @Log(title = "取样记录信息-批量收样", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "批量收样")
    @ApiOperation(value = "批量收样",response = BatchCollectSamplesDTO.class)
    @PostMapping(value = "/open/t-sampling-record/batchCollectSamples")
    public R<Boolean> batchCollectSamples(@RequestBody String param) {
        BatchCollectSamplesDTO batchCollectSamplesDTO = JSON.parseObject(param, BatchCollectSamplesDTO.class);