WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

市场法规、认证清单，订阅增加版本更新记录信息。

Browse Source
This commit is contained in:
wangzhijiang
2023-04-24 14:46:11 +08:00
parent 2cde427c9f
commit e38ab19d4b
4 changed files with 53 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryBaseEO.java
+4
View File
@@ -92,4 +92,8 @@ public class AuthDummyInventoryBaseEO implements Serializable {
/**升版说明*/
@ApiModelProperty(value = "升版说明")
private String upgradeExplanation;
// 是否升级 1是2否
@TableField(exist = false)
private String upgradeOrNot;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java
+25 -9
View File
@@ -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<AuthDummyIn
@Resource
private IFeishuService iFeishuService;
@Autowired
private IMarketListVersionUpdateLogEOService marketListVersionUpdateLogEOService;
@Autowired
private IAuthDummyLogService authDummyLogService;
/**
* 保存
*
@@ -258,10 +260,24 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl<AuthDummyIn
baseWrapper.set("update_by",sysUser.getUsername())
.set("update_time",now);
}
if(org.apache.commons.lang3.StringUtils.equals(authDummyInventoryBaseEO.getUpgradeOrNot(),"1")){
String upgradeExplanation = authDummyInventoryBaseEO.getUpgradeExplanation();
String versionNum = authDummyInventoryBaseEO.getVersionNum();
baseWrapper.set("upgrade_explanation",upgradeExplanation);
baseWrapper.set("version_num",versionNum);
// 将数据添加到市场清单版本更新log中。
MarketListVersionUpdateLogEO mlvLogEo = new MarketListVersionUpdateLogEO();
mlvLogEo.setListId(authDummyInventoryBaseEO.getId());
mlvLogEo.setVersionNum(versionNum);
mlvLogEo.setUpgradeExplanation(upgradeExplanation);
mlvLogEo.setListType(ListTypeEnum.MARKET_CERTIFICATION_LIST.getValue());
this.marketListVersionUpdateLogEOService.add(mlvLogEo);
}
baseWrapper.eq("id",authDummyInventoryBaseEO.getId());
authDummyInventoryBaseEOMapper.update(null,baseWrapper);
if(InventoryStateEnum.ISSUE.getValue().equals(authDummyInventoryBaseEO.getState())){
if(InventoryStateEnum.ISSUE.getValue().equals(authDummyInventoryBaseEO.getState()) && org.apache.commons.lang3.StringUtils.equals(authDummyInventoryBaseEO.getUpgradeOrNot(),"1")){
//先判断第一次发布的时候是否保存过数据
LambdaQueryWrapper<AuthDummyContentChangeEO> wrapper =new LambdaQueryWrapper<>();
wrapper.in(AuthDummyContentChangeEO::getConnectId,authDummyInventoryBaseEO.getId());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java
+4
View File
@@ -102,4 +102,8 @@ public class DummyInventoryBaseEO implements Serializable {
/**升版说明*/
@ApiModelProperty(value = "升版说明")
private String upgradeExplanation;
// 是否升级 1是2否
@TableField(exist = false)
private String upgradeOrNot;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+20 -1
View File
@@ -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<DummyInventoryB
private DummyLogEOServiceImpl dummyLogEOService;
@Autowired
private DummyInventoryBaseEOMapper dummyInventoryBaseEOMapper;
@Autowired
private IMarketListVersionUpdateLogEOService marketListVersionUpdateLogEOService;
/**
* 保存
@@ -346,6 +351,20 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
baseWrapper.set("update_by",sysUser.getUsername())
.set("update_time",now);
}
if(StringUtils.equals(dummyInventoryBaseEO.getUpgradeOrNot(),"1")){
String upgradeExplanation = dummyInventoryBaseEO.getUpgradeExplanation();
String versionNum = dummyInventoryBaseEO.getVersionNum();
baseWrapper.set("upgrade_explanation",upgradeExplanation);
baseWrapper.set("version_num",versionNum);
// 将数据添加到市场清单版本更新log中。
MarketListVersionUpdateLogEO mlvLogEo = new MarketListVersionUpdateLogEO();
mlvLogEo.setListId(dummyInventoryBaseEO.getId());
mlvLogEo.setVersionNum(versionNum);
mlvLogEo.setUpgradeExplanation(upgradeExplanation);
mlvLogEo.setListType(ListTypeEnum.MARKET_REGULATION_LIST.getValue());
this.marketListVersionUpdateLogEOService.add(mlvLogEo);
}
baseWrapper.eq("id",dummyInventoryBaseEO.getId());
dummyInventoryBaseEOMapper.update(null,baseWrapper);
// this.updateById(dummyInventoryBaseEO);
@@ -361,7 +380,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
//先判断是发布还是撤回 1-->发布 2-->撤回
//撤回需要发消息
if(InventoryStateEnum.ISSUE.getValue().equals(dummyInventoryBaseEO.getState())){
if(InventoryStateEnum.ISSUE.getValue().equals(dummyInventoryBaseEO.getState()) && StringUtils.equals(dummyInventoryBaseEO.getUpgradeOrNot(),"1")){
//先判断第一次发布的时候是否保存过数据
LambdaQueryWrapper<DummyContentChangeEO> wrapper =new LambdaQueryWrapper<>();
wrapper.in(DummyContentChangeEO::getConnectId,dummyInventoryBaseEO.getId());