市场法规清单-历史版本

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java

@@ -32,7 +32,8 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper<ParamsCollectM
     List<ParamsCollectManifestEO> queryByParamManifestId(@Param("paramsManifestId") String paramsManifestIdString);
 
     IPage selectpage(@Param("page")  IPage page, @Param("sqlJoin") String sqlJoin, @Param("paramsManifestEO")ParamsManifestEO paramsManifestEO);
-    List<ParamsCollectManifestEO> selectList(@Param("sqlJoin") String sqlJoin, @Param("paramsManifestEO")ParamsManifestEO paramsManifestEO);
+
+    List<ParamsCollectManifestEO> getListInfo(@Param("sqlJoin") String sqlJoin, @Param("paramsManifestEO")ParamsManifestEO paramsManifestEO);
 
     List<ParamsCollectManifestEO> queryByProjectId(@Param("projectId") String projectId);
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml

@@ -149,7 +149,7 @@
              ) temp
          ${sqlJoin}
     </select>
-    <select id="selectList" resultMap="ParamsCollectManifestEOResultMap">
+    <select id="getListInfo" resultMap="ParamsCollectManifestEOResultMap">
         select *
         from (
                  select pcm.*

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -826,7 +826,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                 }
             }
         }
-        List<ParamsCollectManifestEO> paramsCollectManifestEOS = paramsCollectManifestEOMapper.selectList(sqlJoinSb.toString(), paramsManifestEO);// 查询固定列
+        List<ParamsCollectManifestEO> paramsCollectManifestEOS = paramsCollectManifestEOMapper.getListInfo(sqlJoinSb.toString(), paramsManifestEO);// 查询固定列
 //        IPage pageInfo = paramsCollectManifestEOMapper.selectpage(page, sqlJoinSb.toString(), paramsManifestEO); // 查询固定列
 //        List<ParamsCollectManifestEO> list = pageInfo.getRecords(); // 查询固定列
         List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoHistoryEO.java

@@ -243,6 +243,9 @@ public class DummyInventoryInfoHistoryEO implements Serializable {
     @ApiModelProperty(value = "责任部门")
     private java.lang.String dutyDepart;
 
+    @ApiModelProperty(value = "市场清单版本更新log表id")
+    private java.lang.String marketListVersionUpdateLogId;
+
     @TableField(exist = false)
     private String xin1Che1Xing2Shi2Shi1Ri4Qi1String;
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java

@@ -356,6 +356,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
             baseWrapper.set("update_by",sysUser.getUsername())
                     .set("update_time",now);
         }
+        MarketListVersionUpdateLogEO mlvLogEo = new MarketListVersionUpdateLogEO();
         if(StringUtils.equals(dummyInventoryBaseEO.getUpgradeOrNot(), YesOrNoEnum.YES.getValue())){
             String upgradeExplanation = dummyInventoryBaseEO.getUpgradeExplanation();
             String versionNum = dummyInventoryBaseEO.getVersionNum();
@@ -363,7 +364,6 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
             baseWrapper.set("version_num",versionNum);
 
             // 将数据添加到市场清单版本更新log中。
-            MarketListVersionUpdateLogEO mlvLogEo = new MarketListVersionUpdateLogEO();
             mlvLogEo.setListId(dummyInventoryBaseEO.getId());
             mlvLogEo.setVersionNum(versionNum);
             mlvLogEo.setUpgradeExplanation(upgradeExplanation);
@@ -385,6 +385,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     DummyInventoryInfoHistoryEO dummyInventoryInfoHistoryEO = new DummyInventoryInfoHistoryEO();
                     BeanUtils.copyProperties(dummyInventoryInfoEO,dummyInventoryInfoHistoryEO);
                     dummyInventoryInfoHistoryEO.setId(UUID.randomUUID().toString().replace("-", ""));
+                    dummyInventoryInfoHistoryEO.setMarketListVersionUpdateLogId(mlvLogEo.getId());
                     dummyInventoryInfoHistoryEOList.add(dummyInventoryInfoHistoryEO);
                 }
                 dummyInventoryInfoHistoryEOService.saveBatch(dummyInventoryInfoHistoryEOList);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoHistoryEOServiceImpl.java

@@ -125,6 +125,7 @@ public class DummyInventoryInfoHistoryEOServiceImpl extends ServiceImpl<DummyInv
 	public IPage<DummyInventoryInfoHistoryEO> getPageInfo(Page<DummyInventoryInfoHistoryEO> page,DummyInventoryInfoHistoryEO dummyInventoryInfoHistoryEO) {
 		LambdaQueryWrapper<DummyInventoryInfoHistoryEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(DummyInventoryInfoHistoryEO::getDummyInventoryBaseId,dummyInventoryInfoHistoryEO.getDummyInventoryBaseId());
+		wrapper.eq(DummyInventoryInfoHistoryEO::getMarketListVersionUpdateLogId,dummyInventoryInfoHistoryEO.getMarketListVersionUpdateLogId());
 		Page<DummyInventoryInfoHistoryEO> historyEOPage = this.page(page, wrapper);
 
 		treeDict(dummyInventoryInfoHistoryEO, historyEOPage.getRecords());