From 15e44b7b3daea7b1c3b212805cd898b086978e34 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 7 Aug 2023 09:45:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=80=E6=9D=A5=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E8=B5=84=E8=B4=A8=E8=AF=81=E4=B9=A6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/constant/ConstantStatus.java | 3 +- .../controller/basic/BasicCorpController.java | 142 +++++++ .../purchase/SupCertController.java | 19 + .../com/glxp/api/dao/basic/BasicCorpDao.java | 2 +- .../api/entity/basic/BasicCorpEntity.java | 3 + .../api/entity/purchase/SupCertEntity.java | 3 +- .../glxp/api/req/purchase/certRequest.java | 3 + .../api/service/basic/BasicCorpService.java | 2 +- .../basic/impl/BasicCorpServiceImpl.java | 10 +- .../mybatis/mapper/basic/BasicCorpDao.xml | 361 ++++++++++-------- .../mybatis/mapper/purchase/SupCertDao.xml | 149 +++++--- src/main/resources/schemas/schema_v2.1.sql | 2 +- 12 files changed, 475 insertions(+), 224 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/basic/BasicCorpController.java diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index cfd87c6..a76aa80 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -193,10 +193,11 @@ public class ConstantStatus { public static final int CORP_TYPE_SPECIAL = 4; //特俗往来 public static final int CORP_TYPE_DEPT = 4; //部门 - + public static final int CORP_SICK_INN = 1; public static final int CORP_SICK_SICK = 1; public static final int CORP_SICK_CUS = 2; + //单据来源 public static final int FROM_UDIMS = 1; //1.UDIMS平台 public static final int FROM_WEBNEW = 2; //网页新增 diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java new file mode 100644 index 0000000..dfca751 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -0,0 +1,142 @@ +package com.glxp.api.controller.basic; + +import cn.hutool.core.util.IdUtil; +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.exception.JsonException; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.basic.BasicCorpService; +import com.glxp.api.util.CustomUtil; +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 org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Date; +import java.util.List; + +/** + * 往来单位信息维护 + */ +@RestController +public class BasicCorpController { + + @Resource + private BasicCorpService basicUnitMaintainService; + + @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; + basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + 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()); + } + + boolean result = basicUnitMaintainService.verifyExists(basicUnitMaintainSaveRequest); + if (result) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加"); + } + + BasicCorpEntity basicUnitMaintainEntity = new BasicCorpEntity(); + BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity); + basicUnitMaintainEntity.setErpId(CustomUtil.getId()); + if (basicUnitMaintainSaveRequest.getCorpType() == 1) { + basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS); + } else if (basicUnitMaintainSaveRequest.getCorpType() == 2) { + basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK); + } else { + basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_INN); + } + basicUnitMaintainEntity.setUpdateTime(new Date()); + basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId()); + basicUnitMaintainEntity.setCompanyIdFk(Long.parseLong(getCompanyId())); + boolean b = basicUnitMaintainService.insert(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()); + } + + boolean result = basicUnitMaintainService.verifyExists(basicUnitMaintainSaveRequest); + if (result) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加"); + } + + basicUnitMaintainSaveRequest.setOutType(ConstantStatus.CORP_SICK_CUS); + basicUnitMaintainSaveRequest.setUpdateTime(new Date()); + basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest); + 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("删除成功"); + } + + public String getCompanyId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String companyId = request.getHeader("companyId"); + return companyId; + } +} 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 62f66cf..da4b8b5 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -93,6 +93,25 @@ public class SupCertController { return ResultVOUtils.success(pageSimpleResponse); } + //查询往来单位资质证书 + @GetMapping("/sup/app/corp/cert/list") + public BaseResponse filterCorpCert(certRequest certRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (certRequest.getCompanyIdFk() == null) { + return ResultVOUtils.error(500, "企业ID不能为空"); + } + certRequest.setType(4); + List supCertEntities = supCertService.selectBybId(certRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(supCertEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(supCertEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + @AuthRuleAnnotation("") @GetMapping("/sup/company/cert/filter") diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java index 1ef7ce2..4b2432a 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -17,7 +17,7 @@ public interface BasicCorpDao extends BaseMapperPlus { boolean isExit(); -// boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse); + boolean insertThrUnitMaintainignore(BasicCorpEntity thrUnitMaintainResponse); List batchSelectByIds(List id); 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 3056743..fb896d9 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 @@ -38,11 +38,11 @@ public class BasicCorpServiceImpl extends ServiceImpl - - + REPLACE - INTO basic_corp - ( thirdId, erpId, `name`, spell, + 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} - ) + 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}) diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml index 2a297c3..bad72d0 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml @@ -4,68 +4,72 @@ - select * from sup_cert + select * + from sup_cert - + and businessId = #{businessId} - ORDER BY id DESC @@ -108,13 +112,14 @@ UPDATE sup_cert - name=#{name}, - customerId=#{customerId}, - filePath=#{filePath}, - remark=#{remark}, - createTime=#{createTime}, - updateTime=#{updateTime}, + + name=#{name}, + + + customerId=#{customerId}, + + + filePath=#{filePath}, + + + remark=#{remark}, + + + createTime=#{createTime}, + + + updateTime=#{updateTime}, + vailDate=#{vailDate}, expireDate=#{expireDate}, - `type`=#{type}, - `manufacturerIdFk`=#{manufacturerIdFk}, - `productIdFk`=#{productIdFk}, - `code`=#{code}, - `auditStatus`=#{auditStatus}, - `auditComment`=#{auditComment}, - `status`=#{status}, - + + `type`=#{type}, + + + `manufacturerIdFk`=#{manufacturerIdFk}, + + + `productIdFk`=#{productIdFk}, + + + `code`=#{code}, + + + `auditStatus`=#{auditStatus}, + + + `auditComment`=#{auditComment}, + + + `status`=#{status}, + WHERE id = #{id} UPDATE sup_cert - set customerId = #{newId} - - ,auditStatus = #{auditStatus} + set customerId = #{newId} + + , auditStatus = #{auditStatus} WHERE customerId = #{oldId} - @@ -209,26 +237,26 @@ DELETE FROM sup_cert - + and customerId = #{customerId} - + and manufacturerIdFk = #{manufacturerIdFk} - + and productIdFk = #{productIdFk} - - diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index ce35faf..b849994 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -16,7 +16,7 @@ CALL Pro_Temp_ColumnWork('trace_order', 'invCount', 'int', 1); CALL Pro_Temp_ColumnWork('trace_product_record', 'companyIdFk', 'varchar(255)', 1); - +CALL Pro_Temp_ColumnWork('sup_cert', 'companyIdFk', 'bigInt', 1);