Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
pms-ci-test
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
test-ci
pms-ci-test
Commits
9201338a
提交
9201338a
authored
7月 05, 2023
作者:
张小凤
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
exchange(add)
上级
42cb17c2
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
85 行增加
和
5 行删除
+85
-5
BackstageTaskServiceController.java
...om/mmc/pms/controller/BackstageTaskServiceController.java
+10
-1
BackstageTaskServiceDao.java
src/main/java/com/mmc/pms/dao/BackstageTaskServiceDao.java
+4
-0
ServiceDO.java
src/main/java/com/mmc/pms/entity/ServiceDO.java
+6
-0
Others.java
src/main/java/com/mmc/pms/model/group/Others.java
+9
-0
ServiceDTO.java
src/main/java/com/mmc/pms/model/work/dto/ServiceDTO.java
+6
-0
ServiceVO.java
src/main/java/com/mmc/pms/model/work/vo/ServiceVO.java
+6
-1
BackstageTaskService.java
src/main/java/com/mmc/pms/service/BackstageTaskService.java
+2
-0
BackstageTaskServiceImpl.java
...va/com/mmc/pms/service/impl/BackstageTaskServiceImpl.java
+18
-1
BackstageTaskServiceDao.xml
src/main/resources/mapper/work/BackstageTaskServiceDao.xml
+24
-2
没有找到文件。
src/main/java/com/mmc/pms/controller/BackstageTaskServiceController.java
浏览文件 @
9201338a
...
@@ -3,6 +3,7 @@ package com.mmc.pms.controller;
...
@@ -3,6 +3,7 @@ package com.mmc.pms.controller;
import
com.mmc.pms.common.Page
;
import
com.mmc.pms.common.Page
;
import
com.mmc.pms.common.ResultBody
;
import
com.mmc.pms.common.ResultBody
;
import
com.mmc.pms.model.group.Create
;
import
com.mmc.pms.model.group.Create
;
import
com.mmc.pms.model.group.Others
;
import
com.mmc.pms.model.group.Update
;
import
com.mmc.pms.model.group.Update
;
import
com.mmc.pms.model.qo.ServiceQO
;
import
com.mmc.pms.model.qo.ServiceQO
;
import
com.mmc.pms.model.work.dto.ServiceDTO
;
import
com.mmc.pms.model.work.dto.ServiceDTO
;
...
@@ -67,7 +68,7 @@ public class BackstageTaskServiceController extends BaseController {
...
@@ -67,7 +68,7 @@ public class BackstageTaskServiceController extends BaseController {
@ApiParam
(
"作业服务id"
)
@RequestParam
(
value
=
"id"
)
Integer
id
,
HttpServletRequest
request
)
{
@ApiParam
(
"作业服务id"
)
@RequestParam
(
value
=
"id"
)
Integer
id
,
HttpServletRequest
request
)
{
return
backstageTaskService
.
queryById
(
id
,
request
);
return
backstageTaskService
.
queryById
(
id
,
request
);
}
}
@ApiOperation
(
value
=
"查询服务管理列表"
)
@ApiOperation
(
value
=
"查询服务管理列表"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ServiceDTO
.
class
)})
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ServiceDTO
.
class
)})
...
@@ -103,5 +104,13 @@ public class BackstageTaskServiceController extends BaseController {
...
@@ -103,5 +104,13 @@ public class BackstageTaskServiceController extends BaseController {
return
backstageTaskService
.
queryByIdCount
(
companyId
);
return
backstageTaskService
.
queryByIdCount
(
companyId
);
}
}
@ApiOperation
(
value
=
"排序交换"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)
})
@PostMapping
(
"exchange"
)
public
ResultBody
exchangeBannerInfo
(
@Validated
(
Others
.
class
)
@RequestBody
List
<
ServiceVO
>
list
)
{
return
backstageTaskService
.
exchange
(
list
);
}
}
}
src/main/java/com/mmc/pms/dao/BackstageTaskServiceDao.java
浏览文件 @
9201338a
...
@@ -46,4 +46,8 @@ public interface BackstageTaskServiceDao {
...
@@ -46,4 +46,8 @@ public interface BackstageTaskServiceDao {
Integer
getWorkServiceCountByCategoriesId
(
@Param
(
"categoriesIds"
)
List
<
Integer
>
categoriesIds
);
Integer
getWorkServiceCountByCategoriesId
(
@Param
(
"categoriesIds"
)
List
<
Integer
>
categoriesIds
);
Integer
queryByIdCount
(
Integer
companyId
);
Integer
queryByIdCount
(
Integer
companyId
);
void
exchange
(
ServiceDO
serviceDO
);
void
exchangeSort
(
Integer
id
,
Integer
sort
);
}
}
src/main/java/com/mmc/pms/entity/ServiceDO.java
浏览文件 @
9201338a
package
com
.
mmc
.
pms
.
entity
;
package
com
.
mmc
.
pms
.
entity
;
import
com.mmc.pms.model.group.Others
;
import
com.mmc.pms.model.work.vo.ServiceVO
;
import
com.mmc.pms.model.work.vo.ServiceVO
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
...
@@ -7,6 +8,7 @@ import lombok.Builder;
...
@@ -7,6 +8,7 @@ import lombok.Builder;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
javax.validation.constraints.NotNull
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -64,6 +66,10 @@ public class ServiceDO implements Serializable {
...
@@ -64,6 +66,10 @@ public class ServiceDO implements Serializable {
@ApiModelProperty
(
value
=
"单位id"
)
@ApiModelProperty
(
value
=
"单位id"
)
private
Integer
companyId
;
private
Integer
companyId
;
@ApiModelProperty
(
value
=
"顺序"
)
@NotNull
(
message
=
"sort不能为空"
,
groups
=
{
Others
.
class
})
private
Integer
sort
;
public
ServiceDO
(
ServiceVO
param
,
Integer
accountId
)
{
public
ServiceDO
(
ServiceVO
param
,
Integer
accountId
)
{
this
(
param
);
this
(
param
);
...
...
src/main/java/com/mmc/pms/model/group/Others.java
0 → 100644
浏览文件 @
9201338a
package
com
.
mmc
.
pms
.
model
.
group
;
/**
* @Author small
* @Date 2023/7/5 16:55
* @Version 1.0
*/
public
@interface
Others
{
}
src/main/java/com/mmc/pms/model/work/dto/ServiceDTO.java
浏览文件 @
9201338a
...
@@ -2,6 +2,7 @@ package com.mmc.pms.model.work.dto;
...
@@ -2,6 +2,7 @@ package com.mmc.pms.model.work.dto;
import
com.mmc.pms.entity.InspComtDO
;
import
com.mmc.pms.entity.InspComtDO
;
import
com.mmc.pms.entity.ServiceDO
;
import
com.mmc.pms.entity.ServiceDO
;
import
com.mmc.pms.model.group.Others
;
import
com.mmc.pms.model.work.vo.ServiceVO
;
import
com.mmc.pms.model.work.vo.ServiceVO
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
...
@@ -9,6 +10,7 @@ import lombok.Builder;
...
@@ -9,6 +10,7 @@ import lombok.Builder;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
javax.validation.constraints.NotNull
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -79,6 +81,9 @@ public class ServiceDTO implements Serializable {
...
@@ -79,6 +81,9 @@ public class ServiceDTO implements Serializable {
@ApiModelProperty
(
value
=
"单位名称"
)
@ApiModelProperty
(
value
=
"单位名称"
)
private
String
companyName
;
private
String
companyName
;
@ApiModelProperty
(
value
=
"顺序"
)
private
Integer
sort
;
public
ServiceDTO
(
ServiceVO
param
,
Integer
accountId
)
{
public
ServiceDTO
(
ServiceVO
param
,
Integer
accountId
)
{
this
.
id
=
param
.
getId
();
this
.
id
=
param
.
getId
();
this
.
serviceName
=
param
.
getServiceName
();
this
.
serviceName
=
param
.
getServiceName
();
...
@@ -123,6 +128,7 @@ public class ServiceDTO implements Serializable {
...
@@ -123,6 +128,7 @@ public class ServiceDTO implements Serializable {
this
.
createTime
=
serviceDO
.
getCreateTime
();
this
.
createTime
=
serviceDO
.
getCreateTime
();
this
.
updateTime
=
serviceDO
.
getUpdateTime
();
this
.
updateTime
=
serviceDO
.
getUpdateTime
();
this
.
companyId
=
serviceDO
.
getCompanyId
();
this
.
companyId
=
serviceDO
.
getCompanyId
();
this
.
sort
=
serviceDO
.
getSort
();
}
}
public
ServiceDTO
(
ServiceDO
serviceDO
,
String
companyName
)
{
public
ServiceDTO
(
ServiceDO
serviceDO
,
String
companyName
)
{
...
...
src/main/java/com/mmc/pms/model/work/vo/ServiceVO.java
浏览文件 @
9201338a
package
com
.
mmc
.
pms
.
model
.
work
.
vo
;
package
com
.
mmc
.
pms
.
model
.
work
.
vo
;
import
com.mmc.pms.model.group.Create
;
import
com.mmc.pms.model.group.Create
;
import
com.mmc.pms.model.group.Others
;
import
com.mmc.pms.model.group.Update
;
import
com.mmc.pms.model.group.Update
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
...
@@ -28,7 +29,7 @@ public class ServiceVO implements Serializable {
...
@@ -28,7 +29,7 @@ public class ServiceVO implements Serializable {
@NotNull
(
@NotNull
(
message
=
"修改服务id不能为空"
,
message
=
"修改服务id不能为空"
,
groups
=
{
Update
.
class
})
groups
=
{
Update
.
class
,
Others
.
class
})
private
Integer
id
;
private
Integer
id
;
@ApiModelProperty
(
value
=
"服务名称"
,
example
=
"服务名称"
)
@ApiModelProperty
(
value
=
"服务名称"
,
example
=
"服务名称"
)
...
@@ -70,4 +71,8 @@ public class ServiceVO implements Serializable {
...
@@ -70,4 +71,8 @@ public class ServiceVO implements Serializable {
@ApiModelProperty
(
value
=
"单位id"
)
@ApiModelProperty
(
value
=
"单位id"
)
private
Integer
companyId
;
private
Integer
companyId
;
@ApiModelProperty
(
value
=
"顺序"
)
@NotNull
(
message
=
"sort不能为空"
,
groups
=
{
Others
.
class
})
private
Integer
sort
;
}
}
src/main/java/com/mmc/pms/service/BackstageTaskService.java
浏览文件 @
9201338a
...
@@ -36,4 +36,6 @@ public interface BackstageTaskService {
...
@@ -36,4 +36,6 @@ public interface BackstageTaskService {
Integer
getWorkServiceCountByCategoriesId
(
List
<
Integer
>
ids
);
Integer
getWorkServiceCountByCategoriesId
(
List
<
Integer
>
ids
);
ResultBody
queryByIdCount
(
Integer
id
);
ResultBody
queryByIdCount
(
Integer
id
);
ResultBody
exchange
(
List
<
ServiceVO
>
list
);
}
}
src/main/java/com/mmc/pms/service/impl/BackstageTaskServiceImpl.java
浏览文件 @
9201338a
...
@@ -61,7 +61,8 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
...
@@ -61,7 +61,8 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
@Override
@Override
public
ResultBody
addWorkService
(
ServiceVO
param
,
Integer
userAccountId
)
{
public
ResultBody
addWorkService
(
ServiceVO
param
,
Integer
userAccountId
)
{
ServiceDO
serviceDO
=
new
ServiceDO
(
param
,
userAccountId
);
ServiceDO
serviceDO
=
new
ServiceDO
(
param
,
userAccountId
);
backstageTaskServiceDao
.
insert
(
serviceDO
);
Integer
insert
=
backstageTaskServiceDao
.
insert
(
serviceDO
);
backstageTaskServiceDao
.
exchangeSort
(
serviceDO
.
getId
(),
serviceDO
.
getId
());
return
ResultBody
.
success
();
return
ResultBody
.
success
();
}
}
...
@@ -207,6 +208,22 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
...
@@ -207,6 +208,22 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
return
ResultBody
.
success
(
backstageTaskServiceDao
.
queryByIdCount
(
companyId
));
return
ResultBody
.
success
(
backstageTaskServiceDao
.
queryByIdCount
(
companyId
));
}
}
@Transactional
@Override
public
ResultBody
exchange
(
List
<
ServiceVO
>
list
)
{
Integer
sort
=
list
.
get
(
0
).
getSort
();
ServiceDO
serviceDO
=
new
ServiceDO
();
serviceDO
.
setId
(
list
.
get
(
0
).
getId
());
serviceDO
.
setSort
(
list
.
get
(
1
).
getSort
());
backstageTaskServiceDao
.
exchange
(
serviceDO
);
ServiceDO
serviceDO1
=
new
ServiceDO
();
serviceDO1
.
setId
(
list
.
get
(
1
).
getId
());
serviceDO1
.
setSort
(
sort
);
backstageTaskServiceDao
.
exchange
(
serviceDO1
);
return
ResultBody
.
success
();
}
private
List
<
WorkServiceDTO
>
getWorkServiceDTOS
(
List
<
ServiceDO
>
pageList
,
HttpServletRequest
request
)
{
private
List
<
WorkServiceDTO
>
getWorkServiceDTOS
(
List
<
ServiceDO
>
pageList
,
HttpServletRequest
request
)
{
List
<
CompanyInfoVO
>
companyInfoList
=
userAppApi
.
listCompanyPage
(
new
CompanyInfoQO
(
1
,
100000
),
request
.
getHeader
(
"token"
));
List
<
CompanyInfoVO
>
companyInfoList
=
userAppApi
.
listCompanyPage
(
new
CompanyInfoQO
(
1
,
100000
),
request
.
getHeader
(
"token"
));
String
companyName
=
""
;
String
companyName
=
""
;
...
...
src/main/resources/mapper/work/BackstageTaskServiceDao.xml
浏览文件 @
9201338a
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
<result
property=
"isDeleted"
column=
"is_deleted"
jdbcType=
"INTEGER"
/>
<result
property=
"isDeleted"
column=
"is_deleted"
jdbcType=
"INTEGER"
/>
<result
property=
"accountId"
column=
"account_id"
jdbcType=
"INTEGER"
/>
<result
property=
"accountId"
column=
"account_id"
jdbcType=
"INTEGER"
/>
<result
property=
"companyId"
column=
"company_id"
jdbcType=
"INTEGER"
/>
<result
property=
"companyId"
column=
"company_id"
jdbcType=
"INTEGER"
/>
<result
property=
"sort"
column=
"sort"
jdbcType=
"INTEGER"
/>
</resultMap>
</resultMap>
<!--查询所有-->
<!--查询所有-->
...
@@ -63,7 +64,7 @@
...
@@ -63,7 +64,7 @@
<select
id=
"queryAllByLimit"
resultMap=
"ServiceMap"
parameterType=
"com.mmc.pms.model.qo.ServiceQO"
>
<select
id=
"queryAllByLimit"
resultMap=
"ServiceMap"
parameterType=
"com.mmc.pms.model.qo.ServiceQO"
>
select
select
id, service_name, application_id, industry_id, display_state, cover_plan, share_card, video,
id, service_name, application_id, industry_id, display_state, cover_plan, share_card, video,
service_introduction, create_time, update_time, account_id,company_id
service_introduction, create_time, update_time, account_id,company_id
,sort
from service
from service
<where>
<where>
is_deleted = 0
is_deleted = 0
...
@@ -83,7 +84,7 @@
...
@@ -83,7 +84,7 @@
and company_id = #{companyId}
and company_id = #{companyId}
</if>
</if>
</where>
</where>
order by
create_time
desc
order by
sort
desc
limit #{pageNo}, #{pageSize}
limit #{pageNo}, #{pageSize}
</select>
</select>
...
@@ -298,4 +299,25 @@
...
@@ -298,4 +299,25 @@
<select
id=
"queryByIdCount"
resultType=
"java.lang.Integer"
>
<select
id=
"queryByIdCount"
resultType=
"java.lang.Integer"
>
select count(1) from service where company_id=#{companyId} and is_deleted=0
select count(1) from service where company_id=#{companyId} and is_deleted=0
</select>
</select>
<update
id=
"exchange"
parameterType=
"com.mmc.pms.entity.ServiceDO"
>
update service
<set>
<if
test=
" sort != null "
>
sort = #{sort}
</if>
</set>
where id = #{id}
</update>
<update
id=
"exchangeSort"
parameterType=
"com.mmc.pms.entity.ServiceDO"
>
update service
<set>
<if
test=
" sort != null "
>
sort = #{sort}
</if>
</set>
where id = #{id}
</update>
</mapper>
</mapper>
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论