项目计划

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectPlanService.java

@@ -61,8 +61,8 @@ public class ProjectPlanService extends CrudService<ProjectPlanDao, ProjectPlanI
             User userF = dao.getUserId(projectPlanInfo.getFinishName());
             projectPlanInfo.setFinishName(userF.getId());
             //根据项目类型查询typeId
-            String projectTypeId = dao.getProjectTypeName(projectPlanInfo.getProjectStage(),projectRecords.getProjectTypeId());
-            projectPlanInfo.setProjectStage(projectTypeId);
+            /*String projectTypeId = dao.getProjectTypeName(projectPlanInfo.getProjectStage(),projectRecords.getProjectTypeId());
+            projectPlanInfo.setProjectStage(projectTypeId);*/
             //将提醒人信息进行去重
             masterIdSet.add(userR.getId());
 

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectPlanController.java

@@ -16,7 +16,11 @@ import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.service.ProjectImplementEarlyService;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
@@ -50,19 +54,22 @@ public class ProjectPlanController extends BaseController {
     private ProjectRecordsService projectRecordsService;
 
     @Autowired
+    private RuralProjectRecordsService ruralProjectRecordsService;
+
+    @Autowired
     private ProjectPlanService projectPlanService;
 
     @Autowired
     private WorkProjectUserDao workProjectUserDao;
 
     @ModelAttribute
-    public ProjectRecords get(@RequestParam(required=false) String id) {
-        ProjectRecords entity = null;
+    public RuralProjectRecords get(@RequestParam(required=false) String id) {
+        RuralProjectRecords entity = null;
         if (StringUtils.isNotBlank(id)){
-            entity = projectRecordsService.get(id);
+            entity = ruralProjectRecordsService.get(id);
         }
         if (entity == null){
-            entity = new ProjectRecords();
+            entity = new RuralProjectRecords();
         }
         return entity;
     }
@@ -72,19 +79,19 @@ public class ProjectPlanController extends BaseController {
      */
     @RequiresPermissions("project:projectPlan:list")
     @RequestMapping(value = {"list", ""})
-    public String list(ProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
+    public String list(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
         projectRecords.setProjectStatus(5);
         //查询已审核通过的项目信息
-        Page<ProjectRecords> page = projectRecordsService.findPage(new Page<ProjectRecords>(request, response), projectRecords);
+        Page<RuralProjectRecords> page = ruralProjectRecordsService.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称，并将委托方信息添加到数据中
-        List<ProjectRecords> list = page.getList();
+        List<RuralProjectRecords> list = page.getList();
         for (int i = 0; i < list.size(); i++) {
-            ProjectRecords records1 = list.get(i);
+            RuralProjectRecords records1 = list.get(i);
             if (records1.getWorkContractInfo() == null) {
-                projectRecordsService.queryLinkmanInfos(records1);
+                ruralProjectRecordsService.queryLinkmanInfos(records1);
                 if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
                     WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
                     WorkContractInfo contractInfo = new WorkContractInfo();
@@ -92,29 +99,11 @@ public class ProjectPlanController extends BaseController {
                     records1.setWorkContractInfo(contractInfo);
                 }
             }
-            Set masterIdSet = new HashSet();
-            //将项目的项目负责人id进行去重处理
-            for (User masterUser:records1.getProjectLeaders()) {
-                masterIdSet.add(masterUser.getId());
-            }
-
-
-            //查询项目组成员信息
-            List<User> members = workProjectUserDao.isDelFalg(records1.getId(), "");
-            records1.setProjectMembers(members);
-            records1.setMemberNameStr(Collections3.extractToString(members, "name", ","));
-            records1.setMemberIds(Collections3.extractToString(members, "id", ","));
-
-            //Set转List
-            List<String> masterIdList = new ArrayList<>(masterIdSet);
-            //如果当前登录人为项目登记者或项目负责人则允许其添加子节点信息
-            for (String masterId : masterIdList) {
-                if(masterId.equals(UserUtils.getUser().getId())){
-                    records1.setOperationSign(1);
-                    break;
-                }else{
-                    records1.setOperationSign(0);
-                }
+            //判断是否为admin
+            if (UserUtils.isManager()){
+                records1.setFlagAdmin("1");
+            }else{
+                records1.setFlagAdmin("0");
             }
         }
         model.addAttribute("page", page);
@@ -122,7 +111,7 @@ public class ProjectPlanController extends BaseController {
     }
 
     @RequestMapping(value = {"form"})
-    public String form(ProjectRecords projectRecords, Model model) {
+    public String form(RuralProjectRecords projectRecords, Model model) {
         boolean flag = false;
         //判断是否为查看信息操作
         if("view".equals(projectRecords.getView())){
@@ -131,25 +120,33 @@ public class ProjectPlanController extends BaseController {
         //获取项目信息
         //如果没有id则为新增 添加创建人信息和当前创建时间信息
         if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
-            projectRecords = projectRecordsService.get(projectRecords.getId());
+            projectRecords = ruralProjectRecordsService.get(projectRecords.getId());
         }else {
             projectRecords.setCreateBy(UserUtils.getUser());
             projectRecords.setCreateDate(new Date());
         }
 
-        //获取项目计划通知栏中的项目类型信息
-        List<ProjectType> projectTypeList = projectRecordsService.getProjectType(projectRecords.getProjectTypeId());
         ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
         //将项目id放入项目计划表中
         projectPlanInfo.setProjectId(projectRecords.getId());
         //获取项目计划信息
         List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+        if(projectPlanList.size() == 0 && !flag){
+            //获取项目计划信息
+            List<MainDictDetail> mainDictList = DictUtils.getMainDictList("projectPlan");
+            if(mainDictList.size()>0){
+                for (MainDictDetail mainDict : mainDictList) {
+                    ProjectPlanInfo projectPlan = new ProjectPlanInfo();
+                    projectPlan.setProjectStage(mainDict.getLabel());
+                    projectPlanList.add(projectPlan);
+                }
+            }
+        }
         //获取 项目计划附件信息
         List<WorkClientAttachment> workAttachmentList = projectPlanService.getWorkAttachment(projectRecords.getId());
         projectRecords.setProjectPlanList(projectPlanList);
         projectRecords.setWorkAttachments(workAttachmentList);
         model.addAttribute("projectRecords", projectRecords);
-        model.addAttribute("projectTypeList", projectTypeList);
         if(flag){
             return "modules/projectrecord/plan/projectPlanView";
         }
@@ -162,8 +159,9 @@ public class ProjectPlanController extends BaseController {
     @RequiresPermissions(value={"project:projectPlan:add","project:projectPlan:edit"})
     @RequestMapping(value = "save")
     public String save(ProjectRecords projectRecords, Model model, RedirectAttributes redirectAttributes) throws Exception{
-
-        projectPlanService.saveProjectPlanInfo(projectRecords);//保存
+        ProjectRecords ProjectRecord = ruralProjectRecordsService.getProjectRecords(projectRecords.getId());
+        MyBeanUtils.copyBeanNotNull2Bean(projectRecords, ProjectRecord);//将编辑表单中的非NULL值覆盖数据库记录中的值
+        projectPlanService.saveProjectPlanInfo(ProjectRecord);//保存
         addMessage(redirectAttributes, "保存项目计划成功");
         return "redirect:"+ Global.getAdminPath()+"/project/projectPlan/?repage";
     }

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordsDao.java

@@ -5,6 +5,7 @@ package com.jeeplus.modules.ruralprojectrecords.dao;
 
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordReportInfo;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 
@@ -56,4 +57,11 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
      * @return
      */
     Integer findPageCount(RuralProjectRecords records);
+
+    /**
+     * 根据id查新项目信息
+     * @param id
+     * @return
+     */
+    ProjectRecords getProjectRecords(String id);
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.ActEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
+import com.jeeplus.modules.projectrecord.entity.ProjectPlanInfo;
 import com.jeeplus.modules.sys.entity.Area;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
@@ -77,6 +78,8 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String officeName;
 	private String flagAdmin;
 	private String reportedState;   //上报状态
+	private String view;
+	private List<ProjectPlanInfo> projectPlanList= Lists.newArrayList();;//项目计划信息
 
 	public String getPrrId() {
 		return prrId;
@@ -719,4 +722,20 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setReportedState(String reportedState) {
 		this.reportedState = reportedState;
 	}
+
+	public List<ProjectPlanInfo> getProjectPlanList() {
+		return projectPlanList;
+	}
+
+	public void setProjectPlanList(List<ProjectPlanInfo> projectPlanList) {
+		this.projectPlanList = projectPlanList;
+	}
+
+	public String getView() {
+		return view;
+	}
+
+	public void setView(String view) {
+		this.view = view;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -17,6 +17,7 @@ import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectClientLinkmanDao;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsDao;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralWorkProjectUserDao;
@@ -115,6 +116,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	public RuralProjectRecords get(String id) {
 		return super.get(id);
 	}
+	public ProjectRecords getProjectRecords(String id) {
+		return dao.getProjectRecords(id);
+	}
 	public RuralProjectRecords getQueryProjectUsers(String id) {
 		RuralProjectRecords projectRecords = super.get(id);
 		List<User> users = workProjectUserDao.queryProjectUsers(projectRecords.getId(), "1");
@@ -182,6 +186,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
 			} else if("2".equals(projectRecords.getProjectType())){//判断查询为造价审核信息
 				dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_COST_WORK_RECORDS.getValue());
+			}else{
+				dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
 			}
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
 			projectRecords.getSqlMap().put("delFlag", "AND a.del_flag = 0");

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1185,16 +1185,8 @@ public class WorkProjectNotifyController extends BaseController {
 				} else if (workProjectNotify.getType().equals("131")) {    //项目计划通知
 					boolean flag = false;
 					//通过通知信息id获取项目登记对象
-					ProjectRecords projectRecords = projectRecordsService.get(workProjectNotify.getNotifyId());
-					//获取项目信息
-					if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
-						projectRecords = projectRecordsService.get(projectRecords.getId());
-					}else {
-						projectRecords.setCreateBy(UserUtils.getUser());
-						projectRecords.setCreateDate(new Date());
-					}
+					RuralProjectRecords projectRecords = ruralProjectRecordsService.get(workProjectNotify.getNotifyId());
 
-					List<ProjectType> projectTypeList = projectRecordsService.getProjectType(projectRecords.getProjectTypeId());
 					ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
 					projectPlanInfo.setProjectId(projectRecords.getId());
 					projectPlanInfo.setLoginId(UserUtils.getUser().getId());
@@ -1205,7 +1197,6 @@ public class WorkProjectNotifyController extends BaseController {
 					projectRecords.setProjectPlanList(projectPlanList);
 					projectRecords.setWorkAttachments(workAttachmentList);
 					model.addAttribute("projectRecords", projectRecords);
-					model.addAttribute("projectTypeList", projectTypeList);
 					return "modules/projectrecord/plan/projectPlanView";
 
 				}

src/main/resources/mappings/modules/projectrecord/ProjectPlanDao.xml

@@ -89,7 +89,7 @@
 		a.del_flag AS "delFlag",
 		a.remarks AS "remarks",
 		a.project_id as projectId,
-		pt.type_name as projectStage,
+		a.project_stage as projectStage,
 		DATE_FORMAT(a.begin_date,'%Y-%m-%d') as beginDate,
 		DATE_FORMAT(a.end_date,'%Y-%m-%d') as endDate,
 		sur.name as remindName,

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -65,6 +65,19 @@
         LEFT JOIN sys_office o ON o.id = a.office_id
 		WHERE a.id = #{id}
 	</select>
+
+
+	<select id="getProjectRecords" resultType="ProjectRecords" >
+		SELECT
+			<include refid="projectRecordsColumns"/>
+        ,su.name AS "createBy.name"
+        ,o.top_company AS "office.name"
+        FROM rural_project_records a
+        <include refid="projectRecordsJoins"/>
+        LEFT JOIN sys_user su ON su.id = a.create_by
+        LEFT JOIN sys_office o ON o.id = a.office_id
+		WHERE a.id = #{id}
+	</select>
 	
 	<select id="findList" resultType="RuralProjectRecords" >
 		SELECT

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanForm.jsp

@@ -224,29 +224,24 @@
                                         <input id="projectPlanList{{idx}}_costNum" name="projectPlanList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <input id="projectPlanList{{idx}}_projectStage" name="projectPlanList[{{idx}}].projectStage" list ="num" value="{{row.projectStage}}" class="form-control required datetime"/>
-                                        <datalist id ="num" >
-                                            <c:forEach items="${projectTypeList}" var="projectType">
-                                                <option>${projectType.typeName}</option>
-                                            </c:forEach>
-                                        </datalist>
+                                        <input id="projectPlanList{{idx}}_projectStage" readonly="true" name="projectPlanList[{{idx}}].projectStage" list ="num" value="{{row.projectStage}}" class="form-control required"/>
                                     </td>
 
-                        <td>
-                            <input lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_beginDate" name="projectPlanList[{{idx}}].beginDate" type="text" value="{{row.beginDate}}"  class="form-control required datetime"/>
-                        </td>
-                        <td>
-                            <input lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_endDate" name="projectPlanList[{{idx}}].endDate" type="text" value="{{row.endDate}}"  class="form-control required datetime"/>
-                        </td>
+                                    <td>
+                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_beginDate" name="projectPlanList[{{idx}}].beginDate" type="text" value="{{row.beginDate}}"  class="form-control required datetime"/>
+                                    </td>
+                                    <td>
+                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_endDate" name="projectPlanList[{{idx}}].endDate" type="text" value="{{row.endDate}}"  class="form-control required datetime"/>
+                                    </td>
 
                                     <td>
                                         <sys:treeselecttPlanUser id="projectPlanList{{idx}}_remindName" name="remindName" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].remindName" labelValue="{{row.remindName}}"
-                                         title="用户" url="/sys/office/treeDataByPlan?type=3&projectId=${projectRecords.id}" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                         title="用户" url="/sys/office/treeDataByPlan?type=3&projectId=${projectRecords.id}" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 
                                     <td>
                                         <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="finishName" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"
-                                         title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanList.jsp

@@ -138,7 +138,7 @@
 	<div class="layui-row">
 		<div class="full-width fl">
 			<div class="layui-row contentShadow shadowLR" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="projectRecords" action="${ctx}/project/projectPlan/" method="post" class="form-inline">
+				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/project/projectPlan/" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
@@ -228,11 +228,9 @@
 				// {checkbox: true, fixed: true},
 				{field:'index',align:'center', title: '序号',width:40}
 				,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
-					}}
-				,{field:'projId',align:'center', title: '项目编号',minWidth:150,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.projId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
 					}}
+				,{field:'projId',align:'center', title: '项目编号',minWidth:150}
 				,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						if(null == d.contract || '' == d.contract){
 							return "<span style=\"color:red\" title='无合同'>无合同</span>";
@@ -253,9 +251,10 @@
 						if(d.canedit3 != undefined && d.canedit3 =="1")
 						{
 							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/project/projectPlan/form?view=view&id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-search-plus\"></i> 详情</a>";
-							if(d.operationSign ==1){
-								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlan/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 编辑</a>";
-							}
+						}
+						if(d.canedit4 != undefined && d.canedit4 =="1")
+						{
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlan/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 编辑</a>";
 						}
 						return xml;
 
@@ -276,8 +275,10 @@
 					,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
 					,"projectStatus":"${projectRecords.projectStatus}"
 					,"procId":"${projectRecords.processInstanceId}"
-					,"operationSign":"${projectRecords.operationSign}"
-					<shiro:hasPermission name="project:projectRecords:edit">,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && fn:contains(projectRecords.memberIds,fns:getUser().id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
+					<shiro:hasPermission name="project:projectPlan:edit">
+						,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+						,"canedit4":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+					</shiro:hasPermission>
 				}
 				</c:forEach>
 				</c:if>

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyList.jsp

@@ -371,7 +371,7 @@
 						<div class="layui-input-block">
 							<form:select id="type" path="type" class="form-control simple-select">
 								<form:option value="" label=""/>
-								<form:options items="${fns:getDictList('project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								<form:options items="${fns:getDictList('new_project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 							</form:select>
 						</div>
 					</div>