销售计划查询增加查询列;

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/processor/SalesPlanProcessor.java

@@ -4,14 +4,12 @@ import java.util.List;
 import java.util.UUID;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.Assert;
 
 import com.beecode.bcp.type.KObject;
 import com.beecode.inz.query.entity.RowData;
 import com.beecode.inz.query.processor.DataProcessor;
 import com.beecode.inz.query.processor.DataProcessorContext;
 import com.xyst.dinas.biz.service.DinasOrganizationService;
-import com.xyst.dinas.sales.service.SalesPlanService;
 
 /**
  * 销售计划查询处理
@@ -21,32 +19,16 @@ import com.xyst.dinas.sales.service.SalesPlanService;
  */
 public class SalesPlanProcessor implements DataProcessor {
 
-	@Autowired
-	private SalesPlanService salesPlanService;
+//	@Autowired
+//	private SalesPlanService salesPlanService;
 	@Autowired
 	private DinasOrganizationService orgService;
 	
-	
 	@Override
 	public void process(DataProcessorContext context) {
 		List<RowData> rowDatas = context.getRowDatas();
 		for (RowData row : rowDatas) {
 
-			UUID id = UUID.fromString(row.get("id").toString());
-			KObject salesPlan = salesPlanService.queryTempSalesPlan(id);
-			Assert.notNull(salesPlan, "找不到对应的销售计划!");
-			String dinasTypeNames = "";
-			List<KObject> list = salesPlan.get("SalesPlanTempDetails").toList();
-			for (int i = 0; i < list.size(); i++) {
-				KObject detail = list.get(i);
-				if (i == list.size() - 1) {
-					dinasTypeNames += detail.get("dinasType").getString("dinasTypeName");
-				} else {
-					dinasTypeNames += detail.get("dinasType").getString("dinasTypeName") + ",";
-				}
-			}
-			row.put("dinasTypeNames", dinasTypeNames);
-			
 			UUID regionalCompanyId = UUID.fromString(row.get("regionalCompany").toString());
 			KObject regionalCompany = orgService.load(regionalCompanyId);
 			row.put("regionalCompanyName", regionalCompany.getString("name"));

backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/SalesPlan.mk

@@ -10,6 +10,7 @@
   <content>
     <customQuery id='451f4875-82d2-486b-b684-325692e93b28'>
       <kclass>com.xyst.dinas.sales.datamodel.SalesPlan</kclass>
+      <dataProcessor>com.xyst.dinas.sales.processor.SalesPlanProcessor</dataProcessor>
       <authorityItem></authorityItem>
       <innerScene title='全部'>
         <id>c775c023-9960-4039-9e9c-d3ff544308b5</id>

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/SalesPlan.jmx

@@ -10,7 +10,7 @@
 	<content>
 		<m:query>
 			<m:type>com.xyst.dinas.sales.datamodel.SalesPlan</m:type>
-			<m:dataProcessor></m:dataProcessor>
+			<m:dataProcessor>com.xyst.dinas.sales.processor.SalesPlanProcessor</m:dataProcessor>
 			<m:authorityItem></m:authorityItem>
 			<m:innerScenes>
 				<m:innerScene>