Merge remote-tracking branch 'origin/master'

src/main/java/org/ajnb/controller/BiddingProcessController.java

@@ -2,7 +2,9 @@ package org.ajnb.controller;
 
 
 import org.ajnb.service.BiddingInfoService;
+import org.ajnb.service.BiddingProcessService;
 import org.ajnb.vo.BiddingInfoVO;
+import org.ajnb.vo.BiddingProcessVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -15,10 +17,17 @@ public class BiddingProcessController {
 
     @Autowired
     private BiddingInfoService biddingInfoService;
+    @Autowired
+    private BiddingProcessService biddingProcessService;
 
     @RequestMapping("BaseInfo")
     public List<BiddingInfoVO> BaseInfo(BiddingInfoVO biddingInfoVO){
         return biddingInfoService.queryBiddingInfoById(biddingInfoVO);
     }
 
+    @RequestMapping("ProcessInfo")
+    public List<BiddingProcessVO> ProcessInfo(BiddingProcessVO biddingProcessVO){
+        return biddingProcessService.queryBiddingProcessByBiddingId(biddingProcessVO);
+    }
+
 }

src/main/java/org/ajnb/mapper/BiddingProcessMapper.java

@@ -0,0 +1,11 @@
+package org.ajnb.mapper;
+
+import org.ajnb.vo.BiddingProcessVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface BiddingProcessMapper {
+    public List<BiddingProcessVO> queryBiddingProcessByBiddingId(BiddingProcessVO biddingProcessVO);
+}

src/main/java/org/ajnb/service/BiddingProcessService.java

@@ -0,0 +1,11 @@
+package org.ajnb.service;
+
+import org.ajnb.vo.BiddingProcessVO;
+
+import java.util.List;
+
+public interface BiddingProcessService {
+
+    public List<BiddingProcessVO> queryBiddingProcessByBiddingId(BiddingProcessVO biddingProcessVO);
+
+}

src/main/java/org/ajnb/service/BiddingProcessServiceImpl.java

@@ -0,0 +1,21 @@
+package org.ajnb.service;
+
+import org.ajnb.mapper.BiddingProcessMapper;
+import org.ajnb.vo.BiddingProcessVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class BiddingProcessServiceImpl implements BiddingProcessService{
+
+    @Autowired
+    private BiddingProcessMapper biddingProcessMapper;
+
+    @Override
+    public List<BiddingProcessVO> queryBiddingProcessByBiddingId(BiddingProcessVO biddingProcessVO) {
+        return biddingProcessMapper.queryBiddingProcessByBiddingId(biddingProcessVO);
+    }
+}

src/main/java/org/ajnb/vo/BiddingInfoVO.java

@@ -41,5 +41,7 @@ public class BiddingInfoVO {
 
     private BigDecimal price_limit_lower;
 
+    private String create_time;
+
     private String creator;
 }

src/main/java/org/ajnb/vo/BiddingProcessVO.java

@@ -0,0 +1,21 @@
+package org.ajnb.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Setter
+@Getter
+
+public class BiddingProcessVO {
+    private Integer id;
+    private Integer supplier_id;
+    private String supplier_name;
+    private Integer bidding_info_id;
+    private Integer rule_id;
+    private Integer duration_minutes;
+    private BigDecimal first_round_offer;
+    private BigDecimal second_round_offer;
+    private BigDecimal third_round_offer;
+}

src/main/resources/mapper/BiddingProcess.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.ajnb.mapper.BiddingProcessMapper">
+
+    <parameterMap id="pm" type="org.ajnb.vo.BiddingProcessVO"></parameterMap>
+    <resultMap id="rm" type="org.ajnb.vo.BiddingProcessVO"></resultMap>
+
+    <select id="queryBiddingProcessByBiddingId" resultMap="rm">
+        select * from BiddingProcess where bidding_info_id = #{bidding_info_id}
+    </select>
+
+
+
+</mapper>