Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
W
warehouse
概览
Overview
详情
活动
周期分析
版本库
存储库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
苗卫卫
warehouse
Commits
3fca8360
提交
3fca8360
authored
1 年前
作者:
zhangqiliang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
墙盒申请的导出功能
父级
1a948737
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
2 行增加
和
6 行删除
+2
-6
src/main/java/com/boco/nbd/wios/export/Contants.java
+1
-1
src/main/java/com/boco/nbd/wios/manage/controller/WallboxApplyController.java
+1
-2
src/main/resources/mybatis/mapper/def/common/WallboxApplyMapper.xml
+0
-3
没有找到文件。
src/main/java/com/boco/nbd/wios/export/Contants.java
查看文件 @
3fca8360
...
...
@@ -101,5 +101,5 @@ public class Contants {
public
static
final
String
export_wallBox_title
=
"序号,申请团队,安装订单号,安装单最近状态,区域,是否特殊申请,审核状态,物流状态,剩余时间,超时类型,数量,申请时间"
;
public
static
final
String
export_wallBox_field
=
"no,supplierTeam,orderId,installStatus,
area
Name,ifEmergency,checkStatus,logisticsStatus,timeRemaining,ifTimeout,number,createdTime"
;
"no,supplierTeam,orderId,installStatus,
region
Name,ifEmergency,checkStatus,logisticsStatus,timeRemaining,ifTimeout,number,createdTime"
;
}
This diff is collapsed.
Click to expand it.
src/main/java/com/boco/nbd/wios/manage/controller/WallboxApplyController.java
查看文件 @
3fca8360
...
...
@@ -65,7 +65,7 @@ public class WallboxApplyController {
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"orderId"
,
value
=
"订单id"
,
dataType
=
"string"
,
paramType
=
"query"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"ifEmergency"
,
value
=
"是否紧急0否,1是"
,
dataType
=
"int"
,
paramType
=
"query"
,
required
=
true
),})
public
BaseResponse
<
Object
>
applyInstallation
(
String
orderId
,
Integer
ifEmergency
,
String
areaName
)
{
public
BaseResponse
<
Object
>
applyInstallation
(
String
orderId
,
Integer
ifEmergency
)
{
Assert
.
notNull
(
orderId
,
"订单id不能为空"
);
Order
order
=
orderService
.
get
(
orderId
);
if
(
ObjectUtil
.
isNull
(
order
))
{
...
...
@@ -91,7 +91,6 @@ public class WallboxApplyController {
wa
.
setOrderId
(
orderId
);
wa
.
setIfEmergency
(
ifEmergency
);
wa
.
setCreateAccount
(
tokenService
.
getUser
().
getUserId
());
wa
.
setAreaName
(
areaName
);
wallboxApplyService
.
insertWallboxApply
(
wa
);
return
new
BaseResponse
<>(
true
);
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mybatis/mapper/def/common/WallboxApplyMapper.xml
查看文件 @
3fca8360
...
...
@@ -91,7 +91,6 @@
<if
test=
"createdTime != null "
>
and created_time = #{createdTime}
</if>
<if
test=
"modifyAccount != null and modifyAccount != ''"
>
and modify_account = #{modifyAccount}
</if>
<if
test=
"modifyTime != null "
>
and modify_time = #{modifyTime}
</if>
<if
test=
"areaName != null "
>
and area_name = #{modifyTime}
</if>
</where>
</select>
...
...
@@ -255,7 +254,6 @@
<if
test=
"createdTime != null"
>
created_time,
</if>
<if
test=
"modifyAccount != null"
>
modify_account,
</if>
<if
test=
"modifyTime != null"
>
modify_time,
</if>
<if
test=
"areaName != null"
>
area_name,
</if>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"orderId != null and orderId != ''"
>
#{orderId},
</if>
...
...
@@ -282,7 +280,6 @@
<if
test=
"createdTime != null"
>
#{createdTime},
</if>
<if
test=
"modifyAccount != null"
>
#{modifyAccount},
</if>
<if
test=
"modifyTime != null"
>
#{modifyTime},
</if>
<if
test=
"areaName != null"
>
#{areaName},
</if>
</trim>
</insert>
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论