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

@@ -22,6 +22,16 @@ public class ProjectPlanWeekly extends DataEntity<ProjectPlanWeekly> {
     private String projectUserId;//项目负责人id
     private String principalUserName;//负责人名称
 
+    private String btnAgent;//按钮控制
+
+    public String getBtnAgent() {
+        return btnAgent;
+    }
+
+    public void setBtnAgent(String btnAgent) {
+        this.btnAgent = btnAgent;
+    }
+
     public String getOfficeId() {
         return officeId;
     }

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

@@ -7,6 +7,7 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectplanweekly.entity.ProjectPlanWeekly;
 import com.jeeplus.modules.projectplanweekly.service.ProjectPlanWeeklyService;
+import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -52,7 +53,7 @@ public class ProjectPlanWeeklyController extends BaseController {
             projectPlanWeekly.setEndDate(sundayDate);
         }
         Page<ProjectPlanWeekly> page = projectPlanWeeklyService.findPageWeekly(new Page<ProjectPlanWeekly>(request,response),projectPlanWeekly);
-        List<ProjectPlanWeekly> list = page.getList();
+        getBtnAgent(page.getList());
         model.addAttribute("page", page);
         model.addAttribute("weeklyStatus", projectPlanWeekly.getWeeklyStatus());
         model.addAttribute("beginDate", projectPlanWeekly.getBeginDate());
@@ -84,13 +85,15 @@ public class ProjectPlanWeeklyController extends BaseController {
     public String view(ProjectPlanWeekly projectPlanWeekly, HttpServletRequest request,Model model){
         if (null!=projectPlanWeekly&&!projectPlanWeekly.getProjectId().equals("")){
             ProjectPlanWeekly planWeekly = projectPlanWeeklyService.getPlanWeekly(projectPlanWeekly.getId());
-            planWeekly.setUser(UserUtils.getUser());
-            planWeekly.setOffice(UserUtils.getUser().getOffice());
+            User byUserId = UserUtils.getByUserId(planWeekly.getCreateBy().getId());
+            planWeekly.setUser(byUserId);
+            planWeekly.setOffice(byUserId.getOffice());
             model.addAttribute("projectPlanWeekly", planWeekly);
         }else {
             ProjectPlanWeekly projectPlanWeeklyUpdate = projectPlanWeeklyService.get(projectPlanWeekly.getId());
-            projectPlanWeeklyUpdate.setUser(UserUtils.getUser());
-            projectPlanWeeklyUpdate.setOffice(UserUtils.getUser().getOffice());
+            User byUserId = UserUtils.getByUserId(projectPlanWeeklyUpdate.getCreateBy().getId());
+            projectPlanWeeklyUpdate.setUser(byUserId);
+            projectPlanWeeklyUpdate.setOffice(byUserId.getOffice());
             model.addAttribute("projectPlanWeekly", projectPlanWeeklyUpdate);
         }
         return "modules/projectplanweekly/projectPlanWeeklyView";
@@ -169,4 +172,18 @@ public class ProjectPlanWeeklyController extends BaseController {
         }
         return "redirect:"+ Global.getAdminPath()+"/projectplan/weekly/?repage";
     }
+
+    //设置按钮权限
+    public void getBtnAgent(List<ProjectPlanWeekly> list){
+        String id = UserUtils.getUser().getId();//获取当前登录人id
+        for (ProjectPlanWeekly projectPlanWeekly:list){
+            if (null == projectPlanWeekly.getProjectId() || projectPlanWeekly.getProjectId().equals("")){
+                if (projectPlanWeekly.getCreateBy().getId().equals(id)){
+                    projectPlanWeekly.setBtnAgent("0");
+                }
+            }else {
+                projectPlanWeekly.setBtnAgent("1");
+            }
+        }
+    }
 }

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">
@@ -57,9 +57,9 @@
 		i.remarks_status AS "remarksStatus",
 		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
+		r.project_name AS "projectRecords.projectName",
+	  	i.company_id as "company.id",
+	  	i.office_id as "office.id"
 	</sql>
 
 	<select id="get" resultType="com.jeeplus.modules.projectplanweekly.entity.ProjectPlanWeekly" >
@@ -362,11 +362,27 @@
 		WHERE id = #{id}
 	</update>
 
-	<update id="sureWeeklyInfo">
+    <update id="sureWeeklyInfo">
 		UPDATE project_plan_info SET
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			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/projectPlanWeeklyForm.jsp

@@ -80,7 +80,7 @@
         <form:form id="inputForm" modelAttribute="projectPlanWeekly" action="${ctx}/projectplan/weekly/save" method="post" class="form-horizontal" >
             <form:hidden path="id"/>
             <div class="form-group layui-row first">
-                <div class="form-group-label"><h2>个人周报</h2></div>
+                <div class="form-group-label"><h2>周报信息</h2></div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>创建人：</label>
                     <div class="layui-input-block">

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

@@ -256,6 +256,8 @@
                         }
                         return xml;
                     }}
+                ,{field:'createBy',align:'center', title: '负责人',width:100}
+                ,{field:'createDate',align:'center', title: '创建日期',width:100}
                 ,{field:'beginDate',align:'center', title: '开始日期',width:100}
                 ,{field:'endDate',align:'center', title: '结束日期',width:100}
                 ,{align:'center',width:100, title: '状态' ,templet:function(d){
@@ -280,15 +282,13 @@
                         var xml="";
                         if(d.weeklyStatus != undefined && d.weeklyStatus =="0")
                         {
-                            if (d.projectId == undefined || d.projectId == ''){
+                            if (d.btnAgent != undefined && d.btnAgent == '0'){
                                 xml+="<a href=\"#\" onclick=\"openDialog('修改周报信息', '${ctx}/projectplan/weekly/form?id=" + d.id +"','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            	xml+="<a href=\"${ctx}/projectplan/weekly/sureWeeklyStatus?id=" + d.id + "&projectId="+d.projectId+"\" onclick=\"return confirmx('确认要完成该工作计划吗？', this.href)\" class=\"op-btn op-btn-op-btn-revert\" style=\"color: white;background: darkseagreen\"><i class=\"fa fa-check\"></i>确认完成</a>";
+                            	xml+="<a href=\"#\" onclick=\"weeklyText('" + d.id+"','"+d.projectId+"')\" class=\"op-btn op-btn-op-btn-revert\" style=\"color: white;background: #ffa44e\" ><i class=\"fa fa-plus-square-o\"></i> 备注</a>";
+                            	xml+="<a href=\"${ctx}/projectplan/weekly/delete?id=" + d.id + "&projectId="+d.projectId+"\" onclick=\"return confirmx('确认要删除该计划信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
                             }
-                            // xml+="<a href=\"#\" onclick=\"weeklySure('" + d.id+"','"+d.projectId+"')\" class=\"op-btn op-btn-op-btn-revert\" style=\"color: white;background: darkseagreen\"><i class=\"fa fa-check\"></i> 确认完成</a>";
-                            xml+="<a href=\"${ctx}/projectplan/weekly/sureWeeklyStatus?id=" + d.id + "&projectId="+d.projectId+"\" onclick=\"return confirmx('确认要完成该工作计划吗？', this.href)\" class=\"op-btn op-btn-op-btn-revert\" style=\"color: white;background: darkseagreen\"><i class=\"fa fa-check\"></i>确认完成</a>";
-                            xml+="<a href=\"#\" onclick=\"weeklyText('" + d.id+"','"+d.projectId+"')\" class=\"op-btn op-btn-op-btn-revert\" style=\"color: white;background: #ffa44e\" ><i class=\"fa fa-plus-square-o\"></i> 备注</a>";
-                            xml+="<a href=\"${ctx}/projectplan/weekly/delete?id=" + d.id + "&projectId="+d.projectId+"\" onclick=\"return confirmx('确认要删除该计划信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
-                            // xml+="<a href='javascript:void(0)' class='op-btn  op-btn-edit' title='备注' onclick='projectText()'><i class='fa fa-edit'></i>备注</a>";
-                        }
+						}
                         return xml;
 
                     }}
@@ -301,12 +301,15 @@
                     "index":"${index.index+1}"
                     ,"id":"${projectPlanWeekly.id}"
                     ,"remarks":"${projectPlanWeekly.remarks}"
+					,"createBy":"${projectPlanWeekly.createBy.id}"
+					,"createDate":"<fmt:formatDate value="${projectPlanWeekly.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"beginDate":"<fmt:formatDate value="${projectPlanWeekly.beginDate}" pattern="yyyy-MM-dd"/>"
                     ,"endDate":"<fmt:formatDate value="${projectPlanWeekly.endDate}" pattern="yyyy-MM-dd"/>"
                     ,"weeklyStatus":"${projectPlanWeekly.weeklyStatus}"
                     ,"projectId":"${projectPlanWeekly.projectRecords.id}"
                     ,"projectName":"${projectPlanWeekly.projectRecords.projectName}"
                     ,"remarksReason":"${projectPlanWeekly.remarksReason}"
+					,"btnAgent":"${projectPlanWeekly.btnAgent}"
                 }
                 </c:forEach>
                 </c:if>

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

@@ -80,7 +80,7 @@
         <form:form id="inputForm" modelAttribute="projectPlanWeekly" action="${ctx}/projectplan/weekly/save" method="post" class="form-horizontal" >
             <form:hidden path="id"/>
             <div class="form-group layui-row first">
-                <div class="form-group-label"><h2>个人周报</h2></div>
+                <div class="form-group-label"><h2>周报信息</h2></div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>创建人：</label>
                     <div class="layui-input-block">