From 4d79383a59a6ef7db93f3d166248377e219834dc Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 22 Jan 2024 15:48:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=9A=E5=90=8E=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=2079603?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MeetingManageFlowServiceImpl.java | 5 ++++ .../LawsDataCenterFileController.java | 30 +++++++++---------- .../service/ILawsDataCenterFileService.java | 8 ++--- .../impl/LawsDataCenterFileServiceImpl.java | 9 +++--- .../impl/LawsStandardizationServiceImpl.java | 4 +-- 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java index da71d4d7..f8c92e41 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java @@ -303,6 +303,11 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService { LawsStandardization lawsStandardization = new LawsStandardization(); lawsStandardization.setId(processMeetingManage.getStandardizationSecondId()); lawsStandardization.setPid(processMeetingManage.getStandardizationFirstId()); + LawsStandardization standardization = lawsStandardizationService.getById( + StringUtils.isNotBlank(processMeetingManage.getStandardizationSecondId()) ? + processMeetingManage.getStandardizationSecondId() : processMeetingManage.getStandardizationFirstId()); + lawsStandardization.setStandardizationType(standardization.getStandardizationType()); + lawsStandardization.setName(standardization.getName()); // 参会记录 ArrayList lawsStandardizationMeetingList = new ArrayList<>(); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFileController.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFileController.java index 8123cb93..b7c2702c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFileController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFileController.java @@ -1,30 +1,30 @@ package com.jero.modules.laws.dataCenter.controller; -import java.util.Arrays; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; -import com.jero.common.exception.JeroBootException; -import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.common.api.vo.ResultCommon; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.util.CurrentUserUtil; import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile; import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFileService; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.sys.controller.SysCommonController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.Map; /** @@ -75,7 +75,7 @@ public class LawsDataCenterFileController extends JeroController add(@Validated @RequestBody LawsDataCenterFile lawsDataCenterFile) { - lawsDataCenterFileService.add(lawsDataCenterFile); + lawsDataCenterFileService.add(lawsDataCenterFile, true); return Result.OK(ResultCommon.OK); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/ILawsDataCenterFileService.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/ILawsDataCenterFileService.java index f8f9bdaa..428adb91 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/ILawsDataCenterFileService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/ILawsDataCenterFileService.java @@ -1,9 +1,9 @@ package com.jero.modules.laws.dataCenter.service; -import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile; -import com.baomidou.mybatisplus.extension.service.IService; -import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile; + import java.util.List; /** @@ -30,7 +30,7 @@ public interface ILawsDataCenterFileService extends IService * @param lawsDataCenterFile * @return */ - void add(LawsDataCenterFile lawsDataCenterFile); + void add(LawsDataCenterFile lawsDataCenterFile, boolean flag); /** * 更新 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java index 5430ec9e..fd27afc8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java @@ -104,10 +104,11 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl