diff --git a/demo/src/main/java/com/example/demo/Dao/auditMapper.java b/demo/src/main/java/com/example/demo/Dao/auditMapper.java index 513fb1d..83e98a3 100644 --- a/demo/src/main/java/com/example/demo/Dao/auditMapper.java +++ b/demo/src/main/java/com/example/demo/Dao/auditMapper.java @@ -7,6 +7,7 @@ import java.util.List; @Mapper public interface auditMapper { + @Select("select * from audit where checkNum = #{checkNum}") public Audit selectAudioByCheckNum(long checkNum); @@ -24,7 +25,11 @@ public interface auditMapper { @Select("select * from audit where userNum = #{userNum} and checkState=1" + "order by applyTime") - public List selectByNum(long userNum); + public List selectByNumFinshed(long userNum); + + @Select("select * from audit where userNum = #{userNum} and checkState=0" + + "order by applyTime") + public List selectByNumUnfinshed(long userNum); @Insert("insert into audit(checkNum, userNum, productNum, " + "bankAccount, checkState, contractNum, " + diff --git a/demo/src/main/java/com/example/demo/order/controller/compController.java b/demo/src/main/java/com/example/demo/order/controller/compController.java index d7ce87c..7d069b5 100644 --- a/demo/src/main/java/com/example/demo/order/controller/compController.java +++ b/demo/src/main/java/com/example/demo/order/controller/compController.java @@ -5,22 +5,25 @@ import com.example.demo.bean.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.util.List; -@Controller +//@Controller +@RestController public class compController { @Autowired com.example.demo.Dao.auditMapper auditMapper; - @RequestMapping("/finished")//已经完成的订单浏览的界面 + @RequestMapping(value="/finished",method = RequestMethod.POST)//已经完成的订单浏览的界面 public List doPost(HttpServletResponse response, HttpServletRequest request){ HttpSession session=request.getSession(); User user=new User(); user=(User)session.getAttribute("user"); - return auditMapper.selectByNum(user.getUserNum()); + return auditMapper.selectByNumFinshed(user.getUserNum()); } } diff --git a/demo/src/main/java/com/example/demo/order/controller/orderController.java b/demo/src/main/java/com/example/demo/order/controller/orderController.java index b6072a8..c1c89ae 100644 --- a/demo/src/main/java/com/example/demo/order/controller/orderController.java +++ b/demo/src/main/java/com/example/demo/order/controller/orderController.java @@ -8,6 +8,8 @@ import com.example.demo.order.service.orderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -17,12 +19,12 @@ import javax.servlet.http.HttpSession; import java.io.IOException; import java.util.ArrayList; import java.util.List; - +@RestController public class orderController extends HttpServlet { @Autowired private orderServiceImpl orderService; - @PostMapping("/orderlist") + @RequestMapping(value = "/orderlist",method = RequestMethod.POST) public void orderList(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/html;charset=utf-8"); HttpSession session = request.getSession(); diff --git a/demo/src/main/java/com/example/demo/order/controller/showController.java b/demo/src/main/java/com/example/demo/order/controller/showController.java index ef019e3..9b19fd6 100644 --- a/demo/src/main/java/com/example/demo/order/controller/showController.java +++ b/demo/src/main/java/com/example/demo/order/controller/showController.java @@ -6,6 +6,8 @@ import com.example.demo.bean.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -17,12 +19,13 @@ import java.util.List; 打印出所以的订单 */ -@Controller +//@Controller +@RestController public class showController extends HttpServlet { @Autowired com.example.demo.Dao.auditMapper auditMapper; - @RequestMapping("/order")//订单浏览的界面 + @RequestMapping(value="/order",method = RequestMethod.POST)//订单浏览的界面 public List doPost(HttpServletResponse response, HttpServletRequest request){ HttpSession session=request.getSession(); User user=new User(); diff --git a/demo/src/main/java/com/example/demo/order/controller/unCompController.java b/demo/src/main/java/com/example/demo/order/controller/unCompController.java new file mode 100644 index 0000000..bd0d8df --- /dev/null +++ b/demo/src/main/java/com/example/demo/order/controller/unCompController.java @@ -0,0 +1,27 @@ +package com.example.demo.order.controller; + +import com.example.demo.bean.Audit; +import com.example.demo.bean.User; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.util.List; + +@RestController +public class unCompController { + @Autowired + com.example.demo.Dao.auditMapper auditMapper; + + @RequestMapping(value="/unfinished",method = RequestMethod.POST)//已经完成的订单浏览的界面 + public List doPost(HttpServletResponse response, HttpServletRequest request){ + HttpSession session=request.getSession(); + User user=new User(); + user=(User)session.getAttribute("user"); + return auditMapper.selectByNumUnfinshed(user.getUserNum()); + } +}