Merge branch 'dev' into pre-production

blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java

@@ -13,7 +13,6 @@ import org.springblade.core.transaction.annotation.SeataCloudApplication;
  * @author lmy
  */
 @BladeCloudApplication
-@SeataCloudApplication
 public class BasicApplication {
 
 	public static void main(String[] args) {

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java

@@ -13,7 +13,6 @@ import org.springblade.core.transaction.annotation.SeataCloudApplication;
  */
 
 @BladeCloudApplication
-@SeataCloudApplication
 public class BasicDataApplication {
 
 	public static void main(String[] args) {

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java

@@ -3456,6 +3456,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 					} catch (Exception e) {
 						rowMessage.append("生效时间格式错误,例:2020-01-01；");
 					}
+				} else {
+					rowMessage.append("生效时间不能为空");
 				}
 				if (StrUtil.isNotEmpty(priceExcel.getExpiryTime())) {
 					// 校验是否为日期格式
@@ -3464,6 +3466,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 					} catch (Exception e) {
 						rowMessage.append("到期时间格式错误,例:2020-01-01；");
 					}
+				} else {
+					rowMessage.append("到期时间不能为空");
 				}
 				if (!ObjectUtil.isAllEmpty(startTime, endTime)) {
 					// 校验时间大小关系

blade-service/logpm-business/src/main/java/com/logpm/business/BusinessApplication.java

@@ -7,7 +7,6 @@ import org.springblade.core.launch.BladeApplication;
 import org.springblade.core.transaction.annotation.SeataCloudApplication;
 
 @BladeCloudApplication
-@SeataCloudApplication
 public class BusinessApplication {
 
 	public static void main(String[] args) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java

@@ -27,7 +27,6 @@ import org.springblade.core.transaction.annotation.SeataCloudApplication;
  * @author Chill
  */
 @BladeCloudApplication
-@SeataCloudApplication
 public class DistributionApplication {
 
 	public static void main(String[] args) {

blade-service/logpm-report/src/main/java/com/logpm/report/util/QueryUtil.java

@@ -9,6 +9,7 @@ import com.logpm.report.constant.ReportConstants;
 import org.springblade.core.mp.support.Condition;
 
 import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -28,8 +29,13 @@ public class QueryUtil {
 	 * @return
 	 */
 	public static QueryWrapper buildQueryWrapper(Object vo, Class classz) {
-		Map<String, Object> stringObjectMap = BeanUtil.beanToMap(vo);
-		return Condition.getQueryWrapper(stringObjectMap, classz);
+		Map<String, Object> stringObjectMap = BeanUtil.beanToMap(vo, new LinkedHashMap<>(), true, false);
+		Map<String, Object> result = new LinkedHashMap<>();
+		for (Map.Entry<String, Object> entry : stringObjectMap.entrySet()) {
+			String keyWithSuffix = entry.getKey() + "_equal";
+			result.put(keyWithSuffix, entry.getValue());
+		}
+		return Condition.getQueryWrapper(result, classz);
 	}
 
 	/**

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/WarehouseApplication.java

@@ -27,7 +27,6 @@ import org.springblade.core.transaction.annotation.SeataCloudApplication;
  * @author Chill
  */
 @BladeCloudApplication
-@SeataCloudApplication
 public class WarehouseApplication {
 
 	public static void main(String[] args) {

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/QuestDetailServiceImpl.java

@@ -22,6 +22,7 @@ import com.logpm.warehouse.vo.QuestDetailVO;
 import com.logpm.warehouse.excel.QuestDetailExcel;
 import com.logpm.warehouse.mapper.QuestDetailMapper;
 import com.logpm.warehouse.service.IQuestDetailService;
+import org.springblade.system.cache.DictBizCache;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,6 +50,7 @@ public class QuestDetailServiceImpl extends BaseServiceImpl<QuestDetailMapper, Q
 		//questDetailList.forEach(questDetail -> {
 		//	questDetail.setTypeName(DictCache.getValue(DictEnum.YES_NO, QuestDetail.getType()));
 		//});
+
 		return questDetailList;
 	}