diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index a20d1ba5..3c0c78ff 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -70,30 +70,25 @@ public class BasicCorpController extends BaseController { @GetMapping("/udiwms/basic/unit/maintain/filter") public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - List basicUnitMaintainEntities; basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK); - basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + List basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); PageInfo pageInfo = new PageInfo<>(basicUnitMaintainEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(basicUnitMaintainEntities); - return ResultVOUtils.success(pageSimpleResponse); } @GetMapping("/udiwms/basic/unit/maintain/filterOptimize") public BaseResponse filterBasicUnitMaintainOptimize(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - List basicUnitMaintainEntities; - basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + List basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); PageInfo pageInfo = new PageInfo<>(basicUnitMaintainEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); List reList = basicUnitMaintainEntities.stream().map(s-> { @@ -103,21 +98,17 @@ public class BasicCorpController extends BaseController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(reList); - return ResultVOUtils.success(pageSimpleResponse); } @GetMapping("/udiwms/basic/unit/maintain/filter2") public BaseResponse filterBasicUnitMaintain2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - List basicUnitMaintainEntities; - basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(basicUnitMaintainEntities); + List basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + PageInfo pageInfo = new PageInfo<>(basicUnitMaintainEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(basicUnitMaintainEntities); @@ -149,7 +140,6 @@ public class BasicCorpController extends BaseController { if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } - return ResultVOUtils.success(); } @@ -165,7 +155,6 @@ public class BasicCorpController extends BaseController { if (result) { return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加"); } - basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest); return ResultVOUtils.success("修改成功"); } @@ -189,8 +178,7 @@ public class BasicCorpController extends BaseController { basicUnitMaintainResponse.setUnitId(item.getErpId()); return basicUnitMaintainResponse; }).collect(Collectors.toList()); - PageInfo pageInfo; - pageInfo = new PageInfo<>(basicUnitMaintainResponses); + PageInfo pageInfo = new PageInfo<>(basicUnitMaintainResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(basicUnitMaintainResponses); @@ -206,8 +194,7 @@ public class BasicCorpController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK); - List basicUnitMaintainEntities; - basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + List basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); List basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item -> { @@ -216,8 +203,7 @@ public class BasicCorpController extends BaseController { basicUnitMaintainResponse.setUnitId(item.getErpId()); return basicUnitMaintainResponse; }).collect(Collectors.toList()); - PageInfo pageInfo; - pageInfo = new PageInfo<>(basicUnitMaintainResponses); + PageInfo pageInfo = new PageInfo<>(basicUnitMaintainResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(basicUnitMaintainResponses); @@ -282,12 +268,10 @@ public class BasicCorpController extends BaseController { return ResultVOUtils.error(500, "往来单位接口地址未定义"); if (basicThirdSysDetailEntity.getEnabled()) { thrUnitImportService.selectAllUnit(basicThirdSysDetailEntity, unitMaintainFilterRequest); - } else { return ResultVOUtils.error(500, "第三方系统往来单位接口服务未启用"); } - return ResultVOUtils.success("后台正在添加，请稍后刷新查看！"); } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java index 1d137e85..44fb3512 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java @@ -17,6 +17,8 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicCorpExportLogResponse; import com.glxp.api.service.basic.BasicCorpExportLogService; import com.glxp.api.service.basic.BasicCorpService; +import com.glxp.api.service.basic.BasicGenExcelService; +import com.glxp.api.service.basic.BasicGenJsonService; import com.glxp.api.util.CustomUtil; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -42,7 +44,6 @@ public class BasicCorpExportLogController { private BasicCorpService basicUnitMaintainService; @Resource private BasicGenJsonService basicGenJsonService; - ; @GetMapping("/udiwms/corps/exportLog/filter") public BaseResponse filter(FilterCorpExportLogRequest filterCorpExportLogRequest, @@ -53,8 +54,7 @@ public class BasicCorpExportLogController { } List corpExportLogEntities = basicCorpExportLogService.filterCorpExportLog(filterCorpExportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(corpExportLogEntities); + PageInfo pageInfo = new PageInfo<>(corpExportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(corpExportLogEntities); @@ -127,7 +127,6 @@ public class BasicCorpExportLogController { //basicGenExcelService.exportCorp(genKey, corpsExportRequest); basicGenJsonService.exportCorp(genKey, basicCorpsExportRequest); - return ResultVOUtils.success("后台正在导出生成udi文件，请稍后刷新查看!"); } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java index 45cd14f0..9b801b7e 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java @@ -49,8 +49,7 @@ public class BasicCorpImportLogController { } List udiInfoImportLogEntities = basicCorpImportLogService.filterImportLog(filterCorpImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiInfoImportLogEntities); + PageInfo pageInfo = new PageInfo<>(udiInfoImportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiInfoImportLogEntities); @@ -105,8 +104,6 @@ public class BasicCorpImportLogController { corpImportLogEntity.setFromType("文件导入"); corpImportLogEntity.setUpdateTime(new Date()); corpImportLogEntity.setCreateTime(new Date()); -// corpImportLogEntity.setCreateUser(String.valueOf(customerService.getUserId())); -// corpImportLogEntity.setUpdateUser(String.valueOf(customerService.getUserId())); corpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS); corpImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); basicCorpImportLogService.insertImportLog(corpImportLogEntity); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index daa1c5f1..7166765a 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -58,7 +58,6 @@ public class BasicOrderPrintController { SystemPDFTemplateService systemPDFTemplateService; @Resource IoOrderDetailBizService ioOrderDetailBizService; - @Resource UdiRelevanceService udiRelevanceService; @Resource @@ -73,7 +72,6 @@ public class BasicOrderPrintController { SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService; @Value("${file_path}") private String filePath; - @Resource SystemParamConfigService systemParamConfigService; @Resource @@ -86,7 +84,6 @@ public class BasicOrderPrintController { @PostMapping("/udiwms/pdf/template/inspection/order/file") public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest) { - String name = getStatusName(filterOrderPrintRequest.getStatus()); SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction()); if (sysPdfTemplateRelevanceCodeEntity != null) { @@ -166,7 +163,6 @@ public class BasicOrderPrintController { bizData.put("zczbhhzbapzbh", obj.getCertCode() == null ? ' ' : obj.getCertCode()); bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); - if (IntUtil.value(printThird) == 1) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(obj.getBindRlFk()); ThrProductsEntity thrProductsEntity = thrProductsService.selectByCode(udiRelevanceEntity.getThirdId()); @@ -175,11 +171,9 @@ public class BasicOrderPrintController { bizData.put("spec", thrProductsEntity.getSpec() == null ? ' ' : thrProductsEntity.getSpec()); bizData.put("measname", thrProductsEntity.getMeasname() == null ? ' ' : thrProductsEntity.getMeasname()); bizData.put("manufactor", thrProductsEntity.getManufactory()); -// bizData.put("zczbhhzbapzbh", thrProductsEntity.getRegisterNo() == null ? ' ' : thrProductsEntity.getRegisterNo()); bizData.put("ylqxzcrbarmc", thrProductsEntity.getYlqxzcrbarmc() == null ? ' ' : thrProductsEntity.getYlqxzcrbarmc()); } - //添加发票号 String fphm = ""; String fprq = null; @@ -198,8 +192,6 @@ public class BasicOrderPrintController { i++; } } - - } else { //查询单据表 FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); @@ -225,11 +217,7 @@ public class BasicOrderPrintController { break; } } - //查询产品表 -// UdiProductEntity udiProductEntity = udiProductService.findByUuid(ioOrderDetailBizEntity.getUuidFk()); - UdiRelevanceResponse udiProductEntity = udiRelevanceService.selectByRelId(obj.getRelId() + ""); -// List ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(ioOrderDetailBizEntity.getOrderIdFk()); //组装数据 Map bizData = new HashMap<>(); bizData.put("index", i); @@ -289,7 +277,6 @@ public class BasicOrderPrintController { } } - data.put("data", list); String param = JSON.toJSONString(data); JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + FileUtils.getLastFileName(systemPDFTemplateEntity.getPath()), "pdf"); @@ -336,7 +323,6 @@ public class BasicOrderPrintController { @RequestBody FilterOrderPrintRequest filterOrderPrintRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { - List list = new ArrayList<>(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式 SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(filterOrderPrintRequest.getLabelId() + ""); @@ -350,7 +336,6 @@ public class BasicOrderPrintController { //查询单据表 FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk()); - IoOrderResponse ioOrderResponse = ioOrderService.filterList(filterOrderRequest).get(0); //查询业务单详情 List ioCodeEntityList = ioCodeService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); int i = 1; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductSetController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductSetController.java index ca3e9f6c..cb82bc9c 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductSetController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductSetController.java @@ -29,8 +29,7 @@ public class BasicProductSetController { @GetMapping("/spms/basicProduct/setup/filter") public BaseResponse filterSetUps(FilterBasicProductSetrequest filterBasicProductSetrequest) { List basicProductSetEntities = basicProductSetService.filterSetup(filterBasicProductSetrequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(basicProductSetEntities); + PageInfo pageInfo = new PageInfo<>(basicProductSetEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(basicProductSetEntities); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java index fb79d466..1925491f 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java @@ -17,11 +17,12 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlDlResponse; +import com.glxp.api.service.basic.BasicGenExcelService; +import com.glxp.api.service.basic.BasicGenJsonService; import com.glxp.api.service.basic.BasicProductsExportLogService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.util.CustomUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -155,7 +156,6 @@ public class BasicProductsExportLogController { basicProductsExportLogService.insertUdiInfoExportLog(basicProductsExportLogEntity); UdiRelevanceExportJsonResponse exportData = basicGenJsonService.paresDataJson(udiInfoExportRequest); basicGenExcelService.uploadProductsSmpJson(genKey, exportData); -// basicGenExcelService.uploadProductsSmp(genKey, udiInfoExportRequest); return ResultVOUtils.success("后台正在上传，请稍后刷新查看!"); } @@ -192,8 +192,7 @@ public class BasicProductsExportLogController { BeanUtil.copyProperties(item, udiRlDlResponse); return udiRlDlResponse; }).collect(Collectors.toList()); - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiRelevanceResponses); + PageInfo pageInfo = new PageInfo<>(udiRelevanceResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiRlDlResponses); @@ -231,8 +230,7 @@ public class BasicProductsExportLogController { BeanUtil.copyProperties(item, udiRlDlResponse); return udiRlDlResponse; }).collect(Collectors.toList()); - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiRelevanceResponses); + PageInfo pageInfo = new PageInfo<>(udiRelevanceResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiRlDlResponses); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductsImportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductsImportLogController.java index 37dc0cd2..1a913d20 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductsImportLogController.java @@ -45,8 +45,6 @@ public class BasicProductsImportLogController { @Resource BasicProductsImportDetailService basicProductsImportDetailService; - - private static final String TAG = "UdiInfoImportLogControl"; private static final Logger log = LoggerFactory.getLogger(BasicProductsImportLogController.class); @GetMapping("/udiwms/products/importLog/filter") @@ -58,8 +56,7 @@ public class BasicProductsImportLogController { } List udiInfoImportLogEntities = basicProductsImportLogService.filterImportLog(filterUdiIpLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiInfoImportLogEntities); + PageInfo pageInfo = new PageInfo<>(udiInfoImportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiInfoImportLogEntities); @@ -256,7 +253,6 @@ public class BasicProductsImportLogController { basicProductsImportLogService.insertImportLog(basicProductsImportLogEntity); basicProductsImportLogService.downloadSmpUdiInfo(genKey, filterUdiIpLogRequest.getLastUpdateTime()); return ResultVOUtils.success("后台已开始下载并更新，请稍后刷新查看!"); - } } diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index 53e5d5c9..912f9215 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -64,7 +64,7 @@ public class UdiContrastController extends BaseController{ @Resource UdiProductService udiProductService; @Resource - private ThrSystemService thrSystemService; + ThrSystemService thrSystemService; @Resource UdiContrastService udiContrastService; @Resource @@ -76,10 +76,9 @@ public class UdiContrastController extends BaseController{ @Resource CompanyService companyService; @Resource - private CompanyProductRelevanceService companyProductRelevanceService; + CompanyProductRelevanceService companyProductRelevanceService; @Resource IoOrderDetailCodeService orderDetailCodeService; - @Resource SpsSyncWebSocket webSocketServer; @Resource @@ -348,7 +347,6 @@ public class UdiContrastController extends BaseController{ productInfoEntityList.addAll(result); } } - } PageInfo pageInfo; @@ -357,7 +355,6 @@ public class UdiContrastController extends BaseController{ pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(productInfoEntityList); return ResultVOUtils.success(pageSimpleResponse); - } @@ -386,7 +383,6 @@ public class UdiContrastController extends BaseController{ @AuthRuleAnnotation("") @PostMapping("/udi/udirel/updateLevelDrugAli") public BaseResponse updateLevelDrugAli(@RequestBody ThirdAliDrugRequest thirdAliDrug) { - ; return udiProductService.saveOrUpadateLevelDrugAli(thirdAliDrug); } @@ -555,13 +551,10 @@ public class UdiContrastController extends BaseController{ public void insertUdiInfos(List udiInfoEntities) { if (CollUtil.isNotEmpty(udiInfoEntities)) { UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiInfoEntities.get(0).getUuid()); - if (udiProductEntity == null) { udiProductService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities)); } } } - - } diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 74b003d5..dd9a0794 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -66,9 +66,9 @@ public class UdiRelevanceController extends BaseController { @Resource BasicUpdateProductService basicUpdateProductService; @Resource - private SystemParamConfigService systemParamConfigService; + SystemParamConfigService systemParamConfigService; @Resource - private ThrSystemService thrSystemService; + ThrSystemService thrSystemService; @Resource ThrDataService thrDataService; @Resource @@ -92,8 +92,7 @@ public class UdiRelevanceController extends BaseController { List udiRelevanceResponses = null; udiRelevanceResponses = udiRelevanceDao.pdaDlUdiRel(filterUdiRelRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiRelevanceResponses); + PageInfo pageInfo = new PageInfo<>(udiRelevanceResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiRelevanceResponses); @@ -108,7 +107,6 @@ public class UdiRelevanceController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - List udiRelevanceResponses = null; if (StrUtil.isNotEmpty(filterUdiRelRequest.getBindRlIds())) { String[] datas = filterUdiRelRequest.getBindRlIds().split(","); @@ -117,9 +115,8 @@ public class UdiRelevanceController extends BaseController { filterUdiRelRequest.setRelIds(list); } - udiRelevanceResponses = udiRelevanceService.filterUdiJoinSup(filterUdiRelRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiRelevanceResponses); + List udiRelevanceResponses = udiRelevanceService.filterUdiJoinSup(filterUdiRelRequest); + PageInfo pageInfo = new PageInfo<>(udiRelevanceResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiRelevanceResponses); @@ -210,8 +207,7 @@ public class UdiRelevanceController extends BaseController { } } - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiRelevanceResponses); + PageInfo pageInfo = new PageInfo<>(udiRelevanceResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiRelevanceResponses); @@ -224,8 +220,7 @@ public class UdiRelevanceController extends BaseController { @GetMapping("/udi/cert/filterUdi") public BaseResponse filterCertUdi(FilterUdiRelRequest filterUdiRelRequest) { List udiRelevanceResponses = udiRelevanceService.filterCertUdi(filterUdiRelRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiRelevanceResponses); + PageInfo pageInfo = new PageInfo<>(udiRelevanceResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiRelevanceResponses); @@ -245,10 +240,7 @@ public class UdiRelevanceController extends BaseController { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(filterUdiRelRequest.getId()); FilterUdiRelRequest tempRequest = new FilterUdiRelRequest(); tempRequest.setUuid(udiRelevanceEntity.getUuid()); -// if (filterUdiRelRequest.getProductsType() == 2) { -// tempRequest.setNameCode(filterUdiRelRequest.getNameCode()); tempRequest.setUuid(udiRelevanceEntity.getUuid()); -// } List udiInfoEntities = udiProductService.filterAllUdiInfo(tempRequest); //移除层级为空的数据 @@ -274,7 +266,6 @@ public class UdiRelevanceController extends BaseController { } } return ResultVOUtils.success(udiRelevanceResponses); - } //多选删除 @@ -494,8 +485,6 @@ public class UdiRelevanceController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/udirel/disable") public BaseResponse disable(@RequestBody UdiCombineRequest udiCombineRequest) { - - if (invProductService.isExitByRelId(udiCombineRequest.getRelId() + "")) { return ResultVOUtils.error(500, "库存已存在，无法禁用"); } @@ -506,21 +495,6 @@ public class UdiRelevanceController extends BaseController { return ResultVOUtils.success("更新成功"); } - - public UdiProductEntity getUdiInfo(UdiCombineRequest udiCombineRequest) { - UdiRelevanceEntity temp = udiRelevanceService.selectById(udiCombineRequest.getRelId()); - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setNameCode(udiCombineRequest.getThirdId()); - filterUdiRelRequest.setUuid(temp.getUuid()); - List udiInfoEntities = udiProductService.filterUdiInfo(filterUdiRelRequest); - if (udiInfoEntities != null && udiInfoEntities.size() > 0) { - UdiProductEntity udiProductEntity = udiInfoEntities.get(0); - return udiProductEntity; - } - return null; - } - - //单独选入ERP产品 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/addErp") @@ -578,8 +552,7 @@ public class UdiRelevanceController extends BaseController { } } filterSysEntityList.add(new FilterSysEntity(10, "最新同步")); - PageInfo pageInfo; - pageInfo = new PageInfo<>(filterSysEntityList); + PageInfo pageInfo = new PageInfo<>(filterSysEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(filterSysEntityList); @@ -609,8 +582,7 @@ public class UdiRelevanceController extends BaseController { } } filterSysEntityList.add(new DictDto(10, "最新同步")); - PageInfo pageInfo; - pageInfo = new PageInfo<>(filterSysEntityList); + PageInfo pageInfo = new PageInfo<>(filterSysEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(filterSysEntityList); @@ -734,8 +706,7 @@ public class UdiRelevanceController extends BaseController { } } } - PageInfo pageInfo; - pageInfo = new PageInfo<>(basicProductThirdSysResponses); + PageInfo pageInfo = new PageInfo<>(basicProductThirdSysResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(basicProductThirdSysResponses); diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 6af93b0c..8d96d9d0 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -64,7 +64,6 @@ public class UdiRlSupController extends BaseController { private CompanyProductsRelService companyProductsRelService; @Resource private BasicCorpService basicUnitMaintainService; - @Resource private UdiRelevanceService udiRelevanceService; @Resource @@ -148,8 +147,7 @@ public class UdiRlSupController extends BaseController { } List basicInstrumentMaintainRelevanceResponses = null; basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); + PageInfo pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses); @@ -201,8 +199,7 @@ public class UdiRlSupController extends BaseController { } List companyProductRelevanceEntities = udiRlSupService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(companyProductRelevanceEntities); + PageInfo pageInfo = new PageInfo<>(companyProductRelevanceEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(companyProductRelevanceEntities); @@ -304,7 +301,6 @@ public class UdiRlSupController extends BaseController { udiProductService.insertUdiInfo(udiProductEntity); } - try { CodeRel codeRel = new CodeRel(); if (udiProductEntity.getProductsType() == null || udiProductEntity.getProductsType() == 1) { @@ -365,7 +361,6 @@ public class UdiRlSupController extends BaseController { BeanUtil.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiProductEntity); //处理是否需要扫码字段 classifyCodeService.updateRequireScanCode(udiProductEntity); - udiProductEntity.setUpdateTime(new Date()); UdiRelevanceEntity udiRelevanceEntity1 = udiRelevanceService.selectById(Long.valueOf(rlidStr)); @@ -374,14 +369,13 @@ public class UdiRlSupController extends BaseController { byUuid.setCatalogname1(udiProductEntity.getCatalogname1()); byUuid.setCatalogname2(udiProductEntity.getCatalogname2()); byUuid.setCatalogname3(udiProductEntity.getCatalogname3()); -// byUuid.setDetailSort(udiProductEntity.getDetailSort()); byUuid.setYbbm(udiProductEntity.getYbbm()); byUuid.setManufactory(udiProductEntity.getManufactory()); byUuid.setUpdateTime(new Date()); udiProductService.updateUdiInfo(byUuid); } else { - - byUuid.setPrice(udiInfoExportRequest.getPrice()); udiProductEntity.setId(IdUtil.getSnowflakeNextId()); + byUuid.setPrice(udiInfoExportRequest.getPrice()); + udiProductEntity.setId(IdUtil.getSnowflakeNextId()); udiProductService.insertUdiInfo(udiProductEntity); } diff --git a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java index 90a5de12..6ef33fde 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java @@ -170,7 +170,6 @@ public class UdiSyncController extends BaseController { @AuthRuleAnnotation("") @GetMapping("udiwms/udiinfo/filterCompany") public BaseResponse filterCompany(UdiCompanyRequest udiCompanyRequest) { - try { BaseResponse> udiDlDeviceResponse = syncUdiService.filterCompany(udiCompanyRequest); return udiDlDeviceResponse; @@ -312,8 +311,7 @@ public class UdiSyncController extends BaseController { public BaseResponse filterProduct(FilterUdiRelRequest filterUdiRelRequest) { List udiInfoEntities = udiProductService.filterAllUdiInfo(filterUdiRelRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiInfoEntities); + PageInfo pageInfo = new PageInfo<>(udiInfoEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiInfoEntities); @@ -323,10 +321,8 @@ public class UdiSyncController extends BaseController { @AuthRuleAnnotation("") @GetMapping("/udiwms/basic/findByCode") public BaseResponse findByCode(FilterUdiRelRequest filterUdiRelRequest) { - UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode()); - UdiProductEntity udiProductEntity - = udiProductService.findByNameCode(udiEntity.getUdi()); + UdiProductEntity udiProductEntity = udiProductService.findByNameCode(udiEntity.getUdi()); return ResultVOUtils.success(udiProductEntity); } @@ -334,7 +330,6 @@ public class UdiSyncController extends BaseController { //出入库同步下载 @GetMapping("udidl/udiwms/syncUdi") public BaseResponse syncUdi(ProductInfoFilterRequest productInfoFilterRequest) { - List productInfoEntityList = productInfoService.syncDlUdi(productInfoFilterRequest); return ResultVOUtils.success(productInfoEntityList); @@ -344,7 +339,6 @@ public class UdiSyncController extends BaseController { //出入库同步下载 @GetMapping("udidl/udiwms/syncCompany") public BaseResponse syncCompany(UdiCompanyRequest udiCompanyRequest) { - List udiCompanyEntities = udiCompanyService.syncDlCompany(udiCompanyRequest); return ResultVOUtils.success(udiCompanyEntities); diff --git a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java index 2ac7d613..de89954a 100644 --- a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java +++ b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java @@ -82,8 +82,7 @@ public class RelCodeBatchController extends BaseController { @GetMapping("/udiwms/relCode/batch/filter") public BaseResponse list(RelCodeBatchRequest relCodeBatchRequest, BindingResult bindingResult) { String customerId = getCustomerId(); - if (!customerId.equals("110")) - relCodeBatchRequest.setErpId(customerId); + if (!customerId.equals("110")) relCodeBatchRequest.setErpId(customerId); List relCodeBatchResponses = relCodeBatchService.filterList(relCodeBatchRequest); PageInfo pageInfo = new PageInfo<>(relCodeBatchResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/controller/collect/RelCodeDetailController.java b/src/main/java/com/glxp/api/controller/collect/RelCodeDetailController.java index 5d041643..a4bd2cb8 100644 --- a/src/main/java/com/glxp/api/controller/collect/RelCodeDetailController.java +++ b/src/main/java/com/glxp/api/controller/collect/RelCodeDetailController.java @@ -29,8 +29,6 @@ public class RelCodeDetailController extends BaseController { @Resource private RelCodeDetailService relCodeDetailService; - - /** * 扫码 * @param relCodeDetailRequest diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java index 4b454984..9084f888 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java @@ -77,6 +77,4 @@ public class DeviceCheckDetailController extends BaseController { return ResultVOUtils.successMsg("操作成功"); } - - } diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailItemController.java b/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailItemController.java index b7b439d4..98a2bd36 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailItemController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailItemController.java @@ -63,5 +63,4 @@ public class DeviceCheckDetailItemController extends BaseController { return ResultVOUtils.successMsg("操作成功"); } - } diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceCheckItemDictController.java b/src/main/java/com/glxp/api/controller/dev/DeviceCheckItemDictController.java index 16a499e3..73378aee 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceCheckItemDictController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceCheckItemDictController.java @@ -26,7 +26,6 @@ public class DeviceCheckItemDictController extends BaseController { private final DeviceCheckItemDictService deviceCheckItemDictService; - /** * 生成一个项目编码 * diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java index 0f78a4d0..8fdeaccf 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java @@ -63,7 +63,6 @@ public class DeviceInfoController extends BaseController { private final DeviceInfoService deviceInfoService; private final DeviceChangeLogService deviceChangeLogService; - @Value("${file_path}") private String filePath; diff --git a/src/main/java/com/glxp/api/controller/dev/DevicePlanDetailController.java b/src/main/java/com/glxp/api/controller/dev/DevicePlanDetailController.java index 094550a6..24f70636 100644 --- a/src/main/java/com/glxp/api/controller/dev/DevicePlanDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DevicePlanDetailController.java @@ -83,8 +83,6 @@ public class DevicePlanDetailController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/device/plan/detail/add") public BaseResponse add(@RequestBody @Valid DevicePlanDetailParam param) { - - DevicePlanEntity entity = null; if (!param.valid(devicePlanService)) { AuthAdmin user = super.getUser(); @@ -129,5 +127,4 @@ public class DevicePlanDetailController extends BaseController { return ResultVOUtils.successMsg("删除成功"); } - } diff --git a/src/main/java/com/glxp/api/controller/dev/DevicePlanDetailItemController.java b/src/main/java/com/glxp/api/controller/dev/DevicePlanDetailItemController.java index f5639f86..7f67494f 100644 --- a/src/main/java/com/glxp/api/controller/dev/DevicePlanDetailItemController.java +++ b/src/main/java/com/glxp/api/controller/dev/DevicePlanDetailItemController.java @@ -126,7 +126,6 @@ public class DevicePlanDetailItemController extends BaseController { devicePlanDetailItemService.insertIgnoreBatch(entityList); } } - } return ResultVOUtils.successMsg("添加成功"); } diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java index af60c219..12a6ddbb 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java @@ -30,11 +30,8 @@ import java.util.List; @RequestMapping public class DeviceUpkeepDetailController extends BaseController { - private final DeviceUpkeepDetailService deviceUpkeepDetailService; - private final DevicePlanService devicePlanService; - private final DeviceInfoService deviceInfoService; private final DevicePlanDetailService devicePlanDetailService; private final DeviceUpkeepDetailItemService deviceUpkeepDetailItemService; @@ -65,8 +62,6 @@ public class DeviceUpkeepDetailController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/device/upkeep/detail/add") public BaseResponse add(@RequestBody @Valid DevicePlanDetailParam param) { - - DevicePlanEntity entity = null; if (!param.valid(devicePlanService)) { AuthAdmin user = super.getUser(); @@ -97,6 +92,4 @@ public class DeviceUpkeepDetailController extends BaseController { return ResultVOUtils.successMsg("操作成功"); } - - } diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeController.java index 82487e32..833a6266 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeController.java @@ -70,7 +70,6 @@ public class IoCodeController extends BaseController { return ResultVOUtils.page(pageInfo); } - /** * 根据单据号查询正式码表数据 * @@ -90,11 +89,8 @@ public class IoCodeController extends BaseController { @AuthRuleAnnotation("") @GetMapping("spms/inout/dlcode/findByOrderId") public BaseResponse downloadCodesByOrderId(String orderId) { - - List codeEntityList = ioCodeService.findByOrderId(orderId); - PageInfo pageInfo; - pageInfo = new PageInfo<>(codeEntityList); + PageInfo pageInfo = new PageInfo<>(codeEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(codeEntityList); diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java index fd2e55dd..68cdbbc9 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java @@ -41,8 +41,7 @@ public class IoCodeLostController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List list = codeLostService.selectLost(ioCodeLostEntity); - PageInfo pageInfo; - pageInfo = new PageInfo<>(list); + PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(list); @@ -56,10 +55,7 @@ public class IoCodeLostController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - - codeLostService.update(ioCodeLostEntity); - return ResultVOUtils.success("成功"); } @@ -120,6 +116,5 @@ public class IoCodeLostController extends BaseController { if (codeLostEntity == null) return ResultVOUtils.error(500, "未缓存！"); return ResultVOUtils.success(codeLostEntity); - } } diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index b12384ff..f4dbd38b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -142,18 +142,15 @@ public class IoCodeTempController extends BaseController { inPostOrder.setPostOrders(inPostOrders); outPostOrder.setPostOrders(outPostOrders); - if (CollUtil.isNotEmpty(inPostOrders)) { inPostOrder.setCustomerId(getCustomerId()); inPostOrder.setUserId(userId); transInoutService.creatOrderByPda(inPostOrder); } - } catch (Exception e) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } - return ResultVOUtils.success("上传成功，等待后台处理"); } @@ -385,7 +382,6 @@ public class IoCodeTempController extends BaseController { udiEntity.setSerialNo(addOrderRequest.getSerialNo()); } - if (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && udiEntity.getSerialNo().length() > 20) { return ResultVOUtils.error(500, "无效条码！序列号超出最大范围"); } @@ -394,7 +390,6 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "无效条码！批次号超出最大范围"); } - //批次号校验 //判断此产品是否开启允许无批次号 UdiProductEntity udiInfoEntity = udiProductService.findByNameCode(udiEntity.getUdi()); @@ -511,10 +506,6 @@ public class IoCodeTempController extends BaseController { } } - - //过期提醒： -// SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip"); - if (IntUtil.value(bussinessTypeEntity.getCheckExpire()) == 1 && !addOrderRequest.isIgnoreExpire()) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); @@ -535,7 +526,6 @@ public class IoCodeTempController extends BaseController { } } - UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); //判断层级标识是否正确 if (bussinessTypeEntity.isUse()) { @@ -558,9 +548,6 @@ public class IoCodeTempController extends BaseController { } } - - //近效期提醒 -// SystemParamConfigEntity recentParamConfigEntity = systemParamConfigService.selectByParamKey("recent_date_tip"); long recent = 0; if (udiRelevanceResponse.getRecentDateTime() != null) recent = udiRelevanceResponse.getRecentDateTime().longValue(); @@ -667,7 +654,6 @@ public class IoCodeTempController extends BaseController { } } - } // 是否检验寄售库存 if (bussinessTypeEntity.isAdvancePreIn()) { @@ -954,7 +940,6 @@ public class IoCodeTempController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - return codeTempService.addDrugOrderWeb(addOrderRequest); } @@ -1148,7 +1133,6 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - //更新供应商 IoCodeTempEntity codeTempEntity = codeTempService.selectById(codeSaveRequest.getId()); if (StrUtil.isNotEmpty(codeSaveRequest.getMySupId())) { @@ -1226,7 +1210,6 @@ public class IoCodeTempController extends BaseController { } } - boolean r1 = orderDetailBizService.isExit(orderEntity.getBillNo()); boolean r2 = ioOrderDetailCodeService.isExit(orderEntity.getBillNo()); if (!r1 && !r2) { @@ -1315,7 +1298,6 @@ public class IoCodeTempController extends BaseController { } return ResultVOUtils.success(); - } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 291307b4..1d77210f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -101,7 +101,6 @@ public class IoOrderController extends BaseController { @GetMapping("/udiwms/inout/order/filter") public BaseResponse filterOrder(FilterOrderRequest filterOrderRequest) { - if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) { orderService.setFilterStatus(filterOrderRequest); } @@ -135,7 +134,6 @@ public class IoOrderController extends BaseController { @GetMapping("/udiwms/inout/order/filterList") public BaseResponse filterOrderList(FilterOrderRequest filterOrderRequest) { - if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) { orderService.setFilterStatus(filterOrderRequest); } @@ -163,7 +161,6 @@ public class IoOrderController extends BaseController { if (ioOrderResponse.getCheckStatus() == null) { ioOrderResponse.setCheckStatus(0 + ""); } - ioOrderResponse = orderInvoiceService.findRegStausByBillNo(ioOrderResponse); } PageInfo pageInfo = new PageInfo<>(list); @@ -206,7 +203,6 @@ public class IoOrderController extends BaseController { return ResultVOUtils.error(500, "请先录入产品！"); } - String vailKey = ""; for (IoOrderDetailBizEntity orderDetailBizEntity : orderDetailBizEntities) { if (orderDetailBizEntity.getBindRlFk() == null) { @@ -492,7 +488,6 @@ public class IoOrderController extends BaseController { } } - @Resource IoCodeService codeService; @@ -513,7 +508,6 @@ public class IoOrderController extends BaseController { return ResultVOUtils.success("删除成功！"); } - //已验收单据删除、单据编辑删除等 @AuthRuleAnnotation("") @PostMapping("udiwms/inout/order/finish/delete") @@ -536,7 +530,6 @@ public class IoOrderController extends BaseController { return ResultVOUtils.success("删除成功！"); } - //单据编辑，条码减一 @AuthRuleAnnotation("") @PostMapping("udiwms/inout/code/finish/delete") @@ -693,8 +686,7 @@ public class IoOrderController extends BaseController { } List orderEntityList = orderService.filterList(filterOrderRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(orderEntityList); + PageInfo pageInfo = new PageInfo<>(orderEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(orderEntityList); @@ -769,7 +761,6 @@ public class IoOrderController extends BaseController { if (null == ioOrderDetailBizEntity) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } -// ioOrderDetailBizEntity.setCheckFileName(ioOrderDetailBizEntity.getCheckFileName().substring(0,ioOrderDetailBizEntity.getCheckFileName().length() - 4)); orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity); return ResultVOUtils.success(); } @@ -781,7 +772,6 @@ public class IoOrderController extends BaseController { ioOrderEntity.setUpdateTime(new Date()); ioOrderEntity.setUpdateUser(getUserId() + ""); orderService.updateByBillNo(ioOrderEntity); -// webSocketServer.sendMessage(SocketMsgEntity.builder().type(SocketMsgType.TASK_SYNC_DELETE).content(ioOrderEntity.getBillNo()).remark("单据删除").build(), null); webSocketServer.sendMessage(SocketMsgEntity.builder().type(SocketMsgType.TASK_INVOICE_CONFIRM).content(ioOrderEntity.getBillNo()).remark("发票确认").build(), null); return ResultVOUtils.success(); } @@ -836,9 +826,7 @@ public class IoOrderController extends BaseController { @ApiOperation("udims上传单据") @PostMapping("/warehouse/inout/postOrdersUdims") public BaseResponse postOrdersUdims(@RequestBody PostUdimsOrderRequest orderRequest) { - ioAddInoutService.creatOrderByUdims(orderRequest); - return ResultVOUtils.success(); } @@ -912,7 +900,6 @@ public class IoOrderController extends BaseController { } } - originCodes.forEach( code -> { //复制选中的产品 @@ -949,7 +936,6 @@ public class IoOrderController extends BaseController { if (!ioCheckInoutService.checkManual(newOrder.getBillNo())) { ioCheckInoutService.check(newOrder.getBillNo()); } - return ResultVOUtils.success(); } @@ -971,7 +957,6 @@ public class IoOrderController extends BaseController { } } - if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) { orderService.setFilterStatus(filterOrderRequest); } @@ -1030,5 +1015,4 @@ public class IoOrderController extends BaseController { return ResultVOUtils.success(orderEntity); } - } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index a9a528da..0cd7bec5 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -110,7 +110,6 @@ public class IoOrderDetailBizController extends BaseController { ReceivedetailService receivedetailService; @Resource IBasicBusTypeChangeService basicBusTypeChangeService; - @Resource IoOrderInvoiceService ioOrderInvoiceService; @@ -134,9 +133,7 @@ public class IoOrderDetailBizController extends BaseController { @PostMapping("/udiwms/inout/order/addBizProduct") @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse addBizProduct(@RequestBody AddBizProductReqeust addBizProductReqeust) { - return orderDetailBizService.addBizProduct(addBizProductReqeust); - } @@ -205,10 +202,8 @@ public class IoOrderDetailBizController extends BaseController { return ResultVOUtils.error(500, "第三方单据所属仓库不能为空！"); } - //获取往来信息 if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INNOR) {//内部调拨 - InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByThrCode(thrOrderEntity.getCorpId(), thrOrderEntity.getThirdSysFk()); orderEntity.setFromDeptCode(invWarehouseEntity.getParentId()); orderEntity.setFromInvCode(invWarehouseEntity.getCode()); @@ -259,7 +254,6 @@ public class IoOrderDetailBizController extends BaseController { } ioOrderDetailBizEntity.setBindRlIds(bindRlIds.substring(1)); } - } ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo()); ioOrderDetailBizEntity.setProductDate(thrOrderDetailEntity.getProductDate()); @@ -285,7 +279,6 @@ public class IoOrderDetailBizController extends BaseController { @Resource BasicCorpService basicCorpService; - //选入领用单据至业务单据 @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/addReceiveOrder") @@ -414,7 +407,6 @@ public class IoOrderDetailBizController extends BaseController { orderDetailBizService.insert(ioOrderDetailBizEntity); } return ResultVOUtils.success("选入成功！"); - } @@ -433,8 +425,6 @@ public class IoOrderDetailBizController extends BaseController { return ResultVOUtils.success("删除成功！"); } return ResultVOUtils.error(500, "删除失败"); - - } @@ -492,11 +482,7 @@ public class IoOrderDetailBizController extends BaseController { @PostMapping("/udiwms/inout/biz/updateBind") @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateBindSup(@RequestBody BizBindUpdateRequest bizBindUpdateRequest) { - - IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(bizBindUpdateRequest.getId()); - - if (bizBindUpdateRequest.getBindRlFk() != null) orderDetailBizEntity.setBindRlFk(bizBindUpdateRequest.getBindRlFk()); if (StrUtil.isNotEmpty(bizBindUpdateRequest.getSupId())) { @@ -516,22 +502,18 @@ public class IoOrderDetailBizController extends BaseController { @PostMapping("/udiwms/inout/biz/deleteById") @Log(title = "发票管理", businessType = BusinessType.DELETE) public BaseResponse deleteById(@RequestBody IoOrderInvoiceEntity ioOrderInvoiceEntity) { - - IoOrderInvoiceResponse ioOrderInvoiceResponse = orderDetailBizService.selectByinvoiceId(ioOrderInvoiceEntity.getId()); - //更改 登记状态 - IoOrderDetailCodeEntity ioOrderDetailBizEntity = new IoOrderDetailCodeEntity(); - FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest(); FilterOrderDetailBizRequest filterOrderDetailBizRequest1 = new FilterOrderDetailBizRequest(); filterOrderDetailBizRequest1.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk()); filterOrderDetailBizRequest1.setBatchNo(ioOrderInvoiceEntity.getBatchNo()); - filterOrderDetailBizRequest.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk()); filterOrderDetailBizRequest.setBatchNo(ioOrderInvoiceEntity.getBatchNo()); filterOrderDetailBizRequest.setRelId(ioOrderInvoiceEntity.getBizIdFk()); + //更改 登记状态 + IoOrderDetailCodeEntity ioOrderDetailBizEntity = new IoOrderDetailCodeEntity(); ioOrderDetailBizEntity.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk()); ioOrderDetailBizEntity.setBatchNo(ioOrderInvoiceEntity.getBatchNo()); ioOrderDetailBizEntity.setBindRlFk(ioOrderInvoiceEntity.getBizIdFk()); @@ -546,8 +528,6 @@ public class IoOrderDetailBizController extends BaseController { } orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity); return ResultVOUtils.success(ioOrderInvoiceResponses); - - } /** @@ -556,7 +536,6 @@ public class IoOrderDetailBizController extends BaseController { * @param ioOrderInvoiceRequest * @return */ - @PostMapping("/udiwms/inout/biz/updateById") @Log(title = "发票管理", businessType = BusinessType.UPDATE) public BaseResponse updateById(@RequestBody IoOrderInvoiceRequest ioOrderInvoiceRequest) { @@ -613,7 +592,6 @@ public class IoOrderDetailBizController extends BaseController { orderEntity.setUpdateTime(new Date()); orderService.update(orderEntity); return ResultVOUtils.success("成功"); - } @@ -641,7 +619,6 @@ public class IoOrderDetailBizController extends BaseController { orderEntity.setUpdateTime(new Date()); orderService.update(orderEntity); return ResultVOUtils.success("成功"); - } @@ -656,9 +633,6 @@ public class IoOrderDetailBizController extends BaseController { List ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest); List orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(orderDetailBizRequest.getOrderIdFk()); for (IoOrderDetailResultResponse orderDetailCodeEntity : ioOrderDetailCodeResponses) { -// if (orderDetailCodeEntity.getReCount() != 0 && orderDetailCodeEntity.getPrice() != null) { -// orderDetailCodeEntity.setAmount(new BigDecimal(orderDetailCodeEntity.getReCount()).multiply(orderDetailCodeEntity.getPrice())); -// } if (orderDetailCodeEntity.getCount() != 0 && orderDetailCodeEntity.getPrice() != null) { orderDetailCodeEntity.setAmount(new BigDecimal(orderDetailCodeEntity.getCount()).multiply(orderDetailCodeEntity.getPrice())); } @@ -687,7 +661,6 @@ public class IoOrderDetailBizController extends BaseController { return ResultVOUtils.page(pageInfo); } - @Resource IoCodeTempService ioCodeTempService; @Resource @@ -697,7 +670,6 @@ public class IoOrderDetailBizController extends BaseController { @Resource IoCodeLostService ioCodeLostService; - //录入阿里送货单的业务单据详情 @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/addAliBizProduct") @@ -730,14 +702,11 @@ public class IoOrderDetailBizController extends BaseController { return ResultVOUtils.error("单据码明细为空！"); } - IoOrderEntity ioOrderEntity = addBizProductReqeust.getOrderEntity(); addBizProductReqeust.setAliOrderBillNo(billCode); ioOrderEntity.setAliOrderBillNo(billCode); for (int i = 0; i < aliYljgBillDetailDrugList.size(); i++) { AliYljgBillDetailDrug aliYljgBillDetailDrug = aliYljgBillDetailDrugList.get(i); - - AliYljgBillDetailDrugCode aliYljgBillDetailDrugCode1 = aliYljgBillDetailDrug.getAliYljgBillDetailDrugCodeList().get(0); String code = aliYljgBillDetailDrugCode1.getCode(); if (StrUtil.isEmpty(code)) { diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index a422955f..a7ef9739 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -71,8 +71,6 @@ public class IoOrderDetailResultController extends BaseController { @Resource IBasicBussinessTypeService basicBussinessTypeService; @Resource - IoCodeService codeService; - @Resource private SystemPDFTemplateService systemPDFTemplateService; @Resource private SystemPDFModuleService systemPDFModuleService; @@ -149,15 +147,12 @@ public class IoOrderDetailResultController extends BaseController { if (StrUtil.isEmpty(filterErpOrderRequest.getOrderIdFk())) { return ResultVOUtils.error(500, "单据号不能为空！"); } - IoOrderEntity orderEntity = orderService.findByBillNo(filterErpOrderRequest.getOrderIdFk()); - BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); filterErpOrderRequest.setPage(null); filterErpOrderRequest.setLimit(null); List list = orderDetailResultService.filterList(filterErpOrderRequest); return ResultVOUtils.success(list); } - @Resource IoOrderDetailBizService orderDetailBizService; @Resource @@ -168,10 +163,8 @@ public class IoOrderDetailResultController extends BaseController { @AuthRuleAnnotation("") @GetMapping("/udiwms/inout/wditCheck/filterList") public BaseResponse waitCheckList(FilterOrderDetailResultRequest orderDetailResultRequest) { - List orderDetailBizEntities = orderDetailBizService.findByOrderId(orderDetailResultRequest.getOrderIdFk()); List orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailResultRequest.getOrderIdFk()); - return ResultVOUtils.success(checkInoutService.combineCheck(orderDetailBizEntities, orderDetailCodeEntities)); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java index 12d14557..0d7305bf 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java @@ -119,7 +119,6 @@ public class IoOrderInvoiceController extends BaseController { public BaseResponse deleteInvoice(@RequestBody DeleteRequest deleteRequest) { if (StrUtil.isEmpty(deleteRequest.getInvoiceEncode())) return ResultVOUtils.error(500, "发票编码不能为空"); - boolean b = ioOrderInvoiceService.remove(new QueryWrapper().eq("invoiceEncode", deleteRequest.getInvoiceEncode())); if (b) return ResultVOUtils.success("删除成功！"); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 122a77a8..604a7d6e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -102,7 +102,6 @@ public class IoOrderReviewController extends BaseController { acceptOrderEntity.setExitAccept(false); } return ResultVOUtils.success(acceptOrderEntity); - } //获取验收单据业务详情 @@ -327,7 +326,6 @@ public class IoOrderReviewController extends BaseController { supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); //设置状态为补录单据 } - supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); //设置导出状态为未导出 supplementOrder.setCorpOrderId(CustomUtil.getId() + "x"); //修改往来单位及当前库存号 @@ -559,15 +557,12 @@ public class IoOrderReviewController extends BaseController { SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); spsSyncDataRequest.setBillNo(reviewSpmsRequest.getBillNo()); return spsSyncDownloadService.findOrder(spsSyncDataRequest); - } - @AuthRuleAnnotation("") @PostMapping("/udiwms/order/getSimpleOrder") public BaseResponse getSimpleOrder(@RequestBody ReviewSpmsRequest reviewSpmsRequest) { - getUser(); if (StrUtil.isEmpty(reviewSpmsRequest.getBillNo())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderUploadController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderUploadController.java index d3841e25..6f2fb1c9 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderUploadController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderUploadController.java @@ -19,8 +19,6 @@ import java.util.ArrayList; @RestController public class IoOrderUploadController { - - private static final Logger logger = LoggerFactory.getLogger(IoOrderUploadController.class); @Value("${file_path}") private String filePath; @Value("${API_KEY}") @@ -35,7 +33,6 @@ public class IoOrderUploadController { public BaseResponse uploadFile(HttpServletRequest request, @RequestParam(value = "content" , required = false) String content, @RequestParam(value = "files", required = false) MultipartFile[] files) { - // return receiveFile(request,content,files); } @@ -67,7 +64,6 @@ public class IoOrderUploadController { // TODO Auto-generated catch block e.printStackTrace(); } - } return ResultVOUtils.success(null); diff --git a/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java b/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java index 874eeae3..db94f076 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java @@ -33,11 +33,9 @@ import java.util.List; @RequiredArgsConstructor public class IoStatDataController extends BaseController { - @Resource IoStatDataService ioStatDataService; - @GetMapping("/udiwms/inout/stat/filter") public void filterList(FilterStatDataRequest statDataRequest) { ioStatDataService.getData(statDataRequest); diff --git a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java index 972178a2..e37abb1c 100644 --- a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java +++ b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java @@ -35,7 +35,6 @@ public class ioCodeRelController { @GetMapping("/udi/ioCode/Rel/list") public BaseResponse list(IoOrderRelRequest ioOrderRelRequest) { - List list = ioCodeRelServicec.selectIoCodeRelList(ioOrderRelRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(list); @@ -48,7 +47,6 @@ public class ioCodeRelController { @GetMapping("/udi/ioCode/Rel/checkUpProduct") public BaseResponse checkUpProduct(String code) { - //判断码有没有重复 List list = ioCodeRelServicec.selectIoCodeRelByCode("", code); if (list.size() > 0) { @@ -145,7 +143,6 @@ public class ioCodeRelController { } else { return ResultVOUtils.error(999, "删除失败"); } - } diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java index 195bf2b5..db4b4300 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java @@ -35,7 +35,6 @@ public class DeviceInspectTakeController { @Resource DeviceInspectTaskService deviceInspectTaskService; - @Resource DeviceInspectTaskDetailService deviceInspectTaskDetailService; @Resource @@ -91,7 +90,6 @@ public class DeviceInspectTakeController { @PostMapping("/udiwms/inv/device/inspect/take/delectDeviceInspecTake") public BaseResponse delectDeviceInspecTake(@RequestBody DeviceInspectTaskEntity deviceInspectTaskEntity) { - deviceInspectTaskService.delectDeviceInspectTask(deviceInspectTaskEntity); return ResultVOUtils.success(deviceInspectTaskEntity); } diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderController.java b/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderController.java index f0d8ca2f..a115c639 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderController.java @@ -50,7 +50,6 @@ public class DeviceMAOrderController { @Resource private SystemPDFModuleService systemPDFModuleService; - /** * 查询设备养护记录列表 * diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceProjectSetController.java b/src/main/java/com/glxp/api/controller/inv/DeviceProjectSetController.java index a8c57ab7..5c5899fa 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceProjectSetController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceProjectSetController.java @@ -35,7 +35,6 @@ public class DeviceProjectSetController { */ @GetMapping("/udiwms/inv/device/project/set/filter") public BaseResponse filterList(DeviceProjectSetRequest deviceProjectSetRequest) { - List list = deviceProjectSetService.filterList(deviceProjectSetRequest); PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); @@ -77,7 +76,6 @@ public class DeviceProjectSetController { if(b){ return ResultVOUtils.error(999,"编码已存在!"); } - deviceProjectSetService.updateDevprojectSet(deviceProjectSetRequest); return ResultVOUtils.success("更新成功"); } @@ -92,7 +90,6 @@ public class DeviceProjectSetController { @GetMapping("/udiwms/inv/device/project/set/deleteDevprojectSet") public BaseResponse deleteDevprojectSet(String id) { deviceProjectSetService.deleteDevprojectSet(id); - return ResultVOUtils.success("删除成功"); } diff --git a/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java b/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java index 9057963b..58b16aae 100644 --- a/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java @@ -99,7 +99,6 @@ public class InnerOrderController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(innerOrderEntities); return ResultVOUtils.success(pageSimpleResponse); - } @@ -110,7 +109,6 @@ public class InnerOrderController { @PostMapping() @Log(title = "内部码", businessType = BusinessType.INSERT) public BaseResponse add(@RequestBody InnerOrderEntity innerOrderEntity) { - innerOrderService.insert(innerOrderEntity); return ResultVOUtils.success("新增成功！"); } @@ -152,7 +150,6 @@ public class InnerOrderController { */ @PostMapping("/list/detail") public BaseResponse detailList(@RequestBody InnerOrderDetailRequest innerOrderDetailRequest) { - List purApplyDetailEntities = innerOrderDetailService.joinQueryList(innerOrderDetailRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(purApplyDetailEntities); @@ -170,7 +167,6 @@ public class InnerOrderController { @PostMapping("/insertDetail") @Log(title = "内部码", businessType = BusinessType.INSERT) public BaseResponse detailAdd(@RequestBody InnerOrderDetailEntity innerOrderDetailEntity) { - innerOrderDetailService.insert(innerOrderDetailEntity); return ResultVOUtils.success(""); } @@ -221,7 +217,6 @@ public class InnerOrderController { @Log(title = "内部码", businessType = BusinessType.DELETE) public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { - innerOrderDetailService.deleteByIds(Arrays.asList(ids)); return ResultVOUtils.success("删除成功"); } diff --git a/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java index 67a75cbe..5e5e6fbf 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java @@ -95,7 +95,6 @@ public class InvCountOrderController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - if (null == invCountOrder) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } diff --git a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java index 66a0a627..ddbed9ce 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java @@ -51,7 +51,6 @@ public class InvInnerOrderPrintController { @Resource private InvInnerOrderPrintService invInnerOrderPrintService; - @Resource SystemPDFModuleService systemPDFModuleService; @Resource @@ -83,14 +82,12 @@ public class InvInnerOrderPrintController { @PostMapping("/udiwms/innerOrderPrint/addOrderPrint") @Log(title = "内部码", businessType = BusinessType.INSERT) public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) { - if (invInnerOrderprintReques.getOrderIdFk() != null) { invInnerOrderPrintService.addOrderList(invInnerOrderprintReques.getOrderIdFk()); } else { return ResultVOUtils.error(999, "参数错误！"); } return ResultVOUtils.success(); - } //-----------打印码 @@ -184,13 +181,10 @@ public class InvInnerOrderPrintController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(stockPrintTempEntities); return ResultVOUtils.success(pageSimpleResponse); - } else { Map data = new HashMap(); data.put("data", printEntities); JasperUtils.jasperReport(request, response, data, filePath + "/pdf/template/" + FileUtils.getLastFileName(systemPDFTemplateEntity.getPath()), "pdf"); - - } String orderId = ""; for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) { @@ -204,9 +198,7 @@ public class InvInnerOrderPrintController { //查询订单id InvInnerOrderPrintEntity innerOrderPrintEntity = invInnerOrderPrintService.selectById(orderId); - //更新内部码状态 - InnerOrderEntity innerOrderEntity = innerOrderService.findByRecordKey(innerOrderPrintEntity.getOrderIdFk()); if (innerOrderEntity != null) { innerOrderEntity.setGenStatus(2); @@ -214,13 +206,11 @@ public class InvInnerOrderPrintController { innerOrderService.update(innerOrderEntity); } - IoOrderEntity ioOrderEntity = new IoOrderEntity(); ioOrderEntity.setInCodeStatus(1); ioOrderEntity.setBillNo(innerOrderPrintEntity.getOrderIdFk()); ioOrderService.updateByBillNo(ioOrderEntity); return null; - } @@ -281,7 +271,6 @@ public class InvInnerOrderPrintController { } } - Map map = new HashMap<>(); map.put("data", printEntities); String param = JSON.toJSONString(map); @@ -310,7 +299,6 @@ public class InvInnerOrderPrintController { ioOrderEntity.setBillNo(innerOrderPrintEntity.getOrderIdFk()); ioOrderService.updateByBillNo(ioOrderEntity); return null; - } public PdfPrintCountEntity getCount(List countList, InnerOrderPrintResponse InnerOrderPrintResponse) { @@ -325,11 +313,8 @@ public class InvInnerOrderPrintController { @AuthRuleAnnotation("") @PostMapping("/udiwms/pdf/template/stock/qrcode/text/maxfile") public BaseResponse stockQRCodeMaxTextPDFFromTemplateFile(@RequestBody InnerOrderQRCodeTextPDFTemplateRequest innerOrderQRCodeTextPDFTemplateRequest) { - PageSimpleResponse pageSimpleResponse = invInnerOrderPrintService.print(innerOrderQRCodeTextPDFTemplateRequest); - return ResultVOUtils.success(pageSimpleResponse); - } @AuthRuleAnnotation("") diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java index 55db6c94..988bf2ab 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java @@ -39,12 +39,11 @@ public class InvPreinOrderController extends BaseController { InvPreinOrderService invPreinOrderService; @Resource InvPreinDetailService invPreinDetailService; - @Resource CustomerService customerService; + @GetMapping("/udiwms/inv/prein/filter") public BaseResponse filterOrder(FilterInvPreinRequest filterInvPreinRequest) { - if (!isHosUser()) { filterInvPreinRequest.setFromCorp(getCustomerId()); } @@ -69,13 +68,11 @@ public class InvPreinOrderController extends BaseController { @PostMapping("udiwms/inv/prein/delete") @Log(title = "预验收单据", businessType = BusinessType.DELETE) public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) { - if (StrUtil.isEmpty(deleteRequest.getBillNo())) return ResultVOUtils.error(500, "单据号不能为空"); invPreinOrderService.deleteByOrderId(deleteRequest.getBillNo()); invPreinDetailService.deleteByOrderId(deleteRequest.getBillNo()); return ResultVOUtils.success("删除成功！"); - } diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java index e0b39c1f..8a004c14 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java @@ -37,6 +37,7 @@ import java.util.List; @Slf4j @RestController public class InvPreinProductController extends BaseController { + @Resource private InvPreinProductDetailService invPreinProductDetailService; @Resource @@ -71,7 +72,6 @@ public class InvPreinProductController extends BaseController { filterInvPreinProductRequest.setSupId(getCustomerId()); } - List list = invPreinProductService.filterList(filterInvPreinProductRequest); PageInfo pageInfo = new PageInfo<>(list); InvPreProductPageResponse pageResponse = new InvPreProductPageResponse<>(); diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java index 70cc85af..6c440b6f 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java @@ -53,7 +53,6 @@ public class InvProductController extends BaseController { @Resource private CustomerService customerService; - /** * 库存列表查询接口 * @@ -67,7 +66,6 @@ public class InvProductController extends BaseController { filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode())); } - if (StrUtil.isBlank(filterInvProductRequest.getInvCode())) { List invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr()); if (CollUtil.isNotEmpty(invCodes)) { @@ -81,7 +79,6 @@ public class InvProductController extends BaseController { filterInvProductRequest.setSupId(getCustomerId()); } - List list = invProductService.filterListProduct(filterInvProductRequest); PageInfo pageInfo = new PageInfo<>(list); InvProductPageResponse pageResponse = new InvProductPageResponse(); diff --git a/src/main/java/com/glxp/api/controller/inv/InvRemindMsgController.java b/src/main/java/com/glxp/api/controller/inv/InvRemindMsgController.java index c61a1dc9..504834b9 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvRemindMsgController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvRemindMsgController.java @@ -34,7 +34,6 @@ public class InvRemindMsgController extends BaseController { */ @GetMapping("/udiwms/inv/remind/msg/filter") public BaseResponse filterList(FilterInvRemindMsgRequest filterInvRemindMsgRequest) { - if (!isHosUser()) { filterInvRemindMsgRequest.setSupId(getCustomerId()); diff --git a/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java b/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java index 4e7f9c0b..57c1042f 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java @@ -100,7 +100,7 @@ public class InvRemindSetController { /** * 通过库存ID查询生成库存预警设置的信息 * - * @param invId + * @param filterInvRemindSetRequest * @return */ @GetMapping("/udiwms/inv/remind/set/getInfoByInvId") diff --git a/src/main/java/com/glxp/api/controller/inv/InvSickTraceController.java b/src/main/java/com/glxp/api/controller/inv/InvSickTraceController.java index 0b3a0014..8e2ebcd3 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvSickTraceController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvSickTraceController.java @@ -26,7 +26,6 @@ public class InvSickTraceController { @Resource BasicCorpService basicCorpService; - @AuthRuleAnnotation("") @GetMapping("spms/inv/sick/order/trace") public BaseResponse filterSickTrace(FilterSickTraceRequest filterSickTraceRequest) { @@ -42,8 +41,7 @@ public class InvSickTraceController { FilterOrderRequest orderFilterRequest = new FilterOrderRequest(); orderFilterRequest.setFromCorp(basicCorpEntity.getErpId()); List orderEntityList = orderService.filterList(orderFilterRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(orderEntityList); + PageInfo pageInfo = new PageInfo<>(orderEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(orderEntityList); diff --git a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java index 6f290797..36999548 100644 --- a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java @@ -39,7 +39,6 @@ import java.util.stream.Collectors; @RestController public class UdiTraceController { - @Resource UdiRelevanceService udiRelevanceService; @Resource @@ -119,9 +118,7 @@ public class UdiTraceController { return udiTraceResponse; }).collect(Collectors.toList()); - - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiTraceResponseList); + PageInfo pageInfo = new PageInfo<>(udiTraceResponseList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiTraceResponseList); diff --git a/src/main/java/com/glxp/api/controller/inv/VailInvController.java b/src/main/java/com/glxp/api/controller/inv/VailInvController.java index 853e0be7..f4db295c 100644 --- a/src/main/java/com/glxp/api/controller/inv/VailInvController.java +++ b/src/main/java/com/glxp/api/controller/inv/VailInvController.java @@ -31,6 +31,7 @@ import java.util.List; */ @RestController public class VailInvController { + @Resource private InvProductService invProductService; @Resource @@ -44,7 +45,6 @@ public class VailInvController { @AuthRuleAnnotation("") @GetMapping("/spms/inv/product/vail") public BaseResponse invProductVail(FilterInvProductRequest filterInvProductRequest) { - List list = invProductService.filterListProduct(filterInvProductRequest); PageInfo pageInfo = new PageInfo<>(list); InvProductPageResponse pageResponse = new InvProductPageResponse(); @@ -56,7 +56,6 @@ public class VailInvController { @AuthRuleAnnotation("") @GetMapping("/spms/inv/pre/product/vail") public BaseResponse invPreProductVail(FilterInvPreProductRequest filterInvProductRequest) { - List list = invPreProductService.filterList(filterInvProductRequest); PageInfo pageInfo = new PageInfo<>(list); InvProductPageResponse pageResponse = new InvProductPageResponse(); diff --git a/src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java b/src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java index f9a298e5..d8b538f9 100644 --- a/src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java +++ b/src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java @@ -35,10 +35,8 @@ public class SysLogininforController extends BaseController { @SaCheckPermission("monitor:logininfor:list") @GetMapping("/list") public BaseResponse list(FilterLoginLogRequest filterLoginLogRequest) { - List selectLogininforList = logininforService.selectLogininforList(filterLoginLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(selectLogininforList); + PageInfo pageInfo = new PageInfo<>(selectLogininforList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(selectLogininforList); diff --git a/src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java b/src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java index ab71b1e6..8bbbdf26 100644 --- a/src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java +++ b/src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java @@ -34,17 +34,14 @@ public class SysOperlogController extends BaseController { @SaCheckPermission("monitor:operlog:list") @GetMapping("/list") public BaseResponse list(FilterOperLogRequest filterOperLogRequest) { - List selectOperLogList = operLogService.selectOperLogList(filterOperLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(selectOperLogList); + PageInfo pageInfo = new PageInfo<>(selectOperLogList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(selectOperLogList); return ResultVOUtils.success(pageSimpleResponse); } - /** * 批量删除操作日志记录 * @@ -54,7 +51,6 @@ public class SysOperlogController extends BaseController { @SaCheckPermission("monitor:operlog:remove") @DeleteMapping("/{operIds}") public BaseResponse remove(@PathVariable Long[] operIds) { - int i = operLogService.deleteOperLogByIds(operIds); return ResultVOUtils.success("删除成功！"); } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index 85606c90..154e7f23 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -62,13 +62,10 @@ public class PurApplyController { PurPlanService purPlanService; @Resource PurPlanDetailService purPlanDetailService; - - @Resource CustomerService customerService; @Resource GennerOrderUtils gennerOrderUtils; - IBasicBussinessTypeService basicBussinessTypeService; /** * 新增申购单 @@ -149,7 +146,6 @@ public class PurApplyController { @Log(title = "审核申购单", businessType = BusinessType.INSERT) public BaseResponse auditOrder(@RequestBody PurApplyResponse purApplyRequest) { - Long userId = customerService.getUserId(); PurApplyEntity purApplyEntity = new PurApplyEntity(); BeanUtil.copyProperties(purApplyRequest, purApplyEntity); @@ -203,7 +199,6 @@ public class PurApplyController { @PostMapping("/purchase/apply") @Log(title = "申购单", businessType = BusinessType.INSERT) public BaseResponse add(@RequestBody PurApplyEntity purApplyRequest) { - purApplyService.insert(purApplyRequest); return ResultVOUtils.success("新增成功！"); } @@ -235,8 +230,6 @@ public class PurApplyController { purApplyDetailService.deleteByOrderId(id + ""); } } - - return ResultVOUtils.success("删除成功"); } @@ -246,7 +239,6 @@ public class PurApplyController { */ @GetMapping("/purchase/apply/list/detail") public BaseResponse detailList(PurApplyDetailRequest purApplyDetailRequest) { - List purApplyDetailEntities = purApplyDetailService.joinQueryList(purApplyDetailRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(purApplyDetailEntities); @@ -254,7 +246,6 @@ public class PurApplyController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyDetailEntities); return ResultVOUtils.success(pageSimpleResponse); - } /** @@ -264,7 +255,6 @@ public class PurApplyController { @PostMapping("/purchase/apply/detail") @Log(title = "申购单", businessType = BusinessType.INSERT) public BaseResponse detailAdd(@RequestBody PurApplyDetailEntity purApplyDetailEntity) { - purApplyDetailService.insert(purApplyDetailEntity); return ResultVOUtils.success("新增成功"); } @@ -289,7 +279,6 @@ public class PurApplyController { @Log(title = "申购单", businessType = BusinessType.DELETE) public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { - purApplyDetailService.deleteByIds(Arrays.asList(ids)); return ResultVOUtils.success("删除成功"); } @@ -302,7 +291,6 @@ public class PurApplyController { @PostMapping("/purchase/apply/addDetail") @Log(title = "申购单", businessType = BusinessType.INSERT) public BaseResponse addDetail(@RequestBody PurApplyDetailEntity purApplyDetailEntity) { - purApplyDetailService.insert(purApplyDetailEntity); return ResultVOUtils.success(purApplyDetailEntity.getOrderIdFk()); } @@ -313,7 +301,6 @@ public class PurApplyController { @PostMapping("/purchase/apply/add") @Log(title = "申购单", businessType = BusinessType.INSERT) public BaseResponse add() { - Long userId = customerService.getUserId(); PurApplyEntity purApplyEntity = new PurApplyEntity(); purApplyEntity.setCreateUser(userId + ""); @@ -333,7 +320,6 @@ public class PurApplyController { @PostMapping("/purchase/apply/delApplyDetailAll") @Log(title = "申购单", businessType = BusinessType.DELETE) public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { - if(purApplyEntity.getId()!=null){ purApplyService.deleteById(purApplyEntity.getId()); purApplyDetailService.deleteByOrderId(purApplyEntity.getId() + "" ); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java b/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java index ad42e043..03740195 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java @@ -54,13 +54,10 @@ import java.util.stream.Collectors; @RestController public class PurArrivalController extends BaseController { - @Resource PurArrivalService purArrivalService; - @Resource PurArrivalDetailService purArrivalDetailService; - @Resource CustomerService customerService; @Resource @@ -69,7 +66,6 @@ public class PurArrivalController extends BaseController { IoOrderService ioOrderService; @Resource IoOrderDetailBizService ioOrderDetailBizService; - @Resource InvWarehouseService invWarehouseService; @@ -84,7 +80,6 @@ public class PurArrivalController extends BaseController { Long userId = getUserId(); PurArrivalEntity purArrivalEntity = purArrivalRequest.getPurArrivalEntity(); - purArrivalEntity.setCreateUser(userId + ""); purArrivalEntity.setCreateTime(new Date()); purArrivalEntity.setUpdateTime(new Date()); @@ -118,13 +113,11 @@ public class PurArrivalController extends BaseController { } List purArrivalResponses = purArrivalService.queryPageList(purArrivalRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purArrivalResponses); + PageInfo pageInfo = new PageInfo<>(purArrivalResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purArrivalResponses); return ResultVOUtils.success(pageSimpleResponse); - } @@ -144,7 +137,6 @@ public class PurArrivalController extends BaseController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purArrivalResponses); return ResultVOUtils.success(pageSimpleResponse); - } @@ -164,17 +156,12 @@ public class PurArrivalController extends BaseController { String billNo = ""; List purOrderDetailEntities = purArrivalDetailService.findByOrderId(purArrivalEntity.getId() + ""); - if (postPurArrivalRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) { - - - if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurArrivalRequest.isAutoPurchase() == true && StrUtil.isNotEmpty(postPurArrivalRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurArrivalRequest.getTargetBillAction())) { //对计划单里面的供应商进行分组 Map> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurArrivalDetailEntity::getSupId)); - for (Map.Entry> m : map.entrySet()) { //生产单据表信息 IoOrderEntity ioOrderEntity = new IoOrderEntity(); @@ -231,7 +218,6 @@ public class PurArrivalController extends BaseController { */ @GetMapping("/purchase/arrival/list/detail") public BaseResponse detailList(PurOrderDetailRequest purApplyDetailRequest) { - List purOrderDetailResponseList = purArrivalDetailService.joinQueryList(purApplyDetailRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(purOrderDetailResponseList); @@ -239,7 +225,6 @@ public class PurArrivalController extends BaseController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purOrderDetailResponseList); return ResultVOUtils.success(pageSimpleResponse); - } @@ -249,14 +234,12 @@ public class PurArrivalController extends BaseController { @PostMapping("/purchase/arrival/addOrderDetail") @Log(title = "采购单", businessType = BusinessType.INSERT) public BaseResponse addOrderDetail(@RequestBody PurArrivalDetailEntity purOrderDetailEntity) { - boolean falg = purArrivalDetailService.insert(purOrderDetailEntity); if (falg) { return ResultVOUtils.success("添加成功"); } else { return ResultVOUtils.success("添加失败"); } - } @@ -315,12 +298,10 @@ public class PurArrivalController extends BaseController { @Log(title = "采购订单", businessType = BusinessType.DELETE) public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { - purArrivalDetailService.deleteByIds(Arrays.asList(ids)); return ResultVOUtils.success("删除成功"); } - @Resource PurDeliveryDetailService purDeliveryDetailService; @@ -330,8 +311,6 @@ public class PurArrivalController extends BaseController { @PostMapping("/purchase/arrival/addPlanDetailAndOrder") @Log(title = "送货单", businessType = BusinessType.INSERT) public BaseResponse addPlanDetailAndOrder(@RequestBody PurArrivalRequest purArrivalRequest) { - - List purDeliveryDetailEntities = purDeliveryDetailService.findByOrderId(purArrivalRequest.getPurDeliveryId() + ""); List purArrivalDetailEntities = purDeliveryDetailEntities.stream() .map(e -> { diff --git a/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java b/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java index 71af97c2..4abc7ff4 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java @@ -135,7 +135,6 @@ public class PurDeliveryController extends BaseController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purDeliveryResponses); return ResultVOUtils.success(pageSimpleResponse); - } @@ -155,7 +154,6 @@ public class PurDeliveryController extends BaseController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purDeliveryResponses); return ResultVOUtils.success(pageSimpleResponse); - } @@ -247,7 +245,6 @@ public class PurDeliveryController extends BaseController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purDeliveryDetailResponses); return ResultVOUtils.success(pageSimpleResponse); - } /** @@ -446,7 +443,6 @@ public class PurDeliveryController extends BaseController { @Log(title = "采购订单", businessType = BusinessType.DELETE) public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { - purDeliveryDetailService.deleteByIds(Arrays.asList(ids)); return ResultVOUtils.success("删除成功"); } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index 791e86e2..fbb6a7ea 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -57,12 +57,10 @@ public class PurOrderController { @Resource PurOrderService purOrderService; - @Resource PurPlanDetailService purPlanDetailService; @Resource PurOrderDetailService purOrderDetailService; - @Resource CustomerService customerService; @Resource @@ -85,7 +83,6 @@ public class PurOrderController { Long userId = customerService.getUserId(); PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity(); - purOrderEntity.setCreateUser(userId + ""); purOrderEntity.setCreateTime(new Date()); purOrderEntity.setUpdateTime(new Date()); @@ -122,13 +119,11 @@ public class PurOrderController { purOrderRequest.setSupId(customerId); } List purApplyEntities = purOrderService.queryPageList(purOrderRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyEntities); + PageInfo pageInfo = new PageInfo<>(purApplyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyEntities); return ResultVOUtils.success(pageSimpleResponse); - } @@ -167,7 +162,6 @@ public class PurOrderController { //对计划单里面的供应商进行分组 Map> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId)); - if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase() == true && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())) { @@ -220,7 +214,6 @@ public class PurOrderController { } - return ResultVOUtils.success("更新成功！"); } @@ -307,13 +300,11 @@ public class PurOrderController { public BaseResponse detailList(PurOrderDetailRequest purApplyDetailRequest) { List purOrderDetailResponseList = purOrderDetailService.joinQueryList(purApplyDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purOrderDetailResponseList); + PageInfo pageInfo = new PageInfo<>(purOrderDetailResponseList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purOrderDetailResponseList); return ResultVOUtils.success(pageSimpleResponse); - } @@ -322,7 +313,6 @@ public class PurOrderController { */ @GetMapping("/purchase/order/drug/list/detail") public BaseResponse drugDetailList(PurOrderDetailRequest purApplyDetailRequest) { - List purOrderDetailResponseList = purOrderDetailService.joinQueryDrugList(purApplyDetailRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(purOrderDetailResponseList); @@ -330,7 +320,6 @@ public class PurOrderController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purOrderDetailResponseList); return ResultVOUtils.success(pageSimpleResponse); - } /** @@ -344,7 +333,6 @@ public class PurOrderController { if (purOrderRequest.getApplyId() == null || purOrderRequest.getId() == null) { return ResultVOUtils.error(999, "参数错误！"); } - //查询申购单详情 PurPlanDetailRequest purPlanDetailRequest = new PurPlanDetailRequest(); purPlanDetailRequest.setOrderIdFk(purOrderRequest.getApplyId() + ""); @@ -366,7 +354,6 @@ public class PurOrderController { PurOrderDetailRequest.setOrderIdFk(purOrderRequest.getId() + ""); List purOrderDetailEntities = purOrderDetailService.getPurOrderDetailEntityList(PurOrderDetailRequest); - List ids = new ArrayList<>(); for (PurOrderDetailEntity obj : purOrderDetailEntities) { for (PurOrderDetailEntity obj1 : purOrderDetailEntityList) { @@ -435,7 +422,6 @@ public class PurOrderController { @PostMapping("/purchase/order/delOrderDetailAll") @Log(title = "申购单", businessType = BusinessType.DELETE) public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { - if (purApplyEntity.getId() != null) { purOrderService.deleteById(purApplyEntity.getId()); purOrderDetailService.deleteByOrderId(purApplyEntity.getId() + ""); @@ -465,7 +451,6 @@ public class PurOrderController { @Log(title = "采购订单", businessType = BusinessType.DELETE) public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { - purOrderDetailService.deleteByIds(Arrays.asList(ids)); return ResultVOUtils.success("删除成功"); } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index 46b3978f..67d0177a 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -73,7 +73,6 @@ public class PurPlanController { PurApplyDetailService purApplyDetailService; @Resource PurPlanDetailService purPlanDetailService; - @Resource CustomerService customerService; @Resource @@ -95,7 +94,6 @@ public class PurPlanController { Long userId = customerService.getUserId(); PurPlanEntity purPlanEntity = postPurPlanRequest.getPurPlanEntity(); - purPlanEntity.setCreateUser(userId + ""); purPlanEntity.setCreateTime(new Date()); purPlanEntity.setUpdateTime(new Date()); @@ -113,8 +111,6 @@ public class PurPlanController { purPlanService.update(purPlanEntity); } - - return ResultVOUtils.success("提交成功！"); } @@ -136,7 +132,6 @@ public class PurPlanController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyEntities); return ResultVOUtils.success(pageSimpleResponse); - } @@ -156,7 +151,6 @@ public class PurPlanController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyEntities); return ResultVOUtils.success(pageSimpleResponse); - } /** @@ -259,7 +253,6 @@ public class PurPlanController { */ @GetMapping("/purchase/plan/list/detail") public BaseResponse detailList(PurPlanDetailRequest purApplyDetailRequest) { - List purApplyDetailEntities = purPlanDetailService.joinQueryList(purApplyDetailRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(purApplyDetailEntities); @@ -267,7 +260,6 @@ public class PurPlanController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyDetailEntities); return ResultVOUtils.success(pageSimpleResponse); - } /** @@ -302,7 +294,6 @@ public class PurPlanController { purPlanDetailRequest.setOrderIdFk(purPlanRequest.getId() + ""); List purApplyDetailEntities=purPlanDetailService.getPurPlanDetailEntityList(purPlanDetailRequest); - List ids=new ArrayList<>(); for (PurPlanDetailEntity obj:purApplyDetailEntities){ for (PurPlanDetailEntity obj1:purPlanDetailEntityList){ @@ -342,7 +333,6 @@ public class PurPlanController { }else { return ResultVOUtils.success("添加失败"); } - } @@ -400,7 +390,6 @@ public class PurPlanController { @Log(title = "采购计划", businessType = BusinessType.DELETE) public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { - purPlanDetailService.deleteByIds(Arrays.asList(ids)); return ResultVOUtils.success("删除成功"); } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java b/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java index 8eaa6b03..16023096 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java @@ -56,10 +56,8 @@ public class PurReturnedController extends BaseController { @Resource PurReturnedService purReturnedService; - @Resource PurReturnedDetailService purReturnedDetailService; - @Resource CustomerService customerService; @Resource @@ -118,13 +116,11 @@ public class PurReturnedController extends BaseController { } List purReturnedResponses = purReturnedService.queryPageList(purReturnedRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purReturnedResponses); + PageInfo pageInfo = new PageInfo<>(purReturnedResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purReturnedResponses); return ResultVOUtils.success(pageSimpleResponse); - } @@ -138,8 +134,7 @@ public class PurReturnedController extends BaseController { purReturnedRequest.setStatus(10); //查询未审核和已审核状态 } List purReturnedResponses = purReturnedService.queryPageList(purReturnedRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purReturnedResponses); + PageInfo pageInfo = new PageInfo<>(purReturnedResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purReturnedResponses); @@ -164,7 +159,6 @@ public class PurReturnedController extends BaseController { String billNo = ""; List purReturnedDetailEntities = purReturnedDetailService.findByOrderId(purReturnedEntity.getId() + ""); - if (postPurReturnedRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) { if (CollUtil.isNotEmpty(purReturnedDetailEntities) && postPurReturnedRequest.isAutoPurchase() == true @@ -312,7 +306,6 @@ public class PurReturnedController extends BaseController { @Log(title = "采购订单", businessType = BusinessType.DELETE) public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { - purReturnedDetailService.deleteByIds(Arrays.asList(ids)); return ResultVOUtils.success("删除成功"); } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index 7cbd7527..9eac7f54 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -58,10 +58,8 @@ public class SupCertController { private AuthAdminService authAdminService; @Resource private SupCertService supCertService; - @Value("${file_path}") private String filePath; - @Resource private SystemPDFTemplateService systemPDFTemplateService; @Resource @@ -77,71 +75,13 @@ public class SupCertController { } List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(supCertEntityList); + PageInfo pageInfo = new PageInfo<>(supCertEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(supCertEntityList); return ResultVOUtils.success(pageSimpleResponse); } - - private BaseResponse insertCompanyCert(String customerId, PostSelCertRequest request) { - if (CollUtil.isEmpty(request.getSupCertSetEntities())) { - return ResultVOUtils.error(500, "请选入资质证书！"); - } - if (request.getCertType() == null) { - return ResultVOUtils.error(500, "参数错误！"); - } - - int certType = request.getCertType(); - String productIdFk = request.getProductIdFk(); - String manufacturerIdFk = request.getManufacturerIdFk(); - - String errMsg = ""; - ArrayList list = new ArrayList<>(); - int i = request.getSupCertSetEntities().size(); - for (SupCertSetEntity supCertSetEntity : request.getSupCertSetEntities()) { - i--; - FilterSupCertRequest supCertRequest = new FilterSupCertRequest(); - supCertRequest.setName(supCertSetEntity.getName()); - supCertRequest.setCustomerId(customerId); - supCertRequest.setManufacturerIdFk(manufacturerIdFk); - if (productIdFk != null) { - supCertRequest.setProductIdFk(productIdFk); - supCertRequest.setType(3); - } else { - supCertRequest.setType(2); - } - - List supCertEntities = supCertService.selectCompanyCert(supCertRequest); - if (!supCertEntities.isEmpty()) { - list.add(supCertEntities.get(0).getName()); - if (i == 0) { - errMsg = list.stream().map(s -> "," + s).collect(Collectors.joining()); - return ResultVOUtils.error(999, errMsg.substring(1) + "已存在！"); - } - } - } - - for (SupCertSetEntity supCertSetEntity : request.getSupCertSetEntities()) { - SupCertEntity supCertEntity = new SupCertEntity(); - supCertEntity.setName(supCertSetEntity.getName()); - supCertEntity.setManufacturerIdFk(manufacturerIdFk); - supCertEntity.setProductIdFk(productIdFk); - supCertEntity.setCustomerId(customerId); - supCertEntity.setType(certType); - supCertEntity.setCreateTime(new Date()); - supCertEntity.setStatus(0); - supCertEntity.setAuditStatus(ConstantStatus.AUDIT_DRAFT); - supCertEntity.setUpdateTime(new Date()); - supCertEntity.setId(IdUtil.getSnowflakeNextId()); - boolean b = supCertService.insertCompanyCert(supCertEntity); - } - return ResultVOUtils.success("成功"); - } - - @AuthRuleAnnotation("") @PostMapping("/sup/info/selectAllCert") @Log(title = "资质证书", businessType = BusinessType.INSERT) @@ -288,8 +228,6 @@ public class SupCertController { supProductEntity.setAuditStatus(ConstantStatus.AUDIT_UN); supProductService.modifyRegistration(supProductEntity); } - - return ResultVOUtils.success("成功"); } @@ -308,14 +246,12 @@ public class SupCertController { SupCertEntity supCertEntity = new SupCertEntity(); BeanUtil.copyProperties(postSupCertRequest, supCertEntity); - if (postSupCertRequest.getVailDate() != null && postSupCertRequest.getExpireDate() != null) { if (postSupCertRequest.getVailDate().getTime() > postSupCertRequest.getExpireDate().getTime()) { return ResultVOUtils.error(999, "失效期不能小于生效期！"); } } - if (postSupCertRequest.getRepeatUpload() == 1) { //已审核的重新提交 //1.修改对应的资质信息进入变更审核状态， @@ -409,7 +345,6 @@ public class SupCertController { List list = new ArrayList<>(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式 - //查询配送企业信息 SupCompanyEntity supCompanyEntity = supCompanyService.findCompany(purPlanPrintRequest.getCustomerId()); //查询详情 @@ -520,7 +455,6 @@ public class SupCertController { List list = new ArrayList<>(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式 - FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest(); filterSupManufacturerRequest.setId(purPlanPrintRequest.getId()); //查询生产企业信息 @@ -608,9 +542,7 @@ public class SupCertController { supData.put("productType", supProductEntity.getProductType() == null ? ' ' : supProductEntity.getProductType()); supData.put("productDirectoryCode", supProductEntity.getProductDirectoryCode() == null ? ' ' : supProductEntity.getProductDirectoryCode()); supData.put("specification", supProductEntity.getSpecification() == null ? ' ' : supProductEntity.getSpecification()); -// supData.put("cpms", supProductEntity.getCpms() == null ? ' ' : supProductEntity.getCpms()); supData.put("remark1", supProductEntity.getRemark() == null ? ' ' : supProductEntity.getRemark()); - supData.put("index", String.valueOf(i)); supData.put("name", obj.getName() == null ? ' ' : obj.getName()); supData.put("code", obj.getCode() == null ? ' ' : obj.getCode()); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java index fee52faa..6f03c763 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java @@ -43,8 +43,7 @@ public class SupCertSetController { List supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(supCertEntityList); + PageInfo pageInfo = new PageInfo<>(supCertEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(supCertEntityList); @@ -107,7 +106,6 @@ public class SupCertSetController { @PostMapping("/sup/cert/set/delete") @Log(title = "资质证书", businessType = BusinessType.DELETE) public BaseResponse deleteCertSet(@RequestBody DeleteRequest deleteRequest) { - boolean b = supCertSetService.deleteById(deleteRequest.getId()); return ResultVOUtils.success("删除成功！"); } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java index 0cf90702..f503f4da 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java @@ -52,9 +52,6 @@ import java.util.ListIterator; @RestController public class SupCompanyController { - @Value("${file_path}") - private String filePath; - @Resource private AuthAdminService authAdminService; @Resource @@ -78,7 +75,6 @@ public class SupCompanyController { @AuthRuleAnnotation("") @GetMapping("/api/pur/getSupComapnys") public BaseResponse getSupComapnys(FilterSupCompanyRequest companyRequest) { - System.out.println(companyRequest.toString()); List companyEntities = companyService.filterCompany(companyRequest); PageInfo pageInfo = new PageInfo<>(companyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -92,8 +88,6 @@ public class SupCompanyController { @PostMapping("/api/pur/addCompany") @Log(title = "资质证书", businessType = BusinessType.INSERT) public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) { - - //判断是不是存在草稿 if (companyEntity.getAuditStatus() == 6) { List supCertEntityList = supCertService.findAll(companyEntity.getCustomerId()); @@ -132,8 +126,6 @@ public class SupCompanyController { } return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); } - - } String customerId = CustomUtil.getId(); //重新生成customerId @@ -191,7 +183,6 @@ public class SupCompanyController { } } } - } String errMsg = ""; if (supCertSetEntities.size() > 0) { @@ -202,7 +193,6 @@ public class SupCompanyController { } } - companyEntity.setUpdateTime(new Date()); boolean b = companyService.modifyCompany(companyEntity); CustomerContactEntity customerContactEntity = new CustomerContactEntity(); @@ -223,7 +213,6 @@ public class SupCompanyController { @Log(title = "资质证书", businessType = BusinessType.UPDATE) public BaseResponse auditCompany(@RequestBody SupCompanyEntity companyEntity) { - if (companyEntity.getAuditStatus() == 1) { //查询用户上传的证书 FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); @@ -251,9 +240,7 @@ public class SupCompanyController { } } } - } - String errMsg = ""; if (supCertSetEntities.size() > 0) { return ResultVOUtils.error(500, "必传证书不齐全！"); } @@ -293,7 +280,6 @@ public class SupCompanyController { } } - AuthAdmin authAdmin = getUser(); companyEntity.setAuditor(authAdmin.getId() + ""); companyEntity.setAuditTime(new Date()); @@ -323,7 +309,6 @@ public class SupCompanyController { if (!basicCorpDao.exists(new QueryWrapper().eq("erpId", companyEntity.getCustomerId()))) { basicCorpEntity.setId(IdUtil.getSnowflakeNextId()); basicCorpService.insert(basicCorpEntity); - } else { } //更新移除预警信息 @@ -366,7 +351,6 @@ public class SupCompanyController { @GetMapping("api/pur/supCompany/getRoId") public BaseResponse getRoId(String companyId) { CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(companyId); - return ResultVOUtils.success(customerInfoEntity); } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java index 7dd86796..3a00d31c 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java @@ -43,7 +43,6 @@ import java.util.Objects; @RestController public class SupManufacturerController { - @Resource private AuthAdminService authAdminService; @Resource @@ -54,8 +53,6 @@ public class SupManufacturerController { private SupCompanyService supCompanyService; @Resource SupCertSetService supCertSetService; - @Resource - private CompanyService companyService; @AuthRuleAnnotation("") @GetMapping("/sup/manufacturer/getCompanyInfo") @@ -82,7 +79,6 @@ public class SupManufacturerController { @AuthRuleAnnotation("") @GetMapping("/sup/manufacturer/getCompanyBySup") public BaseResponse getCompanyBySup(FilterSupManufacturerRequest filterSupManufacturerRequest) { -// filterSupManufacturerRequest.setCustomerId(getCustomerId()); List companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); PageInfo pageInfo = new PageInfo<>(companyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -166,8 +162,6 @@ public class SupManufacturerController { } else { iterable.remove(); } - - } String errMsg = ""; if (supCertSetEntities.size() > 0) { @@ -176,8 +170,6 @@ public class SupManufacturerController { } return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); } - - } supManufacturerEntity.setCreateTime(new Date()); @@ -270,8 +262,6 @@ public class SupManufacturerController { } else { iterable.remove(); } - - } String errMsg = ""; if (supCertSetEntities.size() > 0) { @@ -280,11 +270,8 @@ public class SupManufacturerController { } return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); } - - } - supManufacturerEntity.setUpdateTime(new Date()); SupManufacturerEntity originEntity = supManufacturerService.findManufacturer(supManufacturerEntity.getManufacturerId()); boolean b = supManufacturerService.modifyCompany(supManufacturerEntity); @@ -310,7 +297,6 @@ public class SupManufacturerController { return ResultVOUtils.error(500, "参数错误！"); } - if (supManufacturerEntity.getAuditStatus() == 1 || supManufacturerEntity.getAuditStatus() == 4) { //查询上传的资质证书 FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); @@ -403,7 +389,6 @@ public class SupManufacturerController { else { return ResultVOUtils.error(500, "删除失败"); } - } public String getCustomerId() { diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index 25e876bd..19a21501 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -50,6 +50,7 @@ import java.util.ListIterator; @RestController public class SupProductController { + @Resource private AuthAdminService authAdminService; @Resource @@ -67,7 +68,6 @@ public class SupProductController { @AuthRuleAnnotation("") @GetMapping("/sup/product/getRegistrationInfo") - public BaseResponse getRegistrationInfo(FilterPoductRequest filterPoductRequest) { SupProductEntity supProductEntity = supProductService.findRegistration(filterPoductRequest.getId()); if (supProductEntity != null) { diff --git a/src/main/java/com/glxp/api/controller/sup/CustomerController.java b/src/main/java/com/glxp/api/controller/sup/CustomerController.java index 75af133f..374a5c89 100644 --- a/src/main/java/com/glxp/api/controller/sup/CustomerController.java +++ b/src/main/java/com/glxp/api/controller/sup/CustomerController.java @@ -60,13 +60,12 @@ public class CustomerController { private AlihealthUtils alihealthUtils; @Value("${ALIHEALTH_URL:http://gw.api.taobao.com/router/rest}") private String alihealthUrl; + @AuthRuleAnnotation("") @GetMapping("/spms/customer/list") public BaseResponse filterCustomers(CustomerInfoFilterRequest customerFilterRequest) { - List customerDetailEntities = customerInfoService.filterCustomerInfo(customerFilterRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(customerDetailEntities); + PageInfo pageInfo = new PageInfo<>(customerDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(customerDetailEntities); @@ -82,8 +81,7 @@ public class CustomerController { DictDto dictDto = new DictDto(s.getCustomerId().toString(),s.getCompanyName()); return dictDto; }).collect(Collectors.toList()); - PageInfo pageInfo; - pageInfo = new PageInfo<>(reList); + PageInfo pageInfo = new PageInfo<>(reList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(reList); @@ -171,7 +169,6 @@ public class CustomerController { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } - return ResultVOUtils.success("更新成功"); } diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java index 362b7fcf..7c7ca0ae 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java @@ -40,10 +40,14 @@ import java.util.Date; @Slf4j public class SpsSyncBasicController { - private final UdiRelevanceDao udiRelevanceDao; - private final BasicProductsDao basicProductsDao; - private final CompanyProductRelevanceDao relevanceDao; - private final UdiProductService udiProductService; + @Resource + UdiRelevanceDao udiRelevanceDao; + @Resource + BasicProductsDao basicProductsDao; + @Resource + CompanyProductRelevanceDao relevanceDao; + @Resource + UdiProductService udiProductService; @Resource ThrProductsAddDiDao thrProductsAddDiDao; @Resource diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index d119c7b7..b857a11b 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -128,15 +128,14 @@ public class SpsSyncDownloadController { WarehouseBussinessTypeDao warehouseBussinessTypeDao; @Resource WarehouseUserDao warehouseUserDao; - private final InvSpaceDao invSpaceDao; - + @Resource + InvSpaceDao invSpaceDao; // 下发单据接口 ，供给中继服务，UDI管理系统下载 @AuthRuleAnnotation("") @GetMapping("sps/sync/order") public BaseResponse getOrder(SpsSyncDataRequest spsSyncDataRequest) { BasicExportStatusEntity basicExportStatusEntity = basicExportService.findByData(ConstantStatus.SYNC_SCAN_ORDER, 3); - String logs = ""; BaseResponse baseResponse = new BaseResponse<>(); if (basicExportStatusEntity != null) { if (StrUtil.isBlank(basicExportStatusEntity.getCacheFilePath())) { @@ -171,7 +170,6 @@ public class SpsSyncDownloadController { BaseResponse baseResponse = ResultVOUtils.error(ResultEnum.NOT_NETWORK.getCode(), ""); BasicExportStatusEntity basicExportStatusEntity = basicExportService.findByData(ConstantStatus.SYNC_DI_PRODUCTS, 3); - String logs = ""; if (basicExportStatusEntity != null) { baseResponse = spsSyncDownloadService.syncUdi(spsSyncDataRequest); @@ -291,14 +289,6 @@ public class SpsSyncDownloadController { } catch (IOException e) { throw new RuntimeException(e); } - // 修改任务状态 -// basicExportService.update(Wrappers.lambdaUpdate(BasicExportStatusEntity.class) -// .set(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.COMPLETED.getCode()) -// .set(BasicExportStatusEntity::getUpdateTime, new Date()) -// .set(BasicExportStatusEntity::getEndTime, new Date()) -// .eq(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.WAIT_SYNC.getCode()) -// .eq(BasicExportStatusEntity::getId, one.getId()) -// ); } } baseResponse.setCode(ResultVOUtils.success().getCode()); @@ -567,20 +557,6 @@ public class SpsSyncDownloadController { } } - - private final IoCodeLostMapper ioCodeLostMapper; - private final IoCodeRelMapper ioCodeRelMapper; - private final BasicHospTypeDao basicHospTypeDao; - private final UdiRelevanceDao udiRelevanceDao; - private final BasicProductsDao basicProductsDao; - private final CompanyProductRelevanceDao relevanceDao; - private final BasicCorpDao corpDao; - private final SupCertDao supCertDao; - private final SupCertSetDao supCertSetDao; - private final SupCompanyDao supCompanyDao; - private final SupManufacturerDao supManufacturerDao; - private final SupProductDao supProductDao; - @Resource DeviceInspectTaskMapper deviceInspectTaskMapper; @Resource @@ -615,19 +591,14 @@ public class SpsSyncDownloadController { DeviceCheckItemDictMapper deviceCheckItemDictMapper; @Resource DeviceRepairApplyMapper deviceRepairApplyMapper; - @Resource DeviceRepairApplyDetailMapper deviceRepairApplyDetailMapper; - @Resource DeviceRepairMapper deviceRepairMapper; - @Resource DeviceUpkeepMapper deviceUpkeepMapper; - @Resource DeviceUpkeepDetailMapper deviceUpkeepDetailMapper; - @Resource DeviceUpkeepDetailItemMapper deviceUpkeepDetailItemMapper; @@ -804,7 +775,6 @@ public class SpsSyncDownloadController { orderEntity.setFromCorp("科室使用出库"); } - orderEntity.setId(null); orderDao.insert(orderEntity); //更新码详情 @@ -840,7 +810,6 @@ public class SpsSyncDownloadController { } } - //更新结果详情 if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailResultEntities())) { List orderDetailResultEntities = syncDataResponse.getOrderDetailResultEntities(); @@ -852,7 +821,6 @@ public class SpsSyncDownloadController { } } - //更新发票信息 if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) { List orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities(); @@ -920,7 +888,6 @@ public class SpsSyncDownloadController { basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); - return ResultVOUtils.success("上传成功！"); } @@ -985,7 +952,6 @@ public class SpsSyncDownloadController { e.printStackTrace(); } basicDownloadStatusEntity.setCacheFilePath(fileFullPath); - basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); return ResultVOUtils.success("上传成功！"); @@ -1119,7 +1085,6 @@ public class SpsSyncDownloadController { remark.append("仓库字典：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n"); } - //仓库用户表 if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) { for (WarehouseUserEntity warehouseUserEntity : syncDataResponse.getWarehouseUserEntities()) { @@ -1136,7 +1101,6 @@ public class SpsSyncDownloadController { remark.append("仓库所属单据类型：").append(syncDataResponse.getWarehouseBussinessTypeEntities().size()).append("条\n"); } - batchSession.close(); basicDownloadStatusEntity.setStatus(1); basicDownloadStatusEntity.setUpdateTime(new Date()); @@ -1421,6 +1385,5 @@ public class SpsSyncDownloadController { } } - } diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java index 0c546a1f..31dd3733 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java @@ -68,8 +68,7 @@ public class SpsSyncExportStatusController { @GetMapping("/spssync/basic/udiinfo/filter") public BaseResponse filterStatus(BasicExportStatusRequest basicExportStatusRequest) { List basicExportStatusEntities = basicExportService.filterExportStatus(basicExportStatusRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(basicExportStatusEntities); + PageInfo pageInfo = new PageInfo<>(basicExportStatusEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(basicExportStatusEntities); diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDelController.java b/src/main/java/com/glxp/api/controller/sync/SyncDelController.java index 8b4194ae..33e76ecb 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDelController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDelController.java @@ -182,14 +182,8 @@ public class SyncDelController extends BaseController { public BaseResponse deleteBasicUnitMaintain(DeleteRequest deleteRequest) { - - String id = deleteRequest.getId(); - BasicCorpEntity basicUnitMaintainEntity = basicUnitMaintainService.selectById(id); - basicUnitMaintainService.deleteById(id); - - return ResultVOUtils.success("删除成功"); } @@ -217,7 +211,6 @@ public class SyncDelController extends BaseController { return ResultVOUtils.error(500, "该单据类型已被仓库绑定，请先移除后删除！"); } - return basicBussinessTypeService.deleteBussinessType(id) == true ? ResultVOUtils.success("删除成功") : ResultVOUtils.error(500, "删除失败，系统繁忙"); } diff --git a/src/main/java/com/glxp/api/controller/sync/TestController.java b/src/main/java/com/glxp/api/controller/sync/TestController.java index 1c9710c0..9c6aeb66 100644 --- a/src/main/java/com/glxp/api/controller/sync/TestController.java +++ b/src/main/java/com/glxp/api/controller/sync/TestController.java @@ -48,7 +48,6 @@ public class TestController { if (file.isEmpty()) { return ResultVOUtils.error(500, "上传第" + (i++) + "个文件失败"); } - String fileName = file.getOriginalFilename(); try { IDCUtils.writeFile(file.getBytes(), filePath + file.getName(), file.getOriginalFilename()); } catch (Exception e) { diff --git a/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java b/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java index 44cac19c..7ce3e554 100644 --- a/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java +++ b/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java @@ -22,8 +22,7 @@ public class ClassifyCodeController { @GetMapping("spms/classify/code/filter") public BaseResponse filterList(FilterClassifyCodeRequest filterDeviceKeyRequest) { List classifyCodeEntities = classifyCodeService.filteClassifyCode(filterDeviceKeyRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(classifyCodeEntities); + PageInfo pageInfo = new PageInfo<>(classifyCodeEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(classifyCodeEntities); diff --git a/src/main/java/com/glxp/api/controller/system/CompanyController.java b/src/main/java/com/glxp/api/controller/system/CompanyController.java index 9c069218..52426ba6 100644 --- a/src/main/java/com/glxp/api/controller/system/CompanyController.java +++ b/src/main/java/com/glxp/api/controller/system/CompanyController.java @@ -32,9 +32,7 @@ public class CompanyController { @PostMapping("/warehouse/info/modifyCompany") @Log(title = "企业信息", businessType = BusinessType.UPDATE) public BaseResponse modifyCompany(@RequestBody CompanyEntity companyEntity) { - boolean b = companyService.modifyCompany(companyEntity); - return ResultVOUtils.success("修改成功"); } } diff --git a/src/main/java/com/glxp/api/controller/system/ConnectTestController.java b/src/main/java/com/glxp/api/controller/system/ConnectTestController.java index 864da213..84e36a4a 100644 --- a/src/main/java/com/glxp/api/controller/system/ConnectTestController.java +++ b/src/main/java/com/glxp/api/controller/system/ConnectTestController.java @@ -25,7 +25,6 @@ public class ConnectTestController { authConnectEntity.setCompanyName(companyEntity.getName()); authConnectEntity.setSysName("UDI自助平台"); return ResultVOUtils.success(authConnectEntity); - } diff --git a/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java b/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java index f824ad8f..108097c5 100644 --- a/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java +++ b/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java @@ -34,8 +34,7 @@ public class DeviceKeyController { @GetMapping("sale/device/registerList") public BaseResponse registerList(FilterDeviceKeyRequest filterDeviceKeyRequest) { List deviceKeyEntities = sysPdaKeyService.findDeviceKey(filterDeviceKeyRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(deviceKeyEntities); + PageInfo pageInfo = new PageInfo<>(deviceKeyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(deviceKeyEntities); @@ -47,7 +46,6 @@ public class DeviceKeyController { @Log(title = "系统信息", businessType = BusinessType.UPDATE) public BaseResponse checkRegister(@RequestBody @Valid SysPdaKeyEntity sysPdaKeyEntity, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -76,7 +74,6 @@ public class DeviceKeyController { @PostMapping("/sale/info/deleterKey") @Log(title = "系统信息", businessType = BusinessType.DELETE) public BaseResponse deleterKey(@RequestBody DeleteRequest deleteRequest) { - sysPdaKeyService.deleteDeviceKey(deleteRequest); return ResultVOUtils.success("删除成功"); diff --git a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java index cfe279b0..b719d599 100644 --- a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java +++ b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java @@ -48,8 +48,7 @@ public class SysMenuHelpController { } List list = sysMenuHelpService.MenuHelpList(sysMenuHelpRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(list); + PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(list); diff --git a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java index 3e8c3639..7e74e865 100644 --- a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java +++ b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java @@ -102,7 +102,6 @@ public class SysParamConfigController { systemParamConfigService.updateParentId(sysParamConfigSaveRequest1); } - //出入库新增单据校验 if (sysParamConfigSaveRequest.getParamKey().equals("io_transInout_interval")) { try { @@ -207,8 +206,6 @@ public class SysParamConfigController { } else { ReflectUtil.setFieldValue(productRemarkSetEntity, "remarkEnable" + (i + 1), false); } - - } } return ResultVOUtils.success(productRemarkSetEntity); diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java index dceb043e..053f0a1b 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java @@ -78,7 +78,6 @@ public class SysPdfModuleController { @Resource IBasicBussinessTypeService basicBussinessTypeService; - @AuthRuleAnnotation("system/pdf/module/detail") @GetMapping("/system/pdf/module/detail") public BaseResponse moduleDetail(@Valid FilterPdfTemplateRelevanceRequest systemPDFModuleRequest, @@ -108,8 +107,6 @@ public class SysPdfModuleController { return ResultVOUtils.success(pageSimpleResponse); } return ResultVOUtils.success(null); - - } @AuthRuleAnnotation("system/pdf/module/updateRl") @@ -125,7 +122,6 @@ public class SysPdfModuleController { @GetMapping("/system/pdf/module/pdfModules") public BaseResponse pdfModules(@RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "limit", defaultValue = "100") Integer limit) { - List systemPDFModuleEntityList = systemPDFModuleService.listPDFModules(page, limit); PageInfo pageInfo = new PageInfo<>(systemPDFModuleEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -154,10 +150,8 @@ public class SysPdfModuleController { SystemPDFModuleEntity systemPDFModuleEntity = new SystemPDFModuleEntity(); BeanUtil.copyProperties(sysPdfModuleSaveRequest, systemPDFModuleEntity); - systemPDFModuleEntity.setCreate_time(new Date()); systemPDFModuleEntity.setUpdate_time(new Date()); - boolean b = systemPDFModuleService.insert(systemPDFModuleEntity); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); @@ -172,7 +166,6 @@ public class SysPdfModuleController { public BaseResponse update(@RequestBody SysPdfModuleSaveRequest sysPdfModuleSaveRequest) { sysPdfModuleSaveRequest.setUpdate_time(new Date()); systemPDFModuleService.updateById(sysPdfModuleSaveRequest); - return ResultVOUtils.success("修改成功"); } @@ -181,7 +174,6 @@ public class SysPdfModuleController { @Log(title = "pdf模板", businessType = BusinessType.DELETE) public BaseResponse deleteById(@RequestParam("id") Integer id) { - boolean b = systemPDFModuleService.deleteById(id); if (b) return ResultVOUtils.success("删除成功"); diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java index a287b395..3eb6874d 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java @@ -88,8 +88,6 @@ public class SysPdfTemplateController { JasperUtils.jasperReport(request, response, data, filePath + "/pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf"); - - } @AuthRuleAnnotation("system/pdf/template/list") diff --git a/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java b/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java index c5853432..3b11ac1b 100644 --- a/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java +++ b/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java @@ -25,7 +25,6 @@ public class SysRemindMsgController { @AuthRuleAnnotation("") @GetMapping("/system/remind/msg/list") public BaseResponse list(FilterSysRemindMsgRequest filterSysRemindMsgRequest) { - List sysRemindMsgEntities = sysRemindMsgService.filterList(filterSysRemindMsgRequest); PageInfo pageInfo = new PageInfo<>(sysRemindMsgEntities); return ResultVOUtils.page(pageInfo); diff --git a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java index caae0545..884da7d7 100644 --- a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java +++ b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java @@ -32,17 +32,11 @@ public class SystemPDFTemplateRelevanceBizController { @Resource SystemPDFTemplateRelevanceBizService systemPDFTemplateRelevanceBizService; - - @Resource - IBasicBussinessTypeService basicBussinessTypeService; - @Resource IBasicBusTypeChangeService basicBusTypeChangeService; - @PostMapping("/system/pdf/templateRelevanceBiz/getListByModelId") public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) { - FilterBusTypeChangeRequest filterBussinessTypeRequest = new FilterBusTypeChangeRequest(); filterBussinessTypeRequest.setEnable(true); List bussinessLocalTypeEntities = basicBusTypeChangeService.filterList(filterBussinessTypeRequest); @@ -55,8 +49,7 @@ public class SystemPDFTemplateRelevanceBizController { } List sysPdfTemplateRelevanceBizEntityList= systemPDFTemplateRelevanceBizService.filterList(filterPdfTemplateRelevanceRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(sysPdfTemplateRelevanceBizEntityList); + PageInfo pageInfo = new PageInfo<>(sysPdfTemplateRelevanceBizEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(sysPdfTemplateRelevanceBizEntityList); @@ -69,8 +62,4 @@ public class SystemPDFTemplateRelevanceBizController { return ResultVOUtils.success("修改成功"); } - - - - } diff --git a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java index 6172d2b2..5625b9b8 100644 --- a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java +++ b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java @@ -53,8 +53,7 @@ public class SystemPDFTemplateRelevanceCodeController { } List sysPdfTemplateRelevanceCodeEntityList= systemPDFTemplateRelevanceCodeService.filterList(filterPdfTemplateRelevanceRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(sysPdfTemplateRelevanceCodeEntityList); + PageInfo pageInfo = new PageInfo<>(sysPdfTemplateRelevanceCodeEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(sysPdfTemplateRelevanceCodeEntityList); diff --git a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceLabelController.java b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceLabelController.java index d36ecd0e..caaef2d7 100644 --- a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceLabelController.java +++ b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceLabelController.java @@ -27,8 +27,7 @@ public class SystemPDFTemplateRelevanceLabelController { public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) { List sysPdfTemplateRelevanceLabelEntityList= systemPDFTemplateRelevanceLabelService.filterList(filterPdfTemplateRelevanceRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(sysPdfTemplateRelevanceLabelEntityList); + PageInfo pageInfo = new PageInfo<>(sysPdfTemplateRelevanceLabelEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(sysPdfTemplateRelevanceLabelEntityList); diff --git a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceStatemenController.java b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceStatemenController.java index d6cf2e9b..1bb77560 100644 --- a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceStatemenController.java +++ b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceStatemenController.java @@ -27,8 +27,7 @@ public class SystemPDFTemplateRelevanceStatemenController { public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) { List sysPdfTemplateRelevanceStatemenEntityList= systemPDFTemplateRelevanceStatemenService.filterList(filterPdfTemplateRelevanceRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(sysPdfTemplateRelevanceStatemenEntityList); + PageInfo pageInfo = new PageInfo<>(sysPdfTemplateRelevanceStatemenEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(sysPdfTemplateRelevanceStatemenEntityList); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java index b78be901..a002320d 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java @@ -86,7 +86,6 @@ public class ThirdAliDrugController extends BaseController { nameCodeIn.add(udiInfoEntity.getNameCode()); } } - } thirdAliDrug.setNameCodeIn(nameCodeIn); List list = new ArrayList<>(); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java index 5972f665..6f52ada4 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java @@ -27,8 +27,7 @@ public class ThirdSysApiController { @GetMapping("/sys/api/findAll") public BaseResponse findAll(FilterSysApiRequest filterSysApiRequest) { List thirdSysApiEntities = thirdSysApiService.findSysApi(filterSysApiRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thirdSysApiEntities); + PageInfo pageInfo = new PageInfo<>(thirdSysApiEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thirdSysApiEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java index 4af777c8..dcf29e67 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java @@ -53,7 +53,6 @@ public class ThrCorpExportLogController { private ThrCorpService thrCorpService; @Resource ThrCorpsDlService thrCorpsDlService; - @Resource private ErpBasicClient erpBasicClient; @Resource @@ -68,8 +67,7 @@ public class ThrCorpExportLogController { } List thrCorpExportLogEntities = thrCorpExportLogService.filterThrCorpExportLog(filterThrCorpExportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpExportLogEntities); + PageInfo pageInfo = new PageInfo<>(thrCorpExportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpExportLogEntities); @@ -150,7 +148,6 @@ public class ThrCorpExportLogController { thrCorpExportLogEntity.setUpdateUser(String.valueOf(customerService.getUserId())); thrCorpExportLogEntity.setCreateTime(new Date()); thrCorpExportLogService.insertThrCorpExportLog(thrCorpExportLogEntity); - //thrCorpsDlService.genExcel(genKey, thrCorpExportRequest); //修改为导出json文件 thrCorpsDlService.genJsonFile(genKey, thrCorpExportRequest); return ResultVOUtils.success("后台正在导出生成udi文件，请稍后刷新查看!"); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java index 58a55469..668f61ed 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java @@ -41,8 +41,7 @@ public class ThrCorpImportLogController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List thrCorpImportLogEntities = thrCorpImportLogService.filterThrCorpImportLog(filterThrCorpImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpImportLogEntities); + PageInfo pageInfo = new PageInfo<>(thrCorpImportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpImportLogEntities); @@ -58,8 +57,7 @@ public class ThrCorpImportLogController { } List thrCorpImportDetailEntities = thrCorpImportDetailService.filterCorpDetailImport(filterThrCorpImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpImportDetailEntities); + PageInfo pageInfo = new PageInfo<>(thrCorpImportDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpImportDetailEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java index 39efa277..e1a09135 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java @@ -58,8 +58,7 @@ public class ThrCorpsController { } List thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpEntities); + PageInfo pageInfo = new PageInfo<>(thrCorpEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpEntities); @@ -205,12 +204,10 @@ public class ThrCorpsController { erpUnitsResponse.setChecked(false); } } - return udiDlDeviceResponse; } else { return udiDlDeviceResponse; } - } else { FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); BeanUtils.copyProperties(thrUnitMaintainFilterRequest, filterThrCorpRequest); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java index f3e3ee6d..13c13e31 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java @@ -43,8 +43,7 @@ public class ThrDeptController { @GetMapping("spms/thrsys/warehouse/filter") public BaseResponse filterInvWarehouse(FilterThrDeptRequest filterThrDeptRequest) { List thrInvWarehouseEntities = thrDeptService.filterThrInvWarehouse(filterThrDeptRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvWarehouseEntities); + PageInfo pageInfo = new PageInfo<>(thrInvWarehouseEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvWarehouseEntities); @@ -156,8 +155,7 @@ public class ThrDeptController { public BaseResponse filterInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) { filterThrSubInvWarehouseRequest.setStatus(0); List thrInvWarehouseEntities = thrInvWarehouseService.selectByThrDeptCode(filterThrSubInvWarehouseRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvWarehouseEntities); + PageInfo pageInfo = new PageInfo<>(thrInvWarehouseEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvWarehouseEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrHslbController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrHslbController.java index ad155d3d..9c07974e 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrHslbController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrHslbController.java @@ -34,8 +34,7 @@ public class ThrHslbController { } List thrHslbEntities = thrHslbService.getHslbs(filterThrHslbRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrHslbEntities); + PageInfo pageInfo = new PageInfo<>(thrHslbEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrHslbEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java index 398b8231..3b8b536a 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java @@ -61,8 +61,7 @@ public class ThrInvProductsController { } List thrInvProductsEntities = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvProductsEntities); + PageInfo pageInfo = new PageInfo<>(thrInvProductsEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvProductsEntities); @@ -79,9 +78,7 @@ public class ThrInvProductsController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - List erpOnHandResponses = postThrInvProductsRequest.getDatas(); - String genKey = postThrInvProductsRequest.getGenKey(); if (genKey == null) { genKey = CustomUtil.getId(); @@ -113,7 +110,6 @@ public class ThrInvProductsController { @PostMapping("/udiwms/thrsys/delInvProducts") @Log(title = "第三方服务", businessType = BusinessType.DELETE) public BaseResponse delInvProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java index a9bc4991..cc4b806f 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java @@ -58,8 +58,7 @@ public class ThrInvProductsExportLogController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List thrInvProductsExportLogEntities = thrInvProductsExportLogService.filterThrInvProductsExportLog(filterThrProductsExportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvProductsExportLogEntities); + PageInfo pageInfo = new PageInfo<>(thrInvProductsExportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvProductsExportLogEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java index d484a1b2..4b7af015 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java @@ -42,8 +42,7 @@ public class ThrInvProductsImportLogController { } List thrInvProductsImportLogEntities = thrInvProductsImportLogService.filterThrInvProductsImportLog(filterThrCorpImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvProductsImportLogEntities); + PageInfo pageInfo = new PageInfo<>(thrInvProductsImportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvProductsImportLogEntities); @@ -59,8 +58,7 @@ public class ThrInvProductsImportLogController { } List thrInvProductsImportDetailEntities = thrInvProductsDetailService.filterInvProductsDetailImport(filterThrCorpImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvProductsImportDetailEntities); + PageInfo pageInfo = new PageInfo<>(thrInvProductsImportDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvProductsImportDetailEntities); @@ -86,8 +84,6 @@ public class ThrInvProductsImportLogController { }else { return ResultVOUtils.error(500, "删除失败，未找到该记录"); } - - } } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java index 3b189c89..1c53a8c3 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java @@ -44,8 +44,7 @@ public class ThrInvWarehouseController { for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) { thrInvWarehouseEntity.setParentName(thrDeptEntity.getName()); } - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvWarehouseEntities); + PageInfo pageInfo = new PageInfo<>(thrInvWarehouseEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvWarehouseEntities); @@ -127,7 +126,6 @@ public class ThrInvWarehouseController { thrDeptEntity.setUpdateTime(new Date()); thrDeptService.updateInvWarehouse(thrDeptEntity); - return ResultVOUtils.success("修改成功!"); } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java index 43247dce..bad0974b 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java @@ -31,7 +31,6 @@ import java.util.List; @RestController public class ThrManusController { - @Resource ThrManufacturerService thrManufacturerService; @Resource @@ -49,8 +48,7 @@ public class ThrManusController { } List thrManufacturerEntities = thrManufacturerService.filterThrManu(filterThrCorpRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrManufacturerEntities); + PageInfo pageInfo = new PageInfo<>(thrManufacturerEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrManufacturerEntities); @@ -134,8 +132,7 @@ public class ThrManusController { } List thrManufacturerEntities = thrManufacturerService.getProductTypes(basicProducstRequest); - PageInfo pageInfo; - pageInfo = new PageInfo(thrManufacturerEntities); + PageInfo pageInfo = new PageInfo(thrManufacturerEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrManufacturerEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java index 40079de7..a532d561 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java @@ -50,7 +50,6 @@ public class ThrOrderController { private SystemParamConfigService systemParamConfigService; @Resource private IThrBusTypeOriginService iThrBusTypeOriginService; - @Resource HttpOkClient httpOkClient; @@ -64,8 +63,7 @@ public class ThrOrderController { } List thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrOrderEntities); + PageInfo pageInfo = new PageInfo<>(thrOrderEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrOrderEntities); @@ -82,8 +80,7 @@ public class ThrOrderController { } List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrOrderDetailEntities); + PageInfo pageInfo = new PageInfo<>(thrOrderDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrOrderDetailEntities); @@ -363,7 +360,6 @@ public class ThrOrderController { return ResultVOUtils.error(500, "第三方业务单据服务未关联"); } - FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); BeanUtil.copyProperties(filterErpOrderRequest, filterThrOrderRequest); filterThrOrderRequest.setPage(filterErpOrderRequest.getPage()); @@ -389,13 +385,11 @@ public class ThrOrderController { erpOrderResponses.add(erpOrderResponse); } } - PageInfo pageInfo; - pageInfo = new PageInfo<>(data); + PageInfo pageInfo = new PageInfo<>(data); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(erpOrderResponses); return ResultVOUtils.success(pageSimpleResponse); - } @@ -436,8 +430,7 @@ public class ThrOrderController { erpOrderResponses.add(erpOrderResponse); } } - PageInfo pageInfo; - pageInfo = new PageInfo<>(data); + PageInfo pageInfo = new PageInfo<>(data); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(erpOrderResponses); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java index 8c1e18a2..7243bdea 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java @@ -44,7 +44,6 @@ public class ThrOrderExportLogController { ThrOrderExportLogService thrOrderExportLogService; @Resource ThrOrdersDlService thrOrdersDlService; - @Resource private ThrOrderService thrOrderService; @Resource @@ -61,8 +60,7 @@ public class ThrOrderExportLogController { } List udiInfoExportLogEntities = thrOrderExportLogService.filterThrOrderExportLog(filterUdiEpLogReques); - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiInfoExportLogEntities); + PageInfo pageInfo = new PageInfo<>(udiInfoExportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiInfoExportLogEntities); @@ -113,8 +111,6 @@ public class ThrOrderExportLogController { } catch (Exception ex) { System.out.println("下载失败！"); } - - } //业务单据导出生成Excel，并创建生成记录 @@ -149,8 +145,6 @@ public class ThrOrderExportLogController { @PostMapping("/udiwms/thrOrder/importLog/uploadSmp") @Log(title = "业务单据上传SMP", businessType = BusinessType.INSERT) public BaseResponse uploadSmp(@RequestBody ThrOrderExportRequest thrOrderExportRequest) { - - ThrOrderExportLogEntity udiInfoExportLogEntity = new ThrOrderExportLogEntity(); udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); String genKey = CustomUtil.getId(); @@ -203,8 +197,7 @@ public class ThrOrderExportLogController { erpOrderResponses.add(erpOrderResponse); } } - PageInfo pageInfo; - pageInfo = new PageInfo<>(data); + PageInfo pageInfo = new PageInfo<>(data); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(erpOrderResponses); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java index 757daef9..9a05ffeb 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java @@ -39,7 +39,6 @@ public class ThrOrderImportLogController { @Resource ThrOrderImportDetailService thrOrderImportDetailService; - @GetMapping("/udiwms/thrOrder/importLog/filter") public BaseResponse filter(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest, BindingResult bindingResult) { @@ -49,8 +48,7 @@ public class ThrOrderImportLogController { } List udiInfoImportLogEntities = thrOrderImportLogService.filterThrOrderImportLog(filterThrCorpImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiInfoImportLogEntities); + PageInfo pageInfo = new PageInfo<>(udiInfoImportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiInfoImportLogEntities); @@ -66,8 +64,7 @@ public class ThrOrderImportLogController { } List thrOrderImportDetailEntities = thrOrderImportDetailService.filterOrderImportDetail(filterThrCorpImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrOrderImportDetailEntities); + PageInfo pageInfo = new PageInfo<>(thrOrderImportDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrOrderImportDetailEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java index bf25165c..94ef5437 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java @@ -34,8 +34,7 @@ public class ThrProductTypeCotroller { } List thrProductTypeEntityList = thrProductTypeService.getProductTypes(filterThrProductTypeRequest); - PageInfo pageInfo; - pageInfo = new PageInfo(thrProductTypeEntityList); + PageInfo pageInfo = new PageInfo(thrProductTypeEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrProductTypeEntityList); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddController.java index f76c6e60..dd105eab 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddController.java @@ -65,8 +65,7 @@ public class ThrProductsAddController { filterThrProductsRequest.setThirdSysFk(filterThrProductsRequest.getThirdSys()); List thrProductsAddEntities = thrProductsAddService.filterThrProductsRequest(filterThrProductsRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrProductsAddEntities); + PageInfo pageInfo = new PageInfo<>(thrProductsAddEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrProductsAddEntities); @@ -145,10 +144,7 @@ public class ThrProductsAddController { return ResultVOUtils.success(ResultEnum.SUCCESS); } - @Resource UdiRelevanceService udiRelevanceService; - - } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index 86475bea..0ca232a2 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -70,12 +70,10 @@ public class ThrProductsAddDiController { private ThrProductsService thrProductsService; @Resource UdiRelevanceService udiRelevanceService; - @Resource private AuthAdminService authAdminService; @Resource private UdiProductService udiProductService; - @Resource BasicNewUploadDiService basicNewUploadDiService; @Resource diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index b5037fdb..881aafac 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -46,13 +46,10 @@ public class ThrProductsController { @Resource ThrProductsService thrProductsService; - @Resource ThrSystemDetailService thrSystemDetailService; - @Resource private ErpBasicClient erpBasicClient; - @Resource private CustomerService customerService; @@ -67,8 +64,7 @@ public class ThrProductsController { } List thrCorpEntities = thrProductsService.filterJoinThrProducts(filterThrProductsRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpEntities); + PageInfo pageInfo = new PageInfo<>(thrCorpEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java index 80c30173..eb9ee0c7 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java @@ -63,8 +63,7 @@ public class ThrProductsExportLogController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List thrProductsExportLogEntities = thrProductsExportLogService.filterThrProductsExportLog(filterThrProductsExportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrProductsExportLogEntities); + PageInfo pageInfo = new PageInfo<>(thrProductsExportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrProductsExportLogEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java index 3611317a..c10a1420 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java @@ -42,8 +42,7 @@ public class ThrProductsImportLogController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List thrProductsImportLogEntities = thrProductsImportLogService.filterThrPorductsImportLog(filterThrProductsImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrProductsImportLogEntities); + PageInfo pageInfo = new PageInfo<>(thrProductsImportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrProductsImportLogEntities); @@ -58,8 +57,7 @@ public class ThrProductsImportLogController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List thrProductsImportDetailEntities = thrProductsImportDetailService.filterProductsDetailImport(filterThrProductsImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrProductsImportDetailEntities); + PageInfo pageInfo = new PageInfo<>(thrProductsImportDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrProductsImportDetailEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java index 4a663d86..1a5e8386 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java @@ -58,8 +58,7 @@ public class ThrSystemController { basicThirdSysEntities = thrSystemService.filterBasicThiSys(filterBasicThirdSysRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(basicThirdSysEntities); + PageInfo pageInfo = new PageInfo<>(basicThirdSysEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(basicThirdSysEntities); @@ -121,8 +120,6 @@ public class ThrSystemController { return ResultVOUtils.error(500, "第三方系统名称重复"); } - ThrSystemEntity temp = thrSystemService.selectByThirdId(thrSystemEntity.getThirdId()); - if (!thrSystemEntity.getEnabled()) { //如操作为禁用第三方系统，则需要判断是否是最后一个启用的第三方系统，需要保留至少启用一个第三方系统 FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest(); @@ -133,7 +130,6 @@ public class ThrSystemController { } } - if (thrSystemEntity.getMainSys() && !thrSystemEntity.getEnabled()) { return ResultVOUtils.error(500, "主系统必须启用"); } @@ -162,8 +158,7 @@ public class ThrSystemController { } List basicThirdSysEntities; basicThirdSysEntities = thrSystemDetailService.filterBasicThirdSysDetail(filterBasicThirdSysDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(basicThirdSysEntities); + PageInfo pageInfo = new PageInfo<>(basicThirdSysEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(basicThirdSysEntities); @@ -223,8 +218,7 @@ public class ThrSystemController { } List basicThirdSysEntities = thrSystemBusApiService.filterSysBusApi(filterBasicThirdSysDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(basicThirdSysEntities); + PageInfo pageInfo = new PageInfo<>(basicThirdSysEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(basicThirdSysEntities); diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java index 3fbf10ca..ec383dca 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java @@ -41,11 +41,8 @@ public class AuthAdminServiceImpl implements AuthAdminService { if (filterAuthUserRequest == null) { return Collections.emptyList(); } - if (filterAuthUserRequest.getPage() != null) { - int offset = (filterAuthUserRequest.getPage() - 1) * filterAuthUserRequest.getLimit(); - PageHelper.offsetPage(offset, filterAuthUserRequest.getLimit()); - } - + // 分页处理 + filterAuthUserRequest.pageDispose(); return authAdminDao.listAdminPage(filterAuthUserRequest); } @@ -153,10 +150,8 @@ public class AuthAdminServiceImpl implements AuthAdminService { if (filterNoSelectUserRequest == null) { return Collections.emptyList(); } - if (filterNoSelectUserRequest.getPage() != null) { - int offset = (filterNoSelectUserRequest.getPage() - 1) * filterNoSelectUserRequest.getLimit(); - PageHelper.offsetPage(offset, filterNoSelectUserRequest.getLimit()); - } + // 分页处理 + filterNoSelectUserRequest.pageDispose(); return authAdminDao.selectNotSelectUser(filterNoSelectUserRequest.getUserIds(), filterNoSelectUserRequest.getDeptId()); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java index 30c8e366..09a7c0ba 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java @@ -28,10 +28,8 @@ public class AuthCheckServiceImpl implements AuthCheckService { if (filterAuthCheckRequest == null) { return Collections.emptyList(); } - if (filterAuthCheckRequest.getPage() != null) { - int offset = (filterAuthCheckRequest.getPage() - 1) * filterAuthCheckRequest.getLimit(); - PageHelper.offsetPage(offset, filterAuthCheckRequest.getLimit()); - } + // 分页处理 + filterAuthCheckRequest.pageDispose(); return authCheckDao.filterDevices(filterAuthCheckRequest); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java index a7b35175..750b6743 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java @@ -28,11 +28,8 @@ public class CustomerInfoServiceImpl implements CustomerInfoService { if (customerInfoFilterRequest == null) { return Collections.emptyList(); } - - if (customerInfoFilterRequest.getPage() != null) { - int offset = (customerInfoFilterRequest.getPage() - 1) * customerInfoFilterRequest.getLimit(); - PageHelper.offsetPage(offset, customerInfoFilterRequest.getLimit()); - } + // 分页处理 + customerInfoFilterRequest.pageDispose(); return customerInfoDao.filterCustomerInfo(customerInfoFilterRequest); } @@ -41,8 +38,8 @@ public class CustomerInfoServiceImpl implements CustomerInfoService { if (customerInfoFilterRequest == null) { return Collections.emptyList(); } - int offset = (customerInfoFilterRequest.getPage() - 1) * customerInfoFilterRequest.getLimit(); - PageHelper.offsetPage(offset, customerInfoFilterRequest.getLimit()); + // 分页处理 + customerInfoFilterRequest.pageDispose(); List customerDetailEntities = customerInfoDao.filterDetailCustomerInfo(customerInfoFilterRequest); return customerDetailEntities; } diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java index c95bfdae..7a951a2e 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java @@ -47,10 +47,8 @@ public class DeptServiceImpl implements DeptService { if (filterInvWarehouseRequest == null) { return Collections.emptyList(); } - if (filterInvWarehouseRequest.getPage() != null) { - int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit(); - PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit()); - } + // 分页处理 + filterInvWarehouseRequest.pageDispose(); List data = deptDao.filterInvWarehouse(filterInvWarehouseRequest); return data; } @@ -60,10 +58,8 @@ public class DeptServiceImpl implements DeptService { if (filterInvWarehouseRequest == null) { return Collections.emptyList(); } - if (filterInvWarehouseRequest.getPage() != null) { - int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit(); - PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit()); - } + // 分页处理 + filterInvWarehouseRequest.pageDispose(); List data = deptDao.filterAllByUser(filterInvWarehouseRequest); return data; } @@ -73,10 +69,8 @@ public class DeptServiceImpl implements DeptService { if (filterInvWarehouseRequest == null) { return Collections.emptyList(); } - if (filterInvWarehouseRequest.getPage() != null) { - int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit(); - PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit()); - } + // 分页处理 + filterInvWarehouseRequest.pageDispose(); List data = deptDao.filterGroupInvWarehouse(filterInvWarehouseRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java index f3538627..12fc78fc 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java @@ -27,10 +27,8 @@ public class DeptUserServiceImpl implements DeptUserService { @Override public List selectDeptUser(FilterDeptUserReqeust filterDeptUserReqeust) { - if (filterDeptUserReqeust.getPage() != null) { - int offset = (filterDeptUserReqeust.getPage() - 1) * filterDeptUserReqeust.getLimit(); - PageHelper.offsetPage(offset, filterDeptUserReqeust.getLimit()); - } + // 分页处理 + filterDeptUserReqeust.pageDispose(); return deptUserDao.selectDeptUser(filterDeptUserReqeust); } @@ -50,10 +48,8 @@ public class DeptUserServiceImpl implements DeptUserService { @Override public List selectJoinDeptUser(FilterDeptUserReqeust filterDeptUserReqeust) { - if (filterDeptUserReqeust.getPage() != null) { - int offset = (filterDeptUserReqeust.getPage() - 1) * filterDeptUserReqeust.getLimit(); - PageHelper.offsetPage(offset, filterDeptUserReqeust.getLimit()); - } + // 分页处理 + filterDeptUserReqeust.pageDispose(); return deptUserDao.selectJoinDeptUser(filterDeptUserReqeust); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java index 9534bc2a..df48dce3 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java @@ -31,10 +31,8 @@ public class InvBusUserServiceImpl extends ServiceImpl data = invWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); return data; } @@ -83,10 +81,8 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { if (filterInvWarehouseRequest == null) { return Collections.emptyList(); } - if (filterInvWarehouseRequest.getPage() != null) { - int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit(); - PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit()); - } + // 分页处理 + filterInvWarehouseRequest.pageDispose(); List data = invWarehouseDao.filterGroupInvSub(filterInvWarehouseRequest); return data; } @@ -208,10 +204,8 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { if (filterInvSubWarehouseRequest == null) { return Collections.emptyList(); } - if (filterInvSubWarehouseRequest.getPage() != null) { - int offset = (filterInvSubWarehouseRequest.getPage() - 1) * filterInvSubWarehouseRequest.getLimit(); - PageHelper.offsetPage(offset, filterInvSubWarehouseRequest.getLimit()); - } + // 分页处理 + filterInvSubWarehouseRequest.pageDispose(); List data = invWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigServiceImpl.java index bc1ac48f..f4258c01 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigServiceImpl.java @@ -26,10 +26,8 @@ public class SysCustomConfigServiceImpl implements ISysCustomConfigService { if (request == null) { return Collections.emptyList(); } - if (request.getPage() != null) { - int offset = (request.getPage() - 1) * request.getLimit(); - PageHelper.offsetPage(offset, request.getLimit()); - } + // 分页处理 + request.pageDispose(); return sysCustomConfigDao.filterSysCustomConfig(request); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java index c5cd7a33..02c9cbf9 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java @@ -25,11 +25,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService { @Override public List selectDictDataList(SysDictDataRequest sysDictDataRequest) { - - if (sysDictDataRequest.getPage() != null) { - int offset = (sysDictDataRequest.getPage() - 1) * sysDictDataRequest.getLimit(); - PageHelper.offsetPage(offset, sysDictDataRequest.getLimit()); - } + // 分页处理 + sysDictDataRequest.pageDispose(); return baseMapper.selectDictDataList(sysDictDataRequest); diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java index 56a0b1cc..b3fc33dc 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java @@ -33,10 +33,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { @Override public List selectDictTypeList(SysDictTypeRequest sysDictTypeRequest) { - if (sysDictTypeRequest.getPage() != null) { - int offset = (sysDictTypeRequest.getPage() - 1) * sysDictTypeRequest.getLimit(); - PageHelper.offsetPage(offset, sysDictTypeRequest.getLimit()); - } + // 分页处理 + sysDictTypeRequest.pageDispose(); return baseMapper.selectDictTypeList(sysDictTypeRequest); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java index 6123f150..a987e800 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java @@ -25,8 +25,9 @@ public class SysPdaKeyServiceImpl implements SysPdaKeyService { if (filterDeviceKeyRequest == null) { return Collections.emptyList(); } - int offset = (filterDeviceKeyRequest.getPage() - 1) * filterDeviceKeyRequest.getLimit(); - PageHelper.offsetPage(offset, filterDeviceKeyRequest.getLimit()); + // 分页处理 + filterDeviceKeyRequest.pageDispose(); + return sysPdaKeyDao.findDeviceKey(filterDeviceKeyRequest); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java index 1ff04b2e..743a1cc0 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java @@ -42,11 +42,8 @@ public class SysRoleServiceImpl implements ISysRoleService { @Override public List selectPageRoleList(FilterRoleRequest filterRoleRequest) { - - if (filterRoleRequest.getPage() != null) { - int offset = (filterRoleRequest.getPage() - 1) * filterRoleRequest.getLimit(); - PageHelper.offsetPage(offset, filterRoleRequest.getLimit()); - } + // 分页处理 + filterRoleRequest.pageDispose(); return sysRoleMapper.selectRoleList(filterRoleRequest); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java index 3017fb46..c46e3bdd 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java @@ -25,8 +25,8 @@ public class UserRegisterServiceImpl implements UserRegisterService { if (userResisterFilterRequest == null) { return Collections.emptyList(); } - int offset = (userResisterFilterRequest.getPage() - 1) * userResisterFilterRequest.getLimit(); - PageHelper.offsetPage(offset, userResisterFilterRequest.getLimit()); + // 分页处理 + userResisterFilterRequest.pageDispose(); return userRegisterDao.filterUserRegisters(userResisterFilterRequest); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java index 7ea78c5d..400ae6cf 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java @@ -46,10 +46,8 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType if (filterInvBusTypeRequest == null) { return Collections.emptyList(); } - if (filterInvBusTypeRequest.getPage() != null) { - int offset = (filterInvBusTypeRequest.getPage() - 1) * filterInvBusTypeRequest.getLimit(); - PageHelper.offsetPage(offset, filterInvBusTypeRequest.getLimit()); - } + // 分页处理 + filterInvBusTypeRequest.pageDispose(); return warehouseBussinessTypeDao.filterList(filterInvBusTypeRequest); } @@ -84,10 +82,8 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType if (filterInvLinkDataRequest == null) { return Collections.emptyList(); } - if (filterInvLinkDataRequest.getPage() != null) { - int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit(); - PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit()); - } + // 分页处理 + filterInvLinkDataRequest.pageDispose(); return warehouseBussinessTypeDao.selectListByCode(filterInvLinkDataRequest.getCode()); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java index 2f05ed93..c374342e 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java @@ -83,10 +83,8 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { if (filterInvLinkDataRequest == null) { return Collections.emptyList(); } - if (filterInvLinkDataRequest.getPage() != null) { - int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit(); - PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit()); - } + // 分页处理 + filterInvLinkDataRequest.pageDispose(); return warehouseUserDao.selectListkey(filterInvLinkDataRequest); } @Override diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java b/src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java similarity index 99% rename from src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java rename to src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java index 3aa975cc..d006d95b 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java @@ -1,4 +1,4 @@ -package com.glxp.api.controller.basic; +package com.glxp.api.service.basic; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java b/src/main/java/com/glxp/api/service/basic/BasicGenJsonService.java similarity index 99% rename from src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java rename to src/main/java/com/glxp/api/service/basic/BasicGenJsonService.java index caf74601..9cb55e55 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicGenJsonService.java @@ -1,4 +1,4 @@ -package com.glxp.api.controller.basic; +package com.glxp.api.service.basic; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpExportLogServiceImpl.java index f2a71ee5..cd3defc5 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpExportLogServiceImpl.java @@ -37,10 +37,8 @@ public class BasicCorpExportLogServiceImpl implements BasicCorpExportLogService if (filterCorpExportLogRequest == null) { return Collections.emptyList(); } - if (filterCorpExportLogRequest.getPage() != null) { - int offset = (filterCorpExportLogRequest.getPage() - 1) * filterCorpExportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterCorpExportLogRequest.getLimit()); - } + // 分页处理 + filterCorpExportLogRequest.pageDispose(); List data = basicCorpExportLogDao.filterCorpExportLog(filterCorpExportLogRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java index 2171bbf9..f3812235 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java @@ -53,10 +53,8 @@ public class BasicCorpImportLogServiceImpl implements BasicCorpImportLogService if (filterCorpImportLogRequest == null) { return Collections.emptyList(); } - if (filterCorpImportLogRequest.getPage() != null) { - int offset = (filterCorpImportLogRequest.getPage() - 1) * filterCorpImportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterCorpImportLogRequest.getLimit()); - } + // 分页处理 + filterCorpImportLogRequest.pageDispose(); List data = basicCorpImportLogDao.filterImportLog(filterCorpImportLogRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java index dbae519f..a5d6b2c0 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java @@ -29,11 +29,8 @@ public class BasicCorpServiceImpl extends ServiceImpl data = basicCorpDao.filterList(basicUnitMaintainFilterRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java index 5ae14d50..54f58836 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java @@ -49,10 +49,8 @@ public class BasicHospTypeServiceImpl extends ServiceImpl ew=new QueryWrapper<>(); if (StrUtil.isNotEmpty(basicHospTypeFilterRequest.getName())){ ew.like("name",basicHospTypeFilterRequest.getName()); @@ -187,10 +185,8 @@ public class BasicHospTypeServiceImpl extends ServiceImpl data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest); return data; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductSetServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductSetServiceImpl.java index 1ff5fc51..175590ad 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductSetServiceImpl.java @@ -26,10 +26,8 @@ public class BasicProductSetServiceImpl implements BasicProductSetService { if (filterBasicProductSetrequest == null) { return Collections.emptyList(); } - if (filterBasicProductSetrequest.getPage() != null) { - int offset = (filterBasicProductSetrequest.getPage() - 1) * filterBasicProductSetrequest.getLimit(); - PageHelper.offsetPage(offset, filterBasicProductSetrequest.getLimit()); - } + // 分页处理 + filterBasicProductSetrequest.pageDispose(); return basicProductSetDao.filterSetup(filterBasicProductSetrequest); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsExportLogServiceImpl.java index 1b385760..4daafe0e 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsExportLogServiceImpl.java @@ -37,10 +37,8 @@ public class BasicProductsExportLogServiceImpl implements BasicProductsExportLog if (filterInCodeLogRequest == null) { return Collections.emptyList(); } - if (filterInCodeLogRequest.getPage() != null) { - int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit()); - } + // 分页处理 + filterInCodeLogRequest.pageDispose(); List data = udiInfoExportLogDao.filterUdiInfoExportLog(filterInCodeLogRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java index 6a8edd46..99b4f7a9 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java @@ -38,10 +38,8 @@ public class BasicProductsImportDetailServiceImpl implements BasicProductsImport if (filterInCodeLogRequest == null) { return Collections.emptyList(); } - if (filterInCodeLogRequest.getPage() != null) { - int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit()); - } + // 分页处理 + filterInCodeLogRequest.pageDispose(); List data = udiInfoImportDao.filterUdiInfoImport(filterInCodeLogRequest); return data; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java index a080d993..04093779 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java @@ -76,10 +76,8 @@ public class BasicProductsImportLogServiceImpl implements BasicProductsImportLog if (filterUdiIpLogRequest == null) { return Collections.emptyList(); } - if (filterUdiIpLogRequest.getPage() != null) { - int offset = (filterUdiIpLogRequest.getPage() - 1) * filterUdiIpLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterUdiIpLogRequest.getLimit()); - } + // 分页处理 + filterUdiIpLogRequest.pageDispose(); List data = udiInfoImportLogDao.filterImportLog(filterUdiIpLogRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java index 9d989fdb..cb07db71 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java @@ -24,10 +24,8 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { if (basicUnitMaintainFilterRequest == null) { return Collections.emptyList(); } - if (basicUnitMaintainFilterRequest.getPage() != null) { - int offset = (basicUnitMaintainFilterRequest.getPage() - 1) * basicUnitMaintainFilterRequest.getLimit(); - PageHelper.offsetPage(offset, basicUnitMaintainFilterRequest.getLimit()); - } + // 分页处理 + basicUnitMaintainFilterRequest.pageDispose(); List data = basicUnitMaintainDao.filterList(basicUnitMaintainFilterRequest); return data; diff --git a/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java index adb940a2..5130e1ec 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java @@ -39,10 +39,8 @@ public class CompanyProductRelevanceServiceImpl extends ServiceImpl data = companyProductRelevanceDao.filterUdiGp(basicInstrumentMaintainRequest); return data; diff --git a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java index 19c85b04..7d43c495 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java @@ -43,10 +43,8 @@ public class EntrustReceServiceImpl extends ServiceImpl entrustReceResponses = entrustReceDao.filterJoinEntrustRec(basicEntrustRecRequest); if (CollUtil.isNotEmpty(entrustReceResponses)) { //查询当前分库名称和委托验收分库名称 diff --git a/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java index 462d4509..ec3b8e1f 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java @@ -27,10 +27,8 @@ public class ProductInfoServiceImpl implements ProductInfoService { if (productInfoFilterRequest == null) { return Collections.emptyList(); } - if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) { - int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); - PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); - } + // 分页处理 + productInfoFilterRequest.pageDispose(); List data = productInfoDao.filterProductGroup(productInfoFilterRequest); return data; diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java index 8839d076..8014f4a5 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java @@ -28,10 +28,8 @@ public class UdiCompanyServiceImpl implements UdiCompanyService { @Override public List filterUdiCompany(UdiCompanyRequest udiCompanyRequest) { - if (udiCompanyRequest.getPage() != null && udiCompanyRequest.getLimit() != null) { - int offset = (udiCompanyRequest.getPage() - 1) * udiCompanyRequest.getLimit(); - PageHelper.offsetPage(offset, udiCompanyRequest.getLimit()); - } + // 分页处理 + udiCompanyRequest.pageDispose(); return udiCompanyDao.filterUdiCompany(udiCompanyRequest); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index 40883d73..8477b9ae 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -68,10 +68,8 @@ public class UdiProductServiceImpl implements UdiProductService { if (filterUdiRelRequest == null) { return Collections.emptyList(); } - if (filterUdiRelRequest.getPage() != null) { - int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit(); - PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit()); - } + // 分页处理 + filterUdiRelRequest.pageDispose(); List data = udiProductDao.filterUdiInfo(filterUdiRelRequest); return data; diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index 5f19f061..fb1b1866 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -37,10 +37,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl data = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest); return data; } @@ -52,10 +50,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl data = udiRelevanceDao.filterCertUdi(filterUdiRelRequest); return data; @@ -66,10 +62,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl data = udiRelevanceDao.filterUdiJoinSup(filterUdiRelRequest); return data; } @@ -145,10 +139,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest); return data; diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java index 6f09aa7d..a03f63ce 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java @@ -27,10 +27,8 @@ public class UdiRlSupServiceImpl implements UdiRlSupService { if (basicInstrumentMaintainRequest == null) { return Collections.emptyList(); } - if (basicInstrumentMaintainRequest.getPage() != null) { - int offset = (basicInstrumentMaintainRequest.getPage() - 1) * basicInstrumentMaintainRequest.getLimit(); - PageHelper.offsetPage(offset, basicInstrumentMaintainRequest.getLimit()); - } + // 分页处理 + basicInstrumentMaintainRequest.pageDispose(); List data = udiRlSupDao.filterUdiGp(basicInstrumentMaintainRequest); return data; @@ -41,10 +39,8 @@ public class UdiRlSupServiceImpl implements UdiRlSupService { if (filterCompanyProductRelevanceRequest == null) { return Collections.emptyList(); } - if (filterCompanyProductRelevanceRequest.getPage() != null) { - int offset = (filterCompanyProductRelevanceRequest.getPage() - 1) * filterCompanyProductRelevanceRequest.getLimit(); - PageHelper.offsetPage(offset, filterCompanyProductRelevanceRequest.getLimit()); - } + // 分页处理 + filterCompanyProductRelevanceRequest.pageDispose(); return udiRlSupDao.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest); } @@ -58,8 +54,8 @@ public class UdiRlSupServiceImpl implements UdiRlSupService { if (filterCompanyProductRelevanceRequest == null) { return Collections.emptyList(); } - int offset = (filterCompanyProductRelevanceRequest.getPage() - 1) * filterCompanyProductRelevanceRequest.getLimit(); - PageHelper.offsetPage(offset, filterCompanyProductRelevanceRequest.getLimit()); + // 分页处理 + filterCompanyProductRelevanceRequest.pageDispose(); List companyEntities = udiRlSupDao.getCompanyProductRelevance(filterCompanyProductRelevanceRequest); return companyEntities; } diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java index 09e26191..b91383b3 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -154,10 +154,8 @@ public class RelCodeBatchService extends ServiceImpl filterGroupBy(IoOrderInvoiceRequest orderInvoiceRequest) { - if (orderInvoiceRequest.getPage() != null) { - int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit(); - PageHelper.offsetPage(offset, orderInvoiceRequest.getLimit()); - } + // 分页处理 + orderInvoiceRequest.pageDispose(); return ioOrderInvoiceMapper.filterGroupBy(orderInvoiceRequest); } public List filterInvoice(IoOrderInvoiceRequest orderInvoiceRequest) { - if (orderInvoiceRequest.getPage() != null) { - int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit(); - PageHelper.offsetPage(offset, orderInvoiceRequest.getLimit()); - } + // 分页处理 + orderInvoiceRequest.pageDispose(); return ioOrderInvoiceMapper.filterInvoice(orderInvoiceRequest); } public List filterByInvoiceCode(IoOrderInvoiceRequest orderInvoiceRequest) { - if (orderInvoiceRequest.getPage() != null) { - int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit(); - PageHelper.offsetPage(offset, orderInvoiceRequest.getLimit()); - } + // 分页处理 + orderInvoiceRequest.pageDispose(); return ioOrderInvoiceMapper.filterByInvoiceCode(orderInvoiceRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java index edfebd2b..5fe328b3 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java @@ -24,10 +24,8 @@ public class InnerOrderDetailServiceImpl implements InnerOrderDetailService { if (innerOrderDetailRequest == null) { return Collections.emptyList(); } - if (innerOrderDetailRequest.getPage() != null) { - int offset = (innerOrderDetailRequest.getPage() - 1) * innerOrderDetailRequest.getLimit(); - PageHelper.offsetPage(offset, innerOrderDetailRequest.getLimit()); - } + // 分页处理 + innerOrderDetailRequest.pageDispose(); List data = innerOrderDetailDao.joinQueryList(innerOrderDetailRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java index 797567e4..84c294c6 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java @@ -40,10 +40,8 @@ public class InnerOrderServiceImpl implements InnerOrderService { if (innerOrderRequest == null) { return Collections.emptyList(); } - if (innerOrderRequest.getPage() != null) { - int offset = (innerOrderRequest.getPage() - 1) * innerOrderRequest.getLimit(); - PageHelper.offsetPage(offset, innerOrderRequest.getLimit()); - } + // 分页处理 + innerOrderRequest.pageDispose(); List data = innerOrderDao.queryPageList(innerOrderRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index 7a7d95c1..193bb928 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -133,10 +133,8 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService if (filterinnerOrderprintRequest == null) { return Collections.emptyList(); } - if (filterinnerOrderprintRequest.getPage() != null) { - int offset = (filterinnerOrderprintRequest.getPage() - 1) * filterinnerOrderprintRequest.getLimit(); - PageHelper.offsetPage(offset, filterinnerOrderprintRequest.getLimit()); - } + // 分页处理 + filterinnerOrderprintRequest.pageDispose(); List data = invInnerOrderPrintDao.filterJoinInnerPrint(filterinnerOrderprintRequest); return data; diff --git a/src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java b/src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java index 03503710..29a11f32 100644 --- a/src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java +++ b/src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java @@ -88,10 +88,8 @@ public class SysLogininforServiceImpl implements ISysLogininforService, Logininf @Override public List selectLogininforList(FilterLoginLogRequest logininfor) { - if (logininfor.getPage() != null) { - int offset = (logininfor.getPage() - 1) * logininfor.getLimit(); - PageHelper.offsetPage(offset, logininfor.getLimit()); - } + // 分页处理 + logininfor.pageDispose(); return baseMapper.selectLogininforList(logininfor); } diff --git a/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java b/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java index 340db6d1..84a093c2 100644 --- a/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java @@ -44,10 +44,8 @@ public class SysOperLogServiceImpl implements ISysOperLogService, OperLogService @Override public List selectOperLogList(FilterOperLogRequest filterOperLogRequest) { - if (filterOperLogRequest.getPage() != null) { - int offset = (filterOperLogRequest.getPage() - 1) * filterOperLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterOperLogRequest.getLimit()); - } + // 分页处理 + filterOperLogRequest.pageDispose(); return baseMapper.selectList(filterOperLogRequest); } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java index 550d1d72..7c619dce 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java @@ -27,10 +27,8 @@ public class PurApplyDetailImplService implements PurApplyDetailService { if (purApplyRequest == null) { return Collections.emptyList(); } - if (purApplyRequest.getPage() != null) { - int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit(); - PageHelper.offsetPage(offset, purApplyRequest.getLimit()); - } + // 分页处理 + purApplyRequest.pageDispose(); List data = purApplyDetailDao.queryPageList(purApplyRequest); return data; } @@ -51,10 +49,8 @@ public class PurApplyDetailImplService implements PurApplyDetailService { if (purApplyRequest == null) { return Collections.emptyList(); } - if (purApplyRequest.getPage() != null) { - int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit(); - PageHelper.offsetPage(offset, purApplyRequest.getLimit()); - } + // 分页处理 + purApplyRequest.pageDispose(); List data = purApplyDetailDao.joinQueryList(purApplyRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java index e6a2717f..dbcdc07e 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java @@ -25,10 +25,8 @@ public class PurApplyServiceImpl implements PurApplyService { if (purApplyRequest == null) { return Collections.emptyList(); } - if (purApplyRequest.getPage() != null) { - int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit(); - PageHelper.offsetPage(offset, purApplyRequest.getLimit()); - } + // 分页处理 + purApplyRequest.pageDispose(); List data = purApplyDao.queryPageList(purApplyRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java index c284e738..619f5888 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java @@ -27,10 +27,8 @@ public class PurArrivalDetailServiceImpl implements PurArrivalDetailService { if (purOrderDetailRequest == null) { return Collections.emptyList(); } - if (purOrderDetailRequest.getPage() != null) { - int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(); - PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit()); - } + // 分页处理 + purOrderDetailRequest.pageDispose(); List data = purArrivalDetailDao.joinQueryList(purOrderDetailRequest); return data; } @@ -48,10 +46,8 @@ public class PurArrivalDetailServiceImpl implements PurArrivalDetailService { if (purOrderDetailRequest == null) { return Collections.emptyList(); } - if (purOrderDetailRequest.getPage() != null) { - int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(); - PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit()); - } + // 分页处理 + purOrderDetailRequest.pageDispose(); List data = purArrivalDetailDao.queryPageList(purOrderDetailRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java index b7d8aaa8..07340b3f 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java @@ -27,10 +27,8 @@ public class PurArrivalServiceImpl implements PurArrivalService { if (purArrivalRequest == null) { return Collections.emptyList(); } - if (purArrivalRequest.getPage() != null) { - int offset = (purArrivalRequest.getPage() - 1) * purArrivalRequest.getLimit(); - PageHelper.offsetPage(offset, purArrivalRequest.getLimit()); - } + // 分页处理 + purArrivalRequest.pageDispose(); List data = purArrivalDao.queryPageList(purArrivalRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java index 7bbcb594..f7738299 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java @@ -26,10 +26,8 @@ public class PurDeliveryDetailServiceImpl implements PurDeliveryDetailService { if (purOrderDetailRequest == null) { return Collections.emptyList(); } - if (purOrderDetailRequest.getPage() != null) { - int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(); - PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit()); - } + // 分页处理 + purOrderDetailRequest.pageDispose(); List data = purDeliveryDetailDao.joinQueryList(purOrderDetailRequest); return data; } @@ -47,10 +45,8 @@ public class PurDeliveryDetailServiceImpl implements PurDeliveryDetailService { if (purOrderDetailRequest == null) { return Collections.emptyList(); } - if (purOrderDetailRequest.getPage() != null) { - int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(); - PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit()); - } + // 分页处理 + purOrderDetailRequest.pageDispose(); List data = purDeliveryDetailDao.queryPageList(purOrderDetailRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java index 30f8155e..4408930c 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java @@ -36,10 +36,8 @@ public class PurDeliveryServiceImpl implements PurDeliveryService { if (purDeliveryRequest == null) { return Collections.emptyList(); } - if (purDeliveryRequest.getPage() != null) { - int offset = (purDeliveryRequest.getPage() - 1) * purDeliveryRequest.getLimit(); - PageHelper.offsetPage(offset, purDeliveryRequest.getLimit()); - } + // 分页处理 + purDeliveryRequest.pageDispose(); List data = purDeliveryDao.queryPageList(purDeliveryRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java index 04651b99..e08c9a32 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java @@ -28,10 +28,8 @@ public class PurOrderDetailServiceImpl implements PurOrderDetailService { if (purOrderDetailRequest == null) { return Collections.emptyList(); } - if (purOrderDetailRequest.getPage() != null) { - int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(); - PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit()); - } + // 分页处理 + purOrderDetailRequest.pageDispose(); List data = purOrderDetailDao.joinQueryList(purOrderDetailRequest); return data; } @@ -41,10 +39,8 @@ public class PurOrderDetailServiceImpl implements PurOrderDetailService { if (purOrderDetailRequest == null) { return Collections.emptyList(); } - if (purOrderDetailRequest.getPage() != null) { - int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(); - PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit()); - } + // 分页处理 + purOrderDetailRequest.pageDispose(); List data = purOrderDetailDao.joinQueryDrugList(purOrderDetailRequest); return data; } @@ -62,10 +58,8 @@ public class PurOrderDetailServiceImpl implements PurOrderDetailService { if (purOrderDetailRequest == null) { return Collections.emptyList(); } - if (purOrderDetailRequest.getPage() != null) { - int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(); - PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit()); - } + // 分页处理 + purOrderDetailRequest.pageDispose(); List data = purOrderDetailDao.queryPageList(purOrderDetailRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java index 69f0c293..d8784602 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java @@ -45,10 +45,8 @@ public class PurOrderServiceImpl implements PurOrderService { if (purOrderRequest == null) { return Collections.emptyList(); } - if (purOrderRequest.getPage() != null) { - int offset = (purOrderRequest.getPage() - 1) * purOrderRequest.getLimit(); - PageHelper.offsetPage(offset, purOrderRequest.getLimit()); - } + // 分页处理 + purOrderRequest.pageDispose(); List data = purOrderDao.queryPageList(purOrderRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java index 8e5a8acc..3c9d909d 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java @@ -27,10 +27,8 @@ public class PurPlanDetailServiceImpl implements PurPlanDetailService { if (purApplyRequest == null) { return Collections.emptyList(); } - if (purApplyRequest.getPage() != null) { - int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit(); - PageHelper.offsetPage(offset, purApplyRequest.getLimit()); - } + // 分页处理 + purApplyRequest.pageDispose(); List data = purPlanDetailDao.joinQueryList(purApplyRequest); return data; } @@ -48,10 +46,8 @@ public class PurPlanDetailServiceImpl implements PurPlanDetailService { if (purPlanDetailRequest == null) { return Collections.emptyList(); } - if (purPlanDetailRequest.getPage() != null) { - int offset = (purPlanDetailRequest.getPage() - 1) * purPlanDetailRequest.getLimit(); - PageHelper.offsetPage(offset, purPlanDetailRequest.getLimit()); - } + // 分页处理 + purPlanDetailRequest.pageDispose(); List data = purPlanDetailDao.queryPageList(purPlanDetailRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java index 44f64ed4..1cbafb21 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java @@ -25,10 +25,8 @@ public class PurPlanServiceImpl implements PurPlanService { if (purPlanRequest == null) { return Collections.emptyList(); } - if (purPlanRequest.getPage() != null) { - int offset = (purPlanRequest.getPage() - 1) * purPlanRequest.getLimit(); - PageHelper.offsetPage(offset, purPlanRequest.getLimit()); - } + // 分页处理 + purPlanRequest.pageDispose(); List data = purPlanDao.queryPageList(purPlanRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java index 57bc14f6..8393f191 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java @@ -28,10 +28,8 @@ public class PurReturnedDetailServiceImpl implements PurReturnedDetailService { if (purOrderDetailRequest == null) { return Collections.emptyList(); } - if (purOrderDetailRequest.getPage() != null) { - int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(); - PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit()); - } + // 分页处理 + purOrderDetailRequest.pageDispose(); List data = purReturnedDetailDao.joinQueryList(purOrderDetailRequest); return data; } @@ -49,10 +47,8 @@ public class PurReturnedDetailServiceImpl implements PurReturnedDetailService { if (purOrderDetailRequest == null) { return Collections.emptyList(); } - if (purOrderDetailRequest.getPage() != null) { - int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(); - PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit()); - } + // 分页处理 + purOrderDetailRequest.pageDispose(); List data = purReturnedDetailDao.queryPageList(purOrderDetailRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java index 69210b7b..40bfe73d 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java @@ -25,10 +25,8 @@ public class PurReturnedServiceImpl implements PurReturnedService { if (purReturnedRequest == null) { return Collections.emptyList(); } - if (purReturnedRequest.getPage() != null) { - int offset = (purReturnedRequest.getPage() - 1) * purReturnedRequest.getLimit(); - PageHelper.offsetPage(offset, purReturnedRequest.getLimit()); - } + // 分页处理 + purReturnedRequest.pageDispose(); List data = purReturnedDao.queryPageList(purReturnedRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java index f3253fbe..4da935d5 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java @@ -41,10 +41,8 @@ public class SupCertServiceImpl extends ServiceImpl i if (filterSupCertRequest == null) { return Collections.emptyList(); } - if (filterSupCertRequest.getPage() != null) { - int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit(); - PageHelper.offsetPage(offset, filterSupCertRequest.getLimit()); - } + // 分页处理 + filterSupCertRequest.pageDispose(); return supCertDao.filterCompanyCert(filterSupCertRequest); } @@ -53,10 +51,8 @@ public class SupCertServiceImpl extends ServiceImpl i if (filterSupCertRequest == null) { return Collections.emptyList(); } - if (filterSupCertRequest.getPage() != null) { - int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit(); - PageHelper.offsetPage(offset, filterSupCertRequest.getLimit()); - } + // 分页处理 + filterSupCertRequest.pageDispose(); List companyEntities = supCertDao.getCompanyCert(filterSupCertRequest); return companyEntities; @@ -68,10 +64,8 @@ public class SupCertServiceImpl extends ServiceImpl i if (filterSupCertRequest == null) { return Collections.emptyList(); } - if (filterSupCertRequest.getPage() != null) { - int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit(); - PageHelper.offsetPage(offset, filterSupCertRequest.getLimit()); - } + // 分页处理 + filterSupCertRequest.pageDispose(); List companyEntities = supCertDao.getCompanyCert(filterSupCertRequest); return companyEntities; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java index e74b0c77..a7a74b9c 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java @@ -26,10 +26,8 @@ public class SupCertSetServiceImpl extends ServiceImpl companyEntities = supManufacturerDao.getCompany(filterSupManufacturerRequest); return companyEntities; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java index c4613efd..6bb574f3 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java @@ -55,10 +55,8 @@ public class SupProductServiceImpl extends ServiceImpl companyEntities = supProductDao.getRegistration(filterPoductRequest); return companyEntities; } diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java index 8299b439..139ca9c2 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java @@ -27,10 +27,8 @@ public class BasicDownloadServiceImpl extends ServiceImpl MenuHelpList(SysMenuHelpRequest sysMenuHelpRequest) { - if (sysMenuHelpRequest.getPage() != null) { - int offset = (sysMenuHelpRequest.getPage() - 1) * sysMenuHelpRequest.getLimit(); - PageHelper.offsetPage(offset, sysMenuHelpRequest.getLimit()); - } + // 分页处理 + sysMenuHelpRequest.pageDispose(); return sysMenuHelpMapper.selectMenuHelpList(sysMenuHelpRequest); } diff --git a/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java index 1202d1fa..0df3d40a 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java @@ -23,10 +23,8 @@ public class SysRemindMsgServiceImpl implements SysRemindMsgService { @Override public List filterList(FilterSysRemindMsgRequest filterSysRemindMsgRequest) { - if (filterSysRemindMsgRequest.getPage() != null) { - int offset = (filterSysRemindMsgRequest.getPage() - 1) * filterSysRemindMsgRequest.getLimit(); - PageHelper.offsetPage(offset, filterSysRemindMsgRequest.getLimit()); - } + // 分页处理 + filterSysRemindMsgRequest.pageDispose(); return sysRemindMsgMapper.filterList(filterSysRemindMsgRequest); } diff --git a/src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java index 11c662d2..c56f81f9 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java @@ -20,10 +20,8 @@ public class SysRemindSetServiceImpl implements SysRemindSetService { @Override public List filterList(FilterSysRemindSetRequest filterSysRemindSetRequest) { - if (filterSysRemindSetRequest.getPage() != null) { - int offset = (filterSysRemindSetRequest.getPage() - 1) * filterSysRemindSetRequest.getLimit(); - PageHelper.offsetPage(offset, filterSysRemindSetRequest.getLimit()); - } + // 分页处理 + filterSysRemindSetRequest.pageDispose(); return sysRemindSetMapper.filterList(filterSysRemindSetRequest); } } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java index 8d64e101..030bc98a 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java @@ -27,10 +27,10 @@ public class SystemPDFModuleServiceImpl extends ServiceImpl queryPage(FilterPdfModuleRequest FilterPDFModuleRequest) { - int offset = (FilterPDFModuleRequest.getPage() - 1) * FilterPDFModuleRequest.getLimit(); - PageHelper.offsetPage(offset, FilterPDFModuleRequest.getLimit()); - List list = systemPDFModuleDao.queryPage(FilterPDFModuleRequest); + public List queryPage(FilterPdfModuleRequest filterPdfModuleRequest) { + // 分页处理 + filterPdfModuleRequest.pageDispose(); + List list = systemPDFModuleDao.queryPage(filterPdfModuleRequest); return list; } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java index 82473f46..32af8bac 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java @@ -23,10 +23,8 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR @Override public List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest) { - if (systemPDFModuleRequest.getPage() != null) { - int offset = (systemPDFModuleRequest.getPage() - 1) * systemPDFModuleRequest.getLimit(); - PageHelper.offsetPage(offset, systemPDFModuleRequest.getLimit()); - } + // 分页处理 + systemPDFModuleRequest.pageDispose(); return systemPDFTemplateRelevanceDao.filterList(systemPDFModuleRequest); } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java index 3568c93e..f17c1bf4 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java @@ -20,10 +20,10 @@ public class SystemPDFTemplateServiceImpl extends ServiceImpl queryPage(FilterPdfTemplateRequest FilterPdfTemplateRequest) { - int offset = (FilterPdfTemplateRequest.getPage() - 1) * FilterPdfTemplateRequest.getLimit(); - PageHelper.offsetPage(offset, FilterPdfTemplateRequest.getLimit()); - List list = systemPDFTemplateDao.queryPage(FilterPdfTemplateRequest); + public List queryPage(FilterPdfTemplateRequest filterPdfTemplateRequest) { + // 分页处理 + filterPdfTemplateRequest.pageDispose(); + List list = systemPDFTemplateDao.queryPage(filterPdfTemplateRequest); return list; } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java index b7f62db5..06658c08 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java @@ -24,12 +24,10 @@ public class SystemParamConfigServiceImpl extends ServiceImpl queryPage(FilterParamConfigRequest FilterParamConfigRequest) { - if (FilterParamConfigRequest.getPage() != null) { - int offset = (FilterParamConfigRequest.getPage() - 1) * FilterParamConfigRequest.getLimit(); - PageHelper.offsetPage(offset, FilterParamConfigRequest.getLimit()); - } - List list = systemParamConfigDao.queryPage(FilterParamConfigRequest); + public List queryPage(FilterParamConfigRequest filterParamConfigRequest) { + // 分页处理 + filterParamConfigRequest.pageDispose(); + List list = systemParamConfigDao.queryPage(filterParamConfigRequest); return list; } diff --git a/src/main/java/com/glxp/api/service/system/impl/ThirdSysApiServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/ThirdSysApiServiceImpl.java index 80ff17ed..2db76874 100644 --- a/src/main/java/com/glxp/api/service/system/impl/ThirdSysApiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/ThirdSysApiServiceImpl.java @@ -24,10 +24,8 @@ public class ThirdSysApiServiceImpl implements ThirdSysApiService { if (filterSysApiRequest == null) { return Collections.emptyList(); } - if (filterSysApiRequest.getPage() != null) { - int offset = (filterSysApiRequest.getPage() - 1) * filterSysApiRequest.getLimit(); - PageHelper.offsetPage(offset, filterSysApiRequest.getLimit()); - } + // 分页处理 + filterSysApiRequest.pageDispose(); return thirdSysApiDao.findSysApi(filterSysApiRequest); } diff --git a/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java b/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java index 9bd26f81..418e1abf 100644 --- a/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java +++ b/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java @@ -16,10 +16,8 @@ public class BasicInsMaterialService extends ServiceImpl { if (filterThrHslbRequest == null) { return Collections.emptyList(); } - if (filterThrHslbRequest.getPage() != null) { - int offset = (filterThrHslbRequest.getPage() - 1) * filterThrHslbRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrHslbRequest.getLimit()); - } + // 分页处理 + filterThrHslbRequest.pageDispose(); List data = thrHslbMapper.getHslbs(filterThrHslbRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java b/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java index ac33e946..e0ea3078 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java @@ -34,10 +34,8 @@ public class ThrManufacturerService extends ServiceImpl data = thrManufacturerMapper.filterThrManu(filterThrCorpRequest); return data; } @@ -101,10 +99,8 @@ public class ThrManufacturerService extends ServiceImpl data = thrManufacturerMapper.getProductTypes(basicProducstRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java index 98946c96..8770190b 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java @@ -20,10 +20,8 @@ public class ThrProductTypeService extends ServiceImpl data = thrProductTypeMapper.getProductTypes(filterThrProductTypeRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java index 3b4a9ff7..7c818b2b 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java @@ -38,10 +38,8 @@ public class ThrCorpExportLogServiceImpl implements ThrCorpExportLogService { if (filterThrCorpExportLogRequest == null) { return Collections.emptyList(); } - if (filterThrCorpExportLogRequest.getPage() != null) { - int offset = (filterThrCorpExportLogRequest.getPage() - 1) * filterThrCorpExportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrCorpExportLogRequest.getLimit()); - } + // 分页处理 + filterThrCorpExportLogRequest.pageDispose(); List data = thrCorpExportLogDao.filterThrCorpExportLog(filterThrCorpExportLogRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java index c447b1a9..99b193fc 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java @@ -26,10 +26,8 @@ public class ThrCorpImportDetailServiceImpl implements ThrCorpImportDetailServic if (filterThrCorpImportLogRequest == null) { return Collections.emptyList(); } - if (filterThrCorpImportLogRequest.getPage() != null) { - int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit()); - } + // 分页处理 + filterThrCorpImportLogRequest.pageDispose(); List data = thrCorpImportDetailDao.filterCorpDetailImport(filterThrCorpImportLogRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java index 17d5dde3..c5e4a40b 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java @@ -38,10 +38,8 @@ public class ThrCorpImportLogServiceImpl implements ThrCorpImportLogService { if (filterThrCorpImportLogRequest == null) { return Collections.emptyList(); } - if (filterThrCorpImportLogRequest.getPage() != null) { - int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit()); - } + // 分页处理 + filterThrCorpImportLogRequest.pageDispose(); List data = thrCorpImportLogDao.filterThrCorpImportLog(filterThrCorpImportLogRequest); return data; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java index f53d8faf..e42b8681 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java @@ -28,10 +28,8 @@ public class ThrCorpServiceImpl implements ThrCorpService { if (filterThrCorpRequest == null) { return Collections.emptyList(); } - if (filterThrCorpRequest.getPage() != null) { - int offset = (filterThrCorpRequest.getPage() - 1) * filterThrCorpRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrCorpRequest.getLimit()); - } + // 分页处理 + filterThrCorpRequest.pageDispose(); List data = thrCorpDao.filterThrCorps(filterThrCorpRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java index d77b4dc2..f959abda 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java @@ -47,10 +47,8 @@ public class ThrDeptServiceImpl implements ThrDeptService { if (filterThrDeptRequest == null) { return Collections.emptyList(); } - if (filterThrDeptRequest.getPage() != null) { - int offset = (filterThrDeptRequest.getPage() - 1) * filterThrDeptRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrDeptRequest.getLimit()); - } + // 分页处理 + filterThrDeptRequest.pageDispose(); return thrDeptDao.filterThrInvWarehouse(filterThrDeptRequest); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java index 05d798f4..83638cb8 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java @@ -26,10 +26,8 @@ public class ThrInvProductsDetailServiceImpl implements ThrInvProductsDetailServ if (filterThrCorpImportLogRequest == null) { return Collections.emptyList(); } - if (filterThrCorpImportLogRequest.getPage() != null) { - int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit()); - } + // 分页处理 + filterThrCorpImportLogRequest.pageDispose(); List data = thrInvProductsDetailDao.filterInvProductsDetailImport(filterThrCorpImportLogRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java index 483f3ecc..f63db40a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java @@ -39,10 +39,8 @@ public class ThrInvProductsExportLogServiceImpl implements ThrInvProductsExportL if (filterThrCorpExportLogRequest == null) { return Collections.emptyList(); } - if (filterThrCorpExportLogRequest.getPage() != null) { - int offset = (filterThrCorpExportLogRequest.getPage() - 1) * filterThrCorpExportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrCorpExportLogRequest.getLimit()); - } + // 分页处理 + filterThrCorpExportLogRequest.pageDispose(); List data = thrInvProductsExportLogDao.filterThrInvProductsExportLog(filterThrCorpExportLogRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java index ccffb124..2151421e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java @@ -29,10 +29,8 @@ public class ThrInvProductsImportLogServiceImpl implements ThrInvProductsImportL if (filterThrCorpImportLogRequest == null) { return Collections.emptyList(); } - if (filterThrCorpImportLogRequest.getPage() != null) { - int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit()); - } + // 分页处理 + filterThrCorpImportLogRequest.pageDispose(); List data = thrInvProductsImportLogDao.filterThrInvProductsImportLog(filterThrCorpImportLogRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java index e81cad1e..249da60c 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java @@ -26,10 +26,8 @@ public class ThrInvProductsServiceImpl implements ThrInvProductsService { if (filterThrInvProductsRequest == null) { return Collections.emptyList(); } - if (filterThrInvProductsRequest.getPage() != null) { - int offset = (filterThrInvProductsRequest.getPage() - 1) * filterThrInvProductsRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrInvProductsRequest.getLimit()); - } + // 分页处理 + filterThrInvProductsRequest.pageDispose(); List data = thrInvProductsDao.filterThrInvProductss(filterThrInvProductsRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java index 3ad46547..26af9ee2 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java @@ -44,10 +44,8 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService { if (filterThrSubInvWarehouseRequest == null) { return Collections.emptyList(); } - if (filterThrSubInvWarehouseRequest.getPage() != null) { - int offset = (filterThrSubInvWarehouseRequest.getPage() - 1) * filterThrSubInvWarehouseRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrSubInvWarehouseRequest.getLimit()); - } + // 分页处理 + filterThrSubInvWarehouseRequest.pageDispose(); return thrInvWarehouseDao.filterThrInvWarehouse(filterThrSubInvWarehouseRequest); } @@ -61,10 +59,8 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService { if (filterThrSubInvWarehouseRequest == null) { return Collections.emptyList(); } - if (filterThrSubInvWarehouseRequest.getPage() != null) { - int offset = (filterThrSubInvWarehouseRequest.getPage() - 1) * filterThrSubInvWarehouseRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrSubInvWarehouseRequest.getLimit()); - } + // 分页处理 + filterThrSubInvWarehouseRequest.pageDispose(); return thrInvWarehouseDao.selectByThrDeptCode(filterThrSubInvWarehouseRequest); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java index 4fb1b4c6..eac57ef1 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java @@ -30,10 +30,8 @@ public class ThrOrderDetailServiceImpl implements ThrOrderDetailService { if (filterThrOrderDetailRequest == null) { return Collections.emptyList(); } - if (filterThrOrderDetailRequest.getPage() != null) { - int offset = (filterThrOrderDetailRequest.getPage() - 1) * filterThrOrderDetailRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrOrderDetailRequest.getLimit()); - } + // 分页处理 + filterThrOrderDetailRequest.pageDispose(); List data = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java index e53f0df2..8bc50058 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java @@ -35,10 +35,8 @@ public class ThrOrderExportLogServiceImpl implements ThrOrderExportLogService { if (filterThrCorpImportLogRequest == null) { return Collections.emptyList(); } - if (filterThrCorpImportLogRequest.getPage() != null) { - int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit()); - } + // 分页处理 + filterThrCorpImportLogRequest.pageDispose(); List data = thrOrderExportLogDao.filterThrOrderExportLog(filterThrCorpImportLogRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java index dd9fddf4..dd1fa186 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java @@ -24,10 +24,8 @@ public class ThrOrderImportDetailServiceImpl implements ThrOrderImportDetailServ if (filterThrCorpImportLogRequest == null) { return Collections.emptyList(); } - if (filterThrCorpImportLogRequest.getPage() != null) { - int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit()); - } + // 分页处理 + filterThrCorpImportLogRequest.pageDispose(); List data = thrOrderImportDetailDao.filterOrderdDetailImport(filterThrCorpImportLogRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java index b3bf0f94..dbb1c2fd 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java @@ -55,10 +55,8 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { if (filterThrCorpImportLogRequest == null) { return Collections.emptyList(); } - if (filterThrCorpImportLogRequest.getPage() != null) { - int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit()); - } + // 分页处理 + filterThrCorpImportLogRequest.pageDispose(); List data = thrOrderImportLogDao.filterThrOrderImportLog(filterThrCorpImportLogRequest); return data; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java index b5dbeb74..9086b847 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java @@ -35,10 +35,8 @@ public class ThrOrderServiceImpl implements ThrOrderService { if (filterThrOrderRequest == null) { return Collections.emptyList(); } - if (filterThrOrderRequest.getPage() != null) { - int offset = (filterThrOrderRequest.getPage() - 1) * filterThrOrderRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrOrderRequest.getLimit()); - } + // 分页处理 + filterThrOrderRequest.pageDispose(); List data = thrOrderDao.filterThrOrder(filterThrOrderRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java index 67a76e15..1abeb735 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java @@ -48,10 +48,8 @@ public class ThrProductsAddDiService extends ServiceImpl filterThrProductsList(FilterThrProductsRequest filterThrProductsRequest) { - if (null != filterThrProductsRequest && filterThrProductsRequest.getPage() != null) { - int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit()); - } + // 分页处理 + filterThrProductsRequest.pageDispose(); List thrProductsAddDiResponses = thrProductsAddDiDao.filterThrProductsList(filterThrProductsRequest); if (CollUtil.isNotEmpty(thrProductsAddDiResponses)) { diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java index 8a4e9c77..9c32eb7f 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java @@ -25,10 +25,8 @@ public class ThrProductsAddServiceImpl implements ThrProductsAddService { if (filterThrProductsRequest == null) { return Collections.emptyList(); } - if (filterThrProductsRequest.getPage() != null) { - int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit()); - } + // 分页处理 + filterThrProductsRequest.pageDispose(); List data = thrProductsAddDao.filterThrProductsRequest(filterThrProductsRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java index b42aa0f1..89368739 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java @@ -37,10 +37,8 @@ public class ThrProductsExportLogServiceImpl implements ThrProductsExportLogServ if (filterThrProductsExportLogRequest == null) { return Collections.emptyList(); } - if (filterThrProductsExportLogRequest.getPage() != null) { - int offset = (filterThrProductsExportLogRequest.getPage() - 1) * filterThrProductsExportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrProductsExportLogRequest.getLimit()); - } + // 分页处理 + filterThrProductsExportLogRequest.pageDispose(); List data = thrProductsExportLogDao.filterThrProductsExportLog(filterThrProductsExportLogRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java index 70aa614e..03e41f54 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java @@ -24,10 +24,8 @@ public class ThrProductsImportDetailServiceImpl implements ThrProductsImportDeta if (filterThrProductsImportLogRequest == null) { return Collections.emptyList(); } - if (filterThrProductsImportLogRequest.getPage() != null) { - int offset = (filterThrProductsImportLogRequest.getPage() - 1) * filterThrProductsImportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrProductsImportLogRequest.getLimit()); - } + // 分页处理 + filterThrProductsImportLogRequest.pageDispose(); List data = thrProductsImportDetailDao.filterProductsDetailImport(filterThrProductsImportLogRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java index 9469d11a..e15f84cd 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java @@ -23,10 +23,8 @@ public class ThrProductsImportLogServiceImpl implements ThrProductsImportLogServ if (filterThrProductsImportLogRequest == null) { return Collections.emptyList(); } - if (filterThrProductsImportLogRequest.getPage() != null) { - int offset = (filterThrProductsImportLogRequest.getPage() - 1) * filterThrProductsImportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrProductsImportLogRequest.getLimit()); - } + // 分页处理 + filterThrProductsImportLogRequest.pageDispose(); List data = thrProductsImportLogDao.filterThrPorductsImportLog(filterThrProductsImportLogRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index 704f6587..6e450d1f 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -52,10 +52,8 @@ public class ThrProductsServiceImpl extends ServiceImpl data = thrProductsDao.filterThrProducts(filterThrProductsRequest); return data; } @@ -64,10 +62,8 @@ public class ThrProductsServiceImpl extends ServiceImpl data = thrProductsDao.filterThrProducts1(filterThrProductsRequest); return data; } @@ -77,10 +73,8 @@ public class ThrProductsServiceImpl extends ServiceImpl data = thrSystemDetailDao.filterBasicThirdSysDetail(filterBasicThirdSysDetailRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java index e579ae6f..23cbe53f 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java @@ -50,11 +50,8 @@ public class ThrSystemServiceImpl implements ThrSystemService { if (filterBasicThirdSysRequest == null) { return Collections.emptyList(); } - - if (filterBasicThirdSysRequest.getPage() != null) { - int offset = (filterBasicThirdSysRequest.getPage() - 1) * filterBasicThirdSysRequest.getLimit(); - PageHelper.offsetPage(offset, filterBasicThirdSysRequest.getLimit()); - } + // 分页处理 + filterBasicThirdSysRequest.pageDispose(); List data = thrSystemDao.filterBasicThiSys(filterBasicThirdSysRequest); //查询本系统的授权码 AuthLicense license = authLicenseDao.selectLicenseByName("UDI管理系统"); diff --git a/src/main/java/com/glxp/api/util/page/ListPageRequest.java b/src/main/java/com/glxp/api/util/page/ListPageRequest.java index 38ce6bd6..b0bbeb65 100644 --- a/src/main/java/com/glxp/api/util/page/ListPageRequest.java +++ b/src/main/java/com/glxp/api/util/page/ListPageRequest.java @@ -1,6 +1,8 @@ package com.glxp.api.util.page; +import com.github.pagehelper.PageHelper; import lombok.Data; +import lombok.Value; import javax.validation.constraints.Max; import javax.validation.constraints.Min; @@ -23,4 +25,11 @@ public class ListPageRequest { private String orderBy; private String sort; + + public void pageDispose(){ + if (this.getPage() != null && this.getLimit() != null) { + int offset = (this.getPage() - 1) * this.getLimit(); + PageHelper.offsetPage(offset, this.getLimit()); + } + } }