diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java
index dd2a1e4..af3393b 100644
--- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java
+++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java
@@ -1,10 +1,25 @@
package com.zzsmart.qomo.kn.cost.manage.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zzsmart.qomo.kn.cost.manage.service.CostStandardDetailService;
+import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardService;
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+
/**
*
* 标准成本明细表 前端控制器
@@ -13,8 +28,33 @@ import org.springframework.web.bind.annotation.RestController;
* @author cost_purchase_price
* @since 2024-06-19
*/
+@Api(tags="标准成本单行查询")
@RestController
-@RequestMapping("/cost-standard-detail")
+@RequestMapping("//costStandardDetail")
+@Slf4j
public class CostStandardDetailController {
+ @Autowired
+ private CostStandardDetailService costStandardDetailService;
+ /**
+ * 分页列表查询
+ *
+ * @param costStandard
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "cost_standard-分页列表查询")
+ @ApiOperation(value="cost_standard_detail-分页列表查询", notes="cost_standard_detail-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryPageList(CostStandardDetailVO costStandard,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = costStandardDetailService.pageList(page, costStandard);
+ return Result.OK(pageList);
+ }
}
diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardDetailMapper.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardDetailMapper.java
index 76f2a2b..ec9a168 100644
--- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardDetailMapper.java
+++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardDetailMapper.java
@@ -1,8 +1,15 @@
package com.zzsmart.qomo.kn.cost.manage.mapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
*
@@ -14,5 +21,6 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface CostStandardDetailMapper extends BaseMapper {
+ IPage pageList(@Param("page") Page page , @Param(Constants.WRAPPER) Wrapper wrapper);
}
diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardDetailMapper.xml b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardDetailMapper.xml
index 17dd931..95faa0f 100644
--- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardDetailMapper.xml
+++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardDetailMapper.xml
@@ -3,10 +3,11 @@
-
+
+
@@ -33,10 +34,14 @@
+
diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/CostStandardDetailService.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/CostStandardDetailService.java
index 30a429c..e2ca314 100644
--- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/CostStandardDetailService.java
+++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/CostStandardDetailService.java
@@ -1,7 +1,11 @@
package com.zzsmart.qomo.kn.cost.manage.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
/**
*
@@ -12,5 +16,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @since 2024-06-19
*/
public interface CostStandardDetailService extends IService {
+ /**
+ * 分页查询
+ * @param page
+ * @param
+ * @return
+ */
+ IPage pageList(Page page, CostStandardDetailVO costStandard);
}
diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardDetailServiceImpl.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardDetailServiceImpl.java
index 4309d4d..f1e3403 100644
--- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardDetailServiceImpl.java
+++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardDetailServiceImpl.java
@@ -1,9 +1,16 @@
package com.zzsmart.qomo.kn.cost.manage.service.impl;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
import com.zzsmart.qomo.kn.cost.manage.mapper.CostStandardDetailMapper;
import com.zzsmart.qomo.kn.cost.manage.service.CostStandardDetailService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -17,4 +24,32 @@ import org.springframework.stereotype.Service;
@Service
public class CostStandardDetailServiceImpl extends ServiceImpl implements CostStandardDetailService {
+ @Autowired
+ CostStandardDetailMapper costStandardDetailMapper;
+ /**
+ * 分页查询
+ *
+ * @param page
+ * @param costStandard
+ * @return
+ */
+ @Override
+ public IPage pageList(Page page, CostStandardDetailVO costStandard) {
+ // 查询条件组装
+ QueryWrapper queryWrapper = new QueryWrapper();
+
+ if(costStandard != null){
+
+ if(StrUtil.isNotEmpty(costStandard.getMaterialNumber()) ){
+ // 物料号
+ queryWrapper.like("c1.material_number",costStandard.getMaterialNumber());
+ }
+ if(StrUtil.isNotEmpty(costStandard.getVersionNumber()) ){
+ // 版本号
+ queryWrapper.like("c2.version_number",costStandard.getVersionNumber());
+ }
+
+ }
+ return (IPage) costStandardDetailMapper.pageList(page,queryWrapper);
+ }
}
diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java
index 4b95836..db76eaa 100644
--- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java
+++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java
@@ -49,8 +49,6 @@ import java.util.Map;
public class CostStandardVersionServiceImpl extends ServiceImpl implements ICostStandardVersionService {
@Autowired
private CostStandardMapper costStandardMapper;
- @Autowired
- private ICostStandardVersionService costStandardVersionService;
private static final Logger log = LoggerFactory.getLogger(CostStandardVersionServiceImpl.class);
@Transactional(rollbackFor = Exception.class)
@@ -171,7 +169,7 @@ public class CostStandardVersionServiceImpl extends ServiceImpl
+ * 标准成本明细表
+ *
+ *
+ * @author cost_purchase_price
+ * @since 2024-06-19
+ */
+@Data
+public class CostStandardDetailVO extends CostStandardDetail implements Serializable {
+ /**
+ * 版本号
+ */
+ private String versionNumber;
+}