diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 7c873aae..5f595547 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -288,6 +288,14 @@ public class UdiRelevanceController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + //更新关联表 + if(udiRelevanceSaveRequest.getIsDateBy()!=null && udiRelevanceSaveRequest.getIsDateBy()==1){ + if(udiRelevanceSaveRequest.getRecentDateTime()!=null){ + int time=udiRelevanceSaveRequest.getRecentDateTime()*24; + udiRelevanceSaveRequest.setRecentDateTime(time); + } + } + //更新关联表 UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); BeanUtils.copyProperties(udiRelevanceSaveRequest, udiRelevanceEntity); diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index bdb0291f..4a6462c1 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -162,5 +162,9 @@ public class UdiRelevanceEntity { @TableField(value = "dispatch") private boolean dispatch; @TableField(value = "groupBuy") //是否可配送 - private boolean groupBuy; //是否集采产品 + private boolean groupBuy; + //是否集采产品 + @TableField(value = "isDateBy") + private Integer isDateBy; + } diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index ba64bc0b..1b8dc694 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -85,10 +85,17 @@ public class UdiRelevanceSaveRequest { private String price; private Integer useExpireTime; + private Integer lowStockNum; + private Integer overStockNum; + private Integer recentDateTime; + private Integer isDateBy; + private String relCode; + //关联修改提交:true;单独提交:false private Boolean relSubmit; + private boolean dispatch; //是否可配送 private boolean groupBuy; //是否集采产品 diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 05863e49..d5c6ed61 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -90,6 +90,11 @@ public class UdiRelevanceResponse { private Integer useExpireTime; + private Integer lowStockNum; + private Integer overStockNum; + private Integer recentDateTime; + private Integer isDateBy; + private String relCode; //关联查询字典 private String unitFk; //供应商ID diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 080f26e5..7dab6bea 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -746,6 +746,21 @@ groupBuy=#{groupBuy}, + + lowStockNum=#{lowStockNum}, + + + overStockNum=#{overStockNum}, + + + recentDateTime=#{recentDateTime}, + + + isDateBy=#{isDateBy}, + + + relCode=#{relCode}, + WHERE id = #{id}