Skip to content

D
dc-java
Commit 62873ac2 by yinyong
Options

回滚提交

parent 9e7db8ab
Showing with 7 additions and 186 deletions
data-common/src/main/java/com/bailuntec/mapper/DcAutoJitInventoryMapper.xml
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
<result column="bailun_sku" jdbcType="VARCHAR" property="bailunSku" /> <result column="bailun_sku" jdbcType="VARCHAR" property="bailunSku" />
<result column="bailun_sku_title" jdbcType="VARCHAR" property="bailunSkuTitle" /> <result column="bailun_sku_title" jdbcType="VARCHAR" property="bailunSkuTitle" />
<result column="safe_stock" jdbcType="INTEGER" property="safeStock" /> <result column="safe_stock" jdbcType="INTEGER" property="safeStock" />
<result column="warehouse_code" jdbcType="VARCHAR" property="warehouseCode" />
<result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" />
<result column="status" jdbcType="TINYINT" property="status" /> <result column="status" jdbcType="TINYINT" property="status" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
...@@ -85,7 +83,7 @@ ...@@ -85,7 +83,7 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, bailun_sku, bailun_sku_title, safe_stock, warehouse_code, warehouse_name, status id, bailun_sku, bailun_sku_title, safe_stock, status
</sql> </sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcAutoJitInventoryExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcAutoJitInventoryExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -147,11 +145,9 @@ ...@@ -147,11 +145,9 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
insert into dc_auto_jit_inventory (id, bailun_sku, bailun_sku_title, insert into dc_auto_jit_inventory (id, bailun_sku, bailun_sku_title,
safe_stock, warehouse_code, warehouse_name, safe_stock, status)
status)
values (#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{bailunSkuTitle,jdbcType=VARCHAR}, values (#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{bailunSkuTitle,jdbcType=VARCHAR},
#{safeStock,jdbcType=INTEGER}, #{warehouseCode,jdbcType=VARCHAR}, #{warehouseName,jdbcType=VARCHAR}, #{safeStock,jdbcType=INTEGER}, #{status,jdbcType=TINYINT})
#{status,jdbcType=TINYINT})
</insert> </insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcAutoJitInventory"> <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcAutoJitInventory">
<!-- <!--
...@@ -172,12 +168,6 @@ ...@@ -172,12 +168,6 @@
<if test="safeStock != null"> <if test="safeStock != null">
safe_stock, safe_stock,
</if> </if>
<if test="warehouseCode != null">
warehouse_code,
</if>
<if test="warehouseName != null">
warehouse_name,
</if>
<if test="status != null"> <if test="status != null">
status, status,
</if> </if>
...@@ -195,12 +185,6 @@ ...@@ -195,12 +185,6 @@
<if test="safeStock != null"> <if test="safeStock != null">
#{safeStock,jdbcType=INTEGER}, #{safeStock,jdbcType=INTEGER},
</if> </if>
<if test="warehouseCode != null">
#{warehouseCode,jdbcType=VARCHAR},
</if>
<if test="warehouseName != null">
#{warehouseName,jdbcType=VARCHAR},
</if>
<if test="status != null"> <if test="status != null">
#{status,jdbcType=TINYINT}, #{status,jdbcType=TINYINT},
</if> </if>
...@@ -235,12 +219,6 @@ ...@@ -235,12 +219,6 @@
<if test="record.safeStock != null"> <if test="record.safeStock != null">
safe_stock = #{record.safeStock,jdbcType=INTEGER}, safe_stock = #{record.safeStock,jdbcType=INTEGER},
</if> </if>
<if test="record.warehouseCode != null">
warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
</if>
<if test="record.warehouseName != null">
warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
</if>
<if test="record.status != null"> <if test="record.status != null">
status = #{record.status,jdbcType=TINYINT}, status = #{record.status,jdbcType=TINYINT},
</if> </if>
...@@ -259,8 +237,6 @@ ...@@ -259,8 +237,6 @@
bailun_sku = #{record.bailunSku,jdbcType=VARCHAR}, bailun_sku = #{record.bailunSku,jdbcType=VARCHAR},
bailun_sku_title = #{record.bailunSkuTitle,jdbcType=VARCHAR}, bailun_sku_title = #{record.bailunSkuTitle,jdbcType=VARCHAR},
safe_stock = #{record.safeStock,jdbcType=INTEGER}, safe_stock = #{record.safeStock,jdbcType=INTEGER},
warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
status = #{record.status,jdbcType=TINYINT} status = #{record.status,jdbcType=TINYINT}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -282,12 +258,6 @@ ...@@ -282,12 +258,6 @@
<if test="safeStock != null"> <if test="safeStock != null">
safe_stock = #{safeStock,jdbcType=INTEGER}, safe_stock = #{safeStock,jdbcType=INTEGER},
</if> </if>
<if test="warehouseCode != null">
warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
</if>
<if test="warehouseName != null">
warehouse_name = #{warehouseName,jdbcType=VARCHAR},
</if>
<if test="status != null"> <if test="status != null">
status = #{status,jdbcType=TINYINT}, status = #{status,jdbcType=TINYINT},
</if> </if>
...@@ -303,8 +273,6 @@ ...@@ -303,8 +273,6 @@
set bailun_sku = #{bailunSku,jdbcType=VARCHAR}, set bailun_sku = #{bailunSku,jdbcType=VARCHAR},
bailun_sku_title = #{bailunSkuTitle,jdbcType=VARCHAR}, bailun_sku_title = #{bailunSkuTitle,jdbcType=VARCHAR},
safe_stock = #{safeStock,jdbcType=INTEGER}, safe_stock = #{safeStock,jdbcType=INTEGER},
warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
warehouse_name = #{warehouseName,jdbcType=VARCHAR},
status = #{status,jdbcType=TINYINT} status = #{status,jdbcType=TINYINT}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -328,12 +296,6 @@ ...@@ -328,12 +296,6 @@
<if test="safeStock != null"> <if test="safeStock != null">
safe_stock, safe_stock,
</if> </if>
<if test="warehouseCode != null">
warehouse_code,
</if>
<if test="warehouseName != null">
warehouse_name,
</if>
<if test="status != null"> <if test="status != null">
status, status,
</if> </if>
...@@ -352,12 +314,6 @@ ...@@ -352,12 +314,6 @@
<if test="safeStock != null"> <if test="safeStock != null">
#{safeStock,jdbcType=INTEGER}, #{safeStock,jdbcType=INTEGER},
</if> </if>
<if test="warehouseCode != null">
#{warehouseCode,jdbcType=VARCHAR},
</if>
<if test="warehouseName != null">
#{warehouseName,jdbcType=VARCHAR},
</if>
<if test="status != null"> <if test="status != null">
#{status,jdbcType=TINYINT}, #{status,jdbcType=TINYINT},
</if> </if>
...@@ -376,12 +332,6 @@ ...@@ -376,12 +332,6 @@
<if test="safeStock != null"> <if test="safeStock != null">
safe_stock = #{safeStock,jdbcType=INTEGER}, safe_stock = #{safeStock,jdbcType=INTEGER},
</if> </if>
<if test="warehouseCode != null">
warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
</if>
<if test="warehouseName != null">
warehouse_name = #{warehouseName,jdbcType=VARCHAR},
</if>
<if test="status != null"> <if test="status != null">
status = #{status,jdbcType=TINYINT}, status = #{status,jdbcType=TINYINT},
</if> </if>
...@@ -394,19 +344,15 @@ ...@@ -394,19 +344,15 @@
@project https://github.com/itfsw/mybatis-generator-plugin @project https://github.com/itfsw/mybatis-generator-plugin
--> -->
insert into dc_auto_jit_inventory insert into dc_auto_jit_inventory
(id, bailun_sku, bailun_sku_title, safe_stock, warehouse_code, warehouse_name, status (id, bailun_sku, bailun_sku_title, safe_stock, status)
)
values values
(#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{bailunSkuTitle,jdbcType=VARCHAR}, (#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{bailunSkuTitle,jdbcType=VARCHAR},
#{safeStock,jdbcType=INTEGER}, #{warehouseCode,jdbcType=VARCHAR}, #{warehouseName,jdbcType=VARCHAR}, #{safeStock,jdbcType=INTEGER}, #{status,jdbcType=TINYINT})
#{status,jdbcType=TINYINT})
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},
bailun_sku_title = #{bailunSkuTitle,jdbcType=VARCHAR}, bailun_sku_title = #{bailunSkuTitle,jdbcType=VARCHAR},
safe_stock = #{safeStock,jdbcType=INTEGER}, safe_stock = #{safeStock,jdbcType=INTEGER},
warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
warehouse_name = #{warehouseName,jdbcType=VARCHAR},
status = #{status,jdbcType=TINYINT} status = #{status,jdbcType=TINYINT}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcAutoJitInventoryExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcAutoJitInventoryExample" resultMap="BaseResultMap">
......
data-common/src/main/java/com/bailuntec/mapper/DcBaseFinanceEbayMapper.xml
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
insert into dc_base_finance_ebay3_copy insert into dc_base_finance_ebay
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
id, id,
......
data-common/src/main/java/com/bailuntec/mapper/DcConfigForecastSalesMapper.java deleted 100644 → 0
package com.bailuntec.mapper;
import com.bailuntec.domain.entity.DcConfigForecastSales;
import com.bailuntec.domain.example.DcConfigForecastSalesExample;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface DcConfigForecastSalesMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_config_forecast_sales
*
* @mbg.generated
*/
long countByExample(DcConfigForecastSalesExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_config_forecast_sales
*
* @mbg.generated
*/
int deleteByExample(DcConfigForecastSalesExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_config_forecast_sales
*
* @mbg.generated
*/
int deleteByPrimaryKey(Integer id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_config_forecast_sales
*
* @mbg.generated
*/
int insert(DcConfigForecastSales record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_config_forecast_sales
*
* @mbg.generated
*/
int insertSelective(DcConfigForecastSales record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_config_forecast_sales
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
DcConfigForecastSales selectOneByExample(DcConfigForecastSalesExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_config_forecast_sales
*
* @mbg.generated
*/
List<DcConfigForecastSales> selectByExample(DcConfigForecastSalesExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_config_forecast_sales
*
* @mbg.generated
*/
DcConfigForecastSales selectByPrimaryKey(Integer id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_config_forecast_sales
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") DcConfigForecastSales record, @Param("example") DcConfigForecastSalesExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_config_forecast_sales
*
* @mbg.generated
*/
int updateByExample(@Param("record") DcConfigForecastSales record, @Param("example") DcConfigForecastSalesExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_config_forecast_sales
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(DcConfigForecastSales record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_config_forecast_sales
*
* @mbg.generated
*/
int updateByPrimaryKey(DcConfigForecastSales record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_config_forecast_sales
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsert(DcConfigForecastSales record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_config_forecast_sales
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsertSelective(DcConfigForecastSales record);
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/mapper/JobAccountLogMapper.xml
...@@ -616,7 +616,7 @@ ...@@ -616,7 +616,7 @@
<select id="getListByPageEbay" resultType="com.bailuntec.domain.entity.JobAccountLog"> <select id="getListByPageEbay" resultType="com.bailuntec.domain.entity.JobAccountLog">
SELECT t2.id,t1.company_id, t1.account_id, t2.job_name,t2.page_index,t2.page_size,t2.type,t2.interval_time,t2.start_time,t2.end_time, t2.task_ids FROM SELECT t2.id,t1.company_id, t1.account_id, t2.job_name,t2.page_index,t2.page_size,t2.type,t2.interval_time,t2.start_time,t2.end_time, t2.task_ids FROM
(SELECT * FROM dc_base_company_account WHERE company_id = 1 and account_name not like '%test%' <if test="platformId != null">and platform_id=#{platformId} </if> order by id) t1 LEFT JOIN job_account_log t2 on t1.account_id = t2.account_id where t1.id &gt;= 423 order by t1.id limit #{pageIndex},#{pageSize} (SELECT * FROM dc_base_company_account WHERE company_id = 1 and account_name not like '%test%' <if test="platformId != null">and platform_id=#{platformId} </if> order by id) t1 LEFT JOIN job_account_log t2 on t1.account_id = t2.account_id order by t1.id limit #{pageIndex},#{pageSize}
</select> </select>
<select id="getListByPageAmazon" resultType="com.bailuntec.domain.entity.JobAccountLog"> <select id="getListByPageAmazon" resultType="com.bailuntec.domain.entity.JobAccountLog">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment