Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
promotion-service
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
promotion
promotion-service
Commits
f33536eb
提交
f33536eb
authored
4月 09, 2025
作者:
李秋林
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
创建/修改/查询稽查任务时,jsonarray与varchar两对象之间相互转换
上级
f6faa2e8
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
25 行增加
和
14 行删除
+25
-14
ExaPlanCoreController.java
...on/controller/activity/examine/ExaPlanCoreController.java
+1
-0
ActivityExamineDaoImpl.java
...otion/domain/examine/dao/impl/ActivityExamineDaoImpl.java
+20
-10
ActivityExamineDto.java
...omotion/pojo/activity/examine/dto/ActivityExamineDto.java
+4
-4
没有找到文件。
src/main/java/com/wangxiaolu/promotion/controller/activity/examine/ExaPlanCoreController.java
浏览文件 @
f33536eb
package
com
.
wangxiaolu
.
promotion
.
controller
.
activity
.
examine
;
import
com.alibaba.fastjson.JSONObject
;
import
com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto
;
import
com.wangxiaolu.promotion.pojo.activity.examine.vo.ExaPlanVo
;
import
com.wangxiaolu.promotion.result.basedata.R
;
...
...
src/main/java/com/wangxiaolu/promotion/domain/examine/dao/impl/ActivityExamineDaoImpl.java
浏览文件 @
f33536eb
package
com
.
wangxiaolu
.
promotion
.
domain
.
examine
.
dao
.
impl
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson2.JSONArray
;
import
com.alibaba.fastjson2.JSONObject
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.wangxiaolu.promotion.common.util.BeanUtils
;
...
...
@@ -31,13 +32,13 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao {
@Override
public
ActivityExamineDto
selectById
(
Long
id
)
{
ActivityExamineDO
activityExamineDO
=
activityExamineMapper
.
selectById
(
id
);
return
BeanUtils
.
transitionDto
(
activityExamineDO
,
ActivityExamineDto
.
class
);
return
returnDo
(
activityExamineDO
);
}
@Override
public
ActivityExamineDto
selectByPlanId
(
Long
planId
)
{
ActivityExamineDO
examineDO
=
activityExamineMapper
.
selectByPlanId
(
planId
);
return
BeanUtils
.
transitionDto
(
examineDO
,
ActivityExamineDto
.
class
);
return
returnDo
(
examineDO
);
}
@Override
...
...
@@ -48,7 +49,7 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao {
arrayToStringByDo
(
examineDO
,
examineDto
);
activityExamineMapper
.
insert
(
examineDO
);
ActivityExamineDO
examineDO1
=
activityExamineMapper
.
selectById
(
examineDO
.
getId
());
return
BeanUtils
.
transitionDto
(
examineDO1
,
ActivityExamineDto
.
class
);
return
returnDo
(
examineDO1
);
}
catch
(
Exception
e
)
{
String
eMsg
=
e
.
getCause
().
getMessage
();
if
(
eMsg
.
contains
(
"for key 'plan_id_unique'"
))
{
...
...
@@ -65,7 +66,7 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao {
arrayToStringByDo
(
examineDO
,
examineDto
);
activityExamineMapper
.
updateById
(
examineDO
);
ActivityExamineDO
examineDO1
=
activityExamineMapper
.
selectById
(
examineDO
.
getId
());
return
BeanUtils
.
transitionDto
(
examineDO1
,
ActivityExamineDto
.
class
);
return
returnDo
(
examineDO1
);
}
@Override
...
...
@@ -89,11 +90,20 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao {
}
private
void
arrayToStringByDo
(
ActivityExamineDO
examineDO
,
ActivityExamineDto
examineDto
){
examineDO
.
setReportedIds
(
JSONObject
.
toJSONString
(
examineDto
.
getReportedIds
()));
examineDO
.
setClockIds
(
JSONObject
.
toJSONString
(
examineDto
.
getClockIds
()));
examineDO
.
setTemWorkPhotos
(
JSONObject
.
toJSONString
(
examineDto
.
getTemWorkPhotos
()));
examineDO
.
setPosPhotos
(
JSONObject
.
toJSONString
(
examineDto
.
getPosPhotos
()));
private
ActivityExamineDto
returnDo
(
ActivityExamineDO
activityExamineDO
)
{
ActivityExamineDto
dto
=
BeanUtils
.
transitionDto
(
activityExamineDO
,
ActivityExamineDto
.
class
);
dto
.
setReportedIds
(
Objects
.
isNull
(
activityExamineDO
.
getReportedIds
())
?
null
:
JSONArray
.
parseArray
(
activityExamineDO
.
getReportedIds
()));
dto
.
setClockIds
(
Objects
.
isNull
(
activityExamineDO
.
getClockIds
())
?
null
:
JSONArray
.
parseArray
(
activityExamineDO
.
getClockIds
()));
dto
.
setTemWorkPhotos
(
Objects
.
isNull
(
activityExamineDO
.
getTemWorkPhotos
())
?
null
:
JSONArray
.
parseArray
(
activityExamineDO
.
getTemWorkPhotos
()));
dto
.
setPosPhotos
(
Objects
.
isNull
(
activityExamineDO
.
getPosPhotos
())
?
null
:
JSONArray
.
parseArray
(
activityExamineDO
.
getPosPhotos
()));
return
dto
;
}
private
void
arrayToStringByDo
(
ActivityExamineDO
examineDO
,
ActivityExamineDto
examineDto
)
{
examineDO
.
setReportedIds
(
Objects
.
isNull
(
examineDto
.
getReportedIds
())
?
null
:
JSONObject
.
toJSONString
(
examineDto
.
getReportedIds
()));
examineDO
.
setClockIds
(
Objects
.
isNull
(
examineDto
.
getClockIds
())
?
null
:
JSONObject
.
toJSONString
(
examineDto
.
getClockIds
()));
examineDO
.
setTemWorkPhotos
(
Objects
.
isNull
(
examineDto
.
getTemWorkPhotos
())
?
null
:
JSONObject
.
toJSONString
(
examineDto
.
getTemWorkPhotos
()));
examineDO
.
setPosPhotos
(
Objects
.
isNull
(
examineDto
.
getPosPhotos
())
?
null
:
JSONObject
.
toJSONString
(
examineDto
.
getPosPhotos
()));
}
}
src/main/java/com/wangxiaolu/promotion/pojo/activity/examine/dto/ActivityExamineDto.java
浏览文件 @
f33536eb
...
...
@@ -52,12 +52,12 @@ public class ActivityExamineDto {
/**
* 上报ID
*/
private
String
reportedIds
;
private
JSONArray
reportedIds
;
/**
* 打卡ID
*/
private
String
clockIds
;
private
JSONArray
clockIds
;
/**
* 所属战区名称
...
...
@@ -142,7 +142,7 @@ public class ActivityExamineDto {
/**
* 工作取证照片
*/
private
String
temWorkPhotos
;
private
JSONArray
temWorkPhotos
;
/**
* 特陈照
...
...
@@ -162,7 +162,7 @@ public class ActivityExamineDto {
/**
* pos照片
*/
private
String
posPhotos
;
private
JSONArray
posPhotos
;
/**
*
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论