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

fix(会后管理流程): 79603

Browse Source
This commit is contained in:
yjz
2024-01-22 15:48:14 +08:00
parent d3e973e918
commit 4d79383a59
5 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java
+5
View File
@@ -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<LawsStandardizationMeeting> lawsStandardizationMeetingList = new ArrayList<>();
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFileController.java
+15 -15
View File
@@ -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<LawsDataCenterF
@PostMapping(value = "/add")
@RequiresPermissions(permissionFlag)
public Result<T> add(@Validated @RequestBody LawsDataCenterFile lawsDataCenterFile) {
lawsDataCenterFileService.add(lawsDataCenterFile);
lawsDataCenterFileService.add(lawsDataCenterFile, true);
return Result.OK(ResultCommon.OK);
}
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/ILawsDataCenterFileService.java
+4 -4
View File
@@ -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<LawsDataCenterFile>
* @param lawsDataCenterFile
* @return
*/
void add(LawsDataCenterFile lawsDataCenterFile);
void add(LawsDataCenterFile lawsDataCenterFile, boolean flag);
/**
* 更新
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
+5 -4
View File
@@ -104,10 +104,11 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
* @return
*/
@Override
public void add(LawsDataCenterFile lawsDataCenterFile) {
// 校验管理权限
checkManageAuthAdd(lawsDataCenterFile.getFolderId());
public void add(LawsDataCenterFile lawsDataCenterFile, boolean flag) {
if (flag) {
// 校验管理权限
checkManageAuthAdd(lawsDataCenterFile.getFolderId());
}
if (StringUtils.isBlank(lawsDataCenterFile.getOwnerId())){
lawsDataCenterFile.setOwnerId(CurrentUserUtil.getId());
lawsDataCenterFile.setUploader(CurrentUserUtil.getName());
laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
+2 -2
View File
@@ -215,10 +215,10 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
if (StringUtils.isNotBlank(folderId)){
for (String fId : folderId.split(",")) {
lawsDataCenterFile.setFolderId(fId);
lawsDataCenterFileService.add(lawsDataCenterFile);
lawsDataCenterFileService.add(lawsDataCenterFile, false);
}
}else {
lawsDataCenterFileService.add(lawsDataCenterFile);
lawsDataCenterFileService.add(lawsDataCenterFile, false);
}
}
}