Browse Source

获取采购系统接口修复

master
dimengzhe 1 year ago
parent
commit
2a4df665c9
  1. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java
  2. 21
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/SystemVo2.java
  3. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java
  4. 6
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java

@ -36,7 +36,7 @@ public interface CommonFeign {
@ApiOperation(value = "获取采购系统名称")
@ResponseBody
@GetMapping("/getSystem")
ResultBean<List<SystemVo>> getSystem(@RequestParam("orgPath") String orgPath);
ResultBean<List<SystemVo2>> getSystem(@RequestParam("orgPath") String orgPath);
@ApiOperation(value = "获取金融部门主管")
@ResponseBody

21
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/SystemVo2.java

@ -0,0 +1,21 @@
package com.yxt.anrui.terminal.api.base.common;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/29
**/
@Data
public class SystemVo2 {
@ApiModelProperty("部门sid")
@JsonProperty("dictKey")
private String deptSid;
@ApiModelProperty("采购系统名称")
@JsonProperty("dictValue")
private String purchaseSystemName;
}

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java

@ -35,7 +35,7 @@ public class CommonRest implements CommonFeign {
}
@Override
public ResultBean<List<SystemVo>> getSystem(String orgPath) {
public ResultBean<List<SystemVo2>> getSystem(String orgPath) {
return commonService.getSystem(orgPath);
}

6
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java

@ -63,10 +63,10 @@ public class CommonService {
return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
}
public ResultBean<List<SystemVo>> getSystem(String orgPath) {
ResultBean<List<SystemVo>> rb = ResultBean.fireFail();
public ResultBean<List<SystemVo2>> getSystem(String orgPath) {
ResultBean<List<SystemVo2>> rb = ResultBean.fireFail();
ResultBean<List<AppBasePurchSystemVo>> resultBean = basePurchaseSystemFeign.fetchDetailsByUseOrgPath(orgPath);
List<SystemVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList());
List<SystemVo2> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo2.class)).collect(Collectors.toList());
return rb.success().setData(list);
}

Loading…
Cancel
Save