diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 36a4f77..a3b1b31 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -229,7 +229,7 @@ public interface BaseRepository extends JpaReposito public int deleteWeaklyByProperties(String[] propNames, Object[] objValues,String username); /** - * 更新有效无效状态 + * 更新启用禁用 * @return count */ public int updateValidStatusById(ID id,int status,String username); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index b606733..5d7b764 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -884,7 +884,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where model." + propName + " in(:"+propName+") "; Query query = entityManager.createQuery(hql); - query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue()); + query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); query.setParameter("modifyUser",username); query.setParameter("modifyDatetime",getNowTime(true)); query.setParameter(propName, Arrays.asList(propValues)); @@ -908,7 +908,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query query = entityManager.createQuery(sb.toString()); query.setParameter("modifyUser",username); query.setParameter("modifyDatetime",getNowTime(true)); - query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue()); + query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); setParameter(query,propName,propValue); @@ -934,7 +934,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } /** - * 批量弱删除 + * 批量禁用 * @return */ @Override @@ -956,7 +956,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } /** - * 批量弱删除 + * 批量禁用 * @return */ @Override diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepository.java similarity index 82% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepository.java index 40478e5..7d24900 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface BasCustomerRepositry extends BaseRepository { +public interface BasCustomerRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepository.java similarity index 81% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepository.java index cab9915..cae338f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface WmsShippingFlagRepositry extends BaseRepository { +public interface WmsShippingFlagRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java similarity index 83% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java index c61fec7..776cec3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface WmsZonesRepositry extends BaseRepository { +public interface WmsZonesRepository extends BaseRepository { }