Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/mappings/modules/projectplanweekly/ProjectPlanWeeklyDao.xml

src/main/java/com/jeeplus/modules/projectplanweekly/entity/ProjectPlanWeekly.java

@@ -43,15 +43,6 @@ public class ProjectPlanWeekly extends DataEntity<ProjectPlanWeekly> {
     }
 
     private ProjectRecords projectRecords;
-    private Office company;
-
-    public Office getCompany() {
-        return company;
-    }
-
-    public void setCompany(Office company) {
-        this.company = company;
-    }
 
     public ProjectRecords getProjectRecords() {
         return projectRecords;

src/main/java/com/jeeplus/modules/projectplanweekly/web/ProjectPlanWeeklyController.java

@@ -55,6 +55,9 @@ public class ProjectPlanWeeklyController extends BaseController {
         Page<ProjectPlanWeekly> page = projectPlanWeeklyService.findPageWeekly(new Page<ProjectPlanWeekly>(request,response),projectPlanWeekly);
         getBtnAgent(page.getList());
         model.addAttribute("page", page);
+        model.addAttribute("weeklyStatus", projectPlanWeekly.getWeeklyStatus());
+        model.addAttribute("beginDate", projectPlanWeekly.getBeginDate());
+        model.addAttribute("endDate", projectPlanWeekly.getEndDate());
         return "modules/projectplanweekly/projectPlanWeeklyList";
     }
 

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,7 +256,8 @@
 				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 != ''">
@@ -300,20 +301,4 @@
 			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>

src/main/webapp/webpage/modules/projectplanweekly/projectPlanWeeklyList.jsp

@@ -181,7 +181,16 @@
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">创建时间：</label>
+							<label class="layui-form-label double-line"><span class="require-item">*</span>任务完成状态：</label>
+							<div class="layui-input-block">
+								<select id="weeklyStatus" name="weeklyStatus" class="form-control simple-select required" lay-verify="">
+									<option value="0" <c:if test="${weeklyStatus eq '0' }">selected</c:if>>未完成</option>
+									<option value="1" <c:if test="${weeklyStatus eq '1' }">selected</c:if>>已完成</option>
+								</select>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">任务计划时间：</label>
 							<div class="layui-input-block">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${beginDate}" pattern="yyyy-MM-dd"/>"/>