复核标准（取消扣分项及总分）

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

@@ -633,7 +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);
+//                        saveReviewAudit(projectReportData,projectRecord,infoId);
                         this.exigenceProjectSave(projectReportData);
                     }else{
                         //启动流程
@@ -643,7 +643,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                         }else{
                             str = this.saveRuralProject(projectReportData, variables, processInstanceId, projectcontentinfo.getProject().getProjectLeaders());
                         }
-                        saveReviewAudit(projectReportData,projectRecord,infoId);
+//                        saveReviewAudit(projectReportData,projectRecord,infoId);
                         //保存tree数据
 //                        saveReportTree(projectcontentinfo,status,infoId,reviewId,1);
 

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

@@ -232,55 +232,6 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
                 if (type == 2) {
                     //启动流程
                     String 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{
-                        if (com.jeeplus.common.utils.StringUtils.isBlank(records.getEmergencyProject()) || "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);
-                        }
-                    }
                     //保存tree数据
 //                    saveReportTree(projectcontentinfo,status,infoId,reviewId,1);
 

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

@@ -752,20 +752,37 @@ public class RuralProjectMessageNewController extends BaseController {
             projectReportData.setAct(act);
         }
         //重新生成质量复核标准送审数据
+        String infoId="";
+        List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
         RuralProjectRecords records = ruralProjectRecordsService.getQueryProjectUsers(projectcontentinfo.getProject().getId());
         if (projectcontentinfo.getProjectReviewList()!=null && projectcontentinfo.getProjectReviewList().size()!=0){
             for (WorkReviewAudit workReviewAudit:projectcontentinfo.getProjectReviewList()){
-                WorkReviewAudit audit = workReviewStandardService.getAudit(workReviewAudit.getId());
-                if (audit!=null){
-                    if (null == workReviewAudit.getDeduct()){
-                        workReviewAudit.setDeduct((byte) 0);
+                if (StringUtils.isNotBlank(workReviewAudit.getDeductOption())){
+                    infoId=projectReportData.getId();
+                    WorkReviewStandard reviewStandard = workReviewStandardService.get(workReviewAudit.getStandardId());
+                    if (reviewStandard==null){
+                        workReviewAudit = workReviewStandardService.getAudit(workReviewAudit.getId());
+                        workReviewAudits.add(workReviewAudit);
+                    }else{
+                        workReviewAudit.setReportId(infoId);
+                        workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                        workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                        workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                        workReviewAudit.setSort(reviewStandard.getSort());
+                        workReviewAudit.setId(null);
+                        workReviewAudit.setType("4");
+                        workReviewAudit.setParent(new WorkReviewAudit("0"));
+                        workReviewAudits.add(workReviewAudit);
                     }
-                    audit.setDeduct(workReviewAudit.getDeduct());
-                    audit.setDeductOption(workReviewAudit.getDeductOption());
-                    workReviewAuditDao.update(audit);
                 }
             }
         }
+        workReviewStandardService.deleteAuditType(infoId);
+        if (workReviewAudits!=null && workReviewAudits.size()!=0){
+            for (WorkReviewAudit workReviewAudit:workReviewAudits){
+                workReviewStandardService.saveAudit(workReviewAudit);
+            }
+        }
         //删除上报咨询员信息
         projectcontentinfoDao.deleteConsultant(projectcontentinfo.getProject().getId());
         //保存咨询员信息

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

@@ -465,24 +465,36 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
         ProjectReportDataTwo t = projectReportDataService.getOnRural(projectReportData.getId());//从数据库取出记录的值
 
         //重新生成质量复核标准送审数据
-        RuralProjectRecords records = ruralProjectRecordsService.getQueryProjectUsers(t.getProject().getId());
-        Boolean status = false;
-        if (com.jeeplus.common.utils.StringUtils.isBlank(t.getId())){
-            status = true;
-        }
+        String infoId="";
+        List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
         if (projectcontentinfo.getProjectReviewList()!=null && projectcontentinfo.getProjectReviewList().size()!=0){
             for (WorkReviewAudit workReviewAudit:projectcontentinfo.getProjectReviewList()){
-                WorkReviewAudit audit = workReviewStandardService.getAudit(workReviewAudit.getId());
-                if (audit!=null){
-                    if (null == workReviewAudit.getDeduct()){
-                        workReviewAudit.setDeduct((byte) 0);
+                if (StringUtils.isNotBlank(workReviewAudit.getDeductOption())){
+                    infoId=projectReportData.getId();
+                    WorkReviewStandard reviewStandard = workReviewStandardService.get(workReviewAudit.getStandardId());
+                    if (reviewStandard==null){
+                        workReviewAudit = workReviewStandardService.getAudit(workReviewAudit.getId());
+                        workReviewAudits.add(workReviewAudit);
+                    }else{
+                        workReviewAudit.setReportId(infoId);
+                        workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                        workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                        workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                        workReviewAudit.setSort(reviewStandard.getSort());
+                        workReviewAudit.setId(null);
+                        workReviewAudit.setType("4");
+                        workReviewAudit.setParent(new WorkReviewAudit("0"));
+                        workReviewAudits.add(workReviewAudit);
                     }
-                    audit.setDeduct(workReviewAudit.getDeduct());
-                    audit.setDeductOption(workReviewAudit.getDeductOption());
-                    workReviewAuditDao.update(audit);
                 }
             }
         }
+        workReviewStandardService.deleteAuditType(infoId);
+        if (workReviewAudits!=null && workReviewAudits.size()!=0){
+            for (WorkReviewAudit workReviewAudit:workReviewAudits){
+                workReviewStandardService.saveAudit(workReviewAudit);
+            }
+        }
 
 
         if(null != saveAuditFlag){

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

@@ -20,10 +20,7 @@ import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportDataTwo;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataTwoService;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectReportRecordService;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectcontentinfo.service.*;
 import com.jeeplus.modules.projectrecord.entity.ProjectPlanInfo;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.ruralprojectrecords.entity.*;
@@ -110,6 +107,8 @@ public class RuralProjectViewController extends BaseController {
     private ProjectEngineeringService engineeringService;
     @Autowired
     private WorkReviewStandardService workReviewStandardService;
+    @Autowired
+    private ProjectContentDataService projectContentDataService;
     /**
      * 项目查看
      * 传参：项目id
@@ -439,12 +438,33 @@ public class RuralProjectViewController extends BaseController {
                 consultants.add(bzshbConsultant);
             }
         }
+        //展示
+        //获取自检的质量复核标准
+        String reviewId="";
+        if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) ||"0".equals(ruralProjectRecords.getEmergencyProject())){
+                reviewId="2";
+            }else{
+                reviewId="3";
+            }
+        }
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"质量复核");
         WorkReviewAudit workReviewAudit = new WorkReviewAudit();
         String type = "4";
         workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
         workReviewAudit.setType(type);
         workReviewAudit.setReportId(projectReportData.getId());
-        List<WorkReviewAudit> workReviewAudits = workReviewStandardService.findAuditList(workReviewAudit);
+        List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
+        for(WorkReviewAudit reviewAudit:workReviewAudits){
+            for (WorkReviewAudit audit:audits){
+                if (reviewAudit.getId().equals(audit.getStandardId())){
+                    reviewAudit.setDeductOption(audit.getDeductOption());
+                    break;
+                }
+            }
+        }
         model.addAttribute("list", workReviewAudits);
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
@@ -928,12 +948,33 @@ public class RuralProjectViewController extends BaseController {
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
         ruralProjectRecords.setBzshbUserList(auditUserList);
+        //展示
+        //获取自检的质量复核标准
+        String reviewId="";
+        if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) ||"0".equals(ruralProjectRecords.getEmergencyProject())){
+                reviewId="2";
+            }else{
+                reviewId="3";
+            }
+        }
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListIssue(reviewId,"报告签发");
         WorkReviewAudit workReviewAudit = new WorkReviewAudit();
         String type = "4";
         workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
         workReviewAudit.setType(type);
         workReviewAudit.setReportId(projectReportDataTwo.getId());
-        List<WorkReviewAudit> workReviewAudits = workReviewStandardService.findAuditList(workReviewAudit);
+        List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
+        for(WorkReviewAudit reviewAudit:workReviewAudits){
+            for (WorkReviewAudit audit:audits){
+                if (reviewAudit.getId().equals(audit.getStandardId())){
+                    reviewAudit.setDeductOption(audit.getDeductOption());
+                    break;
+                }
+            }
+        }
         model.addAttribute("list", workReviewAudits);
         model.addAttribute("processInstanceId",projectReportDataTwo.getProcessInstanceId());
         model.addAttribute("projectReportData",projectReportData);

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

@@ -197,6 +197,7 @@ import com.jeeplus.modules.workrepay.service.WorkRepayService;
 import com.jeeplus.modules.workresignation.entity.WorkResignation;
 import com.jeeplus.modules.workresignation.service.WorkResignationService;
 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.workscrap.entity.WorkScrap;
 import com.jeeplus.modules.workscrap.service.WorkScrapService;
@@ -2750,32 +2751,41 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("subProjectInfos", subProjectInfos);
 					model.addAttribute("workContractInfo", workContractInfo);
 					model.addAttribute("projectRecordPlans", projectRecordPlans);
-					WorkReviewAudit workReviewAudit = new WorkReviewAudit();
-					String type = "4";
-					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);
+					//获取评分标准
 					//获取自检的质量复核标准
 					String reviewId="";
 					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
 						reviewId="1";
 					}else{
-						if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) || "0".equals(ruralProjectRecords.getEmergencyProject()) ){
+						if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) ||"0".equals(ruralProjectRecords.getEmergencyProject())){
 							reviewId="2";
 						}else{
 							reviewId="3";
 						}
 					}
-					List<WorkReviewAudit> workReview = projectContentDataService.findListReview(reviewId,"质量复核");
-					if (null!=workReview){
-						projectReportData.setProjectReviewList(workReview);
+					List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"质量复核");
+					model.addAttribute("list", workReviewAudits);
+					if (null!=workReviewAudits){
+						projectReportData.setProjectReviewList(workReviewAudits);
 					}
 					model.addAttribute("projectReportData", projectReportData);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						//展示
+						WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+						String type = "4";
+						workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+						workReviewAudit.setType(type);
+						workReviewAudit.setReportId(workProjectNotify.getNotifyId());
+						List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
+						for(WorkReviewAudit reviewAudit:workReviewAudits){
+							for (WorkReviewAudit audit:audits){
+								if (reviewAudit.getId().equals(audit.getStandardId())){
+									reviewAudit.setDeductOption(audit.getDeductOption());
+									break;
+								}
+							}
+						}
+						model.addAttribute("lists", workReviewAudits);
 						//查询总审人员信息
 						RuralReportConsultant bzshbConsultant = new RuralReportConsultant();
 						List<WorkStaffCertificate> bzshbCertificateList = Lists.newArrayList();
@@ -2915,6 +2925,20 @@ public class WorkProjectNotifyController extends BaseController {
 
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify";
 					} else {
+						WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+						String type = "4";
+						workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+						workReviewAudit.setType(type);
+						workReviewAudit.setReportId(workProjectNotify.getNotifyId());
+						List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
+						for(WorkReviewAudit reviewAudit:workReviewAudits){
+							for (WorkReviewAudit audit:audits){
+								if (reviewAudit.getId().equals(audit.getStandardId())){
+									reviewAudit.setDeductOption(audit.getDeductOption());
+								}
+							}
+						}
+						model.addAttribute("lists", workReviewAudits);
 						//查询总审人员信息
 						RuralReportConsultant bzshbConsultant = new RuralReportConsultant();
 						List<WorkStaffCertificate> bzshbCertificateList = Lists.newArrayList();
@@ -2993,22 +3017,25 @@ public class WorkProjectNotifyController extends BaseController {
 					projectReportDataTwo.setAct(act);
 					Projectcontentinfo projectcontentinfo = new Projectcontentinfo();
 					projectcontentinfo.setProjectReportData(data);
+					//获取评分标准
 					//获取自检的质量复核标准
-					String reviewId = "";
-					if ("2".equals(ruralProjectRecords.getSubmitMoney())) {
-						reviewId = "1";
-					} else {
-						if ("0".equals(ruralProjectRecords.getEmergencyProject())){
-							reviewId = "2";
+					String reviewId="";
+					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+						reviewId="1";
+					}else{
+						if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) ||"0".equals(ruralProjectRecords.getEmergencyProject())){
+							reviewId="2";
+						}else{
+							reviewId="3";
 						}
 					}
-					List<WorkReviewAudit> workReview = projectContentDataService.findListIssue(reviewId, "报告签发");
-					if (null != workReview) {
-						projectReportDataTwo.setProjectReviewList(workReview);
+					List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListIssue(reviewId,"报告签发");
+					model.addAttribute("list", workReviewAudits);
+					if (null != workReviewAudits) {
+						projectReportDataTwo.setProjectReviewList(workReviewAudits);
 					}
-
 					projectcontentinfo.setProjectReportDataTwo(projectReportDataTwo);
-					model.addAttribute("workReviews", workReview);
+					model.addAttribute("workReviews", workReviewAudits);
 					//添加当前文件服务器类型
 					projectcontentinfo.setUploadMode(uploadMode);
 					List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");
@@ -3130,15 +3157,23 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("subProjectInfos", subProjectInfos);
 					model.addAttribute("workContractInfo", workContractInfo);
 					model.addAttribute("projectRecordPlans", projectRecordPlans);
-					WorkReviewAudit workReviewAudit = new WorkReviewAudit();
-					String type = "4";
-					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);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						//展示
+						WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+						String type = "4";
+						workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+						workReviewAudit.setType(type);
+						workReviewAudit.setReportId(workProjectNotify.getNotifyId());
+						List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
+						for(WorkReviewAudit reviewAudit:workReviewAudits){
+							for (WorkReviewAudit audit:audits){
+								if (reviewAudit.getId().equals(audit.getStandardId())){
+									reviewAudit.setDeductOption(audit.getDeductOption());
+									break;
+								}
+							}
+						}
+						model.addAttribute("list", workReviewAudits);
 						projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
 						projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
 						projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
@@ -3153,6 +3188,21 @@ public class WorkProjectNotifyController extends BaseController {
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModifyTwo";
 					} else {
+						WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+						String type = "4";
+						workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+						workReviewAudit.setType(type);
+						workReviewAudit.setReportId(workProjectNotify.getNotifyId());
+						List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
+						for(WorkReviewAudit reviewAudit:workReviewAudits){
+							for (WorkReviewAudit audit:audits){
+								if (reviewAudit.getId().equals(audit.getStandardId())){
+									reviewAudit.setDeductOption(audit.getDeductOption());
+									break;
+								}
+							}
+						}
+						model.addAttribute("list", workReviewAudits);
 						projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
 						projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
 						projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));

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

@@ -24,6 +24,7 @@ public class WorkReviewAudit extends TreeEntity<WorkReviewAudit>{
 	private String type;
 	private String reportId;
 	private String deductOption;	//打分意见
+	private String standardId;		//标准id
 
 	public WorkReviewAudit() {
 		super();
@@ -121,4 +122,12 @@ public class WorkReviewAudit extends TreeEntity<WorkReviewAudit>{
 	public void setDeductOption(String deductOption) {
 		this.deductOption = deductOption;
 	}
+
+	public String getStandardId() {
+		return standardId;
+	}
+
+	public void setStandardId(String standardId) {
+		this.standardId = standardId;
+	}
 }

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

@@ -26,6 +26,7 @@ public class WorkReviewStandard extends TreeEntity<WorkReviewStandard>{
 	private String companyId;   //公司id
 	private String type;
     private Integer proofread; //是否是校核
+	private String deductOption;	//打分意见
 
 	public WorkReviewStandard() {
 		super();
@@ -107,4 +108,12 @@ public class WorkReviewStandard extends TreeEntity<WorkReviewStandard>{
 	public void setType(String type) {
 		this.type = type;
 	}
+
+	public String getDeductOption() {
+		return deductOption;
+	}
+
+	public void setDeductOption(String deductOption) {
+		this.deductOption = deductOption;
+	}
 }

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

@@ -16,6 +16,7 @@
 		a.max_deduct AS "maxDeduct",
 		a.deduct AS "deduct",
 		a.deductOption AS "deductOption",
+		a.standard_id AS "standardId",
 		a.order_num AS "orderNum",
 		type AS "type",
 		report_id AS "reportId",
@@ -72,7 +73,7 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<select id="findAllList" resultType="WorkReviewAudit" >
 		SELECT 
 			<include refid="workReviewAuditColumns"/>
@@ -108,7 +109,9 @@
 			company_id,
 			order_num,
 			type,
-			report_id
+			report_id,
+			deductOption,
+			standard_id
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -125,7 +128,9 @@
 			#{companyId},
 			#{orderNum},
 			#{type},
-			#{reportId}
+			#{reportId},
+			#{deductOption},
+			#{standardId}
 		)
 	</insert>
 	

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

@@ -1165,9 +1165,9 @@
 													<%--<th width="25%">序号</th>--%>
 												<th width="40%">符合内容及评分标准</th>
 												<th width="10%">自校</th>
-												<th width="10%">最高分</th>
-												<th width="10%">扣分</th>
-												<th >扣分意见</th>
+<%--												<th width="10%">最高分</th>--%>
+<%--												<th width="10%">扣分</th>--%>
+												<th >意见</th>
 
 													<%--<th width="15%">操作</th>--%>
 											</tr>
@@ -1175,11 +1175,8 @@
 											<tbody id="projectReviewList">
 											<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
 												<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-														<%--<td title="${workReviewAudit.orderNum}">--%>
-														<%--${workReviewAudit.orderNum}--%>
-														<%--</td>--%>
 													<td class="hide">
-														<input id="projectReviewList${index.index}_id" name="projectReviewList[${index.index}].id" type="hidden" value="${workReviewAudit.id}"/>
+														<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
 													</td>
 													<td title="${workReviewAudit.standardDetail}">
 															${workReviewAudit.standardDetail}
@@ -1187,23 +1184,23 @@
 													<td>
 														<i class="fa fa-check"></i>
 													</td>
+<%--													<td class="input-td">--%>
+<%--														<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
+<%--													</td>--%>
+<%--													<td class="input-td">--%>
+<%--														<input id="deduct" htmlEscape="false" name="projectReviewList[${index.index}].deduct"  class="form-control layui-input number" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入"/>--%>
+<%--													</td>--%>
 													<td class="input-td">
-														<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />
-													</td>
-													<td class="input-td">
-														<input id="deduct" htmlEscape="false" name="projectReviewList[${index.index}].deduct"  class="form-control layui-input number" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入"/>
-													</td>
-													<td class="input-td">
-														<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入扣分意见" readonly="true" style="background-color: #FFFFFF;" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
+														<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" 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="maxTotal"></td>
-												<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>
-												<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>
-											</tr>
+<%--											<tr>--%>
+<%--												<td colspan="2" style="font-weight: bold">总分</td>--%>
+<%--												<td id="maxTotal"></td>--%>
+<%--												<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
+<%--												<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
+<%--											</tr>--%>
 											</tbody>
 										</table>
 									</div>

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

@@ -100,17 +100,17 @@
 				$(id).removeAttr("class","hide");
 
 			})
-			var maxTotal=0;
-			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){
-					maxTotal=maxTotal+parseInt(zhi);
-				}
-			}
-			$("#maxTotal").html(maxTotal);
-			$("#deTotal").html(maxTotal);
-			$("#total").html(0);
+			// var maxTotal=0;
+			// 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){
+			// 		maxTotal=maxTotal+parseInt(zhi);
+			// 	}
+			// }
+			// $("#maxTotal").html(maxTotal);
+			// $("#deTotal").html(maxTotal);
+			// $("#total").html(0);
         });
 
         function insertTitle(tValue){
@@ -1009,20 +1009,18 @@
 													<%--<th width="25%">序号</th>--%>
 												<th width="40%">符合内容及评分标准</th>
 												<th width="10%">自校</th>
-												<th width="10%">最高分</th>
-												<th width="10%">扣分</th>
-												<th >扣分意见</th>
+<%--												<th width="10%">最高分</th>--%>
+<%--												<th width="10%">扣分</th>--%>
+												<th >意见</th>
 													<%--<th width="15%">操作</th>--%>
 											</tr>
 											</thead>
 											<tbody>
 											<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
 												<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-														<%--<td title="${workReviewAudit.orderNum}">--%>
-														<%--${workReviewAudit.orderNum}--%>
-														<%--</td>--%>
 													<td class="hide">
-														<input id="projectReviewList${index.index}_id" name="projectReviewList[${index.index}].id" type="hidden" value="${workReviewAudit.id}"/>
+<%--														<input id="projectReviewList${index.index}_id" name="projectReviewList[${index.index}].id" type="hidden" value="${workReviewAudit.id}"/>--%>
+														<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
 													</td>
 													<td title="${workReviewAudit.standardDetail}">
 															${workReviewAudit.standardDetail}
@@ -1030,23 +1028,23 @@
 													<td>
 														<i class="fa fa-check"></i>
 													</td>
+<%--													<td class="input-td">--%>
+<%--														<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
+<%--													</td>--%>
+<%--													<td class="input-td">--%>
+<%--														<input id="deduct" htmlEscape="false" name="projectReviewList[${index.index}].deduct"  class="form-control layui-input number" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入"/>--%>
+<%--													</td>--%>
 													<td class="input-td">
-														<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />
-													</td>
-													<td class="input-td">
-														<input id="deduct" htmlEscape="false" name="projectReviewList[${index.index}].deduct"  class="form-control layui-input number" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入"/>
-													</td>
-													<td class="input-td">
-														<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入扣分意见" readonly="true" style="background-color: #FFFFFF;" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
+														<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" 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="maxTotal"></td>
-												<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>
-												<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>
-											</tr>
+<%--											<tr>--%>
+<%--												<td colspan="2" style="font-weight: bold">总分</td>--%>
+<%--												<td id="maxTotal"></td>--%>
+<%--												<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
+<%--												<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
+<%--											</tr>--%>
 											</tbody>
 										</table>
 									</div>

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

@@ -48,22 +48,22 @@
 					$("#contractRate").parent().parent().hide();
 				}
 			}
-			var length=$("#treeTable2 tbody tr").length;
-			var total=0;
-			var maxTotal=0;
-			for (var i=0;i<length;i++){
-				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
-				var zhiMax=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
-				if (undefined!=zhi && ''!=zhi){
-					total=total+parseInt(zhi);
-				}
-				if (undefined!=zhiMax && ''!=zhiMax){
-					maxTotal=maxTotal+parseInt(zhiMax);
-				}
-			}
-			$("#total").html(total);
-			$("#maxTotal").html(maxTotal);
-			$("#deTotal").html(maxTotal-total);
+			// var length=$("#treeTable2 tbody tr").length;
+			// var total=0;
+			// var maxTotal=0;
+			// for (var i=0;i<length;i++){
+			// 	var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
+			// 	var zhiMax=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+			// 	if (undefined!=zhi && ''!=zhi){
+			// 		total=total+parseInt(zhi);
+			// 	}
+			// 	if (undefined!=zhiMax && ''!=zhiMax){
+			// 		maxTotal=maxTotal+parseInt(zhiMax);
+			// 	}
+			// }
+			// $("#total").html(total);
+			// $("#maxTotal").html(maxTotal);
+			// $("#deTotal").html(maxTotal-total);
 		});
 
 		function readOpenInfo(value) {
@@ -898,9 +898,9 @@
 									<%--<th width="25%">序号</th>--%>
 								<th width="40%">符合内容及评分标准</th>
 								<th width="10%">自校</th>
-								<th width="10%">最高分</th>
-								<th width="10%">扣分</th>
-								<th >扣分意见</th>
+<%--								<th width="10%">最高分</th>--%>
+<%--								<th width="10%">扣分</th>--%>
+								<th >意见</th>
 									<%--<th width="15%">操作</th>--%>
 							</tr>
 							</thead>
@@ -916,24 +916,23 @@
 									<td>
 										<i class="fa fa-check"></i>
 									</td>
-									<td class="input-td">
-										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />
-									</td>
-									<td class="input-td">
-										<input id="deduct" htmlEscape="false" readonly="true" style="text-align: center;background-color: #fff" class="form-control layui-input number"  value="${workReviewAudit.deduct}"/>
-									</td>
+<%--									<td class="input-td">--%>
+<%--										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
+<%--									</td>--%>
+<%--									<td class="input-td">--%>
+<%--										<input id="deduct" htmlEscape="false" readonly="true" style="text-align: center;background-color: #fff" class="form-control layui-input number"  value="${workReviewAudit.deduct}"/>--%>
+<%--									</td>--%>
 									<td class="input-td">
 										<input id="deductOpinion" title="${workReviewAudit.deductOption}" style="text-align: center;background-color: #fff"   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="maxTotal"></td>
-								<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>
-								<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>
-
-							</tr>
+<%--							<tr>--%>
+<%--								<td colspan="2" style="font-weight: bold">总分</td>--%>
+<%--								<td id="maxTotal"></td>--%>
+<%--								<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
+<%--								<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
+<%--							</tr>--%>
 							</tbody>
 						</table>
 					</div>

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

@@ -48,22 +48,22 @@
 					$("#contractRate").parent().parent().hide();
 				}
 			}
-			var length=$("#treeTable2 tbody tr").length;
-			var total=0;
-			var maxTotal=0;
-			for (var i=0;i<length;i++){
-				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
-				var zhiMax=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
-				if (undefined!=zhi && ''!=zhi){
-					total=total+parseInt(zhi);
-				}
-				if (undefined!=zhiMax && ''!=zhiMax){
-					maxTotal=maxTotal+parseInt(zhiMax);
-				}
-			}
-			$("#total").html(total);
-			$("#maxTotal").html(maxTotal);
-			$("#deTotal").html(maxTotal-total);
+			// var length=$("#treeTable2 tbody tr").length;
+			// var total=0;
+			// var maxTotal=0;
+			// for (var i=0;i<length;i++){
+			// 	var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
+			// 	var zhiMax=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+			// 	if (undefined!=zhi && ''!=zhi){
+			// 		total=total+parseInt(zhi);
+			// 	}
+			// 	if (undefined!=zhiMax && ''!=zhiMax){
+			// 		maxTotal=maxTotal+parseInt(zhiMax);
+			// 	}
+			// }
+			// $("#total").html(total);
+			// $("#maxTotal").html(maxTotal);
+			// $("#deTotal").html(maxTotal-total);
 		});
 
 		function readOpenInfo(value) {
@@ -996,14 +996,14 @@
 									<%--<th width="25%">序号</th>--%>
 								<th width="40%">符合内容及评分标准</th>
 								<th width="10%">自校</th>
-									<th width="10%">最高分</th>
-									<th width="10%">扣分</th>
-								<th>扣分意见</th>
+<%--									<th width="10%">最高分</th>--%>
+<%--									<th width="10%">扣分</th>--%>
+								<th>意见</th>
 									<%--<th width="15%">操作</th>--%>
 							</tr>
 							</thead>
 							<tbody>
-							<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+							<c:forEach items="${lists}" var="workReviewAudit" varStatus="index">
 								<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
 										<%--<td title="${workReviewAudit.orderNum}">--%>
 										<%--${workReviewAudit.orderNum}--%>
@@ -1014,23 +1014,23 @@
 									<td>
 										<i class="fa fa-check"></i>
 									</td>
-									<td class="input-td">
-										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />
-									</td>
-									<td class="input-td">
-										<input id="deduct" htmlEscape="false" readonly="true" style="text-align: center;background-color: #fff" class="form-control layui-input number"  value="${workReviewAudit.deduct}"/>
-									</td>
+<%--									<td class="input-td">--%>
+<%--										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
+<%--									</td>--%>
+<%--									<td class="input-td">--%>
+<%--										<input id="deduct" htmlEscape="false" readonly="true" style="text-align: center;background-color: #fff" class="form-control layui-input number"  value="${workReviewAudit.deduct}"/>--%>
+<%--									</td>--%>
 									<td class="input-td">
 										<input id="deductOpinion" title="${workReviewAudit.deductOption}" style="text-align: center;background-color: #fff"   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="maxTotal"></td>
-								<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>
-								<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>
-							</tr>
+<%--							<tr>--%>
+<%--								<td colspan="2" style="font-weight: bold">总分</td>--%>
+<%--								<td id="maxTotal"></td>--%>
+<%--								<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
+<%--								<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
+<%--							</tr>--%>
 							</tbody>
 						</table>
 					</div>

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

@@ -63,22 +63,22 @@
 					}
 				})
 			})
-			var length=$("#treeTable2 tbody tr").length;
-			var total=0;
-			var maxTotal=0;
-			for (var i=0;i<length;i++){
-				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
-				var zhiMax=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
-				if (undefined!=zhi && ''!=zhi){
-					total=total+parseInt(zhi);
-				}
-				if (undefined!=zhiMax && ''!=zhiMax){
-					maxTotal=maxTotal+parseInt(zhiMax);
-				}
-			}
-			$("#total").html(total);
-			$("#maxTotal").html(maxTotal);
-			$("#deTotal").html(maxTotal-total);
+			// var length=$("#treeTable2 tbody tr").length;
+			// var total=0;
+			// var maxTotal=0;
+			// for (var i=0;i<length;i++){
+			// 	var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
+			// 	var zhiMax=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+			// 	if (undefined!=zhi && ''!=zhi){
+			// 		total=total+parseInt(zhi);
+			// 	}
+			// 	if (undefined!=zhiMax && ''!=zhiMax){
+			// 		maxTotal=maxTotal+parseInt(zhiMax);
+			// 	}
+			// }
+			// $("#total").html(total);
+			// $("#maxTotal").html(maxTotal);
+			// $("#deTotal").html(maxTotal-total);
 		});
 
 		function openDialogre(title,url,width,height,target,buttons) {
@@ -313,9 +313,9 @@
 									<%--<th width="25%">序号</th>--%>
 								<th width="40%">符合内容及评分标准</th>
 								<th width="10%">自校</th>
-								<th width="10%">最高分</th>
-								<th width="10%">扣分</th>
-								<th >扣分意见</th>
+<%--								<th width="10%">最高分</th>--%>
+<%--								<th width="10%">扣分</th>--%>
+								<th >意见</th>
 
 									<%--<th width="15%">操作</th>--%>
 							</tr>
@@ -332,23 +332,23 @@
 									<td>
 										<i class="fa fa-check"></i>
 									</td>
-									<td class="input-td">
-										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />
-									</td>
-									<td class="input-td">
-										<input id="deduct" 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="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
+<%--									</td>--%>
+<%--									<td class="input-td">--%>
+<%--										<input id="deduct" 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" style="text-align: center;background-color: #fff" 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="maxTotal"></td>
-								<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>
-								<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>
-							</tr>
+<%--							<tr>--%>
+<%--								<td colspan="2" style="font-weight: bold">总分</td>--%>
+<%--								<td id="maxTotal"></td>--%>
+<%--								<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
+<%--								<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
+<%--							</tr>--%>
 							</tbody>
 						</table>
 					</div>

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

@@ -63,22 +63,22 @@
 					}
 				})
 			})
-			var length=$("#treeTable2 tbody tr").length;
-			var total=0;
-			var maxTotal=0;
-			for (var i=0;i<length;i++){
-				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
-				var zhiMax=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
-				if (undefined!=zhi && ''!=zhi){
-					total=total+parseInt(zhi);
-				}
-				if (undefined!=zhiMax && ''!=zhiMax){
-					maxTotal=maxTotal+parseInt(zhiMax);
-				}
-			}
-			$("#total").html(total);
-			$("#maxTotal").html(maxTotal);
-			$("#deTotal").html(maxTotal-total);
+			// var length=$("#treeTable2 tbody tr").length;
+			// var total=0;
+			// var maxTotal=0;
+			// for (var i=0;i<length;i++){
+			// 	var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
+			// 	var zhiMax=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+			// 	if (undefined!=zhi && ''!=zhi){
+			// 		total=total+parseInt(zhi);
+			// 	}
+			// 	if (undefined!=zhiMax && ''!=zhiMax){
+			// 		maxTotal=maxTotal+parseInt(zhiMax);
+			// 	}
+			// }
+			// $("#total").html(total);
+			// $("#maxTotal").html(maxTotal);
+			// $("#deTotal").html(maxTotal-total);
 		});
 
 		function openDialogre(title,url,width,height,target,buttons) {
@@ -382,9 +382,9 @@
 									<%--<th width="25%">序号</th>--%>
 								<th width="40%">符合内容及评分标准</th>
 								<th width="10%">自校</th>
-								<th width="10%">最高分</th>
-								<th width="10%">扣分</th>
-								<th >扣分意见</th>
+<%--								<th width="10%">最高分</th>--%>
+<%--								<th width="10%">扣分</th>--%>
+								<th >意见</th>
 
 									<%--<th width="15%">操作</th>--%>
 							</tr>
@@ -401,23 +401,23 @@
 									<td>
 										<i class="fa fa-check"></i>
 									</td>
-									<td class="input-td">
-										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />
-									</td>
-									<td class="input-td">
-										<input id="deduct" 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="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
+<%--									</td>--%>
+<%--									<td class="input-td">--%>
+<%--										<input id="deduct" 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" style="text-align: center;background-color: #fff" 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="maxTotal"></td>
-								<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>
-								<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>
-							</tr>
+<%--							<tr>--%>
+<%--								<td colspan="2" style="font-weight: bold">总分</td>--%>
+<%--								<td id="maxTotal"></td>--%>
+<%--								<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
+<%--								<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
+<%--							</tr>--%>
 							</tbody>
 						</table>
 					</div>