Merge branch 'master' of http://47.103.50.109:8091/huazheng/huazheng-project-flink.git

src/main/java/com/huazheng/project/mssql/model/SampleApplicationProcess.java

@@ -38,6 +38,7 @@ public class SampleApplicationProcess implements Serializable {
 
 	private String sys_incstatus; // 状态 
 	private String pCBCS2chanPinYY;
+	private String xiaoShouBMv; // 销售部门编号
 	
 	private String ziSHiYBv; // 子事业部
 	

src/main/resources/devtools/table/mssql/SampleApplicationProcess.sql

@@ -22,3 +22,4 @@ Distributed by (id);
 alter table SampleApplicationProcess add column pCBCS2chanPinYY text;
 alter table SampleApplicationProcess add column ziSHiYBv text;
 alter table SampleApplicationProcess add column sys_incstatus text;
+alter table SampleApplicationProcess add column xiaoShouBMv text;

src/main/resources/mapper/greenplum/GPMapper_greenplum.xml

@@ -296,9 +296,9 @@
     </select>
     <insert id="insertSampleApplicationProcess" parameterType="com.huazheng.project.mssql.model.SampleApplicationProcess">
     	insert into SampleApplicationProcess (id, dingDanLXv, dingDanLXt, sYS_INCIDENT, yeWuYID, xuFangGS, xuFangGSID, 
-    		yangPinLXv, yangPinLXt, pCBCS, chanPinYY, jiFuBZ, sYS_UPDATETIME,pCBCS2chanPinYY, ziSHiYBv, sys_incstatus, hashResult) 
+    		yangPinLXv, yangPinLXt, pCBCS, chanPinYY, jiFuBZ, sYS_UPDATETIME,pCBCS2chanPinYY, ziSHiYBv, sys_incstatus, xiaoShouBMv, hashResult) 
     	values(#{id}, #{dingDanLXv}, #{dingDanLXt}, #{sYS_INCIDENT}, #{yeWuYID}, #{xuFangGS}, #{xuFangGSID}, 
-    		#{yangPinLXv}, #{yangPinLXt}, #{pCBCS}, #{chanPinYY}, #{jiFuBZ}, #{sYS_UPDATETIME},#{pCBCS2chanPinYY},#{ziSHiYBv},#{sys_incstatus},#{hashResult})
+    		#{yangPinLXv}, #{yangPinLXt}, #{pCBCS}, #{chanPinYY}, #{jiFuBZ}, #{sYS_UPDATETIME},#{pCBCS2chanPinYY},#{ziSHiYBv},#{sys_incstatus},#{xiaoShouBMv},#{hashResult})
     </insert>
     <delete id="deleteSampleApplicationProcess" parameterType="com.huazheng.project.mssql.model.SampleApplicationProcess">
     	delete from SampleApplicationProcess where id = #{id}
@@ -307,7 +307,7 @@
     	update SampleApplicationProcess set
     		dingDanLXv = #{dingDanLXv}, dingDanLXt = #{dingDanLXt}, sYS_INCIDENT = #{sYS_INCIDENT}, yeWuYID = #{yeWuYID}, xuFangGS = #{xuFangGS}, xuFangGSID = #{xuFangGSID}, 
     		yangPinLXv = #{yangPinLXv}, yangPinLXt = #{yangPinLXt}, pCBCS = #{pCBCS}, chanPinYY = #{chanPinYY}, jiFuBZ = #{jiFuBZ}, 
-    		sYS_UPDATETIME = #{sYS_UPDATETIME},pCBCS2chanPinYY=#{pCBCS2chanPinYY},ziSHiYBv=#{ziSHiYBv}, sys_incstatus=#{sys_incstatus}, hashResult = #{hashResult}
+    		sYS_UPDATETIME = #{sYS_UPDATETIME},pCBCS2chanPinYY=#{pCBCS2chanPinYY},ziSHiYBv=#{ziSHiYBv}, sys_incstatus=#{sys_incstatus}, xiaoShouBMv=#{xiaoShouBMv}, hashResult = #{hashResult}
     	where id = #{id}
     </update>
 	<select id="selectSampleApplicationProcessCheck" parameterType="com.huazheng.project.mssql.model.SampleApplicationProcess" resultType="com.huazheng.project.mssql.model.SampleApplicationProcess">

src/main/resources/mapper/mssql/CrmMapper_mssql.xml

@@ -28,7 +28,7 @@
     <select id="selectSampleApplicationProcessNew" parameterType="SampleApplicationProcess" resultType="SampleApplicationProcess">
 		select top 20 
 			id,dingDanLXv,dingDanLXt,sYS_INCIDENT,yeWuYID,xuFangGS,xuFangGSID,
-			yangPinLXv,yangPinLXt,pCBCS,chanPinYY,jiFuBZ,sYS_UPDATETIME,concat(pCBCS,'层/',chanPinYY) as pCBCS2chanPinYY,ziSHiYBv,sys_incstatus
+			yangPinLXv,yangPinLXt,pCBCS,chanPinYY,jiFuBZ,sYS_UPDATETIME,concat(pCBCS,'层/',chanPinYY) as pCBCS2chanPinYY,ziSHiYBv,sys_incstatus,xiaoShouBMv
 		from "Biz_样品申请流程"
 		where id &gt; #{id}
     </select>
@@ -93,7 +93,7 @@
     <select id="selectSampleApplicationProcessCheckByUpdate" parameterType="SampleApplicationProcess" resultType="SampleApplicationProcess">
     	select top 20 
 			id,dingDanLXv,dingDanLXt,sYS_INCIDENT,yeWuYID,xuFangGS,xuFangGSID,
-			yangPinLXv,yangPinLXt,pCBCS,chanPinYY,jiFuBZ,sYS_UPDATETIME,concat(pCBCS,'层/',chanPinYY) as pCBCS2chanPinYY,ziSHiYBv,sys_incstatus
+			yangPinLXv,yangPinLXt,pCBCS,chanPinYY,jiFuBZ,sYS_UPDATETIME,concat(pCBCS,'层/',chanPinYY) as pCBCS2chanPinYY,ziSHiYBv,sys_incstatus,xiaoShouBMv
 		from "Biz_样品申请流程"
 		where id &gt; #{id} 
 			and sys_updatetime is not null and CONVERT(varchar(10),sys_updatetime,120) = CONVERT(varchar(10),GETDATE(),120)
@@ -154,7 +154,7 @@
     </select>
 	<select id="selectSampleApplicationProcessById" parameterType="SampleApplicationProcess" resultType="SampleApplicationProcess">
     	select id,dingDanLXv,dingDanLXt,sYS_INCIDENT,yeWuYID,xuFangGS,xuFangGSID,
-    		yangPinLXv,yangPinLXt,pCBCS,chanPinYY,jiFuBZ,sYS_UPDATETIME,concat(pCBCS,'层/',chanPinYY) as pCBCS2chanPinYY,ziSHiYBv,sys_incstatus
+    		yangPinLXv,yangPinLXt,pCBCS,chanPinYY,jiFuBZ,sYS_UPDATETIME,concat(pCBCS,'层/',chanPinYY) as pCBCS2chanPinYY,ziSHiYBv,sys_incstatus,xiaoShouBMv
     	from "Biz_样品申请流程" 
     	where id = #{id}
     </select>

src/main/resources/mapper/mssql2/HzcrmMapper_mssql2.xml

@@ -19,7 +19,7 @@
     <select id="selectSysSAPreturnNoNew" parameterType="SysSAPreturnNo" resultType="SysSAPreturnNo">
 		select top 20 a.* from (
 			select id as rowids,
-				id,processName,shiLiH,sapNo,chuangJianSJ
+				id,processName,shiLiH,('00'+sapNo) as sapNo,chuangJianSJ
 			from Sys_SAPreturnNo
 		) a where a.rowids &gt; #{rowids}
     </select>
@@ -46,7 +46,7 @@
     
     
 	<select id="selectSysSAPreturnNoById" parameterType="SysSAPreturnNo" resultType="SysSAPreturnNo">
-    	select id,processName,shiLiH,sapNo,chuangJianSJ from Sys_SAPreturnNo where id = #{id}
+    	select id,processName,shiLiH,('00'+sapNo) as sapNo,chuangJianSJ from Sys_SAPreturnNo where id = #{id}
     </select>
 	<select id="selectTKeHuById" parameterType="TKeHu" resultType="TKeHu">
     	SELECT keHuID,keHuCode,keHuMC,xinBaoED,diQu from T_KeHu where keHuID = #{keHuID}
@@ -69,7 +69,7 @@
     <select id="cascadeSysSAPreturnNoByVbap" parameterType="com.huazheng.project.hana.model.Vbap" resultType="SysSAPreturnNo">
     	select top 20 a.* from (
 			select id as rowids,
-				id,processName,shiLiH,sapNo,chuangJianSJ
+				id,processName,shiLiH,('00'+sapNo) as sapNo,chuangJianSJ
 			from Sys_SAPreturnNo
 		) a where sapNo = #{vbeln}
     </select>