ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准化活动): 文件说明

Browse Source
This commit is contained in:
yjz
2023-11-06 10:59:09 +08:00
parent 2987e538bb
commit 37d6233d5e
3 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java
+1 -1
View File
@@ -177,7 +177,7 @@ public class LawsStandardizationController extends JeroController<LawsStandardiz
public Result<T> delete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
return Result.error("请选择数据!");
}
}
lawsStandardizationService.delete(map.get("id"));
return Result.OK("删除成功!");
}
laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java
+3 -3
View File
@@ -40,9 +40,9 @@ public class LawsStandardizationPayment extends BaseEntity {
@ApiModelProperty(value = "年份")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String year;
/**整改状态(1-待整改、2-整改中、3-审批中、4-已完成)*/
@Excel(name = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)", width = 15)
@ApiModelProperty(value = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)")
/**整改状态*/
@Excel(name = "整改状态", width = 15)
@ApiModelProperty(value = "整改状态")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String state;
/**计划内*/
laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
+39 -40
View File
@@ -19,10 +19,7 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
@@ -74,6 +71,9 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
List<LawsStandardizationPayment> standardizationPaymentList = standardizationVO.getStandardizationPayments();
List<LawsStandardizationMeeting> standardizationMeetingList = standardizationVO.getStandardizationMeetings();
if (StringUtils.isBlank(lawsStandardization.getId())){
lawsStandardization.setId(String.valueOf(SnowflakeUtils.snowflake()));
}
// 基础信息
lawsStandardizationService.saveOrUpdate(lawsStandardization);
@@ -140,50 +140,49 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
private String getFileDescription(LawsStandardization lawsStandardization) {
// 树形结构
LawsStandardization treeList = queryTreeList();
// 一级
List<LawsStandardization> children = treeList.getChildren();
// 查询父级信息
LawsStandardization fatherDetail = getChildrenDetail(children, lawsStandardization.getPid());
String name = getName(fatherDetail);
return (StringUtils.isNotBlank(name) ? name + "-" : "") + "会议资料";
}
private String getName(LawsStandardization lawsStandardization) {
// 拆开为list结构
List<LawsStandardization> list = new ArrayList<>();
StringBuilder stringBuilder = new StringBuilder();
if (lawsStandardization.getLevel() < 2L){
return stringBuilder.toString();
treeToList(treeList, list);
// 获取一二级节点名称
getNodeName(lawsStandardization, list, stringBuilder);
if (stringBuilder.length() > 0){
stringBuilder.append("-");
}
if (lawsStandardization.getLevel().equals(3L)){
// 工作组
stringBuilder.append("-").append(lawsStandardization.getName());
}
if (lawsStandardization.getLevel().equals(2L)){
// 委员会
stringBuilder.insert(0, lawsStandardization.getName());
}
getName(lawsStandardizationService.getOne(
new LambdaQueryWrapper<LawsStandardization>()
.eq(LawsStandardization::getId, lawsStandardization.getPid())));
return stringBuilder.toString();
return stringBuilder.append("会议资料").toString();
}
private LawsStandardization getChildrenDetail(List<LawsStandardization> treeList, String pid) {
for (LawsStandardization tree : treeList) {
if (tree.getId().equals(pid)) {
return tree;
private void getNodeName(LawsStandardization lawsStandardization, List<LawsStandardization> list, StringBuilder stringBuilder) {
Optional<LawsStandardization> first = list.stream().filter(v -> v.getId().equals(lawsStandardization.getPid())).findFirst();
first.ifPresent(v -> {
// 工作组
if (first.get().getLevel().equals(2L)){
stringBuilder.append(v.getName());
}
if (tree.getChildren() != null && !tree.getChildren().isEmpty()) {
getChildrenDetail(tree.getChildren(), pid);
// 委员会
if (first.get().getLevel().equals(1L)){
stringBuilder.insert(0, v.getName() + "-");
}
getNodeName(v, list, stringBuilder);
});
}
private void treeToList(LawsStandardization treeList, List<LawsStandardization> list) {
if (!Objects.isNull(treeList)){
list.add(treeList);
if (!Objects.isNull(treeList.getChildren()) && !treeList.getChildren().isEmpty()) {
for (LawsStandardization tree : treeList.getChildren()) {
treeToList(tree, list);
}
}
}
return new LawsStandardization();
}
/**
* 保存或更新法律法规标准化信息的支付信息
* 保存或更新支付信息
*
* @param lawsStandardization 法律法规标准化信息对象
* @param standardizationPaymentList 标准化支付信息列表
* @param lawsStandardization 标准化活动对象
* @param standardizationPaymentList 支付信息列表
*/
private void saveOrUpdatePayment(LawsStandardization lawsStandardization, List<LawsStandardizationPayment> standardizationPaymentList) {
for (LawsStandardizationPayment lawsStandardizationPayment : standardizationPaymentList) {
@@ -220,10 +219,10 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
/**
* 保存或更新法律法规标准化信息
* 保存或更新集团参与情况
*
* @param lawsStandardization 法律法规标准化信息对象
* @param standardizationGroupList 标准化组列表
* @param lawsStandardization 标准化活动
* @param standardizationGroupList 集团参与情况列表
*/
private void saveOrUpdateGroup(LawsStandardization lawsStandardization, List<LawsStandardizationGroup> standardizationGroupList) {
for (LawsStandardizationGroup lawsStandardizationGroup : standardizationGroupList) {