Browse Source

修改冲突文件

zou_ht 8 years ago
parent
commit
cf94380968
1 changed files with 20 additions and 1 deletions
  1. 20 1
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml

+ 20 - 1
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -1306,7 +1306,26 @@
 	<select id="findPartnerDemandListByPage" parameterType="java.lang.String"
 		resultType="com.goafanti.demand.bo.DemandPartnerListBo">
 		SELECT
-=======
+		id,
+		serial_number AS serialNumber,
+		data_category AS dataCategory,
+		NAME,
+		keyword,
+		release_date AS releaseDate,
+		demand_type AS demandType,
+		validity_period AS validityPeriod,
+		problem_des as problemDes,
+		industry_category_a as industryCategoryA,
+		industry_category_b as
+		industryCategoryB,
+		budget_cost as budgetCost
+		FROM
+		demand
+		WHERE
+		audit_status = 3
+		AND release_status = 1
+		AND deleted_sign = 0
+		AND employer_id = #{employerId,jdbcType=VARCHAR}
 	</if>
   </select>