蔡德晨 5 лет назад
Родитель
Сommit
3db7877464

+ 4 - 8
src/main/java/com/jeeplus/modules/sg/project/mapper/xml/ItemMapper.xml

@@ -16,26 +16,20 @@
 		a.parent_node AS "parentNode",
 		a.type AS "type"
 	</sql>
-	
-	<!--<sql id="infoJoins">-->
-		<!---->
-		<!--LEFT JOIN test_category category ON category.id = a.category_id-->
-	<!--</sql>-->
+
 	
     
 	<select id="get" resultType="WbsItem" >
 		SELECT 
 			<include refid="infoColumns"/>
 		FROM sg_wbs_item a
 		WHERE a.id = #{id}
 	</select>
 	
-	<select id="findList" resultType="WbsItem" parameterType="WbsSelection">
+	<select id="findList" resultType="WbsItem" parameterType="com.jeeplus.modules.sg.project.entity.WbsSelection">
 		SELECT 
 			<include refid="infoColumns"/>
 		FROM sg_wbs_item a
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
@@ -49,10 +43,10 @@
 				AND a.unit= #{unit}
 			</if>
 			<if test="itemStartDate != null and itemEndDate != ''">
-				AND a.create_date >= #{itemStartDate}
+				AND a.create_date &gt;= #{itemStartDate}
 			</if>
 			<if test="itemEndDate != null and itemEndDate != ''">
-				AND a.create_date <= #{itemEndDate}
+				AND a.create_date &lt;= #{itemEndDate}
 			</if>
 		</where>
 		<choose>
@@ -69,7 +63,6 @@
 		SELECT 
 			<include refid="infoColumns"/>
 		FROM sg_wbs_item a
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}

+ 4 - 10
src/main/java/com/jeeplus/modules/sg/project/mapper/xml/ProjectMapper.xml

@@ -14,26 +14,18 @@
 		a.number AS "number",
 		a.parent_node AS "parentNode"
 	</sql>
-	
-	<!--<sql id="infoJoins">-->
-		<!---->
-		<!--LEFT JOIN test_category category ON category.id = a.category_id-->
-	<!--</sql>-->
-	
-    
+
 	<select id="get" resultType="WbsProject" >
 		SELECT 
 			<include refid="infoColumns"/>
 		FROM sg_wbs_project a
 		WHERE a.id = #{id}
 	</select>
 	
-	<select id="findList" resultType="WbsProject" parameterType="WbsSelection" >
+	<select id="findList" resultType="WbsProject" parameterType="com.jeeplus.modules.sg.project.entity.WbsSelection" >
 		SELECT 
 			<include refid="infoColumns"/>
 		FROM sg_wbs_project a
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
@@ -44,10 +36,10 @@
 				AND a.update_by= #{updateBy.id}
 			</if>
 			<if test="projectStartDate != null and projectEndDate != ''">
-				AND a.create_date >= #{projectStartDate}
+				AND a.create_date &gt;= #{projectStartDate}
 			</if>
 			<if test="projectEndDate != null and projectEndDate != ''">
-				AND a.create_date <= #{projectEndDate}
+				AND a.create_date &lt;= #{projectEndDate}
 			</if>
 		</where>
 		<choose>
@@ -64,7 +56,6 @@
 		SELECT 
 			<include refid="infoColumns"/>
 		FROM sg_wbs_project a
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}