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/enumeration/PlanningCycleEnum.java

+package com.xyst.dinas.biz.enumeration;
+
+public enum PlanningCycleEnum{
+	/**
+	 * 周
+	 */
+     WEEK(0),
+     
+	/**
+	 * 天
+	 */
+     DAY(1);
+	
+	int value;
+
+	PlanningCycleEnum(int value) {
+		this.value = value;
+	}
+
+	public int getValue() {
+		return value;
+	}
+
+}

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/warn/service/WarningSettingServiceImpl.java

@@ -123,7 +123,7 @@ public class WarningSettingServiceImpl implements IWarningSettingService{
 			warSettingIdObj.set("personnel", personnelStr);
 		}
 		String min = warnSetting.getMin();
-		if(min!=null) warSettingIdObj.set("min", min);
+		warSettingIdObj.set("min", min);
 		
 		warnSettingDao.update(warSettingIdObj);
 	}

backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/datamodel/Organization.mk

@@ -37,6 +37,10 @@
  				<annotation id='27df6ead-3e3a-49b1-aa7c-12d9da85d731' attributeId='52e44d71-7372-4cda-b5b2-481172210181' name='length' value='500'>
  				</annotation>
 			</attribute>
+			<attribute id='55314e49-b5c9-4102-b376-d5213d2878a2' name='planningCycle' columnName='planning_cycle' title='计划周期' type='string' default='' precision='' isArray='false'>
+ 				<annotation id='n544a6100-2a92-42e9-8558-6c5e5833c217' attributeId='n2d966eb7-8acf-431b-87fe-147167a15f47' name='length' value='100'>
+ 				</annotation>
+			</attribute>
 			<attribute id='8a9c2549-d7fd-4874-970f-a38c7eaf4955' name='department' columnName='department' title='部门' type='com.beecode.bap.department.datamodel.Department' default='' precision='' isArray='false'>
  				<annotation id='31b269b5-aa63-440d-8ca0-6e9a8d54e5d3' attributeId='b6231426-0fb5-47c3-a7ce-75408c4135b0' name='mappingType' value='many-to-one'>
  				</annotation>

backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/query/Organization.mk

@@ -77,6 +77,15 @@
         </ref>
         <description></description>
       </field>
+      <field title='计划周期'>
+        <name>planningCycle</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
       <field title='创建时间'>
         <name>createTime</name>
         <type>datetime</type>

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

@@ -103,6 +103,20 @@
 					<m:default></m:default>
 				</m:attribute>
 				<m:attribute>
+					<m:annotations>
+						<m:annotation>
+							<m:type>bcp.type.constraint.StringLength</m:type>
+							<m:value>100</m:value>
+						</m:annotation>
+					</m:annotations>
+					<m:id>55314e49-b5c9-4102-b376-d5213d2878a2</m:id>
+					<m:name>planningCycle</m:name>
+					<m:title>计划周期</m:title>
+					<m:type>string</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
 					<m:annotations/>
 					<m:id>8a9c2549-d7fd-4874-970f-a38c7eaf4955</m:id>
 					<m:name>department</m:name>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/Organization.jmx

@@ -91,6 +91,16 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
+					<m:name>planningCycle</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>createTime</m:name>
 					<m:title>创建时间</m:title>
 					<m:type>datetime</m:type>

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

@@ -54,6 +54,9 @@
 		<property name="address" type="nstring" not-null="false">
 			<column name="address" length="100"></column>
 		</property>
+		<property name="planningCycle" type="nstring" not-null="false">
+			<column name="planning_cycle" length="100"></column>
+		</property>
 		<many-to-one name="department" entity-name="com.beecode.bap.department.datamodel.Department" fetch="select">
 			<column name="department"  not-null="false"/>
 		</many-to-one>

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/ContractServiceImpl.java

@@ -261,6 +261,9 @@ public class ContractServiceImpl implements ContractService {
 		jsonObject.put("purchaseSandUnitName", purchaseSandUnitName);
 		jsonObject.put("regionalCompanyId", regionalCompanyId.toString());
 		jsonObject.put("stationId", stationId.toString());
+		jsonObject.put("contractId", contract.getUuid("id"));
+		jsonObject.put("projectId", project.getUuid("id"));
+		jsonObject.put("purchaseSandUnitId", contract.get("purchaseSandUnit").getUuid("id"));
 		return jsonObject.toString();
 	}