Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportRecord.java
#	src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp
#	src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

src/main/java/com/jeeplus/modules/projectAccessory/service/ProjectTemplateService.java

@@ -355,6 +355,66 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
 
         return projectTemplateList;
     }
+    public List<ProjectTemplateInfo> getProjectTemplateUrgentList(ProjectAccessoryRelationInfo projectTemplateInfo){
+        //查询所有被选择为必填项展示列，并查询附件信息
+        List<ProjectTemplateInfo> projectTemplateList = dao.getProjectTemplateList(projectTemplateInfo);
+        for (ProjectTemplateInfo info: projectTemplateList) {
+            WorkClientAttachment attchment = new WorkClientAttachment();
+            attchment.setProjectId(projectTemplateInfo.getId());
+            attchment.setAttachmentId(info.getId());
+            List<WorkClientAttachment> attachments = workattachmentService.getList(attchment);
+            CollectAccessoryInfo cAInfo = new CollectAccessoryInfo();
+            cAInfo.setOfficeId(UserUtils.getUser().getOffice().getId());
+            cAInfo.setCompanyId(UserUtils.getUser().getCompany().getId());
+            cAInfo.setCreateBy(UserUtils.getUser());
+            //遍历附件信息，判定改附件信息是否被收藏
+            for (WorkClientAttachment info1: attachments) {
+                //url截取
+                String aliyunUrl = Global.getAliDownloadUrl();
+                if(info1.getUrl().indexOf(aliyunUrl)!=-1){
+                    cAInfo.setUrl(info1.getUrl().replace(aliyunUrl,""));
+                }
+                CollectAccessoryInfo collectAccessoryInfo = projectAccessoryDao.getCollectAccessoryInfo1(cAInfo);
+                if(null != collectAccessoryInfo){
+                    info1.setCollectFlag("1");
+                }else{
+                    info1.setCollectFlag("0");
+                }
+            }
+            //数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+            workattachmentService.clientAttachmentManageOnUrl(attachments);
+            info.setWorkAttachments(attachments);
+            //判断是否为必填项，若为必填项则添加必填判定字段
+            if(info.getRequiredStage() == 1 || info.getRequiredStage() == 2){
+                info.setMustFlag(1);
+                //判定必填项的下的是否有附件信息
+                if (attachments.size()!=0){
+                    info.setFileFlag(1);
+                }
+            } else {
+                info.setMustFlag(0);
+                info.setFileFlag(0);
+            }
+        }
+        //查询没有被选择必填项的数据并查询是否已经上传附件，若有则添加到展示列中
+        List<ProjectTemplateInfo> otherProjectTemplateList = dao.projectAccessoryListByParentId(projectTemplateInfo);
+        for (ProjectTemplateInfo otherInfo: otherProjectTemplateList) {
+            WorkClientAttachment attchment = new WorkClientAttachment();
+            attchment.setProjectId(projectTemplateInfo.getId());
+            attchment.setAttachmentId(otherInfo.getId());
+            List<WorkClientAttachment> attachments = workattachmentService.getList(attchment);
+            //数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+            workattachmentService.clientAttachmentManageOnUrl(attachments);
+            if(attachments.size()>0){
+                otherInfo.setWorkAttachments(attachments);
+                otherInfo.setFileFlag(0);
+                otherInfo.setMustFlag(0);
+                projectTemplateList.add(otherInfo);
+            }
+        }
+
+        return projectTemplateList;
+    }
 
     /**
      * 归档审核页面各附件保存信息查看展示数据（归档中将报告的必填项也展示出来）

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportRecord.java

@@ -8,6 +8,7 @@ import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.ActEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.entity.Workattachment;
 import org.activiti.engine.history.HistoricProcessInstance;
@@ -64,6 +65,9 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	private ProjectReportData projectReportData;		// 报告信息（仅作为展示用）
 	private List<String> chargeCriterionList;	//合同收费标准
 
+	private List<RuralReportConsultant> reportedConsultantList= Lists.newArrayList();;//咨询员列表
+
+
 	private Integer type;//(1：ProjectReportRecord  2：RuralProjectReportRecord)
 	private Integer recordAuditType;//归档状态（1：总审驳回，2：归档管理员驳回）
 
@@ -440,4 +444,12 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setRecordAuditType(Integer recordAuditType) {
 		this.recordAuditType = recordAuditType;
 	}
+
+	public List<RuralReportConsultant> getReportedConsultantList() {
+		return reportedConsultantList;
+	}
+
+	public void setReportedConsultantList(List<RuralReportConsultant> reportedConsultantList) {
+		this.reportedConsultantList = reportedConsultantList;
+	}
 }

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

@@ -17,12 +17,14 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.projectAccessory.dao.ProjectTemplateDao;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportRecordDao;
+import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectMaterialDefectRecord;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectMessageDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.dao.WorkattachmentDao;
@@ -107,6 +109,8 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 	@Autowired
 	private ProjectTemplateDao projectTemplateDao;
 	@Autowired
+	private ProjectcontentinfoDao projectcontentinfoDao;
+	@Autowired
 	ProjectReportRecordDao projectReportRecordDao;
 	public ProjectReportRecord get(String id) {
 		ProjectReportRecord projectReportRecord= super.get(id);
@@ -937,6 +941,16 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 			saveWorkattachments(reportRecord);
 			flag = "yes";
 		}
+		if (flag.equals("yes")){
+			//只有B级紧急项目可以修改质量复核信息
+			RuralProjectRecords ruralProjectRecords=ruralProjectRecordsService.get(reportRecord.getReport().getProject().getId());
+			if ("1".equals(ruralProjectRecords.getSubmitMoney()) && "1".equals(ruralProjectRecords.getEmergencyProject()) ){
+				uploadBReport(reportRecord);
+			}
+		}
+
+
+
 		projectReportRecord.setReferenceRemarks(reportRecord.getReferenceRemarks());
 		projectReportRecord.setFileNum(reportRecord.getFileNum());
 		projectReportRecord.setFileNumTow(reportRecord.getFileNumTow());
@@ -1335,6 +1349,39 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 		}
 		return "保存审核意见成功！";
 	}
+	//修改质量符合报告信息
+	public void uploadBReport(ProjectReportRecord reportRecord){
+		//获取项目id
+		String projectId=reportRecord.getReport().getProject().getId();
+		//删除上报咨询员信息
+		projectcontentinfoDao.deleteConsultant(projectId);
+		//保存咨询员信息
+		//判定是否是第一个得参数
+		Integer consultantFlag = 0;
+		for (int i = 0; i<reportRecord.getReportedConsultantList().size();i++){
+			RuralReportConsultant info = reportRecord.getReportedConsultantList().get(i);
+			if (info.getZixunyuan() == null){
+				continue;
+			}
+			consultantFlag ++;
+			if(1 == consultantFlag){
+				//第一个有效数据为负责人信息，同步到项目表信息中
+				//将项目表中的项目负责人信息修改
+				RuralProjectRecords projectRecords = new RuralProjectRecords();
+				projectRecords.setId(projectId);
+				projectRecords.setProjectMasterId(info.getZixunyuan());
+				ruralProjectRecordsService.updateProjectMaster(projectRecords);
+			}
+			//添加项目id
+			info.setProjectId(projectId);
+			info.preInsert();
+			projectcontentinfoDao.insertConsultant(info);
+		}
+		//修改质量复核
+		ProjectReportData projectReportData = reportRecord.getReport();
+		projectReportDataService.save(projectReportData);
+	}
+
 
 	/**
 	 * 将备考表下载到本地

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectReportRecordController.java

@@ -560,6 +560,9 @@ public class ProjectReportRecordController extends BaseController {
 				if (StringUtils.isNotBlank(projectReportRecord.getHome()) && projectReportRecord.getHome().equals("recordAll")){
 					return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessageAll/?repage";
 				}
+				if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("Reurgent")){
+					return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+				}
 				if("1".equals(ruralProjectRecords.getProjectType())){
 					return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
 				}else if("2".equals(ruralProjectRecords.getProjectType())){

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

@@ -3370,15 +3370,6 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         //生成质量复核标准送审数据
         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;

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

@@ -239,7 +239,7 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
                     if ("2".equals(records.getSubmitMoney())){
                         reviewId="1";
                     }else{
-                        if ("0".equals(records.getEmergencyProject())){
+                        if (com.jeeplus.common.utils.StringUtils.isBlank(records.getEmergencyProject()) || "0".equals(records.getEmergencyProject())){
                             reviewId="2";
                         }
                     }
@@ -593,7 +593,7 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
         }
         for (User u : users){
             workProjectNotify.setUser(u);
-            workProjectNotify.setNotifyRole("部门主任审批");
+            workProjectNotify.setNotifyRole("总审室审批");
             workProjectNotify.setId("");
             workProjectNotifyService
                     .save(workProjectNotify);

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

@@ -159,7 +159,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            if("0".equals(records.getEmergencyProject())){
+            if(StringUtils.isBlank(records.getEmergencyProject()) ||"0".equals(records.getEmergencyProject())){
                 reviewId="2";
             }else{
                 reviewId="3";
@@ -357,7 +357,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            if ("0".equals(records.getEmergencyProject())){
+            if (StringUtils.isBlank(records.getEmergencyProject()) || "0".equals(records.getEmergencyProject()) ){
                 reviewId="2";
             }else if ("1".equals(records.getEmergencyProject())){
                 reviewId="3";
@@ -1178,7 +1178,6 @@ public class RuralCostProjectMessageNewController extends BaseController {
             projectReportRecord.setCreateDate(new Date());
             projectReportRecord.setCreateBy(UserUtils.getUser());
         }
-
         //获取项目信息
         RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectReportRecord.getReport().getProject().getId());
         ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
@@ -1267,6 +1266,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         projectRecords.setWorkContractInfo(projectContractInfo);
         projectReportRecord.getReport().setProject(projectRecords);
         projectReportRecord.setView("modify");
+
         model.addAttribute("projectReportRecord", projectReportRecord);
         model.addAttribute("workClientInfoName", projectReportRecord.getClientName());
         model.addAttribute("project", projectReportRecord.getReport().getProject());
@@ -1298,6 +1298,208 @@ public class RuralCostProjectMessageNewController extends BaseController {
     }
 
     /**
+     * B级紧急项目驳回修改
+     * 查看，增加，编辑报告归档表单页面
+     */
+    @RequestMapping(value = "formRecordUrgentModify")
+    public String formRecordUrgentModify(ProjectReportRecord projectReportRecord, Model model) {
+        //查询“配农网”工程类型id
+        String engineeringId = engineeringService.getEngineeringId("202");
+        projectReportRecord = projectReportRecordService.get(projectReportRecord.getId());
+        if(StringUtils.isBlank(projectReportRecord.getId())){
+            projectReportRecord.setCreateDate(new Date());
+            projectReportRecord.setCreateBy(UserUtils.getUser());
+        }
+        //根据项目id查询报告信息
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectReportRecord.getReport().getProject().getId());
+        projectReportRecord.setReport(projectReportData);
+        //获取项目信息
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectReportRecord.getReport().getProject().getId());
+        List<RuralReportConsultant> consultants=reConsultants(ruralProjectRecords,projectReportData);
+        ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+        //添加项目类型
+        relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+        relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+        //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+        String money=ruralProjectRecords.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(StringUtils.isBlank(money)){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
+
+        //添加报告类型
+        relateInfo.setRequiredStage(1);
+        relateInfo.setId(ruralProjectRecords.getId());
+        //查询报告文件、依据性文件、其他文件必填列表以及数据
+        List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+        for (MainDictDetail mainDict : mainDictDetails) {
+            relateInfo.setAttachType(mainDict.getValue());
+            switch (mainDict.getValue()) {
+                case "11":
+                    List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateUrgentList(relateInfo);
+                    for (ProjectTemplateInfo info: fileAttachmentList) {
+                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                        if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+                            if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+                                if(!info.getAttachTypes().contains("zip")){
+                                    info.setAttachTypes(info.getAttachTypes()+",zip");
+                                }
+                                if(!info.getAttachTypes().contains("rar")){
+                                    info.setAttachTypes(info.getAttachTypes()+",rar");
+                                }
+                            }
+                        }
+                    }
+                    projectReportRecord.setFileAttachmentList(fileAttachmentList);
+                    break;
+                case "12":
+                    List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateUrgentList(relateInfo);
+                    for (ProjectTemplateInfo info: projectTemplateList) {
+                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                        if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+                            if("投标文件、中标通知书、工程承包合同（协议书记专用条款部分）、补充协议".equals(info.getAttachName()) || "送审工程预算、结算书".equals(info.getAttachName()) ){
+                                if(!info.getAttachTypes().contains("zip")){
+                                    info.setAttachTypes(info.getAttachTypes()+",zip");
+                                }
+                                if(!info.getAttachTypes().contains("rar")){
+                                    info.setAttachTypes(info.getAttachTypes()+",rar");
+                                }
+                            }
+                        }
+                    }
+                    projectReportRecord.setFileGistdataList(projectTemplateList);
+                    break;
+                case "13":
+                    projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateUrgentList(relateInfo));
+                    break;
+            }
+
+        }
+        ProjectRecords projectRecords = new ProjectRecords();
+        try {
+            MyBeanUtils.copyBeanNotNull2Bean(ruralProjectRecords, projectRecords);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //获取合同信息
+        WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfo(ruralProjectRecords.getWorkContractInfo().getId());
+        projectRecords.setWorkContractInfo(projectContractInfo);
+        projectReportRecord.getReport().setProject(projectRecords);
+        projectReportRecord.setView("modify");
+        model.addAttribute("info", consultants);
+        model.addAttribute("projectReportData", projectReportData);
+        model.addAttribute("projectReportRecord", projectReportRecord);
+        model.addAttribute("workClientInfoName", projectReportRecord.getClientName());
+        model.addAttribute("project", projectReportRecord.getReport().getProject());
+
+        if(StringUtils.isNotBlank(projectReportRecord.getProcessInstanceId())){
+            ProcessInstance processInstance = actTaskService.getProcIns(projectReportRecord.getProcessInstanceId());
+            if (processInstance!=null) {
+                Task taskInfok = actTaskService.getCurrentTaskInfo(processInstance);
+                Act act = new Act();
+                act.setTaskId(taskInfok.getId());
+                act.setTaskName(taskInfok.getName());
+                act.setProcDefId(taskInfok.getProcessDefinitionId());
+                act.setTaskDefKey(taskInfok.getTaskDefinitionKey());
+                act.setProcInsId(taskInfok.getProcessInstanceId());
+                act.setTask(taskInfok);
+                projectReportRecord.setAct(act);
+            }
+        }
+        return "modules/ruralprojectrecords/record/cost/projectReportRecordUrgentModify";
+    }
+
+    public List<RuralReportConsultant> reConsultants(RuralProjectRecords records,ProjectReportData projectReportData){
+        //查询总审人员信息
+        List<User> auditUserList = userService.getAuditUserListByType(records.getSubmitMoney());
+        records.setBzshbUserList(auditUserList);
+        if(null == projectReportData.getConsultant()){
+            projectReportData.setConsultant(UserUtils.getUser());
+        }
+        if(null == projectReportData.getPrincipal()){
+            projectReportData.setPrincipal(UserUtils.getUser());
+        }
+        List<RuralReportConsultant> consultants = Lists.newArrayList();
+        //将自己添加到咨询员数据中
+        //根据用户查询技能信息
+        RuralReportConsultant currentConsultant = new RuralReportConsultant();
+        List<WorkStaffCertificate> userCertificateList = Lists.newArrayList();
+        if(StringUtils.isNotBlank(records.getProjectMasterId())){
+            userCertificateList = ruralProjectMessageService.getCertificateByUser(records.getProjectMasterId());
+        }
+        //获取专业类型
+        List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
+        for (WorkStaffCertificate certificateInfo: userCertificateList) {
+            currentConsultant.setZhucezigezhID(certificateInfo.getNum());
+            currentConsultant.setZhucezigezhKey(certificateInfo.getName());
+            for (MainDictDetail type : certificateMajor) {
+                if(certificateInfo.getMajor().equals(type.getValue())){
+                    currentConsultant.setMajor(type.getLabel());
+                }
+            }
+            User currentUser=userService.get(records.getProjectMasterId());
+            currentConsultant.setZixunyuanName(currentUser.getName());
+            currentConsultant.setZixunyuan(currentUser.getId());
+            currentConsultant.setRole("负责人");
+            consultants.add(currentConsultant);
+        }
+        //总审
+        RuralReportConsultant zongshen = new RuralReportConsultant();
+        zongshen.setZixunyuan(projectReportData.getBzshbUserId());
+        //根据项目id查找报告咨询员信息
+        List<RuralReportConsultant> consultantList = ruralProjectMessageService.getConsultantsList(records.getId());
+        //使用迭代器去除重复信息
+        //排除 重新申请|撤销
+        Iterator<RuralReportConsultant> it = consultantList.iterator();
+        while(it.hasNext()){
+            RuralReportConsultant consultant = it.next();
+            //判定重新复核中总审人员信息去除展示
+            if(consultant.getZixunyuan().equals(zongshen.getZixunyuan())){
+                it.remove();
+            }else if(consultant.getZixunyuan().equals(currentConsultant.getZixunyuan())){
+                try {
+                    MyBeanUtils.copyBeanNotNull2Bean(consultant, currentConsultant);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                it.remove();
+            }else{
+                //根据用户查询技能信息
+                List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                for (WorkStaffCertificate certificateInfo: certificateList) {
+                    if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
+                        consultant.setZhucezigezhID(certificateInfo.getNum());
+                    }
+                    for (MainDictDetail type : certificateMajor) {
+                        if(certificateInfo.getMajor().equals(type.getValue())){
+                            consultant.setMajor(type.getLabel());
+                        }
+                    }
+                }
+                User user=userService.get(consultant.getZixunyuan());
+                consultant.setZixunyuanName(user.getName());
+            }
+        }
+        consultants.addAll(consultantList);
+        return consultants;
+    }
+    /**
      * 项目上报
      * @param projectRecords
      * @return
@@ -1577,7 +1779,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            if ("0".equals(records.getEmergencyProject())){
+            if (StringUtils.isBlank(records.getEmergencyProject()) || "0".equals(records.getEmergencyProject())){
                 reviewId="2";
             }else if ("1".equals(records.getEmergencyProject())){
                 reviewId="3";

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

@@ -36,6 +36,7 @@ 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.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workreview.dao.WorkReviewAuditDao;
 import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 import com.jeeplus.modules.workreview.entity.WorkReviewStandard;
 import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
@@ -95,6 +96,8 @@ public class RuralProjectMessageNewController extends BaseController {
     @Autowired
     private WorkReviewStandardService workReviewStandardService;
     @Autowired
+    private WorkReviewAuditDao workReviewAuditDao;
+    @Autowired
     private ProjectEngineeringService engineeringService;
     @Autowired
     private ProjectReportRecordService projectReportRecordService;
@@ -169,7 +172,7 @@ public class RuralProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            if ("0".equals(records.getEmergencyProject())){
+            if (StringUtils.isBlank(records.getEmergencyProject()) ||"0".equals(records.getEmergencyProject())){
                 reviewId="2";
             }else if ("1".equals(records.getEmergencyProject())){
                 reviewId="3";
@@ -373,7 +376,7 @@ public class RuralProjectMessageNewController extends BaseController {
         if ("2".equals(ruralProjectRecords.getSubmitMoney())){
             reviewId="1";
         }else{
-            if ("0".equals(ruralProjectRecords.getEmergencyProject())){
+            if (StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) || "0".equals(ruralProjectRecords.getEmergencyProject())){
                 reviewId="2";
             }else{
                 reviewId="3";
@@ -750,53 +753,19 @@ public class RuralProjectMessageNewController extends BaseController {
         }
         //重新生成质量复核标准送审数据
         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);
+        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);
                     }
-                    workReviewAudit.setType("4");
-                    workReviewAudit.setParent(new WorkReviewAudit("0"));
-                    workReviewAudit.setRemarks(remarks);
-                    workReviewAudits.add(workReviewAudit);
+                    audit.setDeduct(workReviewAudit.getDeduct());
+                    audit.setDeductOption(workReviewAudit.getDeductOption());
+                    workReviewAuditDao.update(audit);
                 }
             }
         }
-        if (!status) {
-            workReviewStandardService.deleteAuditType(infoId);
-        }
-        if (workReviewAudits!=null && workReviewAudits.size()!=0){
-            for (WorkReviewAudit workReviewAudit:workReviewAudits){
-                workReviewStandardService.saveAudit(workReviewAudit);
-            }
-        }
         //删除上报咨询员信息
         projectcontentinfoDao.deleteConsultant(projectcontentinfo.getProject().getId());
         //保存咨询员信息
@@ -869,7 +838,7 @@ public class RuralProjectMessageNewController extends BaseController {
             addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
         }else {
             if ("modifyApply".equals(taskDefKey)){
-                ruralProjectMessageService.saveData(projectcontentinfo,3);
+//                ruralProjectMessageService.saveData(projectcontentinfo,3);
             }
             //添加查询报告号模板的bizCode参数
             if("1".equals(projectRecord.getProjectType())){
@@ -1366,6 +1335,11 @@ public class RuralProjectMessageNewController extends BaseController {
                 Double jingHeJianE = Double.valueOf(reported.getJingHeJianE())/10000;
                 reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
             }
+            if(StringUtils.isNotBlank(projectReportData.getZiXunShouRu())){
+                Double ziXunShouRu = Double.valueOf(projectReportData.getZiXunShouRu());
+                reported.setZiXunShouRu(String.format("%.2f", ziXunShouRu));
+            }
+
 
             ruralProjectMessageS.disposeProjectRecords(records,reported);
         }
@@ -1626,7 +1600,7 @@ public class RuralProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            if ("0".equals(records.getEmergencyProject())){
+            if (StringUtils.isBlank(records.getEmergencyProject()) || "0".equals(records.getEmergencyProject())){
                 reviewId="2";
             }else if ("1".equals(records.getEmergencyProject())){
                 reviewId="3";

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

@@ -31,6 +31,7 @@ import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workreview.dao.WorkReviewAuditDao;
 import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 import com.jeeplus.modules.workreview.entity.WorkReviewStandard;
 import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
@@ -70,6 +71,8 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
     @Autowired
     private WorkReviewStandardService workReviewStandardService;
     @Autowired
+    private WorkReviewAuditDao workReviewAuditDao;
+    @Autowired
     private ProjectContentDataService projectContentDataService;
     @Autowired
     private ProjectReportDataService reportDataService;
@@ -154,7 +157,7 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            if ("0".equals(records.getEmergencyProject())){
+            if (StringUtils.isBlank(records.getEmergencyProject()) || "0".equals(records.getEmergencyProject())){
                 reviewId="2";
             }
         }
@@ -463,55 +466,23 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
 
         //重新生成质量复核标准送审数据
         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);
+        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);
                     }
-                    workReviewAudit.setType("4");
-                    workReviewAudit.setParent(new WorkReviewAudit("0"));
-                    workReviewAudit.setRemarks(remarks);
-                    workReviewAudits.add(workReviewAudit);
+                    audit.setDeduct(workReviewAudit.getDeduct());
+                    audit.setDeductOption(workReviewAudit.getDeductOption());
+                    workReviewAuditDao.update(audit);
                 }
             }
         }
-        if (!status) {
-            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/workprojectnotify/web/WorkProjectNotifyController.java

@@ -2764,7 +2764,7 @@ public class WorkProjectNotifyController extends BaseController {
 					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
 						reviewId="1";
 					}else{
-						if("0".equals(ruralProjectRecords.getEmergencyProject())){
+						if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) || "0".equals(ruralProjectRecords.getEmergencyProject()) ){
 							reviewId="2";
 						}else{
 							reviewId="3";
@@ -3653,6 +3653,7 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 					ProjectReportData projectReportData = projectReportDataService.getOnRural(projectReportRecord.getReport().getId());
 					projectReportRecord.setProjectReportData(projectReportData);
+					projectReportRecord.setReport(projectReportData);
 					Projectcontentinfo projectcontentinfo = projectcontentinfoService.getByInfoId(projectReportData.getId());
 					projectcontentinfo.setProjectReportData(projectReportData);
 					//获取项目信息
@@ -3798,7 +3799,13 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 						return "modules/ruralprojectrecords/record/projectReportRecordAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
-						return "modules/ruralprojectrecords/record/projectReportRecordModifyApply";
+						if("1".equals(ruralProjectRecords.getEmergencyProject())){
+							List<RuralReportConsultant> consultants=reConsultants(ruralProjectRecords,projectReportData);
+							model.addAttribute("info", consultants);
+							return "modules/ruralprojectrecords/record/projectReportRecordUrgentModifyApply";
+						}else{
+							return "modules/ruralprojectrecords/record/projectReportRecordModifyApply";
+						}
 					} else {
 						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
 						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
@@ -5727,4 +5734,81 @@ public class WorkProjectNotifyController extends BaseController {
 		return projectRecords;
 	}
 
+	//获取项目组成员
+	public List<RuralReportConsultant> reConsultants(RuralProjectRecords records,ProjectReportData projectReportData){
+		//查询总审人员信息
+		List<User> auditUserList = userService.getAuditUserListByType(records.getSubmitMoney());
+		records.setBzshbUserList(auditUserList);
+		if(null == projectReportData.getConsultant()){
+			projectReportData.setConsultant(UserUtils.getUser());
+		}
+		if(null == projectReportData.getPrincipal()){
+			projectReportData.setPrincipal(UserUtils.getUser());
+		}
+		List<RuralReportConsultant> consultants = Lists.newArrayList();
+		//将自己添加到咨询员数据中
+		//根据用户查询技能信息
+		RuralReportConsultant currentConsultant = new RuralReportConsultant();
+		List<WorkStaffCertificate> userCertificateList = Lists.newArrayList();
+		if(StringUtils.isNotBlank(records.getProjectMasterId())){
+			userCertificateList = ruralProjectMessageService.getCertificateByUser(records.getProjectMasterId());
+		}
+		//获取专业类型
+		List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
+		for (WorkStaffCertificate certificateInfo: userCertificateList) {
+			currentConsultant.setZhucezigezhID(certificateInfo.getNum());
+			currentConsultant.setZhucezigezhKey(certificateInfo.getName());
+			for (MainDictDetail type : certificateMajor) {
+				if(certificateInfo.getMajor().equals(type.getValue())){
+					currentConsultant.setMajor(type.getLabel());
+				}
+			}
+			User currentUser=userService.get(records.getProjectMasterId());
+			currentConsultant.setZixunyuanName(currentUser.getName());
+			currentConsultant.setZixunyuan(currentUser.getId());
+			currentConsultant.setRole("负责人");
+			consultants.add(currentConsultant);
+		}
+		//总审
+		RuralReportConsultant zongshen = new RuralReportConsultant();
+		zongshen.setZixunyuan(projectReportData.getBzshbUserId());
+		//根据项目id查找报告咨询员信息
+		List<RuralReportConsultant> consultantList = ruralProjectMessageService.getConsultantsList(records.getId());
+		//使用迭代器去除重复信息
+		//排除 重新申请|撤销
+		Iterator<RuralReportConsultant> it = consultantList.iterator();
+		while(it.hasNext()){
+			RuralReportConsultant consultant = it.next();
+			//判定重新复核中总审人员信息去除展示
+			if(consultant.getZixunyuan().equals(zongshen.getZixunyuan())){
+				it.remove();
+			}else if(consultant.getZixunyuan().equals(currentConsultant.getZixunyuan())){
+				try {
+					MyBeanUtils.copyBeanNotNull2Bean(consultant, currentConsultant);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				it.remove();
+			}else{
+				//根据用户查询技能信息
+				List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+				for (WorkStaffCertificate certificateInfo: certificateList) {
+					if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
+						consultant.setZhucezigezhID(certificateInfo.getNum());
+					}
+					for (MainDictDetail type : certificateMajor) {
+						if(certificateInfo.getMajor().equals(type.getValue())){
+							consultant.setMajor(type.getLabel());
+						}
+					}
+				}
+				User user=userService.get(consultant.getZixunyuan());
+				consultant.setZixunyuanName(user.getName());
+			}
+		}
+		consultants.addAll(consultantList);
+		return consultants;
+	}
+
+
 }

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

@@ -37,6 +37,8 @@ public class WorkReviewStandardService extends TreeService<WorkReviewStandardDao
     private ProjectReportDataService projectReportDataService;
     @Autowired
     private WorkReviewAuditDao workReviewAuditDao;
+//    @Autowired
+//    private WorkReviewStandardService workReviewStandardService;
     @Autowired
     private BzshbExaminDao bzshbExaminDao;
 
@@ -306,19 +308,20 @@ 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.setType("4");
-//                workReviewAudit.setParent(new WorkReviewAudit("0"));
-//                workReviewAudit.setParentIds("0,");
-//                if (com.jeeplus.common.utils.StringUtils.isNotBlank(workReviewAudit.getType())) {
-//                    saveAudit(workReviewAudit);
-//                }
-//            }
-//        }
+	    //修改抽查标准
+        if (projectcontentinfo.getProjectReviewList()!=null && projectcontentinfo.getProjectReviewList().size()!=0){
+            for (WorkReviewAudit workReviewAudit:projectcontentinfo.getProjectReviewList()){
+                WorkReviewAudit audit = workReviewAuditDao.get(workReviewAudit.getId());
+                if (audit!=null){
+                    if (null == workReviewAudit.getDeduct()){
+                        workReviewAudit.setDeduct((byte) 0);
+                    }
+                    audit.setDeduct(workReviewAudit.getDeduct());
+                    audit.setDeductOption(workReviewAudit.getDeductOption());
+                    workReviewAuditDao.update(audit);
+                }
+            }
+        }
         String sore="0";
         if(StringUtils.isNotBlank(projectcontentinfo.getReviewScore())){
             sore=projectcontentinfo.getReviewScore();

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

@@ -193,15 +193,15 @@ public class WorkReviewStandardController extends BaseController {
 
 		if (workReviewAudit.getMaxDeduct()-Integer.parseInt(maxDeduct)>=0){
 			try {
-				workReviewStandardService.reportMaxDeduct(id,maxDeduct);
+//				workReviewStandardService.reportMaxDeduct(id,maxDeduct);
 				map.put("status",true);
 			}catch (Exception e){
 				map.put("status",false);
-				map.put("error","输入打分项失败");
+				map.put("error","输入扣分项失败");
 			}
 		}else{
 			map.put("status",false);
-			map.put("error","输入打分项失败,打分项不能超过总分");
+			map.put("error","输入扣分项失败,扣分项不能超过总分");
 		}
 		return map;
 	}
@@ -213,7 +213,7 @@ public class WorkReviewStandardController extends BaseController {
 	public Map<String,Object> reportDeductOption(String id,String deductOption, RedirectAttributes redirectAttributes) {
 		Map<String,Object> map = new HashMap<>();
 		try {
-			workReviewStandardService.reportDeductOption(id,deductOption);
+//			workReviewStandardService.reportDeductOption(id,deductOption);
 			map.put("status",true);
 		}catch (Exception e){
 			map.put("status",false);

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

@@ -1574,6 +1574,7 @@
 		FROM rural_project_records a
 		left join work_contract_info wci on a.contract_id = wci.id
 		left join project_report_data prd on prd.project_id = a.id
+		LEFT JOIN project_report_data_two prdt ON prdt.project_id = a.id
 		left join rural_project_report_record prr on prr.report_id = prd.id
 		left join sys_user u on u.id = a.create_by
 		left join sys_office o on o.id = a.office_id
@@ -1582,8 +1583,11 @@
 		left join sys_user su on su.id = w1.user_id
 		left join sys_office so on so.id = su.office_id
 		<where>
+			/*判定是否紧急项目【紧急项目 质量复核状态为5】【非紧急项目 签发状态为5】*/
+			IF( a.emergency_project = 0 or a.emergency_project is null , prdt.`status` = 5, prd.`status` = 5 )
 			and a.submit_money = 1
-			and a.del_flag = 0 and project_type in (1,2) and prd.`status`=5
+			and a.del_flag = 0 and project_type in (1,2)
+# 			and prd.`status`=5
 			and a.id not in (select project_id	FROM project_flingbatch_relation r left join project_filingbatch f on f.filing_batch=r.filing_batch	where f.filing_status in(2,3,5) )
 		    and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
 			<if test="projectName != null and projectName != ''">
@@ -1606,6 +1610,7 @@
 		FROM rural_project_records a
 		left join work_contract_info wci on a.contract_id = wci.id
 		left join project_report_data prd on prd.project_id = a.id
+		LEFT JOIN project_report_data_two prdt ON prdt.project_id = a.id
 		left join rural_project_report_record prr on prr.report_id = prd.id
 		left join sys_user u on u.id = a.create_by
 		left join sys_office o on o.id = a.office_id
@@ -1615,11 +1620,13 @@
 		left join sys_user sur on sur.id = a.create_by
 		left join sys_office so on so.id = su.office_id
 		<where>
+		    /*判定是否紧急项目【紧急项目 质量复核状态为5】【非紧急项目 签发状态为5】*/
+			IF( a.emergency_project = 0 or a.emergency_project is null , prdt.`status` = 5, prd.`status` = 5 )
 			<if test="projectName != null and projectName != ''">
 				AND a.project_name like concat(concat('%',#{projectName}),'%')
 			</if>
 			and a.submit_money = 1
-			and a.del_flag = 0 and a.project_type in (1,2) and prd.`status`=5
+			and a.del_flag = 0 and a.project_type in (1,2)
 			/*不捞取已经发起审批并审批状态为2、3、5的项目信息*/
 			and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">

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

@@ -139,6 +139,7 @@
 			parent_ids = #{parentIds},
 			max_deduct = #{maxDeduct},
 			deduct = #{deduct},
+			deductOption = #{deductOption},
 			company_id = #{companyId},
 			order_num = #{orderNum},
 			type = #{type},

src/main/webapp/static/common/css/style.css

@@ -10403,4 +10403,42 @@ td .file_nei{
 td .file_neirong{
     float: left;
     width: 91%
+}
+
+
+.table.reviews > tbody > tr >td >a,
+.table.reviews > tbody > tr >td >div,
+.table.reviews > tbody > tr >td{
+    text-align: center;
+    line-height: 20px;
+}
+
+.table.reviews > tbody > tr > td
+{
+    padding: 0 8px;
+    height: 40px;
+    line-height: 100%;
+}
+.table.reviews > tbody > tr > td >img
+{
+    padding: 8px;
+    line-height: 100%;
+}
+
+.table.reviews{
+    table-layout:fixed;
+}
+
+table.reviews tbody tr:hover{
+    background-color: #d9ecfb;
+}
+table.reviews tbody tr td.input-td{
+    padding: 0;
+}
+table.reviews tbody tr td.input-td input{
+    border:none;
+}
+table.reviews tbody tr td.input-td input:active,
+table.reviews tbody tr td.input-td input:focus{
+    border:solid 1px #0f92fb !important;
 }

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

@@ -103,6 +103,7 @@
 			}
 			$("#total").html(total);
 			$("#maxTotal").html(maxTotal);
+			$("#deTotal").html(maxTotal-total);
         });
 
         function insertTitle(tValue){
@@ -321,8 +322,11 @@
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同类别：</label>
 							<div class="layui-input-block with-icon">
-								<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-								<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+								<div style="overflow: hidden">
+									<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+									<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+								</div>
+								<span style="font-size: 12px;color: red;">施工合同</span>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -1515,15 +1519,15 @@
 			</div>
 			<div>
 				<div class="layui-item layui-col-xs12" >
-					<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+					<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
 						<thead>
 						<tr>
 							<%--<th width="25%">序号</th>--%>
 							<th width="40%">符合内容及评分标准</th>
 							<th width="10%">自校</th>
 							<th width="10%">最高分</th>
-							<th width="20%">打分</th>
-							<th >打分意见</th>
+							<th width="10%">扣分</th>
+							<th >扣分意见</th>
 
 							<%--<th width="15%">操作</th>--%>
 						</tr>
@@ -1555,9 +1559,8 @@
 						<tr>
 							<td colspan="2" style="font-weight: bold">总分</td>
 							<td id="maxTotal"></td>
-							<td id="total" >
-							</td>
-							<td></td>
+							<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>
+							<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>
 						</tr>
 						</tbody>
 					</table>

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

@@ -105,6 +105,8 @@
 				}
 			}
 			$("#maxTotal").html(maxTotal);
+			$("#deTotal").val(maxTotal);
+			$("#total").html(0);
         });
 
         function insertTitle(tValue){
@@ -189,7 +191,9 @@
 								total=total+parseInt(zhi);
 							}
 						}
-						$("#total").val(total);
+						$("#total").html(total);
+						var maxTotal=$("#maxTotal").html();
+						$("#deTotal").val(parseInt(maxTotal)-total);
 						// parent.layer.msg('输入打分项成功',{icon:1});
 					}else {
 						parent.layer.msg(data.error,{icon:2});
@@ -370,8 +374,11 @@
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同类别：</label>
 							<div class="layui-input-block with-icon">
-								<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-								<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+								<div style="overflow: hidden">
+									<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+									<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+								</div>
+								<span style="font-size: 12px;color: red;">施工合同</span>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -1562,15 +1569,15 @@
 					</div>
 					<div>
 						<div class="layui-item layui-col-xs12" >
-							<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+							<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
 								<thead>
 								<tr>
 										<%--<th width="25%">序号</th>--%>
 									<th width="40%">符合内容及评分标准</th>
 									<th width="10%">自校</th>
 									<th width="10%">最高分</th>
-									<th width="10%"><span class="require-item">*</span>打分</th>
-									<th >打分意见</th>
+									<th width="10%">扣分</th>
+									<th >扣分意见</th>
 
 										<%--<th width="15%">操作</th>--%>
 								</tr>
@@ -1582,6 +1589,9 @@
 <%--											<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 id="projectReviewList${index.index}_id" name="projectReviewList[${index.index}].id" type="hidden" value="${workReviewAudit.id}"/>
+										</td>
 										<td title="${workReviewAudit.standardDetail}">
 												${workReviewAudit.standardDetail}
 										</td>
@@ -1592,20 +1602,18 @@
 											<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"  class="form-control layui-input judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入" />
+											<input id="deduct" htmlEscape="false" name="projectReviewList[${index.index}].deduct" class="form-control layui-input" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入" />
 										</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"/>
+											<input id="deductOpinion"  name="projectReviewList[${index.index}].deductOption"  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="maxTotal"></td>
-									<td  class="input-td">
-										<input id="total" name="reviewScore" htmlEscape="false" readonly="true"  style="background-color: #FFFFFF;"  class="form-control layui-input ">
-									</td>
-									<td></td>
+									<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>
+									<td><span style="float: left;line-height: 35px">(得)</span><input id="deTotal" name="reviewScore" htmlEscape="false" readonly="true"  style="background-color: #FFFFFF;width: 20%;float: left;color: red;background-color: rgba(0,0,0,0);border: 0px;"  class="form-control layui-input "></td>
 								</tr>
 								</tbody>
 							</table>

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -334,9 +334,12 @@
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同类别：</label>
 							<div class="layui-input-block with-icon">
-								<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-								<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+								<div style="overflow: hidden">
+									<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+									<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
 									<%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
+								</div>
+								<span style="font-size: 12px;color: red;">施工合同</span>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp

@@ -1594,8 +1594,11 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">合同类别：</label>
 						<div class="layui-input-block with-icon">
-							<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-							<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+							<div style="overflow: hidden">
+								<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+								<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+							</div>
+							<span style="font-size: 12px;color: red;">施工合同</span>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -944,8 +944,11 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同类别：</label>
 					<div class="layui-input-block with-icon">
-						<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-						<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+						<div style="overflow: hidden">
+							<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+							<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+						</div>
+						<span style="font-size: 12px;color: red;">施工合同</span>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportModify.jsp

@@ -862,9 +862,12 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同类别：</label>
 					<div class="layui-input-block with-icon">
-						<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-						<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+						<div style="overflow: hidden">
+							<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+							<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
 							<%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
+						</div>
+						<span style="font-size: 12px;color: red;">施工合同</span>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

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

@@ -620,8 +620,12 @@
                     ,"cancancel":<c:choose><c:when test="${projectRecords.projectStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					,"deleteAdmin":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					,"modifyRecords":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '2' != projectRecords.projectReportStatus && '5' != projectRecords.projectReportStatus && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-					,"reportDataFlag":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && '0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-
+					<c:if test="${'1' == projectRecords.flagAdmin}">
+						,"reportDataFlag":<c:choose><c:when test="${'0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+					</c:if>
+					<c:if test="${'0' == projectRecords.flagAdmin}">
+						,"reportDataFlag":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+					</c:if>
 					</c:when>
                     <c:otherwise>
                     ,"candel":"0"

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectRepordDescriptionAudit.jsp

@@ -341,9 +341,12 @@
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同类别：</label>
 							<div class="layui-input-block with-icon">
-								<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-								<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+								<div style="overflow: hidden">
+									<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+									<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
 									<%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
+								</div>
+								<span style="font-size: 12px;color: red;">施工合同</span>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectRepordDescriptionView.jsp

@@ -309,9 +309,12 @@
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同类别：</label>
 							<div class="layui-input-block with-icon">
-								<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-								<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
-									<%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
+								<div style="overflow: hidden">
+									<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+									<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+										<%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
+								</div>
+								<span style="font-size: 12px;color: red;">施工合同</span>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordAudit.jsp

@@ -8,6 +8,7 @@
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/common/css/style.css"/>
+	<script src="${ctxStatic}/common/html/js/script.js"></script>
 	<%@include file="/webpage/include/treetable.jsp" %>
 	<script type="text/javascript">
         var validateForm;
@@ -30,7 +31,12 @@
 						top.layer.msg('两次案卷号填写不同，请重新输入！', {icon: 0});
 						return;
 					}*/
-                    $('#flag').val('yes');
+					var flags=judgment();
+					if (!flags){
+						return flags;
+					}else{
+						$('#flag').val('yes');
+					}
                 }else{
                     $('#flag').val('no');
                 }
@@ -352,9 +358,12 @@
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同类别：</label>
 							<div class="layui-input-block with-icon">
-								<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-								<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
-									<%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
+								<div style="overflow: hidden">
+									<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+									<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+										<%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
+								</div>
+								<span style="font-size: 12px;color: red;">施工合同</span>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -1408,7 +1417,7 @@
 					<div class="layui-item layui-col-sm11 with-textarea">
 						<label class="layui-form-label "><span class="require-item">*</span>备考表：</label>
 						<div class="layui-input-block">
-							<form:textarea placeholder="请输入备考表内容" path="referenceRemarks" htmlEscape="false" rows="7"  maxlength="500"  class="form-control required"/>
+							<form:textarea placeholder="请输入备考表内容" path="referenceRemarks" htmlEscape="false" rows="7"  maxlength="500"  class="form-control judgment"/>
 						</div>
 					</div>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -590,7 +590,12 @@
 
                     ,"deleteAdmin":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					,"modifyRecords":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '2' != projectRecords.projectReportStatus && '5' != projectRecords.projectReportStatus && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-					,"reportDataFlag":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && '0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+					<c:if test="${'1' == projectRecords.flagAdmin}">
+						,"reportDataFlag":<c:choose><c:when test="${'0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+					</c:if>
+					<c:if test="${'0' == projectRecords.flagAdmin}">
+						,"reportDataFlag":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+					</c:if>
 					</c:when>
                     <c:otherwise>
                     ,"candel":"0"

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

@@ -1594,8 +1594,11 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">合同类别：</label>
 						<div class="layui-input-block with-icon">
-							<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-							<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+							<div style="overflow: hidden">
+								<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+								<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+							</div>
+							<span style="font-size: 12px;color: red;">施工合同</span>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">

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

@@ -125,6 +125,8 @@
 				}
 			}
 			$("#maxTotal").html(maxTotal);
+			$("#deTotal").html(maxTotal);
+			$("#total").html(0);
         });
 
         function insertTitle(tValue){
@@ -211,6 +213,8 @@
 							}
 						}
 						$("#total").html(total);
+						var maxTotal=$("#maxTotal").html();
+						$("#deTotal").html(parseInt(maxTotal)-total);
 						// parent.layer.msg('输入打分项成功',{icon:1});
 					}else {
 						parent.layer.msg(data.error,{icon:2});
@@ -521,9 +525,12 @@
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同类别：</label>
 							<div class="layui-input-block with-icon">
-								<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-								<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+								<div style="overflow: hidden">
+									<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+									<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
 									<%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
+								</div>
+								<span style="font-size: 12px;color: red;">施工合同</span>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -1152,25 +1159,28 @@
 								</div>
 								<div>
 									<div class="layui-item layui-col-xs12" >
-										<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+										<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
 											<thead>
 											<tr>
 													<%--<th width="25%">序号</th>--%>
 												<th width="40%">符合内容及评分标准</th>
 												<th width="10%">自校</th>
 												<th width="10%">最高分</th>
-												<th width="10%"><span class="require-item">*</span>打分</th>
-												<th >打分意见</th>
+												<th width="10%">扣分</th>
+												<th >扣分意见</th>
 
 													<%--<th width="15%">操作</th>--%>
 											</tr>
 											</thead>
-											<tbody>
+											<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}"/>
+													</td>
 													<td title="${workReviewAudit.standardDetail}">
 															${workReviewAudit.standardDetail}
 													</td>
@@ -1181,18 +1191,18 @@
 														<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"  class="form-control layui-input number judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入" />
+														<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" placeholder="请输入打分意见" readonly="true" style="background-color: #FFFFFF;" name="deductOpinion" 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 id="total"></td>
-												<td></td>
+												<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>
+												<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>
 											</tr>
 											</tbody>
 										</table>

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

@@ -109,6 +109,8 @@
 				}
 			}
 			$("#maxTotal").html(maxTotal);
+			$("#deTotal").html(maxTotal);
+			$("#total").html(0);
         });
 
         function insertTitle(tValue){
@@ -188,6 +190,8 @@
 							}
 						}
 						$("#total").html(total);
+						var maxTotal=$("#maxTotal").html();
+						$("#deTotal").html(parseInt(maxTotal)-total);
 						// parent.layer.msg('输入打分项成功',{icon:1});
 					}else {
 						parent.layer.msg(data.error,{icon:2});
@@ -500,9 +504,12 @@
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同类别：</label>
 							<div class="layui-input-block with-icon">
-								<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectcontentinfo.projectReportData.contractCategory=='0'}">checked</c:if>>
-								<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectcontentinfo.projectReportData.contractCategory=='1'}">checked</c:if>>
-									<%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
+								<div style="overflow: hidden">
+									<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectcontentinfo.projectReportData.contractCategory=='0'}">checked</c:if>>
+									<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectcontentinfo.projectReportData.contractCategory=='1'}">checked</c:if>>
+										<%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
+								</div>
+								<span style="font-size: 12px;color: red;">施工合同</span>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -996,15 +1003,15 @@
 								</div>
 								<div>
 									<div class="layui-item layui-col-xs12" >
-										<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+										<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
 											<thead>
 											<tr>
 													<%--<th width="25%">序号</th>--%>
 												<th width="40%">符合内容及评分标准</th>
 												<th width="10%">自校</th>
 												<th width="10%">最高分</th>
-												<th width="10%"><span class="require-item">*</span>打分</th>
-												<th >打分意见</th>
+												<th width="10%">扣分</th>
+												<th >扣分意见</th>
 													<%--<th width="15%">操作</th>--%>
 											</tr>
 											</thead>
@@ -1014,6 +1021,9 @@
 														<%--<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}"/>
+													</td>
 													<td title="${workReviewAudit.standardDetail}">
 															${workReviewAudit.standardDetail}
 													</td>
@@ -1024,19 +1034,18 @@
 														<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"  class="form-control layui-input number judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)"   placeholder="请输入"/>
+														<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" placeholder="请输入打分意见" readonly="true" style="background-color: #FFFFFF;" name="deductOpinion" 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 id="total"></td>
-												<td></td>
-
+												<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>
+												<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>
 											</tr>
 											</tbody>
 										</table>

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

@@ -589,8 +589,11 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">合同类别：</label>
                     <div class="layui-input-block with-icon">
-                        <input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-                        <input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+                        <div style="overflow: hidden">
+                            <input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+                            <input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+                        </div>
+                        <span style="font-size: 12px;color: red;">施工合同</span>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">

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

@@ -491,8 +491,11 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">合同类别：</label>
                     <div class="layui-input-block with-icon">
-                        <input type="radio" title="金额合同" lay-filter="jine" disabled name="projectReportData.contractCategory" id="jine" value="0"  <c:if test="${projectcontentinfo.projectReportData.contractCategory=='0'}">checked</c:if>>
-                        <input type="radio" title="费率合同" lay-filter="jine" disabled name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectcontentinfo.projectReportData.contractCategory=='1'}">checked</c:if>>
+                        <div style="overflow: hidden">
+                            <input type="radio" title="金额合同" lay-filter="jine" disabled name="projectReportData.contractCategory" id="jine" value="0"  <c:if test="${projectcontentinfo.projectReportData.contractCategory=='0'}">checked</c:if>>
+                            <input type="radio" title="费率合同" lay-filter="jine" disabled name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectcontentinfo.projectReportData.contractCategory=='1'}">checked</c:if>>
+                        </div>
+                        <span style="font-size: 12px;color: red;">施工合同</span>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">

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

@@ -873,9 +873,12 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">合同类别：</label>
 						<div class="layui-input-block with-icon">
+							<div style="overflow: hidden">
 								<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
 								<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
 <%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
+							</div>
+							<span style="font-size: 12px;color: red;">施工合同</span>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">

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

@@ -720,9 +720,12 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">合同类别：</label>
 						<div class="layui-input-block with-icon">
+							<div style="overflow: hidden">
 								<input type="radio" title="金额合同" lay-filter="jine" disabled name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectcontentinfo.projectReportData.contractCategory=='0'}">checked</c:if>>
 								<input type="radio" title="费率合同" lay-filter="jine" disabled name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectcontentinfo.projectReportData.contractCategory=='1'}">checked</c:if>>
 <%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
+							</div>
+							<span style="font-size: 12px;color: red;">施工合同</span>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">

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

@@ -63,6 +63,7 @@
 			}
 			$("#total").html(total);
 			$("#maxTotal").html(maxTotal);
+			$("#deTotal").html(maxTotal-total);
 		});
 
 		function readOpenInfo(value) {
@@ -340,8 +341,11 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同类别：</label>
 					<div class="layui-input-block with-icon">
-						<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" disabled <c:if test="${projectcontentinfo.projectReportData.contractCategory=='0'}">checked</c:if>>
-						<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectcontentinfo.projectReportData.contractCategory=='1'}">checked</c:if>>
+						<div style="overflow: hidden">
+							<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" disabled <c:if test="${projectcontentinfo.projectReportData.contractCategory=='0'}">checked</c:if>>
+							<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectcontentinfo.projectReportData.contractCategory=='1'}">checked</c:if>>
+						</div>
+						<span style="font-size: 12px;color: red;">施工合同</span>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -888,15 +892,15 @@
 				</div>
 				<div>
 					<div class="layui-item layui-col-xs12" >
-						<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+						<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
 							<thead>
 							<tr>
 									<%--<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 >扣分意见</th>
 									<%--<th width="15%">操作</th>--%>
 							</tr>
 							</thead>
@@ -926,8 +930,8 @@
 							<tr>
 								<td colspan="2" style="font-weight: bold">总分</td>
 								<td id="maxTotal"></td>
-								<td id="total" ></td>
-								<td style="background-color: #F1f1f1"></td>
+								<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>
+								<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>
 
 							</tr>
 							</tbody>

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

@@ -63,6 +63,7 @@
 			}
 			$("#total").html(total);
 			$("#maxTotal").html(maxTotal);
+			$("#deTotal").html(maxTotal-total);
 		});
 
 		function readOpenInfo(value) {
@@ -340,8 +341,11 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同类别：</label>
 					<div class="layui-input-block with-icon">
-						<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-						<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+						<div style="overflow: hidden">
+							<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+							<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+						</div>
+						<span style="font-size: 12px;color: red;">施工合同</span>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -986,15 +990,15 @@
 				</div>
 				<div>
 					<div class="layui-item layui-col-xs12" >
-						<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+						<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
 							<thead>
 							<tr>
 									<%--<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>扣分意见</th>
 									<%--<th width="15%">操作</th>--%>
 							</tr>
 							</thead>
@@ -1024,8 +1028,8 @@
 							<tr>
 								<td colspan="2" style="font-weight: bold">总分</td>
 								<td id="maxTotal"></td>
-								<td id="total" style="background-color: #F1f1f1"></td>
-								<td style="background-color: #F1f1f1"></td>
+								<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>
+								<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>
 							</tr>
 							</tbody>
 						</table>

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

@@ -78,6 +78,7 @@
 			}
 			$("#total").html(total);
 			$("#maxTotal").html(maxTotal);
+			$("#deTotal").html(maxTotal-total);
 		});
 
 		function openDialogre(title,url,width,height,target,buttons) {
@@ -219,8 +220,11 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同类别：</label>
 					<div class="layui-input-block with-icon">
-						<input type="radio" disabled title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-						<input type="radio" disabled title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+						<div style="overflow: hidden">
+							<input type="radio" disabled title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+							<input type="radio" disabled title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+						</div>
+						<span style="font-size: 12px;color: red;">施工合同</span>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -303,15 +307,15 @@
 				</div>
 				<div>
 					<div class="layui-item layui-col-xs12" >
-						<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+						<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
 							<thead>
 							<tr>
 									<%--<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 >扣分意见</th>
 
 									<%--<th width="15%">操作</th>--%>
 							</tr>
@@ -342,9 +346,8 @@
 							<tr>
 								<td colspan="2" style="font-weight: bold">总分</td>
 								<td id="maxTotal"></td>
-								<td id="total" ></td>
-								<td ></td>
-
+								<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>
+								<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>
 							</tr>
 							</tbody>
 						</table>

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

@@ -78,6 +78,7 @@
 			}
 			$("#total").html(total);
 			$("#maxTotal").html(maxTotal);
+			$("#deTotal").html(maxTotal-total);
 		});
 
 		function openDialogre(title,url,width,height,target,buttons) {
@@ -233,10 +234,14 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同类别：</label>
 					<div class="layui-input-block with-icon">
-						<input type="radio" disabled title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
-						<input type="radio" disabled title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+						<div style="overflow: hidden">
+							<input type="radio" disabled title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+							<input type="radio" disabled title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+						</div>
+						<span style="font-size: 12px;color: red;">施工合同</span>
 					</div>
 				</div>
+
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同价(元)：</label>
 					<div class="layui-input-block with-icon">
@@ -378,8 +383,8 @@
 								<th width="40%">符合内容及评分标准</th>
 								<th width="10%">自校</th>
 								<th width="10%">最高分</th>
-								<th width="10%">打分</th>
-								<th >打分意见</th>
+								<th width="10%">扣分</th>
+								<th >扣分意见</th>
 
 									<%--<th width="15%">操作</th>--%>
 							</tr>
@@ -410,8 +415,8 @@
 							<tr>
 								<td colspan="2" style="font-weight: bold">总分</td>
 								<td id="maxTotal"></td>
-								<td id="total"></td>
-								<td ></td>
+								<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>
+								<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>
 							</tr>
 							</tbody>
 						</table>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -925,7 +925,7 @@
 								<c:if test="${workContractInfo.contractState != 7 && workContractInfo.contractState !=4}">
 									,"cancel":"1"
 								</c:if>
-								,"cancelDel":"1"
+								// ,"cancelDel":"1"
 							</c:if>
 						</c:when>
 						<c:otherwise>