Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/constant/DinasTypeConstant.java

@@ -20,7 +20,7 @@ public interface DinasTypeConstant {
 	/**
 	 * 关联子表的实体名
 	 */
-	String STATION_DINAS_TYPE_DETAIL_ENTITY = "com.xyst.dinas.biz.datamodel.Station$DinasTypeDetail";
+	String STATION_DINAS_TYPE_DETAIL_ENTITY = "com.xyst.dinas.biz.datamodel.StationAssociatedDinasTypeDetail";
 	
 	/** 砂石种类名称*/
 	String DINASTYPE_NAME = "dinasTypeName";

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/RetailInfo.jmx

@@ -94,7 +94,7 @@
 					<m:id>97b70076-09ca-4fb5-b2d0-cd13a4218f19</m:id>
 					<m:name>dinasTypeDetails</m:name>
 					<m:title>售卖的砂石</m:title>
-					<m:type>com.xyst.dinas.biz.datamodel.RetailInfo$DinasTypeDetail[]</m:type>
+					<m:type>com.xyst.dinas.biz.datamodel.RetailInfoAssociatedDinasTypeDetail[]</m:type>
                     <m:description/>
                     <m:default/>
 				</m:attribute>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/RetailInfo$DinasTypeDetail.jmx → backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/RetailInfoAssociatedDinasTypeDetail.jmx

@@ -2,7 +2,7 @@
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
 	<specification>1.0</specification>
 	<id>f146f611-b102-4865-81c8-c4375b6771dc</id>
-	<name>com.xyst.dinas.biz.datamodel.RetailInfo$DinasTypeDetail</name>
+	<name>com.xyst.dinas.biz.datamodel.RetailInfoAssociatedDinasTypeDetail</name>
 	<title>散户购买的砂石种类</title>
 	<define>bcp.type.Class</define>
 	<define-version>1.0</define-version>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/Station$DinasTypeDetail.jmx → backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/StationAssociatedDinasTypeDetail.jmx

@@ -2,7 +2,7 @@
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
 	<specification>1.0</specification>
 	<id>2e4c91d3-9cdf-4af7-90b6-689473b6d142</id>
-	<name>com.xyst.dinas.biz.datamodel.Station$DinasTypeDetail</name>
+	<name>com.xyst.dinas.biz.datamodel.StationAssociatedDinasTypeDetail</name>
 	<title>砂石和场站的关联表</title>
 	<define>bcp.type.Class</define>
 	<define-version>1.0</define-version>

backend/xyst.dinas.biz/src/main/resources/config/DinasType.hbm.xml

@@ -74,7 +74,7 @@
         </property>
     </class>
 
-    <class entity-name="com.xyst.dinas.biz.datamodel.Station$DinasTypeDetail" table="xyst_dinas_biz_station_dinas_type_detail" >
+    <class entity-name="com.xyst.dinas.biz.datamodel.StationAssociatedDinasTypeDetail" table="xyst_dinas_biz_station_dinas_type_detail" >
         <tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
         <id name="id" type="uuid-binary" column="id" length="16">
             <generator class="assigned" />

backend/xyst.dinas.biz/src/main/resources/config/RetailInfo.hbm.xml

@@ -79,11 +79,11 @@
 
         <bag name="dinasTypeDetails" cascade="none" inverse="true" lazy="extra">
             <key column="master_id" not-null="true" />
-            <one-to-many entity-name="com.xyst.dinas.biz.datamodel.RetailInfo$DinasTypeDetail"/>
+            <one-to-many entity-name="com.xyst.dinas.biz.datamodel.RetailInfoAssociatedDinasTypeDetail"/>
         </bag>
     </class>
 
-    <class entity-name="com.xyst.dinas.biz.datamodel.RetailInfo$DinasTypeDetail" table="xyst_dinas_biz_retail_dinas_type_detail" >
+    <class entity-name="com.xyst.dinas.biz.datamodel.RetailInfoAssociatedDinasTypeDetail" table="xyst_dinas_biz_retail_dinas_type_detail" >
         <tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
         <id name="id" type="uuid-binary" column="id" length="16">
             <generator class="assigned" />

backend/xyst.dinas.contract/src/main/resources/config/Contract.hbm.xml

@@ -143,10 +143,10 @@
         </property>
 		<bag name="contractDetails" lazy="true" fetch="select" inverse="true">
 			<key column="master_id" not-null="true" />
-			<one-to-many entity-name="com.xyst.dinas.contract.datamodel.Contract$contractDetail" />
+			<one-to-many entity-name="com.xyst.dinas.contract.datamodel.ContractAssociatedcontractDetail" />
 		</bag>
 	</class>
-	<class entity-name="com.xyst.dinas.contract.datamodel.Contract$contractDetail" table="xyst_dinas_contract_detail">
+	<class entity-name="com.xyst.dinas.contract.datamodel.ContractAssociatedcontractDetail" table="xyst_dinas_contract_detail">
 		<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
         <id name="id" type="uuid-binary" column="id" length="16">
             <generator class="uuid2" />

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/constant/PriceAdjustmentConstant.java

@@ -10,6 +10,6 @@ public interface PriceAdjustmentConstant {
 	/**
 	 * 子项目的实体名
 	 */
-	String DETAIL_ENTITY = "com.xyst.dinas.price.datamodel.PriceAdjustment$DinasTypeDetails";
+	String DETAIL_ENTITY = "com.xyst.dinas.price.datamodel.PriceAdjustmentAssociatedDinasTypeDetails";
 
 }

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/entity/PriceAdjustmentSearchEntity.java

@@ -12,6 +12,7 @@ import java.util.UUID;
  */
 public class PriceAdjustmentSearchEntity<T> extends Page<T> {
     private Integer applyStatus;
+    private Integer adjustmentStatus;
     private List<UUID> stationIds;
     private List<UUID> regionalCompanyIds;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -79,4 +80,12 @@ public class PriceAdjustmentSearchEntity<T> extends Page<T> {
     public void setApplyEndDate(Date applyEndDate) {
         this.applyEndDate = applyEndDate;
     }
+
+    public Integer getAdjustmentStatus() {
+        return adjustmentStatus;
+    }
+
+    public void setAdjustmentStatus(Integer adjustmentStatus) {
+        this.adjustmentStatus = adjustmentStatus;
+    }
 }

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/service/PriceAdjustmentServiceImpl.java

@@ -8,6 +8,7 @@ import com.xyst.dinas.price.entity.PriceAdjustmentEchartReturnEntity;
 import com.xyst.dinas.price.entity.PriceAdjustmentEchartSearchEntity;
 import com.xyst.dinas.price.entity.PriceAdjustmentSearchEntity;
 import com.xyst.dinas.price.entity.StationDinasTypePriceDetail;
+import com.xyst.dinas.price.enumeration.PriceAdjustmentAdjustmentStatusEnum;
 import com.xyst.dinas.price.service.PriceAdjustmentService;
 import com.xyst.dinas.price.service.RegionalCompanyPriceAuthorityService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -139,8 +140,9 @@ public class PriceAdjustmentServiceImpl implements PriceAdjustmentService {
             return;
         }
         for (KObject kObject : kObjects) {
-            kObject.set("applyStatus", BizProcessState.DONE_WITH_REJECT.getValue());
-            kObject.set("failureReason", "本条数据所属生效日已有新记录审批通过,本条系统自动驳回");
+//            kObject.set("applyStatus", BizProcessState.DONE_WITH_REJECT.getValue());
+            kObject.set("adjustmentStatus", PriceAdjustmentAdjustmentStatusEnum.ABOLITION.getValue());
+//            kObject.set("failureReason", "本条数据所属生效日已有新记录审批通过,本条系统自动废弃");
             priceAdjustmentDao.modify(kObject);
         }
 

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/web/PriceAdjustmentController.java

@@ -16,6 +16,7 @@ import com.xyst.dinas.price.entity.PriceAdjustmentSearchEntity;
 import com.xyst.dinas.price.service.PriceAdjustmentService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -215,13 +216,29 @@ public class PriceAdjustmentController {
      */
 
     @GetMapping("getSameMessage")
-    public ResponseObj getSameAdjustmentDateAndLtCreateDateInfo(Date adjustmentDate, Date createTime, UUID stationId){
+    public ResponseObj getSameAdjustmentDateAndLtCreateDateInfo(@DateTimeFormat(pattern = "yyyy-MM-dd")@RequestParam("adjustmentDate") Date adjustmentDate, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @RequestParam("createTime") Date createTime, @DateTimeFormat(pattern = "yyyy-MM-dd")@RequestParam("stationId") UUID stationId){
         List<KObject> sameAdjustmentDateAndLtCreateDateInfo = priceAdjustmentService.getSameAdjustmentDateAndLtCreateDateInfo(adjustmentDate, createTime, stationId);
         if(CollectionUtils.isEmpty(sameAdjustmentDateAndLtCreateDateInfo)){
             String formart1DateString = DateTimeUtils.getFormart1DateString(adjustmentDate);
-            String message = "检查到该场站生效日期为["+formart1DateString+"]下有"+sameAdjustmentDateAndLtCreateDateInfo.size()+"条早先创建并审批通过的记录,当该记录提交审批通过后,会将其它记录置为驳回";
-            return ResponseObj.success(message, sameAdjustmentDateAndLtCreateDateInfo);
+            String message = "检查到该场站生效日期为["+formart1DateString+"]下有"+sameAdjustmentDateAndLtCreateDateInfo.size()+"条早先创建并审批通过的记录,当该记录提交审批通过后,会将其它记录置为失效";
+            return ResponseObj.error(message, sameAdjustmentDateAndLtCreateDateInfo);
+        }
+        return ResponseObj.success();
+    }
+
+    /**
+     * 数据相同时候的提示
+     * @return
+     */
 
+    @GetMapping("getSameMessageById")
+    public ResponseObj getSameById(@RequestParam("id") UUID id){
+        KObject byId = priceAdjustmentService.getById(id);
+        List<KObject> sameAdjustmentDateAndLtCreateDateInfo = priceAdjustmentService.getSameAdjustmentDateAndLtCreateDateInfo(byId.getDate("adjustmentDate"),byId.getDate("createTime") , byId.get("station").getUuid("Id"));
+        if(CollectionUtils.isEmpty(sameAdjustmentDateAndLtCreateDateInfo)){
+            String formart1DateString = DateTimeUtils.getFormart1DateString(byId.getDate("adjustmentDate"));
+            String message = "检查到该场站生效日期为["+formart1DateString+"]下有"+sameAdjustmentDateAndLtCreateDateInfo.size()+"条早先创建并审批通过的记录,当该记录提交审批通过后,会将其它记录置为失效";
+            return ResponseObj.error(message, sameAdjustmentDateAndLtCreateDateInfo);
         }
         return ResponseObj.success();
     }

backend/xyst.dinas.price/src/main/resources/com/xyst/dinas/price/datamodel/PriceAdjustment.jmx

@@ -151,7 +151,7 @@
 					<m:id>862d0182-3296-4481-a1d9-6b0c6fe91aa4</m:id>
 					<m:name>dinasTypeDetails</m:name>
 					<m:title>包含砂石种类和砂石价格子表</m:title>
-					<m:type>com.xyst.dinas.price.datamodel.PriceAdjustment$DinasTypeDetails[]</m:type>
+					<m:type>com.xyst.dinas.price.datamodel.PriceAdjustmentAssociatedDinasTypeDetails[]</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>

backend/xyst.dinas.price/src/main/resources/com/xyst/dinas/price/datamodel/PriceAdjustment$DinasTypeDetails.jmx → backend/xyst.dinas.price/src/main/resources/com/xyst/dinas/price/datamodel/PriceAdjustmentAssociatedDinasTypeDetails.jmx

@@ -2,7 +2,7 @@
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
 	<specification>1.0</specification>
 	<id>cf735008-b2cc-40e3-b2db-843d19b873d1</id>
-	<name>com.xyst.dinas.price.datamodel.PriceAdjustment$DinasTypeDetails</name>
+	<name>com.xyst.dinas.price.datamodel.PriceAdjustmentAssociatedDinasTypeDetails</name>
 	<title>调价申请子表</title>
 	<description>调价申请采砂类型和砂石价格子表</description>
 	<define>bcp.type.Class</define>

backend/xyst.dinas.price/src/main/resources/config/PriceAdjustment.hbm.xml

@@ -106,10 +106,10 @@
         </property>
         <bag name="dinasTypeDetails" lazy="true" fetch="select" inverse="true">
             <key column="master_id" not-null="true" />
-            <one-to-many entity-name="com.xyst.dinas.price.datamodel.PriceAdjustment$DinasTypeDetails" />
+            <one-to-many entity-name="com.xyst.dinas.price.datamodel.PriceAdjustmentAssociatedDinasTypeDetails" />
         </bag>
     </class>
-    <class entity-name="com.xyst.dinas.price.datamodel.PriceAdjustment$DinasTypeDetails" table="xyst_dinas_price_adjustment_dinas_type_detail" >
+    <class entity-name="com.xyst.dinas.price.datamodel.PriceAdjustmentAssociatedDinasTypeDetails" table="xyst_dinas_price_adjustment_dinas_type_detail" >
         <tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer" />
         <id name="id" type="uuid-binary" column="id" length="16">
             <generator class="assigned" />

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/constant/ProductionPlanReportConstant.java

@@ -10,6 +10,6 @@ public interface ProductionPlanReportConstant {
 	/**
 	 * 子项目的实体名
 	 */
-	String DETAIL_ENTITY = "com.xyst.dinas.production.datamodel.ProductionPlanReport$DinasTypeDetails";
+	String DETAIL_ENTITY = "com.xyst.dinas.production.datamodel.ProductionPlanReportAssociatedDinasTypeDetails";
 
 }

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/constant/SandMiningConstant.java

@@ -9,6 +9,6 @@ public interface SandMiningConstant {
 	/**
 	 * 实体名
 	 */
-	String STATION_DETAIL_ENTITY = "com.xyst.dinas.production.datamodel.SandMining$SandMiningStationDetail";
+	String STATION_DETAIL_ENTITY = "com.xyst.dinas.production.datamodel.SandMiningAssociatedSandMiningStationDetail";
 
 }

backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/ProductionPlanReport.jmx

@@ -82,7 +82,7 @@
 					<m:id>862d0182-3296-4481-a1d9-6b0c6fe91aa4</m:id>
 					<m:name>dinasTypeDetails</m:name>
 					<m:title>包含砂石种类和砂石量子表</m:title>
-					<m:type>com.xyst.dinas.production.datamodel.ProductionPlanReport$DinasTypeDetails[]</m:type>
+					<m:type>com.xyst.dinas.production.datamodel.ProductionPlanReportAssociatedDinasTypeDetails[]</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>

backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/ProductionPlanReport$DinasTypeDetails.jmx → backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/ProductionPlanReportAssociatedDinasTypeDetails.jmx

@@ -2,7 +2,7 @@
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
 	<specification>1.0</specification>
 	<id>224beb45-2976-49d7-b408-6fd3c208494e</id>
-	<name>com.xyst.dinas.production.datamodel.ProductionPlanReport$DinasTypeDetails</name>
+	<name>com.xyst.dinas.production.datamodel.ProductionPlanReportAssociatedDinasTypeDetails</name>
 	<title>生产计划子表</title>
 	<description>生产计划采砂类型和砂石量子表</description>
 	<define>bcp.type.Class</define>

backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/SandMining.jmx

@@ -16,7 +16,7 @@
 	<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.ShipInfo</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.SandMiningArea</dependency>
-	<dependency>com.xyst.dinas.production.datamodel.SandMining$SandMiningStationDetail</dependency>
+	<dependency>com.xyst.dinas.production.datamodel.SandMiningAssociatedSandMiningStationDetail</dependency>
 	<content>
 		<m:class>
 			<m:parents>
@@ -151,7 +151,7 @@
 					<m:id>923fc243-b92b-45d5-8876-a8cad89b5ac5</m:id>
 					<m:name>stationDetails</m:name>
 					<m:title>包含场站子表</m:title>
-					<m:type>com.xyst.dinas.production.datamodel.SandMining$SandMiningStationDetail[]</m:type>
+					<m:type>com.xyst.dinas.production.datamodel.SandMiningAssociatedSandMiningStationDetail[]</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>

backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/SandMining$SandMiningStationDetail.jmx → backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/SandMiningAssociatedSandMiningStationDetail.jmx

@@ -2,7 +2,7 @@
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
 	<specification>1.0</specification>
 	<id>5eb36512-4772-4397-a40e-1d257f005278</id>
-	<name>com.xyst.dinas.production.datamodel.SandMining$SandMiningStationDetail</name>
+	<name>com.xyst.dinas.production.datamodel.SandMiningAssociatedSandMiningStationDetail</name>
 	<title>采砂许可证场站表</title>
 	<define>bcp.type.Class</define>
 	<define-version>1.0</define-version>

backend/xyst.dinas.production/src/main/resources/config/ProductionPlanReport.hbm.xml

@@ -69,10 +69,10 @@
         </property>
         <bag name="dinasTypeDetails" lazy="true" fetch="select" inverse="true">
             <key column="master_id" not-null="true" />
-            <one-to-many entity-name="com.xyst.dinas.production.datamodel.ProductionPlanReport$DinasTypeDetails" />
+            <one-to-many entity-name="com.xyst.dinas.production.datamodel.ProductionPlanReportAssociatedDinasTypeDetails" />
         </bag>
     </class>
-    <class entity-name="com.xyst.dinas.production.datamodel.ProductionPlanReport$DinasTypeDetails" table="xyst_dinas_production_plan_report_dinas_type_detail" >
+    <class entity-name="com.xyst.dinas.production.datamodel.ProductionPlanReportAssociatedDinasTypeDetails" table="xyst_dinas_production_plan_report_dinas_type_detail" >
         <tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer" />
         <id name="id" type="uuid-binary" column="id" length="16">
             <generator class="assigned" />

backend/xyst.dinas.production/src/main/resources/config/SandMining.hbm.xml

@@ -108,7 +108,7 @@
 
         <bag name="stationDetails" lazy="true" fetch="select" inverse="true">
             <key column="master_id" not-null="true" />
-            <one-to-many entity-name="com.xyst.dinas.production.datamodel.SandMining$SandMiningStationDetail" />
+            <one-to-many entity-name="com.xyst.dinas.production.datamodel.SandMiningAssociatedSandMiningStationDetail" />
         </bag>
         <property name="sandMiningRange" type="nstring" not-null="false">
             <column name="sand_mining_range" length="3000" >
@@ -137,7 +137,7 @@
         </property>
     </class>
 
-    <class entity-name="com.xyst.dinas.production.datamodel.SandMining$SandMiningStationDetail" table="xyst_dinas_production_sand_mining_station_detail">
+    <class entity-name="com.xyst.dinas.production.datamodel.SandMiningAssociatedSandMiningStationDetail" table="xyst_dinas_production_sand_mining_station_detail">
         <tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
         <id name="id" type="uuid-binary" column="id" length="16">
             <generator class="assigned" />

backend/xyst.dinas.project/src/main/java/com/xyst/dinas/project/constant/ProjectFiledConstant.java

@@ -7,7 +7,7 @@ public interface ProjectFiledConstant {
 	 */
 	String PROJECTFILED_NTITY = "com.xyst.dinas.project.datamodel.ProjectFiled";
 	
-	String PROJECTFILED_DINASTYPE_ENTITY = "com.xyst.dinas.project.datamodel.ProjectFiled$ProjectFiledDinasDetail";
+	String PROJECTFILED_DINASTYPE_ENTITY = "com.xyst.dinas.project.datamodel.ProjectFiledAssociatedProjectFiledDinasDetail";
 
 	/** 项目名称*/
 	String PROJECT_NAME = "projectName";

backend/xyst.dinas.project/src/main/resources/config/ProjectFiled.hbm.xml

@@ -71,14 +71,14 @@
 		</property>
 		<bag name="ProjectFiledDinasDetails" lazy="true" fetch="select" inverse="true">
 			<key column="master_id" not-null="true" />
-			<one-to-many entity-name="com.xyst.dinas.project.datamodel.ProjectFiled$ProjectFiledDinasDetail" />
+			<one-to-many entity-name="com.xyst.dinas.project.datamodel.ProjectFiledAssociatedProjectFiledDinasDetail" />
 		</bag>
 		<bag name="ProjectSubContractorDetails" lazy="true" fetch="select" inverse="true">
 			<key column="master_id" not-null="true" />
-			<one-to-many entity-name="com.xyst.dinas.project.datamodel.ProjectFiled$ProjectSubContractorDetail" />
+			<one-to-many entity-name="com.xyst.dinas.project.datamodel.ProjectFiledAssociatedProjectSubContractorDetail" />
 		</bag>
 	</class>
-	<class entity-name="com.xyst.dinas.project.datamodel.ProjectFiled$ProjectFiledDinasDetail" table="xyst_dinas_project_filed_dinas_detail">
+	<class entity-name="com.xyst.dinas.project.datamodel.ProjectFiledAssociatedProjectFiledDinasDetail" table="xyst_dinas_project_filed_dinas_detail">
 		<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
 		<id name="id" type="uuid-binary" column="id" length="16">
 			<generator class="assigned" />
@@ -93,7 +93,7 @@
 			<column name="master_id"  not-null="false"/>
 		</many-to-one>
 	</class>
-	<class entity-name="com.xyst.dinas.project.datamodel.ProjectFiled$ProjectSubContractorDetail" table="xyst_dinas_project_sub_contractor_detail">
+	<class entity-name="com.xyst.dinas.project.datamodel.ProjectFiledAssociatedProjectSubContractorDetail" table="xyst_dinas_project_sub_contractor_detail">
 		<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
 		<id name="id" type="uuid-binary" column="id" length="16">
 			<generator class="assigned" />

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/constant/SalesPlanConstant.java

@@ -5,7 +5,7 @@ public class SalesPlanConstant {
 	/** 销售计划主表-实体*/
 	public static final String ENTITY = "com.xyst.dinas.sales.datamodel.SalesPlan";
 	/** 销售计划子表-实体*/
-	public static final String ENTITY_DETAIL = "com.xyst.dinas.sales.datamodel.SalesPlan$SalesPlanDetail";
+	public static final String ENTITY_DETAIL = "com.xyst.dinas.sales.datamodel.SalesPlanAssociatedSalesPlanDetail";
 	/** 销售计划子表-名称*/
 	public static final String SalesPlanDetails = "SalesPlanDetails";
 	

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/NeedPlanQueryView.jmx

@@ -134,7 +134,7 @@
 					              "title" : "详情",
 					              "action" : "openDetail",
 					              "param" : {
-					                "detailModelName" : "com.xyst.dinas.sales.datamodel.NeedPlan$NeedPlanDetail",
+					                "detailModelName" : "com.xyst.dinas.sales.datamodel.NeedPlanAssociatedNeedPlanDetail",
 					                "columnList":[
 									        {
 									            "key":"dinasType.dinasTypeName",

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanQueryView.jmx

@@ -147,7 +147,7 @@
 					              "title" : "详情",
 					              "action" : "openDetail",
 					              "param" : {
-					                "detailModelName" : "com.xyst.dinas.sales.datamodel.SalesPlan$SalesPlanDetail",
+					                "detailModelName" : "com.xyst.dinas.sales.datamodel.SalesPlanAssociatedSalesPlanDetail",
 					                "columnList":[
 									        {
 									            "key":"dinasType.dinasTypeName",

backend/xyst.dinas.sales/src/main/resources/config/NeedPlan.hbm.xml

@@ -77,10 +77,10 @@
 		</property>
 		<bag name="NeedPlanDetails" lazy="true" fetch="select" inverse="true">
 			<key column="master_id" not-null="true" />
-			<one-to-many entity-name="com.xyst.dinas.sales.datamodel.NeedPlan$NeedPlanDetail" />
+			<one-to-many entity-name="com.xyst.dinas.sales.datamodel.NeedPlanAssociatedNeedPlanDetail" />
 		</bag>
 	</class>
-	<class entity-name="com.xyst.dinas.sales.datamodel.NeedPlan$NeedPlanDetail" table="xyst_dinas_sales_need_plan_detail">
+	<class entity-name="com.xyst.dinas.sales.datamodel.NeedPlanAssociatedNeedPlanDetail" table="xyst_dinas_sales_need_plan_detail">
 		<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
 		<id name="id" type="uuid-binary" column="id" length="16">
 			<generator class="assigned" />

backend/xyst.dinas.sales/src/main/resources/config/SalesPlan.hbm.xml

@@ -64,10 +64,10 @@
         		
 		<bag name="SalesPlanDetails" lazy="true" fetch="select" inverse="true">
 			<key column="master_id" not-null="true" />
-			<one-to-many entity-name="com.xyst.dinas.sales.datamodel.SalesPlan$SalesPlanDetail" />
+			<one-to-many entity-name="com.xyst.dinas.sales.datamodel.SalesPlanAssociatedSalesPlanDetail" />
 		</bag>
 	</class>
-	<class entity-name="com.xyst.dinas.sales.datamodel.SalesPlan$SalesPlanDetail" table="xyst_dinas_sale_plan_detail">
+	<class entity-name="com.xyst.dinas.sales.datamodel.SalesPlanAssociatedSalesPlanDetail" table="xyst_dinas_sale_plan_detail">
 		<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
         <id name="id" type="uuid-binary" column="id" length="16">
             <generator class="uuid2" />

backend/xyst.dinas.sales/src/main/resources/config/SalesPlanTemp.hbm.xml

@@ -74,10 +74,10 @@
 		
 		<bag name="SalesPlanTempDetails" lazy="true" fetch="select" inverse="true">
 			<key column="master_id" not-null="true" />
-			<one-to-many entity-name="com.xyst.dinas.sales.datamodel.SalesPlanTemp$SalesPlanTempDetail" />
+			<one-to-many entity-name="com.xyst.dinas.sales.datamodel.SalesPlanTempAssociatedSalesPlanTempDetail" />
 		</bag>
 	</class>
-	<class entity-name="com.xyst.dinas.sales.datamodel.SalesPlanTemp$SalesPlanTempDetail" table="xyst_dinas_sale_plan_temp_detail">
+	<class entity-name="com.xyst.dinas.sales.datamodel.SalesPlanTempAssociatedSalesPlanTempDetail" table="xyst_dinas_sale_plan_temp_detail">
 		<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
 		<id name="id" type="uuid-binary" column="id" length="16">
 			<generator class="uuid2" />