Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC001.xml

@@ -184,13 +184,14 @@
         updated_by,  <!-- 更新人 -->
         updated_name,  <!-- 修改人名称 -->
         updated_time,  <!-- 更新时间 -->
-        contract_no  <!-- 合同号 -->
+        contract_no,  <!-- 合同号 -->
+        project_source
         )
         VALUES (#id#, #companyCode#, #companyName#, #depCode#, #depName#, #subcontractCode#, #subcontractName#,
         #genralContractCode#, #genralContractName#, #partyPmName#, #partyPmHpone#, #contractName#, #contractWorkTxt#,
         #projCode#, #projName#, #projType#, #projStatus#, #approvalStatus#, #permissStartDate#, #startDate#, #endDate#,
         #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#,
-        #contractNo#)
+        #contractNo#, #projectSource#)
         <selectKey resultClass="long" keyProperty="id">
             SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGSC001
         </selectKey>
@@ -224,6 +225,7 @@
         proj_code = #projCode#,   <!-- 项目编码 -->
         proj_name = #projName#,   <!-- 项目名称 -->
         proj_type = #projType#,   <!-- 项目性质 -->
+        project_source = #projectSource#,
         proj_status = #projStatus#,   <!-- 项目状态	0:在建；1:完工 -->
         approval_status = #approvalStatus#,   <!-- 审批状态	0:待审；1:审核中；2:已审 -->
         permiss_start_date = #permissStartDate#,   <!-- 准许开工日期 -->
@@ -232,11 +234,9 @@
         updated_by = #updatedBy#,   <!-- 更新人 -->
         updated_name = #updatedName#,   <!-- 修改人名称 -->
         updated_time = #updatedTime#  <!-- 更新时间 -->
-			WHERE
-			id = #id#
+        WHERE id = #id#
     </update>
 
-
 	<update id="batch_complete">
 		UPDATE ${hggpSchema}.HGSC001
 		SET

src/main/java/com/baosight/hggp/hg/wd/sql/HGWD001.xml

@@ -36,12 +36,6 @@
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="accountCode">
-			ACCOUNT_CODE = #accountCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="depCode">
-			DEP_CODE = #depCode#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="createdBy">
 			CREATED_BY = #createdBy#
 		</isNotEmpty>