From 25777c503b6a9112f093ad99ad478cadb55540e9 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Fri, 17 Jan 2025 17:27:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/oa/api/AdFixedAssetLedgerRest.java | 53 +++++++++++ .../yxt/anrui/oa/api/AdFixedAssetRest.java | 53 +++++++++++ .../oa/biz/adfixedasset/AdFixedAsset.java | 54 +++++++++++ .../oa/biz/adfixedasset/AdFixedAssetDto.java | 58 ++++++++++++ .../biz/adfixedasset/AdFixedAssetMapper.java | 44 +++++++++ .../biz/adfixedasset/AdFixedAssetMapper.xml | 12 +++ .../biz/adfixedasset/AdFixedAssetQuery.java | 63 +++++++++++++ .../biz/adfixedasset/AdFixedAssetService.java | 94 +++++++++++++++++++ .../oa/biz/adfixedasset/AdFixedAssetVo.java | 59 ++++++++++++ .../AdFixedAssetLedger.java | 62 ++++++++++++ .../AdFixedAssetLedgerDto.java | 66 +++++++++++++ .../AdFixedAssetLedgerMapper.java | 44 +++++++++ .../AdFixedAssetLedgerMapper.xml | 12 +++ .../AdFixedAssetLedgerQuery.java | 67 +++++++++++++ .../AdFixedAssetLedgerService.java | 94 +++++++++++++++++++ .../AdFixedAssetLedgerVo.java | 68 ++++++++++++++ 16 files changed, 903 insertions(+) create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFixedAssetLedgerRest.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFixedAssetRest.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAsset.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetDto.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetMapper.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetMapper.xml create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetQuery.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetService.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedger.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerDto.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerMapper.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerMapper.xml create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerQuery.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerService.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerVo.java diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFixedAssetLedgerRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFixedAssetLedgerRest.java new file mode 100644 index 0000000000..d4c688205c --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFixedAssetLedgerRest.java @@ -0,0 +1,53 @@ +package com.yxt.anrui.oa.api; + +import com.yxt.anrui.oa.biz.adfixedassetledger.AdFixedAssetLedgerDto; +import com.yxt.anrui.oa.biz.adfixedassetledger.AdFixedAssetLedgerQuery; +import com.yxt.anrui.oa.biz.adfixedassetledger.AdFixedAssetLedgerService; +import com.yxt.anrui.oa.biz.adfixedassetledger.AdFixedAssetLedgerVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "固定资产台账管理") +@RestController +@RequestMapping("v1/adfixedassetledger") +public class AdFixedAssetLedgerRest { + + @Autowired + private AdFixedAssetLedgerService adFixedAssetLedgerService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = adFixedAssetLedgerService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody AdFixedAssetLedgerDto dto) { + return adFixedAssetLedgerService.saveOrUpdateDto(dto); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + adFixedAssetLedgerService.delBySids(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + AdFixedAssetLedgerVo vo = adFixedAssetLedgerService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFixedAssetRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFixedAssetRest.java new file mode 100644 index 0000000000..5006b7eb9e --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFixedAssetRest.java @@ -0,0 +1,53 @@ +package com.yxt.anrui.oa.api; + +import com.yxt.anrui.oa.biz.adfixedasset.AdFixedAssetDto; +import com.yxt.anrui.oa.biz.adfixedasset.AdFixedAssetQuery; +import com.yxt.anrui.oa.biz.adfixedasset.AdFixedAssetService; +import com.yxt.anrui.oa.biz.adfixedasset.AdFixedAssetVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "固定资产管理") +@RestController +@RequestMapping("v1/adfixedasset") +public class AdFixedAssetRest { + + @Autowired + private AdFixedAssetService adFixedAssetService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = adFixedAssetService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody AdFixedAssetDto dto) { + return adFixedAssetService.saveOrUpdateDto(dto); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + adFixedAssetService.delBySids(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + AdFixedAssetVo vo = adFixedAssetService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAsset.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAsset.java new file mode 100644 index 0000000000..5fe3e6131a --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAsset.java @@ -0,0 +1,54 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfixedasset; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "固定资产表", description = "固定资产表") +@TableName("ad_fixed_asset") +public class AdFixedAsset extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("固定资产名称") + private String assetName; // 固定资产名称 + @ApiModelProperty("编号") + private String assetNumber; // 编号 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("规格") + private String specification; // 规格 + @ApiModelProperty("固定资产类别key") + private String assetTypeKey; // 固定资产类别key + @ApiModelProperty("固定资产类别") + private String assetTypeValue; // 固定资产类别 + + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetDto.java new file mode 100644 index 0000000000..44851bec8f --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetDto.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfixedasset; + + +import com.yxt.anrui.oa.biz.oaform.OaFormDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "固定资产表 数据传输对象", description = "固定资产表 数据传输对象") +public class AdFixedAssetDto extends OaFormDto { + + private String sid; // sid + @ApiModelProperty("固定资产名称") + private String assetName; // 固定资产名称 + @ApiModelProperty("编号") + private String assetNumber; // 编号 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("规格") + private String specification; // 规格 + @ApiModelProperty("固定资产类别key") + private String assetTypeKey; // 固定资产类别key + @ApiModelProperty("固定资产类别") + private String assetTypeValue; // 固定资产类别 + @ApiModelProperty("备注") + private String remarks; +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetMapper.java new file mode 100644 index 0000000000..35e0b29819 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetMapper.java @@ -0,0 +1,44 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfixedasset; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AdFixedAssetMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetMapper.xml new file mode 100644 index 0000000000..50741efe35 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetQuery.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetQuery.java new file mode 100644 index 0000000000..1d4b323d34 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetQuery.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfixedasset; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: oa(驻外人员认定申请)
+ * File: AdExpatriatesApplyQuery.java
+ * Class: com.yxt.anrui.oa.api.adexpatriatesapply.AdExpatriatesApplyQuery
+ * Description: 驻外人员认定申请 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-01-16 15:22:53
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "驻外人员认定申请 查询条件", description = "驻外人员认定申请 查询条件") +public class AdFixedAssetQuery implements Query { + + @ApiModelProperty("固定资产名称") + private String assetName; // 固定资产名称 + @ApiModelProperty("编号") + private String assetNumber; // 编号 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("规格") + private String specification; // 规格 + @ApiModelProperty("固定资产类别key") + private String assetTypeKey; // 固定资产类别key + @ApiModelProperty("固定资产类别") + private String assetTypeValue; // 固定资产类别 +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetService.java new file mode 100644 index 0000000000..906187a3ab --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetService.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfixedasset; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; +import com.yxt.anrui.oa.biz.oaform.OaFormService; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class AdFixedAssetService extends MybatisBaseService { + + @Autowired + private OaAppendixService oaAppendixService; + @Autowired + private OaFormService oaFormService; + + public PagerVo listPageVo(PagerQuery pq) { + AdFixedAssetQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + if (StringUtils.isNotBlank(query.getAssetName())) { + qw.like("assetName", query.getAssetName()); + } + if (StringUtils.isNotBlank(query.getAssetNumber())) { + qw.like("assetNumber", query.getAssetNumber()); + } + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdateDto(AdFixedAssetDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + if (StringUtils.isBlank(sid)) { + // 新建操作 + AdFixedAsset entity = new AdFixedAsset(); + BeanUtil.copyProperties(dto, entity, "sid"); + baseMapper.insert(entity); + sid = entity.getSid(); + } else { + // 更新操作 + AdFixedAsset entity = fetchBySid(sid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + return rb.success().setData(sid); + } + + + public AdFixedAssetVo fetchDetailsVoBySid(String sid) { + AdFixedAsset entity = fetchBySid(sid); + AdFixedAssetVo vo = new AdFixedAssetVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetVo.java new file mode 100644 index 0000000000..46620b05d0 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetVo.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfixedasset; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "驻外人员认定申请 视图数据对象", description = "驻外人员认定申请 视图数据对象") +public class AdFixedAssetVo implements Vo { + + private String sid; + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("固定资产名称") + private String assetName; // 固定资产名称 + @ApiModelProperty("编号") + private String assetNumber; // 编号 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("规格") + private String specification; // 规格 + @ApiModelProperty("固定资产类别key") + private String assetTypeKey; // 固定资产类别key + @ApiModelProperty("固定资产类别") + private String assetTypeValue; // 固定资产类别 +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedger.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedger.java new file mode 100644 index 0000000000..4beaa46b93 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedger.java @@ -0,0 +1,62 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfixedassetledger; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@ApiModel(value = "固定资产台账", description = "固定资产台账") +@TableName("ad_fixed_asset_ledger") +public class AdFixedAssetLedger extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("固定资产名称") + private String assetName; // 固定资产名称 + @ApiModelProperty("编号") + private String assetNumber; // 编号 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("规格") + private String specification; // 规格 + @ApiModelProperty("固定资产类别key") + private String assetTypeKey; // 固定资产类别key + @ApiModelProperty("固定资产类别") + private String assetTypeValue; // 固定资产类别 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 使用组织sid + @ApiModelProperty("数量") + private BigDecimal num; // 数量 + @ApiModelProperty("采购单价") + private BigDecimal price; // 采购单价 +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerDto.java new file mode 100644 index 0000000000..a7d1fefb9a --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerDto.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfixedassetledger; + + +import com.yxt.anrui.oa.biz.oaform.OaFormDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "固定资产台账 数据传输对象", description = "固定资产台账 数据传输对象") +public class AdFixedAssetLedgerDto extends OaFormDto { + + private String sid; // sid + @ApiModelProperty("固定资产名称") + private String assetName; // 固定资产名称 + @ApiModelProperty("编号") + private String assetNumber; // 编号 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("规格") + private String specification; // 规格 + @ApiModelProperty("固定资产类别key") + private String assetTypeKey; // 固定资产类别key + @ApiModelProperty("固定资产类别") + private String assetTypeValue; // 固定资产类别 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 使用组织sid + @ApiModelProperty("数量") + private String num; // 数量 + @ApiModelProperty("采购单价") + private String price; // 采购单价 + @ApiModelProperty("备注") + private String remarks; +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerMapper.java new file mode 100644 index 0000000000..dcf5a9698e --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerMapper.java @@ -0,0 +1,44 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfixedassetledger; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AdFixedAssetLedgerMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerMapper.xml new file mode 100644 index 0000000000..66d6da1108 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerQuery.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerQuery.java new file mode 100644 index 0000000000..37a3d4a6c0 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerQuery.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfixedassetledger; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: oa(驻外人员认定申请)
+ * File: AdExpatriatesApplyQuery.java
+ * Class: com.yxt.anrui.oa.api.adexpatriatesapply.AdExpatriatesApplyQuery
+ * Description: 驻外人员认定申请 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-01-16 15:22:53
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "驻外人员认定申请 查询条件", description = "驻外人员认定申请 查询条件") +public class AdFixedAssetLedgerQuery implements Query { + + @ApiModelProperty("固定资产名称") + private String assetName; // 固定资产名称 + @ApiModelProperty("编号") + private String assetNumber; // 编号 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("规格") + private String specification; // 规格 + @ApiModelProperty("固定资产类别key") + private String assetTypeKey; // 固定资产类别key + @ApiModelProperty("固定资产类别") + private String assetTypeValue; // 固定资产类别 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 使用组织sid +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerService.java new file mode 100644 index 0000000000..8a1c86884a --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerService.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfixedassetledger; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; +import com.yxt.anrui.oa.biz.oaform.OaFormService; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class AdFixedAssetLedgerService extends MybatisBaseService { + + @Autowired + private OaAppendixService oaAppendixService; + @Autowired + private OaFormService oaFormService; + + public PagerVo listPageVo(PagerQuery pq) { + AdFixedAssetLedgerQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + if (StringUtils.isNotBlank(query.getAssetName())) { + qw.like("assetName", query.getAssetName()); + } + if (StringUtils.isNotBlank(query.getAssetNumber())) { + qw.like("assetNumber", query.getAssetNumber()); + } + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdateDto(AdFixedAssetLedgerDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + if (StringUtils.isBlank(sid)) { + // 新建操作 + AdFixedAssetLedger entity = new AdFixedAssetLedger(); + BeanUtil.copyProperties(dto, entity, "sid"); + baseMapper.insert(entity); + sid = entity.getSid(); + } else { + // 更新操作 + AdFixedAssetLedger entity = fetchBySid(sid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + return rb.success().setData(sid); + } + + + public AdFixedAssetLedgerVo fetchDetailsVoBySid(String sid) { + AdFixedAssetLedger entity = fetchBySid(sid); + AdFixedAssetLedgerVo vo = new AdFixedAssetLedgerVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerVo.java new file mode 100644 index 0000000000..eb64befc38 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerVo.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfixedassetledger; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "固定资产台账 视图数据对象", description = "固定资产台账 视图数据对象") +public class AdFixedAssetLedgerVo implements Vo { + + private String sid; + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("固定资产名称") + private String assetName; // 固定资产名称 + @ApiModelProperty("编号") + private String assetNumber; // 编号 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("规格") + private String specification; // 规格 + @ApiModelProperty("固定资产类别key") + private String assetTypeKey; // 固定资产类别key + @ApiModelProperty("固定资产类别") + private String assetTypeValue; // 固定资产类别 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 使用组织sid + @ApiModelProperty("数量") + private String num; // 数量 + @ApiModelProperty("采购单价") + private String price; // 采购单价 +} From 6c7ead2d04d9a329069c99d45d3b52d216636caf Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 17 Jan 2025 17:56:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/api/finpayment/FinPaymentDto.java | 12 +- .../FinPaymentapplyDetailsBelowEve.java | 4 + .../FinPaymentapplyDetailsBelowEveDto.java | 24 ++- .../FinPaymentapplyDetailsBelowEveQuery.java | 44 +++-- .../FinPaymentapplyDetailsBelowEveVo.java | 38 ++--- .../fin/biz/finpayment/FinPaymentService.java | 6 +- .../FinPaymentapplyDetailsBelowEveMapper.java | 8 - .../FinPaymentapplyDetailsBelowEveMapper.xml | 9 +- ...FinPaymentapplyDetailsBelowEveService.java | 159 +++++++++++++----- 9 files changed, 181 insertions(+), 123 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java index ab662e939a..0d7ffe37d2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java @@ -52,17 +52,17 @@ public class FinPaymentDto implements Dto { private String sid; // sid private String remarks; - @ApiModelProperty("单位编码") + @ApiModelProperty("单位编码") private String companyCode; // 单位编码 - @ApiModelProperty("单位名称") + @ApiModelProperty("单位名称") private String companyName; // 单位名称 - @ApiModelProperty("开户行") + @ApiModelProperty("开户行") private String bank; // 开户行 - @ApiModelProperty("收款银行账号") + @ApiModelProperty("收款银行账号") private String receivingAccount; // 收款银行账号 - @ApiModelProperty("业务类型key") + @ApiModelProperty("业务类型key") private String businessTypeKey; // 业务类型key - @ApiModelProperty("业务类型value") + @ApiModelProperty("业务类型value") private String businessTypeValue; // 业务类型value @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java index 855d01b078..7260c3bed9 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java @@ -67,4 +67,8 @@ public class FinPaymentapplyDetailsBelowEve extends BaseEntity { private String exePayDate; @ApiModelProperty("平仓付款金额") private BigDecimal exePayPrice; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("分公司名称") + private String useOrgName; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java index bd675b3710..69887ce0de 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java @@ -55,32 +55,38 @@ public class FinPaymentapplyDetailsBelowEveDto implements Dto { @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("平仓款名称") private String costTitleValue; @ApiModelProperty("款项类别，数据字典") private String costTypeKey; @ApiModelProperty("款项类别") private String costTypeValue; - @ApiModelProperty("付款申请明细的明细sid") + @ApiModelProperty("付款申请明细的明细sid") private String detailSid; // 付款申请明细的明细sid - @ApiModelProperty("融资付款开通日期") + @ApiModelProperty("融资付款开通日期") private String openDate; // 融资付款开通日期 - @ApiModelProperty("期数") + @ApiModelProperty("期数") private String period; // 期数 - @ApiModelProperty("付款单位sid") + @ApiModelProperty("付款单位sid") private String payCompanySid; // 付款单位sid - @ApiModelProperty("付款单位名称") + @ApiModelProperty("付款单位名称") private String payCompany; // 付款单位名称 - @ApiModelProperty("收款单位名称") + @ApiModelProperty("收款单位名称") private String receiveCompany; // 收款单位名称 - @ApiModelProperty("收款单位sid") + @ApiModelProperty("收款单位sid") private String receiveCompanySid; // 收款单位sid - @ApiModelProperty("收款银行账号") + @ApiModelProperty("收款银行账号") private String receivingAccount; // 收款银行账号 - @ApiModelProperty("开户行") + @ApiModelProperty("开户行") private String bank; // 开户行 @ApiModelProperty("平仓付款日期") private String exePayDate; @ApiModelProperty("平仓付款金额") private BigDecimal exePayPrice; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("分公司名称") + private String useOrgName; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java index 1b5660696d..680e4af7ef 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java @@ -51,32 +51,26 @@ import java.math.BigDecimal; @ApiModel(value = "付款申请明细-明细-平仓 查询条件", description = "付款申请明细-明细-平仓 查询条件") public class FinPaymentapplyDetailsBelowEveQuery implements Query { + @ApiModelProperty("付款单位名称") + private String payCompany; + @ApiModelProperty("融资付款开通日期") + private String openStartDate; + private String openEndDate; @ApiModelProperty("平仓款名称") private String costTitleValue; - @ApiModelProperty("款项类别，数据字典") - private String costTypeKey; - @ApiModelProperty("款项类别") - private String costTypeValue; - @ApiModelProperty("付款申请明细的明细sid") - private String detailSid; // 付款申请明细的明细sid - @ApiModelProperty("融资付款开通日期") - private String openDate; // 融资付款开通日期 - @ApiModelProperty("期数") - private String period; // 期数 - @ApiModelProperty("付款单位sid") - private String payCompanySid; // 付款单位sid - @ApiModelProperty("付款单位名称") - private String payCompany; // 付款单位名称 - @ApiModelProperty("收款单位名称") - private String receiveCompany; // 收款单位名称 - @ApiModelProperty("收款单位sid") - private String receiveCompanySid; // 收款单位sid - @ApiModelProperty("收款银行账号") - private String receivingAccount; // 收款银行账号 - @ApiModelProperty("开户行") - private String bank; // 开户行 + @ApiModelProperty("收款单位名称") + private String receiveCompany; @ApiModelProperty("平仓付款日期") - private String exePayDate; - @ApiModelProperty("平仓付款金额") - private BigDecimal exePayPrice; + private String exePayStartDate; + private String exePayEndDate; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("支付状态") + private String state; + + private String orgPath; + private String userSid; + private String menuUrl; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java index 6cf26f5096..285e10c27f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java @@ -53,32 +53,26 @@ public class FinPaymentapplyDetailsBelowEveVo implements Vo { private String sid; // sid + @ApiModelProperty("支付状态") + private String state; @ApiModelProperty("平仓款名称") private String costTitleValue; - @ApiModelProperty("款项类别，数据字典") - private String costTypeKey; - @ApiModelProperty("款项类别") - private String costTypeValue; - @ApiModelProperty("付款申请明细的明细sid") - private String detailSid; // 付款申请明细的明细sid - @ApiModelProperty("融资付款开通日期") - private String openDate; // 融资付款开通日期 - @ApiModelProperty("期数") - private String period; // 期数 - @ApiModelProperty("付款单位sid") - private String payCompanySid; // 付款单位sid - @ApiModelProperty("付款单位名称") - private String payCompany; // 付款单位名称 - @ApiModelProperty("收款单位名称") - private String receiveCompany; // 收款单位名称 - @ApiModelProperty("收款单位sid") - private String receiveCompanySid; // 收款单位sid - @ApiModelProperty("收款银行账号") - private String receivingAccount; // 收款银行账号 - @ApiModelProperty("开户行") - private String bank; // 开户行 + @ApiModelProperty("融资付款开通日期") + private String openDate; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("付款单位名称") + private String payCompany; + @ApiModelProperty("收款单位名称") + private String receiveCompany; + @ApiModelProperty("开户行") + private String bank; + @ApiModelProperty("收款银行账号") + private String receivingAccount; @ApiModelProperty("平仓付款日期") private String exePayDate; @ApiModelProperty("平仓付款金额") private BigDecimal exePayPrice; + @ApiModelProperty("备注") + private String remarks; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java index 2329e8c8a6..63332265d5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java @@ -111,13 +111,13 @@ public class FinPaymentService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java index f7459d6fa8..0431564d6c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java @@ -54,16 +54,8 @@ import java.util.List; @Mapper public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper { - //@Update("update fin_paymentapply_details_below_eve set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from fin_paymentapply_details_below_eve") - List selectListVo(); - @Select("select * from fin_paymentapply_details_below_eve where detailSid = #{mainSid}") List selByMainSid(String mainSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml index 44d997bd1c..b3faad32a4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml @@ -4,10 +4,9 @@ - - \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java index 1557e3618b..f8c2dbcec6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java @@ -28,6 +28,9 @@ package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -41,6 +44,7 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetai import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto; import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -60,55 +64,120 @@ import java.util.List; */ @Service public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(FinPaymentapplyDetailsBelowEveQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - FinPaymentapplyDetailsBelowEveQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(FinPaymentapplyDetailsBelowEveDto dto){ + + @Autowired + private SysUserFeign sysUserFeign; + + public PagerVo listPageVo(PagerQuery pq) { + FinPaymentapplyDetailsBelowEveQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + /*if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("fp.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("fp.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("fp.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("fp.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("fp.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + }*/ + if (StringUtils.isNotBlank(query.getPayCompany())) { + qw.like("payCompany", query.getPayCompany()); + } + if (StringUtils.isNotBlank(query.getCostTitleValue())) { + qw.like("costTitleValue", query.getCostTitleValue()); + } + if (StringUtils.isNotBlank(query.getReceiveCompany())) { + qw.like("receiveCompany", query.getReceiveCompany()); + } + if (StringUtils.isNotBlank(query.getPeriod())) { + qw.like("period", query.getPeriod()); + } + if (StringUtils.isNotBlank(query.getRemarks())) { + qw.eq("remarks", query.getRemarks()); + } + if (StringUtils.isNotBlank(query.getPayCompany())) { + qw.like("fp.payCompany", query.getPayCompany()); + } + if (StringUtils.isNotBlank(query.getState())) { + qw.eq("fp.state", query.getState()); + } + //融资付款开通日期 + qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')" + ); + //平仓付款日期 + qw.apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (exePayDate,'%Y-%m-%d') >= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (exePayDate,'%Y-%m-%d') <= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')" + ); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(FinPaymentapplyDetailsBelowEveDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(FinPaymentapplyDetailsBelowEveDto dto){ - FinPaymentapplyDetailsBelowEve entity = new FinPaymentapplyDetailsBelowEve(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(FinPaymentapplyDetailsBelowEveDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(FinPaymentapplyDetailsBelowEveDto dto) { + FinPaymentapplyDetailsBelowEve entity = new FinPaymentapplyDetailsBelowEve(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(FinPaymentapplyDetailsBelowEveDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - FinPaymentapplyDetailsBelowEve entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public FinPaymentapplyDetailsBelowEveDetailsVo fetchDetailsVoBySid(String sid){ - FinPaymentapplyDetailsBelowEve entity = fetchBySid(sid); - FinPaymentapplyDetailsBelowEveDetailsVo vo = new FinPaymentapplyDetailsBelowEveDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + FinPaymentapplyDetailsBelowEve entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public FinPaymentapplyDetailsBelowEveDetailsVo fetchDetailsVoBySid(String sid) { + FinPaymentapplyDetailsBelowEve entity = fetchBySid(sid); + FinPaymentapplyDetailsBelowEveDetailsVo vo = new FinPaymentapplyDetailsBelowEveDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } - public List selByMainSid(String mainSid) { - return baseMapper.selByMainSid(mainSid); - } + public List selByMainSid(String mainSid) { + return baseMapper.selByMainSid(mainSid); + } } \ No newline at end of file From 966c6721a1de34221a7a8c7ab44b217a9bb80d7f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 20 Jan 2025 09:50:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=9E=8D=E8=B5=84?= =?UTF-8?q?=E5=B9=B3=E4=BB=93=E4=BB=98=E6=AC=BE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financingClosingPayment.js | 38 ++ .../src/router/modules/codemenu.js | 15 + .../financingClosingPayment.vue | 520 ++++++++++++++++++ .../paymentInformation/paymentInformation.vue | 2 +- 4 files changed, 574 insertions(+), 1 deletion(-) create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/financingClosingPayment.js create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/financingClosingPayment.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/financingClosingPayment.js new file mode 100644 index 0000000000..fad7b4a5ce --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/financingClosingPayment.js @@ -0,0 +1,38 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/fin/v1/finpaymentapplydetailsbeloweve/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 保存修改记录 + saveOrUpdate: function(params) { + return request({ + url: '/fin/v1/finpaymentapplydetailsbeloweve/save', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 通过sid查询一条记录 + fetchBySid: function(sid) { + return request({ + url: '/fin/v1/finpaymentapplydetailsbeloweve/fetchDetailsBySid/' + sid, + method: 'get' + }) + }, + // 通过sid删除一条或多条记录 + delBySids: function(data) { + return request({ + url: '/fin/v1/finpaymentapplydetailsbeloweve/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + } +} diff --git a/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js b/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js index 2d14fc25c7..8f43654164 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js @@ -139,6 +139,21 @@ const codemenu = [ meta: { title: '付款信息管理', noCache: true } }] }, + // 付款单位信息管理 + { + path: '/anruifinmanagement', + component: Layout, + redirect: '/anruifinmanagement', + meta: { + title: '融资平仓付款管理' + }, + children: [{ + path: '/anruifinmanagement/financingClosingPayment', + component: () => import('@/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue'), + name: 'FinancingClosingPayment', + meta: { title: '融资平仓付款管理', noCache: true } + }] + }, { path: '/anruifinmanagement', component: Layout, diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue new file mode 100644 index 0000000000..c0bb6f326d --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue @@ -0,0 +1,520 @@ + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue index e6c7031f36..b7b5fb2bdb 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue @@ -300,10 +300,10 @@ export default { }, handleConfirm() { this.formobj.createBySid = window.sessionStorage.getItem('userSid') - this.formobj.useOrgSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { if (res.success) { this.formobj.createOrgSid = res.data + this.formobj.useOrgSid = res.data this.$refs['form_obj'].validate((valid) => { if (valid) { req.saveOrUpdate(this.formobj).then((resp) => {