项目管理修改功能(管理员修改报告/档案)

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectReportDataDao.java

@@ -131,4 +131,12 @@ public interface ProjectReportDataDao extends CrudDao<ProjectReportData> {
      * @return
      */
     List<RuralReportConsultant> getConsultantList(String projectId);
+
+    /**
+     * 管理员修改项目组成员
+     * 修改报告总审人员
+     * @param projectReportData
+     * @return
+     */
+    Integer updateProjectBzshUserId(ProjectReportData projectReportData);
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportDataService.java

@@ -385,6 +385,10 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 		dao.updateInvalidProcessInstanceId(projectReportData);
 	}
 	@Transactional(readOnly = false)
+	public void updateProjectBzshUserId(ProjectReportData projectReportData) {
+		dao.updateProjectBzshUserId(projectReportData);
+	}
+	@Transactional(readOnly = false)
 	public void insert(ProjectReportData projectReportData) {
 		projectReportData.setCreateDate(new Date());
 		dao.insert(projectReportData);

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

@@ -681,7 +681,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             e.printStackTrace();
             logger.error("Exception e:"+e);
         }
-        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProject().getId());
+        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectOnRural().getId());
         String dictType = projectcontentinfo.getDictType();
         RuralProjectRecords records = ruralProjectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
         info.setProject(records);
@@ -734,11 +734,54 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
     public String adminModifyReport(Projectcontentinfo projectcontentinfo,HistoricalData historicalData) {
         Projectcontentinfo s = new Projectcontentinfo();
         s.setParentIds("0,");
-        s.setProject(projectcontentinfo.getProject());
+        ProjectRecords projectRecords=new ProjectRecords();
+        projectRecords.setId(projectcontentinfo.getProjectOnRural().getId());
+        s.setProject(projectRecords);
         //根据项目id查询相关工作内容信息的数据 并将其存为父级数据
         Projectcontentinfo contentinfo = projectcontentinfoDao.findListByProject(s).get(0);
-        projectcontentinfo.setProjectOnRural(this.getInfo(projectcontentinfo.getProject().getId()));
-        List<Workattachment> attachmentList = projectcontentinfo.getWorkAttachments();
+        //项目登记
+        RuralProjectRecords ruralProjectRecords=ruralProjectRecordsService.get(projectcontentinfo.getProjectOnRural().getId());
+        if(projectcontentinfo.getProjectOnRural()!=null){
+            ruralProjectRecords.setStartDate(projectcontentinfo.getProjectOnRural().getStartDate());
+            ruralProjectRecords.setEndingDate(projectcontentinfo.getProjectOnRural().getEndingDate());
+            //修改项目登记开始工作时间
+            ruralProjectRecordsService.updateDate(ruralProjectRecords);
+        }
+        projectcontentinfo.setProjectOnRural(this.getInfo(projectcontentinfo.getProjectOnRural().getId()));
+        //删除上报咨询员信息
+        projectcontentinfoDao.deleteConsultant(projectcontentinfo.getProjectOnRural().getId());
+        //保存咨询员信息
+        //判定是否是第一个得参数
+        Integer consultantFlag = 0;
+        //判定获取最后一个参数
+        Integer consultantLastFlag = projectcontentinfo.getReportedConsultantList().size()-1;
+        for (int i = 0; i<projectcontentinfo.getReportedConsultantList().size();i++){
+            RuralReportConsultant info = projectcontentinfo.getReportedConsultantList().get(i);
+            if (info.getZixunyuan() == null){
+                continue;
+            }
+            consultantFlag ++;
+            if(1 == consultantFlag){
+                //第一个有效数据为负责人信息，同步到项目表信息中
+                //将项目表中的项目负责人信息修改
+                RuralProjectRecords ruralProjectRecords1 = new RuralProjectRecords();
+                ruralProjectRecords1.setId(ruralProjectRecords.getId());
+                ruralProjectRecords1.setProjectMasterId(info.getZixunyuan());
+                ruralProjectRecordsService.updateProjectMaster(ruralProjectRecords1);
+            }
+            if("技术负责人".equals(info.getRole())){
+                //第一个有效数据为技术负责人信息，同步到报告表信息中
+                //将报告表中的技术负责人信息修改
+                ProjectReportData projectReportData = new ProjectReportData();
+                projectReportData.setId(projectcontentinfo.getProjectReportData().getId());
+                projectReportData.setBzshbUserId(info.getZixunyuan());
+                projectReportDataService.updateProjectBzshUserId(projectReportData);
+            }
+            //添加项目id
+            info.setProjectId(projectcontentinfo.getProjectOnRural().getId());
+            info.preInsert();
+            projectcontentinfoDao.insertConsultant(info);
+        }
         //工作报告
         if (projectcontentinfo.getProjectReportData()!=null){
             //保存工作报告相关数据
@@ -752,14 +795,14 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 projectReportData.setFileStatus("1");
             }
             //修改保存
-            String num = projectReportData.getNumber();
-            if(com.jeeplus.common.utils.StringUtils.isNotBlank(num)){
-                projectReportNumService.updateNum(num);
-            }
+//            String num = projectReportData.getNumber();
+//            if(com.jeeplus.common.utils.StringUtils.isNotBlank(num)){
+//                projectReportNumService.updateNum(num);
+//            }
             projectReportDataService.save(projectReportData);
-            contentinfo.setDictType(projectReportData.getType());
-            contentinfo.setInfoId(projectReportData.getId());
-            projectcontentinfoDao.updateInfoId(contentinfo);
+//            contentinfo.setDictType(projectReportData.getType());
+//            contentinfo.setInfoId(projectReportData.getId());
+//            projectcontentinfoDao.updateInfoId(contentinfo);
         }
         historicalService.save(historicalData);
         return "true";

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -341,6 +341,224 @@ public class RuralCostProjectMessageController extends BaseController {
         model.addAttribute("projectcontentinfo", projectcontentinfo);
         return "modules/ruralprojectrecords/cost/projectcontentinfo/adminReportModifyForm";
     }
+    /**
+     * admin跳转修改报告页面
+     * @param projectcontentinfo
+     * @param request
+     * @param response
+     * @param model
+     * @param attr
+     * @return
+     */
+    @RequestMapping(value = {"adminEditForm"})
+    public String adminEditForm(RuralProjectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        if (null!=projectcontentinfo.getProjectId()){
+            projectRecords = projectRecordsService.get(projectcontentinfo.getProjectId());
+            model.addAttribute("projectRecords", projectRecords);
+        }
+        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
+        if (null ==projectcontentinfo1){
+            model.addAttribute("projectReportData",null);
+            return "modules/ruralprojectrecords/view/reportView";
+        }
+        ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        if (null ==projectReportData){
+            model.addAttribute("projectReportData",null);
+            return "modules/ruralprojectrecords/view/reportView";
+        }
+        projectReportData = projectReportDataService.get(projectReportData.getId());
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
+        Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
+        projectcontent.setProjectReportData(projectReportData);
+        RuralProjectcontentinfo ruralProjectcontentinfo = projectRecordsService.formAccessory(projectRecords);
+        projectRecordsService.disposeData(ruralProjectcontentinfo);
+        projectcontent.setFileAttachmentList(ruralProjectcontentinfo.getFileAttachmentList());
+        projectcontent.setFileGistdataList(ruralProjectcontentinfo.getFileGistdataList());
+        projectcontent.setFileOtherList(ruralProjectcontentinfo.getFileOtherList());
+        //根据条件查询附件必填项
+        ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+        //添加项目类型
+        relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+        relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+        //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+        String money=ruralProjectRecords.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(StringUtils.isBlank(money)){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
+        //添加报告类型
+        relateInfo.setRequiredStage(1);
+        relateInfo.setId(ruralProjectRecords.getId());
+        List<RuralReportConsultant> consultants = Lists.newArrayList();
+        //将自己添加到咨询员数据中
+        //根据用户查询技能信息
+        RuralReportConsultant currentConsultant = new RuralReportConsultant();
+        List<WorkStaffCertificate> userCertificateList = Lists.newArrayList();
+        if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
+            userCertificateList = ruralProjectMessageService.getCertificateByUser(ruralProjectRecords.getProjectMasterId());
+        }
+        //获取专业类型
+        List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
+        for (WorkStaffCertificate certificateInfo: userCertificateList) {
+            currentConsultant.setZhucezigezhID(certificateInfo.getNum());
+            currentConsultant.setZhucezigezhKey(certificateInfo.getName());
+            for (MainDictDetail type : certificateMajor) {
+                if(certificateInfo.getMajor().equals(type.getValue())){
+                    currentConsultant.setMajor(type.getLabel());
+                }
+            }
+            User currentUser=userService.get(ruralProjectRecords.getProjectMasterId());
+            currentConsultant.setZixunyuanName(currentUser.getName());
+            currentConsultant.setZixunyuan(currentUser.getId());
+            currentConsultant.setRole("负责人");
+            consultants.add(currentConsultant);
+        }
+        //查询总审人员信息
+        RuralReportConsultant bzshbConsultant = new RuralReportConsultant();
+        //根据项目id查找报告咨询员信息
+        List<RuralReportConsultant> consultantList = ruralProjectMessageService.getConsultantsList(projectcontentinfo.getProjectId());
+        //使用迭代器去除重复信息
+        //排除 重新申请|撤销
+        Iterator<RuralReportConsultant> it = consultantList.iterator();
+        while(it.hasNext()){
+            RuralReportConsultant consultant = it.next();
+            if(consultant.getZixunyuan().equals(currentConsultant.getZixunyuan())){
+                try {
+                    MyBeanUtils.copyBeanNotNull2Bean(consultant, currentConsultant);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                it.remove();
+            }else{
+                //根据用户查询技能信息
+                List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                for (WorkStaffCertificate certificateInfo: certificateList) {
+                    if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
+                        consultant.setZhucezigezhID(certificateInfo.getNum());
+                    }
+                    for (MainDictDetail type : certificateMajor) {
+                        if(certificateInfo.getMajor().equals(type.getValue())){
+                            consultant.setMajor(type.getLabel());
+                        }
+                    }
+                }
+                User user=userService.get(consultant.getZixunyuan());
+                consultant.setRole("咨询员");
+                consultant.setZixunyuanName(user.getName());
+                if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+                    bzshbConsultant = consultant;
+                    bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
+                    bzshbConsultant.setRole("技术负责人");
+                    it.remove();
+                }
+            }
+        }
+        consultants.addAll(consultantList);
+
+        if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+            consultants.add(bzshbConsultant);
+        }else{
+            //查询总审人员信息
+            bzshbConsultant = new RuralReportConsultant();
+            List<WorkStaffCertificate> bzshbCertificateList = Lists.newArrayList();
+            if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
+                bzshbCertificateList = ruralProjectMessageService.getCertificateByUser(projectReportData.getBzshbUserId());
+            }
+            for (WorkStaffCertificate certificateInfo: bzshbCertificateList) {
+                bzshbConsultant.setZhucezigezhID(certificateInfo.getNum());
+                bzshbConsultant.setZhucezigezhKey(certificateInfo.getName());
+                for (MainDictDetail dictType : certificateMajor) {
+                    if(certificateInfo.getMajor().equals(dictType.getValue())){
+                        bzshbConsultant.setMajor(dictType.getLabel());
+                    }
+                }
+                User bzshbUser=userService.get(projectReportData.getBzshbUserId());
+                bzshbConsultant.setZixunyuanName(bzshbUser.getName());
+                bzshbConsultant.setZixunyuan(bzshbUser.getId());
+                consultants.add(bzshbConsultant);
+            }
+            Iterator<RuralReportConsultant> itView = consultants.iterator();
+            while(itView.hasNext()){
+                RuralReportConsultant consultant = itView.next();
+                if(bzshbCertificateList.size()>0){
+                    if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
+                        try {
+                            MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
+                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setRole("技术负责人");
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        itView.remove();
+                    }
+                }else{
+                    if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+                        try {
+                            MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
+                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setRole("技术负责人");
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        itView.remove();
+                    }
+                }
+            }
+            if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+                consultants.add(bzshbConsultant);
+            }else{
+                User user=userService.get(projectReportData.getBzshbUserId());
+                bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+                bzshbConsultant.setZixunyuan(user.getId());
+                bzshbConsultant.setRole("技术负责人");
+                consultants.add(bzshbConsultant);
+            }
+        }
+        //查询总审人员信息
+        List<User> auditUserList = userService.getAuditUserList();
+        ruralProjectRecords.setBzshbUserList(auditUserList);
+        model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
+        model.addAttribute("projectReportData",projectReportData);
+        model.addAttribute("projectId", projectcontentinfo1.getProject().getId());
+        model.addAttribute("project", projectcontentinfo1.getProject());
+        model.addAttribute("reportedId", projectcontentinfo.getReportedId());
+        model.addAttribute("projectRecords", ruralProjectRecords);
+        model.addAttribute("id", projectcontentinfo.getId());
+        model.addAttribute("projectcontentinfo", projectcontent);
+        model.addAttribute("consultantinfo", consultants);
+        //获取是否含有上报信息
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(projectcontentinfo.getReportedId());
+        if(null != reported){
+            model.addAttribute("reportedView", 1);
+        }
+        List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");
+        if(null != achievementTypes){
+            for (MainDictDetail achievementType:achievementTypes) {
+                if(achievementType.getValue().equals(projectReportData.getAchievementType())){
+                    projectReportData.setAchievementType(achievementType.getLabel());
+                    break;
+                }
+            }
+        }
+        return "modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm";
+    }
 
 
     /**

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageAllController.java

@@ -1,14 +1,30 @@
 package com.jeeplus.modules.ruralprojectrecords.web;
 
+import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.historical.entity.HistoricalData;
+import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
+import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsReported;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageAllService;
+import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 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.service.UserService;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import jersey.repackaged.com.google.common.collect.Lists;
 import org.activiti.engine.HistoryService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -19,9 +35,11 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -41,6 +59,12 @@ public class RuralProjectMessageAllController extends BaseController {
     protected HistoryService historyService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private ProjectcontentinfoService projectcontentinfoService;
+    @Autowired
+    private ProjectReportDataService projectReportDataService;
+    @Autowired
+    private RuralProjectMessageService ruralProjectMessageService;
 
     @ModelAttribute
     public RuralProjectRecords get(@RequestParam(required=false) String id) {
@@ -94,5 +118,258 @@ public class RuralProjectMessageAllController extends BaseController {
         Map<String, List> map = ruralProjectMessageAllService.getProjectList(projectRecords, request, response);
         return map;
     }
+    /**
+     * admin跳转修改报告页面
+     * @param projectcontentinfo
+     * @param request
+     * @param response
+     * @param model
+     * @param attr
+     * @return
+     */
+    @RequestMapping(value = {"adminEditForm"})
+    public String adminEditForm(RuralProjectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        if (null!=projectcontentinfo.getProjectId()){
+            projectRecords = projectRecordsService.get(projectcontentinfo.getProjectId());
+            model.addAttribute("projectRecords", projectRecords);
+        }
+        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
+        if (null ==projectcontentinfo1){
+            model.addAttribute("projectReportData",null);
+            return "modules/ruralprojectrecords/view/reportView";
+        }
+        ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        if (null ==projectReportData){
+            model.addAttribute("projectReportData",null);
+            return "modules/ruralprojectrecords/view/reportView";
+        }
+        projectReportData = projectReportDataService.get(projectReportData.getId());
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
+        Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
+        projectcontent.setProjectReportData(projectReportData);
+        RuralProjectcontentinfo ruralProjectcontentinfo = projectRecordsService.formAccessory(projectRecords);
+        projectRecordsService.disposeData(ruralProjectcontentinfo);
+        projectcontent.setFileAttachmentList(ruralProjectcontentinfo.getFileAttachmentList());
+        projectcontent.setFileGistdataList(ruralProjectcontentinfo.getFileGistdataList());
+        projectcontent.setFileOtherList(ruralProjectcontentinfo.getFileOtherList());
+        //根据条件查询附件必填项
+        ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+        //添加项目类型
+        relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+        relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+        //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+        String money=ruralProjectRecords.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(StringUtils.isBlank(money)){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
+        //添加报告类型
+        relateInfo.setRequiredStage(1);
+        relateInfo.setId(ruralProjectRecords.getId());
+        List<RuralReportConsultant> consultants = com.google.common.collect.Lists.newArrayList();
+        //将自己添加到咨询员数据中
+        //根据用户查询技能信息
+        RuralReportConsultant currentConsultant = new RuralReportConsultant();
+        List<WorkStaffCertificate> userCertificateList = com.google.common.collect.Lists.newArrayList();
+        if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
+            userCertificateList = ruralProjectMessageService.getCertificateByUser(ruralProjectRecords.getProjectMasterId());
+        }
+        //获取专业类型
+        List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
+        for (WorkStaffCertificate certificateInfo: userCertificateList) {
+            currentConsultant.setZhucezigezhID(certificateInfo.getNum());
+            currentConsultant.setZhucezigezhKey(certificateInfo.getName());
+            for (MainDictDetail type : certificateMajor) {
+                if(certificateInfo.getMajor().equals(type.getValue())){
+                    currentConsultant.setMajor(type.getLabel());
+                }
+            }
+            User currentUser=userService.get(ruralProjectRecords.getProjectMasterId());
+            currentConsultant.setZixunyuanName(currentUser.getName());
+            currentConsultant.setZixunyuan(currentUser.getId());
+            currentConsultant.setRole("负责人");
+            consultants.add(currentConsultant);
+        }
+        //查询总审人员信息
+        RuralReportConsultant bzshbConsultant = new RuralReportConsultant();
+        //根据项目id查找报告咨询员信息
+        List<RuralReportConsultant> consultantList = ruralProjectMessageService.getConsultantsList(projectcontentinfo.getProjectId());
+        //使用迭代器去除重复信息
+        //排除 重新申请|撤销
+        Iterator<RuralReportConsultant> it = consultantList.iterator();
+        while(it.hasNext()){
+            RuralReportConsultant consultant = it.next();
+            if(consultant.getZixunyuan().equals(currentConsultant.getZixunyuan())){
+                try {
+                    MyBeanUtils.copyBeanNotNull2Bean(consultant, currentConsultant);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                it.remove();
+            }else{
+                //根据用户查询技能信息
+                List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                for (WorkStaffCertificate certificateInfo: certificateList) {
+                    if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
+                        consultant.setZhucezigezhID(certificateInfo.getNum());
+                    }
+                    for (MainDictDetail type : certificateMajor) {
+                        if(certificateInfo.getMajor().equals(type.getValue())){
+                            consultant.setMajor(type.getLabel());
+                        }
+                    }
+                }
+                User user=userService.get(consultant.getZixunyuan());
+                consultant.setRole("咨询员");
+                consultant.setZixunyuanName(user.getName());
+                if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+                    bzshbConsultant = consultant;
+                    bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
+                    bzshbConsultant.setRole("技术负责人");
+                    it.remove();
+                }
+            }
+        }
+        consultants.addAll(consultantList);
 
+        if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+            consultants.add(bzshbConsultant);
+        }else{
+            //查询总审人员信息
+            bzshbConsultant = new RuralReportConsultant();
+            List<WorkStaffCertificate> bzshbCertificateList = com.google.common.collect.Lists.newArrayList();
+            if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
+                bzshbCertificateList = ruralProjectMessageService.getCertificateByUser(projectReportData.getBzshbUserId());
+            }
+            for (WorkStaffCertificate certificateInfo: bzshbCertificateList) {
+                bzshbConsultant.setZhucezigezhID(certificateInfo.getNum());
+                bzshbConsultant.setZhucezigezhKey(certificateInfo.getName());
+                for (MainDictDetail dictType : certificateMajor) {
+                    if(certificateInfo.getMajor().equals(dictType.getValue())){
+                        bzshbConsultant.setMajor(dictType.getLabel());
+                    }
+                }
+                User bzshbUser=userService.get(projectReportData.getBzshbUserId());
+                bzshbConsultant.setZixunyuanName(bzshbUser.getName());
+                bzshbConsultant.setZixunyuan(bzshbUser.getId());
+                consultants.add(bzshbConsultant);
+            }
+            Iterator<RuralReportConsultant> itView = consultants.iterator();
+            while(itView.hasNext()){
+                RuralReportConsultant consultant = itView.next();
+                if(bzshbCertificateList.size()>0){
+                    if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
+                        try {
+                            MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
+                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setRole("技术负责人");
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        itView.remove();
+                    }
+                }else{
+                    if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+                        try {
+                            MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
+                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setRole("技术负责人");
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        itView.remove();
+                    }
+                }
+            }
+            if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+                consultants.add(bzshbConsultant);
+            }else{
+                User user=userService.get(projectReportData.getBzshbUserId());
+                bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+                bzshbConsultant.setZixunyuan(user.getId());
+                bzshbConsultant.setRole("技术负责人");
+                consultants.add(bzshbConsultant);
+            }
+        }
+        //查询总审人员信息
+        List<User> auditUserList = userService.getAuditUserList();
+        ruralProjectRecords.setBzshbUserList(auditUserList);
+        model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
+        model.addAttribute("projectReportData",projectReportData);
+        model.addAttribute("projectId", projectcontentinfo1.getProject().getId());
+        model.addAttribute("project", projectcontentinfo1.getProject());
+        model.addAttribute("reportedId", projectcontentinfo.getReportedId());
+        model.addAttribute("projectRecords", ruralProjectRecords);
+        model.addAttribute("id", projectcontentinfo.getId());
+        model.addAttribute("projectcontentinfo", projectcontent);
+        model.addAttribute("consultantinfo", consultants);
+        //获取是否含有上报信息
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(projectcontentinfo.getReportedId());
+        if(null != reported){
+            model.addAttribute("reportedView", 1);
+        }
+        List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");
+        if(null != achievementTypes){
+            for (MainDictDetail achievementType:achievementTypes) {
+                if(achievementType.getValue().equals(projectReportData.getAchievementType())){
+                    projectReportData.setAchievementType(achievementType.getLabel());
+                    break;
+                }
+            }
+        }
+        return "modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls";
+    }
+    /**
+     * admin修改报告信息
+     * @param projectcontentinfo
+     * @param model
+     * @param redirectAttributes
+     * @return
+     */
+    @RequestMapping(value = {"adminModifyReport"})
+    public String adminModifyReport(Projectcontentinfo projectcontentinfo,HttpServletRequest request, Model model,RedirectAttributes redirectAttributes)  {
+        try{
+            String toJson = ruralProjectMessageService.getReportToJson(projectcontentinfo);
+            HistoricalData historicalData = new HistoricalData();
+            historicalData.setDataType("1");
+            historicalData.setDataId(projectcontentinfo.getProjectReportData().getId());
+            historicalData.setIp(StringUtils.getRemoteAddr(request));
+            historicalData.setOperator(UserUtils.getUser().getId());
+            historicalData.setDataObj(toJson);
+            String str = ruralProjectMessageService.adminModifyReport(projectcontentinfo,historicalData);
+            addMessage(redirectAttributes, "修改报告"+(str.equals("true")?"成功":"失败"));
+            ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
+            if (projectReportData!=null){
+                if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessageAll/?repage";
+                }
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessageAll/?repage";
+            }
+        }catch (Exception e){
+            logger.error("ProjectcontentinfoController save Exception e"+e);
+        }
+        if(UserUtils.isManager()){
+            model.addAttribute("flag","1");
+        }
+        addMessage(redirectAttributes, "修改报告失败");
+        ProjectRecords projectRecords = projectcontentinfo.getProject()==null?new ProjectRecords():projectcontentinfo.getProject();
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessageAll/?repage";
+    }
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -352,6 +352,216 @@ public class RuralProjectMessageController extends BaseController {
         model.addAttribute("projectcontentinfo", projectcontentinfo);
         return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportModifyForm";
     }
+    /**
+     * admin跳转修改报告页面
+     * @param projectcontentinfo
+     * @param request
+     * @param response
+     * @param model
+     * @param attr
+     * @return
+     */
+    @RequestMapping(value = {"adminEditForm"})
+    public String adminEditForm(RuralProjectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        if (null!=projectcontentinfo.getProjectId()){
+            projectRecords = projectRecordsService.get(projectcontentinfo.getProjectId());
+            model.addAttribute("projectRecords", projectRecords);
+        }
+        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
+        ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        projectReportData = projectReportDataService.get(projectReportData.getId());
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
+        Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
+        projectcontent.setProjectReportData(projectReportData);
+        RuralProjectcontentinfo ruralProjectcontentinfo = projectRecordsService.formAccessory(projectRecords);
+        projectRecordsService.disposeData(ruralProjectcontentinfo);
+        projectcontent.setFileAttachmentList(ruralProjectcontentinfo.getFileAttachmentList());
+        projectcontent.setFileGistdataList(ruralProjectcontentinfo.getFileGistdataList());
+        projectcontent.setFileOtherList(ruralProjectcontentinfo.getFileOtherList());
+        //根据条件查询附件必填项
+        ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+        //添加项目类型
+        relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+        relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+        //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+        String money=ruralProjectRecords.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(StringUtils.isBlank(money)){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
+        //添加报告类型
+        relateInfo.setRequiredStage(1);
+        relateInfo.setId(ruralProjectRecords.getId());
+        List<RuralReportConsultant> consultants = Lists.newArrayList();
+        //将自己添加到咨询员数据中
+        //根据用户查询技能信息
+        RuralReportConsultant currentConsultant = new RuralReportConsultant();
+        List<WorkStaffCertificate> userCertificateList = Lists.newArrayList();
+        if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
+            userCertificateList = ruralProjectMessageService.getCertificateByUser(ruralProjectRecords.getProjectMasterId());
+        }
+        //获取专业类型
+        List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
+        for (WorkStaffCertificate certificateInfo: userCertificateList) {
+            currentConsultant.setZhucezigezhID(certificateInfo.getNum());
+            currentConsultant.setZhucezigezhKey(certificateInfo.getName());
+            for (MainDictDetail type : certificateMajor) {
+                if(certificateInfo.getMajor().equals(type.getValue())){
+                    currentConsultant.setMajor(type.getLabel());
+                }
+            }
+            User currentUser=userService.get(ruralProjectRecords.getProjectMasterId());
+            currentConsultant.setZixunyuanName(currentUser.getName());
+            currentConsultant.setZixunyuan(currentUser.getId());
+            currentConsultant.setRole("负责人");
+            consultants.add(currentConsultant);
+        }
+        //查询总审人员信息
+        RuralReportConsultant bzshbConsultant = new RuralReportConsultant();
+        //根据项目id查找报告咨询员信息
+        List<RuralReportConsultant> consultantList = ruralProjectMessageService.getConsultantsList(projectcontentinfo.getProjectId());
+        //使用迭代器去除重复信息
+        //排除 重新申请|撤销
+        Iterator<RuralReportConsultant> it = consultantList.iterator();
+        while(it.hasNext()){
+            RuralReportConsultant consultant = it.next();
+            if(consultant.getZixunyuan().equals(currentConsultant.getZixunyuan())){
+                try {
+                    MyBeanUtils.copyBeanNotNull2Bean(consultant, currentConsultant);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                it.remove();
+            }else{
+                //根据用户查询技能信息
+                List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                for (WorkStaffCertificate certificateInfo: certificateList) {
+                    if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
+                        consultant.setZhucezigezhID(certificateInfo.getNum());
+                    }
+                    for (MainDictDetail type : certificateMajor) {
+                        if(certificateInfo.getMajor().equals(type.getValue())){
+                            consultant.setMajor(type.getLabel());
+                        }
+                    }
+                }
+                User user=userService.get(consultant.getZixunyuan());
+                consultant.setRole("咨询员");
+                consultant.setZixunyuanName(user.getName());
+                if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+                    bzshbConsultant = consultant;
+                    bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
+                    bzshbConsultant.setRole("技术负责人");
+                    it.remove();
+                }
+            }
+        }
+        consultants.addAll(consultantList);
+
+        if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+            consultants.add(bzshbConsultant);
+        }else{
+            //查询总审人员信息
+            bzshbConsultant = new RuralReportConsultant();
+            List<WorkStaffCertificate> bzshbCertificateList = Lists.newArrayList();
+            if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
+                bzshbCertificateList = ruralProjectMessageService.getCertificateByUser(projectReportData.getBzshbUserId());
+            }
+            for (WorkStaffCertificate certificateInfo: bzshbCertificateList) {
+                bzshbConsultant.setZhucezigezhID(certificateInfo.getNum());
+                bzshbConsultant.setZhucezigezhKey(certificateInfo.getName());
+                for (MainDictDetail dictType : certificateMajor) {
+                    if(certificateInfo.getMajor().equals(dictType.getValue())){
+                        bzshbConsultant.setMajor(dictType.getLabel());
+                    }
+                }
+                User bzshbUser=userService.get(projectReportData.getBzshbUserId());
+                bzshbConsultant.setZixunyuanName(bzshbUser.getName());
+                bzshbConsultant.setZixunyuan(bzshbUser.getId());
+                consultants.add(bzshbConsultant);
+            }
+            Iterator<RuralReportConsultant> itView = consultants.iterator();
+            while(itView.hasNext()){
+                RuralReportConsultant consultant = itView.next();
+                if(bzshbCertificateList.size()>0){
+                    if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
+                        try {
+                            MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
+                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setRole("技术负责人");
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        itView.remove();
+                    }
+                }else{
+                    if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+                        try {
+                            MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
+                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setRole("技术负责人");
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        itView.remove();
+                    }
+                }
+            }
+            if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+                consultants.add(bzshbConsultant);
+            }else{
+                User user=userService.get(projectReportData.getBzshbUserId());
+                bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+                bzshbConsultant.setZixunyuan(user.getId());
+                bzshbConsultant.setRole("技术负责人");
+                consultants.add(bzshbConsultant);
+            }
+        }
+        //查询总审人员信息
+        List<User> auditUserList = userService.getAuditUserList();
+        ruralProjectRecords.setBzshbUserList(auditUserList);
+        model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
+        model.addAttribute("projectReportData",projectReportData);
+        model.addAttribute("projectId", projectcontentinfo1.getProject().getId());
+        model.addAttribute("project", projectcontentinfo1.getProject());
+        model.addAttribute("reportedId", projectcontentinfo.getReportedId());
+        model.addAttribute("projectRecords", ruralProjectRecords);
+        model.addAttribute("id", projectcontentinfo.getId());
+        model.addAttribute("projectcontentinfo", projectcontent);
+        model.addAttribute("consultantinfo", consultants);
+        //获取是否含有上报信息
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(projectcontentinfo.getReportedId());
+        if(null != reported){
+            model.addAttribute("reportedView", 1);
+        }
+        List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");
+        if(null != achievementTypes){
+            for (MainDictDetail achievementType:achievementTypes) {
+                if(achievementType.getValue().equals(projectReportData.getAchievementType())){
+                    projectReportData.setAchievementType(achievementType.getLabel());
+                    break;
+                }
+            }
+        }
+        return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms";
+    }
 
 
     /**

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataDao.xml

@@ -928,7 +928,7 @@
 		</where>
 	</update>
 
-	<select id="findByProjectId" parameterType="String" resultType="ProjectReportData">
+    <select id="findByProjectId" parameterType="String" resultType="ProjectReportData">
 		SELECT
 		<include refid="projectReportDataColumns"/>
 		FROM project_report_data a
@@ -1065,5 +1065,10 @@
 		  left join work_staff_certificate wsc on wsc.staff_id = wsa.id and wsc.name = a.zhucezigezhID
 		where projectId = #{projectId}
 	</select>
+	<update id="updateProjectBzshUserId">
+		UPDATE project_report_data SET
+			bzshb_user_id =  #{bzshbUserId}
+		WHERE id = #{id}
+	</update>
 
 </mapper>

src/main/webapp/webpage/modules/projectAccessory/workAttachmentForm.jsp

@@ -197,9 +197,16 @@
 									<div class="op-btn-box" >
 										<span>
 										</span>
-										<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
-											<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?id=${workClientAttachment.id}&type=2&url=${workClientAttachment.url}','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-										</c:if>
+										<c:choose>
+											<c:when test="${workClientAttachment.createBy.id eq fns:getUser().id}">
+												<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?id=${workClientAttachment.id}&type=2&url=${workClientAttachment.url}','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+											</c:when>
+											<c:otherwise>
+												<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
+													<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?id=${workClientAttachment.id}&type=2&url=${workClientAttachment.url}','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+												</shiro:hasPermission>
+											</c:otherwise>
+										</c:choose>
 										<c:if test="${workClientAttachment.collectFlag != 1}">
 											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
 										</c:if>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageLists.jsp

@@ -827,7 +827,6 @@
             renderTable();
         });
 
-
         function complain(d){//操作中显示的内容
         	var xml = '<div class=\"layui-btn-group\">';
 			if(d.pid=="0") {
@@ -946,6 +945,11 @@
 						xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralCostProjectMessage/adminRecordModifyForm?id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改归档</a>";
 					}
 				}
+				<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
+					if ('0'!=d.projectReportStatus){
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralCostProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改报告</a>";
+					}
+				</shiro:hasPermission>
 				xml+="</div>";
 				return[xml].join('');
 			}else{

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllLists.jsp

@@ -798,6 +798,11 @@
 						xml+="<a href=\"#\" onclick=\"openDialogView('归档管理员文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 上传文件</a>";
 					</shiro:hasPermission>
 				}
+				if ('0'!=d.projectReportStatus){
+					<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralProjectMessageAll/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改报告</a>";
+					</shiro:hasPermission>
+				}
 				xml+="</div>"
 				return[xml].join('');
 			}else{

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists.jsp

@@ -947,6 +947,11 @@
 						xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralProjectMessage/adminRecordModifyForm?id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改归档</a>";
 					}
 				}
+				<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
+				if ('0'!=d.projectReportStatus){
+					xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改报告</a>";
+				}
+				</shiro:hasPermission>
 				xml+="</div>"
 				return[xml].join('');
 			}else{

src/main/webapp/webpage/modules/workstaff/qualificationForm.jsp

@@ -172,6 +172,10 @@
         function certificateList() {
             var listlength=$("#certificateList tr").length;
             for(var i=0;i<listlength;i++){
+                $("#major"+idx+"").find("div").eq(i).show();
+                $("#major"+idx+"").find("div").eq(i).prop("disabled", true);
+            }
+            for(var i=0;i<listlength;i++){
                 var nameKey=$("#certificateList"+i+"_name").val();
                 var idx=i;
                 $("#requireMajor").html('<span class="require-item">*</span>专业')
@@ -200,7 +204,7 @@
             var length=$("#major"+idx+"").find("div").length;
             for(var i=0;i<length;i++){
                 $("#major"+idx+"").find("div").eq(i).hide();
-                $("#major"+idx+"").find("div").eq(i).prop("disabled", true);
+                $("#major"+idx+"").find("div").eq(i).find("select").prop("disabled", true);
             }
             $("#requireMajor").html('<span class="require-item">*</span>专业')
             if (nameKey=="151"){