From 29252eb42f3f17f9d52d89d7f56578d6dab1b99e Mon Sep 17 00:00:00 2001 From: cy <1664593601@qq.com> Date: 星期一, 30 十月 2023 13:46:44 +0800 Subject: [PATCH] feat: 更改数据库 --- consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 56 insertions(+), 1 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java index 5ac7972..e493eaa 100644 --- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java +++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java @@ -3,10 +3,13 @@ import com.consum.base.Constants; import com.consum.base.core.param.BaseWarehouseParam1; import com.consum.base.pojo.LWhFormOutputParam; +import com.consum.base.pojo.LWhFormProcureParam; import com.consum.base.util.IdUtil; import com.consum.model.po.*; import com.iplatform.model.po.S_user_core; +import com.walker.db.page.GenericPager; import com.walker.infrastructure.utils.DateUtils; +import com.walker.infrastructure.utils.StringUtils; import com.walker.jdbc.service.BaseServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -14,6 +17,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.util.CollectionUtils; +import java.util.HashMap; import java.util.List; /** @@ -34,7 +38,10 @@ @Autowired private LWhFormOutputCoreService lWhFormOutputCoreService; -// /** + private static String QUERY_FORM_OUTPUT_LIST = "SELECT * FROM l_wh_form_output WHERE 1 = 1"; + + + // /** // * @Description 鏂板鍑哄簱鍗� // * @Author 鍗㈠簡闃� // * @Date 2023/10/27 @@ -201,4 +208,52 @@ return 1; } + + /** + * @Description 鍒楄〃鏌ヨ + * @Author 鍗㈠簡闃� + * @Date 2023/10/30 + */ + public GenericPager queryFormOutputList(LWhFormOutputParam param) { + HashMap<String, Object> paramts = new HashMap<>(); + StringBuilder sql = new StringBuilder(QUERY_FORM_OUTPUT_LIST); + //鍑哄簱鍗曞彿 + if (!StringUtils.isEmpty(param.getBusinessFormCode())) { + sql.append(" and BUSINESS_FORM_CODE like :businessFormCode "); + paramts.put("businessFormCode", StringUtils.CHAR_PERCENT + param.getBusinessFormCode() + StringUtils.CHAR_PERCENT); + } + //鐗╁搧鍚嶇О + if (!StringUtils.isEmpty(param.getGoodsTemplateName())) { + sql.append(" AND id IN (SELECT BUSINESS_ID FROM L_WH_PROCURE_MODEL procureModel LEFT JOIN BASE_GOODS_MODELS baseModel ON procureModel.BASE_GOODS_MODELS_ID=baseModel.ID LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseModel.GOODS_TEMPLATES_ID=baseTemp.id WHERE procureModel.BUSINESS_TYPE=1 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)"); + paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT); + } + //鏈烘瀯 + if (param.getAgencyId() != null){ + sql.append(" and AGENCY_ID like :agencyId "); + paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT); + } + //鍒涘缓浜� + if (!StringUtils.isEmpty(param.getOperatorName())) { + sql.append(" and operator_name =:operator_name "); + paramts.put("operator_name", param.getOperatorName()); + } + //鐘舵�� + if (param.getStates() != null) { + sql.append(" and states =:states "); + paramts.put("states", param.getStates()); + } + //鍑哄簱鏃堕棿 + if (param.getOutputTimeStart() != null) { + sql.append(" and DEAL_TIME >=:outputTimeStart "); + paramts.put("outputTimeStart", param.getOutputTimeStart() * 1000000); + } + if (param.getOutputTimeEnd() != null) { + sql.append(" and DEAL_TIME <:outputTimeEnd "); + paramts.put("outputTimeEnd", param.getOutputTimeEnd() * 1000000 + 240000); + } + + sql.append(" ORDER BY DEAL_TIME DESC"); + GenericPager genericPager = selectSplit(sql.toString(), paramts, new LWhFormOutput()); + return genericPager; + } } -- Gitblit v1.9.1