Переглянути джерело

fix 数据确认未插入试验类型异常

32197351@qq.com 2 роки тому
батько
коміт
e7cf062c1a

+ 2 - 1
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/entity/ItdmGongdanShuju.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import io.swagger.annotations.ApiModel;
@@ -60,7 +61,7 @@ public class ItdmGongdanShuju implements Serializable {
     private java.lang.String woId;
 	/**试验类型*/
 	//@Excel(name = "试验类型", width = 15, dicCode = "shiiyan_type")
-	//@Dict(dicCode = "shiiyan_type")
+	@Dict(dicCode = "shiiyan_type")
     @ApiModelProperty(value = "试验类型")
     private java.lang.String shiyanType;
 	/**试验开始时间*/

+ 2 - 0
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/service/impl/ItdmGongdanShujuServiceImpl.java

@@ -50,6 +50,8 @@ public class ItdmGongdanShujuServiceImpl extends ServiceImpl<ItdmGongdanShujuMap
             int l = (int) (betweenMinute / Integer.parseInt(itdmGongdanDto.getPinci()));
             for (int i = 1; i <= l; i++) {
                 ItdmGongdanShuju itdmGongdanShuju = new ItdmGongdanShuju();
+                itdmGongdanShuju.setShiyanType(itdmGongdanDto.getShiyanType());
+                itdmGongdanShuju.setPinci(itdmGongdanDto.getPinci());
                 itdmGongdanDetail.setId(null);
                 BeanUtils.copyProperties(itdmGongdanDetail, itdmGongdanShuju);
                 itdmGongdanShuju.setShiyanTime(DateUtil.offsetMinute(date1, i *  Integer.parseInt(itdmGongdanDto.getPinci())).toString().split(" ")[1]);