市场法规清单编号修改

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardMapper.java

@@ -21,6 +21,13 @@ public interface LawsMarketStandardMapper extends BaseMapper<LawsMarketStandard>
     IPage<LawsMarketStandard> queryByPage(Page<LawsMarketStandard> page, @Param(Constants.WRAPPER) QueryWrapper<LawsMarketStandard> queryWrapper);
 
     List<LawsMarketStandard> queryByPage(@Param(Constants.WRAPPER) QueryWrapper<LawsMarketStandard> queryWrapper);
+
+    /**
+     *  获取最大编号
+     * @param str
+     * @return
+     */
+    String getOneByManifestNo(String str);
 }
 
 

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml

@@ -43,4 +43,7 @@
         left join sys_user as u on u.id = ms.author
             ${ew.customSqlSegment}
     </select>
+    <select id="getOneByManifestNo" resultType="java.lang.String">
+        select max(manifest_no) as manifest_no from laws_market_standard where manifest_no like CONCAT(#{str},'%')
+    </select>
 </mapper>

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java

@@ -155,14 +155,11 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     private String generateManifestNo(String country) {
         // 生成清单编号
         String s = "BZFG-" + country.replace(",","") + "-";
-        QueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new QueryWrapper<>();
+        String manifestNo = marketStandardMapper.getOneByManifestNo(s);
-        queryLawsMarketStandard.select("max(manifest_no) as manifest_no");
+        if(StringUtils.isBlank(manifestNo)){
-        queryLawsMarketStandard.likeRight("manifest_no",s);
-        LawsMarketStandard lawsMarketStandard = getOne(queryLawsMarketStandard,false);
-        if(Objects.isNull(lawsMarketStandard)){
             return s + "01";
         }
-        String num = lawsMarketStandard.getManifestNo().substring(lawsMarketStandard.getManifestNo().length() - 2);
+        String num = manifestNo.substring(manifestNo.length() - 2);
         int m = Integer.parseInt(num);
         return s + (m >= 10 ? (m + 1) : "0" + (m + 1));
     }