Merge branch 'dev' into dev_dz

zhuo

2025-03-15 500b831eb1153e9ba04fbffefa8fdfdfa080316c

Merge branch 'dev' into dev_dz

 basic-server/src/main/resources/mapper/StructureTestMapper.xml

@@ -31,6 +31,7 @@
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>

    </select>

</mapper>

 cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java

@@ -155,8 +155,8 @@

    @ApiOperation(value = "维护数采配置")
    @PostMapping("/saveDataAcquisitionConfiguration")
    public Result<?> saveDataAcquisitionConfiguration(@RequestParam(value = "deviceId") Integer deviceId, @RequestBody DataConfigDto dataConfigList) {
        dataConfigService.saveDataAcquisitionConfiguration(deviceId, dataConfigList);
    public Result<?> saveDataAcquisitionConfiguration(@RequestBody DataConfigDto dataConfigList) {
        dataConfigService.saveDataAcquisitionConfiguration(dataConfigList.getDeviceId(), dataConfigList);
        return Result.success();
    }


 cnas-device/src/main/java/com/ruoyi/device/dto/DataConfigDto.java

@@ -33,4 +33,7 @@

    @ApiModelProperty("数采-db，mdb文件名称")
    private String dbFileName;

    @ApiModelProperty("设备ID")
    private Integer deviceId;
}

 cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java

@@ -13,6 +13,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -69,7 +70,7 @@

    @ApiOperation(value = "审核文件变更")
    @PostMapping("/checkManageDocumentAlter")
    public Result checkManageDocumentAlter(@RequestBody ManageDocumentAlter manageDocumentAlter){
    public Result checkManageDocumentAlter(ManageDocumentAlter manageDocumentAlter){
        return Result.success(manageDocumentAlterService.checkManageDocumentAlter(manageDocumentAlter));
    }


 cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java

@@ -12,6 +12,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.UserMapper;


@@ -184,8 +185,11 @@
                System.err.println("附件上传错误");
                return 0;
            }
            if(StringUtils.isNotEmpty(oldManageDocumentAlter.getMethod())){

            }
            /*其余相关处理*/
            if (oldManageDocumentAlter.getMethod().equals("作废")){
            if ("作废".equals(oldManageDocumentAlter.getMethod())){
                //新增到作废申请里面
                ManageDocumentCancel manageDocumentCancel = new ManageDocumentCancel();
                manageDocumentCancel.setDocumentCode(oldManageDocumentAlter.getAlterBeforeCode());