From febc84c3cfb20ef148671ada09327103df056949 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 22 五月 2023 16:43:00 +0800
Subject: [PATCH] 调整计划管理模块2

---
 igds-inout/src/main/java/com/ld/igds/m/view/ContractManage01.view.xml                |    2 
 igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml                   |    2 
 igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java       |    4 
 igds-inout/src/main/java/com/ld/igds/models/InoutContract.java                       |  220 +++++++++++++++++++++++++++
 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java |    4 
 igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java                    |    8 
 igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml                  |    2 
 igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java           |   10 
 /dev/null                                                                            |  153 -------------------
 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java         |    6 
 igds-inout/src/main/java/com/ld/igds/m/view/ContractManage03.view.xml                |    2 
 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1504.java         |    6 
 igds-inout/src/main/java/com/ld/igds/m/view/ContractManage02.view.xml                |    2 
 igds-doc/sql/update-v35-to-v40.sql                                                   |    5 
 14 files changed, 248 insertions(+), 178 deletions(-)

diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java
index e3ce47f..734fa74 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java
@@ -5,7 +5,7 @@
 import com.ld.igds.constant.RedisConst;
 import com.ld.igds.log.service.InteStatusLogService;
 import com.ld.igds.models.InteStatusLog;
-import com.ld.igds.models.MContract;
+import com.ld.igds.models.InoutContract;
 import com.ld.igds.sh.dto.ApiResponse;
 import com.ld.igds.sh.dto.Dto1503;
 import com.ld.igds.sh.param.ApiRequest;
@@ -63,7 +63,7 @@
         redisUtil.set(key, param.getEndTime());
 
         //鏌ヨ鍚堝悓淇℃伅
-        List<MContract> dataList = hApiShServiceImpl.listContract(companyId,
+        List<InoutContract> dataList = hApiShServiceImpl.listContract(companyId,
                 startTime, param.getEndTime());
 
         //鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
@@ -79,7 +79,7 @@
         List<DefaultDept> deptList = hApiShServiceImpl.listDept(companyId, companyId);
         DefaultDept dept = deptList.get(0);
         //灏佽鏁版嵁淇℃伅
-        for (MContract contract : dataList) {
+        for (InoutContract contract : dataList) {
             dto1503 = new Dto1503();
 
             dto1503.setHtbh(contract.getId());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1504.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1504.java
index 10cb1a8..d78f304 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1504.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1504.java
@@ -5,7 +5,7 @@
 import com.ld.igds.constant.RedisConst;
 import com.ld.igds.log.service.InteStatusLogService;
 import com.ld.igds.models.InteStatusLog;
-import com.ld.igds.models.MContract;
+import com.ld.igds.models.InoutContract;
 import com.ld.igds.sh.dto.ApiResponse;
 import com.ld.igds.sh.dto.Dto1504;
 import com.ld.igds.sh.param.ApiRequest;
@@ -63,7 +63,7 @@
         redisUtil.set(key, param.getEndTime());
 
         //鏌ヨ鍚堝悓淇℃伅
-        List<MContract> dataList = hApiShServiceImpl.listContract(companyId,
+        List<InoutContract> dataList = hApiShServiceImpl.listContract(companyId,
                 startTime, param.getEndTime());
 
         //鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
@@ -79,7 +79,7 @@
         List<DefaultDept> deptList = hApiShServiceImpl.listDept(companyId, companyId);
         DefaultDept dept = deptList.get(0);
         //灏佽鏁版嵁淇℃伅
-        for (MContract contract : dataList) {
+        for (InoutContract contract : dataList) {
             dto = new Dto1504();
 
             dto.setZznm(contract.getId());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
index d5417f8..7cd9170 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
@@ -767,8 +767,8 @@
 	 * @param endTime
 	 * @return
 	 */
-	public List<MContract> listContract(String companyId, Date startTime, Date endTime){
-		String hql = " from " + MContract.class.getName() + " where companyId =:companyId";
+	public List<InoutContract> listContract(String companyId, Date startTime, Date endTime){
+		String hql = " from " + InoutContract.class.getName() + " where companyId =:companyId";
 
 		Map<String, Object> args = new HashMap<String, Object>();
 		args.put("companyId", companyId);
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
index 7f65933..88ff69d 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
@@ -631,8 +631,8 @@
 	 * @param endTime
 	 * @return
 	 */
-	public List<MContract> listContract(String companyId, Date startTime, Date endTime){
-		String hql = " from " + MContract.class.getName() + " where companyId =:companyId";
+	public List<InoutContract> listContract(String companyId, Date startTime, Date endTime){
+		String hql = " from " + InoutContract.class.getName() + " where companyId =:companyId";
 
 		Map<String, Object> args = new HashMap<String, Object>();
 		args.put("companyId", companyId);
diff --git a/igds-doc/sql/update-v35-to-v40.sql b/igds-doc/sql/update-v35-to-v40.sql
index 5e4b783..d1ed658 100644
--- a/igds-doc/sql/update-v35-to-v40.sql
+++ b/igds-doc/sql/update-v35-to-v40.sql
@@ -2,4 +2,7 @@
 
 -- 淇敼璁″垝琛ㄥ悕绉�
 RENAME TABLE D_M_PLAN TO D_INOUT_PLAN
-RENAME TABLE D_M_PLAN_DETAIL TO D_INOUT_PLAN_DETAIL;
\ No newline at end of file
+RENAME TABLE D_M_PLAN_DETAIL TO D_INOUT_PLAN_DETAIL;
+
+--淇敼鍚堝悓淇℃伅
+RENAME TABLE D_M_CONTRACT TO D_INOUT_CONTRACT;
\ No newline at end of file
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java
index c57645a..13a5496 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java
@@ -3,7 +3,7 @@
 import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
 import com.bstek.dorado.data.provider.Page;
 import com.ld.igds.m.InoutManageUtil;
-import com.ld.igds.models.MContract;
+import com.ld.igds.models.InoutContract;
 import com.ld.igds.util.ContextUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Session;
@@ -16,9 +16,9 @@
 @Component
 public class HContractManageService extends HibernateDao {
 
-	public void pageContract(Page<MContract> page, Map<String, Object> param)
+	public void pageContract(Page<InoutContract> page, Map<String, Object> param)
 			throws Exception {
-		String hql = " from " + MContract.class.getName()
+		String hql = " from " + InoutContract.class.getName()
 				+ " where companyId =:companyId and deptId =:deptId";
 
 		Map<String, Object> args = new HashMap<String, Object>();
@@ -61,7 +61,7 @@
 	}
 
 
-	public void saveContract(MContract data) {
+	public void saveContract(InoutContract data) {
 		if (StringUtils.isEmpty(data.getCompanyId())) {
 			data.setCompanyId(ContextUtil.getCompanyId());
 		}
@@ -86,7 +86,7 @@
 		}
 	}
 
-	public String delContract(MContract data) {
+	public String delContract(InoutContract data) {
 		Session session = this.getSessionFactory().openSession();
 		try {
 			if (null != data.getId()) {
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage01.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage01.view.xml
index a6d22de..8bdf516 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage01.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage01.view.xml
@@ -36,7 +36,7 @@
       </PropertyDef>
     </DataType>
     <DataType name="dtMain">
-      <Property name="creationType">com.ld.igds.models.MContract</Property>
+      <Property name="creationType">com.ld.igds.models.InoutContract</Property>
       <PropertyDef name="id">
         <Property></Property>
         <Property name="label">ID_</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage02.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage02.view.xml
index d7cf635..552b6a3 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage02.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage02.view.xml
@@ -36,7 +36,7 @@
       </PropertyDef>
     </DataType>
     <DataType name="dtMain">
-      <Property name="creationType">com.ld.igds.models.MContract</Property>
+      <Property name="creationType">com.ld.igds.models.InoutContract</Property>
       <PropertyDef name="id">
         <Property></Property>
         <Property name="label">ID_</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage03.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage03.view.xml
index a7ace32..dbe124f 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage03.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage03.view.xml
@@ -4,7 +4,7 @@
   <Context/>
   <Model>
     <DataType name="dtMain">
-      <Property name="creationType">com.ld.igds.models.MContract</Property>
+      <Property name="creationType">com.ld.igds.models.InoutContract</Property>
       <PropertyDef name="id">
         <Property></Property>
         <Property name="label">ID_</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java
index 34a268d..48d46e5 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java
@@ -8,7 +8,7 @@
 import com.ld.igds.m.InoutManageUtil;
 import com.ld.igds.m.service.HContractManageService;
 import com.ld.igds.models.DicTrigger;
-import com.ld.igds.models.MContract;
+import com.ld.igds.models.InoutContract;
 import com.ld.igds.sys.service.SysDeptService;
 import com.ld.igds.util.ContextUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -119,7 +119,7 @@
 	 * @throws Exception
 	 */
 	@DataProvider
-	public void pageContract(Page<MContract> page, Map<String, Object> param) throws Exception {
+	public void pageContract(Page<InoutContract> page, Map<String, Object> param) throws Exception {
 		if (null == param) {
 			param = new HashMap<String, Object>();
 		}
@@ -131,7 +131,7 @@
 	 * @param data
 	 */
 	@DataResolver
-	public void saveContract(MContract data) {
+	public void saveContract(InoutContract data) {
 		service.saveContract(data);
 	}
 
@@ -141,7 +141,7 @@
 	 * @return
 	 */
 	@Expose
-	public String delContract(MContract data) {
+	public String delContract(InoutContract data) {
 		return service.delContract(data);
 	}
 }
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
index 8f17da5..642c3ca 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
@@ -233,7 +233,7 @@
       </PropertyDef>
     </DataType>
     <DataType name="dtContract">
-      <Property name="creationType">com.ld.igds.models.MContract</Property>
+      <Property name="creationType">com.ld.igds.models.InoutContract</Property>
       <PropertyDef name="id">
         <Property></Property>
         <Property name="label">ID_</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml
index 494cb28..1c979bd 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml
@@ -276,7 +276,7 @@
       </PropertyDef>
     </DataType>
     <DataType name="dtContract">
-      <Property name="creationType">com.ld.igds.models.MContract</Property>
+      <Property name="creationType">com.ld.igds.models.InoutContract</Property>
       <PropertyDef name="id">
         <Property></Property>
         <Property name="label">ID_</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutContract.java b/igds-inout/src/main/java/com/ld/igds/models/InoutContract.java
new file mode 100644
index 0000000..5b5c625
--- /dev/null
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutContract.java
@@ -0,0 +1,220 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Desc:
+ * @author: Andy
+ * @update-time: 2023/5/22  鏍规嵁鏂板浗鏍囪皟鏁村悕绉帮紝浼樺寲瀛楁
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_CONTRACT")
+public class InoutContract implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "ID_", length = 40)
+    @PropertyDef(label = "ID_")
+    private String id;
+
+    @Column(name = "COMPANY_ID_", length = 10)
+    @PropertyDef(label = "缁勭粐缂栫爜")
+    private String companyId;
+
+    @Column(name = "DEPT_ID_", length = 40)
+    @PropertyDef(label = "搴撳尯缂栫爜")
+    private String deptId;
+
+
+    @Column(name = "NAME_", length = 50)
+    @PropertyDef(label = "鍚堝悓鍚嶇О")
+    private String name;
+
+//	@Column(name = "PLAN_ID_", length = 40)
+//	@PropertyDef(label = "璁″垝缂栫爜")
+//	private String planId;
+//
+//	@Column(name = "PLAN_NAME_", length = 50)
+//	@PropertyDef(label = "璁″垝鍚嶇О")
+//	private String planName;
+
+    @Column(name = "TYPE_", length = 10)
+    @PropertyDef(label = "涓氬姟绫诲埆", description = "1:閿�鍞悎鍚� 2:閲囪喘鍚堝悓 3:浠ｅ偍鍚堝悓")
+    private String type;
+
+    @Column(name = "CUSTOMER_TYPE_", length = 10)
+    @PropertyDef(label = "瀹㈡埛绫诲瀷", description = "1:浼佷笟 2:涓汉")
+    private String customerType;
+
+    @Column(name = "YEAR_", length = 10)
+    @PropertyDef(label = "骞翠唤")
+    private String year;
+
+    @Column(name = "CUSTOMER_ID_", length = 20)
+    @PropertyDef(label = "绀句細淇＄敤鐮�", description = "濡傛灉鏄紒涓�=瀹㈡埛缁熶竴绀句細淇＄敤浠ｇ爜")
+    private String customerId;
+
+    @Column(name = "CUSTOMER_NAME_", length = 50)
+    @PropertyDef(label = "瀹㈡埛鍚嶇О")
+    private String customerName;
+
+
+    @Column(name = "fddbr", length = 50)
+    @PropertyDef(label = "娉曞畾浠ｈ〃浜�")
+    private String fddbr;
+
+    @Column(name = "txdz", length = 200)
+    @PropertyDef(label = "閫氳鍦板潃")
+    private String txdz;
+
+    @Column(name = "yzbm", length = 6)
+    @PropertyDef(label = "閭斂缂栫爜")
+    private String yzbm;
+
+    @PropertyDef(label = "鑱旂郴浜哄鍚�")
+    @Column(name = "lxrxm", length = 50)
+    private String lxrxm;
+
+    @PropertyDef(label = "鑱旂郴鐢佃瘽")
+    @Column(name = "lxrdh", length = 20)
+    private String lxrdh;
+
+    @PropertyDef(label = "韬唤璇佸彿")
+    @Column(name = "sfzh", length = 20)
+    private String sfzh;
+
+    @PropertyDef(label = "鐢靛瓙淇＄")
+    @Column(name = "dzyx", length = 50)
+    private String dzyx;
+
+    @Column(name = "SIGNING_TIME_")
+    @PropertyDef(label = "绛捐鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd")
+    private Date signingTime;
+
+    @Column(name = "SIGN_ADDRESS_", length = 100)
+    @PropertyDef(label = "绛剧害鍦扮偣")
+    private String signAddress;
+
+    @Column(name = "BEGIN_TIME_")
+    @PropertyDef(label = "绾﹀畾寮�濮嬫椂闂�")
+    private Date beginTime;
+
+    @Column(name = "END_TIME_")
+    @PropertyDef(label = "绾﹀畾瀹屾垚鏃堕棿")
+    private Date endTime;
+
+    @Column(name = "REL_END_TIME_")
+    @PropertyDef(label = "瀹為檯瀹屾垚鏃堕棿")
+    private Date relEndTime;
+
+    @Column(name = "FOOD_VARIETY_", length = 20)
+    @PropertyDef(label = "绮鍝佺")
+    private String foodVariety;
+
+    @Column(name = "FOOD_TYPE_", length = 20)
+    @PropertyDef(label = "绮鎬ц川")
+    private String foodType;
+
+    @Column(name = "PRICE_")
+    @PropertyDef(label = "鍚堝悓鍗曚环锛屽厓/鍚�")
+    private Double price;
+
+    @Column(name = "MONEY_")
+    @PropertyDef(label = "鍚堝悓鎬婚噾棰�", description = "鍗曚綅锛氬厓")
+    private Double money;
+
+    @Column(name = "CONTRACT_AMOUNT_")
+    @PropertyDef(label = "鍚堝悓鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+    private Double contactAmount;
+
+    @Column(name = "COMPLETE_NUM_")
+    @PropertyDef(label = "灞ョ害鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+    private Double completeNum;
+
+    @Column(name = "lybzj")
+    @PropertyDef(label = "灞ョ害淇濊瘉閲�", description = "鍗曚綅锛氬厓")
+    private Double lybzj;
+
+    @PropertyDef(label = "灞ョ害鐜�", description = "鍗曚綅锛�%")
+    @Column(name = "lyl")
+    private Double lyl;
+
+    @Column(name = "jsjg")
+    @PropertyDef(label = "缁撶畻浠锋牸锛屽厓/鍚�")
+    private Double jsjg;
+
+    @PropertyDef(label = "缁撶畻鎬婚噾棰�", description = "鍗曚綅锛氬厓")
+    @Column(name = "jszje")
+    private Double jszje;
+
+    @PropertyDef(label = "缁撶畻涓庡悎鍚屼竴鑷存��", description = "1锛氱鍚� 2锛氫笉绗﹀悎")
+    @Column(name = "jsyhtyzx", length = 1)
+    private String jsyhtyzx;
+
+    @PropertyDef(label = "涓嶄竴鑷村師鍥�")
+    @Column(name = "jsyhtbyzyy", length = 250)
+    private String jsyhtbyzyy;
+
+    @Column(name = "CUSTOMER_BANK_", length = 10)
+    @PropertyDef(label = "瀹㈡埛寮�鎴疯")
+    private String customerBank;
+
+    @Column(name = "CUSTOMER_BANK_ACCOUNT_", length = 40)
+    @PropertyDef(label = "瀹㈡埛鏂硅处鍙�")
+    private String customerBankAccount;
+
+    @Column(name = "CUSTOMER_SIGN_USER_", length = 50)
+    @PropertyDef(label = "瀹㈡埛绛剧害浜�")
+    private String customerSignUser;
+
+    @Column(name = "BANK_", length = 50)
+    @PropertyDef(label = "鏈柟寮�鎴疯")
+    private String bank;
+
+    @Column(name = "BANK_ACCOUNT_", length = 40)
+    @PropertyDef(label = "鏈柟璐﹀彿")
+    private String bankAccount;
+
+    @Column(name = "SIGN_USER_", length = 50)
+    @PropertyDef(label = "鏈柟绛剧害浜�")
+    private String signUser;
+
+    /**
+     * --------瀹℃壒淇℃伅--------
+     **/
+
+    @Column(name = "CREATE_USER_", length = 50)
+    @PropertyDef(label = "鍒涘缓浜�")
+    private String createUser;
+
+    @Column(name = "AUDIT_USER_", length = 50)
+    @PropertyDef(label = "瀹℃壒浜�")
+    private String auditUser;
+
+    @Column(name = "AUDIT_DATE_")
+    @PropertyDef(label = "瀹℃壒鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+    private String auditDate;
+
+    @Column(name = "CREATE_TIME_")
+    @PropertyDef(label = "鍒涘缓鏃堕棿")
+    private Date createTime;
+
+    @Column(name = "wcrq")
+    @PropertyDef(label = "瀹屾垚鏃堕棿")
+    private Date wcrq;
+
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏇存柊鏃堕棿")
+    private Date updateTime;
+
+}
diff --git a/igds-inout/src/main/java/com/ld/igds/models/MContract.java b/igds-inout/src/main/java/com/ld/igds/models/MContract.java
deleted file mode 100644
index 0842b71..0000000
--- a/igds-inout/src/main/java/com/ld/igds/models/MContract.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.ld.igds.models;
-
-import com.bstek.dorado.annotation.PropertyDef;
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 鍚堝悓
- * 
- * @author: chen
- *
- */
-@Data
-@Entity
-@Table(name = "D_M_CONTRACT")
-public class MContract implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name = "ID_", length = 40)
-	@PropertyDef(label = "ID_")
-	private String id;
-
-	@Column(name = "COMPANY_ID_", length = 10)
-	@PropertyDef(label = "缁勭粐缂栫爜")
-	private String companyId;
-
-	@Column(name = "DEPT_ID_", length = 40)
-	@PropertyDef(label = "搴撳尯缂栫爜")
-	private String deptId;
-
-	@Column(name = "PLAN_ID_", length = 40)
-	@PropertyDef(label = "璁″垝缂栫爜")
-	private String planId;
-
-	@Column(name = "PLAN_NAME_", length = 50)
-	@PropertyDef(label = "璁″垝鍚嶇О")
-	private String planName;
-
-	@Column(name = "TYPE_", length = 20)
-	@PropertyDef(label = "鍚堝悓绫诲瀷")
-	private String type;
-
-	@Column(name = "NAME_", length = 50)
-	@PropertyDef(label = "鍚堝悓鍚嶇О")
-	private String name;
-
-	@Column(name = "YEAR_", length = 10)
-	@PropertyDef(label = "骞翠唤")
-	private String year;
-
-	@Column(name = "CUSTOMER_ID_", length = 20)
-	@PropertyDef(label = "瀹㈡埛缂栫爜")
-	private String customerId;
-
-	@Column(name = "CUSTOMER_NAME_", length = 50)
-	@PropertyDef(label = "瀹㈡埛鍚嶇О")
-	private String customerName;
-
-	@Column(name = "CUSTOMER_TYPE_", length = 10)
-	@PropertyDef(label = "瀹㈡埛绫诲瀷")
-	private String customerType;
-
-	@Column(name = "CUSTOMER_BANK_", length = 50)
-	@PropertyDef(label = "瀹㈡埛寮�鎴疯")
-	private String customerBank;
-
-	@Column(name = "CUSTOMER_BANK_ACCOUNT_", length = 40)
-	@PropertyDef(label = "瀹㈡埛寮�鎴疯璐﹀彿")
-	private String customerBankAccount;
-
-	@Column(name = "CUSTOMER_SIGN_USER_", length = 50)
-	@PropertyDef(label = "瀹㈡埛绛剧害浜�")
-	private String customerSignUser;
-
-	@Column(name = "BANK_", length = 50)
-	@PropertyDef(label = "鏈柟寮�鎴疯")
-	private String bank;
-
-	@Column(name = "BANK_ACCOUNT_", length = 40)
-	@PropertyDef(label = "鏈柟寮�鎴疯璐﹀彿")
-	private String bankAccount;
-
-	@Column(name = "SIGN_USER_", length = 50)
-	@PropertyDef(label = "鏈柟绛剧害浜�")
-	private String signUser;
-
-	@Column(name = "SIGN_ADDRESS_", length = 50)
-	@PropertyDef(label = "绛剧害鍦板潃")
-	private String signAddress;
-
-	@Column(name = "PRICE_")
-	@PropertyDef(label = "鍚堝悓鍗曚环锛屽厓/鍏枻")
-	private Double price;
-
-	@Column(name = "MONEY_")
-	@PropertyDef(label = "鍚堝悓鎬婚噾棰�")
-	private Double money;
-
-	@Column(name = "CONTRACT_AMOUNT_")
-	@PropertyDef(label = "鍚堝悓鏁伴噺")
-	private Double contactAmount;
-
-	@Column(name = "COMPLETE_NUM_")
-	@PropertyDef(label = "鍚堝悓瀹屾垚鏁伴噺")
-	private Double completeNum;
-
-
-	@Column(name = "FOOD_VARIETY_", length = 20)
-	@PropertyDef(label = "绮鍝佺")
-	private String foodVariety;
-
-	@Column(name = "FOOD_TYPE_", length = 20)
-	@PropertyDef(label = "绮鎬ц川")
-	private String foodType;
-
-	@Column(name = "PAY_TYPE_", length = 20)
-	@PropertyDef(label = "鏀粯鏂瑰紡")
-	private String payType;
-
-	@Column(name = "CREATE_USER_", length = 50)
-	@PropertyDef(label = "鍒涘缓浜�")
-	private String createUser;
-
-	@Column(name = "CREATE_TIME_")
-	@PropertyDef(label = "鍒涘缓鏃堕棿")
-	private Date createTime;
-
-	@Column(name = "SIGNING_TIME_")
-	@PropertyDef(label = "绛捐鏃堕棿")
-	private Date signingTime;
-
-	@Column(name = "BEGIN_TIME_")
-	@PropertyDef(label = "鏈夋晥寮�濮嬫椂闂�")
-	private Date beginTime;
-
-
-	@Column(name = "END_TIME_")
-	@PropertyDef(label = "鏈夋晥鎴鏃堕棿")
-	private Date endTime;
-
-	@Column(name = "REMARK_", length = 200)
-	@PropertyDef(label = "澶囨敞")
-	private String remark;
-
-}

--
Gitblit v1.9.3