From 214b0462236390399ea184b3c4a3993fc0daf504 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 08 十二月 2023 10:10:07 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-分配治疗修改
---
phi_platform_common/src/main/resources/mapper/platform/TreatProjectMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/phi_platform_common/src/main/resources/mapper/platform/TreatProjectMapper.xml b/phi_platform_common/src/main/resources/mapper/platform/TreatProjectMapper.xml
index 6e5711c..dc63270 100644
--- a/phi_platform_common/src/main/resources/mapper/platform/TreatProjectMapper.xml
+++ b/phi_platform_common/src/main/resources/mapper/platform/TreatProjectMapper.xml
@@ -8,7 +8,7 @@
<!-- 鏁翠釜瀹炰綋绫讳慨鏀癸紝琛ㄥ瓧娈�=瀹炰綋绫诲瓧娈�-->
<sql id="Update_Column_All">
<trim prefixOverrides=",">
- ,positionData = #{positionData},projectNo = #{projectNo},projectName = #{projectName},price = #{price},num = #{num},useDuration = #{useDuration},palsyDuration = #{palsyDuration},projectId = #{projectId},treatSingleId = #{treatSingleId},remarkInfo = #{remarkInfo},hisId = #{hisId},isDeduct = #{isDeduct},userProjectItemId = #{userProjectItemId},goodsId = #{goodsId},treatSingleNo = #{treatSingleNo},deductNum = #{deductNum},isUserPro = #{isUserPro},indicationId = #{indicationId},indication = #{indication},partType = #{partType},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
+ ,positionData = #{positionData},projectNo = #{projectNo},projectName = #{projectName},price = #{price},num = #{num},useDuration = #{useDuration},palsyDuration = #{palsyDuration},projectId = #{projectId},treatSingleId = #{treatSingleId},remarkInfo = #{remarkInfo},hisId = #{hisId},isDeduct = #{isDeduct},userProjectItemId = #{userProjectItemId},goodsId = #{goodsId},treatSingleNo = #{treatSingleNo},deductNum = #{deductNum},isUserPro = #{isUserPro},indicationId = #{indicationId},indication = #{indication},partType = #{partType},sdRemark = #{sdRemark},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
</trim>
</sql>
@@ -19,11 +19,11 @@
<selectKey keyProperty="id" resultType="String" order="BEFORE">
select replace(uuid(),'-','') from dual
</selectKey>
- insert into treat_project (id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,isDel,createTime,editTime) values (#{id},#{positionData},#{projectNo},#{projectName},#{price},#{num},#{useDuration},#{palsyDuration},#{projectId},#{treatSingleId},#{remarkInfo},#{hisId},#{isDeduct},#{userProjectItemId},#{goodsId},#{treatSingleNo},#{deductNum},#{isUserPro},#{indicationId},#{indication},#{partType},#{isDel},#{createTime},#{editTime})
+ insert into treat_project (id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime) values (#{id},#{positionData},#{projectNo},#{projectName},#{price},#{num},#{useDuration},#{palsyDuration},#{projectId},#{treatSingleId},#{remarkInfo},#{hisId},#{isDeduct},#{userProjectItemId},#{goodsId},#{treatSingleNo},#{deductNum},#{isUserPro},#{indicationId},#{indication},#{partType},#{sdRemark},#{isDel},#{createTime},#{editTime})
</insert>
<insert id="insertById" parameterType="com.hx.phiappt.model.treat.TreatProject">
- insert into treat_project (id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,isDel,createTime,editTime) values (#{id},#{positionData},#{projectNo},#{projectName},#{price},#{num},#{useDuration},#{palsyDuration},#{projectId},#{treatSingleId},#{remarkInfo},#{hisId},#{isDeduct},#{userProjectItemId},#{goodsId},#{treatSingleNo},#{deductNum},#{isUserPro},#{indicationId},#{indication},#{partType},#{isDel},#{createTime},#{editTime})
+ insert into treat_project (id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime) values (#{id},#{positionData},#{projectNo},#{projectName},#{price},#{num},#{useDuration},#{palsyDuration},#{projectId},#{treatSingleId},#{remarkInfo},#{hisId},#{isDeduct},#{userProjectItemId},#{goodsId},#{treatSingleNo},#{deductNum},#{isUserPro},#{indicationId},#{indication},#{partType},#{sdRemark},#{isDel},#{createTime},#{editTime})
</insert>
<select id="selectList" resultType="com.hx.phiappt.model.treat.TreatProject" parameterType="com.hx.mybatisTool.SqlSentence" >
@@ -55,14 +55,14 @@
<select id="selectOneByKey" resultType="com.hx.phiappt.model.treat.TreatProject" parameterType="java.lang.Object" >
select
- id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,isDel,createTime,editTime
+ id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime
from treat_project
WHERE id = #{value}
</select>
<select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.treat.TreatProject" parameterType="java.lang.Object" >
select
- id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,isDel,createTime,editTime
+ id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime
from treat_project
WHERE id = #{value}
</select>
@@ -90,7 +90,7 @@
<update id="updateEditInfo" parameterType="java.util.Map">
update treat_project
set num = #{num}, indication = #{indication} , indicationId = #{indicationId}
- , partType = #{partType}, editTime = now()
+ , partType = #{partType}, sdRemark = #{m.sdRemark}, editTime = now()
where id = #{id}
</update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0