Merge remote-tracking branch 'origin/master'

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/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("");