Browse Source

报告信息科学计数法问题

user5 4 năm trước cách đây
mục cha
commit
78a28aa855

+ 84 - 56
src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportData.java

@@ -30,7 +30,7 @@ import java.util.Map;
  * @version 2018-06-05
  */
 public class ProjectReportData extends ActEntity<ProjectReportData> {
-	
+
 	private static final long serialVersionUID = 1L;
 	private String companyId;		// 公司id
 	private String officeId;		// 部门id
@@ -90,16 +90,16 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private String upId;
 
 
-	private Double reviewFee;  //送审价
-	private Double approvalFee;  //审定价
-	private Double contractFee;   //合同价
-	private Double verifyFee;    //核增核减额
-	private Double verifyRate;    //核增核减率
-	private Double buildingRate;    //土建比例
-	private Double installRate;    //安装比例
-	private Double consultFee;    //咨询标的额
-	private Double buildingFee;   //土建额
-	private Double installFee;    //安装额
+	private String reviewFee;  //送审价
+	private String approvalFee;  //审定价
+	private String contractFee;   //合同价
+	private String verifyFee;    //核增核减额
+	private String verifyRate;    //核增核减率
+	private String buildingRate;    //土建比例
+	private String installRate;    //安装比例
+	private String consultFee;    //咨询标的额
+	private String buildingFee;   //土建额
+	private String installFee;    //安装额
 	private String recordNum;     //归档申请编号
 	private String templateTypeName;
 	private String conditionType;   //判断条件
@@ -145,7 +145,7 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private HistoricProcessInstance historicProcessInstance;
 	// 流程定义
 	private ProcessDefinition processDefinition;
-	
+
 	public ProjectReportData() {
 		super();
 	}
@@ -161,7 +161,7 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setCompanyId(String companyId) {
 		this.companyId = companyId;
 	}
-	
+
 	public String getOfficeId() {
 		return officeId;
 	}
@@ -178,11 +178,11 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setProject(ProjectRecords project) {
 		this.project = project;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	@ExcelField(title="报告编号", align=2, sort=1)
 	public String getNumber() {
 		return number;
@@ -287,15 +287,15 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setNumber(String number) {
 		this.number = number;
 	}
-	
+
 	public void setType(String type) {
 		this.type = type;
 	}
-	
+
 	public void setAchievementType(String achievementType) {
 		this.achievementType = achievementType;
 	}
-	
+
 	public void setReviewStandard(String reviewStandard) {
 		this.reviewStandard = reviewStandard;
 	}
@@ -303,23 +303,23 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setSignCostOne(User signCostOne) {
 		this.signCostOne = signCostOne;
 	}
-	
+
 	public void setSignCostTwo(User signCostTwo) {
 		this.signCostTwo = signCostTwo;
 	}
-	
+
 	public void setMaster(User master) {
 		this.master = master;
 	}
-	
+
 	public void setReportDate(Date reportDate) {
 		this.reportDate = reportDate;
 	}
-	
+
 	public void setFileStatus(String fileStatus) {
 		this.fileStatus = fileStatus;
 	}
-	
+
 	public void setStatus(String status) {
 		this.status = status;
 	}
@@ -520,67 +520,111 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	}
 
 
-	public Double getReviewFee() {
+	public String getReviewFee() {
 		return reviewFee;
 	}
 
-	public void setReviewFee(Double reviewFee) {
+	public void setReviewFee(String reviewFee) {
 		this.reviewFee = reviewFee;
 	}
 
-	public Double getApprovalFee() {
+	public void setContractName(String contractName) {
+		this.contractName = contractName;
+	}
+
+	public void setTypeName(String typeName) {
+		this.typeName = typeName;
+	}
+
+	public void setProjectName(String projectName) {
+		this.projectName = projectName;
+	}
+
+	public void setProjectNum(String projectNum) {
+		this.projectNum = projectNum;
+	}
+
+	public void setSignCostOneName(String signCostOneName) {
+		this.signCostOneName = signCostOneName;
+	}
+
+	public void setSignCostTwoName(String signCostTwoName) {
+		this.signCostTwoName = signCostTwoName;
+	}
+
+	public void setMasterName(String masterName) {
+		this.masterName = masterName;
+	}
+
+	public String getApprovalFee() {
 		return approvalFee;
 	}
 
-	public void setApprovalFee(Double approvalFee) {
+	public void setApprovalFee(String approvalFee) {
 		this.approvalFee = approvalFee;
 	}
 
-	public Double getContractFee() {
+	public String getContractFee() {
 		return contractFee;
 	}
 
-	public void setContractFee(Double contractFee) {
+	public void setContractFee(String contractFee) {
 		this.contractFee = contractFee;
 	}
 
-	public Double getVerifyFee() {
+	public String getVerifyFee() {
 		return verifyFee;
 	}
 
-	public void setVerifyFee(Double verifyFee) {
+	public void setVerifyFee(String verifyFee) {
 		this.verifyFee = verifyFee;
 	}
 
-	public Double getVerifyRate() {
+	public String getVerifyRate() {
 		return verifyRate;
 	}
 
-	public void setVerifyRate(Double verifyRate) {
+	public void setVerifyRate(String verifyRate) {
 		this.verifyRate = verifyRate;
 	}
 
-	public Double getConsultFee() {
+	public String getBuildingRate() {
+		return buildingRate;
+	}
+
+	public void setBuildingRate(String buildingRate) {
+		this.buildingRate = buildingRate;
+	}
+
+	public String getInstallRate() {
+		return installRate;
+	}
+
+	public void setInstallRate(String installRate) {
+		this.installRate = installRate;
+	}
+
+	public String getConsultFee() {
 		return consultFee;
 	}
 
-	public void setConsultFee(Double consultFee) {
+	public void setConsultFee(String consultFee) {
 		this.consultFee = consultFee;
 	}
 
-	public Double getBuildingFee() {
+	public String getBuildingFee() {
 		return buildingFee;
 	}
 
-	public void setBuildingFee(Double buildingFee) {
+	public void setBuildingFee(String buildingFee) {
 		this.buildingFee = buildingFee;
 	}
 
-	public Double getInstallFee() {
+	public String getInstallFee() {
 		return installFee;
 	}
 
-	public void setInstallFee(Double installFee) {
+	public void setInstallFee(String installFee) {
 		this.installFee = installFee;
 	}
 
@@ -616,22 +660,6 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 		this.tempType = tempType;
 	}
 
-	public Double getBuildingRate() {
-		return buildingRate;
-	}
-
-	public void setBuildingRate(Double buildingRate) {
-		this.buildingRate = buildingRate;
-	}
-
-	public Double getInstallRate() {
-		return installRate;
-	}
-
-	public void setInstallRate(Double installRate) {
-		this.installRate = installRate;
-	}
-
 	public Date getAuditPassDate() {
 		return auditPassDate;
 	}
@@ -743,4 +771,4 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setContractRate(String contractRate) {
 		this.contractRate = contractRate;
 	}
-}
+}

+ 65 - 65
src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecordsReported.java

@@ -52,31 +52,31 @@ public class RuralProjectRecordsReported extends ActEntity<RuralProjectRecordsRe
 	private Double GCGMValue;		//建筑面积或规模
 	private String GCGMUnit;		//计量单位
 	private String PorjectUse;		//工程用途
-	private Double ZiXunBDE;		//咨询标的额(万元)
-	private Double ZiXunBDETJ;		//其中土建造价(万元)
-	private Double ZiXunBDEAZ;		//其中安装造价(万元)
-	private Double CalTJPercent;	//其中土建百分比(%)
-	private Double CalAZPercent;	//其中安装百分比(%)
-	private Double CalZZJUnit;	//单位造价(元)
-
-	private Double CalZZJTJUnit;	//其中土建单位造价(元)
-	private Double CalZZJAZUnit;	//其中安装单位造价(元)
-	private Double HeTongJia;		//合同价(万元)
-	private Double SongShenJia;		//送审价(万元)
-	private Double ShenDingJia;		//审定价(万元)
-	private Double JingHeJianE;		//审核增减额(万元)
-	private Double JingHeJianLv;	//审核增减率(%)
+	private String ZiXunBDE;		//咨询标的额(万元)
+	private String ZiXunBDETJ;		//其中土建造价(万元)
+	private String ZiXunBDEAZ;		//其中安装造价(万元)
+	private String CalTJPercent;	//其中土建百分比(%)
+	private String CalAZPercent;	//其中安装百分比(%)
+	private String CalZZJUnit;	//单位造价(元)
+
+	private String CalZZJTJUnit;	//其中土建单位造价(元)
+	private String CalZZJAZUnit;	//其中安装单位造价(元)
+	private String HeTongJia;		//合同价(万元)
+	private String SongShenJia;		//送审价(万元)
+	private String ShenDingJia;		//审定价(万元)
+	private String JingHeJianE;		//审核增减额(万元)
+	private String JingHeJianLv;	//审核增减率(%)
 
 
 	//主要材料和人工消耗量指标
-	private Double GCYL;			//钢材用量(t)
-	private Double SNYL;			//水泥用量(t)
-	private Double YBTYL;			//预拌砼用量(m³)
-	private Double RGGRYL;			//人工工日用量(工日)
-	private Double GCYLPerUnit;	//钢材消耗指标(kg)
-	private Double SNYLPerUnit;	//水泥消耗指标(kg)
-	private Double YBTYLPerUnit;	//预拌砼消耗指标(m³)
-	private Double RGGRYLPerUnit;	//人工工日消耗指标(工日)
+	private String GCYL;			//钢材用量(t)
+	private String SNYL;			//水泥用量(t)
+	private String YBTYL;			//预拌砼用量(m³)
+	private String RGGRYL;			//人工工日用量(工日)
+	private String GCYLPerUnit;	//钢材消耗指标(kg)
+	private String SNYLPerUnit;	//水泥消耗指标(kg)
+	private String YBTYLPerUnit;	//预拌砼消耗指标(m³)
+	private String RGGRYLPerUnit;	//人工工日消耗指标(工日)
 
 	private List<String> TJProjectList;		//土建工程
 	private List<String> ZSProjectList;	//装饰工程
@@ -308,171 +308,171 @@ public class RuralProjectRecordsReported extends ActEntity<RuralProjectRecordsRe
 		PorjectUse = porjectUse;
 	}
 
-	public Double getZiXunBDE() {
+	public String getZiXunBDE() {
 		return ZiXunBDE;
 	}
 
-	public void setZiXunBDE(Double ziXunBDE) {
+	public void setZiXunBDE(String ziXunBDE) {
 		ZiXunBDE = ziXunBDE;
 	}
 
-	public Double getZiXunBDETJ() {
+	public String getZiXunBDETJ() {
 		return ZiXunBDETJ;
 	}
 
-	public void setZiXunBDETJ(Double ziXunBDETJ) {
+	public void setZiXunBDETJ(String ziXunBDETJ) {
 		ZiXunBDETJ = ziXunBDETJ;
 	}
 
-	public Double getZiXunBDEAZ() {
+	public String getZiXunBDEAZ() {
 		return ZiXunBDEAZ;
 	}
 
-	public void setZiXunBDEAZ(Double ziXunBDEAZ) {
+	public void setZiXunBDEAZ(String ziXunBDEAZ) {
 		ZiXunBDEAZ = ziXunBDEAZ;
 	}
 
-	public Double getCalTJPercent() {
+	public String getCalTJPercent() {
 		return CalTJPercent;
 	}
 
-	public void setCalTJPercent(Double calTJPercent) {
+	public void setCalTJPercent(String calTJPercent) {
 		CalTJPercent = calTJPercent;
 	}
 
-	public Double getCalAZPercent() {
+	public String getCalAZPercent() {
 		return CalAZPercent;
 	}
 
-	public void setCalAZPercent(Double calAZPercent) {
+	public void setCalAZPercent(String calAZPercent) {
 		CalAZPercent = calAZPercent;
 	}
 
-	public Double getCalZZJUnit() {
+	public String getCalZZJUnit() {
 		return CalZZJUnit;
 	}
 
-	public void setCalZZJUnit(Double calZZJUnit) {
+	public void setCalZZJUnit(String calZZJUnit) {
 		CalZZJUnit = calZZJUnit;
 	}
 
-	public Double getCalZZJTJUnit() {
+	public String getCalZZJTJUnit() {
 		return CalZZJTJUnit;
 	}
 
-	public void setCalZZJTJUnit(Double calZZJTJUnit) {
+	public void setCalZZJTJUnit(String calZZJTJUnit) {
 		CalZZJTJUnit = calZZJTJUnit;
 	}
 
-	public Double getCalZZJAZUnit() {
+	public String getCalZZJAZUnit() {
 		return CalZZJAZUnit;
 	}
 
-	public void setCalZZJAZUnit(Double calZZJAZUnit) {
+	public void setCalZZJAZUnit(String calZZJAZUnit) {
 		CalZZJAZUnit = calZZJAZUnit;
 	}
 
-	public Double getHeTongJia() {
+	public String getHeTongJia() {
 		return HeTongJia;
 	}
 
-	public void setHeTongJia(Double heTongJia) {
+	public void setHeTongJia(String heTongJia) {
 		HeTongJia = heTongJia;
 	}
 
-	public Double getSongShenJia() {
+	public String getSongShenJia() {
 		return SongShenJia;
 	}
 
-	public void setSongShenJia(Double songShenJia) {
+	public void setSongShenJia(String songShenJia) {
 		SongShenJia = songShenJia;
 	}
 
-	public Double getShenDingJia() {
+	public String getShenDingJia() {
 		return ShenDingJia;
 	}
 
-	public void setShenDingJia(Double shenDingJia) {
+	public void setShenDingJia(String shenDingJia) {
 		ShenDingJia = shenDingJia;
 	}
 
-	public Double getJingHeJianE() {
+	public String getJingHeJianE() {
 		return JingHeJianE;
 	}
 
-	public void setJingHeJianE(Double jingHeJianE) {
+	public void setJingHeJianE(String jingHeJianE) {
 		JingHeJianE = jingHeJianE;
 	}
 
-	public Double getJingHeJianLv() {
+	public String getJingHeJianLv() {
 		return JingHeJianLv;
 	}
 
-	public void setJingHeJianLv(Double jingHeJianLv) {
+	public void setJingHeJianLv(String jingHeJianLv) {
 		JingHeJianLv = jingHeJianLv;
 	}
 
-	public Double getGCYL() {
+	public String getGCYL() {
 		return GCYL;
 	}
 
-	public void setGCYL(Double GCYL) {
+	public void setGCYL(String GCYL) {
 		this.GCYL = GCYL;
 	}
 
-	public Double getSNYL() {
+	public String getSNYL() {
 		return SNYL;
 	}
 
-	public void setSNYL(Double SNYL) {
+	public void setSNYL(String SNYL) {
 		this.SNYL = SNYL;
 	}
 
-	public Double getYBTYL() {
+	public String getYBTYL() {
 		return YBTYL;
 	}
 
-	public void setYBTYL(Double YBTYL) {
+	public void setYBTYL(String YBTYL) {
 		this.YBTYL = YBTYL;
 	}
 
-	public Double getRGGRYL() {
+	public String getRGGRYL() {
 		return RGGRYL;
 	}
 
-	public void setRGGRYL(Double RGGRYL) {
+	public void setRGGRYL(String RGGRYL) {
 		this.RGGRYL = RGGRYL;
 	}
 
-	public Double getGCYLPerUnit() {
+	public String getGCYLPerUnit() {
 		return GCYLPerUnit;
 	}
 
-	public void setGCYLPerUnit(Double GCYLPerUnit) {
+	public void setGCYLPerUnit(String GCYLPerUnit) {
 		this.GCYLPerUnit = GCYLPerUnit;
 	}
 
-	public Double getSNYLPerUnit() {
+	public String getSNYLPerUnit() {
 		return SNYLPerUnit;
 	}
 
-	public void setSNYLPerUnit(Double SNYLPerUnit) {
+	public void setSNYLPerUnit(String SNYLPerUnit) {
 		this.SNYLPerUnit = SNYLPerUnit;
 	}
 
-	public Double getYBTYLPerUnit() {
+	public String getYBTYLPerUnit() {
 		return YBTYLPerUnit;
 	}
 
-	public void setYBTYLPerUnit(Double YBTYLPerUnit) {
+	public void setYBTYLPerUnit(String YBTYLPerUnit) {
 		this.YBTYLPerUnit = YBTYLPerUnit;
 	}
 
-	public Double getRGGRYLPerUnit() {
+	public String getRGGRYLPerUnit() {
 		return RGGRYLPerUnit;
 	}
 
-	public void setRGGRYLPerUnit(Double RGGRYLPerUnit) {
+	public void setRGGRYLPerUnit(String RGGRYLPerUnit) {
 		this.RGGRYLPerUnit = RGGRYLPerUnit;
 	}
 
@@ -635,4 +635,4 @@ public class RuralProjectRecordsReported extends ActEntity<RuralProjectRecordsRe
 	public void setProjectRecordId(String projectRecordId) {
 		this.projectRecordId = projectRecordId;
 	}
-}
+}

+ 1 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -189,7 +189,7 @@ public class RuralCostProjectMessageController extends BaseController {
             projectReportData.setFileStatus("1");
         }
         if(null != reviewFee){
-            projectReportData.setReviewFee(reviewFee);
+            projectReportData.setReviewFee(String.valueOf(reviewFee));
         }
         projectcontentinfo.setProjectReportData(projectReportData);
 

+ 1 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java

@@ -128,7 +128,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
             projectReportData.setFileStatus("1");
         }
         if(null != reviewFee){
-            projectReportData.setReviewFee(reviewFee);
+            projectReportData.setReviewFee(String.valueOf(reviewFee));
         }
         projectcontentinfo.setProjectReportData(projectReportData);
 

+ 1 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -198,7 +198,7 @@ public class RuralProjectMessageController extends BaseController {
             projectReportData.setFileStatus("1");
         }
         if(null != reviewFee){
-            projectReportData.setReviewFee(reviewFee);
+            projectReportData.setReviewFee(String.valueOf(reviewFee));
         }
         projectcontentinfo.setProjectReportData(projectReportData);
 

+ 1 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewController.java

@@ -135,7 +135,7 @@ public class RuralProjectMessageNewController extends BaseController {
             projectReportData.setFileStatus("1");
         }
         if(null != reviewFee){
-            projectReportData.setReviewFee(reviewFee);
+            projectReportData.setReviewFee(String.valueOf(reviewFee));
         }
         projectcontentinfo.setProjectReportData(projectReportData);
 

+ 4 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm.jsp

@@ -1611,6 +1611,7 @@
 			}
 		});
 		if(validateForm.form()){
+			var t1=new Date().getTime();
 			$($document.getElementById(inputForm)).ajaxSubmit({
 				success:function(data) {
 					var d = data;
@@ -1624,6 +1625,9 @@
 					top.layer.close(index)
 				}
 			});
+
+			var t2=new Date().getTime();
+			console.log(t2-t1);
 		}
 	}