From d8fb6d11aa24b77b8bbcc5740140d31f5692837d Mon Sep 17 00:00:00 2001 From: cy <1664593601@qq.com> Date: 星期四, 16 十一月 2023 16:11:05 +0800 Subject: [PATCH] feat: 调拨调整 --- consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java | 272 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 225 insertions(+), 47 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java index da88dcb..80a1143 100644 --- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java +++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java @@ -2,19 +2,27 @@ import com.consum.base.core.CodeGeneratorEnum; import com.consum.base.core.CodeGeneratorService; -import com.consum.base.core.WhBusinessEnum; +import com.consum.base.core.utils.IdUtil; +import com.consum.base.core.utils.MapRowMapper; +import com.consum.base.core.utils.MapUtils; +import com.consum.base.core.utils.MapperUtil; +import com.consum.base.pojo.LWhFormTransferGoodsInfoParam; import com.consum.base.pojo.LWhFormTransferParam; -import com.consum.base.pojo.LWhProcureModelParams; -import com.consum.base.util.IdUtil; +import com.consum.base.pojo.LWhProcureModelUserParam; +import com.consum.base.pojo.LWhTransferModelParam; +import com.consum.base.pojo.query.TransferQry; +import com.consum.base.pojo.response.FormTransferGoodsVO; +import com.consum.base.pojo.response.GoodsModelVO; +import com.consum.base.pojo.response.LWHFromTransferExtendVO; import com.consum.model.po.*; import com.consum.model.vo.LWhFormOutputVo; -import com.consum.model.vo.LWhFormTransferVo; import com.consum.model.vo.LWhGoodsRecordVo; 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 org.apache.commons.compress.utils.Lists; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,6 +32,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Description 璋冩嫧绠$悊 @@ -51,32 +60,42 @@ private LWhGoodsRecordService lWhGoodsRecordService; @Autowired private BaseGoodsModelsServiceImpl baseGoodsModelsService; + @Autowired + private LWhProcureModelUserServiceImpl lWhProcureModelUserService; private static String QUERY_FORM_TRANSFER_LIST = "SELECT * FROM l_wh_form_transfer WHERE 1 = 1"; + /** * @Description 鏂板 * @Author 鍗㈠簡闃� * @Date 2023/10/30 */ - public int add(LWhFormTransferParam param, S_user_core currentUser, FinSysTenantUser sysInfo) { + public int add(LWhFormTransferParam param, FinSysTenantUser sysInfo) throws Exception { //1.鏂板璋冩嫧鍗曡褰� LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(); //璋冩嫧鍗昳d long lWhFormTransferId = IdUtil.generateId(); lWhFormTransfer.setId(lWhFormTransferId); - lWhFormTransfer.setBusinessType(0); + + Integer businessType = param.getTransferBusinessType(); + // 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為�� + // TODO 鏋氫妇瀛楀吀 + lWhFormTransfer.setBusinessType(businessType); + lWhFormTransfer.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Transfer)); Long warehouseId = param.getInWarehouseId(); lWhFormTransfer.setInWarehouseId(warehouseId); - //鏍规嵁浠撳簱id鏌ヨ浠撳簱 - BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId); + //鍏ュ簱浠撳簱涓哄綋鍓嶇敤鎴风殑榛樿浠撳簱 + String tenantId = sysInfo.getTenantId(); + BaseWarehouse warehouse = baseWarehouseService.getDefaultWarehouseByAgencyId(Long.valueOf(tenantId)); if (warehouse == null) { log.error("浠撳簱涓嶅瓨鍦�"); - return 0; + throw new Exception("浠撳簱涓嶅瓨鍦�"); } + lWhFormTransfer.setInWarehouseId(warehouse.getId()); lWhFormTransfer.setInWarehouseName(warehouse.getWarehouseName()); - lWhFormTransfer.setInAgencyId(Long.valueOf(sysInfo.getTenantId())); + lWhFormTransfer.setInAgencyId(Long.valueOf(tenantId)); lWhFormTransfer.setInAgencyName(sysInfo.getTenantName()); //鏍规嵁鏈烘瀯id鏌ヨ璋冩嫧鏈烘瀯 FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(param.getOutAgencyId())); @@ -89,64 +108,122 @@ lWhFormTransfer.setOperatorId(sysInfo.getId()); lWhFormTransfer.setOperatorName(sysInfo.getUserName()); lWhFormTransfer.setCreateTime(param.getCreateTime()); + //0=寰呭嚭搴擄紱1=寰呮帴鏀讹紱2=宸插叆搴撳簱:4=宸叉挙閿� lWhFormTransfer.setStates(0); lWhFormTransfer.setProcureDoc(param.getProcureDoc()); + + //3.褰撲笟鍔$被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉 + if (businessType == 1) { + //閮ㄩ棬鍒嗗彂绫诲瀷 鍑哄簱浠撳簱绫诲瀷0鏈烘瀯1閮ㄩ棬 + // TODO 鍑哄簱涓氬姟绫诲瀷 鑱旂郴鐢佃瘽 + lWhFormTransfer.setOutWarehouseType(1); + } int flag1 = this.insert(lWhFormTransfer); if (flag1 == 0) { log.error("鏂板璋冩嫧鍗曞け璐�"); return 0; } + //2.鏂板鐗╁搧鍨嬪彿璁板綍 - List<LWhProcureModelParams> models = param.getModels(); + List<LWhFormTransferGoodsInfoParam> transferGoods = param.getTransferGoods(); List<LWhProcureModel> modelList = new ArrayList<>(); - for (LWhProcureModelParams model : models) { - LWhProcureModel lWhProcureModel = new LWhProcureModel(); - lWhProcureModel.setId(IdUtil.generateId()); - lWhProcureModel.setBusinessType(2); - lWhProcureModel.setBusinessId(lWhFormTransferId); - lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId()); - lWhProcureModel.setCounts(model.getCounts()); - //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨 - int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0,warehouseId, model.getBaseGoodsModelsId(), (short) 1, null); - lWhProcureModel.setWorehouseCount(goodsNum); - modelList.add(lWhProcureModel); + for (LWhFormTransferGoodsInfoParam transferGoodsInfo : transferGoods) { + for (LWhTransferModelParam model : transferGoodsInfo.getModels()) { + LWhProcureModel lWhProcureModel = new LWhProcureModel(); + lWhProcureModel.setId(IdUtil.generateId()); + // 鐗╁搧鍨嬪彿涓氬姟绫诲瀷 + // 鐗╁搧绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂 + switch (businessType) { + case 0: + lWhProcureModel.setBusinessType(2); + break; + case 1: + lWhProcureModel.setBusinessType(4); + break; + default: + lWhProcureModel.setBusinessType(null); + } + lWhProcureModel.setBusinessId(lWhFormTransferId); + lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId()); + lWhProcureModel.setCounts(model.getCounts()); + //鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿 + BaseGoodsModels baseGoodsModels = this.baseGoodsModelsService.get(new BaseGoodsModels(model.getBaseGoodsModelsId())); + if (baseGoodsModels != null) { + lWhProcureModel.setBaseGoodsModelsName(baseGoodsModels.getModelName()); + } + // TODO 浠锋牸 + lWhProcureModel.setPrice(10L); + //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨 + int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, model.getBaseGoodsModelsId(), (short) 1, null); + lWhProcureModel.setWorehouseCount(goodsNum); + + //3.褰撲笟鍔$被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉 + // 鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂 + //TODO 閮ㄩ棬鍒嗗彂绫诲瀷 + if (businessType == 1) { + List<LWhProcureModelUser> procureModelUserList = Lists.newArrayList(); + for (LWhProcureModelUserParam lWhProcureModelUserParam : model.getProcureModelUserList()) { + LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser(); + lWhProcureModelUser.setId(IdUtil.generateId()); + lWhProcureModelUser.setTransBusinessId(lWhFormTransferId); + lWhProcureModelUser.setWhProcureModelId(lWhProcureModel.getId()); + lWhProcureModelUser.setBaseGoodsModelsId(model.getBaseGoodsModelsId()); + lWhProcureModelUser.setNowUserName(lWhProcureModelUserParam.getNowUserName()); + lWhProcureModelUser.setNowUserPhone(lWhProcureModelUserParam.getNowUserPhone()); + lWhProcureModelUser.setGoodsNum(lWhProcureModelUserParam.getGoodsNum()); + procureModelUserList.add(lWhProcureModelUser); + } + int procureInsertNum = lWhProcureModelUserService.insert(procureModelUserList); + if (procureInsertNum != procureModelUserList.size()) { + log.error("鏂板鐗╁搧浣跨敤淇℃伅澶辫触"); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return 0; + } + } + + modelList.add(lWhProcureModel); + } } + int flag2 = this.lWhProcureModelService.insert(modelList); if (flag2 != modelList.size()) { log.error("鏂板鐗╁搧鍨嬪彿澶辫触"); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return 0; } + return 1; } + /** - * @Description 鍒楄〃鏌ヨ + * @Description 鍒楄〃鏌ヨ * @Author 鍗㈠簡闃� * @Date 2023/10/30 */ - public GenericPager<LWhFormTransfer> queryFormTransferList(LWhFormTransferParam param) { + public GenericPager<LWhFormTransfer> queryFormTransferList(TransferQry param) { HashMap<String, Object> paramts = new HashMap<>(); StringBuilder sql = new StringBuilder(QUERY_FORM_TRANSFER_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); + sql.append(" and BUSINESS_FORM_CODE = :businessFormCode "); + paramts.put("businessFormCode", param.getBusinessFormCode()); } //鐗╁搧鍚嶇О 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)"); + 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=2 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)"); paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT); } //璋冩嫧鏈烘瀯 - if (param.getOutAgencyId() != null){ + if (param.getOutAgencyId() != null) { sql.append(" and OUT_AGENCY_ID = :OUT_AGENCY_ID "); paramts.put("OUT_AGENCY_ID", param.getOutAgencyId()); } //鎺ユ敹鏈烘瀯 - if (param.getInAgencyId() != null){ + if (param.getInAgencyId() != null) { sql.append(" and IN_AGENCY_ID = :IN_AGENCY_ID "); - paramts.put("IN_AGENCY_ID", param.getInAgencyId() ); + paramts.put("IN_AGENCY_ID", param.getInAgencyId()); } //鐘舵�� if (param.getStates() != null) { @@ -168,13 +245,13 @@ paramts.put("createTimeEnd", param.getCreateTimeEnd() * 1000000 + 240000); } //鎺ユ敹鏃堕棿 - if (param.getInTimeStart() != null) { + if (param.getStartTime() != null) { sql.append(" and IN_TIME >=:inTimeStart "); - paramts.put("inTimeStart", param.getInTimeStart() * 1000000); + paramts.put("inTimeStart", param.getStartTime() * 1000000); } - if (param.getInTimeEnd() != null) { + if (param.getEndTime() != null) { sql.append(" and IN_TIME <:inTimeEnd "); - paramts.put("inTimeEnd", param.getInTimeEnd() * 1000000 + 240000); + paramts.put("inTimeEnd", param.getEndTime() * 1000000 + 240000); } sql.append(" ORDER BY CREATE_TIME DESC"); @@ -184,27 +261,69 @@ } /** - * @Description 鏍规嵁id鏌ヨ璇︽儏 + * @Description 鏍规嵁id鏌ヨ璇︽儏 * @Author 鍗㈠簡闃� * @Date 2023/10/30 */ - public LWhFormTransferVo getById(Long id) { - LWhFormTransferVo vo = new LWhFormTransferVo(); + public LWHFromTransferExtendVO getById(Long id) { + LWHFromTransferExtendVO result = new LWHFromTransferExtendVO(); //1.鏌ヨ璋冩嫧鍗� LWhFormTransfer lWhFormTransfer = this.get(new LWhFormTransfer(id)); if (lWhFormTransfer != null) { - BeanUtils.copyProperties(lWhFormTransfer,vo); + BeanUtils.copyProperties(lWhFormTransfer, result); } - //2.鏌ヨ鐗╁搧鍨嬪彿 - List<LWhProcureModel> models = this.lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id); + + String sql = "SELECT bgt.id, CATEGORY_ID, CATEGORY_NAME, GOODS_NAME " + + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID " + + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID " + + "WHERE pm.BUSINESS_ID =:id GROUP BY bgt.id "; + Map<String, Object> paramMap = new HashMap<>(); + paramMap.put("id", result.getId()); + List<Map<String, Object>> procureModelList = lWhFormOutputService.select(sql, paramMap, new MapperUtil()); + List<FormTransferGoodsVO> formTransferGoods = Lists.newArrayList(); + for (Map<String, Object> map : procureModelList) { + FormTransferGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormTransferGoodsVO.class); + + // 鏌ヨ鍨嬪彿鏁伴噺 + List<GoodsModelVO> goodsModelVOList = Lists.newArrayList(); + String sql2 = "SELECT pm.id,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount " + + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID " + + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID " + + "WHERE pm.BUSINESS_ID =:id"; + List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, paramMap, new MapperUtil()); + modelList.forEach(item -> { + GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class); + goodsModelVOList.add(goodsModelVO); + }); + procureTemplateInfoVO.setModels(goodsModelVOList); + formTransferGoods.add(procureTemplateInfoVO); + } + result.setFormTransferGoods(formTransferGoods); + + /*//2.鏌ヨ鐗╁搧鍨嬪彿 + //List<LWhProcureModel> models = this.lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id); + List<LWhProcureModel> models = this.lWhProcureModelService.getModelByForm(null, id); + if (!CollectionUtils.isEmpty(models)) { - vo.setModels(models); - } - return vo; + List<LWhProcureModelVo> lWhProcureModelVoList = Lists.newArrayList(); + for (LWhProcureModel model : models) { + LWhProcureModelVo lWhProcureModelVo = new LWhProcureModelVo(); + BeanUtils.copyProperties(model, lWhProcureModelVo); + + LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser(); + lWhProcureModelUser.setWhProcureModelId(model.getId()); + List<LWhProcureModelUser> select = lWhProcureModelUserService.select(lWhProcureModelUser); + lWhProcureModelVo.setProcureModelUsersList(select); + lWhProcureModelVoList.add(lWhProcureModelVo); + } + vo.setModels(lWhProcureModelVoList); + }*/ + return result; } + /** - * @Description 瀵煎嚭璋冩嫧鍑哄簱鍗� + * @Description 瀵煎嚭璋冩嫧鍑哄簱鍗� * @Author 鍗㈠簡闃� * @Date 2023/10/31 */ @@ -215,8 +334,8 @@ Long outWarehouseFormId = this.lWhFormOutputCoreService.createOutFormByTransId(id, currentUser, dealTime); //2.鍑哄簱鍗昳d鏌ヨ鍑哄簱鍗� LWhFormOutput lWhFormOutput = this.lWhFormOutputService.get(new LWhFormOutput(outWarehouseFormId)); - if (lWhFormOutput!= null) { - BeanUtils.copyProperties(lWhFormOutput,result); + if (lWhFormOutput != null) { + BeanUtils.copyProperties(lWhFormOutput, result); } //3.鏍规嵁杩涘嚭搴撴祦姘存�昏〃id鏌ヨl_wh_goods_record LWhGoodsRecord record = new LWhGoodsRecord(); @@ -226,7 +345,7 @@ if (!CollectionUtils.isEmpty(recordList)) { for (LWhGoodsRecord lWhGoodsRecord : recordList) { LWhGoodsRecordVo vo = new LWhGoodsRecordVo(); - BeanUtils.copyProperties(lWhGoodsRecord,vo); + BeanUtils.copyProperties(lWhGoodsRecord, vo); //鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿 BaseGoodsModels baseGoodsModels = baseGoodsModelsService.get(new BaseGoodsModels(id)); if (baseGoodsModels != null) { @@ -242,6 +361,7 @@ /** * 鎾ら攢 + * * @author 鍗㈠簡闃� * @date 2023/10/31 */ @@ -250,4 +370,62 @@ lWhFormTransfer.setStates(4); return this.update(lWhFormTransfer); } + + public GenericPager<Map<String, Object>> queryTransferInfo(TransferQry transferQry) { + + HashMap<String, Object> paramts = new HashMap<>(); + StringBuilder sql = new StringBuilder( + "SELECT\n" + "\tft.id,\n" + "\tft.BUSINESS_FORM_CODE businessCode,\n" + "\tbgt.GOODS_NAME goodsName,\n" + "\tbgt.CLASSIFICATION goodsType,\n" + + "\tbgm.id goodsModelId,\n" + "\tbgm.MODEL_NAME goodsModelName,\n" + "\tpm.COUNTS goodsCount,\n" + "\tfst.`name` tennatName,\n" + + "\tfstd.NAME departmentName,\n" + "\tft.OPERATOR_ID distributor,\n" + "\tft.CREATE_TIME TIME \n" + "FROM\n" + "\tl_wh_form_transfer ft\n" + + "\tLEFT JOIN l_wh_procure_model pm ON ft.ID = pm.BUSINESS_ID\n" + + "\tLEFT JOIN base_goods_models bgm ON bgm.GOODS_TEMPLATES_ID = pm.BASE_GOODS_MODELS_ID\n" + + "\tLEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID\n" + + "\tLEFT JOIN fin_sys_tenant_user fstu ON fstu.id = ft.OPERATOR_ID\n" + + "\tLEFT JOIN fin_sys_tenant_department fstd ON fstu.SYS_DEPT_ID = fstd.ID \n" + + "\tLEFT JOIN fin_sys_tenant fst ON fst.id = fstd.TENANT_ID where 1=1 "); + //鍗曞彿 + if (StringUtils.isNotEmpty(transferQry.getBusinessFormCode())) { + sql.append("AND BUSINESS_FORM_CODE like :businessFormCode "); + paramts.put("businessFormCode", StringUtils.CHAR_PERCENT + transferQry.getBusinessFormCode() + StringUtils.CHAR_PERCENT); + } + //鐗╁搧鍚嶇О + if (StringUtils.isNotEmpty(transferQry.getGoodsTemplateName())) { + sql.append("AND bgt.GOODS_NAME like:goodsName "); + paramts.put("goodsName", StringUtils.CHAR_PERCENT + transferQry.getGoodsTemplateName() + StringUtils.CHAR_PERCENT); + } + // 瑙勬牸鍨嬪彿 + if (transferQry.getBaseGoodsTemplateId() != null) { + sql.append("AND bgm.id =:goodsModelId "); + paramts.put("goodsModelId", transferQry.getBaseGoodsTemplateId()); + } + //璋冩嫧鏈烘瀯 + if (transferQry.getOutAgencyId() != null) { + sql.append("AND OUT_AGENCY_ID = :OUT_AGENCY_ID "); + paramts.put("OUT_AGENCY_ID", transferQry.getOutAgencyId()); + } + + //鍒涘缓浜� + if (StringUtils.isNotEmpty(transferQry.getOperatorName())) { + sql.append("AND ft.OPERATOR_NAME =:OPERATOR_NAME "); + paramts.put("OPERATOR_NAME", transferQry.getOperatorName()); + } + //鐢宠鏃堕棿 + if (transferQry.getCreateTimeStart() != null) { + sql.append("AND ft.CREATE_TIME >=:createTimeStart "); + paramts.put("createTimeStart", transferQry.getCreateTimeStart() * 1000000); + } + if (transferQry.getCreateTimeEnd() != null) { + sql.append("AND ft.CREATE_TIME <:createTimeEnd "); + paramts.put("createTimeEnd", transferQry.getCreateTimeEnd() * 1000000 + 240000); + } + sql.append("ORDER BY ft.CREATE_TIME DESC"); + + GenericPager<Map<String, Object>> mapGenericPager = this.selectSplit(sql.toString(), paramts, transferQry.getPageNum(), transferQry.getPageSize(), + new MapRowMapper()); + + return mapGenericPager; + } + + } -- Gitblit v1.9.1