ソースを参照

物资管理,添加读取字段建议结算款(表格中AH列),前端显示该列数据

[user3] 4 年 前
コミット
c2cf67d687

+ 10 - 0
src/main/java/com/jeeplus/modules/sg/audit/information/entity/Information.java

@@ -93,6 +93,8 @@ public class Information extends DataEntity<Information>  {
 	private String appendStatus;
 	//结算审定施工费金额(含税价)
 	private Double settlementPrice;
+	//建议结算款
+	private String suggestedAmount;
 
 	public String getAppendStatus() {
 		return appendStatus;
@@ -438,6 +440,14 @@ public class Information extends DataEntity<Information>  {
 		this.settlementPrice = settlementPrice;
 	}
 
+	public String getSuggestedAmount() {
+		return suggestedAmount;
+	}
+
+	public void setSuggestedAmount(String suggestedAmount) {
+		this.suggestedAmount = suggestedAmount;
+	}
+
 	@Override
 	public String toString() {
 		return "Information{" +

+ 6 - 3
src/main/java/com/jeeplus/modules/sg/audit/information/mapper/xml/InformationMapper.xml

@@ -55,7 +55,8 @@
 		a.secondFinishDate,
 		a.finishDate,
 		a.overdue,
-		a.underCentralized
+		a.underCentralized,
+		a.suggestedAmount
 	</sql>
     <select id="findAllInformationList" resultType="com.jeeplus.modules.sg.audit.information.entity.Information">
 		select project_id,project_name from sj_project_information
@@ -359,7 +360,8 @@
 		secondFinish,
 		secondFinishDate,
 		underCentralized,
-		settlementPrice
+		settlementPrice,
+	 	suggestedAmount
 		) VALUES
 		<foreach collection="information" item="item" index="index" separator="," >
 		(
@@ -391,7 +393,8 @@
 			#{item.secondFinish},
 			#{item.secondFinishDate},
 			#{item.underCentralized},
-			#{item.settlementPrice}
+			#{item.settlementPrice},
+			#{item.suggestedAmount}
             )
 		</foreach>
 	</insert>

+ 7 - 0
src/main/java/com/jeeplus/modules/sg/audit/information/utils/ImportInformation.java

@@ -369,6 +369,11 @@ public  class ImportInformation {
                     BigDecimal b1 = new BigDecimal(Double.parseDouble(civil.toString()));
                     BigDecimal b2 = new BigDecimal(Double.parseDouble(installation.toString()));
                     double settlementPrice = b1.add(b2).doubleValue();
+                    //AH(建议结算款)
+                    Object suggestedAmount = ei.getCellValue(row, 33);
+                    if ("".equals(suggestedAmount)) {
+                        suggestedAmount = "0.0";
+                    }
                     Object projectFirm = ei.getCellValue(row, 39);
                     Object subDate = ei.getCellValue(row, 41);
                     Object releaseDate = ei.getCellValue(row, 42);
@@ -381,6 +386,7 @@ public  class ImportInformation {
                     if (projectTotal.equals("")) {
                         projectTotal = "0.0";
                     }
+
                     information.setProjectId(projectId.toString());
                     information.setProjectName(projectName.toString());
                     information.setProjectType(projectType.toString());
@@ -419,6 +425,7 @@ public  class ImportInformation {
                     information.setCreateDate(new Date());
                     information.setUpdateBy(user);
                     information.setUpdateDate(new Date());
+                    information.setSuggestedAmount(suggestedAmount.toString());
                     informationList.add(information);
                     successNum++;
              }

+ 6 - 0
src/main/webapp/webpage/modules/sg/audit/information/informationList.js

@@ -151,6 +151,12 @@ $(document).ready(function() {
 			   sortName: 'secondFinishDate'
 		   }
 		   ,{
+			   field: 'suggestedAmount',
+			   title: '建议</br>结算款',
+			   width:'80px',
+			   sortName: 'suggestedAmount'
+		   }
+		   ,{
 			   field: 'firstUnits',
 			   title: '一级</br>单位',
 			   width:'60px',