;

backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/processor/FinanceRefundProcessor.java

@@ -25,8 +25,8 @@ public class FinanceRefundProcessor implements DataProcessor {
 
 	@Autowired
 	private DinasOrganizationService orgService;
-	@Autowired
-	private PurchaseSandCompanyService purchaseSandCompanyService;
+//	@Autowired
+//	private PurchaseSandCompanyService purchaseSandCompanyService;
 	
 	@Override
 	public void process(DataProcessorContext context) {
@@ -37,9 +37,9 @@ public class FinanceRefundProcessor implements DataProcessor {
 			KObject regionalCompany = orgService.load(regionalCompanyId);
 			row.put("regionalCompanyName", regionalCompany.getString("name"));
 			
-			UUID purchaseSandCompanyId = UUID.fromString(row.get("purchaseSandCompany.id").toString());
-			KObject purchaseSandCompany = purchaseSandCompanyService.getById(purchaseSandCompanyId);
-			row.put("purchaseSandCompanyName", purchaseSandCompany.getString("name"));
+//			UUID purchaseSandCompanyId = UUID.fromString(row.get("purchaseSandCompany.id").toString());
+//			KObject purchaseSandCompany = purchaseSandCompanyService.getById(purchaseSandCompanyId);
+//			row.put("purchaseSandCompanyName", purchaseSandCompany.getString("name"));
 			
 			String fundTypeName = null;
 			int fundType = Integer.valueOf(row.get(FinanceRefundConstant.fundType).toString());

backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/FinanceRefund.mk

@@ -57,7 +57,15 @@
         </ref>
         <description></description>
       </field>
-
+      <field title='购砂单位名称'>
+        <name>purchaseSandCompany.name</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
       <field title='退款状态'>
         <name>refundState</name>
         <type>string</type>

backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/FinanceRefund.jmx

@@ -67,6 +67,16 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
+					<m:name>purchaseSandCompany.name</m:name>
+					<m:title>购砂单位名称</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
 					<m:name>refundState</m:name>
 					<m:title>退款状态</m:title>
 					<m:type>string</m:type>