项目导出功能调整和bug修复

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecordsExport.java

@@ -263,7 +263,7 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 	private Integer recordState; //是否超期归档状态
 	private String completionStatus; //完成状态
 
-	private String money; //收费金额
+	private Double money; //收费金额
 	private String prdAuditDate; //报告审批通过时间时间
 	private String whetherReportNumber; //是否需要报告号
 	private String signatureFlag; //审定单签章状态
@@ -939,7 +939,7 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 		this.constructionLinkman = constructionLinkman;
 	}
 
-	//@ExcelField(title="上报状态", align=2, sort=19,dictType = "reported_state")
+	@ExcelField(title="上报状态", align=2, sort=19,dictType = "reported_state")
 	public String getReportedState() {
 		return reportedState;
 	}
@@ -1910,12 +1910,12 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 		this.downArchiveStatus = downArchiveStatus;
 	}
 
-	//@ExcelField(title="咨询营业收入(万元)", align=2, sort=20)
-	public String getMoney() {
+	@ExcelField(title="咨询营业收入(万元)", align=2, sort=17)
+	public Double getMoney() {
 		return money;
 	}
 
-	public void setMoney(String money) {
+	public void setMoney(Double money) {
 		this.money = money;
 	}
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -369,6 +369,37 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
         page.setCountFlag(false);
         projectRecords.setPage(page);
 		List<RuralProjectRecordsExport> recordsList = dao.findExportList(projectRecords);
+
+		if(null != recordsList && recordsList.size()>0){
+
+			//查询报告文件、依据性文件、其他文件必填列表以及数据
+			List<MainDictDetail> projectSortCostList = projectSortCostList();
+
+			//查询报告文件、依据性文件、其他文件必填列表以及数据
+			List<MainDictDetail> projectSortList = projectSortList();
+
+			for (RuralProjectRecordsExport info : recordsList) {
+				if("1".equals(info.getProjectType())){  //工程咨询
+
+					for (MainDictDetail infoDetail: projectSortList) {
+						if(info.getAttachmentProjectSort().equals(infoDetail.getValue())){
+							info.setAttachmentProjectSort(infoDetail.getLabel());
+							break;
+						}
+					}
+
+				}else if("2".equals(info.getProjectType())){    //造价审核
+
+					for (MainDictDetail infoDetail: projectSortCostList) {
+						if(info.getAttachmentProjectSort().equals(infoDetail.getValue())){
+							info.setAttachmentProjectSort(infoDetail.getLabel());
+							break;
+						}
+					}
+				}
+			}
+		}
+
 		return recordsList;
 	}
 

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -506,6 +506,8 @@
 		,a.record_state as "recordState"
 		,a.submit_money as "submitMoney"
 		,a.submit_scale as "submitScale"
+		,a.attachment_project_sort as "attachmentProjectSort"
+		,rprr.ZiXunBDE as "ziXunBDE"
 		,(case when a.submit_money = '1' then 'B级' when a.submit_money = '2' then 'A级' else '' end) as projectScale
 		,(case
 		when a.submit_money = '1' and prd.status = '5' then
@@ -513,6 +515,13 @@
 		when a.submit_money = '2' and prdt.status = '5' then
 		'已完成' else '未完成'
 		end) as completionStatus
+		,(case
+		when a.submit_money = '1' and pfp.status = '5' then
+		'已归档'
+		when a.submit_money = '2' and ppf.status = '5' then
+		'已归档' else '未归档'
+		end) as downArchiveStatus
+
 		,a.project_type as projectType,
 		wci.name AS "workContractInfo.name",
 		wci.contract_num as "workContractInfo.contractNum",

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -524,11 +524,11 @@
 							<label class="layui-form-label">创建时间：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
+									   value="<fmt:formatDate value="${ruralProjectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>
                                 <span class="group-sep">-</span>
                                 <input id="endDate" name="endDate" placeholder="结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-                                       value="<fmt:formatDate value="${projectRecords.endDate}" pattern="yyyy-MM-dd"/>"/>
+                                       value="<fmt:formatDate value="${ruralProjectRecords.endDate}" pattern="yyyy-MM-dd"/>"/>
                                 </input>
 							</div>
 						</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -396,11 +396,11 @@
 							<label class="layui-form-label">创建时间：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
+									   value="<fmt:formatDate value="${ruralProjectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>
                                 <span class="group-sep">-</span>
                                 <input id="endDate" name="endDate" placeholder="结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-                                       value="<fmt:formatDate value="${projectRecords.endDate}" pattern="yyyy-MM-dd"/>"/>
+                                       value="<fmt:formatDate value="${ruralProjectRecords.endDate}" pattern="yyyy-MM-dd"/>"/>
                                 </input>
 							</div>
 						</div>