diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/table/FundMapper.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/table/FundMapper.java index 8a42be5895c26b759aece79dfea30735a196ebd3..ba4e9ec3530b3ccbd7052de522118932c24a9422 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/table/FundMapper.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/table/FundMapper.java @@ -70,4 +70,6 @@ public interface FundMapper extends BaseMapper<FundPo> { Integer queryFundLatestYear(); List<FundDo> queryExport(); + + } diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/fund/FundQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/fund/FundQueryServiceImpl.java index 55c0dc0419d77310eee78eb049d7306dd010da94..66f540e7a8a06671ab5e94d4ca3cbed1d632b00b 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/fund/FundQueryServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/fund/FundQueryServiceImpl.java @@ -24,6 +24,7 @@ import com.seasky.projectplan.infrastructure.dataobject.po.FundPo; import com.seasky.projectplan.infrastructure.db.mapper.table.BudgetInfoMapper; import com.seasky.projectplan.infrastructure.db.mapper.table.FundMapper; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -50,7 +51,6 @@ public class FundQueryServiceImpl extends AbstractService<FundPo, FundMapper> im @Resource BudgetInfoMapper budgetInfoMapper; - /** * 鏌ヨ缁忔祹绉戠洰閫氳繃id * @@ -134,7 +134,13 @@ public class FundQueryServiceImpl extends AbstractService<FundPo, FundMapper> im InfoCanUseFundOut out = new InfoCanUseFundOut(); JSONObject jsonObject = JSON.parseObject(o.toString()); out.setId(Long.valueOf(jsonObject.get("id").toString())); - out.setName(jsonObject.get("fundName").toString()); + Long fundParentId = Long.valueOf(jsonObject.get("fundParentId").toString()); + FundPo fundPo1 = mapper.selectById(fundParentId); + if (ObjectUtils.isEmpty(fundPo1)){ + out.setName(jsonObject.get("fundName").toString()); + }else { + out.setName(fundPo1.getFundName() + "-" + jsonObject.get("fundName").toString()); + } out.setCode(jsonObject.get("fundCode").toString()); out.setFundDescribe(jsonObject.get("fundDescribe").toString()); FundPo fundPo = mapper.selectById(out.getId()); diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java index 59ae9cfa625a18f04b4b3d247d8a9e012e949c83..9ac8b6ad549227d6669b62f2b4f2f9594e326ab0 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java @@ -416,7 +416,7 @@ public class BaseConfigController implements IBaseConfigController { * * @return {@link Result}<{@link PersonFundOut}> */ - @ApiOperation("5.鏌ヨ鎵€鏈変汉鐨勪唬鐮佸拰鍚嶇О") + @ApiOperation("鏌ヨ鎵€鏈夌粡娴庣鐩殑浠g爜鍜屽悕绉�") @Override public Result<PersonFundOut> queryPersonCodeAndName() { return ok(ResponseCode.SUCCESS,baseConfigQuerySvr.queryPersonCodeAndName());