| src/main/java/com/ruoyi/production/controller/ProductionProductOutputController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/production/mapper/ProductionProductOutputMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/production/service/ProductionProductOutputService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/production/service/impl/ProductionProductOutputServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/production/ProductionProductInputMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/production/ProductionProductOutputMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/ruoyi/production/controller/ProductionProductOutputController.java
对比新文件 @@ -0,0 +1,27 @@ package com.ruoyi.production.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.framework.web.domain.R; import com.ruoyi.production.dto.ProductionProductInputDto; import com.ruoyi.production.dto.ProductionProductOutputDto; import com.ruoyi.production.service.ProductionProductInputService; import com.ruoyi.production.service.ProductionProductOutputService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RequestMapping("productionProductOutput") @RestController @Api(value = "鐢熶骇浜у嚭") public class ProductionProductOutputController { @Autowired private ProductionProductOutputService productionProductOutputService; @GetMapping("listPage") public R page(Page<ProductionProductOutputDto> page, ProductionProductOutputDto productionProductOutputDto) { return R.ok(productionProductOutputService.listPageProductionProductOutputDto(page, productionProductOutputDto)); } } src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java
对比新文件 @@ -0,0 +1,15 @@ package com.ruoyi.production.dto; import com.ruoyi.production.pojo.ProductionProductInput; import com.ruoyi.production.pojo.ProductionProductOutput; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class ProductionProductOutputDto extends ProductionProductOutput { @ApiModelProperty(value = "鎶ュ伐鍗曞彿") private String productNo; @ApiModelProperty(value = "浜у搧鍨嬪彿") private String model; } src/main/java/com/ruoyi/production/mapper/ProductionProductOutputMapper.java
@@ -1,9 +1,15 @@ package com.ruoyi.production.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.production.dto.ProductionProductOutputDto; import com.ruoyi.production.pojo.ProductionProductOutput; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @Mapper public interface ProductionProductOutputMapper extends BaseMapper<ProductionProductOutput> { IPage<ProductionProductOutputDto> listPageProductionProductOutputDto(Page page, @Param("c") ProductionProductOutputDto productionProductOutputDto); } src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -16,7 +16,7 @@ private Long id; @ApiModelProperty(value = "鎶ュ伐id") private Long productionProductId; private Long productMainId; @ApiModelProperty(value = "浜у搧id") private Long productModelId; src/main/java/com/ruoyi/production/service/ProductionProductOutputService.java
对比新文件 @@ -0,0 +1,11 @@ package com.ruoyi.production.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.production.dto.ProductionProductOutputDto; import com.ruoyi.production.pojo.ProductionProductOutput; public interface ProductionProductOutputService extends IService<ProductionProductOutput> { IPage<ProductionProductOutputDto> listPageProductionProductOutputDto(Page page, ProductionProductOutputDto productionProductOutputDto); } src/main/java/com/ruoyi/production/service/impl/ProductionProductOutputServiceImpl.java
对比新文件 @@ -0,0 +1,24 @@ package com.ruoyi.production.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.production.dto.ProductionProductOutputDto; import com.ruoyi.production.mapper.ProductionProductOutputMapper; import com.ruoyi.production.pojo.ProductionProductOutput; import com.ruoyi.production.service.ProductionProductOutputService; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service @AllArgsConstructor public class ProductionProductOutputServiceImpl extends ServiceImpl<ProductionProductOutputMapper, ProductionProductOutput> implements ProductionProductOutputService { @Autowired private ProductionProductOutputMapper productionProductOutputMapper; @Override public IPage<ProductionProductOutputDto> listPageProductionProductOutputDto(Page page, ProductionProductOutputDto productionProductOutputDto) { return productionProductOutputMapper.listPageProductionProductOutputDto(page, productionProductOutputDto); } } src/main/resources/mapper/production/ProductionProductInputMapper.xml
@@ -4,7 +4,7 @@ <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductionProductInput"> <id property="id" column="id"/> <result property="productionProductId" column="production_product_id"/> <result property="productMainId" column="product_main_id"/> <result property="productModelId" column="product_model_id"/> <result property="quantity" column="quantity"/> <result property="tenantId" column="tenant_id"/> src/main/resources/mapper/production/ProductionProductOutputMapper.xml
@@ -2,5 +2,27 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.production.mapper.ProductionProductOutputMapper"> <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductionProductOutput"> <id property="id" column="id"/> <result property="productMainId" column="product_main_id"/> <result property="productModelId" column="product_model_id"/> <result property="quantity" column="quantity"/> <result property="tenantId" column="tenant_id"/> <result property="createTime" column="create_time"/> </resultMap> <select id="listPageProductionProductOutputDto" resultType="com.ruoyi.production.dto.ProductionProductOutputDto"> select ppo.*, pm.model as model, ppm.product_no as productNo from production_product_output ppo left join production_product_main ppm on ppm.id = ppo.product_main_id left join product_model pm on pm.id = ppo.product_model_id <where> <if test="c.productMainId != null and c.productMainId > 0"> and ppm.id = #{c.productMainId} </if> </where> order by ppo.id </select> </mapper>