周报

src/main/resources/mappings/modules/projectplanweekly/ProjectPlanWeeklyDao.xml

@@ -38,8 +38,8 @@
 		a.remarks_reason AS "remarksReason",
 		a.project_id AS "projectRecords.id",
 		r.project_name AS "projectRecords.projectName",
-	  	a.company_id as company.id,
-	  	a.office_id as office.id
+	  	a.company_id as "company.id",
+	  	a.office_id as "office.id"
 	</sql>
 
 	<sql id="projectPlan">
@@ -58,8 +58,8 @@
 		i.remarks_reason AS "remarksReason",
 		i.project_id AS "projectRecords.id",
 		r.project_name AS "projectRecords.projectName"
-	  	i.company_id as company.id,
-	  	i.office_id as office.id
+	  	i.company_id as "company.id",
+	  	i.office_id as "office.id"
 	</sql>
 
 	<select id="get" resultType="com.jeeplus.modules.projectplanweekly.entity.ProjectPlanWeekly" >
@@ -256,8 +256,7 @@
 				and a.begin_date >= #{beginDate} and a.begin_date 	&lt;= #{endDate}
 				and a.end_date >= #{endDate}
 			</if>
-			(wpu.user_id = #{currentUser.id} ${sqlMap.dsf}) and
-			r.status = 5 and r.del_flag=0
+
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -301,4 +300,20 @@
 			weekly_status = #{weeklyStatus}
 		WHERE id = #{id}
 	</update>
+
+	<update id="deleteWeekly">
+		UPDATE project_plan_weekly SET
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			del_flag = #{delFlag}
+		WHERE id = #{id}
+	</update>
+
+	<update id="deleteWeeklyInfo">
+		UPDATE project_plan_info SET
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			del_flag = #{delFlag}
+		WHERE id = #{id}
+	</update>
 </mapper>