Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-java
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
dc-java
Commits
9a568e45
Commit
9a568e45
authored
May 20, 2019
by
wutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
同步SKU增加开发时间字段
parent
d5dadeee
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
113 additions
and
9 deletions
+113
-9
SkuInfo.java
...-sku/src/main/java/com/bailuntec/domain/pojo/SkuInfo.java
+5
-0
DcBaseSkuMapper.xml
...ku/src/main/java/com/bailuntec/mapper/DcBaseSkuMapper.xml
+34
-8
DcBaseSku.java
.../src/main/java/com/bailuntec/domain/entity/DcBaseSku.java
+14
-1
DcBaseSkuExample.java
...n/java/com/bailuntec/domain/example/DcBaseSkuExample.java
+60
-0
No files found.
data-base/base-sync-sku/src/main/java/com/bailuntec/domain/pojo/SkuInfo.java
View file @
9a568e45
...
@@ -401,6 +401,11 @@ public class SkuInfo {
...
@@ -401,6 +401,11 @@ public class SkuInfo {
@JSONField
(
name
=
"pushTime"
)
@JSONField
(
name
=
"pushTime"
)
public
LocalDateTime
pushTime
;
public
LocalDateTime
pushTime
;
/// <summary>
/// PDS开发时间
/// </summary>
@JSONField
(
name
=
"developTime"
)
public
LocalDateTime
developTime
;
/// <summary>
/// <summary>
/// 调拨计划交期
/// 调拨计划交期
...
...
data-base/base-sync-sku/src/main/java/com/bailuntec/mapper/DcBaseSkuMapper.xml
View file @
9a568e45
...
@@ -73,6 +73,7 @@
...
@@ -73,6 +73,7 @@
<result
column=
"source"
jdbcType=
"TINYINT"
property=
"source"
/>
<result
column=
"source"
jdbcType=
"TINYINT"
property=
"source"
/>
<result
column=
"push_time"
jdbcType=
"TIMESTAMP"
property=
"pushTime"
/>
<result
column=
"push_time"
jdbcType=
"TIMESTAMP"
property=
"pushTime"
/>
<result
column=
"has_delete"
jdbcType=
"BIT"
property=
"hasDelete"
/>
<result
column=
"has_delete"
jdbcType=
"BIT"
property=
"hasDelete"
/>
<result
column=
"develop_time"
jdbcType=
"TIMESTAMP"
property=
"developTime"
/>
</resultMap>
</resultMap>
<sql
id=
"Example_Where_Clause"
>
<sql
id=
"Example_Where_Clause"
>
<!--
<!--
...
@@ -154,7 +155,8 @@
...
@@ -154,7 +155,8 @@
virtual_price, size_image, sales_price, enable, inspection_hours, bargainer, customs_code,
virtual_price, size_image, sales_price, enable, inspection_hours, bargainer, customs_code,
declare_title_en, declare_title_cn, pick_title_cn, pick_title_en, product_nature,
declare_title_en, declare_title_cn, pick_title_cn, pick_title_en, product_nature,
charger_specifications, packing_price, packing_name, packing_size, product_size,
charger_specifications, packing_price, packing_name, packing_size, product_size,
packing_weight, unit, push_status, transfer_delivery, source, push_time, has_delete
packing_weight, unit, push_status, transfer_delivery, source, push_time, has_delete,
develop_time
</sql>
</sql>
<select
id=
"selectByExample"
parameterType=
"com.bailuntec.domain.example.DcBaseSkuExample"
resultMap=
"BaseResultMap"
>
<select
id=
"selectByExample"
parameterType=
"com.bailuntec.domain.example.DcBaseSkuExample"
resultMap=
"BaseResultMap"
>
<!--
<!--
...
@@ -237,7 +239,7 @@
...
@@ -237,7 +239,7 @@
packing_name, packing_size, product_size,
packing_name, packing_size, product_size,
packing_weight, unit, push_status,
packing_weight, unit, push_status,
transfer_delivery, source, push_time,
transfer_delivery, source, push_time,
has_delete)
has_delete
, develop_time
)
values (#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{skuImage,jdbcType=VARCHAR},
values (#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{skuImage,jdbcType=VARCHAR},
#{categoryId,jdbcType=INTEGER}, #{categoryName,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR},
#{categoryId,jdbcType=INTEGER}, #{categoryName,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR},
#{warehouseName,jdbcType=VARCHAR}, #{unitPrice,jdbcType=DECIMAL}, #{sellerId,jdbcType=INTEGER},
#{warehouseName,jdbcType=VARCHAR}, #{unitPrice,jdbcType=DECIMAL}, #{sellerId,jdbcType=INTEGER},
...
@@ -260,7 +262,7 @@
...
@@ -260,7 +262,7 @@
#{packingName,jdbcType=VARCHAR}, #{packingSize,jdbcType=VARCHAR}, #{productSize,jdbcType=VARCHAR},
#{packingName,jdbcType=VARCHAR}, #{packingSize,jdbcType=VARCHAR}, #{productSize,jdbcType=VARCHAR},
#{packingWeight,jdbcType=DECIMAL}, #{unit,jdbcType=VARCHAR}, #{pushStatus,jdbcType=TINYINT},
#{packingWeight,jdbcType=DECIMAL}, #{unit,jdbcType=VARCHAR}, #{pushStatus,jdbcType=TINYINT},
#{transferDelivery,jdbcType=INTEGER}, #{source,jdbcType=TINYINT}, #{pushTime,jdbcType=TIMESTAMP},
#{transferDelivery,jdbcType=INTEGER}, #{source,jdbcType=TINYINT}, #{pushTime,jdbcType=TIMESTAMP},
#{hasDelete,jdbcType=BIT})
#{hasDelete,jdbcType=BIT}
, #{developTime,jdbcType=TIMESTAMP}
)
</insert>
</insert>
<insert
id=
"insertSelective"
parameterType=
"com.bailuntec.domain.entity.DcBaseSku"
>
<insert
id=
"insertSelective"
parameterType=
"com.bailuntec.domain.entity.DcBaseSku"
>
<!--
<!--
...
@@ -470,6 +472,9 @@
...
@@ -470,6 +472,9 @@
<if
test=
"hasDelete != null"
>
<if
test=
"hasDelete != null"
>
has_delete,
has_delete,
</if>
</if>
<if
test=
"developTime != null"
>
develop_time,
</if>
</trim>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"id != null"
>
<if
test=
"id != null"
>
...
@@ -673,6 +678,9 @@
...
@@ -673,6 +678,9 @@
<if
test=
"hasDelete != null"
>
<if
test=
"hasDelete != null"
>
#{hasDelete,jdbcType=BIT},
#{hasDelete,jdbcType=BIT},
</if>
</if>
<if
test=
"developTime != null"
>
#{developTime,jdbcType=TIMESTAMP},
</if>
</trim>
</trim>
</insert>
</insert>
<select
id=
"countByExample"
parameterType=
"com.bailuntec.domain.example.DcBaseSkuExample"
resultType=
"java.lang.Long"
>
<select
id=
"countByExample"
parameterType=
"com.bailuntec.domain.example.DcBaseSkuExample"
resultType=
"java.lang.Long"
>
...
@@ -893,6 +901,9 @@
...
@@ -893,6 +901,9 @@
<if
test=
"record.hasDelete != null"
>
<if
test=
"record.hasDelete != null"
>
has_delete = #{record.hasDelete,jdbcType=BIT},
has_delete = #{record.hasDelete,jdbcType=BIT},
</if>
</if>
<if
test=
"record.developTime != null"
>
develop_time = #{record.developTime,jdbcType=TIMESTAMP},
</if>
</set>
</set>
<if
test=
"_parameter != null"
>
<if
test=
"_parameter != null"
>
<include
refid=
"Update_By_Example_Where_Clause"
/>
<include
refid=
"Update_By_Example_Where_Clause"
/>
...
@@ -970,7 +981,8 @@
...
@@ -970,7 +981,8 @@
transfer_delivery = #{record.transferDelivery,jdbcType=INTEGER},
transfer_delivery = #{record.transferDelivery,jdbcType=INTEGER},
source = #{record.source,jdbcType=TINYINT},
source = #{record.source,jdbcType=TINYINT},
push_time = #{record.pushTime,jdbcType=TIMESTAMP},
push_time = #{record.pushTime,jdbcType=TIMESTAMP},
has_delete = #{record.hasDelete,jdbcType=BIT}
has_delete = #{record.hasDelete,jdbcType=BIT},
develop_time = #{record.developTime,jdbcType=TIMESTAMP}
<if
test=
"_parameter != null"
>
<if
test=
"_parameter != null"
>
<include
refid=
"Update_By_Example_Where_Clause"
/>
<include
refid=
"Update_By_Example_Where_Clause"
/>
</if>
</if>
...
@@ -1180,6 +1192,9 @@
...
@@ -1180,6 +1192,9 @@
<if
test=
"hasDelete != null"
>
<if
test=
"hasDelete != null"
>
has_delete = #{hasDelete,jdbcType=BIT},
has_delete = #{hasDelete,jdbcType=BIT},
</if>
</if>
<if
test=
"developTime != null"
>
develop_time = #{developTime,jdbcType=TIMESTAMP},
</if>
</set>
</set>
where id = #{id,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</update>
...
@@ -1254,7 +1269,8 @@
...
@@ -1254,7 +1269,8 @@
transfer_delivery = #{transferDelivery,jdbcType=INTEGER},
transfer_delivery = #{transferDelivery,jdbcType=INTEGER},
source = #{source,jdbcType=TINYINT},
source = #{source,jdbcType=TINYINT},
push_time = #{pushTime,jdbcType=TIMESTAMP},
push_time = #{pushTime,jdbcType=TIMESTAMP},
has_delete = #{hasDelete,jdbcType=BIT}
has_delete = #{hasDelete,jdbcType=BIT},
develop_time = #{developTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</update>
<insert
id=
"upsertSelective"
parameterType=
"com.bailuntec.domain.entity.DcBaseSku"
>
<insert
id=
"upsertSelective"
parameterType=
"com.bailuntec.domain.entity.DcBaseSku"
>
...
@@ -1466,6 +1482,9 @@
...
@@ -1466,6 +1482,9 @@
<if
test=
"hasDelete != null"
>
<if
test=
"hasDelete != null"
>
has_delete,
has_delete,
</if>
</if>
<if
test=
"developTime != null"
>
develop_time,
</if>
</trim>
</trim>
values
values
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
...
@@ -1670,6 +1689,9 @@
...
@@ -1670,6 +1689,9 @@
<if
test=
"hasDelete != null"
>
<if
test=
"hasDelete != null"
>
#{hasDelete,jdbcType=BIT},
#{hasDelete,jdbcType=BIT},
</if>
</if>
<if
test=
"developTime != null"
>
#{developTime,jdbcType=TIMESTAMP},
</if>
</trim>
</trim>
on duplicate key update
on duplicate key update
<trim
suffixOverrides=
","
>
<trim
suffixOverrides=
","
>
...
@@ -1874,6 +1896,9 @@
...
@@ -1874,6 +1896,9 @@
<if
test=
"hasDelete != null"
>
<if
test=
"hasDelete != null"
>
has_delete = #{hasDelete,jdbcType=BIT},
has_delete = #{hasDelete,jdbcType=BIT},
</if>
</if>
<if
test=
"developTime != null"
>
develop_time = #{developTime,jdbcType=TIMESTAMP},
</if>
</trim>
</trim>
</insert>
</insert>
<insert
id=
"upsert"
parameterType=
"com.bailuntec.domain.entity.DcBaseSku"
>
<insert
id=
"upsert"
parameterType=
"com.bailuntec.domain.entity.DcBaseSku"
>
...
@@ -1893,7 +1918,7 @@
...
@@ -1893,7 +1918,7 @@
bargainer, customs_code, declare_title_en, declare_title_cn, pick_title_cn, pick_title_en,
bargainer, customs_code, declare_title_en, declare_title_cn, pick_title_cn, pick_title_en,
product_nature, charger_specifications, packing_price, packing_name, packing_size,
product_nature, charger_specifications, packing_price, packing_name, packing_size,
product_size, packing_weight, unit, push_status, transfer_delivery, source, push_time,
product_size, packing_weight, unit, push_status, transfer_delivery, source, push_time,
has_delete)
has_delete
, develop_time
)
values
values
(#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{skuImage,jdbcType=VARCHAR},
(#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{skuImage,jdbcType=VARCHAR},
#{categoryId,jdbcType=INTEGER}, #{categoryName,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR},
#{categoryId,jdbcType=INTEGER}, #{categoryName,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR},
...
@@ -1917,7 +1942,7 @@
...
@@ -1917,7 +1942,7 @@
#{packingName,jdbcType=VARCHAR}, #{packingSize,jdbcType=VARCHAR}, #{productSize,jdbcType=VARCHAR},
#{packingName,jdbcType=VARCHAR}, #{packingSize,jdbcType=VARCHAR}, #{productSize,jdbcType=VARCHAR},
#{packingWeight,jdbcType=DECIMAL}, #{unit,jdbcType=VARCHAR}, #{pushStatus,jdbcType=TINYINT},
#{packingWeight,jdbcType=DECIMAL}, #{unit,jdbcType=VARCHAR}, #{pushStatus,jdbcType=TINYINT},
#{transferDelivery,jdbcType=INTEGER}, #{source,jdbcType=TINYINT}, #{pushTime,jdbcType=TIMESTAMP},
#{transferDelivery,jdbcType=INTEGER}, #{source,jdbcType=TINYINT}, #{pushTime,jdbcType=TIMESTAMP},
#{hasDelete,jdbcType=BIT})
#{hasDelete,jdbcType=BIT}
, #{developTime,jdbcType=TIMESTAMP}
)
on duplicate key update
on duplicate key update
id = #{id,jdbcType=INTEGER},
id = #{id,jdbcType=INTEGER},
bailun_sku = #{bailunSku,jdbcType=VARCHAR},
bailun_sku = #{bailunSku,jdbcType=VARCHAR},
...
@@ -1985,7 +2010,8 @@
...
@@ -1985,7 +2010,8 @@
transfer_delivery = #{transferDelivery,jdbcType=INTEGER},
transfer_delivery = #{transferDelivery,jdbcType=INTEGER},
source = #{source,jdbcType=TINYINT},
source = #{source,jdbcType=TINYINT},
push_time = #{pushTime,jdbcType=TIMESTAMP},
push_time = #{pushTime,jdbcType=TIMESTAMP},
has_delete = #{hasDelete,jdbcType=BIT}
has_delete = #{hasDelete,jdbcType=BIT},
develop_time = #{developTime,jdbcType=TIMESTAMP}
</insert>
</insert>
<select
id=
"selectOneByExample"
parameterType=
"com.bailuntec.domain.example.DcBaseSkuExample"
resultMap=
"BaseResultMap"
>
<select
id=
"selectOneByExample"
parameterType=
"com.bailuntec.domain.example.DcBaseSkuExample"
resultMap=
"BaseResultMap"
>
<!--
<!--
...
...
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseSku.java
View file @
9a568e45
...
@@ -611,6 +611,15 @@ public class DcBaseSku {
...
@@ -611,6 +611,15 @@ public class DcBaseSku {
private
Boolean
hasDelete
;
private
Boolean
hasDelete
;
/**
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_sku.develop_time
*
* @mbg.generated
*/
private
LocalDateTime
developTime
;
/**
* This method was generated by MyBatis Generator.
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_sku
* This method corresponds to the database table dc_base_sku
*
*
...
@@ -689,6 +698,7 @@ public class DcBaseSku {
...
@@ -689,6 +698,7 @@ public class DcBaseSku {
sb
.
append
(
", source="
).
append
(
source
);
sb
.
append
(
", source="
).
append
(
source
);
sb
.
append
(
", pushTime="
).
append
(
pushTime
);
sb
.
append
(
", pushTime="
).
append
(
pushTime
);
sb
.
append
(
", hasDelete="
).
append
(
hasDelete
);
sb
.
append
(
", hasDelete="
).
append
(
hasDelete
);
sb
.
append
(
", developTime="
).
append
(
developTime
);
sb
.
append
(
"]"
);
sb
.
append
(
"]"
);
return
sb
.
toString
();
return
sb
.
toString
();
}
}
...
@@ -777,7 +787,8 @@ public class DcBaseSku {
...
@@ -777,7 +787,8 @@ public class DcBaseSku {
&&
(
this
.
getTransferDelivery
()
==
null
?
other
.
getTransferDelivery
()
==
null
:
this
.
getTransferDelivery
().
equals
(
other
.
getTransferDelivery
()))
&&
(
this
.
getTransferDelivery
()
==
null
?
other
.
getTransferDelivery
()
==
null
:
this
.
getTransferDelivery
().
equals
(
other
.
getTransferDelivery
()))
&&
(
this
.
getSource
()
==
null
?
other
.
getSource
()
==
null
:
this
.
getSource
().
equals
(
other
.
getSource
()))
&&
(
this
.
getSource
()
==
null
?
other
.
getSource
()
==
null
:
this
.
getSource
().
equals
(
other
.
getSource
()))
&&
(
this
.
getPushTime
()
==
null
?
other
.
getPushTime
()
==
null
:
this
.
getPushTime
().
equals
(
other
.
getPushTime
()))
&&
(
this
.
getPushTime
()
==
null
?
other
.
getPushTime
()
==
null
:
this
.
getPushTime
().
equals
(
other
.
getPushTime
()))
&&
(
this
.
getHasDelete
()
==
null
?
other
.
getHasDelete
()
==
null
:
this
.
getHasDelete
().
equals
(
other
.
getHasDelete
()));
&&
(
this
.
getHasDelete
()
==
null
?
other
.
getHasDelete
()
==
null
:
this
.
getHasDelete
().
equals
(
other
.
getHasDelete
()))
&&
(
this
.
getDevelopTime
()
==
null
?
other
.
getDevelopTime
()
==
null
:
this
.
getDevelopTime
().
equals
(
other
.
getDevelopTime
()));
}
}
/**
/**
...
@@ -857,6 +868,7 @@ public class DcBaseSku {
...
@@ -857,6 +868,7 @@ public class DcBaseSku {
result
=
prime
*
result
+
((
getSource
()
==
null
)
?
0
:
getSource
().
hashCode
());
result
=
prime
*
result
+
((
getSource
()
==
null
)
?
0
:
getSource
().
hashCode
());
result
=
prime
*
result
+
((
getPushTime
()
==
null
)
?
0
:
getPushTime
().
hashCode
());
result
=
prime
*
result
+
((
getPushTime
()
==
null
)
?
0
:
getPushTime
().
hashCode
());
result
=
prime
*
result
+
((
getHasDelete
()
==
null
)
?
0
:
getHasDelete
().
hashCode
());
result
=
prime
*
result
+
((
getHasDelete
()
==
null
)
?
0
:
getHasDelete
().
hashCode
());
result
=
prime
*
result
+
((
getDevelopTime
()
==
null
)
?
0
:
getDevelopTime
().
hashCode
());
return
result
;
return
result
;
}
}
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcBaseSkuExample.java
View file @
9a568e45
...
@@ -4730,6 +4730,66 @@ public class DcBaseSkuExample {
...
@@ -4730,6 +4730,66 @@ public class DcBaseSkuExample {
addCriterion
(
"has_delete not between"
,
value1
,
value2
,
"hasDelete"
);
addCriterion
(
"has_delete not between"
,
value1
,
value2
,
"hasDelete"
);
return
(
Criteria
)
this
;
return
(
Criteria
)
this
;
}
}
public
Criteria
andDevelopTimeIsNull
()
{
addCriterion
(
"develop_time is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andDevelopTimeIsNotNull
()
{
addCriterion
(
"develop_time is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andDevelopTimeEqualTo
(
LocalDateTime
value
)
{
addCriterion
(
"develop_time ="
,
value
,
"developTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andDevelopTimeNotEqualTo
(
LocalDateTime
value
)
{
addCriterion
(
"develop_time <>"
,
value
,
"developTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andDevelopTimeGreaterThan
(
LocalDateTime
value
)
{
addCriterion
(
"develop_time >"
,
value
,
"developTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andDevelopTimeGreaterThanOrEqualTo
(
LocalDateTime
value
)
{
addCriterion
(
"develop_time >="
,
value
,
"developTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andDevelopTimeLessThan
(
LocalDateTime
value
)
{
addCriterion
(
"develop_time <"
,
value
,
"developTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andDevelopTimeLessThanOrEqualTo
(
LocalDateTime
value
)
{
addCriterion
(
"develop_time <="
,
value
,
"developTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andDevelopTimeIn
(
List
<
LocalDateTime
>
values
)
{
addCriterion
(
"develop_time in"
,
values
,
"developTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andDevelopTimeNotIn
(
List
<
LocalDateTime
>
values
)
{
addCriterion
(
"develop_time not in"
,
values
,
"developTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andDevelopTimeBetween
(
LocalDateTime
value1
,
LocalDateTime
value2
)
{
addCriterion
(
"develop_time between"
,
value1
,
value2
,
"developTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andDevelopTimeNotBetween
(
LocalDateTime
value1
,
LocalDateTime
value2
)
{
addCriterion
(
"develop_time not between"
,
value1
,
value2
,
"developTime"
);
return
(
Criteria
)
this
;
}
}
}
/**
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment