From 6ff227227d54e7556de4621913baa34a58fda209 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 7 Mar 2025 17:58:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseInternalPurchase.java | 29 +-- .../BaseVehmodelConfig.java | 49 ++--- .../BaseInternalPurchaseRest.java | 193 ++++++++---------- .../BaseInternalPurchaseService.java | 18 +- .../ScmVehicleEnterlibraryService.java | 47 +---- 5 files changed, 123 insertions(+), 213 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java index 8c0a808902..cbd9536ba1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java @@ -31,36 +31,23 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-base(内申请管理)
- * File: BaseInternalPurchase.java
- * Class: com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchase
- * Description: 内购表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-16 13:46:25
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "内购表", description = "内购表") @TableName("base_internal_purchase") public class BaseInternalPurchase extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("申请编号") + @ApiModelProperty("申请编号") private String applyNo; // 申请编号 - @ApiModelProperty("申请人姓名") + @ApiModelProperty("申请人姓名") private String applyPeoName; // 申请人姓名 - @ApiModelProperty("调入分公司sid") + @ApiModelProperty("调入分公司sid") private String buyerOrgSid; // 调入分公司sid - @ApiModelProperty("调入分公司名称") + @ApiModelProperty("调入分公司名称") private String buyerOrgName; // 调入分公司名称 - @ApiModelProperty("调出分公司sid") + @ApiModelProperty("调出分公司sid") private String sellerOrgSid; // 调出分公司sid - @ApiModelProperty("调出分公司名称") + @ApiModelProperty("调出分公司名称") private String sellerOrgName; // 调出分公司名称 @ApiModelProperty("调车类型key") private String shuntingTypeKey; // 调车类型key @@ -68,9 +55,9 @@ public class BaseInternalPurchase extends BaseEntity { private String shuntingTypeValue; // 调车类型value @ApiModelProperty("车辆数量") private String num; // 车辆数量 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty("流程定义的id") private String procDefId; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfig.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfig.java index 4486d9ba4b..8dc6dd5689 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfig.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfig.java @@ -30,54 +30,31 @@ import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - -import javax.validation.constraints.NotBlank; import java.math.BigDecimal; -/** - * Project: anrui-base(车型信息)
- * File: BaseVehmodelConfig.java
- * Class: com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig
- * Description: 车型与简述配置关联表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-01-15 10:51:33
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @ApiModel(value = "车型与简述配置关联表", description = "车型与简述配置关联表") @Data @TableName("base_vehmodel_config") public class BaseVehmodelConfig extends BaseEntity { private static final long serialVersionUID = 1L; - - @ApiModelProperty("车型sid") + @ApiModelProperty("车型sid") private String modelSid; // 车型sid - - @ApiModelProperty("简述配置sid") + @ApiModelProperty("简述配置sid") private String configurationItemsSid; // 简述配置sid - - @ApiModelProperty("厂家结算价") + @ApiModelProperty("厂家结算价") private BigDecimal manufactorSettlementPrice; // 厂家结算价 - - @ApiModelProperty("销售参考价") + @ApiModelProperty("销售参考价") private BigDecimal salesReferencePrice; // 销售参考价 - - @ApiModelProperty("价格有效期") + @ApiModelProperty("价格有效期") private String priceValidity; // 价格有效期 - - @ApiModelProperty("销售指导价") - private BigDecimal guidedPrice; // 销售指导价 - - @ApiModelProperty(value = "是否常用车型") - private Integer isCommonModel; - - @ApiModelProperty(value = "使用组织sid（分公司）") - private String useOrgSid; - @ApiModelProperty(value = "内部编码") - private String insideCode; + @ApiModelProperty("销售指导价") + private BigDecimal guidedPrice; // 销售指导价 + @ApiModelProperty(value = "是否常用车型") + private Integer isCommonModel; + @ApiModelProperty(value = "使用组织sid（分公司）") + private String useOrgSid; + @ApiModelProperty(value = "内部编码") + private String insideCode; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java index b081c72237..b810eea934 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java @@ -44,114 +44,101 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * Project: anrui-base(内申请管理)
- * File: BaseInternalPurchaseFeignFallback.java
- * Class: com.yxt.anrui.base.biz.baseinternalpurchase.BaseInternalPurchaseRest
- * Description: 内购表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-16 13:46:25
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "内购表") -@RestController("com.yxt.anrui.base.biz.baseinternalpurchase.BaseInternalPurchaseRest") +@RestController @RequestMapping("v1/baseinternalpurchase") public class BaseInternalPurchaseRest implements BaseInternalPurchaseFeign { - @Autowired - private BaseInternalPurchaseService baseInternalPurchaseService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = baseInternalPurchaseService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody BaseInternalPurchaseDto dto){ - return baseInternalPurchaseService.saveAll(dto); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private BaseInternalPurchaseService baseInternalPurchaseService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = baseInternalPurchaseService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody BaseInternalPurchaseDto dto) { + return baseInternalPurchaseService.saveAll(dto); + } + + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return baseInternalPurchaseService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return baseInternalPurchaseService.delAll(sids); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - return baseInternalPurchaseService.fetchDetailsVoBySid(sid); - } - - @Override - public ResultBean submitBaseInternalPurchase(SubmitBaseInterNalPurchaseDto dto) { - return baseInternalPurchaseService.submitBaseInternalPurchase(dto); - } - - @Override - public ResultBean complete(BaseInterNalPurchaseCompleteDto bvd) { - BusinessVariables bv=new BusinessVariables(); - BeanUtil.copyProperties(bvd,bv); - //bv.setFormVariables(BeanUtil.beanToMap(bvd)); - bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId()); - return baseInternalPurchaseService.complete(bv); - } - - @Override - public ResultBean InitiatorToAnswer(BaseInterNalPurchaseCompleteDto bvd) { - BusinessVariables bv=new BusinessVariables(); - BeanUtil.copyProperties(bvd,bv); - bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId()); - return baseInternalPurchaseService.InitiatorToAnswer(bv,bvd.getId()); - } - - @Override - public ResultBean companyToDivisionOperate(BaseInterNalPurchaseCompleteDto bvd) { - BusinessVariables bv=new BusinessVariables(); - BeanUtil.copyProperties(bvd,bv); - bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId()); - return baseInternalPurchaseService.companyToDivisionOperate(bv); - } - - @Override - public ResultBean> getNextNodesForSubmit(GetNextNodeDto gnnd) { - return baseInternalPurchaseService.getNextNodesForSubmit(gnnd); - } - - @Override - public ResultBean> getPreviousNodesForReject(GetNextNodeDto gnnd) { - return baseInternalPurchaseService.getPreviousNodesForReject(gnnd); - } - - @Override - public ResultBean taskReject(BaseInterNalPurchaseTaskQuery query) { - return baseInternalPurchaseService.taskReject(query); - } - - @Override - public ResultBean revokeProcess(BaseInterNalPurchaseTaskQuery query) { - return baseInternalPurchaseService.revokeProcess(query); - } - - @Override - public ResultBean breakProcess(BaseInterNalPurchaseTaskQuery query) { - return baseInternalPurchaseService.breakProcess(query); - } - - @Override - public ResultBean getCompanyShunting(String sid) { - return baseInternalPurchaseService.getCompanyShunting(sid); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + return baseInternalPurchaseService.fetchDetailsVoBySid(sid); + } + + @Override + public ResultBean submitBaseInternalPurchase(SubmitBaseInterNalPurchaseDto dto) { + return baseInternalPurchaseService.submitBaseInternalPurchase(dto); + } + + @Override + public ResultBean complete(BaseInterNalPurchaseCompleteDto bvd) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(bvd, bv); + //bv.setFormVariables(BeanUtil.beanToMap(bvd)); + bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId()); + return baseInternalPurchaseService.complete(bv); + } + + @Override + public ResultBean InitiatorToAnswer(BaseInterNalPurchaseCompleteDto bvd) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(bvd, bv); + bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId()); + return baseInternalPurchaseService.InitiatorToAnswer(bv, bvd.getId()); + } + + @Override + public ResultBean companyToDivisionOperate(BaseInterNalPurchaseCompleteDto bvd) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(bvd, bv); + bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId()); + return baseInternalPurchaseService.companyToDivisionOperate(bv); + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNextNodeDto gnnd) { + return baseInternalPurchaseService.getNextNodesForSubmit(gnnd); + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNextNodeDto gnnd) { + return baseInternalPurchaseService.getPreviousNodesForReject(gnnd); + } + + @Override + public ResultBean taskReject(BaseInterNalPurchaseTaskQuery query) { + return baseInternalPurchaseService.taskReject(query); + } + + @Override + public ResultBean revokeProcess(BaseInterNalPurchaseTaskQuery query) { + return baseInternalPurchaseService.revokeProcess(query); + } + + @Override + public ResultBean breakProcess(BaseInterNalPurchaseTaskQuery query) { + return baseInternalPurchaseService.breakProcess(query); + } + + @Override + public ResultBean getCompanyShunting(String sid) { + return baseInternalPurchaseService.getCompanyShunting(sid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index 53267796d3..14c2da25eb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -41,7 +41,6 @@ import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVe import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleVo; import com.yxt.anrui.base.api.baseoutsourcingapplication.GetNextNodeDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService; @@ -86,25 +85,11 @@ import com.yxt.messagecenter.api.message.MessageFlowableQuery; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.math.BigDecimal; import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; -/** - * Project: anrui-base(内申请管理)
- * File: BaseInternalPurchaseService.java
- * Class: com.yxt.anrui.base.biz.baseinternalpurchase.BaseInternalPurchaseService
- * Description: 内购表 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-16 13:46:25
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class BaseInternalPurchaseService extends MybatisBaseService { @@ -559,6 +544,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService - * File: ScmVehicleEnterlibraryService.java
- * Class: scm.biz.scmvehicleenterlibrary.ScmVehicleEnterlibraryService
- * Description: 入库单 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-06 09:53:39
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class ScmVehicleEnterlibraryService extends MybatisBaseService { @Autowired - SysUserFeign sysUserFeign; - + private SysUserFeign sysUserFeign; @Autowired - SysStaffOrgFeign sysStaffOrgFeign; - + private SysStaffOrgFeign sysStaffOrgFeign; @Autowired - ScmFileService scmFileService; - + private ScmFileService scmFileService; @Autowired - BaseVehicleFeign baseVehicleFeign; - + private BaseVehicleFeign baseVehicleFeign; @Autowired - FileUploadComponent fileUploadComponent; - + private FileUploadComponent fileUploadComponent; @Autowired - BaseOutsourcingApplicationFeign baseOutsourcingApplicationFeign; - + private BaseOutsourcingApplicationFeign baseOutsourcingApplicationFeign; @Autowired - BaseInternalPurchaseFeign baseInternalPurchaseFeign; - + private BaseInternalPurchaseFeign baseInternalPurchaseFeign; @Autowired - BaseInternalPurchaseVehicleFeign baseInternalPurchaseVehicleFeign; - + private BaseInternalPurchaseVehicleFeign baseInternalPurchaseVehicleFeign; @Autowired - FinKingDeeFeign finKingDeeFeign; + private FinKingDeeFeign finKingDeeFeign; @Autowired private SysOrganizationFeign sysOrganizationFeign; @Autowired @@ -135,10 +110,6 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService createQueryWrapper(ScmVehicleEnterlibraryQuery query) { // todo: 这里根据具体业务调整查询条件