From 9b2c6851efa8a580acb672290b8162c19dbada2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 30 Jan 2023 16:30:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicUnitMaintainController.java | 494 ++++++++++++++++++ .../api/dao/basic/BasicUnitMaintainDao.java | 39 ++ .../api/entity/basic/BasicCorpEntity.java | 4 +- .../basic/BasicUnitMaintainFilterRequest.java | 31 ++ .../res/basic/BasicUnitMaintainResponse.java | 30 ++ .../basic/BasicUnitMaintainService.java | 43 ++ .../impl/BasicUnitMaintainServiceImpl.java | 129 +++++ .../mapper/basic/BasicUnitMaintainDao.xml | 295 +++++++++++ 8 files changed, 1063 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/basic/BasicUnitMaintainController.java create mode 100644 src/main/java/com/glxp/api/dao/basic/BasicUnitMaintainDao.java create mode 100644 src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java create mode 100644 src/main/java/com/glxp/api/res/basic/BasicUnitMaintainResponse.java create mode 100644 src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java create mode 100644 src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml diff --git a/src/main/java/com/glxp/api/controller/basic/BasicUnitMaintainController.java b/src/main/java/com/glxp/api/controller/basic/BasicUnitMaintainController.java new file mode 100644 index 00000000..c6633303 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/basic/BasicUnitMaintainController.java @@ -0,0 +1,494 @@ +package com.glxp.api.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.BasicCorpEntity; +import com.glxp.api.entity.system.SystemParamConfigEntity; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.entity.thrsys.ThrSystemEntity; +import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BasicProductThirdSysResponse; +import com.glxp.api.res.basic.BasicUnitMaintainResponse; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.system.CompanyService; +import com.glxp.api.service.system.SystemParamConfigService; +import com.glxp.api.service.thrsys.ThrCorpService; +import com.glxp.api.service.thrsys.ThrSystemService; +import com.glxp.api.util.CustomUtil; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.*; +import java.util.stream.Collectors; + +/** + * 往来单位信息维护 + */ +@RestController +public class BasicUnitMaintainController { + + @Resource + private BasicUnitMaintainService basicUnitMaintainService; +// @Resource +// BasicThirdSysDetailService basicThirdSysDetailService; + @Resource + private SystemParamConfigService systemParamConfigService; + @Resource + private ThrSystemService thrSystemService; +// @Resource +// BasicUnitImportService basicUnitImportService; + @Resource + private ThrCorpService thrCorpService; + @Resource + private CompanyService companyService; +// @Resource +// private OrderService orderService; + @Resource + private ErpBasicClient erpBasicClient; + + @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); + PageInfo pageInfo = new PageInfo<>(basicUnitMaintainEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicUnitMaintainEntities); + + SystemParamConfigEntity systemParamConfigEntityBUMErpId = systemParamConfigService.selectByParamKey("basic_unit_maintain_erp_id"); + SystemParamConfigEntity systemParamConfigEntityBUMThirdId = systemParamConfigService.selectByParamKey("basic_cops_thirdSys"); + Map rMap = new HashMap<>(); + rMap.put("BUMErpIdValue", + systemParamConfigEntityBUMErpId != null && StringUtils.isNotBlank(systemParamConfigEntityBUMErpId.getParamValue()) ? + systemParamConfigEntityBUMErpId.getParamValue() : "0"); + rMap.put("BUMThirdIdValue", + systemParamConfigEntityBUMThirdId != null && StringUtils.isNotBlank(systemParamConfigEntityBUMThirdId.getParamValue()) ? + systemParamConfigEntityBUMThirdId.getParamValue() : "0"); + rMap.put("page", pageSimpleResponse); + return ResultVOUtils.success(rMap); + } + + @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); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicUnitMaintainEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/basic/unit/maintain/save") + public BaseResponse save(@RequestBody @Valid BasicCorpEntity basicUnitMaintainSaveRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + BasicCorpEntity basicUnitMaintainEntity = new BasicCorpEntity(); + BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity); + basicUnitMaintainEntity.setErpId(CustomUtil.getId()); + basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS); + basicUnitMaintainEntity.setUpdateTime(new Date()); + boolean b = basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success(); + } + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/basic/unit/maintain/update") + public BaseResponse update(@RequestBody @Valid BasicCorpEntity basicUnitMaintainSaveRequest,BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest); + return ResultVOUtils.success("修改成功"); + } + + // @AuthRuleAnnotation("") + @GetMapping("/udiwms/unit/download") + public BaseResponse downloadBasicUnit(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK); + List basicUnitMaintainEntities; + basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + + List basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item -> + { + BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse(); + BeanUtils.copyProperties(item, basicUnitMaintainResponse); + basicUnitMaintainResponse.setUnitId(item.getErpId()); + return basicUnitMaintainResponse; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicUnitMaintainResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicUnitMaintainResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @GetMapping("/udiwms/basic/unit/download") + public BaseResponse scdownloadBasicUnit(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK); + List basicUnitMaintainEntities; + basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + + List basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item -> + { + BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse(); + BeanUtils.copyProperties(item, basicUnitMaintainResponse); + basicUnitMaintainResponse.setUnitId(item.getErpId()); + return basicUnitMaintainResponse; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicUnitMaintainResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicUnitMaintainResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + +// @AuthRuleAnnotation("") +// @PostMapping("/udiwms/basic/unit/maintain/combine") +// public BaseResponse combine(@RequestBody CombineUnitRequest combineRequest, BindingResult bindingResult) { +// +// if (bindingResult.hasErrors()) { +// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); +// } +// List erpUnitsResponses = combineRequest.getCustmandocResponses(); +// if (erpUnitsResponses != null && erpUnitsResponses.size() > 0) { +// for (ErpUnitsResponse erpUnitsResponse : erpUnitsResponses) { +// BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); +// if (combineRequest.getThirdSys() != null) { +// if ("thirdId".equals(combineRequest.getThirdSys())) { +// basicUnitMaintainEntity.setThirdId(erpUnitsResponse.getId()); +// basicUnitMaintainEntity.setThirdName(erpUnitsResponse.getName()); +// } else if ("thirdId1".equals(combineRequest.getThirdSys())) { +// basicUnitMaintainEntity.setThirdId1(erpUnitsResponse.getId()); +// basicUnitMaintainEntity.setThirdName1(erpUnitsResponse.getName()); +// } else if ("thirdId2".equals(combineRequest.getThirdSys())) { +// basicUnitMaintainEntity.setThirdId2(erpUnitsResponse.getId()); +// basicUnitMaintainEntity.setThirdName2(erpUnitsResponse.getName()); +// } else if ("thirdId3".equals(combineRequest.getThirdSys())) { +// basicUnitMaintainEntity.setThirdId3(erpUnitsResponse.getId()); +// basicUnitMaintainEntity.setThirdName3(erpUnitsResponse.getName()); +// } else if ("thirdId4".equals(combineRequest.getThirdSys())) { +// basicUnitMaintainEntity.setThirdId4(erpUnitsResponse.getId()); +// basicUnitMaintainEntity.setThirdName4(erpUnitsResponse.getName()); +// } +// } +// basicUnitMaintainEntity.setErpId(CustomUtil.getId()); +// basicUnitMaintainEntity.setName(erpUnitsResponse.getName()); +// basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell()); +// basicUnitMaintainEntity.setAddr(erpUnitsResponse.getAddr()); +// basicUnitMaintainEntity.setCreditNo(erpUnitsResponse.getCreditNo()); +// basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact()); +// basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile()); +// basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SP); +// basicUnitMaintainEntity.setUpdateTime(new Date()); +// basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); +// } +// } +// return ResultVOUtils.success("选入成功"); +// } +// +// @AuthRuleAnnotation("") +// @GetMapping("/udiwms/basic/unit/maintain/combineAll") +// public BaseResponse combineAll(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, BindingResult bindingResult) { +// +// if (bindingResult.hasErrors()) { +// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); +// } +// BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("corpUrl", unitMaintainFilterRequest.getThirdSys()); +// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) +// return ResultVOUtils.error(500, "往来单位接口地址未定义"); +// if (basicThirdSysDetailEntity.getEnabled()) { +// basicUnitImportService.selectAllUnit(basicThirdSysDetailEntity, unitMaintainFilterRequest); +// +// } else { +// return ResultVOUtils.error(500, "第三方系统往来单位接口服务未启用"); +// } +// +// +// return ResultVOUtils.success("后台正在添加，请稍后刷新查看！"); +// } +// +// @AuthRuleAnnotation("") +// @PostMapping("/udiwms/basic/unit/maintain/combineSingle") +// public BaseResponse combineSingle(@RequestBody CombineSingleUnitRequest combineRequest, BindingResult bindingResult) { +// +// if (bindingResult.hasErrors()) { +// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); +// } +// ErpUnitsResponse erpUnitsResponse = combineRequest.getErpUnitsResponse(); +// BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); +// basicUnitMaintainEntity.setId(Integer.parseInt(combineRequest.getKey())); +// if (combineRequest.getThirdSys() != null) { +// if ("thirdId".equals(combineRequest.getThirdSys())) { +// basicUnitMaintainEntity.setThirdId(erpUnitsResponse.getId()); +// basicUnitMaintainEntity.setThirdName(erpUnitsResponse.getName()); +// } else if ("thirdId1".equals(combineRequest.getThirdSys())) { +// basicUnitMaintainEntity.setThirdId1(erpUnitsResponse.getId()); +// basicUnitMaintainEntity.setThirdName1(erpUnitsResponse.getName()); +// } else if ("thirdId2".equals(combineRequest.getThirdSys())) { +// basicUnitMaintainEntity.setThirdId2(erpUnitsResponse.getId()); +// basicUnitMaintainEntity.setThirdName2(erpUnitsResponse.getName()); +// } else if ("thirdId3".equals(combineRequest.getThirdSys())) { +// basicUnitMaintainEntity.setThirdId3(erpUnitsResponse.getId()); +// basicUnitMaintainEntity.setThirdName3(erpUnitsResponse.getName()); +// } else if ("thirdId4".equals(combineRequest.getThirdSys())) { +// basicUnitMaintainEntity.setThirdId4(erpUnitsResponse.getId()); +// basicUnitMaintainEntity.setThirdName4(erpUnitsResponse.getName()); +// } +// } +//// basicUnitMaintainEntity.setThirdName(erpUnitsResponse.getName()); +//// basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell()); +//// basicUnitMaintainEntity.setAddr(erpUnitsResponse.getAddr()); +//// basicUnitMaintainEntity.setCreditNo(erpUnitsResponse.getCreditNo()); +//// basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact()); +//// basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile()); +// basicUnitMaintainService.updateById(basicUnitMaintainEntity); +// return ResultVOUtils.success("关联成功"); +// } +// +// //解除绑定 +// @AuthRuleAnnotation("") +// @GetMapping("/udiwms/unit/thirdSys/removeRl") +// public BaseResponse uploadThirdServcie(RemoveRelRequest removeRelRequest) { +// BasicUnitMaintainEntity udiRelevanceEntity = basicUnitMaintainService.selectById(removeRelRequest.getRelId()); +// if (removeRelRequest.getThirdSys().equals("thirdId")) { +// udiRelevanceEntity.setThirdId(""); +// udiRelevanceEntity.setThirdName(""); +// } else if (removeRelRequest.getThirdSys().equals("thirdId1")) { +// udiRelevanceEntity.setThirdId1(""); +// udiRelevanceEntity.setThirdName1(""); +// } else if (removeRelRequest.getThirdSys().equals("thirdId2")) { +// udiRelevanceEntity.setThirdId2(""); +// udiRelevanceEntity.setThirdName2(""); +// } else if (removeRelRequest.getThirdSys().equals("thirdId3")) { +// udiRelevanceEntity.setThirdId3(""); +// udiRelevanceEntity.setThirdName3(""); +// } else if (removeRelRequest.getThirdSys().equals("thirdId4")) { +// udiRelevanceEntity.setThirdId4(""); +// udiRelevanceEntity.setThirdName4(""); +// } +// basicUnitMaintainService.updateById(udiRelevanceEntity); +// +// return ResultVOUtils.success("解除绑定成功！"); +// } +// +// @AuthRuleAnnotation("") + @PostMapping("/udiwms/basic/unit/maintain/delete") + public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + BasicCorpEntity basicUnitMaintainEntity = basicUnitMaintainService.selectById(id); +//todo 该功能还未设计 +// //判断是否被单据绑定 +// OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); +// orderFilterRequest.setFromCorpId(basicUnitMaintainEntity.getErpId()); +// OrderEntity orderEntity = orderService.findOne(orderFilterRequest); +// if (orderEntity != null) { +// return ResultVOUtils.error(500, "已存在该供应商单据，无法删除!"); +// } + + basicUnitMaintainService.deleteById(id); + return ResultVOUtils.success("删除成功"); + } +// +// //查询ERP往来单位 +// @AuthRuleAnnotation("") +// @GetMapping("/udiwms/unitMaintain/filterErp") +// public BaseResponse filterErp(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, +// BindingResult bindingResult) { +// +// if (bindingResult.hasErrors()) { +// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); +// } +// BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("corpUrl", unitMaintainFilterRequest.getThirdSys()); +// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) +// return ResultVOUtils.error(500, "往来单位接口地址未定义"); +// if (basicThirdSysDetailEntity.getEnabled()) { +// if (basicThirdSysDetailEntity.getFromType() == 0 || (unitMaintainFilterRequest.getIsDownThrSys() != null && unitMaintainFilterRequest.getIsDownThrSys())) { +// BaseResponse> udiDlDeviceResponse = +// erpBasicClient.getErpCrop(unitMaintainFilterRequest); +// +// if (udiDlDeviceResponse.getCode() == 20000) { +// for (ErpUnitsResponse erpUnitsResponse : udiDlDeviceResponse.getData().getList()) { +// BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(erpUnitsResponse.getId(), unitMaintainFilterRequest.getThirdSys()); +// if (basicUnitMaintainEntity != null) { +// erpUnitsResponse.setChecked(true); +// } else { +// erpUnitsResponse.setChecked(false); +// } +// } +// +// return udiDlDeviceResponse; +// } else { +// return udiDlDeviceResponse; +// } +// +// } else { +// FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); +// BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); +// filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys()); +// List thrCorpEntities +// = thrCorpService.filterThrCorps(filterThrCorpRequest); +// List thrCorpEntityList = thrCorpEntities.stream().map(item -> +// { +// ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); +// BeanUtils.copyProperties(item, thrCorpEntity); +// BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(item.getUnitId(), unitMaintainFilterRequest.getThirdSys()); +// if (basicUnitMaintainEntity != null) { +// thrCorpEntity.setChecked(true); +// } else { +// thrCorpEntity.setChecked(false); +// } +// thrCorpEntity.setId(item.getUnitId()); +// return thrCorpEntity; +// }).collect(Collectors.toList()); +// PageInfo pageInfo; +// pageInfo = new PageInfo<>(thrCorpEntities); +// PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); +// pageSimpleResponse.setTotal(pageInfo.getTotal()); +// pageSimpleResponse.setList(thrCorpEntityList); +// return ResultVOUtils.success(pageSimpleResponse); +// } +// } else { +// return ResultVOUtils.error(500, "第三方系统往来单位服务接口未启用"); +// } +// } +// + //获取产品信息详情（多平台） + @AuthRuleAnnotation("") + @GetMapping("/udiwms/unitMaintain/thirdSys/detail") + public BaseResponse getThirdSysDetail(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + BasicCorpEntity basicUnitMaintainEntity = basicUnitMaintainService.selectById(basicUnitMaintainFilterRequest.getId() + ""); + + FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest(); + filterBasicThirdSysRequest.setEnabled(true); + List basicThirdSysEntities = thrSystemService.filterBasicThiSys(filterBasicThirdSysRequest); + List basicProductThirdSysResponses = new ArrayList<>(); + + for (ThrSystemEntity basicThirdSysEntity : basicThirdSysEntities) { + if (basicThirdSysEntity.getThirdId().equals("thirdId")) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId()); + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + if (basicUnitMaintainEntity != null) { + basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId()); + basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName()); + } + + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } else if (basicThirdSysEntity.getThirdId().equals("thirdId1")) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId()); + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + if (basicUnitMaintainEntity != null) { + basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId1()); + basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName1()); + } + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } else if (basicThirdSysEntity.getThirdId().equals("thirdId2")) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId()); + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + if (basicUnitMaintainEntity != null) { + basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId2()); + basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName2()); + } + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } else if (basicThirdSysEntity.getThirdId().equals("thirdId3")) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId()); + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + if (basicUnitMaintainEntity != null) { + basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId3()); + basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName3()); + } + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } else if (basicThirdSysEntity.getThirdId().equals("thirdId4")) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId()); + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + if (basicUnitMaintainEntity != null) { + basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId4()); + basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName4()); + } + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } + } + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicProductThirdSysResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicProductThirdSysResponses); + return ResultVOUtils.success(pageSimpleResponse); + } +// +// public BasicThirdSysEntity filterThirdSys(String thirdId, List basicThirdSysEntities) { +// if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) { +// for (BasicThirdSysEntity basicThirdSysEntity : basicThirdSysEntities) { +// if (thirdId.equals(basicThirdSysEntity.getThirdId())) { +// return basicThirdSysEntity; +// } +// } +// } +// return null; +// } + +} diff --git a/src/main/java/com/glxp/api/dao/basic/BasicUnitMaintainDao.java b/src/main/java/com/glxp/api/dao/basic/BasicUnitMaintainDao.java new file mode 100644 index 00000000..64b441ab --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/BasicUnitMaintainDao.java @@ -0,0 +1,39 @@ +package com.glxp.api.dao.basic; + + +import com.glxp.api.entity.basic.BasicCorpEntity; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BasicUnitMaintainDao { + List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); + + boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity); + + boolean insertBasicUnitMaintainignore(BasicCorpEntity basicUnitMaintainEntity); + + boolean insert(BasicCorpEntity basicUnitMaintainEntity); + + boolean updateById(BasicCorpEntity basicUnitMaintainSaveRequest); + + BasicCorpEntity selectByThirdId(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); + + boolean deleteById(@Param("id") String id); + + BasicCorpEntity selectById(@Param("id") String id); + + List batchSelectByIds(@Param("ids") List id); + + List batchSelectByErpIds(@Param("erpIds") List erpIds); + + BasicCorpEntity selectByName(@Param("name") String name); + + + boolean importBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity); + + List batchSelectByErpIdsAndName(@Param("erpIds") List erpIds, @Param("name") String name); +} diff --git a/src/main/java/com/glxp/api/entity/basic/BasicCorpEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicCorpEntity.java index 13c1a826..c873f3a7 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicCorpEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicCorpEntity.java @@ -102,13 +102,13 @@ public class BasicCorpEntity { * 往来单位类型：1.客户，2：供应商，3：内部科室,4.特殊单据 */ @TableField(value = "corpType") - private Byte corpType; + private Integer corpType; /** * 客户单据：1.患者，2.客户 */ @TableField(value = "outType") - private Byte outType; + private Integer outType; /** * 创建人 diff --git a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java new file mode 100644 index 00000000..0bb8f66b --- /dev/null +++ b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java @@ -0,0 +1,31 @@ +package com.glxp.api.req.basic; + +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.req.ListPageRequest; +import com.glxp.api.res.thrsys.ThrCorpsResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class BasicUnitMaintainFilterRequest extends ListPageRequest { + + private Integer id; + private String key; + private String unitId; + private String name; + private String thirdSys; + private String thirdSysFk; + + private String thirdId; + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + private String erpId; + private Integer corpType; + private Integer outType; + private Boolean isDownThrSys; + private String lastUpdateTime; + ListthrCorpEntities; +} diff --git a/src/main/java/com/glxp/api/res/basic/BasicUnitMaintainResponse.java b/src/main/java/com/glxp/api/res/basic/BasicUnitMaintainResponse.java new file mode 100644 index 00000000..45c7b49f --- /dev/null +++ b/src/main/java/com/glxp/api/res/basic/BasicUnitMaintainResponse.java @@ -0,0 +1,30 @@ +package com.glxp.api.res.basic; + +import lombok.Data; + +import java.util.Date; + +@Data +public class BasicUnitMaintainResponse { + + private Integer id; + private String thirdId; + private String erpId; + private String name; + private String spell; + private String addr; + private String status; + private String type; + private String creditNo; + private String contact; + private String mobile; + private String thirdName; + private String unitId; + private Integer corpType; + private Integer outType; + private String createUser; + private Date createTime; + private String updateUser; + private Date updateTime; + private String remark; +} diff --git a/src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java b/src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java new file mode 100644 index 00000000..4afd0a93 --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java @@ -0,0 +1,43 @@ +package com.glxp.api.service.basic; + + + + +import com.glxp.api.entity.basic.BasicCorpEntity; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; + +import java.util.List; + +public interface BasicUnitMaintainService { + + List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); + + boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity); + + boolean updateById(BasicCorpEntity basicUnitMaintainEntity); + + boolean insert(BasicCorpEntity basicUnitMaintainEntity); + +// boolean updateById(BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest); + + boolean deleteById(String id); + + BasicCorpEntity selectByThirdId(String thirdId, String thirdSys); + + BasicCorpEntity selectById(String id); + + BasicCorpEntity selectByErpId(String id); + + BasicCorpEntity selectByName(String name); + + boolean isExit(); + + + boolean insertBasicUnitMaintainignore(BasicCorpEntity basicUnitMaintainEntity); + + List batchSelectByIds(List id); + + List batchSelectByErpIds(List erpIds); + + List batchSelectByErpIdsAndName(List erpIds, String name); +} 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 new file mode 100644 index 00000000..f30c5ddc --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java @@ -0,0 +1,129 @@ +package com.glxp.api.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.basic.BasicUnitMaintainDao; +import com.glxp.api.entity.basic.BasicCorpEntity; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +@Service +public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { + + @Resource + BasicUnitMaintainDao basicUnitMaintainDao; + + @Override + public List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) { + if (basicUnitMaintainFilterRequest == null) { + return Collections.emptyList(); + } + if (basicUnitMaintainFilterRequest.getPage() != null) { + int offset = (basicUnitMaintainFilterRequest.getPage() - 1) * basicUnitMaintainFilterRequest.getLimit(); + PageHelper.offsetPage(offset, basicUnitMaintainFilterRequest.getLimit()); + } + + List data = basicUnitMaintainDao.filterList(basicUnitMaintainFilterRequest); + return data; + } + + @Override + public boolean insertBasicUnitMaintainignore(BasicCorpEntity basicUnitMaintainEntity) { + return basicUnitMaintainDao.insertBasicUnitMaintainignore(basicUnitMaintainEntity); + } + + @Override + public boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity) { + return basicUnitMaintainDao.insertBasicUnitMaintain(basicUnitMaintainEntity); + } + + @Override + public boolean insert(BasicCorpEntity basicUnitMaintainEntity) { + return basicUnitMaintainDao.insert(basicUnitMaintainEntity); + } + + @Override + public boolean updateById(BasicCorpEntity basicUnitMaintainSaveRequest) { + basicUnitMaintainSaveRequest.setUpdateTime(new Date()); + return basicUnitMaintainDao.updateById(basicUnitMaintainSaveRequest); + } + + @Override + public boolean deleteById(String id) { + return basicUnitMaintainDao.deleteById(id); + } + + @Override + public BasicCorpEntity selectByThirdId(String thirdId, String thirdSys) { + + + BasicUnitMaintainFilterRequest filterUdiInfoRequest = new BasicUnitMaintainFilterRequest(); + if ("thirdId".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId(thirdId); + } else if ("thirdId1".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId1(thirdId); + } else if ("thirdId2".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId2(thirdId); + } else if ("thirdId3".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId3(thirdId); + } else if ("thirdId4".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId4(thirdId); + } + return basicUnitMaintainDao.selectByThirdId(filterUdiInfoRequest); + } + + @Override + public List batchSelectByIds(List ids) { + return basicUnitMaintainDao.batchSelectByIds(ids); + } + + @Override + public List batchSelectByErpIds(List erpIds) { + return basicUnitMaintainDao.batchSelectByErpIds(erpIds); + } + + @Override + public List batchSelectByErpIdsAndName(List erpIds, String name) { + return basicUnitMaintainDao.batchSelectByErpIdsAndName(erpIds, name); + } + + @Override + public BasicCorpEntity selectById(String id) { + return basicUnitMaintainDao.selectById(id); + } + + @Override + public BasicCorpEntity selectByErpId(String id) { + if (id == null) { + return null; + } + BasicUnitMaintainFilterRequest filterUdiInfoRequest = new BasicUnitMaintainFilterRequest(); + filterUdiInfoRequest.setErpId(id); + List basicUnitMaintainEntities = basicUnitMaintainDao.filterList(filterUdiInfoRequest); + if (basicUnitMaintainEntities != null && basicUnitMaintainEntities.size() > 0) + return basicUnitMaintainEntities.get(0); + return null; + } + + @Override + public BasicCorpEntity selectByName(String name) { + return basicUnitMaintainDao.selectByName(name); + } + + @Override + public boolean isExit() { + BasicUnitMaintainFilterRequest filterUdiInfoRequest = new BasicUnitMaintainFilterRequest(); + filterUdiInfoRequest.setPage(1); + filterUdiInfoRequest.setLimit(1); + List data = filterList(filterUdiInfoRequest); + if (data != null && data.size() > 0) { + return true; + } + return false; + } +} diff --git a/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml new file mode 100644 index 00000000..17bb0095 --- /dev/null +++ b/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -0,0 +1,295 @@ + + + + + + + + + + REPLACE + INTO basic_corp + (thirdId,erpId,name,spell, + addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, + thirdName,thirdName1,thirdName2,thirdName3,thirdName4,updateTime,corpType,outType,createUser,createTime,updateUser,remark) + values + ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{thirdName}, + #{thirdName1}, + #{thirdName2}, + #{thirdName3}, + #{thirdName4}, + #{updateTime}, + #{corpType}, + #{outType}, + #{createUser}, + #{createTime}, + #{updateUser}, + #{remark} + ) + + + + insert + ignore + INTO basic_corp + (thirdId,erpId,name,spell, + addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, + thirdName,thirdName1,thirdName2,thirdName3,thirdName4,updateTime,corpType,outType,createUser,createTime,updateUser,remark) + values + ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{thirdName}, + #{thirdName1}, + #{thirdName2}, + #{thirdName3}, + #{thirdName4}, + #{updateTime}, + #{corpType}, + #{outType}, + #{createUser}, + #{createTime}, + #{updateUser}, + #{remark} + ) + + + + insert INTO basic_corp(thirdId, erpId, name, spell, addr, + status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, + thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType, outType,createUser,createTime,updateUser,remark) + values (#{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdId1}, #{thirdId2}, #{thirdId3}, #{thirdId4}, + #{thirdName}, #{thirdName1}, #{thirdName2}, #{thirdName3}, #{thirdName4}, #{updateTime}, #{corpType}, + #{outType},#{createUser}, + #{createTime}, + #{updateUser}, + #{remark}) + + + + + UPDATE basic_corp + + thirdId=#{thirdId}, + erpId=#{erpId}, + name=#{name}, + spell=#{spell}, + addr=#{addr}, + status=#{status}, + type=#{type}, + creditNo=#{creditNo}, + contact=#{contact}, + mobile=#{mobile}, + thirdId1=#{thirdId1}, + thirdId2=#{thirdId2}, + thirdId3=#{thirdId3}, + thirdId4=#{thirdId4}, + thirdName=#{thirdName}, + thirdName1=#{thirdName1}, + thirdName2=#{thirdName2}, + thirdName3=#{thirdName3}, + thirdName4=#{thirdName4}, + updateTime=#{updateTime}, + corpType=#{corpType}, + outType=#{outType}, + createUser=#{createUser}, + createTime=#{createTime}, + updateUser=#{updateUser}, + remark=#{remark}, + + WHERE id=#{id} + + + + DELETE + FROM basic_corp + WHERE id = #{id} + + + + + + + + + + + + + + REPLACE + INTO basic_corp + ( thirdId, erpId, `name`, spell, + addr, status, `type`, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, + thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType,outType,createUser,createTime,updateUser,remark) + values ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{thirdName}, + #{thirdName1}, + #{thirdName2}, + #{thirdName3}, + #{thirdName4}, + #{updateTime}, + #{corpType}, + #{outType}, + #{createUser}, + #{createTime}, + #{updateUser}, + #{remark} + ) + + + +