上报数据bug修复

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

@@ -2273,6 +2273,21 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         if(null != reported.getContentsIncludeList() && reported.getContentsIncludeList().size()>0){
             reported.setContentsInclude(String.join(",", reported.getContentsIncludeList()));
         }
+        if(StringUtils.isBlank(reported.getHeTongJia())){
+            reported.setHeTongJia(null);
+        }
+        if(StringUtils.isBlank(reported.getSongShenJia())){
+            reported.setSongShenJia(null);
+        }
+        if(StringUtils.isBlank(reported.getShenDingJia())){
+            reported.setShenDingJia(null);
+        }
+        if(StringUtils.isBlank(reported.getJingHeJianE())){
+            reported.setJingHeJianE(null);
+        }
+        if(StringUtils.isBlank(reported.getJingHeJianLv())){
+            reported.setJingHeJianLv(null);
+        }
     }
 
     /**

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

@@ -1330,9 +1330,9 @@
 
                 <div id="ptDiv">
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">合同价(万元)：</label>
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>合同价(万元)：</label>
                         <div class="layui-input-block with-icon">
-                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number"/>
+                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">

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

@@ -1335,9 +1335,9 @@
 
                 <div id="ptDiv">
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">合同价(万元)：</label>
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>合同价(万元)：</label>
                         <div class="layui-input-block with-icon">
-                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number"/>
+                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">

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

@@ -1350,9 +1350,9 @@
 
                 <div id="ptDiv">
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">合同价(元)：</label>
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>合同价(元)：</label>
                         <div class="layui-input-block with-icon">
-                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number"/>
+                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">

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

@@ -1317,9 +1317,9 @@
 
                 <div id="ptDiv">
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">合同价(万元)：</label>
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>合同价(万元)：</label>
                         <div class="layui-input-block with-icon">
-                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number"/>
+                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">

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

@@ -1321,9 +1321,9 @@
 
                 <div id="ptDiv">
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">合同价(万元)：</label>
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>合同价(万元)：</label>
                         <div class="layui-input-block with-icon">
-                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number"/>
+                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">

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

@@ -147,12 +147,12 @@
 <%--        </ul>--%>
     </div>
     </div>
-    <c:if test="${ruralProjectRecordsReported.id==null}">
+    <c:if test="${empty ruralProjectRecordsReported.id}">
         <div class="topMar">
             <h2>暂无上报信息</h2>
         </div>
     </c:if>
-    <c:if test="${ruralProjectRecordsReported.id!=null}">
+    <c:if test="${not empty ruralProjectRecordsReported.id}">
     <div class="container" style="margin-top: 40px">
         <sys:message content="${message}"/>
         <form:form id="inputForm" modelAttribute="ruralProjectRecordsReported" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessage/auditSaveReported" method="post" class="form-horizontal layui-form">
@@ -332,7 +332,7 @@
                                 </c:when>
                                 <c:otherwise>
                                     <tr>
-                                        <td colspan="6" align="center">暂无数据</td>
+                                        <td colspan="8" align="center">暂无数据</td>
                                     </tr>
                                 </c:otherwise>
                             </c:choose>