Pārlūkot izejas kodu

标准成本单行查询

wangqiong 2 gadus atpakaļ
vecāks
revīzija
9442a3b69d

+ 41
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java Parādīt failu

1
 package com.zzsmart.qomo.kn.cost.manage.controller;
1
 package com.zzsmart.qomo.kn.cost.manage.controller;
2
 
2
 
3
 
3
 
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
+import com.zzsmart.qomo.kn.cost.manage.service.CostStandardDetailService;
7
+import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardService;
8
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
9
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
10
+import io.swagger.annotations.Api;
11
+import io.swagger.annotations.ApiOperation;
12
+import lombok.extern.slf4j.Slf4j;
13
+import org.jeecg.common.api.vo.Result;
14
+import org.springframework.beans.factory.annotation.Autowired;
15
+import org.springframework.web.bind.annotation.GetMapping;
4
 import org.springframework.web.bind.annotation.RequestMapping;
16
 import org.springframework.web.bind.annotation.RequestMapping;
5
 
17
 
18
+import org.springframework.web.bind.annotation.RequestParam;
6
 import org.springframework.web.bind.annotation.RestController;
19
 import org.springframework.web.bind.annotation.RestController;
7
 
20
 
21
+import javax.servlet.http.HttpServletRequest;
22
+
8
 /**
23
 /**
9
  * <p>
24
  * <p>
10
  * 标准成本明细表 前端控制器
25
  * 标准成本明细表 前端控制器
13
  * @author cost_purchase_price
28
  * @author cost_purchase_price
14
  * @since 2024-06-19
29
  * @since 2024-06-19
15
  */
30
  */
31
+@Api(tags="标准成本单行查询")
16
 @RestController
32
 @RestController
17
-@RequestMapping("/cost-standard-detail")
33
+@RequestMapping("//costStandardDetail")
34
+@Slf4j
18
 public class CostStandardDetailController {
35
 public class CostStandardDetailController {
36
+    @Autowired
37
+    private CostStandardDetailService costStandardDetailService;
38
+
39
+    /**
40
+     * 分页列表查询
41
+     *
42
+     * @param costStandard
43
+     * @param pageNo
44
+     * @param pageSize
45
+     * @param req
46
+     * @return
47
+     */
48
+    //@AutoLog(value = "cost_standard-分页列表查询")
49
+    @ApiOperation(value="cost_standard_detail-分页列表查询", notes="cost_standard_detail-分页列表查询")
50
+    @GetMapping(value = "/list")
51
+    public Result<IPage<CostStandardDetailVO>> queryPageList(CostStandardDetailVO costStandard,
52
+                                                                @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
53
+                                                                @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
54
+                                                                HttpServletRequest req) {
19
 
55
 
56
+        Page<CostStandardDetailVO> page = new Page<CostStandardDetailVO>(pageNo, pageSize);
57
+        IPage<CostStandardDetailVO> pageList = costStandardDetailService.pageList(page, costStandard);
58
+        return Result.OK(pageList);
59
+    }
20
 }
60
 }

+ 8
- 0
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardDetailMapper.java Parādīt failu

1
 package com.zzsmart.qomo.kn.cost.manage.mapper;
1
 package com.zzsmart.qomo.kn.cost.manage.mapper;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.baomidou.mybatisplus.core.toolkit.Constants;
6
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
7
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
8
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
9
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
10
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
5
 import org.apache.ibatis.annotations.Mapper;
11
 import org.apache.ibatis.annotations.Mapper;
12
+import org.apache.ibatis.annotations.Param;
6
 
13
 
7
 /**
14
 /**
8
  * <p>
15
  * <p>
14
  */
21
  */
15
 @Mapper
22
 @Mapper
16
 public interface CostStandardDetailMapper extends BaseMapper<CostStandardDetail> {
23
 public interface CostStandardDetailMapper extends BaseMapper<CostStandardDetail> {
24
+    IPage<CostStandardDetailVO> pageList(@Param("page") Page<CostStandardDetailVO> page , @Param(Constants.WRAPPER) Wrapper<CostStandardDetailVO> wrapper);
17
 
25
 
18
 }
26
 }

+ 10
- 5
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardDetailMapper.xml Parādīt failu

3
 <mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.CostStandardDetailMapper">
3
 <mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.CostStandardDetailMapper">
4
 
4
 
5
     <!-- 通用查询映射结果 -->
5
     <!-- 通用查询映射结果 -->
6
-    <resultMap id="BaseResultMap" type="com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail">
6
+    <resultMap id="CostStandardDetailVOResultMap" type="com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO">
7
         <id column="id" property="id" />
7
         <id column="id" property="id" />
8
         <result column="material_number" property="materialNumber" />
8
         <result column="material_number" property="materialNumber" />
9
         <result column="version_number_id" property="versionNumberId" />
9
         <result column="version_number_id" property="versionNumberId" />
10
+        <result column="version_number" property="versionNumber" />
10
         <result column="level" property="level" />
11
         <result column="level" property="level" />
11
         <result column="figure_number" property="figureNumber" />
12
         <result column="figure_number" property="figureNumber" />
12
         <result column="dosage" property="dosage" />
13
         <result column="dosage" property="dosage" />
33
         <result column="update_time" property="updateTime" />
34
         <result column="update_time" property="updateTime" />
34
         <result column="remark" property="remark" />
35
         <result column="remark" property="remark" />
35
     </resultMap>
36
     </resultMap>
37
+    <select id="pageList" resultMap="CostStandardDetailVOResultMap">
38
+        select c1.*, c2.version_number, c2.version_status, c2.stage,c2.version_year
39
+        from
40
+            cost_standard_detail  c1
41
+                left join cost_standard_version  c2 on c1.version_number_id = c2.id
42
+            ${ew.customSqlSegment}
43
+        ORDER BY c1.create_time desc
36
 
44
 
37
-    <!-- 通用查询结果列 -->
38
-    <sql id="Base_Column_List">
39
-        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
40
-    </sql>
45
+    </select>
41
 
46
 
42
 </mapper>
47
 </mapper>

+ 11
- 0
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/CostStandardDetailService.java Parādīt failu

1
 package com.zzsmart.qomo.kn.cost.manage.service;
1
 package com.zzsmart.qomo.kn.cost.manage.service;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
4
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
5
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
4
 import com.baomidou.mybatisplus.extension.service.IService;
6
 import com.baomidou.mybatisplus.extension.service.IService;
7
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
8
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
5
 
9
 
6
 /**
10
 /**
7
  * <p>
11
  * <p>
12
  * @since 2024-06-19
16
  * @since 2024-06-19
13
  */
17
  */
14
 public interface CostStandardDetailService extends IService<CostStandardDetail> {
18
 public interface CostStandardDetailService extends IService<CostStandardDetail> {
19
+    /**
20
+     * 分页查询
21
+     * @param page
22
+     * @param
23
+     * @return
24
+     */
25
+    IPage<CostStandardDetailVO> pageList(Page<CostStandardDetailVO> page, CostStandardDetailVO costStandard);
15
 
26
 
16
 }
27
 }

+ 35
- 0
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardDetailServiceImpl.java Parādīt failu

1
 package com.zzsmart.qomo.kn.cost.manage.service.impl;
1
 package com.zzsmart.qomo.kn.cost.manage.service.impl;
2
 
2
 
3
+import cn.hutool.core.util.StrUtil;
4
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
+import com.baomidou.mybatisplus.core.metadata.IPage;
6
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
7
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
4
 import com.zzsmart.qomo.kn.cost.manage.mapper.CostStandardDetailMapper;
8
 import com.zzsmart.qomo.kn.cost.manage.mapper.CostStandardDetailMapper;
5
 import com.zzsmart.qomo.kn.cost.manage.service.CostStandardDetailService;
9
 import com.zzsmart.qomo.kn.cost.manage.service.CostStandardDetailService;
6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
10
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
11
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
12
+import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
13
+import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.stereotype.Service;
14
 import org.springframework.stereotype.Service;
8
 
15
 
9
 /**
16
 /**
17
 @Service
24
 @Service
18
 public class CostStandardDetailServiceImpl extends ServiceImpl<CostStandardDetailMapper, CostStandardDetail> implements CostStandardDetailService {
25
 public class CostStandardDetailServiceImpl extends ServiceImpl<CostStandardDetailMapper, CostStandardDetail> implements CostStandardDetailService {
19
 
26
 
27
+    @Autowired
28
+    CostStandardDetailMapper costStandardDetailMapper;
29
+    /**
30
+     * 分页查询
31
+     *
32
+     * @param page
33
+     * @param costStandard
34
+     * @return
35
+     */
36
+    @Override
37
+    public IPage<CostStandardDetailVO> pageList(Page<CostStandardDetailVO> page, CostStandardDetailVO costStandard) {
38
+        // 查询条件组装
39
+        QueryWrapper queryWrapper = new QueryWrapper();
40
+
41
+        if(costStandard != null){
42
+
43
+            if(StrUtil.isNotEmpty(costStandard.getMaterialNumber()) ){
44
+                // 物料号
45
+                queryWrapper.like("c1.material_number",costStandard.getMaterialNumber());
46
+            }
47
+            if(StrUtil.isNotEmpty(costStandard.getVersionNumber()) ){
48
+                // 版本号
49
+                queryWrapper.like("c2.version_number",costStandard.getVersionNumber());
50
+            }
51
+
52
+        }
53
+        return (IPage<CostStandardDetailVO>) costStandardDetailMapper.pageList(page,queryWrapper);
54
+    }
20
 }
55
 }

+ 1
- 3
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java Parādīt failu

49
 public class CostStandardVersionServiceImpl extends ServiceImpl<CostStandardVersionMapper, CostStandardVersion> implements ICostStandardVersionService {
49
 public class CostStandardVersionServiceImpl extends ServiceImpl<CostStandardVersionMapper, CostStandardVersion> implements ICostStandardVersionService {
50
     @Autowired
50
     @Autowired
51
     private CostStandardMapper costStandardMapper;
51
     private CostStandardMapper costStandardMapper;
52
-    @Autowired
53
-    private ICostStandardVersionService costStandardVersionService;
54
     private static final Logger log = LoggerFactory.getLogger(CostStandardVersionServiceImpl.class);
52
     private static final Logger log = LoggerFactory.getLogger(CostStandardVersionServiceImpl.class);
55
 
53
 
56
     @Transactional(rollbackFor = Exception.class)
54
     @Transactional(rollbackFor = Exception.class)
171
                     standardVersion.setVersionYear(String.valueOf(createDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().getYear()));
169
                     standardVersion.setVersionYear(String.valueOf(createDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().getYear()));
172
                     // 调用保存方法
170
                     // 调用保存方法
173
                     try {
171
                     try {
174
-                        costStandardVersionService.save(standardVersion);
172
+                        save(standardVersion);
175
                     } catch (Exception e) {
173
                     } catch (Exception e) {
176
                         failureNum++;
174
                         failureNum++;
177
                         String msg = "<br/>第 " + (i + 2) + " 行数据导入失败;";
175
                         String msg = "<br/>第 " + (i + 2) + " 行数据导入失败;";

+ 32
- 0
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/CostStandardDetailVO.java Parādīt failu

1
+package com.zzsmart.qomo.kn.cost.manage.vo;
2
+
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableField;
5
+import com.baomidou.mybatisplus.annotation.TableId;
6
+import com.baomidou.mybatisplus.annotation.TableName;
7
+import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
8
+import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
9
+import lombok.Data;
10
+import lombok.Getter;
11
+import lombok.Setter;
12
+import lombok.experimental.Accessors;
13
+
14
+import java.io.Serializable;
15
+import java.math.BigDecimal;
16
+import java.time.LocalDateTime;
17
+
18
+/**
19
+ * <p>
20
+ * 标准成本明细表
21
+ * </p>
22
+ *
23
+ * @author cost_purchase_price
24
+ * @since 2024-06-19
25
+ */
26
+@Data
27
+public class CostStandardDetailVO  extends CostStandardDetail implements Serializable  {
28
+    /**
29
+     * 版本号
30
+     */
31
+    private String versionNumber;
32
+}