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;
+
 /**
  * <p>
  * 标准成本明细表 前端控制器
@@ -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<IPage<CostStandardDetailVO>> queryPageList(CostStandardDetailVO costStandard,
+                                                                @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                                HttpServletRequest req) {
+
+        Page<CostStandardDetailVO> page = new Page<CostStandardDetailVO>(pageNo, pageSize);
+        IPage<CostStandardDetailVO> pageList = costStandardDetailService.pageList(page, costStandard);
+        return Result.OK(pageList);
+    }
 }

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;
 
 /**
  * <p>
@@ -14,5 +21,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface CostStandardDetailMapper extends BaseMapper<CostStandardDetail> {
+    IPage<CostStandardDetailVO> pageList(@Param("page") Page<CostStandardDetailVO> page , @Param(Constants.WRAPPER) Wrapper<CostStandardDetailVO> wrapper);
 
 }

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardDetailMapper.xml

@@ -3,10 +3,11 @@
 <mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.CostStandardDetailMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail">
+    <resultMap id="CostStandardDetailVOResultMap" type="com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO">
         <id column="id" property="id" />
         <result column="material_number" property="materialNumber" />
         <result column="version_number_id" property="versionNumberId" />
+        <result column="version_number" property="versionNumber" />
         <result column="level" property="level" />
         <result column="figure_number" property="figureNumber" />
         <result column="dosage" property="dosage" />
@@ -33,10 +34,14 @@
         <result column="update_time" property="updateTime" />
         <result column="remark" property="remark" />
     </resultMap>
+    <select id="pageList" resultMap="CostStandardDetailVOResultMap">
+        select c1.*, c2.version_number, c2.version_status, c2.stage,c2.version_year
+        from
+            cost_standard_detail  c1
+                left join cost_standard_version  c2 on c1.version_number_id = c2.id
+            ${ew.customSqlSegment}
+        ORDER BY c1.create_time desc
 
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, material_number, version_number_id, level, figure_number, dosage, unit, specification, bom_cost, packing_cost, auxiliary_cost, labor_cost, euip_depreciation_cost, equip_consume_cost, hydroelectricity_cost, other_cost, trail_cost, manufacture_cost, total_labor_cost, total_equip_consume_cost, total_euip_depreciation_cost, total_hydroelectricity_cost, total_other_cost, create_by, create_time, update_by, update_time, remark
-    </sql>
+    </select>
 
 </mapper>

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;
 
 /**
  * <p>
@@ -12,5 +16,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2024-06-19
  */
 public interface CostStandardDetailService extends IService<CostStandardDetail> {
+    /**
+     * 分页查询
+     * @param page
+     * @param
+     * @return
+     */
+    IPage<CostStandardDetailVO> pageList(Page<CostStandardDetailVO> page, CostStandardDetailVO costStandard);
 
 }

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<CostStandardDetailMapper, CostStandardDetail> implements CostStandardDetailService {
 
+    @Autowired
+    CostStandardDetailMapper costStandardDetailMapper;
+    /**
+     * 分页查询
+     *
+     * @param page
+     * @param costStandard
+     * @return
+     */
+    @Override
+    public IPage<CostStandardDetailVO> pageList(Page<CostStandardDetailVO> 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<CostStandardDetailVO>) costStandardDetailMapper.pageList(page,queryWrapper);
+    }
 }

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<CostStandardVersionMapper, CostStandardVersion> 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<CostStandardVers
                     standardVersion.setVersionYear(String.valueOf(createDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().getYear()));
                     // 调用保存方法
                     try {
-                        costStandardVersionService.save(standardVersion);
+                        save(standardVersion);
                     } catch (Exception e) {
                         failureNum++;
                         String msg = "<br/>第 " + (i + 2) + " 行数据导入失败；";

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/CostStandardDetailVO.java

@@ -0,0 +1,32 @@
+package com.zzsmart.qomo.kn.cost.manage.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
+import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 标准成本明细表
+ * </p>
+ *
+ * @author cost_purchase_price
+ * @since 2024-06-19
+ */
+@Data
+public class CostStandardDetailVO  extends CostStandardDetail implements Serializable  {
+    /**
+     * 版本号
+     */
+    private String versionNumber;
+}