复核标准重新调整

src/main/java/com/jeeplus/modules/bzshbExamine/web/BzshbExaminController.java

@@ -150,9 +150,15 @@ public class BzshbExaminController extends BaseController {
         Projectcontentinfo projectcontentinfo = projectcontentinfoService.getByInfoId(projectReportData.getId());
 
         //获取总审抽查的质量复核标准
-        String reviewId="2";
-        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListExamin(reviewId,"紧急项目");
-        if (null!=workReviewAudits){
+//        String reviewId="3";
+        WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+        String Audittype = "4";
+        workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+        workReviewAudit.setType(Audittype);
+        workReviewAudit.setReportId(projectReportData.getId());
+        List<WorkReviewAudit> workReviewAudits = workReviewStandardService.findAuditList(workReviewAudit);
+
+        if (null!=workReviewAudit){
             projectReportData.setProjectReviewList(workReviewAudits);
             model.addAttribute("workReviewAudits", workReviewAudits);
         }
@@ -343,13 +349,13 @@ public class BzshbExaminController extends BaseController {
         projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
         projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
         if("view".equals(bzshbExaminInfo.getView())){
-            WorkReviewAudit workReviewAudit = new WorkReviewAudit();
-            String type = "4";
-            workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
-            workReviewAudit.setType(type);
-            workReviewAudit.setReportId(projectReportData.getId());
-            List<WorkReviewAudit> workReviewAuditList = workReviewStandardService.findAuditList(workReviewAudit);
-            model.addAttribute("list", workReviewAuditList);
+//            WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+//            String type = "4";
+//            workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+//            workReviewAudit.setType(type);
+//            workReviewAudit.setReportId(projectReportData.getId());
+//            List<WorkReviewAudit> workReviewAuditList = workReviewStandardService.findAuditList(workReviewAudit);
+            model.addAttribute("list", workReviewAudits);
             return "modules/bzshbExamin/bzshbExamineView";
         }
         return "modules/bzshbExamin/bzshbExamineform";

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

@@ -315,15 +315,15 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
         List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
         for (WorkReviewStandard reviewStandard:workReviewStandards){
             int orderNum = Integer.parseInt(reviewStandard.getOrderNum());
-            if (orderNum>100100 && orderNum<200000){
+            if (orderNum>10100 && orderNum<20000){
                 WorkReviewAudit workReviewAudit = new WorkReviewAudit();
                 workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
                 workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
                 workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
                 workReviewAudit.setSort(reviewStandard.getSort());
                 workReviewAudit.setId(reviewStandard.getId());
-                if (orderNum>100100 && orderNum<100199){
-                    workReviewAudit.setType("1");
+                if (orderNum>10100 && orderNum<10200){
+                    workReviewAudit.setType("4");
                     workReviewAudit.setParent(new WorkReviewAudit("0"));
                     workReviewAudit.setParentIds("0,");
                 }
@@ -331,15 +331,31 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
                     workReviewAudits.add(workReviewAudit);
                 }
             }
-            if (orderNum>200100){
+            if (orderNum>20100){
                 WorkReviewAudit workReviewAudit = new WorkReviewAudit();
                 workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
                 workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
                 workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
                 workReviewAudit.setSort(reviewStandard.getSort());
                 workReviewAudit.setId(reviewStandard.getId());
-                if (orderNum>200100 && orderNum<200199){
-                    workReviewAudit.setType("1");
+                if (orderNum>20100 && orderNum<20199){
+                    workReviewAudit.setType("4");
+                    workReviewAudit.setParent(new WorkReviewAudit("0"));
+                    workReviewAudit.setParentIds("0,");
+                }
+                if (StringUtils.isNotBlank(workReviewAudit.getType())) {
+                    workReviewAudits.add(workReviewAudit);
+                }
+            }
+            if (orderNum>30100){
+                WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+                workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                workReviewAudit.setSort(reviewStandard.getSort());
+                workReviewAudit.setId(reviewStandard.getId());
+                if (orderNum>30100 && orderNum<30199){
+                    workReviewAudit.setType("4");
                     workReviewAudit.setParent(new WorkReviewAudit("0"));
                     workReviewAudit.setParentIds("0,");
                 }
@@ -396,15 +412,15 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
         List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
         for (WorkReviewStandard reviewStandard:workReviewStandards){
             int orderNum = Integer.parseInt(reviewStandard.getOrderNum());
-            if (orderNum>100200 && orderNum<200000){
+            if (orderNum>10200 && orderNum<20000){
                 WorkReviewAudit workReviewAudit = new WorkReviewAudit();
                 workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
                 workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
                 workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
                 workReviewAudit.setSort(reviewStandard.getSort());
                 workReviewAudit.setId(reviewStandard.getId());
-                if (orderNum>100200 && orderNum<100299){
-                    workReviewAudit.setType("1");
+                if (orderNum>10200 && orderNum<10299){
+                    workReviewAudit.setType("4");
                     workReviewAudit.setParent(new WorkReviewAudit("0"));
                     workReviewAudit.setParentIds("0,");
                 }
@@ -412,15 +428,15 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
                     workReviewAudits.add(workReviewAudit);
                 }
             }
-            if (orderNum>200200){
+            if (orderNum>20200){
                 WorkReviewAudit workReviewAudit = new WorkReviewAudit();
                 workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
                 workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
                 workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
                 workReviewAudit.setSort(reviewStandard.getSort());
                 workReviewAudit.setId(reviewStandard.getId());
-                if (orderNum>200200 && orderNum<200299){
-                    workReviewAudit.setType("1");
+                if (orderNum>20200 && orderNum<20299){
+                    workReviewAudit.setType("4");
                     workReviewAudit.setParent(new WorkReviewAudit("0"));
                     workReviewAudit.setParentIds("0,");
                 }
@@ -477,15 +493,15 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
         List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
         for (WorkReviewStandard reviewStandard:workReviewStandards){
             int orderNum = Integer.parseInt(reviewStandard.getOrderNum());
-            if (orderNum>200100){
+            if (orderNum>30100){
                 WorkReviewAudit workReviewAudit = new WorkReviewAudit();
                 workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
                 workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
                 workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
                 workReviewAudit.setSort(reviewStandard.getSort());
                 workReviewAudit.setId(reviewStandard.getId());
-                if (orderNum>200100 && orderNum<200199){
-                    workReviewAudit.setType("1");
+                if (orderNum>30100 && orderNum<30199){
+                    workReviewAudit.setType("4");
                     workReviewAudit.setParent(new WorkReviewAudit("0"));
                     workReviewAudit.setParentIds("0,");
                 }

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

@@ -633,6 +633,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                 if (type == 2) {
                     //判定如果是B类紧急项目 则不进行流程，直接通过
                     if("1".equals(ruralProjectRecords.getSubmitMoney()) && "1".equals(ruralProjectRecords.getEmergencyProject())){
+                        saveReviewAudit(projectReportData,projectRecord,infoId);
                         this.exigenceProjectSave(projectReportData);
                     }else{
                         //启动流程
@@ -642,54 +643,9 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                         }else{
                             str = this.saveRuralProject(projectReportData, variables, processInstanceId, projectcontentinfo.getProject().getProjectLeaders());
                         }
-                        //生成质量复核标准送审数据
-                        RuralProjectRecords records = ruralProjectRecordsService.getQueryProjectUsers(projectRecord.getId());
-                        String reviewId="";
-                        if ("2".equals(records.getSubmitMoney())){
-                            reviewId="1";
-                        }else{
-                            reviewId="";
-                        }
-                        Boolean status = false;
-                        if (com.jeeplus.common.utils.StringUtils.isBlank(projectReportData.getId())){
-                            status = true;
-                        }
-                        List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
-                        if (projectReportData.getProjectReviewList()!=null && projectReportData.getProjectReviewList().size()!=0){
-                            infoId=projectReportData.getId();
-                            for (WorkReviewAudit workReviewAudit:projectReportData.getProjectReviewList()){
-                                String remarks = workReviewAudit.getRemarks();
-                                WorkReviewStandard reviewStandard = workReviewStandardService.get(workReviewAudit.getId());
-                                if (reviewStandard==null){
-                                    workReviewAudit = workReviewStandardService.getAudit(workReviewAudit.getId());
-                                    workReviewAudit.setRemarks(remarks);
-                                    workReviewAudits.add(workReviewAudit);
-                                }else{
-                                    workReviewAudit.setReportId(infoId);
-                                    workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
-                                    workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
-                                    workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
-                                    workReviewAudit.setSort(reviewStandard.getSort());
-                                    if (!status) {
-                                        workReviewAudit.setId(null);
-                                    }
-                                    workReviewAudit.setType("1");
-                                    workReviewAudit.setParent(new WorkReviewAudit("0"));
-                                    workReviewAudit.setRemarks(remarks);
-                                    workReviewAudits.add(workReviewAudit);
-                                }
-                            }
-                        }
-                        if (!status) {
-                            workReviewStandardService.deleteAuditType(infoId);
-                        }
-                        if (workReviewAudits!=null && workReviewAudits.size()!=0){
-                            for (WorkReviewAudit workReviewAudit:workReviewAudits){
-                                workReviewStandardService.saveAudit(workReviewAudit);
-                            }
-                        }
+                        saveReviewAudit(projectReportData,projectRecord,infoId);
                         //保存tree数据
-                        saveReportTree(projectcontentinfo,status,infoId,reviewId,1);
+//                        saveReportTree(projectcontentinfo,status,infoId,reviewId,1);
 
                         if (!str.equals("true")){
                             return str;
@@ -3348,5 +3304,63 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         }
     }
 
+    /**
+     * 保存复核标准审核
+     * @param projectReportData
+     * @param projectRecord
+     * @param infoId
+     */
+    public void saveReviewAudit(ProjectReportData projectReportData,ProjectRecords projectRecord,String infoId){
+        //生成质量复核标准送审数据
+        RuralProjectRecords records = ruralProjectRecordsService.getQueryProjectUsers(projectRecord.getId());
+        String reviewId="";
+        if ("2".equals(records.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            if (records.getEmergencyProject().equals("0")){
+                reviewId="2";
+            }else{
+                reviewId="3";
+            }
+        }
+        Boolean status = false;
+        if (com.jeeplus.common.utils.StringUtils.isBlank(projectReportData.getId())){
+            status = true;
+        }
+        List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
+        if (projectReportData.getProjectReviewList()!=null && projectReportData.getProjectReviewList().size()!=0){
+            infoId=projectReportData.getId();
+            for (WorkReviewAudit workReviewAudit:projectReportData.getProjectReviewList()){
+                String remarks = workReviewAudit.getRemarks();
+                WorkReviewStandard reviewStandard = workReviewStandardService.get(workReviewAudit.getId());
+                if (reviewStandard==null){
+                    workReviewAudit = workReviewStandardService.getAudit(workReviewAudit.getId());
+                    workReviewAudit.setRemarks(remarks);
+                    workReviewAudits.add(workReviewAudit);
+                }else{
+                    workReviewAudit.setReportId(infoId);
+                    workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                    workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                    workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                    workReviewAudit.setSort(reviewStandard.getSort());
+                    if (!status) {
+                        workReviewAudit.setId(null);
+                    }
+                    workReviewAudit.setType("4");
+                    workReviewAudit.setParent(new WorkReviewAudit("0"));
+                    workReviewAudit.setRemarks(remarks);
+                    workReviewAudits.add(workReviewAudit);
+                }
+            }
+        }
+        if (!status) {
+            workReviewStandardService.deleteAuditType(infoId);
+        }
+        if (workReviewAudits!=null && workReviewAudits.size()!=0){
+            for (WorkReviewAudit workReviewAudit:workReviewAudits){
+                workReviewStandardService.saveAudit(workReviewAudit);
+            }
+        }
+    }
 
 }

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

@@ -237,7 +237,9 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
                     if ("2".equals(records.getSubmitMoney())){
                         reviewId="1";
                     }else{
-                        reviewId="2";
+                        if ("0".equals(records.getEmergencyProject())){
+                            reviewId="2";
+                        }
                     }
                     Boolean status = false;
                     if (com.jeeplus.common.utils.StringUtils.isBlank(projectReportData.getId())){
@@ -262,7 +264,7 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
                                 if (!status) {
                                     workReviewAudit.setId(null);
                                 }
-                                workReviewAudit.setType("1");
+                                workReviewAudit.setType("4");
                                 workReviewAudit.setParent(new WorkReviewAudit("0"));
                                 workReviewAudit.setRemarks(remarks);
                                 workReviewAudits.add(workReviewAudit);
@@ -278,7 +280,7 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
                         }
                     }
                     //保存tree数据
-                    saveReportTree(projectcontentinfo,status,infoId,reviewId,1);
+//                    saveReportTree(projectcontentinfo,status,infoId,reviewId,1);
 
 
                     if (!str.equals("true")){

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

@@ -159,9 +159,13 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            reviewId="";
+            if("0".equals(records.getEmergencyProject())){
+                reviewId="2";
+            }else{
+                reviewId="3";
+            }
         }
-        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"自检");
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"质量复核");
         if (null!=workReviewAudits){
             projectReportData.setProjectReviewList(workReviewAudits);
             model.addAttribute("workReviewAudits", workReviewAudits);
@@ -353,9 +357,13 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            reviewId="";
+            if ("0".equals(records.getEmergencyProject())){
+                reviewId="2";
+            }else if ("1".equals(records.getEmergencyProject())){
+                reviewId="3";
+            }
         }
-        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"自检");
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"质量符合");
         if (null!=workReviewAudits){
             projectReportData.setProjectReviewList(workReviewAudits);
             model.addAttribute("workReviewAudits", workReviewAudits);
@@ -896,6 +904,21 @@ public class RuralCostProjectMessageNewController extends BaseController {
     }
 
     /**
+     * 评分意见
+     */
+    @RequestMapping(value = "selectDeduct")
+    public String selectDeduct(String deductOpinion,String identification, Model model) {
+        //审核意见模板标识
+        model.addAttribute("identification", identification);
+        model.addAttribute("identificationName", "质量复核打分意见");
+        ProjectReportData projectReportData = new ProjectReportData();
+        model.addAttribute("auditOpinion",deductOpinion);
+        model.addAttribute("projectReportData",projectReportData);
+        return "modules/sys/gridselectConsultantOpinion";
+    }
+
+
+    /**
      * 根据信息获取归档信息并调转页面
      */
     @RequestMapping(value = "formRecord")
@@ -1554,9 +1577,13 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            reviewId="";
+            if ("0".equals(records.getEmergencyProject())){
+                reviewId="2";
+            }else if ("1".equals(records.getEmergencyProject())){
+                reviewId="3";
+            }
         }
-        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"自检");
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"质量复核");
         if (null!=workReviewAudits){
             projectReportData.setProjectReviewList(workReviewAudits);
             model.addAttribute("workReviewAudits", workReviewAudits);

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

@@ -37,6 +37,8 @@ import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
+import com.jeeplus.modules.workreview.entity.WorkReviewStandard;
+import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.history.HistoricProcessInstance;
@@ -91,6 +93,8 @@ public class RuralProjectMessageNewController extends BaseController {
     @Autowired
     private ProjectcontentinfoDao projectcontentinfoDao;
     @Autowired
+    private WorkReviewStandardService workReviewStandardService;
+    @Autowired
     private ProjectEngineeringService engineeringService;
     @Autowired
     private ProjectReportRecordService projectReportRecordService;
@@ -165,9 +169,13 @@ public class RuralProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            reviewId="";
+            if ("0".equals(records.getEmergencyProject())){
+                reviewId="2";
+            }else if ("1".equals(records.getEmergencyProject())){
+                reviewId="3";
+            }
         }
-        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"自检");
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"质量复核");
         if (null!=workReviewAudits){
             projectReportData.setProjectReviewList(workReviewAudits);
             model.addAttribute("workReviewAudits", workReviewAudits);
@@ -365,7 +373,11 @@ public class RuralProjectMessageNewController extends BaseController {
         if ("2".equals(ruralProjectRecords.getSubmitMoney())){
             reviewId="1";
         }else{
-            reviewId="";
+            if ("0".equals(ruralProjectRecords.getEmergencyProject())){
+                reviewId="2";
+            }else{
+                reviewId="3";
+            }
         }
         List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"自检");
         if (null!=workReviewAudits){
@@ -736,6 +748,55 @@ public class RuralProjectMessageNewController extends BaseController {
             Act act = getByAct(projectReportData.getProcessInstanceId());
             projectReportData.setAct(act);
         }
+        //重新生成质量复核标准送审数据
+        RuralProjectRecords records = ruralProjectRecordsService.getQueryProjectUsers(projectcontentinfo.getProject().getId());
+        String reviewId="";
+        String infoId="";
+        if ("2".equals(records.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            if ("0".equals(records.getEmergencyProject())){
+                reviewId="2";
+            }
+        }
+        Boolean status = false;
+        if (com.jeeplus.common.utils.StringUtils.isBlank(projectReportData.getId())){
+            status = true;
+        }
+        List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
+        if (projectReportData.getProjectReviewList()!=null && projectReportData.getProjectReviewList().size()!=0){
+            infoId=projectReportData.getId();
+            for (WorkReviewAudit workReviewAudit:projectReportData.getProjectReviewList()){
+                String remarks = workReviewAudit.getRemarks();
+                WorkReviewStandard reviewStandard = workReviewStandardService.get(workReviewAudit.getId());
+                if (reviewStandard==null){
+                    workReviewAudit = workReviewStandardService.getAudit(workReviewAudit.getId());
+                    workReviewAudit.setRemarks(remarks);
+                    workReviewAudits.add(workReviewAudit);
+                }else{
+                    workReviewAudit.setReportId(infoId);
+                    workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                    workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                    workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                    workReviewAudit.setSort(reviewStandard.getSort());
+                    if (!status) {
+                        workReviewAudit.setId(null);
+                    }
+                    workReviewAudit.setType("4");
+                    workReviewAudit.setParent(new WorkReviewAudit("0"));
+                    workReviewAudit.setRemarks(remarks);
+                    workReviewAudits.add(workReviewAudit);
+                }
+            }
+        }
+        if (!status) {
+            workReviewStandardService.deleteAuditType(infoId);
+        }
+        if (workReviewAudits!=null && workReviewAudits.size()!=0){
+            for (WorkReviewAudit workReviewAudit:workReviewAudits){
+                workReviewStandardService.saveAudit(workReviewAudit);
+            }
+        }
         //删除上报咨询员信息
         projectcontentinfoDao.deleteConsultant(projectcontentinfo.getProject().getId());
         //保存咨询员信息
@@ -1565,9 +1626,14 @@ public class RuralProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            reviewId="";
+            if ("0".equals(records.getEmergencyProject())){
+                reviewId="2";
+            }else if ("1".equals(records.getEmergencyProject())){
+                reviewId="3";
+            }
+
         }
-        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"自检");
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"质量复核");
         if (null!=workReviewAudits){
             projectReportData.setProjectReviewList(workReviewAudits);
             model.addAttribute("workReviewAudits", workReviewAudits);

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

@@ -32,6 +32,8 @@ 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.workreview.entity.WorkReviewAudit;
+import com.jeeplus.modules.workreview.entity.WorkReviewStandard;
+import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.history.HistoricProcessInstance;
@@ -50,10 +52,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Controller
 @RequestMapping(value = "${adminPath}/ruralProject/ruralProjectMessageNewTwo")
@@ -69,6 +68,8 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
     @Autowired
     private ProjectReportDataTwoService projectReportDataService;
     @Autowired
+    private WorkReviewStandardService workReviewStandardService;
+    @Autowired
     private ProjectContentDataService projectContentDataService;
     @Autowired
     private ProjectReportDataService reportDataService;
@@ -153,9 +154,11 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            reviewId="2";
+            if ("0".equals(records.getEmergencyProject())){
+                reviewId="2";
+            }
         }
-        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListIssue(reviewId,"自检");
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListIssue(reviewId,"报告签发");
         if (null!=workReviewAudits){
             projectReportData.setProjectReviewList(workReviewAudits);
             model.addAttribute("workReviews",workReviewAudits);
@@ -325,9 +328,11 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
             if ("2".equals(records.getSubmitMoney())){
                 reviewIds="1";
             }else{
-                reviewIds="";
+                if ("0".equals(records.getEmergencyProject())){
+                    reviewIds="2";
+                }
             }
-            List<WorkReviewAudit> workReview = projectContentDataService.findListIssue(reviewIds,"自检");
+            List<WorkReviewAudit> workReview = projectContentDataService.findListIssue(reviewIds,"报告签发");
             model.addAttribute("workReviews",workReview);
             return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModifyTwo";
         }else if (StringUtils.isNotBlank(projectcontentinfo.getView()) && projectcontentinfo.getView().contains("costLiu")){
@@ -453,7 +458,62 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
             Act act = getByAct(projectReportData.getProcessInstanceId());
             projectReportData.setAct(act);
         }
+
         ProjectReportDataTwo t = projectReportDataService.getOnRural(projectReportData.getId());//从数据库取出记录的值
+
+        //重新生成质量复核标准送审数据
+        RuralProjectRecords records = ruralProjectRecordsService.getQueryProjectUsers(t.getProject().getId());
+        String reviewId="";
+        String infoId="";
+        if ("2".equals(records.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            if ("0".equals(records.getEmergencyProject())){
+                reviewId="2";
+            }else if ("1".equals(records.getEmergencyProject())){
+                reviewId="3";
+            }
+        }
+        Boolean status = false;
+        if (com.jeeplus.common.utils.StringUtils.isBlank(t.getId())){
+            status = true;
+        }
+        List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
+        if (projectReportData.getProjectReviewList()!=null && projectReportData.getProjectReviewList().size()!=0){
+            infoId=projectReportData.getId();
+            for (WorkReviewAudit workReviewAudit:projectReportData.getProjectReviewList()){
+                String remarks = workReviewAudit.getRemarks();
+                WorkReviewStandard reviewStandard = workReviewStandardService.get(workReviewAudit.getId());
+                if (reviewStandard==null){
+                    workReviewAudit = workReviewStandardService.getAudit(workReviewAudit.getId());
+                    workReviewAudit.setRemarks(remarks);
+                    workReviewAudits.add(workReviewAudit);
+                }else{
+                    workReviewAudit.setReportId(infoId);
+                    workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                    workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                    workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                    workReviewAudit.setSort(reviewStandard.getSort());
+                    if (!status) {
+                        workReviewAudit.setId(null);
+                    }
+                    workReviewAudit.setType("4");
+                    workReviewAudit.setParent(new WorkReviewAudit("0"));
+                    workReviewAudit.setRemarks(remarks);
+                    workReviewAudits.add(workReviewAudit);
+                }
+            }
+        }
+        if (!status) {
+            workReviewStandardService.deleteAuditType(infoId);
+        }
+        if (workReviewAudits!=null && workReviewAudits.size()!=0){
+            for (WorkReviewAudit workReviewAudit:workReviewAudits){
+                workReviewStandardService.saveAudit(workReviewAudit);
+            }
+        }
+
+
         if(null != saveAuditFlag){
             if(1 == saveAuditFlag && !t.getStatus().equals("4") && !t.getStatus().equals("5")){
                 addMessage(redirectAttributes, "项目报告已送审，请勿重复送审");

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

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.modules.workprojectnotify.web;
 
+import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
@@ -216,6 +217,7 @@ import com.jeeplus.modules.workstockcontract.entity.WorkStockContract;
 import com.jeeplus.modules.workstockcontract.service.WorkStockContractService;
 import com.jeeplus.modules.workvisa.entity.WorkVisa;
 import com.jeeplus.modules.workvisa.service.WorkVisaService;
+import net.sf.json.JSONArray;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -2656,6 +2658,7 @@ public class WorkProjectNotifyController extends BaseController {
 					workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
 					workReviewAudit.setType(type);
 					workReviewAudit.setReportId(workProjectNotify.getNotifyId());
+
 					List<WorkReviewAudit> workReviewAudits = workReviewStandardService.findAuditList(workReviewAudit);
 					model.addAttribute("type", type);
 					model.addAttribute("list", workReviewAudits);
@@ -2664,9 +2667,13 @@ public class WorkProjectNotifyController extends BaseController {
 					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
 						reviewId="1";
 					}else{
-						reviewId="";
+						if("0".equals(ruralProjectRecords.getEmergencyProject())){
+							reviewId="2";
+						}else{
+							reviewId="3";
+						}
 					}
-					List<WorkReviewAudit> workReview = projectContentDataService.findListReview(reviewId,"自检");
+					List<WorkReviewAudit> workReview = projectContentDataService.findListReview(reviewId,"质量复核");
 					if (null!=workReview){
 						projectReportData.setProjectReviewList(workReview);
 					}
@@ -2894,9 +2901,11 @@ public class WorkProjectNotifyController extends BaseController {
 					if ("2".equals(ruralProjectRecords.getSubmitMoney())) {
 						reviewId = "1";
 					} else {
-						reviewId = "";
+						if ("0".equals(ruralProjectRecords.getEmergencyProject())){
+							reviewId = "2";
+						}
 					}
-					List<WorkReviewAudit> workReview = projectContentDataService.findListIssue(reviewId, "自检");
+					List<WorkReviewAudit> workReview = projectContentDataService.findListIssue(reviewId, "报告签发");
 					if (null != workReview) {
 						projectReportDataTwo.setProjectReviewList(workReview);
 					}

src/main/java/com/jeeplus/modules/workreview/dao/WorkReviewAuditDao.java

@@ -23,6 +23,7 @@ public interface WorkReviewAuditDao extends CrudDao<WorkReviewAudit>,TreeDao<Wor
 
     List<WorkReviewAudit> fingIds(@Param("parentIdSet") Set<String> parentIdSet, @Param("companyId") String companyId);
     void reportMaxDeduct(@Param("id") String id,@Param("maxDeduct") String maxDeduct);
+    void reportDeductOption(@Param("id") String id,@Param("deductOption") String deductOption);
 
     WorkReviewAudit getReviewAudit(@Param("reportId")String reportId,@Param("companyId")String companyId,@Param("type")String type);
     void deleteAudit(@Param("reportId")String reportId);

src/main/java/com/jeeplus/modules/workreview/entity/WorkReviewAudit.java

@@ -23,6 +23,7 @@ public class WorkReviewAudit extends TreeEntity<WorkReviewAudit>{
 	private String companyId;   //公司id
 	private String type;
 	private String reportId;
+	private String deductOption;	//打分意见
 
 	public WorkReviewAudit() {
 		super();
@@ -112,4 +113,12 @@ public class WorkReviewAudit extends TreeEntity<WorkReviewAudit>{
 	public void setDeduct(Byte deduct) {
 		this.deduct = deduct;
 	}
+
+	public String getDeductOption() {
+		return deductOption;
+	}
+
+	public void setDeductOption(String deductOption) {
+		this.deductOption = deductOption;
+	}
 }

src/main/java/com/jeeplus/modules/workreview/service/WorkReviewStandardService.java

@@ -219,6 +219,10 @@ public class WorkReviewStandardService extends TreeService<WorkReviewStandardDao
     public void reportMaxDeduct(String id,String maxDeduct) {
         workReviewAuditDao.reportMaxDeduct(id,maxDeduct);
 	}
+    @Transactional(readOnly = false)
+    public void reportDeductOption(String id,String deductOption) {
+        workReviewAuditDao.reportDeductOption(id,deductOption);
+    }
 	@Transactional(readOnly = false)
 	public void save(WorkReviewStandard workReviewStandard) {
         //设置序号
@@ -303,19 +307,18 @@ public class WorkReviewStandardService extends TreeService<WorkReviewStandardDao
     @Transactional(readOnly = false)
     public void saveExaminAudit(Projectcontentinfo projectcontentinfo) {
 	    //保存抽查标准
-        List<WorkReviewAudit> workReviewAudits=projectcontentinfo.getProjectReviewList();
-        if (workReviewAudits.size()>0){
-            for (WorkReviewAudit workReviewAudit:workReviewAudits){
-                workReviewAudit.setReportId(projectcontentinfo.getProjectReportData().getId());
-                workReviewAudit.setId(null);
-                workReviewAudit.setType("4");
-                workReviewAudit.setParent(new WorkReviewAudit("0"));
-                workReviewAudit.setParentIds("0,");
-                if (com.jeeplus.common.utils.StringUtils.isNotBlank(workReviewAudit.getType())) {
-                    saveAudit(workReviewAudit);
-                }
-            }
-        }
+//        List<WorkReviewAudit> workReviewAudits=projectcontentinfo.getProjectReviewList();
+//        if (workReviewAudits.size()>0){
+//            for (WorkReviewAudit workReviewAudit:workReviewAudits){
+//                workReviewAudit.setReportId(projectcontentinfo.getProjectReportData().getId());
+//                workReviewAudit.setType("4");
+//                workReviewAudit.setParent(new WorkReviewAudit("0"));
+//                workReviewAudit.setParentIds("0,");
+//                if (com.jeeplus.common.utils.StringUtils.isNotBlank(workReviewAudit.getType())) {
+//                    saveAudit(workReviewAudit);
+//                }
+//            }
+//        }
         String sore="0";
         if(StringUtils.isNotBlank(projectcontentinfo.getReviewScore())){
             sore=projectcontentinfo.getReviewScore();

src/main/java/com/jeeplus/modules/workreview/web/WorkReviewStandardController.java

@@ -189,11 +189,35 @@ public class WorkReviewStandardController extends BaseController {
 	@ResponseBody
 	public Map<String,Object> reportMaxDeduct(String id,String maxDeduct, RedirectAttributes redirectAttributes) {
 		Map<String,Object> map = new HashMap<>();
+		WorkReviewAudit workReviewAudit=workReviewStandardService.getAudit(id);
+
+		if (workReviewAudit.getMaxDeduct()-Integer.parseInt(maxDeduct)>=0){
+			try {
+				workReviewStandardService.reportMaxDeduct(id,maxDeduct);
+				map.put("status",true);
+			}catch (Exception e){
+				map.put("status",false);
+				map.put("error","输入打分项失败");
+			}
+		}else{
+			map.put("status",false);
+			map.put("error","输入打分项失败,打分项不能超过总分");
+		}
+		return map;
+	}
+	/**
+	 * 修改复核标准意见
+	 */
+	@RequestMapping(value = "reportDeductOption")
+	@ResponseBody
+	public Map<String,Object> reportDeductOption(String id,String deductOption, RedirectAttributes redirectAttributes) {
+		Map<String,Object> map = new HashMap<>();
 		try {
-			workReviewStandardService.reportMaxDeduct(id,maxDeduct);
+			workReviewStandardService.reportDeductOption(id,deductOption);
 			map.put("status",true);
 		}catch (Exception e){
 			map.put("status",false);
+			map.put("error","输入打分意见失败");
 		}
 		return map;
 	}

src/main/resources/mappings/modules/workreview/WorkReviewAuditDao.xml

@@ -15,6 +15,7 @@
 		a.parent_ids AS "parentIds",
 		a.max_deduct AS "maxDeduct",
 		a.deduct AS "deduct",
+		a.deductOption AS "deductOption",
 		a.order_num AS "orderNum",
 		type AS "type",
 		report_id AS "reportId",
@@ -161,7 +162,7 @@
 	<update id="deleteAuditType">
 		DELETE FROM work_review_audit
 		WHERE report_id = #{reportId}
-		AND TYPE = '1'
+		AND TYPE = '4'
 	</update>
 	<!--物理删除-->
 	<update id="deleteAuditChangeType">
@@ -232,6 +233,11 @@
 			deduct = #{maxDeduct}
 		WHERE id = #{id}
     </update>
+	<update id="reportDeductOption">
+        UPDATE work_review_audit SET
+			deductOption = #{deductOption}
+		WHERE id = #{id}
+    </update>
 
     <select id="selectOrderNum" resultType="java.lang.String">
         SELECT MAX(order_num) FROM work_review_audit WHERE parent_id = #{parentId}

src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineView.jsp

@@ -1516,6 +1516,8 @@
 							<th width="40%">符合内容及评分标准</th>
 							<th width="10%">自校</th>
 							<th width="20%">打分</th>
+							<th >打分意见</th>
+
 							<%--<th width="15%">操作</th>--%>
 						</tr>
 						</thead>
@@ -1535,12 +1537,16 @@
 								<td class="input-td">
 									<span id="maxDeduct">${workReviewAudit.deduct}</span>
 								</td>
+								<td class="input-td">
+									<input id="deductOpinion" title="${workReviewAudit.deductOption}" style="background-color: #fff;text-align: center"  placeholder="请输入审核意见" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
+								</td>
 							</tr>
 						</c:forEach>
 						<tr>
 							<td colspan="2" style="font-weight: bold">总分</td>
 							<td id="total" >
 							</td>
+							<td></td>
 						</tr>
 						</tbody>
 					</table>

src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineform.jsp

@@ -145,28 +145,48 @@
 			obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
 			obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
 		}
-		function reportMaxDeduct(maxDeduct,id,parentId){
-			var dataList = ${fns:toJson(workReviewAudits)};
-			var maxDeductTotal = 0;
-			var maxDeducts = 0;
+		function reportMaxDeduct(maxDeduct,id,parentId,obj){
+			<%--console.log(${fns:toJson(list)})--%>
+			<%--var dataList = ${fns:toJson(list)}--%>
+			<%--var maxDeductTotal = 0;--%>
+			<%--var maxDeducts = 0;--%>
 			var total=0;
-			for (var i=0; i<dataList.length; i++){
-				if(dataList[i].id == id){
-					maxDeducts = dataList[i].maxDeduct;
-				}
-			}
-			var length=$("#treeTable2 tbody tr").length;
-			for (var i=0;i<length;i++){
-				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
-				if (undefined!=zhi && ''!=zhi){
-					total=total+parseInt(zhi);
+			<%--for (var i=0; i<dataList.length; i++){--%>
+			<%--	if(dataList[i].id == id){--%>
+			<%--		maxDeducts = dataList[i].maxDeduct;--%>
+			<%--	}--%>
+			<%--	// if(dataList[i].id == parentId){--%>
+			<%--	//     maxDeductTotal = dataList[i].maxDeduct;--%>
+			<%--	// }--%>
+			<%--}--%>
+			$.ajax({
+				url:"${ctx}/workreview/workReviewStandard/reportMaxDeduct",
+				data:{
+					"maxDeduct":maxDeduct,
+					"id":id,
+				},
+				type:"post",
+				success:function(data){
+					if(data.status){
+						var length=$("#treeTable2 tbody tr").length;
+						for (var i=0;i<length;i++){
+							var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+							if (undefined!=zhi && ''!=zhi){
+								total=total+parseInt(zhi);
+							}
+						}
+						$("#total").val(total);
+						// parent.layer.msg('输入打分项成功',{icon:1});
+					}else {
+						parent.layer.msg(data.error,{icon:2});
+						$(obj).val("")
+					}
 				}
-			}
-			$("#total").val(total);
-			parent.layer.msg('输入打分项成功',{icon:1});
+			});
 			return false;
 		}
 
+
 	</script>
 </head>
 <body >
@@ -1534,17 +1554,19 @@
 										<%--<th width="25%">序号</th>--%>
 									<th width="40%">符合内容及评分标准</th>
 									<th width="10%">自校</th>
-									<th width="20%">打分</th>
+									<th width="20%"><span class="require-item">*</span>打分</th>
+									<th >打分意见</th>
+
 										<%--<th width="15%">操作</th>--%>
 								</tr>
 								</thead>
 								<tbody>
 								<c:forEach items="${workReviewAudits}" var="workReviewAudit" varStatus="index">
 									<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-										<td class="hide">
-											<input type="text" name="projectReviewList[${index.index}].standardDetail" value="${workReviewAudit.standardDetail}">
-											<input type="text" name="projectReviewList[${index.index}].orderNum" value="${workReviewAudit.orderNum}">
-										</td>
+<%--										<td class="hide">--%>
+<%--											<input type="text" name="projectReviewList[${index.index}].standardDetail" value="${workReviewAudit.standardDetail}">--%>
+<%--											<input type="text" name="projectReviewList[${index.index}].orderNum" value="${workReviewAudit.orderNum}">--%>
+<%--										</td>--%>
 										<td title="${workReviewAudit.standardDetail}">
 												${workReviewAudit.standardDetail}
 										</td>
@@ -1552,15 +1574,19 @@
 											<i class="fa fa-check"></i>
 										</td>
 										<td class="input-td">
-											<input id="maxDeduct" name="projectReviewList[${index.index}].deduct" htmlEscape="false"  class="form-control layui-input judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}')" placeholder="${workReviewAudit.maxDeduct}">
+											<input id="maxDeduct" htmlEscape="false"  class="form-control layui-input judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="${workReviewAudit.maxDeduct}" />
+										</td>
+										<td class="input-td">
+											<input id="deductOpinion" placeholder="请输入打分意见" readonly="true" style="background-color: #FFFFFF;" name="deductOpinion" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input judgment"/>
 										</td>
 									</tr>
 								</c:forEach>
 								<tr>
 									<td colspan="2" style="font-weight: bold">总分</td>
 									<td style="padding: 0px;">
-										<input id="total" name="reviewScore" htmlEscape="false" readonly="true"  class="form-control layui-input judgment">
+										<input id="total" name="reviewScore" htmlEscape="false" readonly="true"  class="form-control layui-input ">
 									</td>
+									<td></td>
 								</tr>
 								</tbody>
 							</table>
@@ -1766,6 +1792,48 @@
 			content: value
 		});
 	}
+	function openDeductInfo(value,id,obj) {
+		top.layer.open({
+			type: 2,
+			area: ['80%','65%'],
+			title:"意见",
+			name:'friend',
+			skin:"two-btns",
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectDeduct?deductOpinion="+value+"&identification=checkRatingComments"),
+			btn: ['确定', '关闭'],
+			yes: function(index, layero){
+				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var item = iframeWin.getSelectedItem();
+				console.log(item);
+				if(item == "-1"){
+					return;
+				}
+				var items = item.split('_item_');
+				console.log(items)
+				var option=items[1];
+				$.ajax({
+					url:"${ctx}/workreview/workReviewStandard/reportDeductOption",
+					data:{
+						"deductOption":option,
+						"id":id,
+					},
+					type:"post",
+					success:function(data){
+						if(data.status){
+							$(obj).val(option);
+							// parent.layer.msg('输入意见项成功',{icon:1});
+						}else {
+							parent.layer.msg(data.error,{icon:2});
+						}
+					}
+				});
+				top.layer.close(index);//关闭对话框。
+			},
+			cancel: function(index){
+			}
+		});
+	}
+
 </script>
 </body>
 </html>

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

@@ -756,11 +756,11 @@
 							}
 							if(d.projectReportStatus == 4){
 								//驳回操作
-								if(d.newReportNotifyFlag == 1){
+								// if(d.newReportNotifyFlag == 1){
 									xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改质量复核</a>";
-								}else{
-									xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改质量复核</a>";
-								}
+								<%--}else{--%>
+								<%--	xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改质量复核4</a>";--%>
+								<%--}--%>
 
 								<%--xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告质量复核吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";--%>
 							}
@@ -809,11 +809,11 @@
 										}
 										if(d.projectReportRecordStatus == 4){
 											//驳回操作
-											if(d.newRecordNotifyFlag == 1){
+											// if(d.newRecordNotifyFlag == 1){
 												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-											}else{
-												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-											}
+											<%--}else{--%>
+											<%--	xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";--%>
+											<%--}--%>
 										}
 									}
 								}
@@ -835,11 +835,11 @@
 									}
 									if(d.projectReportRecordStatus == 4){
 										//驳回操作
-										if(d.newRecordNotifyFlag == 1){
+										// if(d.newRecordNotifyFlag == 1){
 											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-										}else{
-											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-										}
+										<%--}else{--%>
+										<%--	xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";--%>
+										<%--}--%>
 									}
 								}
 							}
@@ -913,11 +913,11 @@
 												/*驳回修改*/
 												if(d.reportedState == 4){
 													//驳回操作
-													if(d.newReportedNotifyFlag == 1){
+													// if(d.newReportedNotifyFlag == 1){
 														xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
-													}else{
-														xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
-													}
+													<%--}else{--%>
+													<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
+													<%--}--%>
 												}
 											}
 										}
@@ -945,12 +945,12 @@
 											/*驳回修改*/
 											if(d.reportedState == 4){
 												//驳回操作
-												if(d.newReportedNotifyFlag == 1){
+												// if(d.newReportedNotifyFlag == 1){
 													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
-												}else{
-													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
+												<%--}else{--%>
+												<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
 
-												}
+												<%--}--%>
 											}
 										}
 									}

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp

@@ -166,19 +166,20 @@
 			obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
 		}
 		// 确认对话框
-		function reportMaxDeduct(maxDeduct,id,parentId){
-			var dataList = ${fns:toJson(list)};
-			var maxDeductTotal = 0;
-			var maxDeducts = 0;
+		function reportMaxDeduct(maxDeduct,id,parentId,obj){
+        	<%--console.log(${fns:toJson(list)})--%>
+			<%--var dataList = ${fns:toJson(list)}--%>
+			<%--var maxDeductTotal = 0;--%>
+			<%--var maxDeducts = 0;--%>
 			var total=0;
-			for (var i=0; i<dataList.length; i++){
-				if(dataList[i].id == id){
-					maxDeducts = dataList[i].maxDeduct;
-				}
-				// if(dataList[i].id == parentId){
-				//     maxDeductTotal = dataList[i].maxDeduct;
-				// }
-			}
+			<%--for (var i=0; i<dataList.length; i++){--%>
+			<%--	if(dataList[i].id == id){--%>
+			<%--		maxDeducts = dataList[i].maxDeduct;--%>
+			<%--	}--%>
+			<%--	// if(dataList[i].id == parentId){--%>
+			<%--	//     maxDeductTotal = dataList[i].maxDeduct;--%>
+			<%--	// }--%>
+			<%--}--%>
 			$.ajax({
 				url:"${ctx}/workreview/workReviewStandard/reportMaxDeduct",
 				data:{
@@ -196,9 +197,10 @@
 							}
 						}
 						$("#total").html(total);
-						parent.layer.msg('输入打分项成功',{icon:1});
+						// parent.layer.msg('输入打分项成功',{icon:1});
 					}else {
-						parent.layer.msg('输入打分项失败',{icon:2});
+						parent.layer.msg(data.error,{icon:2});
+						$(obj).val("")
 					}
 				}
 			});
@@ -1142,7 +1144,9 @@
 													<%--<th width="25%">序号</th>--%>
 												<th width="40%">符合内容及评分标准</th>
 												<th width="10%">自校</th>
-												<th width="20%">打分</th>
+												<th width="20%"><span class="require-item">*</span>打分</th>
+												<th >打分意见</th>
+
 													<%--<th width="15%">操作</th>--%>
 											</tr>
 											</thead>
@@ -1159,13 +1163,17 @@
 														<i class="fa fa-check"></i>
 													</td>
 													<td class="input-td">
-														<input id="maxDeduct" htmlEscape="false"  class="form-control layui-input judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}')" placeholder="${workReviewAudit.maxDeduct}">
+														<input id="maxDeduct" htmlEscape="false"  class="form-control layui-input judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="${workReviewAudit.maxDeduct}" />
+													</td>
+													<td class="input-td">
+														<input id="deductOpinion" placeholder="请输入打分意见" readonly="true" style="background-color: #FFFFFF;" name="deductOpinion" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
 													</td>
 												</tr>
 											</c:forEach>
 											<tr>
 												<td colspan="2" style="font-weight: bold">总分</td>
 												<td id="total"></td>
+												<td></td>
 											</tr>
 											</tbody>
 										</table>
@@ -1974,6 +1982,48 @@
 			}
 		});
 	}
+
+	function openDeductInfo(value,id,obj) {
+		top.layer.open({
+			type: 2,
+			area: ['80%','65%'],
+			title:"意见",
+			name:'friend',
+			skin:"two-btns",
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectDeduct?deductOpinion="+value+"&identification=ReportDataRatingComments"),
+			btn: ['确定', '关闭'],
+			yes: function(index, layero){
+				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var item = iframeWin.getSelectedItem();
+				console.log(item);
+				if(item == "-1"){
+					return;
+				}
+				var items = item.split('_item_');
+				console.log(items)
+				var option=items[1];
+				$.ajax({
+					url:"${ctx}/workreview/workReviewStandard/reportDeductOption",
+					data:{
+						"deductOption":option,
+						"id":id,
+					},
+					type:"post",
+					success:function(data){
+						if(data.status){
+							$(obj).val(option);
+							// parent.layer.msg('输入意见项成功',{icon:1});
+						}else {
+							parent.layer.msg(data.error,{icon:2});
+						}
+					}
+				});
+				top.layer.close(index);//关闭对话框。
+			},
+			cancel: function(index){
+			}
+		});
+	}
 	function readOpenInfo(value) {
 		layer.open({
 			title: '意见',

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp

@@ -143,19 +143,20 @@
             });
         }
 		// 确认对话框
-		function reportMaxDeduct(maxDeduct,id,parentId){
-			var dataList = ${fns:toJson(list)};
-			var maxDeductTotal = 0;
-			var maxDeducts = 0;
+		function reportMaxDeduct(maxDeduct,id,parentId,obj){
+			<%--console.log(${fns:toJson(list)})--%>
+			<%--var dataList = ${fns:toJson(list)}--%>
+			<%--var maxDeductTotal = 0;--%>
+			<%--var maxDeducts = 0;--%>
 			var total=0;
-			for (var i=0; i<dataList.length; i++){
-				if(dataList[i].id == id){
-					maxDeducts = dataList[i].maxDeduct;
-				}
-				// if(dataList[i].id == parentId){
-				//     maxDeductTotal = dataList[i].maxDeduct;
-				// }
-			}
+			<%--for (var i=0; i<dataList.length; i++){--%>
+			<%--	if(dataList[i].id == id){--%>
+			<%--		maxDeducts = dataList[i].maxDeduct;--%>
+			<%--	}--%>
+			<%--	// if(dataList[i].id == parentId){--%>
+			<%--	//     maxDeductTotal = dataList[i].maxDeduct;--%>
+			<%--	// }--%>
+			<%--}--%>
 			$.ajax({
 				url:"${ctx}/workreview/workReviewStandard/reportMaxDeduct",
 				data:{
@@ -173,14 +174,16 @@
 							}
 						}
 						$("#total").html(total);
-						parent.layer.msg('输入打分项成功',{icon:1});
+						// parent.layer.msg('输入打分项成功',{icon:1});
 					}else {
-						parent.layer.msg('输入打分项失败',{icon:2});
+						parent.layer.msg(data.error,{icon:2});
+						$(obj).val("")
 					}
 				}
 			});
 			return false;
 		}
+
 	</script>
 </head>
 <body >
@@ -985,7 +988,8 @@
 													<%--<th width="25%">序号</th>--%>
 												<th width="40%">符合内容及评分标准</th>
 												<th width="10%">自校</th>
-												<th width="20%">打分</th>
+												<th width="20%"><span class="require-item">*</span>打分</th>
+												<th >打分意见</th>
 													<%--<th width="15%">操作</th>--%>
 											</tr>
 											</thead>
@@ -1002,13 +1006,18 @@
 														<i class="fa fa-check"></i>
 													</td>
 													<td class="input-td">
-														<input id="maxDeduct" htmlEscape="false"  class="form-control layui-input judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}')" placeholder="${workReviewAudit.maxDeduct}">
+														<input id="maxDeduct" htmlEscape="false"  class="form-control layui-input judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="${workReviewAudit.maxDeduct}">
+													</td>
+													<td class="input-td">
+														<input id="deductOpinion" placeholder="请输入打分意见" readonly="true" style="background-color: #FFFFFF;" name="deductOpinion" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
 													</td>
 												</tr>
 											</c:forEach>
 											<tr>
 												<td colspan="2" style="font-weight: bold">总分</td>
 												<td id="total"></td>
+												<td></td>
+
 											</tr>
 											</tbody>
 										</table>
@@ -1872,6 +1881,48 @@
 			}
 		});
 	}
+	function openDeductInfo(value,id,obj) {
+		top.layer.open({
+			type: 2,
+			area: ['80%','65%'],
+			title:"意见",
+			name:'friend',
+			skin:"two-btns",
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectDeduct?deductOpinion="+value+"&identification=ReportDataTwoRatingComments"),
+			btn: ['确定', '关闭'],
+			yes: function(index, layero){
+				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var item = iframeWin.getSelectedItem();
+				console.log(item);
+				if(item == "-1"){
+					return;
+				}
+				var items = item.split('_item_');
+				console.log(items)
+				var option=items[1];
+				$.ajax({
+					url:"${ctx}/workreview/workReviewStandard/reportDeductOption",
+					data:{
+						"deductOption":option,
+						"id":id,
+					},
+					type:"post",
+					success:function(data){
+						if(data.status){
+							$(obj).val(option);
+							// parent.layer.msg('输入意见项成功',{icon:1});
+						}else {
+							parent.layer.msg(data.error,{icon:2});
+						}
+					}
+				});
+				top.layer.close(index);//关闭对话框。
+			},
+			cancel: function(index){
+			}
+		});
+	}
+
 	function readOpenInfo(value) {
 		layer.open({
 			title: '意见',

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageTwoView.jsp

@@ -889,6 +889,7 @@
 								<th width="40%">符合内容及评分标准</th>
 								<th width="10%">自校</th>
 								<th width="20%">打分</th>
+								<th >打分意见</th>
 									<%--<th width="15%">操作</th>--%>
 							</tr>
 							</thead>
@@ -907,11 +908,16 @@
 									<td class="input-td">
 										<input id="maxDeduct" style="text-align: center" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
 									</td>
+									<td class="input-td">
+										<input id="deductOpinion" style="text-align: center" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
+									</td>
 								</tr>
 							</c:forEach>
 							<tr>
 								<td colspan="2" style="font-weight: bold">总分</td>
 								<td id="total" style="background-color: #F1f1f1"></td>
+								<td style="background-color: #F1f1f1"></td>
+
 							</tr>
 							</tbody>
 						</table>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView.jsp

@@ -987,6 +987,7 @@
 								<th width="40%">符合内容及评分标准</th>
 								<th width="10%">自校</th>
 								<th width="20%">打分</th>
+								<th >打分意见</th>
 									<%--<th width="15%">操作</th>--%>
 							</tr>
 							</thead>
@@ -1005,11 +1006,15 @@
 									<td class="input-td">
 										<input id="maxDeduct" style="text-align: center" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
 									</td>
+									<td class="input-td">
+										<input id="deductOpinion" title="${workReviewAudit.deductOption}"  readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
+									</td>
 								</tr>
 							</c:forEach>
 							<tr>
 								<td colspan="2" style="font-weight: bold">总分</td>
 								<td id="total" style="background-color: #F1f1f1"></td>
+								<td style="background-color: #F1f1f1"></td>
 							</tr>
 							</tbody>
 						</table>

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

@@ -755,11 +755,11 @@
 							}
 							if(d.projectReportStatus == 4){
 								//驳回操作
-								if(d.newReportNotifyFlag == 1){
+								// if(d.newReportNotifyFlag == 1){
 									xml+="<a href=\"#\" onclick=\"openDialogreReport('调整质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
-								}else{
-									xml+="<a href=\"#\" onclick=\"openDialogreReport('调整质量复核', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
-								}
+								<%--}else{--%>
+								<%--	xml+="<a href=\"#\" onclick=\"openDialogreReport('调整质量复核', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";--%>
+								<%--}--%>
 
 								<%--xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告质量复核吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";--%>
 							}
@@ -807,11 +807,11 @@
 										}
 										if(d.projectReportRecordStatus == 4){
 											//驳回操作
-											if(d.newRecordNotifyFlag == 1){
+											// if(d.newRecordNotifyFlag == 1){
 												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-											}else{
-												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-											}
+											<%--}else{--%>
+											<%--	xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";--%>
+											<%--}--%>
 										}
 									}
 								}
@@ -832,11 +832,11 @@
 									}
 									if(d.projectReportRecordStatus == 4){
 										//驳回操作
-										if(d.newRecordNotifyFlag == 1){
+										// if(d.newRecordNotifyFlag == 1){
 											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-										}else{
-											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-										}
+										<%--}else{--%>
+										<%--	xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";--%>
+										<%--}--%>
 									}
 								}
 							}
@@ -910,11 +910,11 @@
 												/*驳回修改*/
 												if(d.reportedState == 4){
 													//驳回操作
-													if(d.newReportedNotifyFlag == 1){
+													// if(d.newReportedNotifyFlag == 1){
 														xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
-													}else{
-														xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
-													}
+													<%--}else{--%>
+													<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
+													<%--}--%>
 
 												}
 											}
@@ -943,11 +943,11 @@
 											/*驳回修改*/
 											if(d.reportedState == 4){
 												//驳回操作
-												if(d.newReportedNotifyFlag == 1){
+												// if(d.newReportedNotifyFlag == 1){
 													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
-												}else{
-													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
-												}
+												<%--}else{--%>
+												<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
+												<%--}--%>
 
 											}
 										}

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportIssueView.jsp

@@ -304,6 +304,8 @@
 								<th width="40%">符合内容及评分标准</th>
 								<th width="10%">自校</th>
 								<th width="20%">打分</th>
+								<th >打分意见</th>
+
 									<%--<th width="15%">操作</th>--%>
 							</tr>
 							</thead>
@@ -322,11 +324,16 @@
 									<td class="input-td">
 										<input id="maxDeduct" style="text-align: center" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
 									</td>
+									<td class="input-td">
+										<input id="deductOpinion" style="text-align: center" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
+									</td>
 								</tr>
 							</c:forEach>
 							<tr>
 								<td colspan="2" style="font-weight: bold">总分</td>
 								<td id="total" style="background-color: #F1f1f1"></td>
+								<td style="background-color: #F1f1f1"></td>
+
 							</tr>
 							</tbody>
 						</table>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -372,6 +372,8 @@
 								<th width="40%">符合内容及评分标准</th>
 								<th width="10%">自校</th>
 								<th width="20%">打分</th>
+								<th >打分意见</th>
+
 									<%--<th width="15%">操作</th>--%>
 							</tr>
 							</thead>
@@ -388,13 +390,17 @@
 										<i class="fa fa-check"></i>
 									</td>
 									<td class="input-td">
-										<input id="maxDeduct" style="text-align: center" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
+										<input id="maxDeduct" style="text-align: center;background-color: #fff" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
+									</td>
+									<td class="input-td">
+										<input id="deductOpinion" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
 									</td>
 								</tr>
 							</c:forEach>
 							<tr>
 								<td colspan="2" style="font-weight: bold">总分</td>
-								<td id="total" style="background-color: #F1f1f1"></td>
+								<td id="total"></td>
+								<td ></td>
 							</tr>
 							</tbody>
 						</table>

src/main/webapp/webpage/modules/workreview/workReviewStandardFormFu.jsp

@@ -69,7 +69,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12">
-					<label class="layui-form-label"><span class="require-item">*</span>最多扣分：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>最高分数：</label>
 					<div class="layui-input-block">
 						<form:input path="maxDeduct" htmlEscape="false" max="100" min="0" class="form-control digits required layui-input"/>
 					</div>

src/main/webapp/webpage/modules/workreview/workReviewStandardList.jsp

@@ -68,6 +68,7 @@
 						<thead>
 							<tr>
 								<th  width="40%">复核内容</th>
+								<th  >最高分数</th>
 								<th >序号</th>
 								<th width="240px">操作</th>
 							</tr>
@@ -79,16 +80,24 @@
 										${workReviewStandard.standardDetail}
 								</a></td>
 								<td style="text-align: center">
+										${workReviewStandard.maxDeduct}
+								</td>
+								<td style="text-align: center">
 									${workReviewStandard.orderNum}
 								</td>
 								<td class="op-td text-center">
 									<div class="op-btn-box">
 											<div class="layui-btn-group search-spacing">
-												<c:if test="${workReviewStandard.grade==2}">
+												<c:if test="${workReviewStandard.grade==0}">
 													<shiro:hasPermission name="workreview:workReviewStandard:add">
 														<a href="javascript:void(0);" onclick="openDialog('添加标准', '${ctx}/workreview/workReviewStandard/form?parent.id=${workReviewStandard.id}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-blue"> 添加下级标准</a>
 													</shiro:hasPermission>
 												</c:if>
+												<c:if test="${workReviewStandard.grade==1}">
+													<shiro:hasPermission name="workreview:workReviewStandard:add">
+														<a href="javascript:void(0);" onclick="openDialog('添加标准', '${ctx}/workreview/workReviewStandard/formFu?parent.id=${workReviewStandard.id}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-blue"> 添加下级标准</a>
+													</shiro:hasPermission>
+												</c:if>
 												<c:if test="${workReviewStandard.grade ==1}">
 													<shiro:hasPermission name="workreview:workReviewStandard:edit">
 														<a href="javascript:void(0);" onclick="openDialog('修改复核标准', '${ctx}/workreview/workReviewStandard/form?id=${workReviewStandard.id}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>
@@ -96,7 +105,7 @@
 												</c:if>
 												<c:if test="${workReviewStandard.grade >=2}">
 													<shiro:hasPermission name="workreview:workReviewStandard:edit">
-														<a href="javascript:void(0);" onclick="openDialog('修改复核标准', '${ctx}/workreview/workReviewStandard/form?id=${workReviewStandard.id}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>
+														<a href="javascript:void(0);" onclick="openDialog('修改复核标准', '${ctx}/workreview/workReviewStandard/formFu?id=${workReviewStandard.id}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>
 													</shiro:hasPermission>
 													<shiro:hasPermission name="workreview:workReviewStandard:del">
 														<a href="${ctx}/workreview/workReviewStandard/delete?id=${workReviewStandard.id}" onclick="return confirmx('确认要删除该复核标准及其子复核标准吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>