Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceItemDictDao.java

@@ -34,4 +34,6 @@ import java.util.List;
 public interface IcServiceItemDictDao extends BaseDao<IcServiceItemDictEntity> {
 
     List<ServiceItemResultDTO> pageList(String customerId);
+
+    IcServiceItemDictEntity selectMax(String customerId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java

@@ -74,6 +74,7 @@ public class IcServiceItemDictServiceImpl extends BaseServiceImpl<IcServiceItemD
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void addOrUpdate(ServiceItemAddFormDTO formDTO) {
+        formDTO.setCategoryName(formDTO.getCategoryName().trim());
         //分类名称是否唯一
         LambdaQueryWrapper<IcServiceItemDictEntity> nameQuery = new LambdaQueryWrapper<>();
         nameQuery.eq(IcServiceItemDictEntity::getCustomerId, formDTO.getCustomerId())
@@ -90,10 +91,8 @@ public class IcServiceItemDictServiceImpl extends BaseServiceImpl<IcServiceItemD
             baseDao.update(null, update);
             return;
         }
-        LambdaQueryWrapper<IcServiceItemDictEntity> maxQuery = new LambdaQueryWrapper<>();
-        maxQuery.eq(IcServiceItemDictEntity::getCustomerId, formDTO.getCustomerId())
-                .orderByDesc(IcServiceItemDictEntity::getCategoryCode).last("limit 1");
-        IcServiceItemDictEntity max = baseDao.selectOne(maxQuery);
+        //如果说当前查询的编码是1022，但是库里面1023已经存在且del_flag='0'。这个时候新增的编码为1023就会报错。
+        IcServiceItemDictEntity max = baseDao.selectMax(formDTO.getCustomerId());
         // 获取编码
         IcServiceItemDictEntity insert = new IcServiceItemDictEntity();
         insert.setCustomerId(formDTO.getCustomerId());

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml

@@ -18,4 +18,17 @@
             d.SORT DESC
     </select>
 
+    <select id="selectMax" parameterType="java.lang.String" resultType="com.epmet.entity.IcServiceItemDictEntity">
+        SELECT
+            d.ID,
+            d.CATEGORY_CODE,
+            d.SORT
+        FROM
+            ic_service_item_dict d
+        WHERE
+            d.DEL_FLAG = '0'
+            AND d.CUSTOMER_ID = #{customerId}
+            order by CATEGORY_CODE desc
+            limit 1
+    </select>
 </mapper>