diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java index 5b237c54..8c2c0888 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java @@ -111,4 +111,10 @@ public class SelectController { public AjaxResult getUserByRoleIdCbx(@RequestBody SelectDto dto){ return service.getUserByRoleIdCbx(dto); } + + @ApiOperation(value = "往来单位id和标段工程id获取协议信息") + @PostMapping("getAgreementInfoById") + public AjaxResult getAgreementInfoById(@RequestBody SelectDto dto){ + return service.getAgreementInfoById(dto); + } } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/AgreementVo.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/AgreementVo.java new file mode 100644 index 00000000..35556031 --- /dev/null +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/AgreementVo.java @@ -0,0 +1,17 @@ +package com.bonus.sgzb.system.domain; + +import lombok.Data; + +/** + * @author 10488 + * 协议信息 + */ +@Data +public class AgreementVo { + + /** 协议ID*/ + private Integer agreementId; + + /** 协议编号*/ + private String agreementCode; +} diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java index 82de6cc1..400c100b 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java @@ -25,4 +25,10 @@ public class SelectDto { /** 角色权限字符串*/ private String roleKey; + /** 往来单位id*/ + private int unitId; + + /** 标段工程id*/ + private int projectId; + } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java index a592475d..e6c92b69 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.system.mapper; +import com.bonus.sgzb.system.domain.AgreementVo; import com.bonus.sgzb.system.domain.SelectDto; import com.bonus.sgzb.system.domain.SelectVo; import com.bonus.sgzb.system.domain.TreeNode; @@ -156,4 +157,13 @@ public interface SelectMapper { * @date 2023/12/20 21:02 */ List getUserByRoleIdCbxTree(SelectDto dto); + + /** + * @param dto + * @return AgreementVo + * @description 往来单位id和标段工程id获取协议信息 + * @author cwchen + * @date 2023/12/21 10:53 + */ + List getAgreementInfoById(SelectDto dto); } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java index d937b1d1..2fad6250 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java @@ -143,4 +143,13 @@ public interface SelectService { * @date 2023/12/20 20:48 */ AjaxResult getUserByRoleIdCbx(SelectDto dto); + + /** + * @param dto + * @return AjaxResult + * @description 往来单位id和标段工程id获取协议信息 + * @author cwchen + * @date 2023/12/21 10:47 + */ + AjaxResult getAgreementInfoById(SelectDto dto); } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java index b390ae75..6ab76e7e 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.system.service.impl; import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.system.domain.AgreementVo; import com.bonus.sgzb.system.domain.SelectDto; import com.bonus.sgzb.system.domain.SelectVo; import com.bonus.sgzb.system.domain.TreeNode; @@ -212,12 +213,12 @@ public class SelectServiceImpl implements SelectService { @Override public AjaxResult getUserByRoleIdCbx(SelectDto dto) { try { - if(Objects.equals("1",dto.getType())){ + if (Objects.equals("1", dto.getType())) { // 用户/维修员/库管员/采购员-下拉选 List list = new ArrayList<>(); list = mapper.getUserByRoleIdCbxSelect(dto); return AjaxResult.success(list); - }else if(Objects.equals("2",dto.getType())){ + } else if (Objects.equals("2", dto.getType())) { List groupList = new ArrayList<>(); List list = new ArrayList<>(); // 用户/维修员/库管员/采购员-树 @@ -231,8 +232,22 @@ public class SelectServiceImpl implements SelectService { return AjaxResult.success(groupList); } } catch (Exception e) { - log.error("用户/维修员/库管员/采购员-查询失败",e); + log.error("用户/维修员/库管员/采购员-查询失败", e); } return AjaxResult.success(null); } + + @Override + public AjaxResult getAgreementInfoById(SelectDto dto) { + AgreementVo vo = new AgreementVo(); + try { + List list = mapper.getAgreementInfoById(dto); + if (CollectionUtils.isNotEmpty(list)) { + vo = list.get(0); + } + } catch (Exception e) { + log.error("往来单位id和标段工程id获取协议信息", e); + } + return AjaxResult.success(vo); + } } diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml index 68d09f3c..f6af78d1 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml @@ -174,4 +174,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_user su ON sur.user_id = su.user_id AND su.del_flag = '0' WHERE sr.role_key = #{roleKey} AND sr.del_flag = '0' + + \ No newline at end of file