diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryBaseEO.java index c29c773dc..564f3c378 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryBaseEO.java @@ -92,4 +92,8 @@ public class AuthDummyInventoryBaseEO implements Serializable { /**升版说明*/ @ApiModelProperty(value = "升版说明") private String upgradeExplanation; + + // 是否升级 1是2否 + @TableField(exist = false) + private String upgradeOrNot; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java index 593bd08c9..86e077a74 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java @@ -13,15 +13,9 @@ import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; -import com.jero.modules.authDummy.entity.AuthDummyContentChangeEO; -import com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO; -import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; -import com.jero.modules.authDummy.entity.AuthDummyReadEO; +import com.jero.modules.authDummy.entity.*; import com.jero.modules.authDummy.mapper.AuthDummyInventoryBaseEOMapper; -import com.jero.modules.authDummy.service.IAuthDummyContentChangeEOService; -import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService; -import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; -import com.jero.modules.authDummy.service.IAuthDummyReadEOService; +import com.jero.modules.authDummy.service.*; import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; import com.jero.modules.dummy.entity.DummyContentChangeEO; import com.jero.modules.dummy.entity.DummyInventoryBaseEO; @@ -31,6 +25,9 @@ import com.jero.modules.dummy.enums.InventoryStateEnum; import com.jero.modules.dummy.enums.ReadFlagEnum; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.vo.FeishuMsgVo; +import com.jero.modules.log.entity.MarketListVersionUpdateLogEO; +import com.jero.modules.log.enums.ListTypeEnum; +import com.jero.modules.log.service.IMarketListVersionUpdateLogEOService; import com.jero.modules.system.entity.SysAnnouncement; import com.jero.modules.system.service.ISysAnnouncementService; import com.jero.modules.system.service.ISysUserService; @@ -94,6 +91,11 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl wrapper =new LambdaQueryWrapper<>(); wrapper.in(AuthDummyContentChangeEO::getConnectId,authDummyInventoryBaseEO.getId()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java index ba2e5cafd..495f89dde 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java @@ -102,4 +102,8 @@ public class DummyInventoryBaseEO implements Serializable { /**升版说明*/ @ApiModelProperty(value = "升版说明") private String upgradeExplanation; + + // 是否升级 1是2否 + @TableField(exist = false) + private String upgradeOrNot; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 1aa9f146f..23e81a068 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -30,6 +30,9 @@ import com.jero.modules.dummy.service.IDummyReadEOService; import com.jero.modules.dummy.vo.VirtualCreaterVo; import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.log.entity.MarketListVersionUpdateLogEO; +import com.jero.modules.log.enums.ListTypeEnum; +import com.jero.modules.log.service.IMarketListVersionUpdateLogEOService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.entity.SysAnnouncement; @@ -105,6 +108,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl发布 2-->撤回 //撤回需要发消息 - if(InventoryStateEnum.ISSUE.getValue().equals(dummyInventoryBaseEO.getState())){ + if(InventoryStateEnum.ISSUE.getValue().equals(dummyInventoryBaseEO.getState()) && StringUtils.equals(dummyInventoryBaseEO.getUpgradeOrNot(),"1")){ //先判断第一次发布的时候是否保存过数据 LambdaQueryWrapper wrapper =new LambdaQueryWrapper<>(); wrapper.in(DummyContentChangeEO::getConnectId,dummyInventoryBaseEO.getId());