预警查询完善

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/config/ContractConfiguration.java

@@ -15,8 +15,8 @@ import com.xyst.dinas.contract.internal.dao.ContractInfoDao;
 import com.xyst.dinas.contract.internal.service.ContractServiceImpl;
 import com.xyst.dinas.contract.internal.service.ContractWarnServiceImpl;
 import com.xyst.dinas.contract.listener.ContractProcessEventListener;
+import com.xyst.dinas.contract.query.processor.ContractPerformWarningProcessor;
 import com.xyst.dinas.contract.query.processor.ContractWarnSettingProcessor;
-import com.xyst.dinas.contract.query.processor.PerformWarningProcessor;
 import com.xyst.dinas.contract.service.ContractService;
 import com.xyst.dinas.contract.service.ContractWarnService;
 import com.xyst.dinas.contract.web.ContractController;
@@ -69,9 +69,9 @@ public class ContractConfiguration {
 		return configuration;
 	}
 	
-	@Bean("com.xyst.dinas.contract.query.processor.PerformWarningProcessor")
-	public PerformWarningProcessor performWarningProcessor() {
-		return new PerformWarningProcessor();
+	@Bean("com.xyst.dinas.contract.query.processor.ContractPerformWarningProcessor")
+	public ContractPerformWarningProcessor performWarningProcessor() {
+		return new ContractPerformWarningProcessor();
 	}
 	
 	@Bean("com.xyst.dinas.contract.query.processor.ContractWarnSettingProcessor")

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/query/processor/PerformWarningProcessor.java → backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/query/processor/ContractPerformWarningProcessor.java

@@ -11,7 +11,7 @@ import com.beecode.inz.query.processor.DataProcessor;
 import com.beecode.inz.query.processor.DataProcessorContext;
 import com.xyst.dinas.contract.service.ContractService;
 
-public class PerformWarningProcessor implements DataProcessor {
+public class ContractPerformWarningProcessor implements DataProcessor {
 
 	@Autowired
 	private ContractService contractService;
@@ -21,7 +21,7 @@ public class PerformWarningProcessor implements DataProcessor {
 		List<RowData> rowDatas = context.getRowDatas();
 		for (RowData row : rowDatas) {
 			//合同,项目,购砂单位
-			UUID contractId = UUID.fromString(row.get("id").toString());
+			UUID contractId = UUID.fromString(row.get("billId").toString());
 			KObject contract = contractService.queryContractById(contractId);
 			row.put("projectName", contract.isNull("project") ? "" : contract.get("project").getString("name"));
 			row.put("contractName", contract.getString("contractName"));

backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/ContractWarningExe.mk

@@ -10,7 +10,7 @@
   <content>
     <customQuery id='7226bf7b-a061-4554-bef3-c7968b05fdba'>
       <kclass>com.xyst.dinas.biz.datamodel.WarningExe</kclass>
-      <dataProcessor>com.xyst.dinas.contract.query.processor.PerformWarningProcessor</dataProcessor>
+      <dataProcessor>com.xyst.dinas.contract.query.processor.ContractPerformWarningProcessor</dataProcessor>
       <innerScene title='全部'>
         <id>fa6d9e0d-a774-4f90-b20a-b4b3d5b468a6</id>
         <javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
@@ -50,27 +50,9 @@
         </ref>
         <description></description>
       </field>
-      <field title='购砂单位'>
-        <name>purchaseSandUnitName</name>
-        <type>string</type>
-        <ref>
-          <type></type>
-          <name></name>
-        </ref>
-        <description></description>
-      </field>
-      <field title='项目名称'>
-        <name>projectName</name>
-        <type>string</type>
-        <ref>
-          <type></type>
-          <name></name>
-        </ref>
-        <description></description>
-      </field>
-      <field title='合同名称'>
-        <name>contractName</name>
-        <type>string</type>
+      <field title='业务id'>
+        <name>billId</name>
+        <type>uuid</type>
         <ref>
           <type></type>
           <name></name>

backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/ContractWarningExe.jmx

@@ -10,7 +10,7 @@
 	<content>
 		<m:query>
 			<m:type>com.xyst.dinas.biz.datamodel.WarningExe</m:type>
-			<m:dataProcessor>com.xyst.dinas.contract.query.processor.PerformWarningProcessor</m:dataProcessor>
+			<m:dataProcessor>com.xyst.dinas.contract.query.processor.ContractPerformWarningProcessor</m:dataProcessor>
 			<m:authorityItem></m:authorityItem>
 			<m:innerScenes>
 				<m:innerScene>
@@ -60,29 +60,9 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>purchaseSandUnitName</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>projectName</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>contractName</m:name>
-					<m:title>合同名称</m:title>
-					<m:type>string</m:type>
+					<m:name>billId</m:name>
+					<m:title>业务id</m:title>
+					<m:type>uuid</m:type>
 					<m:ref>
 						<m:name></m:name>
 						<m:type></m:type>