update

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java

@@ -77,8 +77,7 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     @Operation(summary = "试验管理-分页列表查询")
     @GetMapping(value = "/list")
     //    @PermissionData(pageComponent="experiment/manage/ExperimentList")
-    public Result<IPage<Experiment>> queryPageList(Experiment experiment,
+    public Result<IPage<Experiment>> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                    HttpServletRequest req) {
         QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap());
@@ -278,6 +277,16 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         return Result.OK("复制成功!");
     }
 
+    @AutoLog(value = "试验管理-完成试验")
+    @Operation(summary = "试验管理-完成试验")
+    @PostMapping(value = "/complete")
+    public Result<String> complete(@RequestParam(name = "id", required = true) String id) {
+        Experiment experiment = experimentService.getById(id);
+        experiment.setStatus(ExperimentStatus.COMPLETED);
+        experimentService.updateById(experiment);
+        return Result.OK("试验已完成!");
+    }
+
     /**
      * 批量删除
      *

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java

@@ -297,7 +297,6 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
         Experiment experiment = new Experiment();
         experiment.setId(report.getExperimentId());
         if (StringUtils.equals(report.getStatus(), ExperimentReportStatus.PASSED)) {
-            experiment.setStatus(ExperimentStatus.COMPLETED);
             experimentDocService.generate(report.getExperimentId(), ExperimentDocType.sybg.getType());
         } else if (StringUtils.equals(report.getStatus(), ExperimentReportStatus.REJECT)) {
             experiment.setStatus(ExperimentStatus.PROGRESSING);

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java

@@ -1,21 +1,17 @@
 package org.jeecg.modules.database.entity;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.apache.commons.lang3.StringUtils;
-import org.jeecg.modules.database.constant.ExperimentStatus;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @Description: 试验管理
@@ -36,54 +32,54 @@ public class Experiment implements Serializable {
      */
     @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
-    private String id;
+    private String                             id;
     /**
      * 创建人
      */
     @Schema(description = "创建人")
-    private String createBy;
+    private String                             createBy;
     /**
      * 创建日期
      */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建日期")
-    private Date   createTime;
+    private Date                               createTime;
     /**
      * 更新人
      */
     @Schema(description = "更新人")
-    private String updateBy;
+    private String                             updateBy;
     /**
      * 更新日期
      */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新日期")
-    private Date   updateTime;
+    private Date                               updateTime;
     /**
      * 所属部门
      */
     @Schema(description = "所属部门")
-    private String sysOrgCode;
+    private String                             sysOrgCode;
     /**
      * 试验编号
      */
     @Excel(name = "试验编号", width = 15)
     @Schema(description = "试验编号")
-    private String experimentNo;
+    private String                             experimentNo;
     /**
      * 名称
      */
     @Excel(name = "名称", width = 15)
     @Schema(description = "名称")
-    private String name;
+    private String                             name;
     /**
      * 试验类型
      */
     @Excel(name = "试验类型", width = 15)
     @Schema(description = "试验类型")
-    private String type;
+    private String                             type;
     /**
      * 试验日期
      */
@@ -91,7 +87,7 @@ public class Experiment implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "试验开始日期")
-    private Date   startDate;
+    private Date                               startDate;
     /**
      * 试验日期
      */
@@ -99,65 +95,59 @@ public class Experiment implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "试验结束日期")
-    private Date   endDate;
+    private Date                               endDate;
     /**
      * 辐射源类型
      */
     @Excel(name = "辐射源类型", width = 15)
     @Schema(description = "辐射源类型")
-    private String radiationSourceType;
+    private String                             radiationSourceType;
     /**
      * 委托方名称
      */
     @Excel(name = "委托方名称", width = 15)
     @Schema(description = "委托方名称")
-    private String clientName;
+    private String                             clientName;
     /**
      * 样品型号
      */
     @Excel(name = "样品型号", width = 15)
     @Schema(description = "样品型号")
-    private String sampleModel;
+    private String                             sampleModel;
     /**
      * 试验负责人
      */
     @Excel(name = "试验负责人", width = 15)
     @Schema(description = "试验负责人")
-    private String supervisor;
+    private String                             supervisor;
     /**
      * 状态
      */
     @Excel(name = "状态", width = 15)
     @Schema(description = "状态")
-    private String status;
+    private String                             status;
-
     /**
      * 样品信息
      */
     @Excel(name = "样品信息", width = 15)
     @Schema(description = "样品信息")
-    private String sampleInfo;
+    private String                             sampleInfo;
-
     @TableField(exist = false)
-    private List<ExperimentSampleInfo> sampleInfoList;
+    private List<ExperimentSampleInfo>         sampleInfoList;
-
     /**
      * 辐照板
      */
     @Excel(name = "辐照板", width = 15)
     @Schema(description = "辐照板")
-    private String irradiationBoard;
+    private String                             irradiationBoard;
-
     @TableField(exist = false)
-    private List<ExperimentIrradiationBoard> irradiationBoardList;
+    private List<ExperimentIrradiationBoard>   irradiationBoardList;
-
     /**
      * 偏置条件
      */
     @Excel(name = "偏置条件", width = 15)
     @Schema(description = "偏置条件")
-    private String deviationCondition;
+    private String                             deviationCondition;
-
     @TableField(exist = false)
     private List<ExperimentDeviationCondition> deviationConditionList;
     /**
@@ -166,7 +156,9 @@ public class Experiment implements Serializable {
     @Excel(name = "加偏设备", width = 15)
     @Schema(description = "加偏设备")
     private String                             deviationEquipment;
-
+    /**
+     * 加偏设备
+     */
     @TableField(exist = false)
     private List<ExperimentDeviationEquipment> deviationEquipmentList;
     /**
@@ -175,24 +167,27 @@ public class Experiment implements Serializable {
     @Excel(name = "复制次数", width = 15)
     @Schema(description = "复制次数")
     private Integer                            copyCount;
-
+    /**
+     * 试验文件
+     */
+    @Excel(name = "试验文件", width = 15)
+    @Schema(description = "试验文件")
+    private String                             files;
     /**
      * 试验人员ID, 逗号分割多个
      */
     @TableField(exist = false)
-    private String experimentUser;
+    private String                             experimentUser;
-
     /**
      * 试验负责人
      */
     @TableField(exist = false)
-    private String supervisorName;
+    private String                             supervisorName;
-
     /**
      * 试验人员
      */
     @TableField(exist = false)
-    private List<ExperimentUser> experimentUserList;
+    private List<ExperimentUser>               experimentUserList;
     //
     //public void addCopyCount() {
     //    if (Objects.isNull(copyCount)) {
@@ -201,5 +196,4 @@ public class Experiment implements Serializable {
     //    setCopyCount(copyCount + 1);
     //}
 
-
 }

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReport.java

@@ -113,9 +113,13 @@ public class ExperimentReport implements Serializable {
      * 状态
      */
     @Excel(name = "状态", width = 15)
-    @Schema(description = "状态(申请中(待校对):INIT,不合格:REJECT ,校对通过(待审核)：PROOFREAD_PASS,审核通过(待批准)：AUDIT_PASS，批准通过：PASSED)")
+    @Schema(description = "状态(申请中待校对:INIT,不合格:REJECT ,校对通过待审核：PROOFREAD_PASS,审核通过待批准：AUDIT_PASS，批准通过：PASSED)")
     private String status;
 
+    @Excel(name = "审批意见", width = 15)
+    @Schema(description = "审批意见")
+    private String memo;
+
     @TableField(exist = false)
     private String fileUrl;
 }

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/IrradiationStandards.java

@@ -85,6 +85,21 @@ public class IrradiationStandards implements Serializable {
     @Excel(name = "退火时长", width = 15)
     @Schema(description = "退火时长")
     private String annealTimes;
+
+    /**
+     * 室温退火温度
+     */
+    @Excel(name = "室温退火温度", width = 15)
+    @Schema(description = "室温退火温度")
+    private String roomAnnealTemperature;
+
+    /**
+     * 加速退火温度
+     */
+    @Excel(name = "加速退火温度", width = 15)
+    @Schema(description = "加速退火温度")
+    private String acceleratedAnnealTemperature;
+
     /**
      * 辐射源
      */