Merge branch 'develop' of http://117.34.109.166:18448/r/mdc_430 into develop

“linengliang”

2023-12-13 f8b114fe75b9b68485e7039f64cd1dae69c77dcc

Merge branch 'develop' of http://117.34.109.166:18448/r/mdc_430 into develop

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardWorkInstructionController.java

@@ -20,8 +20,10 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.StrUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.MaintenanceStandardDetail;
import org.jeecg.modules.eam.entity.MaintenanceStandardWorkInstruction;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IMaintenanceStandardWorkInstructionService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -72,6 +74,9 @@

    @Autowired
    private ISysBaseAPI sysBaseApi;

    @Autowired
    private IEamEquipmentService equipmentService;

    /**
     * 分页列表查询
@@ -266,4 +271,55 @@
        return Result.ok("上传成功!");
    }


    @PostMapping(value = "/addStoveCategoryReport")
    public Result<?> addStoveCategoryReport(MultipartHttpServletRequest request, HttpServletResponse response) throws Exception {
        String str = request.getParameter("data");
        JSONObject json = JSONObject.parseObject(str);
        MaintenanceStandardWorkInstruction maintenanceStandardWorkInstruction = json.toJavaObject(MaintenanceStandardWorkInstruction.class);

        boolean isFileChange = true;
        String uploadId = json.getString("uploadId");
        String fileType = json.getString("fileType");
        String description = json.getString("description");
        String type = json.getString("type");
        // 文件变更
        if (isFileChange) {

            String workInstructionId = "";
            if (StrUtils.isNotBlankOrNull(uploadId)) {
                // 情形一、从文件管理中选择
//                 uploadRelaService.saveOrUpdateUploadRale(partRouteFile.getId(), partRouteFile.getType(), uploadId);
            } else {
                // 情形二、重新上传
                // 1、持久upload
                MultipartFile multipartFile = request.getFile("file");
                List<MultipartFile> multipartFileList = new ArrayList<>();
                multipartFileList.add(multipartFile);
//                List<SysUpload> sysUploads = uploadService.batchUploadFile(fileType, multipartFileList, description);
                List<SysUpload> sysUploads = sysBaseApi.batchUploadFile(fileType, multipartFileList, description);

                //持久作业指导书
                workInstructionId = sysUploads.get(0).getId();
                maintenanceStandardWorkInstruction.setWorkInstructionId(workInstructionId);
                maintenanceStandardWorkInstructionService.save(maintenanceStandardWorkInstruction);

                String equipmentId = maintenanceStandardWorkInstruction.getEquipmentId();
                String technologyStatus = maintenanceStandardWorkInstruction.getTechnologyStatus();
                Equipment equipment = equipmentService.getById(equipmentId);
                equipment.setTechnologyStatus(technologyStatus);
                equipmentService.updateById(equipment);


                // 2、创建/修改 uploadRela
                // 注：当前视为单文件上传控制，后续可能会有单个产品工艺文件对应多个上传文件的升级调整，修改后注意更细此段注释
//                uploadRelaService.saveOrUpdateUploadRale(maintenanceStandardWorkInstruction.getId(), type, sysUploads.get(0).getId());
                sysBaseApi.saveOrUpdateUploadRale(maintenanceStandardWorkInstruction.getId(), type, sysUploads.get(0).getId());
            }
        }

        return Result.ok("上传成功!");
    }


}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardWorkInstruction.java

@@ -5,6 +5,7 @@
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -58,4 +59,10 @@
    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
    private Integer delFlag = CommonConstant.DEL_FLAG_0;

    @TableField(exist = false)
    private String equipmentId;

    @TableField(exist = false)
    private String technologyStatus;
}