试验设备相关BUG

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/TrialDeviceOverhaulDTO.java

@@ -0,0 +1,17 @@
+package org.springblade.business.dto;
+
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.business.entity.TrialDeviceOverhaul;
+
+
+/**
+ * 试验设备检修DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TrialDeviceOverhaulDTO extends TrialDeviceOverhaul {
+    private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/TrialDeviceUseDTO.java

@@ -0,0 +1,17 @@
+package org.springblade.business.dto;
+
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.business.entity.TrialDeviceUse;
+
+
+/**
+ * 试验设备使用DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TrialDeviceUseDTO extends TrialDeviceUse {
+    private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialDeviceClassification.java

@@ -18,6 +18,11 @@ import java.util.Date;
 public class TrialDeviceClassification extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键id
+     */
+    private Long id;
+
     /**
      * 合同段id
      */

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialDeviceOverhaul.java

@@ -31,6 +31,12 @@ public class TrialDeviceOverhaul extends BaseEntity {
     @ApiModelProperty(value = "设备分类id")
     private Long deviceClassId;
 
+    /**
+     * 进场设备id
+     */
+    @ApiModelProperty(value = "进场设备id")
+    private Long deviceInfoId;
+
     /**
      * 设备名称
      */

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialDeviceUse.java

@@ -31,6 +31,12 @@ public class TrialDeviceUse extends BaseEntity {
     @ApiModelProperty(value = "设备分类id")
     private Long deviceClassId;
 
+    /**
+     * 进场设备id
+     */
+    @ApiModelProperty(value = "进场设备id")
+    private Long deviceInfoId;
+
     /**
      * 设备名称
      */
@@ -99,7 +105,6 @@ public class TrialDeviceUse extends BaseEntity {
     @ApiModelProperty(value = "排序")
     private Integer sort;
 
-
     /**
      * pdfURL
      */

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/TrialDeviceInfoVO3.java

@@ -12,6 +12,12 @@ import java.io.Serializable;
 public class TrialDeviceInfoVO3 implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
     /**
      * 设备编号
      */

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/TrialDeviceUsePageVO.java

@@ -41,4 +41,5 @@ public class TrialDeviceUsePageVO extends TrialDeviceUse {
     @ApiModelProperty(value = "设备分类名称")
     private String deviceClassName;
 
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialDeviceInfoController.java

@@ -5,14 +5,14 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springblade.business.dto.TrialDeviceOverhaulDTO;
+import org.springblade.business.dto.TrialDeviceUseDTO;
 import org.springblade.business.entity.TrialDeviceOverhaul;
-import org.springblade.business.excel.TrialDeviceOverhaulExcel;
-import org.springblade.business.excel.TrialDeviceUseExcel;
+import org.springblade.business.excel.*;
 import org.springblade.business.service.ITrialDeviceOverhaulService;
 import org.springblade.business.vo.*;
 import org.springblade.business.entity.TrialDeviceInfo;
 import org.springblade.business.entity.TrialDeviceUse;
-import org.springblade.business.excel.TrialDeviceInfoExcel;
 import org.springblade.business.service.ITrialDeviceInfoService;
 import org.springblade.business.service.ITrialDeviceUseService;
 import org.springblade.business.service.ITrialSampleInfoService;
@@ -85,9 +85,9 @@ public class TrialDeviceInfoController extends BladeController {
 
     @PostMapping("/mobilization/import-batch")
     @ApiOperationSupport(order = 7)
-    @ApiOperation(value = "进场设备导入数据保存", notes = "传入List<TrialDeviceInfoExcel>、合同段contractId")
-    public R<Object> importBatchDeviceInfo(@RequestBody List<TrialDeviceInfoExcel> list, @RequestParam Long contractId) {
-        return R.status(iTrialDeviceInfoService.saveBatchDeviceInfo(list, contractId));
+    @ApiOperation(value = "进场设备导入数据保存", notes = "传入TrialDeviceInfoExcelDTO")
+    public R<Object> importBatchDeviceInfo(@RequestBody TrialDeviceInfoExcelDTO dto) {
+        return R.status(iTrialDeviceInfoService.saveBatchDeviceInfo(dto.getList(), dto.getContractId()));
     }
 
     @GetMapping("/use/device-list")
@@ -113,9 +113,9 @@ public class TrialDeviceInfoController extends BladeController {
 
     @PostMapping("/use/submit")
     @ApiOperationSupport(order = 11)
-    @ApiOperation(value = "使用设备新增或修改", notes = "传入id")
-    public R<Object> useSubmit(@RequestBody TrialDeviceUse obj) {
-        return R.status(iTrialDeviceUseService.useSubmit(obj));
+    @ApiOperation(value = "使用设备新增或修改", notes = "传入TrialDeviceUseDTO")
+    public R<Object> useSubmit(@RequestBody TrialDeviceUseDTO dto) {
+        return R.status(iTrialDeviceUseService.useSubmit(dto));
     }
 
     @GetMapping("/use/remove")
@@ -132,7 +132,7 @@ public class TrialDeviceInfoController extends BladeController {
         return R.data(iTrialDeviceUseService.usePage(Condition.getPage(query), vo, projectId, contractId));
     }
 
-    @GetMapping("/use/print-pdf")
+    @PostMapping("/use/print-pdf")
     @ApiOperationSupport(order = 14)
     @ApiOperation(value = "使用设备打印PDF", notes = "传入ids、项目projectId、合同段contractId")
     public R<Object> usePrintPdf(@RequestParam String ids, @RequestParam String projectId, HttpServletResponse response, @RequestParam Long contractId) {
@@ -149,9 +149,9 @@ public class TrialDeviceInfoController extends BladeController {
 
     @PostMapping("/use/import-batch")
     @ApiOperationSupport(order = 16)
-    @ApiOperation(value = "使用设备导入数据保存", notes = "传入List<TrialDeviceUseExcel>、项目id、合同段id")
-    public R<Object> importBatchDeviceUse(@RequestBody List<TrialDeviceUseExcel> list, @RequestParam Long projectId, @RequestParam Long contractId) {
-        return R.status(iTrialDeviceUseService.importBatchDeviceUse(list, projectId, contractId));
+    @ApiOperation(value = "使用设备导入数据保存", notes = "传入TrialDeviceUseExcelDTO")
+    public R<Object> importBatchDeviceUse(@RequestBody TrialDeviceUseExcelDTO dto) {
+        return R.status(iTrialDeviceUseService.importBatchDeviceUse(dto.getList(), dto.getProjectId(), dto.getContractId()));
     }
 
     @GetMapping("/overhaul/detail")
@@ -163,9 +163,9 @@ public class TrialDeviceInfoController extends BladeController {
 
     @PostMapping("/overhaul/submit")
     @ApiOperationSupport(order = 18)
-    @ApiOperation(value = "检修设备新增或修改", notes = "传入TrialDeviceOverhaul对象")
-    public R<Object> overhaulSubmit(@RequestBody TrialDeviceOverhaul obj) {
-        return R.status(iTrialDeviceOverhaulService.overhaulSubmit(obj));
+    @ApiOperation(value = "检修设备新增或修改", notes = "传入TrialDeviceOverhaulDTO")
+    public R<Object> overhaulSubmit(@RequestBody TrialDeviceOverhaulDTO dto) {
+        return R.status(iTrialDeviceOverhaulService.overhaulSubmit(dto));
     }
 
     @GetMapping("/overhaul/remove")
@@ -182,7 +182,7 @@ public class TrialDeviceInfoController extends BladeController {
         return R.data(iTrialDeviceOverhaulService.overhaulPage(Condition.getPage(query), vo, contractId));
     }
 
-    @GetMapping("/overhaul/print-pdf")
+    @PostMapping("/overhaul/print-pdf")
     @ApiOperationSupport(order = 21)
     @ApiOperation(value = "检修设备打印PDF", notes = "传入ids、合同段contractId")
     public R<Object> overhaulPrintPdf(@RequestParam String ids, HttpServletResponse response, @RequestParam Long contractId) {
@@ -199,9 +199,9 @@ public class TrialDeviceInfoController extends BladeController {
 
     @PostMapping("/overhaul/import-batch")
     @ApiOperationSupport(order = 23)
-    @ApiOperation(value = "检修设备导入数据保存", notes = "传入List<TrialDeviceOverhaulExcel>、合同段contractId")
-    public R<Object> importBatchDeviceOverhaul(@RequestBody List<TrialDeviceOverhaulExcel> list, @RequestParam Long contractId) {
-        return R.status(iTrialDeviceOverhaulService.importBatchDeviceUse(list, contractId));
+    @ApiOperation(value = "检修设备导入数据保存", notes = "传入TrialDeviceOverhaulExcelDTO")
+    public R<Object> importBatchDeviceOverhaul(@RequestBody TrialDeviceOverhaulExcelDTO list) {
+        return R.status(iTrialDeviceOverhaulService.importBatchDeviceUse(list.getList(), list.getContractId()));
     }
 
 

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialMaterialController.java

@@ -150,8 +150,8 @@ public class TrialMaterialController extends BladeController {
     @PostMapping("/sample/import")
     @ApiOperationSupport(order = 15)
     @ApiOperation(value = "样品材料导入", notes = "传入excel,合同段contractId")
-    public R sampleImport(MultipartFile file, Integer isCovered, Long contractId) {
-        TrialSampleInfoImporter trialSampleInfoImporter = new TrialSampleInfoImporter(iTrialSampleInfoService, isCovered == 1, contractId);
+    public R sampleImport(MultipartFile file, Integer isCovered, Long contractId, Long nodeId) {
+        TrialSampleInfoImporter trialSampleInfoImporter = new TrialSampleInfoImporter(iTrialSampleInfoService, isCovered == 1, contractId, nodeId);
         ExcelUtil.save(file, trialSampleInfoImporter, TrialSampleInfoExcel.class);
         return R.success("操作成功");
     }

blade-service/blade-business/src/main/java/org/springblade/business/excel/TrialDeviceInfoExcel.java

@@ -21,28 +21,25 @@ public class TrialDeviceInfoExcel implements Serializable {
     @ExcelProperty("设备名称")
     private String deviceName;
 
-    @ExcelProperty("设备分类名称")
+    @ExcelProperty("设备分类")
     private String deviceClassName;
 
-    @ExcelProperty("试验室管理人员名称")
-    private String managerName;
-
     @ExcelProperty("设备型号")
     private String deviceModel;
 
+    @ExcelProperty("设备编号")
+    private String deviceNumber;
+
     @ExcelProperty("生产厂家")
     private String manufacturer;
 
-    @ExcelProperty("生产日期")
+    @ExcelProperty("出厂日期")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date productionDate;
+    private Date factoryDate;
 
     @ExcelProperty("出厂编号")
     private String factoryNumber;
 
-    @ExcelProperty("设备采集编号")
-    private String equipmentAcquisitionNumber;
-
     @ExcelProperty("进场日期")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date mobilizationDate;
@@ -53,18 +50,29 @@ public class TrialDeviceInfoExcel implements Serializable {
     @ExcelProperty("精准度")
     private String accuracy;
 
-    @ExcelProperty("校验周期(月)")
+    @ExcelProperty("效验周期（月）")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Integer calibrationCycle;
 
-    @ExcelProperty("最近校验时间")
+    @ExcelProperty("最近效验时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date lastCalibrationTime;
 
-    @ExcelProperty("是否需要校验 否/是")
-    private String isCalibration;
+    @ExcelProperty("状态")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Integer status;
+
+    @ExcelProperty("是否需要效验")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Integer isCalibration;
+
+    @ExcelProperty("设备采集编号")
+    private String equipmentAcquisitionNumber;
+
+    @ExcelProperty("设备管理人员")
+    private String managerName;
 
     @ExcelProperty("备注")
     private String remarks;
 
-
 }

blade-service/blade-business/src/main/java/org/springblade/business/excel/TrialDeviceInfoExcelDTO.java

@@ -0,0 +1,16 @@
+package org.springblade.business.excel;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class TrialDeviceInfoExcelDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private List<TrialDeviceInfoExcel> list;
+
+    private Long contractId;
+
+}

blade-service/blade-business/src/main/java/org/springblade/business/excel/TrialDeviceOverhaulExcel.java

@@ -5,12 +5,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -27,7 +23,7 @@ public class TrialDeviceOverhaulExcel implements Serializable {
     @ExcelProperty("设备名称")
     private String deviceName;
 
-    @ExcelProperty("设备分类名称")
+    @ExcelProperty("设备分类")
     private String deviceClassName;
 
     @ExcelProperty("设备编号")
@@ -39,14 +35,14 @@ public class TrialDeviceOverhaulExcel implements Serializable {
     @ExcelProperty("出厂编号")
     private String factoryNumber;
 
-    @ExcelProperty("维修/鉴定日期")
+    @ExcelProperty("维修/检定日期")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date overhaulDate;
 
-    @ExcelProperty("维修/鉴定内容")
+    @ExcelProperty("维修/检定内容")
     private String overhaulText;
 
-    @ExcelProperty("维修/鉴定人")
+    @ExcelProperty("维修/检定人")
     private String managerName;
 
     @ExcelProperty("备注")

blade-service/blade-business/src/main/java/org/springblade/business/excel/TrialDeviceOverhaulExcelDTO.java

@@ -0,0 +1,17 @@
+package org.springblade.business.excel;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+@Data
+public class TrialDeviceOverhaulExcelDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private List<TrialDeviceOverhaulExcel> list;
+
+    private Long contractId;
+
+}

blade-service/blade-business/src/main/java/org/springblade/business/excel/TrialDeviceUseExcel.java

@@ -19,13 +19,13 @@ public class TrialDeviceUseExcel implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ExcelProperty("使用人员名称")
+    @ExcelProperty("使用人")
     private String managerName;
 
     @ExcelProperty("设备名称")
     private String deviceName;
 
-    @ExcelProperty("设备分类名称")
+    @ExcelProperty("设备分类")
     private String deviceClassName;
 
     @ExcelProperty("设备编号")
@@ -37,15 +37,15 @@ public class TrialDeviceUseExcel implements Serializable {
     @ExcelProperty("出厂编号")
     private String factoryNumber;
 
-    @ExcelProperty("使用日期（起")
+    @ExcelProperty("使用日期(起)")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startDate;
 
-    @ExcelProperty("使用日期（止）")
+    @ExcelProperty("使用日期(止)")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
 
-    @ExcelProperty("检测试验项目")
+    @ExcelProperty("检测实验项目")
     private String nodeName;
 
     @ExcelProperty("样品名称")

blade-service/blade-business/src/main/java/org/springblade/business/excel/TrialDeviceUseExcelDTO.java

@@ -0,0 +1,18 @@
+package org.springblade.business.excel;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class TrialDeviceUseExcelDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private List<TrialDeviceUseExcel> list;
+
+    private Long projectId;
+
+    private Long contractId;
+
+}

blade-service/blade-business/src/main/java/org/springblade/business/excel/TrialSampleInfoImporter.java

@@ -12,10 +12,11 @@ public class TrialSampleInfoImporter implements ExcelImporter<TrialSampleInfoExc
     private final ITrialSampleInfoService service;
     private final Boolean isCovered;
     private final Long contractId;
+    private final Long nodeId;
 
     @Override
     public void save(List<TrialSampleInfoExcel> data) {
-        service.importSample(data, isCovered, contractId);
+        service.importSample(data, isCovered, contractId, nodeId);
     }
 
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialDeviceOverhaulMapper.xml

@@ -7,6 +7,7 @@
         <result column="id" property="id"/>
         <result column="manager_name" property="managerName"/>
         <result column="device_class_id" property="deviceClassId"/>
+        <result column="device_info_id" property="deviceInfoId"/>
         <result column="device_name" property="deviceName"/>
         <result column="device_number" property="deviceNumber"/>
         <result column="device_model" property="deviceModel"/>

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialDeviceUseMapper.xml

@@ -7,6 +7,7 @@
         <result column="id" property="id"/>
         <result column="manager_name" property="managerName"/>
         <result column="device_class_id" property="deviceClassId"/>
+        <result column="device_info_id" property="deviceInfoId"/>
         <result column="device_name" property="deviceName"/>
         <result column="device_number" property="deviceNumber"/>
         <result column="device_model" property="deviceModel"/>

blade-service/blade-business/src/main/java/org/springblade/business/service/ITrialDeviceOverhaulService.java

@@ -1,6 +1,7 @@
 package org.springblade.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.business.dto.TrialDeviceOverhaulDTO;
 import org.springblade.business.entity.TrialDeviceOverhaul;
 import org.springblade.business.excel.TrialDeviceOverhaulExcel;
 import org.springblade.business.vo.TrialDeviceOverhaulPageVO;
@@ -13,7 +14,7 @@ public interface ITrialDeviceOverhaulService extends BaseService<TrialDeviceOver
 
     TrialDeviceOverhaul overhaulDetail(Long id);
 
-    boolean overhaulSubmit(TrialDeviceOverhaul obj);
+    boolean overhaulSubmit(TrialDeviceOverhaulDTO dto);
 
     IPage<TrialDeviceOverhaulPageVO> overhaulPage(IPage<TrialDeviceOverhaul> page, TrialDeviceOverhaulPageVO vo, Long contractId);
 

blade-service/blade-business/src/main/java/org/springblade/business/service/ITrialDeviceUseService.java

@@ -1,6 +1,7 @@
 package org.springblade.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.business.dto.TrialDeviceUseDTO;
 import org.springblade.business.excel.TrialDeviceUseExcel;
 import org.springblade.business.vo.TrialDeviceUsePageVO;
 import org.springblade.business.entity.TrialDeviceUse;
@@ -13,7 +14,7 @@ public interface ITrialDeviceUseService extends BaseService<TrialDeviceUse> {
 
     TrialDeviceUse useDetail(Long id);
 
-    boolean useSubmit(TrialDeviceUse obj);
+    boolean useSubmit(TrialDeviceUseDTO dto);
 
     IPage<TrialDeviceUsePageVO> usePage(IPage<TrialDeviceUse> page, TrialDeviceUsePageVO dto, Long projectId, Long contractId);
 

blade-service/blade-business/src/main/java/org/springblade/business/service/ITrialSampleInfoService.java

@@ -21,7 +21,7 @@ public interface ITrialSampleInfoService extends BaseService<TrialSampleInfo> {
 
     boolean sampleCopy(List<TrialSampleInfoDTO> dto);
 
-    void importSample(List<TrialSampleInfoExcel> data, Boolean isCovered, Long contractId);
+    void importSample(List<TrialSampleInfoExcel> data, Boolean isCovered, Long contractId, Long nodeId);
 
     String sampleExportPdf(String ids, HttpServletResponse response);
 

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialDeviceInfoServiceImpl.java

@@ -265,9 +265,11 @@ public class TrialDeviceInfoServiceImpl extends BaseServiceImpl<TrialDeviceInfoM
         List<TrialDeviceInfo> listData = new ArrayList<>();
         for (TrialDeviceInfoExcel trialDeviceInfoExcel : list) {
             for (TrialDeviceClassification deviceClassification : deviceClassifications) {
-                if (trialDeviceInfoExcel.getManagerName().equals(deviceClassification.getClassName())) {
+                if (trialDeviceInfoExcel.getDeviceClassName().equals(deviceClassification.getClassName())) {
                     TrialDeviceInfo trialDeviceInfo = BeanUtil.copyProperties(trialDeviceInfoExcel, TrialDeviceInfo.class);
                     if (trialDeviceInfo != null) {
+                        trialDeviceInfo.setStatus(trialDeviceInfoExcel.getStatus().equals(1) ? 1 : 0);
+                        trialDeviceInfo.setIsCalibration(trialDeviceInfoExcel.getIsCalibration().equals(1) ? 1 : 0);
                         trialDeviceInfo.setDeviceClassId(deviceClassification.getId());
                         listData.add(trialDeviceInfo);
                     }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialDeviceOverhaulServiceImpl.java

@@ -13,12 +13,15 @@ import com.lowagie.text.pdf.PdfWriter;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
+import org.springblade.business.dto.TrialDeviceOverhaulDTO;
 import org.springblade.business.entity.TrialDeviceClassification;
+import org.springblade.business.entity.TrialDeviceInfo;
 import org.springblade.business.entity.TrialDeviceOverhaul;
 import org.springblade.business.entity.TrialDeviceUse;
 import org.springblade.business.excel.TrialDeviceOverhaulExcel;
 import org.springblade.business.excel.TrialDeviceUseExcel;
 import org.springblade.business.mapper.TrialDeviceClassificationMapper;
+import org.springblade.business.mapper.TrialDeviceInfoMapper;
 import org.springblade.business.mapper.TrialDeviceOverhaulMapper;
 import org.springblade.business.service.ITrialDeviceOverhaulService;
 import org.springblade.business.utils.PDFUtil;
@@ -50,6 +53,7 @@ public class TrialDeviceOverhaulServiceImpl extends BaseServiceImpl<TrialDeviceO
 
     private final TrialDeviceClassificationMapper trialDeviceClassificationMapper;
     private final NewIOSSClient newIOSSClient;
+    private final TrialDeviceInfoMapper trialDeviceInfoMapper;
 
     @Override
     public TrialDeviceOverhaul overhaulDetail(Long id) {
@@ -57,8 +61,19 @@ public class TrialDeviceOverhaulServiceImpl extends BaseServiceImpl<TrialDeviceO
     }
 
     @Override
-    public boolean overhaulSubmit(TrialDeviceOverhaul obj) {
-        return this.saveOrUpdate(obj);
+    public boolean overhaulSubmit(TrialDeviceOverhaulDTO dto) {
+        //获取设备信息
+        TrialDeviceInfo trialDeviceInfo = trialDeviceInfoMapper.selectById(dto.getDeviceInfoId());
+        if (ObjectUtil.isNotEmpty(trialDeviceInfo.getDeviceModel())) {
+            dto.setDeviceModel(trialDeviceInfo.getDeviceModel());
+
+        }
+        if (ObjectUtil.isNotEmpty(trialDeviceInfo.getFactoryNumber())) {
+            dto.setFactoryNumber(trialDeviceInfo.getFactoryNumber());
+        }
+        TrialDeviceOverhaul trialDeviceOverhaul = BeanUtil.copyProperties(dto, TrialDeviceOverhaul.class);
+        assert trialDeviceOverhaul != null;
+        return this.saveOrUpdate(trialDeviceOverhaul);
     }
 
     @Override

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialDeviceUseServiceImpl.java

@@ -13,9 +13,12 @@ import com.lowagie.text.pdf.PdfWriter;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
+import org.springblade.business.dto.TrialDeviceUseDTO;
 import org.springblade.business.entity.TrialDeviceClassification;
+import org.springblade.business.entity.TrialDeviceInfo;
 import org.springblade.business.excel.TrialDeviceUseExcel;
 import org.springblade.business.mapper.TrialDeviceClassificationMapper;
+import org.springblade.business.mapper.TrialDeviceInfoMapper;
 import org.springblade.business.utils.PDFUtil;
 import org.springblade.business.utils.SystemUtils;
 import org.springblade.business.vo.TrialDeviceUsePageVO;
@@ -48,6 +51,7 @@ public class TrialDeviceUseServiceImpl extends BaseServiceImpl<TrialDeviceUseMap
 
     private final NewIOSSClient newIOSSClient;
     private final TrialDeviceClassificationMapper trialDeviceClassificationMapper;
+    private final TrialDeviceInfoMapper trialDeviceInfoMapper;
 
     @Override
     public TrialDeviceUse useDetail(Long id) {
@@ -55,8 +59,18 @@ public class TrialDeviceUseServiceImpl extends BaseServiceImpl<TrialDeviceUseMap
     }
 
     @Override
-    public boolean useSubmit(TrialDeviceUse obj) {
-        return this.saveOrUpdate(obj);
+    public boolean useSubmit(TrialDeviceUseDTO dto) {
+        //获取设备信息
+        TrialDeviceInfo trialDeviceInfo = trialDeviceInfoMapper.selectById(dto.getDeviceInfoId());
+        if (ObjectUtil.isNotEmpty(trialDeviceInfo.getDeviceModel())) {
+            dto.setDeviceModel(trialDeviceInfo.getDeviceModel());
+        }
+        if (ObjectUtil.isNotEmpty(trialDeviceInfo.getFactoryNumber())) {
+            dto.setFactoryNumber(trialDeviceInfo.getFactoryNumber());
+        }
+        TrialDeviceUse trialDeviceUse = BeanUtil.copyProperties(dto, TrialDeviceUse.class);
+        assert trialDeviceUse != null;
+        return this.saveOrUpdate(trialDeviceUse);
     }
 
     @Override

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSampleInfoServiceImpl.java

@@ -160,7 +160,7 @@ public class TrialSampleInfoServiceImpl extends BaseServiceImpl<TrialSampleInfoM
     }
 
     @Override
-    public void importSample(List<TrialSampleInfoExcel> data, Boolean isCovered, Long contractId) {
+    public void importSample(List<TrialSampleInfoExcel> data, Boolean isCovered, Long contractId, Long nodeId) {
         List<TrialSampleInfo> list = new ArrayList<>();
         if (ObjectUtil.isEmpty(SecureUtil.getUserId())) {
             throw new ServiceException("获取用户信息失败");
@@ -170,6 +170,7 @@ public class TrialSampleInfoServiceImpl extends BaseServiceImpl<TrialSampleInfoM
             assert trialSampleInfo != null;
             trialSampleInfo.setUserId(SecureUtil.getUserId());
             trialSampleInfo.setContractId(contractId);
+            trialSampleInfo.setNodeId(nodeId);
             list.add(trialSampleInfo);
         });
         if (isCovered) {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ContractInfoController.java

@@ -333,7 +333,6 @@ public class ContractInfoController extends BladeController {
         return R.fail("保存失败");
     }
 
-
     /**
      * 项目分配用户删除
      */
@@ -403,7 +402,6 @@ public class ContractInfoController extends BladeController {
         return R.fail("操作失败");
     }
 
-
     /**
      * 保存或修改分配合同段wbs树
      */