Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectplanweekly/dao/ProjectPlanWeeklyDao.java

@@ -22,4 +22,8 @@ public interface ProjectPlanWeeklyDao extends CrudDao<ProjectPlanWeekly> {
     public Integer sureWeeklyInfo(ProjectPlanWeekly projectPlanWeekly);
 
     public ProjectPlanWeekly getPlanWeekly(String id);
+
+    public Integer deleteWeekly(ProjectPlanWeekly projectPlanWeekly);
+
+    public Integer deleteWeeklyInfo(ProjectPlanWeekly projectPlanWeekly);
 }

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

@@ -44,20 +44,11 @@ public class ProjectPlanWeekly extends DataEntity<ProjectPlanWeekly> {
 
     private User user;
     private Office office;
-    private Office company;
 
     public String getCompanyId() {
         return companyId;
     }
 
-    public Office getCompany() {
-        return company;
-    }
-
-    public void setCompany(Office company) {
-        this.company = company;
-    }
-
     public Office getOffice() {
         return office;
     }

src/main/java/com/jeeplus/modules/projectplanweekly/service/ProjectPlanWeeklyService.java

@@ -130,11 +130,23 @@ public class ProjectPlanWeeklyService extends CrudService<ProjectPlanWeeklyDao,
         projectPlanWeekly.preUpdate();
         projectPlanWeeklyDao.sureWeekly(projectPlanWeekly);
     }
+
     //修改周报表状态
     @Transactional(readOnly = false)
     public void sureWeeklyInfo(ProjectPlanWeekly projectPlanWeekly){
         projectPlanWeekly.preUpdate();
         projectPlanWeeklyDao.sureWeeklyInfo(projectPlanWeekly);
     }
+    //删除周报
+    @Transactional(readOnly = false)
+    public void deleteWeekly(ProjectPlanWeekly projectPlanWeekly){
+        projectPlanWeekly.preUpdate();
+        projectPlanWeeklyDao.deleteWeekly(projectPlanWeekly);
+    }
+    @Transactional(readOnly = false)
+    public void deleteWeeklyInfo(ProjectPlanWeekly projectPlanWeekly){
+        projectPlanWeekly.preUpdate();
+        projectPlanWeeklyDao.deleteWeeklyInfo(projectPlanWeekly);
+    }
 
 }

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

@@ -138,10 +138,8 @@ public class ProjectPlanWeeklyController extends BaseController {
     }
 
     //确认完成周报
-    @ResponseBody
     @RequestMapping("/sureWeeklyStatus")
-    public AjaxJson getSureWeeklyStatus(ProjectPlanWeekly projectPlanWeekly){
-        AjaxJson ajaxJson = new AjaxJson();
+    public String getSureWeeklyStatus(ProjectPlanWeekly projectPlanWeekly){
         projectPlanWeekly.setWeeklyStatus("1");
         projectPlanWeekly.setRemarksReason("");
         try {
@@ -150,14 +148,25 @@ public class ProjectPlanWeeklyController extends BaseController {
             }else {
                 projectPlanWeeklyService.sureWeeklyInfo(projectPlanWeekly);
             }
-            ajaxJson.setSuccess(true);
-            ajaxJson.setMsg("确认完成成功");
-            return ajaxJson;
         }catch (Exception e){
             e.printStackTrace();
         }
-        ajaxJson.setSuccess(false);
-        ajaxJson.setMsg("确认完成失败");
-        return ajaxJson;
+        return "redirect:"+ Global.getAdminPath()+"/projectplan/weekly/?repage";
+    }
+
+    //确认完成周报
+    @RequestMapping("/delete")
+    public String deleteFlag(ProjectPlanWeekly projectPlanWeekly){
+        projectPlanWeekly.setDelFlag("1");
+        try {
+            if (projectPlanWeekly.getProjectId().equals("")){
+                projectPlanWeeklyService.deleteWeekly(projectPlanWeekly);
+            }else {
+                projectPlanWeeklyService.deleteWeeklyInfo(projectPlanWeekly);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return "redirect:"+ Global.getAdminPath()+"/projectplan/weekly/?repage";
     }
 }

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

@@ -97,21 +97,21 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">开始时间：</label>
                     <div class="layui-input-block">
-                        <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date required layui-input"
+                        <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layui-input layer-date laydate-icon required"
                                value="<fmt:formatDate value="${projectPlanWeekly.beginDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">结束时间：</label>
                     <div class="layui-input-block">
-                        <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date required layui-input"
+                        <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layui-input layer-date laydate-icon required"
                                value="<fmt:formatDate value="${projectPlanWeekly.endDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12  with-textarea">
                     <label class="layui-form-label">周报内容：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="remarks"  htmlEscape="false" rows="5"    maxlength="127" class="form-control"/>
+                        <form:textarea path="remarks"  htmlEscape="false" rows="5"    maxlength="127" class="form-control required"/>
                     </div>
                 </div>
             </div>

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

@@ -283,8 +283,10 @@
                             if (d.projectId == undefined || d.projectId == ''){
                                 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=\"#\" 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=\"#\" 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;