md
This commit is contained in:
parent
43ed51595a
commit
de1d12faf3
2
build.sh
2
build.sh
@ -1,6 +1,6 @@
|
|||||||
git pull
|
git pull
|
||||||
mvn install:install-file -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=19.1.0 -Dpackaging=jar -Dfile=./emis-biz/lib/aspose-words-19.1-jdk16.jar
|
mvn install:install-file -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=19.1.0 -Dpackaging=jar -Dfile=./emis-biz/lib/aspose-words-19.1-jdk16.jar
|
||||||
mvn install:install-file -DgroupId=com.mascloud -DartifactId=massdk -Dversion=1.0.3 -Dpackaging=jar -Dfile=./emis-biz/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
|
#mvn install:install-file -DgroupId=com.mascloud -DartifactId=massdk -Dversion=1.0.3 -Dpackaging=jar -Dfile=./emis-biz/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
|
||||||
|
|
||||||
mvn clean package deploy -Dmaven.test.skip=true
|
mvn clean package deploy -Dmaven.test.skip=true
|
||||||
|
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
mvn install:install-file -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=19.1.0 -Dpackaging=jar -Dfile=./aspose-words-19.1-jdk16.jar
|
mvn install:install-file -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=19.1.0 -Dpackaging=jar -Dfile=./aspose-words-19.1-jdk16.jar
|
||||||
mvn install:install-file -DgroupId=com.mascloud -DartifactId=massdk -Dversion=1.0.3 -Dpackaging=jar -Dfile=./masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
|
#mvn install:install-file -DgroupId=com.mascloud -DartifactId=massdk -Dversion=1.0.3 -Dpackaging=jar -Dfile=./masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
|
||||||
|
|||||||
@ -740,7 +740,8 @@
|
|||||||
<select id="selectOrderList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
|
<select id="selectOrderList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
|
||||||
<include refid="selectEmisWaybillVo"/>
|
<include refid="selectEmisWaybillVo"/>
|
||||||
<where>
|
<where>
|
||||||
a.del_flag='0'
|
a.del_flag='0' and a.order_type='0'
|
||||||
|
|
||||||
<if test="id != null "> and a.id = #{id}</if>
|
<if test="id != null "> and a.id = #{id}</if>
|
||||||
<if test="orderSn != null and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
|
<if test="orderSn != null and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
|
||||||
<if test="billCode != null and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') ) </if>
|
<if test="billCode != null and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') ) </if>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
git pull
|
git pull
|
||||||
mvn install:install-file -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=19.1.0 -Dpackaging=jar -Dfile=./emis-biz/lib/aspose-words-19.1-jdk16.jar
|
mvn install:install-file -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=19.1.0 -Dpackaging=jar -Dfile=./emis-biz/lib/aspose-words-19.1-jdk16.jar
|
||||||
mvn install:install-file -DgroupId=com.mascloud -DartifactId=massdk -Dversion=1.0.3 -Dpackaging=jar -Dfile=./emis-biz/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
|
#mvn install:install-file -DgroupId=com.mascloud -DartifactId=massdk -Dversion=1.0.3 -Dpackaging=jar -Dfile=./emis-biz/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
|
||||||
|
|
||||||
mvn clean package install -N -Dmaven.test.skip=true
|
mvn clean package install -N -Dmaven.test.skip=true
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user