Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
C
chinafrica
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
zhengfg
chinafrica
Commits
63aa2301
提交
63aa2301
authored
12月 24, 2019
作者:
zgy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改商品管理
上级
422ed863
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
15 个修改的文件
包含
923 行增加
和
95 行删除
+923
-95
TbCfItemDescController.java
.../java/com/platform/controller/TbCfItemDescController.java
+109
-0
TbCfStationItemController.java
...va/com/platform/controller/TbCfStationItemController.java
+11
-5
TbCfItemDescDao.java
...admin/src/main/java/com/platform/dao/TbCfItemDescDao.java
+14
-0
TbCfItemDescEntity.java
...src/main/java/com/platform/entity/TbCfItemDescEntity.java
+102
-0
TbCfStationItemEntityExtends.java
...ava/com/platform/entity/TbCfStationItemEntityExtends.java
+9
-0
TbCfItemDescService.java
...c/main/java/com/platform/service/TbCfItemDescService.java
+71
-0
TbCfStationItemService.java
...ain/java/com/platform/service/TbCfStationItemService.java
+5
-5
TbCfItemDescServiceImpl.java
...va/com/platform/service/impl/TbCfItemDescServiceImpl.java
+59
-0
TbCfStationItemServiceImpl.java
...com/platform/service/impl/TbCfStationItemServiceImpl.java
+36
-11
TbCfItemDescDao.xml
...n/src/main/resources/com/platform/dao/TbCfItemDescDao.xml
+100
-0
TbCfStationItemDao.xml
...rc/main/resources/com/platform/dao/TbCfStationItemDao.xml
+14
-7
tbcfstationitem.html
...min/src/main/webapp/WEB-INF/page/sys/tbcfstationitem.html
+249
-57
tbcfstationitem.js
platform-admin/src/main/webapp/js/sys/tbcfstationitem.js
+137
-9
pom.xml
platform-common/pom.xml
+6
-0
ExcelExport.java
...n/src/main/java/com/platform/utils/excel/ExcelExport.java
+1
-1
没有找到文件。
platform-admin/src/main/java/com/platform/controller/TbCfItemDescController.java
0 → 100644
浏览文件 @
63aa2301
package
com
.
platform
.
controller
;
import
com.platform.entity.TbCfItemDescEntity
;
import
com.platform.service.TbCfItemDescService
;
import
com.platform.utils.PageUtils
;
import
com.platform.utils.Query
;
import
com.platform.utils.R
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
java.util.List
;
import
java.util.Map
;
/**
* Controller
*
* @author lipengjun
* @date 2019-12-23 14:28:47
*/
@Controller
@RequestMapping
(
"tbcfitemdesc"
)
public
class
TbCfItemDescController
{
@Autowired
private
TbCfItemDescService
tbCfItemDescService
;
/**
* 查看列表
*/
@RequestMapping
(
"/list"
)
@RequiresPermissions
(
"tbcfitemdesc:list"
)
@ResponseBody
public
R
list
(
@RequestParam
Map
<
String
,
Object
>
params
)
{
//查询列表数据
Query
query
=
new
Query
(
params
);
List
<
TbCfItemDescEntity
>
tbCfItemDescList
=
tbCfItemDescService
.
queryList
(
query
);
int
total
=
tbCfItemDescService
.
queryTotal
(
query
);
PageUtils
pageUtil
=
new
PageUtils
(
tbCfItemDescList
,
total
,
query
.
getLimit
(),
query
.
getPage
());
return
R
.
ok
().
put
(
"page"
,
pageUtil
);
}
/**
* 查看信息
*/
@RequestMapping
(
"/info/{itemId}"
)
@RequiresPermissions
(
"tbcfitemdesc:info"
)
@ResponseBody
public
R
info
(
@PathVariable
(
"itemId"
)
String
itemId
)
{
TbCfItemDescEntity
tbCfItemDesc
=
tbCfItemDescService
.
queryObject
(
itemId
);
return
R
.
ok
().
put
(
"tbCfItemDesc"
,
tbCfItemDesc
);
}
/**
* 保存
*/
@RequestMapping
(
"/save"
)
@RequiresPermissions
(
"tbcfitemdesc:save"
)
@ResponseBody
public
R
save
(
@RequestBody
TbCfItemDescEntity
tbCfItemDesc
)
{
tbCfItemDescService
.
save
(
tbCfItemDesc
);
return
R
.
ok
();
}
/**
* 修改
*/
@RequestMapping
(
"/update"
)
@RequiresPermissions
(
"tbcfitemdesc:update"
)
@ResponseBody
public
R
update
(
@RequestBody
TbCfItemDescEntity
tbCfItemDesc
)
{
tbCfItemDescService
.
update
(
tbCfItemDesc
);
return
R
.
ok
();
}
/**
* 删除
*/
@RequestMapping
(
"/delete"
)
@RequiresPermissions
(
"tbcfitemdesc:delete"
)
@ResponseBody
public
R
delete
(
@RequestBody
String
[]
itemIds
)
{
tbCfItemDescService
.
deleteBatch
(
itemIds
);
return
R
.
ok
();
}
/**
* 查看所有列表
*/
@RequestMapping
(
"/queryAll"
)
@ResponseBody
public
R
queryAll
(
@RequestParam
Map
<
String
,
Object
>
params
)
{
List
<
TbCfItemDescEntity
>
list
=
tbCfItemDescService
.
queryList
(
params
);
return
R
.
ok
().
put
(
"list"
,
list
);
}
}
platform-admin/src/main/java/com/platform/controller/TbCfStationItemController.java
浏览文件 @
63aa2301
...
...
@@ -92,9 +92,8 @@ public class TbCfStationItemController extends ApiBaseAction {
@RequestMapping
(
"/save"
)
@RequiresPermissions
(
"tbcfstationitem:save"
)
@ResponseBody
public
R
save
(
@RequestBody
TbCfStationItemEntity
tbCfStationItem
)
{
tbCfStationItemService
.
save
(
tbCfStationItem
);
public
R
save
(
@RequestBody
TbCfStationItemEntity
tbCfStationItem
,
String
itemDesc
)
{
tbCfStationItemService
.
save
(
tbCfStationItem
,
itemDesc
);
return
R
.
ok
();
}
...
...
@@ -104,8 +103,8 @@ public class TbCfStationItemController extends ApiBaseAction {
@RequestMapping
(
"/update"
)
@RequiresPermissions
(
"tbcfstationitem:update"
)
@ResponseBody
public
R
update
(
@RequestBody
TbCfStationItemEntity
tbCfStationItem
)
{
tbCfStationItemService
.
update
(
tbCfStationItem
);
public
R
update
(
@RequestBody
TbCfStationItemEntity
tbCfStationItem
,
String
itemDesc
)
{
tbCfStationItemService
.
update
(
tbCfStationItem
,
itemDesc
);
return
R
.
ok
();
}
...
...
@@ -156,6 +155,13 @@ public class TbCfStationItemController extends ApiBaseAction {
return
R
.
ok
().
put
(
"descripiton"
,
descripiton
);
}
/**
* 修改商品状态
*
* @param status
* @param itemIds
* @return
*/
@RequestMapping
(
"/changeItemStatus"
)
@RequiresPermissions
(
"tbcfstationitem:changeItemStatus"
)
@ResponseBody
...
...
platform-admin/src/main/java/com/platform/dao/TbCfItemDescDao.java
0 → 100644
浏览文件 @
63aa2301
package
com
.
platform
.
dao
;
import
com.platform.entity.TbCfItemDescEntity
;
import
org.apache.ibatis.annotations.Param
;
/**
* Dao
*
* @author lipengjun
* @date 2019-12-23 14:28:47
*/
public
interface
TbCfItemDescDao
extends
BaseDao
<
TbCfItemDescEntity
>
{
int
changeItemDescStatus
(
@Param
(
"status"
)
Integer
status
,
@Param
(
"itemIds"
)
String
[]
itemIds
);
}
platform-admin/src/main/java/com/platform/entity/TbCfItemDescEntity.java
0 → 100644
浏览文件 @
63aa2301
package
com
.
platform
.
entity
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* 实体
* 表名 tb_cf_item_desc
*
* @author lipengjun
* @date 2019-12-23 14:28:47
*/
public
class
TbCfItemDescEntity
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 商品ID
*/
private
String
itemId
;
/**
* 商品描述
*/
private
String
itemDesc
;
/**
* 删除标志
*/
private
Integer
delFlag
;
/**
* 创建时间
*/
private
Date
createTime
;
/**
* 更新时间
*/
private
Date
updateTime
;
/**
* 设置:商品ID
*/
public
void
setItemId
(
String
itemId
)
{
this
.
itemId
=
itemId
;
}
/**
* 获取:商品ID
*/
public
String
getItemId
()
{
return
itemId
;
}
/**
* 设置:商品描述
*/
public
void
setItemDesc
(
String
itemDesc
)
{
this
.
itemDesc
=
itemDesc
;
}
/**
* 获取:商品描述
*/
public
String
getItemDesc
()
{
return
itemDesc
;
}
/**
* 设置:删除标志
*/
public
void
setDelFlag
(
Integer
delFlag
)
{
this
.
delFlag
=
delFlag
;
}
/**
* 获取:删除标志
*/
public
Integer
getDelFlag
()
{
return
delFlag
;
}
/**
* 设置:创建时间
*/
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
/**
* 获取:创建时间
*/
public
Date
getCreateTime
()
{
return
createTime
;
}
/**
* 设置:更新时间
*/
public
void
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
/**
* 获取:更新时间
*/
public
Date
getUpdateTime
()
{
return
updateTime
;
}
}
platform-admin/src/main/java/com/platform/entity/TbCfStationItemEntityExtends.java
浏览文件 @
63aa2301
...
...
@@ -8,6 +8,15 @@ public class TbCfStationItemEntityExtends extends TbCfStationItemEntity implemen
private
String
dname
;
private
String
title
;
private
String
goodtype
;
private
String
itemDesc
;
public
String
getItemDesc
()
{
return
itemDesc
;
}
public
void
setItemDesc
(
String
itemDesc
)
{
this
.
itemDesc
=
itemDesc
;
}
public
String
getDname
()
{
return
dname
;
...
...
platform-admin/src/main/java/com/platform/service/TbCfItemDescService.java
0 → 100644
浏览文件 @
63aa2301
package
com
.
platform
.
service
;
import
com.platform.entity.TbCfItemDescEntity
;
import
java.util.List
;
import
java.util.Map
;
/**
* Service接口
*
* @author lipengjun
* @date 2019-12-23 14:28:47
*/
public
interface
TbCfItemDescService
{
/**
* 根据主键查询实体
*
* @param id 主键
* @return 实体
*/
TbCfItemDescEntity
queryObject
(
String
itemId
);
/**
* 分页查询
*
* @param map 参数
* @return list
*/
List
<
TbCfItemDescEntity
>
queryList
(
Map
<
String
,
Object
>
map
);
/**
* 分页统计总数
*
* @param map 参数
* @return 总数
*/
int
queryTotal
(
Map
<
String
,
Object
>
map
);
/**
* 保存实体
*
* @param tbCfItemDesc 实体
* @return 保存条数
*/
int
save
(
TbCfItemDescEntity
tbCfItemDesc
);
/**
* 根据主键更新实体
*
* @param tbCfItemDesc 实体
* @return 更新条数
*/
int
update
(
TbCfItemDescEntity
tbCfItemDesc
);
/**
* 根据主键删除
*
* @param itemId
* @return 删除条数
*/
int
delete
(
String
itemId
);
/**
* 根据主键批量删除
*
* @param itemIds
* @return 删除条数
*/
int
deleteBatch
(
String
[]
itemIds
);
}
platform-admin/src/main/java/com/platform/service/TbCfStationItemService.java
浏览文件 @
63aa2301
...
...
@@ -44,7 +44,7 @@ public interface TbCfStationItemService {
* @param tbCfStationItem 实体
* @return 保存条数
*/
int
save
(
TbCfStationItemEntity
tbCfStationItem
);
void
save
(
TbCfStationItemEntity
tbCfStationItem
,
String
itemDesc
);
/**
* 根据主键更新实体
...
...
@@ -52,7 +52,7 @@ public interface TbCfStationItemService {
* @param tbCfStationItem 实体
* @return 更新条数
*/
int
update
(
TbCfStationItemEntity
tbCfStationItem
);
void
update
(
TbCfStationItemEntity
tbCfStationItem
,
String
itemDesc
);
/**
* 根据主键删除
...
...
@@ -60,7 +60,7 @@ public interface TbCfStationItemService {
* @param itemId
* @return 删除条数
*/
int
delete
(
String
itemId
);
void
delete
(
String
itemId
);
/**
* 根据主键批量删除
...
...
@@ -68,7 +68,7 @@ public interface TbCfStationItemService {
* @param itemIds
* @return 删除条数
*/
int
deleteBatch
(
String
[]
itemIds
);
void
deleteBatch
(
String
[]
itemIds
);
/**
* 修改商品状态
...
...
@@ -76,5 +76,5 @@ public interface TbCfStationItemService {
* @param itemIds
* @return
*/
int
changeItemStatus
(
Integer
status
,
String
[]
itemIds
);
void
changeItemStatus
(
Integer
status
,
String
[]
itemIds
);
}
platform-admin/src/main/java/com/platform/service/impl/TbCfItemDescServiceImpl.java
0 → 100644
浏览文件 @
63aa2301
package
com
.
platform
.
service
.
impl
;
import
com.platform.dao.TbCfItemDescDao
;
import
com.platform.entity.TbCfItemDescEntity
;
import
com.platform.service.TbCfItemDescService
;
import
com.platform.utils.IdUtil
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
import
java.util.Map
;
/**
* Service实现类
*
* @author lipengjun
* @date 2019-12-23 14:28:47
*/
@Service
(
"tbCfItemDescService"
)
public
class
TbCfItemDescServiceImpl
implements
TbCfItemDescService
{
@Autowired
private
TbCfItemDescDao
tbCfItemDescDao
;
@Override
public
TbCfItemDescEntity
queryObject
(
String
itemId
)
{
return
tbCfItemDescDao
.
queryObject
(
itemId
);
}
@Override
public
List
<
TbCfItemDescEntity
>
queryList
(
Map
<
String
,
Object
>
map
)
{
return
tbCfItemDescDao
.
queryList
(
map
);
}
@Override
public
int
queryTotal
(
Map
<
String
,
Object
>
map
)
{
return
tbCfItemDescDao
.
queryTotal
(
map
);
}
@Override
public
int
save
(
TbCfItemDescEntity
tbCfItemDesc
)
{
tbCfItemDesc
.
setItemId
(
IdUtil
.
createIdbyUUID
());
return
tbCfItemDescDao
.
save
(
tbCfItemDesc
);
}
@Override
public
int
update
(
TbCfItemDescEntity
tbCfItemDesc
)
{
return
tbCfItemDescDao
.
update
(
tbCfItemDesc
);
}
@Override
public
int
delete
(
String
itemId
)
{
return
tbCfItemDescDao
.
delete
(
itemId
);
}
@Override
public
int
deleteBatch
(
String
[]
itemIds
)
{
return
tbCfItemDescDao
.
deleteBatch
(
itemIds
);
}
}
platform-admin/src/main/java/com/platform/service/impl/TbCfStationItemServiceImpl.java
浏览文件 @
63aa2301
package
com
.
platform
.
service
.
impl
;
import
com.platform.dao.TbCfItemDescDao
;
import
com.platform.dao.TbCfStationItemDao
;
import
com.platform.entity.TbCfItemDescEntity
;
import
com.platform.entity.TbCfStationItemEntity
;
import
com.platform.service.TbCfStationItemService
;
import
com.platform.utils.IdUtil
;
import
com.platform.utils.util.StringUtil
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -22,6 +26,9 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
@Autowired
private
TbCfStationItemDao
tbCfStationItemDao
;
@Autowired
private
TbCfItemDescDao
tbCfItemDescDao
;
@Override
public
TbCfStationItemEntity
queryObject
(
String
itemId
)
{
return
tbCfStationItemDao
.
queryObject
(
itemId
);
...
...
@@ -38,30 +45,48 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
}
@Override
public
int
save
(
TbCfStationItemEntity
tbCfStationItem
)
{
tbCfStationItem
.
setItemId
(
IdUtil
.
createIdbyUUID
());
public
void
save
(
TbCfStationItemEntity
tbCfStationItem
,
String
itemDesc
)
{
String
itemId
=
IdUtil
.
createIdbyUUID
();
tbCfStationItem
.
setItemId
(
itemId
);
tbCfStationItem
.
setCreateTime
(
new
Date
());
tbCfStationItem
.
setItemNum
(
0L
);
return
tbCfStationItemDao
.
save
(
tbCfStationItem
);
TbCfItemDescEntity
itemDescEntity
=
new
TbCfItemDescEntity
();
itemDescEntity
.
setItemId
(
itemId
);
itemDescEntity
.
setCreateTime
(
new
Date
());
itemDescEntity
.
setUpdateTime
(
new
Date
());
itemDescEntity
.
setItemDesc
(
itemDesc
);
itemDescEntity
.
setDelFlag
(
1
);
tbCfStationItemDao
.
save
(
tbCfStationItem
);
tbCfItemDescDao
.
save
(
itemDescEntity
);
}
@Override
public
int
update
(
TbCfStationItemEntity
tbCfStationItem
)
{
return
tbCfStationItemDao
.
update
(
tbCfStationItem
);
public
void
update
(
TbCfStationItemEntity
tbCfStationItem
,
String
itemDesc
)
{
TbCfItemDescEntity
itemDescEntity
=
tbCfItemDescDao
.
queryObject
(
tbCfStationItem
.
getItemId
());
if
(
itemDescEntity
!=
null
)
{
itemDescEntity
.
setUpdateTime
(
new
Date
());
itemDescEntity
.
setItemDesc
(
itemDesc
);
tbCfItemDescDao
.
update
(
itemDescEntity
);
}
tbCfStationItemDao
.
update
(
tbCfStationItem
);
}
@Override
public
int
delete
(
String
itemId
)
{
return
tbCfStationItemDao
.
delete
(
itemId
);
public
void
delete
(
String
itemId
)
{
tbCfStationItemDao
.
delete
(
itemId
);
tbCfItemDescDao
.
delete
(
itemId
);
}
@Override
public
int
deleteBatch
(
String
[]
itemIds
)
{
return
tbCfStationItemDao
.
deleteBatch
(
itemIds
);
public
void
deleteBatch
(
String
[]
itemIds
)
{
tbCfStationItemDao
.
deleteBatch
(
itemIds
);
tbCfItemDescDao
.
deleteBatch
(
itemIds
);
}
@Override
public
int
changeItemStatus
(
Integer
status
,
String
[]
itemIds
)
{
return
tbCfStationItemDao
.
changeItemStatus
(
status
,
itemIds
);
public
void
changeItemStatus
(
Integer
status
,
String
[]
itemIds
)
{
tbCfStationItemDao
.
changeItemStatus
(
status
,
itemIds
);
tbCfItemDescDao
.
changeItemDescStatus
(
status
,
itemIds
);
}
}
platform-admin/src/main/resources/com/platform/dao/TbCfItemDescDao.xml
0 → 100644
浏览文件 @
63aa2301
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.platform.dao.TbCfItemDescDao"
>
<resultMap
type=
"com.platform.entity.TbCfItemDescEntity"
id=
"tbCfItemDescMap"
>
<result
property=
"itemId"
column=
"item_id"
/>
<result
property=
"itemDesc"
column=
"item_desc"
/>
<result
property=
"delFlag"
column=
"del_flag"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
</resultMap>
<select
id=
"queryObject"
resultType=
"com.platform.entity.TbCfItemDescEntity"
>
select
`item_id`,
`item_desc`,
`del_flag`,
`create_time`,
`update_time`
from tb_cf_item_desc
where item_id = #{id}
</select>
<select
id=
"queryList"
resultType=
"com.platform.entity.TbCfItemDescEntity"
>
select
`item_id`,
`item_desc`,
`del_flag`,
`create_time`,
`update_time`
from tb_cf_item_desc
WHERE 1=1
<if
test=
"name != null and name.trim() != ''"
>
AND name LIKE concat('%',#{name},'%')
</if>
<choose>
<when
test=
"sidx != null and sidx.trim() != ''"
>
order by ${sidx} ${order}
</when>
<otherwise>
order by item_id desc
</otherwise>
</choose>
<if
test=
"offset != null and limit != null"
>
limit #{offset}, #{limit}
</if>
</select>
<select
id=
"queryTotal"
resultType=
"int"
>
select count(*) from tb_cf_item_desc
WHERE 1=1
<if
test=
"name != null and name.trim() != ''"
>
AND name LIKE concat('%',#{name},'%')
</if>
</select>
<insert
id=
"save"
parameterType=
"com.platform.entity.TbCfItemDescEntity"
>
insert into tb_cf_item_desc(
`item_id`,
`item_desc`,
`del_flag`,
`create_time`,
`update_time`)
values(
#{itemId},
#{itemDesc},
#{delFlag},
#{createTime},
#{updateTime})
</insert>
<update
id=
"update"
parameterType=
"com.platform.entity.TbCfItemDescEntity"
>
update tb_cf_item_desc
<set>
<if
test=
"itemDesc != null"
>
`item_desc` = #{itemDesc},
</if>
<if
test=
"delFlag != null"
>
`del_flag` = #{delFlag},
</if>
<if
test=
"createTime != null"
>
`create_time` = #{createTime},
</if>
<if
test=
"updateTime != null"
>
`update_time` = #{updateTime}
</if>
</set>
where item_id = #{itemId}
</update>
<delete
id=
"delete"
>
delete from tb_cf_item_desc where item_id = #{value}
</delete>
<delete
id=
"deleteBatch"
>
delete from tb_cf_item_desc where item_id in
<foreach
item=
"itemId"
collection=
"array"
open=
"("
separator=
","
close=
")"
>
#{itemId}
</foreach>
</delete>
<update
id=
"changeItemDescStatus"
>
update tb_cf_item_desc set del_flag=#{status} where item_id in
<foreach
item=
"itemId"
collection=
"itemIds"
open=
"("
separator=
","
close=
")"
>
#{itemId}
</foreach>
</update>
</mapper>
\ No newline at end of file
platform-admin/src/main/resources/com/platform/dao/TbCfStationItemDao.xml
浏览文件 @
63aa2301
...
...
@@ -25,9 +25,9 @@
<result
property=
"itemDescritionId"
column=
"item_descrition_id"
/>
</resultMap>
<select
id=
"queryObject"
resultType=
"com.platform.entity.TbCfStationItemEntity"
>
<select
id=
"queryObject"
resultType=
"com.platform.entity.TbCfStationItemEntity
Extends
"
>
select
`item_id`
,
i.item_id
,
`item_code`,
`item_name`,
`item_brief`,
...
...
@@ -43,11 +43,12 @@
`platform_code`,
`platform_name`,
`enable_flag`,
`create_time`
,
i.create_time
,
`item_categorytwo`,
`item_descrition_id`
from tb_cf_station_item
where item_id = #{id}
`item_descrition_id`,
item_desc itemDesc
from tb_cf_station_item i left join tb_cf_item_desc d on i.item_id=d.item_id
where i.item_id = #{id}
</select>
<select
id=
"queryList"
resultType=
"com.platform.entity.TbCfStationItemEntityExtends"
>
...
...
@@ -60,7 +61,7 @@
i.item_price,
i.item_url,
i.item_img,
i.item_count,
i.item_count,
i.item_num,
i.platform_code,
i.platform_name,
...
...
@@ -85,6 +86,9 @@
<if
test=
"code != null and code.trim() != ''"
>
AND item_code=#{code}
</if>
<if
test=
"status != null and status.trim() != ''"
>
AND enable_flag=#{status}
</if>
<choose>
<when
test=
"sidx != null and sidx.trim() != ''"
>
order by ${sidx} ${order}
...
...
@@ -108,6 +112,9 @@
<if
test=
"code != null and code.trim() != ''"
>
AND item_code=#{code}
</if>
<if
test=
"status != null and status.trim() != ''"
>
AND enable_flag=#{status}
</if>
</select>
<insert
id=
"save"
parameterType=
"com.platform.entity.TbCfStationItemEntity"
>
...
...
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfstationitem.html
浏览文件 @
63aa2301
差异被折叠。
点击展开。
platform-admin/src/main/webapp/js/sys/tbcfstationitem.js
浏览文件 @
63aa2301
...
...
@@ -6,7 +6,7 @@ $(function () {
{
label
:
'商品图片'
,
name
:
'itemImg'
,
index
:
'item_img'
,
width
:
35
,
formatter
:
imageFormat
},
{
label
:
'商品编号'
,
name
:
'itemCode'
,
index
:
'item_code'
,
width
:
60
},
{
label
:
'商品名称'
,
name
:
'itemName'
,
index
:
'item_name'
,
width
:
160
},
/* {label: '商品标题', name: 'itemBrief', index: 'item_brief', width: 120},*/
/* {label: '商品标题', name: 'itemBrief', index: 'item_brief', width: 120},*/
/*{label: '商品链接', name: 'itemUrl', index: 'item_url', width: 80,formatter:linkFormat},*/
{
label
:
'商品价格'
,
name
:
'itemPrice'
,
index
:
'item_price'
,
width
:
45
},
{
label
:
'库存'
,
name
:
'itemCount'
,
index
:
'item_count'
,
width
:
45
},
...
...
@@ -16,9 +16,9 @@ $(function () {
{
label
:
'商品一级分类'
,
name
:
'goodtype'
,
index
:
'goodtype'
,
width
:
80
},
{
label
:
'商品二级分类'
,
name
:
'title'
,
index
:
'title'
,
width
:
80
},
{
label
:
'商品品名'
,
name
:
'dname'
,
index
:
'itemDescritionId'
,
width
:
80
},
{
label
:
'状态'
,
name
:
'enableFlag'
,
index
:
'enable_flag'
,
width
:
60
,
formatter
:
itemStatusFormat
},
{
label
:
'创建日期'
,
name
:
'createTime'
,
index
:
'create_time'
,
width
:
80
}
]
{
label
:
'状态'
,
name
:
'enableFlag'
,
index
:
'enable_flag'
,
width
:
60
,
formatter
:
itemStatusFormat
},
{
label
:
'创建日期'
,
name
:
'createTime'
,
index
:
'create_time'
,
width
:
80
}
]
});
});
...
...
@@ -38,8 +38,21 @@ let vm = new Vue({
]
},
q
:
{
name
:
''
}
name
:
''
,
code
:
''
,
status
:
''
},
alertShow
:
false
,
//警告弹窗
attrItem
:[{
selected
:
'尺寸'
,
option
:[
'颜色'
,
'尺寸'
,
'长度'
],
content
:
''
}],
//属性设置
prevItem
:[],
//组合数组
delIndex
:
null
,
putaway
:
false
//是否立即上架
},
methods
:
{
//获取一级分类
...
...
@@ -81,6 +94,9 @@ let vm = new Vue({
vm
.
showList
=
false
;
vm
.
title
=
"新增"
;
vm
.
tbCfStationItem
=
{};
this
.
uploadList
.
length
=
0
;
// vm.tbCfStationItem.itemImg = "";
UE
.
getEditor
(
'itemDesc'
).
setContent
(
""
);
},
update
:
function
(
event
)
{
let
itemId
=
getSelectedRow
(
"#jqGrid"
);
...
...
@@ -94,7 +110,10 @@ let vm = new Vue({
},
saveOrUpdate
:
function
(
event
)
{
vm
.
tbCfStationItem
.
itemImg
=
vm
.
uploadList
[
0
];
let
url
=
vm
.
tbCfStationItem
.
itemId
==
null
?
"../tbcfstationitem/save"
:
"../tbcfstationitem/update"
;
vm
.
tbCfStationItem
.
itemDesc
=
encodeURI
(
UE
.
getEditor
(
'itemDesc'
).
getContent
());
// 富文本取值
let
itemDesc
=
vm
.
tbCfStationItem
.
itemDesc
.
replace
(
/ /g
,
" "
);
let
url
=
vm
.
tbCfStationItem
.
itemId
==
null
?
"../tbcfstationitem/save?itemDesc="
+
itemDesc
:
"../tbcfstationitem/update?itemDesc="
+
itemDesc
;
Ajax
.
request
({
url
:
url
,
params
:
JSON
.
stringify
(
vm
.
tbCfStationItem
),
...
...
@@ -151,14 +170,34 @@ let vm = new Vue({
successCallback
:
function
(
r
)
{
vm
.
tbCfStationItem
=
r
.
tbCfStationItem
;
vm
.
uploadList
[
0
]
=
vm
.
tbCfStationItem
.
itemImg
;
let
itemDesc
=
vm
.
tbCfStationItem
.
itemDesc
;
UE
.
getEditor
(
'itemDesc'
).
setContent
(
itemDesc
);
if
(
itemDesc
==
null
||
itemDesc
==
''
)
{
UE
.
getEditor
(
'itemDesc'
).
setContent
(
""
);
}
}
});
},
import
:
function
()
{
let
itemIds
=
getSelectedRows
(
"#jqGrid"
);
if
(
itemIds
==
null
)
{
return
;
}
},
export
:
function
()
{
let
itemIds
=
getSelectedRows
(
"#jqGrid"
);
if
(
itemIds
==
null
)
{
return
;
}
},
reload
:
function
(
event
)
{
vm
.
showList
=
true
;
let
page
=
$
(
"#jqGrid"
).
jqGrid
(
'getGridParam'
,
'page'
);
$
(
"#jqGrid"
).
jqGrid
(
'setGridParam'
,
{
postData
:
{
'name'
:
vm
.
q
.
name
,
'code'
:
vm
.
q
.
code
},
postData
:
{
'name'
:
vm
.
q
.
name
.
trim
(),
'code'
:
vm
.
q
.
code
.
trim
(),
'status'
:
vm
.
q
.
status
.
trim
()
},
page
:
page
}).
trigger
(
"reloadGrid"
);
vm
.
handleReset
(
'formValidate'
);
...
...
@@ -166,7 +205,8 @@ let vm = new Vue({
reloadSearch
:
function
()
{
vm
.
q
=
{
name
:
''
,
code
:
''
code
:
''
,
status
:
''
};
vm
.
reload
();
},
...
...
@@ -274,6 +314,94 @@ let vm = new Vue({
}
},
/* 添加属性 */
addAttr
(){
if
(
this
.
attrItem
.
length
>
2
){
this
.
$Message
.
info
(
'最多添加三种属性'
);
}
else
{
this
.
attrItem
.
push
({
selected
:
'颜色'
,
option
:[
'颜色'
,
'尺寸'
,
'长度'
],
content
:
''
})
}
},
/* 删除属性 */
delAttr
(){
let
arr
=
new
Array
();
this
.
attrItem
.
map
((
item
,
index
)
=>
{
if
(
this
.
delIndex
!==
index
){
arr
.
push
(
item
)
}
})
this
.
delIndex
=
null
this
.
attrItem
=
arr
this
.
handleChangeContent
()
},
/* 删除单条组合 */
del
(
i
){
let
arr
=
new
Array
();
this
.
prevItem
.
map
((
item
,
index
)
=>
{
if
(
i
!==
index
){
arr
.
push
(
item
)
}
})
this
.
prevItem
=
arr
},
/* 确定删除 */
confirmDel
(
i
){
this
.
delIndex
=
i
this
.
alertShow
=
true
},
/* 计算所有规格的组合 */
handleChangeContent
(){
/* 笛卡尔乘积 */
function
product
(
arr
)
{
const
result
=
arr
.
reduce
((
accArr
,
currentArr
)
=>
{
let
result
=
[]
currentArr
.
forEach
(
c
=>
{
if
(
accArr
.
length
)
{
accArr
.
forEach
(
a
=>
{
result
.
push
(
a
.
concat
(
c
))
})
}
else
{
result
.
push
([
c
])
}
})
return
result
},
[])
return
result
.
map
(
arr
=>
arr
.
join
(
'/'
))
}
this
.
prevItem
=
[]
let
contentArr
=
[]
// 属性通过','分割后的数组
this
.
attrItem
.
map
(
item
=>
{
let
formatter
=
[]
item
.
content
.
split
(
','
).
map
(
item_c
=>
{
if
(
item_c
===
''
)
return
formatter
.
push
(
item_c
)
})
contentArr
.
push
({
size
:
formatter
,
name
:
item
.
selected
})
})
let
skuStrName
=
''
//sku组合名
let
skuArr
=
[]
contentArr
.
forEach
((
item_a
,
index_a
)
=>
{
skuStrName
+=
item_a
.
name
+
'/'
skuArr
.
push
(
item_a
.
size
)
})
skuStrName
=
skuStrName
.
slice
(
0
,
skuStrName
.
length
-
1
)
product
(
skuArr
).
forEach
(
item
=>
{
this
.
prevItem
.
push
({
skuStrName
:
skuStrName
,
skuStrCombination
:
item
,
price
:
null
,
num
:
0
})
})
},
/* 保存 */
save
(){
console
.
log
(
this
.
prevItem
)
//sku组合数组
console
.
log
(
this
.
putaway
)
//是否立即上架
}
/** ******************************************************************************************** */
},
...
...
platform-common/pom.xml
浏览文件 @
63aa2301
...
...
@@ -24,6 +24,12 @@
<yunpian-version>
1.2.7
</yunpian-version>
</properties>
<dependencies>
<dependency>
<groupId>
javax.servlet
</groupId>
<artifactId>
javax.servlet-api
</artifactId>
<version>
3.1.0
</version>
<scope>
compile
</scope>
</dependency>
<dependency>
<groupId>
com.yunpian.sdk
</groupId>
<artifactId>
yunpian-java-sdk
</artifactId>
...
...
platform-common/src/main/java/com/platform/utils/excel/ExcelExport.java
浏览文件 @
63aa2301
...
...
@@ -34,7 +34,6 @@ import java.util.Map;
* 导出EXCEL功能包主类
* 使用POI进行EXCEL导出的功能类。
* 目前简单处理,未设置内存优化。 数据量偏大,出现性能问题时再处理。
*
*/
public
class
ExcelExport
{
...
...
@@ -177,6 +176,7 @@ public class ExcelExport {
obj
.
add
(
new
BigDecimal
(
"123456789123456789.1234"
));
obj
.
add
(
true
);
list1
.
add
(
obj
.
toArray
());
String
[]
header
=
new
String
[]{
"身份证号"
,
"日期"
,
"时间"
,
"整型"
,
"长整"
,
"浮点"
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论