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 c049b5adb7
commit 723a2ba796
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.business.mapper.ParcelMapper"> <mapper namespace="org.jeecg.modules.business.mapper.ParcelMapper">
<insert id="insertOrIgnoreJTParcels" parameterType="list"> <insert id="insertOrIgnoreJTParcels" parameterType="list">
INSERT IGNORE INTO parcel(id, create_by, create_time, update_by, update_time, bill_code, country, INSERT IGNORE INTO parcel(id, create_by, create_time, update_by, update_time, bill_code, country,
third_bill_code, order_no) third_bill_code, order_no)
VALUES VALUES
<foreach collection="parcels" separator="," open="" close="" item="parcel" index="index"> <foreach collection="parcels" separator="," open="" close="" item="parcel" index="index">
( (
@ -86,25 +86,6 @@
) )
</foreach> </foreach>
</insert> </insert>
<insert id="insertOrIgnoreCMKParcels" parameterType="list">
INSERT IGNORE INTO parcel(id, create_by, create_time, update_by, update_time, bill_code, country,
third_bill_code, order_no, product_code)
VALUES
<foreach collection="parcels" separator="," open="" close="" item="parcel" index="index">
(
#{parcel.id},
'cmk api',
NOW(),
'cmk api',
NOW(),
#{parcel.thirdBillCode},
#{parcel.country},
#{parcel.thirdBillCode},
#{parcel.detail.orderNo},
#{parcel.detail.productCode}
)
</foreach>
</insert>
<select id="fetchParcelsToArchive" resultType="org.jeecg.modules.business.entity.Parcel"> <select id="fetchParcelsToArchive" resultType="org.jeecg.modules.business.entity.Parcel">
SELECT * SELECT *
FROM parcel FROM parcel

1
pom.xml
View File

@ -3,6 +3,7 @@
<groupId>org.jeecgframework.boot</groupId> <groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-parent</artifactId> <artifactId>jeecg-boot-parent</artifactId>
<version>1.2.0</version> <version>1.2.0</version>
>>>>>>> a4a96e4a (fix: issue in previous merge)
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WIA APP ${project.version} </name> <name>WIA APP ${project.version} </name>