复核标准（打分项改成扣分项）

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;
@@ -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 (StringUtils.isBlank(records.getEmergencyProject()) || "0".equals(records.getEmergencyProject())){
-                reviewId="2";
-            }
-        }
-        Boolean status = false;
-        if (com.jeeplus.common.utils.StringUtils.isBlank(projectReportData.getId())){
-            status = true;
-        }
-        List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
-        if (projectReportData.getProjectReviewList()!=null && projectReportData.getProjectReviewList().size()!=0){
-            infoId=projectReportData.getId();
-            for (WorkReviewAudit workReviewAudit:projectReportData.getProjectReviewList()){
-                String remarks = workReviewAudit.getRemarks();
-                WorkReviewStandard reviewStandard = workReviewStandardService.get(workReviewAudit.getId());
-                if (reviewStandard==null){
-                    workReviewAudit = workReviewStandardService.getAudit(workReviewAudit.getId());
-                    workReviewAudit.setRemarks(remarks);
-                    workReviewAudits.add(workReviewAudit);
-                }else{
-                    workReviewAudit.setReportId(infoId);
-                    workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
-                    workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
-                    workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
-                    workReviewAudit.setSort(reviewStandard.getSort());
-                    if (!status) {
-                        workReviewAudit.setId(null);
+        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())){

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;
@@ -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 (StringUtils.isBlank(records.getEmergencyProject()) || "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/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/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){
@@ -1518,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>
@@ -1558,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});
@@ -1565,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>
@@ -1585,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>
@@ -1595,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/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});
@@ -1155,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>
@@ -1184,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});
@@ -999,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>
@@ -1017,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>
@@ -1027,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/projectRecordsMessageTwoView.jsp

@@ -63,6 +63,7 @@
 			}
 			$("#total").html(total);
 			$("#maxTotal").html(maxTotal);
+			$("#deTotal").html(maxTotal-total);
 		});
 
 		function readOpenInfo(value) {
@@ -891,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>
@@ -929,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) {
@@ -989,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>
@@ -1027,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) {
@@ -306,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>
@@ -345,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) {
@@ -382,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>
@@ -414,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>