Antiloveg 8 years ago
parent
commit
2aac73e8ea

+ 2 - 2
src/main/java/com/goafanti/common/mapper/ContractMapper.xml

@@ -450,7 +450,7 @@
    from contract c 
 	  where c.deleted_sign = 0  
 	  <if test="serialNumber !=null">
-	    and c.serialNumber = #{serialNumber,jdbcType=INTEGER}
+	    and c.serial_number = #{serialNumber,jdbcType=INTEGER}
 	  </if>
 	  <if test="id !=null">
 	    and c.id = #{id,jdbcType=VARCHAR}
@@ -482,7 +482,7 @@
    from contract c 
 	  where c.deleted_sign = 0  
 	  <if test="serialNumber !=null">
-	    and c.serialNumber = #{serialNumber,jdbcType=INTEGER}
+	    and c.serial_number = #{serialNumber,jdbcType=INTEGER}
 	  </if>
 	  <if test="id !=null">
 	    and c.id = #{id,jdbcType=VARCHAR}

+ 3 - 0
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -783,6 +783,9 @@
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
   	order by d.serial_number desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
   </select>
   
   <select id="findDemandCount" parameterType="String" resultType="java.lang.Integer">

+ 2 - 0
src/main/java/com/goafanti/demand/controller/DemandApiController.java

@@ -3,6 +3,7 @@ package com.goafanti.demand.controller;
 import javax.annotation.Resource;
 
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.goafanti.common.bo.Result;
@@ -18,6 +19,7 @@ public class DemandApiController {
 	/**
 	 * 用户需求列表
 	 */
+	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	public Result list(Integer serialNumber, String name, String keyword, Integer demandType,
 			String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
 			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, String pageNo,