github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: issue in previous merge

pull/6221/head
Gauthier LO 2023-07-04 14:15:37 +02:00
parent 03cef62343
commit a4a96e4a8a
3 changed files with 6 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelMapper.xml
View File

@ -94,23 +94,16 @@
#{number} #{number}
</foreach>; </foreach>;
</select> </select>
<<<<<<< HEAD
<insert id="insertParcelsArchive" parameterType="list">
INSERT INTO parcel_delete(id, create_by, create_time,
update_by, update_time, bill_code,
country, third_bill_code,
order_no, product_code)
=======
<insert id="insertOrIgnoreCMKParcels" parameterType="list"> <insert id="insertParcelsArchive" parameterType="list">
INSERT IGNORE INTO parcel(id, create_by, create_time, update_by, update_time, bill_code, country, INSERT INTO parcel_delete(id, create_by, create_time,
third_bill_code, order_no, product_code) update_by, update_time, bill_code,
>>>>>>> 9c5c7432b6824185b589760c500b696f46f82c58 country, third_bill_code,
order_no, product_code)
VALUES VALUES
<foreach collection="parcels" separator="," open="" close="" item="parcel" index="index"> <foreach collection="parcels" separator="," open="" close="" item="parcel" index="index">
( (
#{parcel.id}, #{parcel.id},
<<<<<<< HEAD
#{parcel.createBy}, #{parcel.createBy},
#{parcel.createTime}, #{parcel.createTime},
#{parcel.updateBy}, #{parcel.updateBy},
@ -122,18 +115,5 @@
#{parcel.productCode} #{parcel.productCode}
) )
</foreach>; </foreach>;
=======
'cmk api',
NOW(),
'cmk api',
NOW(),
#{parcel.thirdBillCode},
#{parcel.country},
#{parcel.thirdBillCode},
#{parcel.detail.orderNo},
#{parcel.detail.productCode}
)
</foreach>
>>>>>>> 9c5c7432b6824185b589760c500b696f46f82c58
</insert> </insert>
</mapper> </mapper>

9
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelTraceMapper.xml
View File

@ -80,10 +80,6 @@
) )
</foreach> </foreach>
</insert> </insert>
<<<<<<< HEAD
=======
>>>>>>> 9c5c7432b6824185b589760c500b696f46f82c58
<insert id="insertOrIgnoreCMKTraces" parameterType="list"> <insert id="insertOrIgnoreCMKTraces" parameterType="list">
INSERT IGNORE INTO parcel_trace(id, create_by, create_time, update_by, update_time, parcel_id, scan_time, INSERT IGNORE INTO parcel_trace(id, create_by, create_time, update_by, update_time, parcel_id, scan_time,
description, description_en, trace_location, scan_type) description, description_en, trace_location, scan_type)
@ -104,12 +100,7 @@
) )
</foreach> </foreach>
</insert> </insert>
<<<<<<< HEAD
<select id="fetchParcelTracesToArchive" resultType="org.jeecg.modules.business.entity.ParcelTrace"> <select id="fetchParcelTracesToArchive" resultType="org.jeecg.modules.business.entity.ParcelTrace">
=======
<select id="fetchParcelTracesToArchive" resultType="org.jeecg.modules.business.entity.Parcel">
>>>>>>> 9c5c7432b6824185b589760c500b696f46f82c58
SELECT * SELECT *
FROM parcel_trace FROM parcel_trace
WHERE parcel_id IN WHERE parcel_id IN

2
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.jeecgframework.boot</groupId> <groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-parent</artifactId> <artifactId>jeecg-boot-parent</artifactId>
<version>0.2.5</version> <version>0.2.6</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WIA APP ${project.version} </name> <name>WIA APP ${project.version} </name>