From c207c54583b4695ef33e655841fa7040b9e2b98c Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 26 Aug 2024 14:45:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/base/api/domain/BmAgreement.java | 6 +- .../base/api/domain/SysDeptTreeSelect.java | 51 ++++++++++++++ .../base/controller/BmCustomerController.java | 9 +-- .../bonus/base/mapper/BmAgreementMapper.java | 2 +- .../base/service/IBmCustomerService.java | 5 +- .../service/impl/BmCustomerServiceImpl.java | 20 ++++-- .../mapper/base/BmAgreementMapper.xml | 68 +++++++++---------- 7 files changed, 109 insertions(+), 52 deletions(-) create mode 100644 bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/SysDeptTreeSelect.java diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmAgreement.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmAgreement.java index c6c6568..1777190 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmAgreement.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmAgreement.java @@ -24,7 +24,7 @@ public class BmAgreement extends BaseEntity implements Serializable { private Integer id; @ApiModelProperty(value="签订日期") - @Excel(name = "协议签订日期") + //@Excel(name = "协议签订日期") private String signDate; @ApiModelProperty(value="协议编号") @@ -47,10 +47,10 @@ public class BmAgreement extends BaseEntity implements Serializable { private Integer leaseCompany; @ApiModelProperty(value="工程id") - private Integer project; + private String project; @ApiModelProperty(value="往来单位id") - private Integer customer; + private String customer; @ApiModelProperty(value="开始时间") @Excel(name = "开始日期") diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/SysDeptTreeSelect.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/SysDeptTreeSelect.java new file mode 100644 index 0000000..2e9ad37 --- /dev/null +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/SysDeptTreeSelect.java @@ -0,0 +1,51 @@ +package com.bonus.base.api.domain; + +import com.bonus.system.api.domain.SysUser; +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Getter; +import lombok.Setter; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * 协议新建往来单位和工程树结构信息 id和parentId为构建所得，采用字符串类型 + * @Author ma_sh + * @create 2024/8/26 13:37 + */ +@Setter +@Getter +public class SysDeptTreeSelect { + + private static final long serialVersionUID = 1L; + + /** 节点ID */ + private String id; + + /** 节点名称 */ + private String label; + + private Integer level; + + /** + * 编码 + */ + private String code; + + private String parentId; + + private String companyId; + + /** 子节点 */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List children; + + private List userList; + + public SysDeptTreeSelect(SysDeptTree dept) { + this.id = dept.getDeptId(); + this.parentId = dept.getParentId(); + this.label = dept.getDeptName(); + this.children = dept.getChildren().stream().map(SysDeptTreeSelect::new).collect(Collectors.toList()); + } +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerController.java index 55bde35..3d61f4a 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerController.java @@ -2,6 +2,7 @@ package com.bonus.base.controller; import com.bonus.base.api.domain.BmCustomer; import com.bonus.base.api.domain.SysDeptTree; +import com.bonus.base.api.domain.SysDeptTreeSelect; import com.bonus.base.api.domain.TreeSelect; import com.bonus.base.service.IBmCustomerService; import com.bonus.common.core.domain.R; @@ -75,8 +76,8 @@ public class BmCustomerController extends BaseController { @ApiOperation(value = "往来单位树") @RequiresPermissions("material:maType:query") @GetMapping("/customerTree") - public R> selectCustomerTree(SysDeptTree sysDept) { - List deptList = customerService.selectCustomerTree(sysDept); + public R> selectCustomerTree(SysDeptTree sysDept) { + List deptList = customerService.selectCustomerTree(sysDept); return R.ok(deptList); } @@ -88,8 +89,8 @@ public class BmCustomerController extends BaseController { @ApiOperation(value = "工程树") @RequiresPermissions("material:maType:query") @GetMapping("/projectTree") - public R> selectProjectTree(SysDeptTree sysDept) { - List deptList = customerService.selectProjectTree(sysDept); + public R> selectProjectTree(SysDeptTree sysDept) { + List deptList = customerService.selectProjectTree(sysDept); return R.ok(deptList); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmAgreementMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmAgreementMapper.java index 872efca..e92aff6 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmAgreementMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmAgreementMapper.java @@ -62,7 +62,7 @@ public interface BmAgreementMapper { * @param project * @return */ - BmAgreement select(@Param(value ="customer") Integer customer, @Param(value ="project") Integer project); + BmAgreement select(@Param(value ="customer") String customer, @Param(value ="project") String project); /** * 查询code diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/IBmCustomerService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/IBmCustomerService.java index ae97ea6..964736c 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/IBmCustomerService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/IBmCustomerService.java @@ -2,6 +2,7 @@ package com.bonus.base.service; import com.bonus.base.api.domain.BmCustomer; import com.bonus.base.api.domain.SysDeptTree; +import com.bonus.base.api.domain.SysDeptTreeSelect; import com.bonus.base.api.domain.TreeSelect; import com.bonus.common.core.web.domain.AjaxResult; @@ -72,12 +73,12 @@ public interface IBmCustomerService * 查询往来单位下拉树结构 * @return */ - List selectCustomerTree(SysDeptTree sysDept); + List selectCustomerTree(SysDeptTree sysDept); /** * 查询工程下拉树结构 * @param sysDept * @return */ - List selectProjectTree(SysDeptTree sysDept); + List selectProjectTree(SysDeptTree sysDept); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmCustomerServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmCustomerServiceImpl.java index 0fd41f1..c1ee41d 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmCustomerServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmCustomerServiceImpl.java @@ -3,12 +3,12 @@ package com.bonus.base.service.impl; import cn.hutool.core.util.PhoneUtil; import com.bonus.base.api.domain.BmCustomer; import com.bonus.base.api.domain.SysDeptTree; +import com.bonus.base.api.domain.SysDeptTreeSelect; import com.bonus.base.api.domain.TreeSelect; import com.bonus.base.mapper.BmCustomerMapper; import com.bonus.base.service.IBmCustomerService; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; -import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -107,9 +107,19 @@ public class BmCustomerServiceImpl implements IBmCustomerService * @return */ @Override - public List selectCustomerTree(SysDeptTree sysDept) { + public List selectCustomerTree(SysDeptTree sysDept) { List deptList = bmCustomerMapper.selectCustomerTree(sysDept); - return buildDeptTreeSelect(deptList); + return buildDeptSelect(deptList); + } + + /** + * 往来单位树单独构建树结构 + * @param deptList + * @return + */ + private List buildDeptSelect(List deptList) { + List deptTrees = buildDeptTree(deptList); + return deptTrees.stream().map(SysDeptTreeSelect::new).collect(Collectors.toList()); } /** @@ -118,9 +128,9 @@ public class BmCustomerServiceImpl implements IBmCustomerService * @return */ @Override - public List selectProjectTree(SysDeptTree sysDept) { + public List selectProjectTree(SysDeptTree sysDept) { List deptList = bmCustomerMapper.selectProjectTree(sysDept); - return buildDeptTreeSelect(deptList); + return buildDeptSelect(deptList); } private List buildDeptTreeSelect(List deptList) { diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/BmAgreementMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/BmAgreementMapper.xml index 709289c..51d77a8 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/BmAgreementMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/BmAgreementMapper.xml @@ -224,64 +224,58 @@ update bm_agreement - code = #{code,jdbcType=VARCHAR}, + code = #{code}, - - sign_date = #{signDate,jdbcType=VARCHAR}, + + sign_date = #{signDate}, - customer = #{customer,jdbcType=INTEGER}, + customer = #{customer}, - project = #{project,jdbcType=INTEGER}, + project = #{project}, - - start_time = #{startTime,jdbcType=VARCHAR}, + + start_time = #{startTime}, - - lease_term = #{leaseTerm,jdbcType=VARCHAR}, + + lease_term = #{leaseTerm}, - - advance_charge = #{advanceCharge,jdbcType=VARCHAR}, + + advance_charge = #{advanceCharge}, - - authorizing_person = #{authorizingPerson,jdbcType=VARCHAR}, + + authorizing_person = #{authorizingPerson}, - - authorizing_phone = #{authorizingPhone,jdbcType=VARCHAR}, + + authorizing_phone = #{authorizingPhone}, - - contract_number = #{contractNumber,jdbcType=VARCHAR}, + + contract_number = #{contractNumber}, - - creator = #{creator,jdbcType=VARCHAR}, + + remark = #{remark}, - - create_time = #{createTime,jdbcType=VARCHAR}, + + settlement_time = #{settlementTime}, - - remark = #{remark,jdbcType=VARCHAR}, + + is_balance = #{isBalance}, - - settlement_time = #{settlementTime,jdbcType=VARCHAR}, + + url = #{url}, - - is_balance = #{isBalance,jdbcType=VARCHAR}, - - - url = #{url,jdbcType=VARCHAR}, - - - is_sure = #{isSure,jdbcType=VARCHAR}, + + is_sure = #{isSure}, - company_id = #{companyId,jdbcType=INTEGER}, + company_id = #{companyId}, - - is_push = #{isPush,jdbcType=VARCHAR}, + + is_push = #{isPush}, - where id = #{id,jdbcType=INTEGER} + where id = #{id}