数据上传

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

@@ -666,7 +666,7 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
                 if("2".equals(ruralProjectRecords.getSubmitMoney())){
                     ruralProjectMessageS.saveProjectReportRecord(t,variables,processInstanceId);//保存
                 }else {
-                    ruralProjectRecordTwoService.saveProjectReportRecord(t,variables,processInstanceId);//保存
+                    ruralProjectRecordTwoService.saveProjectReportRecord(t,variables,t.getProcessInstanceId());//保存
                 }
 
             }else {//新增表单保存

src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml

@@ -492,7 +492,7 @@
 			and a.create_by is not null
 
 			and a.process_instance_id in( select process_instance_id from work_activity_process
-			where process_instance_id in(select process_id from work_activity_process_user where user_id = #{user.id} and del_flag=1)
+			where process_instance_id in(select process_id from work_activity_process_user where user_id = #{user.id} and type=1)
 			and del_flag = 0 and (remarks !='[强制撤销]' or remarks is null) and is_approval != 0
 			group by process_instance_id)
 
@@ -554,7 +554,7 @@
 			</if>
 			and a.create_by is not null
 			and a.process_instance_id in( select process_instance_id from work_activity_process
-			where process_instance_id in(select process_id from work_activity_process_user where user_id = #{user.id} and del_flag=1)
+			where process_instance_id in(select process_id from work_activity_process_user where user_id = #{user.id} and type=1)
 			and del_flag = 0 and (remarks !='[强制撤销]' or remarks is null) and is_approval != 0
 			group by process_instance_id)
 		</where>

src/main/webapp/static/oss/ossupload.js

@@ -739,7 +739,7 @@ function multitestCollectionCollect (ossClient, storeAs, file,attachmentId,attac
                         '<input name="workAttachments['+sort+'].fileSize" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.fileSize+'"/>'+
                         '<input id="workAttachments'+sort+'_sort" name="workAttachments['+sort+'].sort" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+sort+'"/>'+
                         '</td>'+
-                        '<td style="padding:0px">'+'<input id="workAttachments'+sort+'_description" name="workAttachments['+sort+'].description" type="text" readonly="readonly" maxlength="250" class="form-control layui-input" required  placeholder="请输入文件描述" onclick="openInfo(\'workAttachments'+sort+'\',this.value)" style="width: 100%;height: 100%;padding:0px;background-color: #FFFFFF;" />'+'</td>'+
+                        '<td style="padding:0px">'+'<input id="workAttachments'+sort+'_description" name="workAttachments['+sort+'].description" type="text" readonly="readonly" maxlength="250" class="form-control layui-input"  placeholder="请输入文件描述" onclick="openInfo(\'workAttachments'+sort+'\',this.value)" style="width: 100%;height: 100%;padding:0px;background-color: #FFFFFF;" />'+'</td>'+
                         '<td class="op-td">'+
                         '<div class="op-btn-box">';
                     if(2 == fileLocation){
@@ -1720,7 +1720,7 @@ function multitestOnProcessAccessory (ossClient, storeAs, file,attachmentId,atta
                         '<input name="workAttachments['+sort+'].fileSize" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.fileSize+'"/>'+
                         '<input id="workAttachments'+sort+'_sort" name="workAttachments['+sort+'].sort" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+sort+'"/>'+
                         '</td>'+
-                        '<td style="padding:0px">'+'<input id="workAttachments'+sort+'_description" name="workAttachments['+sort+'].description" type="text" readonly="readonly" maxlength="250" class="form-control layui-input" required  placeholder="请输入文件描述" onclick="openInfo(\'workAttachments'+sort+'\',this.value)" style="width: 100%;height: 100%;padding:0px;background-color: #FFFFFF;" />'+'</td>'+
+                        '<td style="padding:0px">'+'<input id="workAttachments'+sort+'_description" name="workAttachments['+sort+'].description" type="text" readonly="readonly" maxlength="250" class="form-control layui-input"  placeholder="请输入文件描述" onclick="openInfo(\'workAttachments'+sort+'\',this.value)" style="width: 100%;height: 100%;padding:0px;background-color: #FFFFFF;" />'+'</td>'+
                         '<td class="op-td">'+
                         '<div class="op-btn-box">';
                     if(2 == fileLocation){

src/main/webapp/webpage/include/head.jsp

@@ -98,7 +98,7 @@
         {
              document.write('<script src="http://gosspublic.alicdn.com/aliyun-oss-sdk-4.4.4.min.js"><\/script>');
             document.write('<script src="${ctxStatic}/bos/node_modules/@baiducloud/sdk/dist/baidubce-sdk.bundle.min.js"><\/script>');
-            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?4"><\/script>');
+            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?5"><\/script>');
             /*document.write('<script type="text/javascript" src="${ctxStatic}/bos/bosupload.js"><\/script>');*/
         }
     }
@@ -106,7 +106,7 @@
     {
          document.write('<script src="http://gosspublic.alicdn.com/aliyun-oss-sdk-4.4.4.min.js"><\/script>');
         document.write('<script src="${ctxStatic}/bos/node_modules/@baiducloud/sdk/dist/baidubce-sdk.bundle.min.js"><\/script>');
-        document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?4"><\/script>');
+        document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?5"><\/script>');
         /*document.write('<script type="text/javascript" src="${ctxStatic}/bos/bosupload.js"><\/script>');*/
     }
 

src/main/webapp/webpage/modules/projectAccessory/workAttachmentForm.jsp

@@ -279,7 +279,7 @@
 							<th width="30%">文件预览</th>
 							<th width="80px">上传人</th>
 							<th width="160px">上传时间</th>
-							<th width="30%" ><span style="color: red">* </span>文件描述</th>
+							<th width="30%" >文件描述</th>
 							<th width="200px">操作</th>
 							<th class="hide"></th>
 						</tr>
@@ -336,7 +336,7 @@
 
 								<td>${workClientAttachment.createBy.name}</td>
 								<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-								<td style="padding:0px"><input id="workAttachments${status.index + 1}_description" name="workAttachments[${status.index + 1}].description" type="text" value="${workClientAttachment.description}"  class="form-control layui-input required" placeholder="请输入文件描述" style="width: 100%;height: 100%;padding:0px;background-color: #FFFFFF;" readonly="true" onclick="openInfo('workAttachments${status.index + 1}',this.value)"/></td>
+								<td style="padding:0px"><input id="workAttachments${status.index + 1}_description" name="workAttachments[${status.index + 1}].description" type="text" value="${workClientAttachment.description}"  class="form-control layui-input" placeholder="请输入文件描述" style="width: 100%;height: 100%;padding:0px;background-color: #FFFFFF;" readonly="true" onclick="openInfo('workAttachments${status.index + 1}',this.value)"/></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<span>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp

@@ -671,39 +671,37 @@
 		}
 
 		function getFee() {
+			//送审价
 			var rf = $("#reviewFee").val();
+			//审定价
 			var af = $("#approvalFee").val();
-			if(rf != ''&& af !=''){
-				var hf = parseInt(rf)-parseInt(af);
-				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
-				rate = rate.toFixed(2);
-				hf = hf.toFixed(2);
-				$("#verifyFee").val(hf);
-				$("#verifyRate").val(rate);
+			if(rf != '' && rf != '0.00' && af !='' && af !='0.00'){
+				var hf = (af*100-rf*100)/100;
+				var rate = parseFloat(hf) / parseFloat(rf) * 100
+				$("#verifyFee").val(hf.toFixed(2));
+				$("#verifyRate").val(rate.toFixed(2));
 			}
 			if(af !=''){
-				af = af.toFixed(2);
 				$("#consultFee").val(af)
 			}
 		}
-
 		function getApprovalFee() {
+			//送审价
 			var rf = $("#reviewFee").val();
+			//审定价
 			var af = $("#approvalFee").val();
 			//土建
 			var bf = $("#buildingFee").val();
 			//安装
 			var inf = $("#installFee").val();
-			if(rf != ''&& af !=''){
-				var hf = parseInt(rf)-parseInt(af);
-				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
-				hf = hf.toFixed(2)
-				rate = rate.toFixed(2)
-				$("#verifyFee").val(hf);
-				$("#verifyRate").val(rate);
+			if(rf != '' && rf != '0.00' && af !='' && af !='0.00'){
+				//计算审核增减额
+				var hf = (af*100-rf*100)/100;
+				var rate = parseFloat(hf) / parseFloat(rf) * 100
+				$("#verifyFee").val(hf.toFixed(2));
+				$("#verifyRate").val(rate.toFixed(2));
 			}
 			if(af !=''){
-				af = af.toFixed(2)
 				$("#consultFee").val(af)
 			}
 			$("#buildingFee").val("");