Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
integration
Commits
231a73cf
Commit
231a73cf
authored
Mar 10, 2026
by
wujipeng
Browse files
更新报表
parent
97341016
Changes
8
Show whitespace changes
Inline
Side-by-side
src/main/java/com/ruzhoukj/integration/controller/ReportController.java
View file @
231a73cf
package
com.ruzhoukj.integration.controller
;
package
com.ruzhoukj.integration.controller
;
import
com.ruzhoukj.integration.pojo.dto.ReportDTO
;
import
com.ruzhoukj.integration.pojo.dto.ReportDTO
;
import
com.ruzhoukj.integration.pojo.dto.TemplateDTO
;
import
com.ruzhoukj.integration.pojo.vo.ReportVO
;
import
com.ruzhoukj.integration.pojo.vo.ReportVO
;
import
com.ruzhoukj.integration.result.PageResult
;
import
com.ruzhoukj.integration.result.PageResult
;
import
com.ruzhoukj.integration.result.Result
;
import
com.ruzhoukj.integration.result.Result
;
...
@@ -40,4 +41,10 @@ public class ReportController {
...
@@ -40,4 +41,10 @@ public class ReportController {
public
Result
<
Boolean
>
generateReport
(
@RequestBody
ReportDTO
reportDTO
)
{
public
Result
<
Boolean
>
generateReport
(
@RequestBody
ReportDTO
reportDTO
)
{
return
Result
.
success
(
reportService
.
generateReport
(
reportDTO
));
return
Result
.
success
(
reportService
.
generateReport
(
reportDTO
));
}
}
@ApiOperation
(
"编辑"
)
@PostMapping
(
"/update"
)
public
Result
<
Boolean
>
saveOrUpdateReport
(
@RequestBody
ReportDTO
reportDTO
)
{
return
Result
.
success
(
reportService
.
saveOrUpdateReport
(
reportDTO
));
}
}
}
src/main/java/com/ruzhoukj/integration/mapper/ReportDetailBasicMapper.java
View file @
231a73cf
...
@@ -3,6 +3,9 @@ package com.ruzhoukj.integration.mapper;
...
@@ -3,6 +3,9 @@ package com.ruzhoukj.integration.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.ruzhoukj.integration.pojo.entity.ReportDetailBasicEntity
;
import
com.ruzhoukj.integration.pojo.entity.ReportDetailBasicEntity
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
/**
/**
* @author : wujipeng
* @author : wujipeng
...
@@ -12,4 +15,8 @@ import org.apache.ibatis.annotations.Mapper;
...
@@ -12,4 +15,8 @@ import org.apache.ibatis.annotations.Mapper;
*/
*/
@Mapper
@Mapper
public
interface
ReportDetailBasicMapper
extends
BaseMapper
<
ReportDetailBasicEntity
>
{
public
interface
ReportDetailBasicMapper
extends
BaseMapper
<
ReportDetailBasicEntity
>
{
List
<
String
>
getCellNumberList
(
@Param
(
"id"
)
String
id
);
void
removeByCellNumber
(
@Param
(
"cellNumberList"
)
List
<
String
>
cellNumberList
,
@Param
(
"reportId"
)
String
reportId
);
}
}
src/main/java/com/ruzhoukj/integration/pojo/entity/ReportEntity.java
View file @
231a73cf
...
@@ -59,18 +59,18 @@ public class ReportEntity {
...
@@ -59,18 +59,18 @@ public class ReportEntity {
@ApiModelProperty
(
value
=
"基础单元格"
)
@ApiModelProperty
(
value
=
"基础单元格"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
Map
<
String
,
Template
DetailBasicEntity
>
cells
;
private
Map
<
String
,
Report
DetailBasicEntity
>
cells
;
@ApiModelProperty
(
value
=
"复合单元格"
)
@ApiModelProperty
(
value
=
"复合单元格"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
List
<
Template
DetailMergeEntity
>
merges
;
private
List
<
Report
DetailMergeEntity
>
merges
;
@ApiModelProperty
(
value
=
"行配置"
)
@ApiModelProperty
(
value
=
"行配置"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
Map
<
String
,
Template
ConfigEntity
>
rows
;
private
Map
<
String
,
Report
ConfigEntity
>
rows
;
@ApiModelProperty
(
value
=
"列配置"
)
@ApiModelProperty
(
value
=
"列配置"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
Map
<
String
,
Template
ConfigEntity
>
columns
;
private
Map
<
String
,
Report
ConfigEntity
>
columns
;
}
}
src/main/java/com/ruzhoukj/integration/service/ReportDetailBasicService.java
View file @
231a73cf
...
@@ -3,6 +3,8 @@ package com.ruzhoukj.integration.service;
...
@@ -3,6 +3,8 @@ package com.ruzhoukj.integration.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.ruzhoukj.integration.pojo.entity.ReportDetailBasicEntity
;
import
com.ruzhoukj.integration.pojo.entity.ReportDetailBasicEntity
;
import
java.util.List
;
/**
/**
* @author : wujipeng
* @author : wujipeng
* @date : 2026/3/9 10:16
* @date : 2026/3/9 10:16
...
@@ -10,4 +12,8 @@ import com.ruzhoukj.integration.pojo.entity.ReportDetailBasicEntity;
...
@@ -10,4 +12,8 @@ import com.ruzhoukj.integration.pojo.entity.ReportDetailBasicEntity;
* @Desc : 描述信息
* @Desc : 描述信息
*/
*/
public
interface
ReportDetailBasicService
extends
IService
<
ReportDetailBasicEntity
>
{
public
interface
ReportDetailBasicService
extends
IService
<
ReportDetailBasicEntity
>
{
List
<
String
>
getCellNumberList
(
String
id
);
void
removeByCellNumber
(
List
<
String
>
removeIdList
,
String
templateId
);
}
}
src/main/java/com/ruzhoukj/integration/service/ReportService.java
View file @
231a73cf
...
@@ -19,4 +19,6 @@ public interface ReportService extends IService<ReportEntity> {
...
@@ -19,4 +19,6 @@ public interface ReportService extends IService<ReportEntity> {
Boolean
generateReport
(
ReportDTO
reportDTO
);
Boolean
generateReport
(
ReportDTO
reportDTO
);
Boolean
saveOrUpdateReport
(
ReportDTO
reportDTO
);
}
}
src/main/java/com/ruzhoukj/integration/service/impl/ReportDetailBasicServiceImpl.java
View file @
231a73cf
...
@@ -6,6 +6,8 @@ import com.ruzhoukj.integration.pojo.entity.ReportDetailBasicEntity;
...
@@ -6,6 +6,8 @@ import com.ruzhoukj.integration.pojo.entity.ReportDetailBasicEntity;
import
com.ruzhoukj.integration.service.ReportDetailBasicService
;
import
com.ruzhoukj.integration.service.ReportDetailBasicService
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
/**
/**
* @author : wujipeng
* @author : wujipeng
* @date : 2026/3/9 10:16
* @date : 2026/3/9 10:16
...
@@ -14,4 +16,13 @@ import org.springframework.stereotype.Service;
...
@@ -14,4 +16,13 @@ import org.springframework.stereotype.Service;
*/
*/
@Service
@Service
public
class
ReportDetailBasicServiceImpl
extends
ServiceImpl
<
ReportDetailBasicMapper
,
ReportDetailBasicEntity
>
implements
ReportDetailBasicService
{
public
class
ReportDetailBasicServiceImpl
extends
ServiceImpl
<
ReportDetailBasicMapper
,
ReportDetailBasicEntity
>
implements
ReportDetailBasicService
{
@Override
public
List
<
String
>
getCellNumberList
(
String
id
)
{
return
baseMapper
.
getCellNumberList
(
id
);
}
@Override
public
void
removeByCellNumber
(
List
<
String
>
cellNumberList
,
String
templateId
)
{
baseMapper
.
removeByCellNumber
(
cellNumberList
,
templateId
);
}
}
}
src/main/java/com/ruzhoukj/integration/service/impl/ReportServiceImpl.java
View file @
231a73cf
...
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.github.pagehelper.Page
;
import
com.github.pagehelper.Page
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.util.StringUtil
;
import
com.ruzhoukj.integration.mapper.ReportMapper
;
import
com.ruzhoukj.integration.mapper.ReportMapper
;
import
com.ruzhoukj.integration.pojo.dto.ReportDTO
;
import
com.ruzhoukj.integration.pojo.dto.ReportDTO
;
import
com.ruzhoukj.integration.pojo.entity.*
;
import
com.ruzhoukj.integration.pojo.entity.*
;
...
@@ -16,8 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
...
@@ -16,8 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.util.ArrayList
;
import
java.util.*
;
import
java.util.List
;
/**
/**
* @author : wujipeng
* @author : wujipeng
...
@@ -152,6 +150,80 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportEntity> i
...
@@ -152,6 +150,80 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportEntity> i
return
Boolean
.
TRUE
;
return
Boolean
.
TRUE
;
}
}
@Override
public
Boolean
saveOrUpdateReport
(
ReportDTO
reportDTO
)
{
//编辑模板
updateById
(
reportDTO
);
//查询模板详情单元格编号集合
List
<
String
>
reportDetailList
=
reportDetailBasicService
.
getCellNumberList
(
reportDTO
.
getId
());
//处理模板详情
handleUpdateReportDetail
(
reportDTO
.
getCells
(),
reportDetailList
,
reportDTO
.
getId
(),
reportDTO
.
getTemplateId
());
//处理模板详情复合
List
<
ReportDetailMergeEntity
>
merges
=
reportDTO
.
getMerges
();
if
(!
ObjectUtils
.
isEmpty
(
merges
))
{
reportDetailMergeService
.
saveOrUpdateBatch
(
merges
);
}
//处理模板详情行列配置
Map
<
String
,
ReportConfigEntity
>
rows
=
reportDTO
.
getRows
();
Map
<
String
,
ReportConfigEntity
>
columns
=
reportDTO
.
getColumns
();
List
<
ReportConfigEntity
>
reportConfigList
=
new
ArrayList
<>();
if
(!
ObjectUtils
.
isEmpty
(
rows
))
{
reportConfigList
.
addAll
(
rows
.
values
());
}
if
(!
ObjectUtils
.
isEmpty
(
columns
))
{
reportConfigList
.
addAll
(
columns
.
values
());
}
reportConfigService
.
saveOrUpdateBatch
(
reportConfigList
);
return
Boolean
.
TRUE
;
}
private
void
handleUpdateReportDetail
(
Map
<
String
,
ReportDetailBasicEntity
>
basic
,
List
<
String
>
CellNumberList
,
String
reportId
,
String
templateId
)
{
if
(
ObjectUtils
.
isEmpty
(
basic
))
{
return
;
}
List
<
String
>
removeIdList
=
new
ArrayList
<>();
List
<
ReportDetailBasicEntity
>
updateList
=
new
ArrayList
<>();
List
<
ReportDetailBasicEntity
>
insertList
=
new
ArrayList
<>();
for
(
String
cellNumber
:
CellNumberList
)
{
if
(
basic
.
containsKey
(
cellNumber
))
{
ReportDetailBasicEntity
reportDetailBasic
=
basic
.
get
(
cellNumber
);
updateList
.
add
(
reportDetailBasic
);
}
else
{
removeIdList
.
add
(
cellNumber
);
}
}
//删除旧数据
if
(!
ObjectUtils
.
isEmpty
(
removeIdList
))
{
reportDetailBasicService
.
removeByCellNumber
(
removeIdList
,
reportId
);
}
//更新数据
reportDetailBasicService
.
updateBatchById
(
updateList
);
//新增新数据
List
<
String
>
insertIdList
=
getUniqueKeys
(
basic
,
CellNumberList
);
for
(
String
cellNumber
:
insertIdList
)
{
ReportDetailBasicEntity
reportDetail
=
basic
.
get
(
cellNumber
);
reportDetail
.
setReportId
(
reportId
);
reportDetail
.
setTemplateId
(
templateId
);
insertList
.
add
(
reportDetail
);
}
if
(!
ObjectUtils
.
isEmpty
(
insertList
))
{
reportDetailBasicService
.
saveBatch
(
insertList
);
}
}
public
static
<
T
>
List
<
String
>
getUniqueKeys
(
Map
<
String
,
T
>
data
,
List
<
String
>
cellNumberList
)
{
// 将List转换为Set以提高查找效率
Set
<
String
>
cellNumberSet
=
new
HashSet
<>(
cellNumberList
);
List
<
String
>
insertIdList
=
new
ArrayList
<>();
for
(
Map
.
Entry
<
String
,
T
>
entry
:
data
.
entrySet
())
{
if
(!
cellNumberSet
.
contains
(
entry
.
getKey
()))
{
insertIdList
.
add
(
entry
.
getKey
());
}
}
return
insertIdList
;
}
private
void
handleUseReport
(
ReportDetailBasicEntity
reportDetailBasic
,
ReportDTO
reportDTO
)
{
private
void
handleUseReport
(
ReportDetailBasicEntity
reportDetailBasic
,
ReportDTO
reportDTO
)
{
if
(
ObjectUtils
.
isEmpty
(
reportDetailBasic
.
getUseReportId
()))
{
if
(
ObjectUtils
.
isEmpty
(
reportDetailBasic
.
getUseReportId
()))
{
String
year
=
reportDTO
.
getYear
();
String
year
=
reportDTO
.
getYear
();
...
...
src/main/resources/com/ruzhoukj/integration/mapper/ReportDetailBasicMapper.xml
View file @
231a73cf
...
@@ -2,5 +2,23 @@
...
@@ -2,5 +2,23 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.ruzhoukj.integration.mapper.ReportDetailBasicMapper"
>
<mapper
namespace=
"com.ruzhoukj.integration.mapper.ReportDetailBasicMapper"
>
<delete
id=
"removeByCellNumber"
>
delete from
report_detail_basic
where
report_id = #{reportId}
and
location in
<foreach
collection=
"cellNumberList"
item=
"cellNumber"
separator=
","
open=
"("
close=
")"
>
#{cellNumber}
</foreach>
</delete>
<select
id=
"getCellNumberList"
resultType=
"java.lang.String"
>
select
location
from
report_detail_basic
where
report_id = #{id}
</select>
</mapper>
</mapper>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment