From f23f7a18fe8fe3729dfb91af5b55b515b835c7d8 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 17 八月 2023 17:40:16 +0800
Subject: [PATCH] 问题修改

---
 igds-recir/src/main/java/models/recir.model.xml |   96 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/igds-recir/src/main/java/models/recir.model.xml b/igds-recir/src/main/java/models/recir.model.xml
index 1e11730..0e12c47 100644
--- a/igds-recir/src/main/java/models/recir.model.xml
+++ b/igds-recir/src/main/java/models/recir.model.xml
@@ -4,7 +4,7 @@
     <Property name="creationType">com.ld.igds.models.Drug</Property>
     <PropertyDef name="id">
       <Property></Property>
-      <Property name="label">缂栫爜</Property>
+      <Property name="label">缂栫爜鑽墏缂栧彿</Property>
     </PropertyDef>
     <PropertyDef name="companyId">
       <Property></Property>
@@ -25,21 +25,111 @@
       <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="count">
-      <Property name="dataType">int</Property>
+      <Property name="dataType">Double</Property>
       <Property name="label">搴撳瓨閲�</Property>
+      <Property name="required">true</Property>
+      <Property name="displayFormat">#0.000000</Property>
     </PropertyDef>
     <PropertyDef name="updateUser">
       <Property></Property>
       <Property name="label">鎿嶄綔鍛�</Property>
     </PropertyDef>
     <PropertyDef name="updateTime">
-      <Property name="dataType">Date</Property>
+      <Property name="dataType">DateTime</Property>
       <Property name="label">鎿嶄綔鏃堕棿</Property>
     </PropertyDef>
     <PropertyDef name="remarks">
       <Property></Property>
       <Property name="label">澶囨敞淇℃伅</Property>
     </PropertyDef>
+    <PropertyDef name="deptId">
+      <Property></Property>
+      <Property name="label">鎵�灞炲簱鍖�</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+      <Property name="required">false</Property>
+    </PropertyDef>
+    <PropertyDef name="deptName">
+      <Property></Property>
+      <Property name="label">搴撳尯鍚嶇О</Property>
+    </PropertyDef>
+    <PropertyDef name="dwdm">
+      <Property></Property>
+      <Property name="label">鍗曚綅浠ｇ爜</Property>
+    </PropertyDef>
+    <PropertyDef name="cgrq">
+      <Property name="dataType">Date</Property>
+      <Property name="label">閲囪喘鏃ユ湡</Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="bzw">
+      <Property></Property>
+      <Property name="label">鍖呰鐗�</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;drugPR#triggerPackage&quot;).getResult()}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="ggxh">
+      <Property></Property>
+      <Property name="label">鍨嬪彿瑙勬牸</Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="aqsysms">
+      <Property></Property>
+      <Property name="label">瀹夊叏浣跨敤璇存槑涔�</Property>
+    </PropertyDef>
+    <PropertyDef name="sccj">
+      <Property></Property>
+      <Property name="label">鐢熶骇鍘傚</Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="cgly">
+      <Property></Property>
+      <Property name="label">閲囪喘鏉ユ簮</Property>
+    </PropertyDef>
+    <PropertyDef name="cctj">
+      <Property></Property>
+      <Property name="label">瀛樺偍鏉′欢</Property>
+    </PropertyDef>
+    <PropertyDef name="ccdd">
+      <Property></Property>
+      <Property name="label">鍌ㄥ瓨鍦扮偣</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;drugPR#triggerLocation&quot;).getResult()}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="bzwclfs">
+      <Property></Property>
+      <Property name="label">鍖呰鐗╁鐞嗘柟寮�</Property>
+    </PropertyDef>
+    <PropertyDef name="czclfs">
+      <Property></Property>
+      <Property name="label">娈嬫福澶勭悊鏂瑰紡</Property>
+    </PropertyDef>
+    <PropertyDef name="bzq">
+      <Property></Property>
+      <Property name="label">淇濊川鏈�</Property>
+      <Property name="required">true</Property>
+      <Property name="dataType">Date</Property>
+    </PropertyDef>
+    <PropertyDef name="kcsldw">
+      <Property></Property>
+      <Property name="label">搴撳瓨閲忓崟浣�</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;drugPR#triggerUnit&quot;).getResult()}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+    </PropertyDef>
   </DataType>
   <DataType name="dtTempIntelTask">
     <Property name="creationType">com.ld.igds.models.TempIntelTask</Property>

--
Gitblit v1.9.3