From 22d199559342c1ccb3a0a8a5b5ee50e973819e16 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 19 一月 2024 11:31:19 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-再生俱乐部

---
 phi_platform_common/src/main/resources/mapper/platform/UserProjectTurnMapper.xml |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/phi_platform_common/src/main/resources/mapper/platform/UserProjectTurnMapper.xml b/phi_platform_common/src/main/resources/mapper/platform/UserProjectTurnMapper.xml
index 8e1dc4c..fdff508 100644
--- a/phi_platform_common/src/main/resources/mapper/platform/UserProjectTurnMapper.xml
+++ b/phi_platform_common/src/main/resources/mapper/platform/UserProjectTurnMapper.xml
@@ -8,7 +8,7 @@
 	<!-- 鏁翠釜瀹炰綋绫讳慨鏀癸紝琛ㄥ瓧娈�=瀹炰綋绫诲瓧娈�-->
 	<sql id="Update_Column_All">
 		<trim prefixOverrides=",">
-			,turnOutUserProjectItemId = #{turnOutUserProjectItemId},turnOutUserProjectName = #{turnOutUserProjectName},turnIntoUserProjectItemId = #{turnIntoUserProjectItemId},turnIntoUserProjectName = #{turnIntoUserProjectName},turnOutUserId = #{turnOutUserId},turnOutUserName = #{turnOutUserName},turnOutUserNO = #{turnOutUserNO},turnOutUserShopId = #{turnOutUserShopId},turnOutUserShopName = #{turnOutUserShopName},turnIntoUserId = #{turnIntoUserId},turnIntoUserName = #{turnIntoUserName},turnIntoUserNo = #{turnIntoUserNo},turnIntoUserShopId = #{turnIntoUserShopId},turnIntoUserShopName = #{turnIntoUserShopName},opType = #{opType},noDeductionAmount = #{noDeductionAmount},turnNumber = #{turnNumber},status = #{status},operatorType = #{operatorType},operatorId = #{operatorId},operatorName = #{operatorName},originChannel = #{originChannel},sourceCode = #{sourceCode},sourceName = #{sourceName},remarks = #{remarks},turnAddId = #{turnAddId},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
+			,turnOutUserProjectItemId = #{turnOutUserProjectItemId},turnOutUserProjectName = #{turnOutUserProjectName},turnIntoUserProjectItemId = #{turnIntoUserProjectItemId},turnIntoUserProjectName = #{turnIntoUserProjectName},turnOutUserId = #{turnOutUserId},turnOutUserName = #{turnOutUserName},turnOutUserNO = #{turnOutUserNO},turnOutUserShopId = #{turnOutUserShopId},turnOutUserShopName = #{turnOutUserShopName},turnIntoUserId = #{turnIntoUserId},turnIntoUserName = #{turnIntoUserName},turnIntoUserNo = #{turnIntoUserNo},turnIntoUserShopId = #{turnIntoUserShopId},turnIntoUserShopName = #{turnIntoUserShopName},opType = #{opType},noDeductionAmount = #{noDeductionAmount},turnNumber = #{turnNumber},status = #{status},operatorType = #{operatorType},operatorId = #{operatorId},operatorName = #{operatorName},originChannel = #{originChannel},sourceCode = #{sourceCode},sourceName = #{sourceName},remarks = #{remarks},turnApproveImageUrl = #{turnApproveImageUrl},turnAddId = #{turnAddId},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
 		</trim>
 	</sql>
 	 
@@ -19,8 +19,12 @@
 	    <selectKey keyProperty="id" resultType="String" order="BEFORE">
                select replace(uuid(),'-','') from dual
         </selectKey>
-        insert into user_project_turn (id,turnOutUserProjectItemId,turnOutUserProjectName,turnIntoUserProjectItemId,turnIntoUserProjectName,turnOutUserId,turnOutUserName,turnOutUserNO,turnOutUserShopId,turnOutUserShopName,turnIntoUserId,turnIntoUserName,turnIntoUserNo,turnIntoUserShopId,turnIntoUserShopName,opType,noDeductionAmount,turnNumber,status,operatorType,operatorId,operatorName,originChannel,sourceCode,sourceName,remarks,turnAddId,isDel,createTime,editTime)  values (#{id},#{turnOutUserProjectItemId},#{turnOutUserProjectName},#{turnIntoUserProjectItemId},#{turnIntoUserProjectName},#{turnOutUserId},#{turnOutUserName},#{turnOutUserNO},#{turnOutUserShopId},#{turnOutUserShopName},#{turnIntoUserId},#{turnIntoUserName},#{turnIntoUserNo},#{turnIntoUserShopId},#{turnIntoUserShopName},#{opType},#{noDeductionAmount},#{turnNumber},#{status},#{operatorType},#{operatorId},#{operatorName},#{originChannel},#{sourceCode},#{sourceName},#{remarks},#{turnAddId},#{isDel},#{createTime},#{editTime})
+        insert into user_project_turn (id,turnOutUserProjectItemId,turnOutUserProjectName,turnIntoUserProjectItemId,turnIntoUserProjectName,turnOutUserId,turnOutUserName,turnOutUserNO,turnOutUserShopId,turnOutUserShopName,turnIntoUserId,turnIntoUserName,turnIntoUserNo,turnIntoUserShopId,turnIntoUserShopName,opType,noDeductionAmount,turnNumber,status,operatorType,operatorId,operatorName,originChannel,sourceCode,sourceName,remarks,turnApproveImageUrl,turnAddId,isDel,createTime,editTime)  values (#{id},#{turnOutUserProjectItemId},#{turnOutUserProjectName},#{turnIntoUserProjectItemId},#{turnIntoUserProjectName},#{turnOutUserId},#{turnOutUserName},#{turnOutUserNO},#{turnOutUserShopId},#{turnOutUserShopName},#{turnIntoUserId},#{turnIntoUserName},#{turnIntoUserNo},#{turnIntoUserShopId},#{turnIntoUserShopName},#{opType},#{noDeductionAmount},#{turnNumber},#{status},#{operatorType},#{operatorId},#{operatorName},#{originChannel},#{sourceCode},#{sourceName},#{remarks},#{turnApproveImageUrl},#{turnAddId},#{isDel},#{createTime},#{editTime})
 	</insert>
+
+	<insert id="insertById" parameterType="com.hx.phiappt.model.user.UserProjectTurn">
+        insert into user_project_turn (id,turnOutUserProjectItemId,turnOutUserProjectName,turnIntoUserProjectItemId,turnIntoUserProjectName,turnOutUserId,turnOutUserName,turnOutUserNO,turnOutUserShopId,turnOutUserShopName,turnIntoUserId,turnIntoUserName,turnIntoUserNo,turnIntoUserShopId,turnIntoUserShopName,opType,noDeductionAmount,turnNumber,status,operatorType,operatorId,operatorName,originChannel,sourceCode,sourceName,remarks,turnApproveImageUrl,turnAddId,isDel,createTime,editTime)  values (#{id},#{turnOutUserProjectItemId},#{turnOutUserProjectName},#{turnIntoUserProjectItemId},#{turnIntoUserProjectName},#{turnOutUserId},#{turnOutUserName},#{turnOutUserNO},#{turnOutUserShopId},#{turnOutUserShopName},#{turnIntoUserId},#{turnIntoUserName},#{turnIntoUserNo},#{turnIntoUserShopId},#{turnIntoUserShopName},#{opType},#{noDeductionAmount},#{turnNumber},#{status},#{operatorType},#{operatorId},#{operatorName},#{originChannel},#{sourceCode},#{sourceName},#{remarks},#{turnApproveImageUrl},#{turnAddId},#{isDel},#{createTime},#{editTime})
+    </insert>
 
 	<select id="selectList" resultType="com.hx.phiappt.model.user.UserProjectTurn" parameterType="com.hx.mybatisTool.SqlSentence" >
 		${sqlSentence}
@@ -51,14 +55,14 @@
 
 	<select id="selectOneByKey" resultType="com.hx.phiappt.model.user.UserProjectTurn" parameterType="java.lang.Object" >
 		select 
-			id,turnOutUserProjectItemId,turnOutUserProjectName,turnIntoUserProjectItemId,turnIntoUserProjectName,turnOutUserId,turnOutUserName,turnOutUserNO,turnOutUserShopId,turnOutUserShopName,turnIntoUserId,turnIntoUserName,turnIntoUserNo,turnIntoUserShopId,turnIntoUserShopName,opType,noDeductionAmount,turnNumber,status,operatorType,operatorId,operatorName,originChannel,sourceCode,sourceName,remarks,turnAddId,isDel,createTime,editTime
+			id,turnOutUserProjectItemId,turnOutUserProjectName,turnIntoUserProjectItemId,turnIntoUserProjectName,turnOutUserId,turnOutUserName,turnOutUserNO,turnOutUserShopId,turnOutUserShopName,turnIntoUserId,turnIntoUserName,turnIntoUserNo,turnIntoUserShopId,turnIntoUserShopName,opType,noDeductionAmount,turnNumber,status,operatorType,operatorId,operatorName,originChannel,sourceCode,sourceName,remarks,turnApproveImageUrl,turnAddId,isDel,createTime,editTime
 		from user_project_turn
 		WHERE id = #{value}
 	</select>
 
 	<select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.user.UserProjectTurn" parameterType="java.lang.Object" >
 		select 
-			id,turnOutUserProjectItemId,turnOutUserProjectName,turnIntoUserProjectItemId,turnIntoUserProjectName,turnOutUserId,turnOutUserName,turnOutUserNO,turnOutUserShopId,turnOutUserShopName,turnIntoUserId,turnIntoUserName,turnIntoUserNo,turnIntoUserShopId,turnIntoUserShopName,opType,noDeductionAmount,turnNumber,status,operatorType,operatorId,operatorName,originChannel,sourceCode,sourceName,remarks,turnAddId,isDel,createTime,editTime
+			id,turnOutUserProjectItemId,turnOutUserProjectName,turnIntoUserProjectItemId,turnIntoUserProjectName,turnOutUserId,turnOutUserName,turnOutUserNO,turnOutUserShopId,turnOutUserShopName,turnIntoUserId,turnIntoUserName,turnIntoUserNo,turnIntoUserShopId,turnIntoUserShopName,opType,noDeductionAmount,turnNumber,status,operatorType,operatorId,operatorName,originChannel,sourceCode,sourceName,remarks,turnApproveImageUrl,turnAddId,isDel,createTime,editTime
 		from user_project_turn
 		WHERE id = #{value}
 	</select>

--
Gitblit v1.8.0