映射详情接口

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java

@@ -80,4 +80,9 @@ public interface SysMappingFeign {
     @PostMapping("/saveMappingList")
     @ResponseBody
     public ResultBean saveMappingList(@RequestBody List<SysMappingDto> dto);
+
+    @ApiOperation("根据条件查询详情")
+    @PostMapping("/selectMappingInfo")
+    @ResponseBody
+    public ResultBean<SysMappingInfoVo> selectMappingInfo(@RequestBody SysMappingInfoQuery query);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java

@@ -74,4 +74,9 @@ public class SysMappingFeignFallback implements SysMappingFeign {
 	public ResultBean saveMappingList(List<SysMappingDto> dto) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<SysMappingInfoVo> selectMappingInfo(SysMappingInfoQuery query) {
+		return null;
+	}
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.portal.api.sysmapping;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysMappingInfoQuery implements Query {
+    private static final long serialVersionUID = 5179141159925489016L;
+
+    @ApiModelProperty("映射来源，如CWXT等")
+    private String map_sourceKey; // 映射来源，如CWXT等
+
+    @ApiModelProperty("映射实体，如付款单")
+    private String map_object; // 映射实体，如付款单
+
+    @ApiModelProperty("映射项目类别，如应付类别")
+    private String map_item; // 映射项目类别，如应付类别
+
+    @ApiModelProperty("数据字典类别编码")
+    private String dictTypeCode; // 数据字典类别编码
+
+    @ApiModelProperty("数据key")
+    private String dictKey; // 数据key
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.portal.api.sysmapping;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysMappingInfoVo implements Vo {
+
+
+    private static final long serialVersionUID = -4909774998558087805L;
+
+    @ApiModelProperty("数据字典sid")
+    private String dictSid; // 数据字典sid
+    @ApiModelProperty("映射来源，如CWXT等")
+    private String map_sourceKey; // 映射来源，如CWXT等
+    @ApiModelProperty("映射来源，如财务系统等")
+    private String map_sourceValue; // 映射来源，如财务系统等
+    @ApiModelProperty("映射实体，如付款单")
+    private String map_object; // 映射实体，如付款单
+    @ApiModelProperty("映射项目类别，如应付类别")
+    private String map_item; // 映射项目类别，如应付类别
+    @ApiModelProperty("项目key，如002")
+    private String map_itemKey; // 项目key，如002
+    @ApiModelProperty("项目value，如外采")
+    private String map_itemValue; // 项目value，如外采
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java

@@ -49,7 +49,8 @@ import lombok.Data;
 @ApiModel(value = "数据映射 查询条件", description = "数据映射 查询条件")
 public class SysMappingQuery implements Query {
 
-	@ApiModelProperty("数据字典sid")
+    private static final long serialVersionUID = -546734185535363676L;
+    @ApiModelProperty("数据字典sid")
     private String dictSid; // 数据字典sid
 	@ApiModelProperty("映射来源，如CWXT等")
     private String map_sourceKey; // 映射来源，如CWXT等

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo;
 import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -55,13 +56,15 @@ import java.util.List;
 @Mapper
 public interface SysMappingMapper extends BaseMapper<SysMapping> {
 
-	//@Update("update sys_mapping set name=#{msg} where id=#{id}")
-	//IPage<SysMappingVo> voPage(IPage<SysMapping> page, @Param(Constants.WRAPPER) QueryWrapper<SysMapping> qw);
-	
-	IPage<SysMappingVo> selectPageVo(IPage<SysMappingQuery> page, @Param(Constants.WRAPPER) QueryWrapper<SysMappingVo> qw);
-	
-	List<SysMappingVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysMapping> qw);
-	
-	@Select("select * from sys_mapping")
-	List<SysMappingVo> selectListVo();
+    //@Update("update sys_mapping set name=#{msg} where id=#{id}")
+    //IPage<SysMappingVo> voPage(IPage<SysMapping> page, @Param(Constants.WRAPPER) QueryWrapper<SysMapping> qw);
+
+    IPage<SysMappingVo> selectPageVo(IPage<SysMappingQuery> page, @Param(Constants.WRAPPER) QueryWrapper<SysMappingVo> qw);
+
+    List<SysMappingVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysMapping> qw);
+
+    @Select("select * from sys_mapping")
+    List<SysMappingVo> selectListVo();
+
+    SysMappingInfoVo selectMappingInfo(@Param(Constants.WRAPPER) QueryWrapper<SysMappingInfoVo> qw);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml

@@ -28,4 +28,21 @@
         SELECT * FROM sys_mapping
         <where>${ew.sqlSegment}</where>
     </select>
+
+    <select id="selectMappingInfo" resultType="com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo">
+        SELECT
+        sm.dictSid,
+        sm.map_sourceKey,
+        sm.map_sourceValue,
+        sm.map_object,
+        sm.map_item,
+        sm.map_itemKey,
+        sm.map_itemValue
+        FROM
+        sys_mapping sm
+        LEFT JOIN dict_common dc ON sm.dictSid = dc.sid
+        LEFT JOIN dict_type dt ON dc.parentSid = dt.sid
+        <where>${ew.sqlSegment}</where>
+    </select>
+
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.portal.biz.sysmapping;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.portal.api.sysmapping.*;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -36,12 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import com.yxt.anrui.portal.api.sysmapping.SysMapping;
-import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery;
-import com.yxt.anrui.portal.api.sysmapping.SysMappingVo;
-import com.yxt.anrui.portal.api.sysmapping.SysMappingDetailsVo;
-import com.yxt.anrui.portal.api.sysmapping.SysMappingDto;
-import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign;
 
 /**
  * Project: sysmapping(sysmapping) <br/>
@@ -61,52 +56,58 @@ import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign;
 @RequestMapping("v1/sysmapping")
 public class SysMappingRest implements SysMappingFeign {
 
-	@Autowired
-	private SysMappingService sysMappingService;
+    @Autowired
+    private SysMappingService sysMappingService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<SysMappingVo>> listPage(@RequestBody PagerQuery<SysMappingQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<SysMappingVo> page = new PagerVo<>();
-		IPage<SysMappingVo> iPage = sysMappingService.listPageVo(pq);
-		PagerVo<SysMappingVo> pagerVo = PagerUtil.pageToVo(iPage, page);
-		return new ResultBean<PagerVo<SysMappingVo>>().success().setData(pagerVo);
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysMappingVo>> listPage(@RequestBody PagerQuery<SysMappingQuery> pq) {
+        PagerVo<SysMappingVo> page = new PagerVo<>();
+        IPage<SysMappingVo> iPage = sysMappingService.listPageVo(pq);
+        PagerVo<SysMappingVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<SysMappingVo>>().success().setData(pagerVo);
 
-	}
+    }
 
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody SysMappingDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		sysMappingService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysMappingDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        sysMappingService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据sid批量删除")
+    @Override
+    @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		sysMappingService.delBySids(sids);
-		return rb.success();
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        sysMappingService.delBySids(sids);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<SysMappingDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		SysMappingDetailsVo vo = sysMappingService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
+    public ResultBean<SysMappingDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        SysMappingDetailsVo vo = sysMappingService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
 
-	@Override
-	public ResultBean saveMappingList(List<SysMappingDto> dto) {
-		ResultBean rb = ResultBean.fireFail();
-		sysMappingService.saveMappingList(dto);
-		return rb.success();
-	}
+    @Override
+    public ResultBean saveMappingList(List<SysMappingDto> dto) {
+        ResultBean rb = ResultBean.fireFail();
+        sysMappingService.saveMappingList(dto);
+        return rb.success();
+    }
+
+    @Override
+    public ResultBean<SysMappingInfoVo> selectMappingInfo(SysMappingInfoQuery query) {
+        ResultBean<SysMappingInfoVo> rb = ResultBean.fireFail();
+        SysMappingInfoVo vo = sysMappingService.selectMappingInfo(query);
+        return rb.success().setData(vo);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java

@@ -28,15 +28,11 @@ package com.yxt.anrui.portal.biz.sysmapping;
 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.portal.api.sysmapping.*;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
-import com.yxt.anrui.portal.api.sysmapping.SysMapping;
-import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery;
-import com.yxt.anrui.portal.api.sysmapping.SysMappingVo;
-import com.yxt.anrui.portal.api.sysmapping.SysMappingDetailsVo;
-import com.yxt.anrui.portal.api.sysmapping.SysMappingDto;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -71,7 +67,7 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
     }
 
     public QueryWrapper<SysMappingVo> queryWrapper(SysMappingQuery query) {
-        QueryWrapper<SysMappingVo> qw = queryWrapper(query);
+        QueryWrapper<SysMappingVo> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(query.getMap_sourceKey())) {
             qw.eq("sm.map_sourceKey", query.getMap_sourceKey());
         }
@@ -146,4 +142,25 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
             save(entity);
         }
     }
+
+    public SysMappingInfoVo selectMappingInfo(SysMappingInfoQuery query) {
+        QueryWrapper<SysMappingInfoVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getMap_sourceKey())) {
+            qw.eq("sm.map_sourceKey", query.getMap_sourceKey());
+        }
+        if (StringUtils.isNotBlank(query.getMap_object())) {
+            qw.eq("sm.map_object", query.getMap_object());
+        }
+        if (StringUtils.isNotBlank(query.getMap_item())) {
+            qw.eq("sm.map_item", query.getMap_item());
+        }
+        if (StringUtils.isNotBlank(query.getDictTypeCode())) {
+            qw.eq("dt.dictTypeCode", query.getDictTypeCode());
+        }
+        if (StringUtils.isNotBlank(query.getDictKey())) {
+            qw.eq("dc.dictKey", query.getDictKey());
+        }
+        SysMappingInfoVo vo = baseMapper.selectMappingInfo(qw);
+        return vo;
+    }
 }