bug修复

src/main/java/com/jeeplus/modules/projectConstruction/web/ContractController.java

@@ -309,9 +309,12 @@ public class ContractController extends BaseController {
     }
 
     private static Double shiftDouble(String moneyStr){
-        moneyStr = moneyStr.replaceAll(",","");
-        Double money = Double.parseDouble(moneyStr);
-        return money;
+        if(StringUtils.isNotBlank(moneyStr)){
+            moneyStr = moneyStr.replaceAll(",","");
+            Double money = Double.parseDouble(moneyStr);
+            return money;
+        }
+        return null;
     }
 
     @RequestMapping("selectcontent")

src/main/java/com/jeeplus/modules/projectrecord/web/implementStage/ProjectInterimPaymentController.java

@@ -260,9 +260,12 @@ public class ProjectInterimPaymentController {
 
 
     private static Double shiftDouble(String moneyStr){
-        moneyStr = moneyStr.replaceAll(",","");
-        Double money = Double.parseDouble(moneyStr);
-        return money;
+        if(StringUtils.isNotBlank(moneyStr)){
+            moneyStr = moneyStr.replaceAll(",","");
+            Double money = Double.parseDouble(moneyStr);
+            return money;
+        }
+        return null;
     }
 
     /**

src/main/resources/mappings/modules/sys/AreaDao.xml

@@ -77,7 +77,7 @@
 		FROM sys_area a
 		<include refid="areaJoins"/>
 		WHERE a.del_flag = #{DEL_FLAG_NORMAL}
-		ORDER BY a.code
+		ORDER BY a.sort=29 desc, a.code
 	</select>
 	
 	<select id="findByParentIdsLike" resultType="Area">

src/main/resources/mappings/modules/workclientinfo/WorkClientInfoDao.xml

@@ -108,10 +108,12 @@
 	</select>
 	
 	<select id="findList" resultType="WorkClientInfo" >
-		SELECT 
+		SELECT
+		su.name as "userName",
 			<include refid="workClientInfoColumns"/>
 		FROM work_client_info a
 		<include refid="workClientInfoJoinsLink"/>
+		left join sys_user su on su.id = a.create_by
 		<if test="workClientLinkman != null and workClientLinkman.name !=null and workClientLinkman.name !=''">
 			LEFT JOIN work_client_linkman b ON a.id = b.client_id
 		</if>

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -1725,7 +1725,7 @@
                 </div>
             </div>
             <%--end--%>
-            <div class="form-group layui-row">
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2><span class="require-item">*</span>项目计划附件信息</h2></div>
                 <div class="layui-item nav-btns">
                     <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
@@ -1745,7 +1745,7 @@
                     <table id="listAttachment" class="table table-bordered table-condensed details">
                         <thead>
                         <tr>
-                                <%-- <th>序号</th>--%>
+                                &lt;%&ndash; <th>序号</th>&ndash;%&gt;
                             <th width="25%">文件</th>
                             <th width="25%">上传人</th>
                             <th width="25%">上传时间</th>
@@ -1755,7 +1755,7 @@
                         <tbody id="file_attachment">
                         <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
                             <tr class="trIdAdds">
-                                    <%-- <td>${status.index + 1}</td>--%>
+                                    &lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;
                                 <c:choose>
                                     <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
@@ -1788,7 +1788,7 @@
                         </tbody>
                     </table>
                 </div>
-            </div>
+            </div>--%>
 
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目组成员列表</h2></div>

src/main/webapp/webpage/modules/workclientinfo/workClientInfoList.jsp

@@ -212,6 +212,7 @@
                 ,{field:'code', align:'center',title: '统一社会信用代码',minWidth:250,templet:function(d){
                         return "<span title='"+ d.code +"'>" + d.code + "</span>";
                     }}
+                ,{field:'userName',align:'center', title: '创建人', width:85}
                 ,{field:'createDate',align:'center', title: '创建时间', width:85}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
@@ -235,6 +236,7 @@
                     ,"number":"${workClientInfo.number}"
 					,"linkman":"${workClientInfo.workClientLinkman.id}"
                     ,"clientName":"${workClientInfo.name}"
+                    ,"userName":"${workClientInfo.userName}"
                     ,"clientProperty":"${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"
 					,"trade":"${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"
                     ,"area":"${workClientInfo.area.name}"