update 功能安全中心 其他资料分发
This commit is contained in:
@@ -113,6 +113,10 @@ public class PayProjectCommon {
|
|||||||
* 项目类型1:工作组,2:分标委, 3:理事会, 4:起草组
|
* 项目类型1:工作组,2:分标委, 3:理事会, 4:起草组
|
||||||
*/
|
*/
|
||||||
public final static Integer PROJECT_TYPE_FILE4 = 4;
|
public final static Integer PROJECT_TYPE_FILE4 = 4;
|
||||||
|
/**
|
||||||
|
* 5功能安全中心
|
||||||
|
*/
|
||||||
|
public final static Integer PROJECT_TYPE_FILE5 = 5;
|
||||||
/**
|
/**
|
||||||
* 需要发票(1:增值税普通发票,2:增值税专用发票,0:否,3:需要发票(小程序需要))
|
* 需要发票(1:增值税普通发票,2:增值税专用发票,0:否,3:需要发票(小程序需要))
|
||||||
*/
|
*/
|
||||||
|
|||||||
+4
-12
@@ -18,6 +18,7 @@ import com.jero.modules.oss.service.IOSSFileService;
|
|||||||
import com.jero.project.common.PayProjectCommon;
|
import com.jero.project.common.PayProjectCommon;
|
||||||
import com.jero.project.entity.PayWorkingGroup;
|
import com.jero.project.entity.PayWorkingGroup;
|
||||||
import com.jero.project.entity.PayWorkingGroupDataFile;
|
import com.jero.project.entity.PayWorkingGroupDataFile;
|
||||||
|
import com.jero.project.enums.ProjectTypeEnum;
|
||||||
import com.jero.project.service.IPayWorkingGroupDataFileService;
|
import com.jero.project.service.IPayWorkingGroupDataFileService;
|
||||||
import com.jero.project.service.IPayWorkingGroupService;
|
import com.jero.project.service.IPayWorkingGroupService;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
@@ -86,10 +87,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
|
|||||||
if(StringUtils.isBlank(payWorkingGroupDataFile.getProjectId())){
|
if(StringUtils.isBlank(payWorkingGroupDataFile.getProjectId())){
|
||||||
return Result.error("工作组id不能为空!");
|
return Result.error("工作组id不能为空!");
|
||||||
}
|
}
|
||||||
if(!Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)
|
if(!ProjectTypeEnum.hasValue(payWorkingGroupDataFile.getProjectType())){
|
||||||
&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)
|
|
||||||
&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE3)
|
|
||||||
&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4)){
|
|
||||||
return Result.error("项目状态不正确!");
|
return Result.error("项目状态不正确!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,10 +140,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
|
|||||||
if(StringUtils.isBlank(payWorkingGroupDataFile.getProjectId())){
|
if(StringUtils.isBlank(payWorkingGroupDataFile.getProjectId())){
|
||||||
return Result.error("项目id不能为空!");
|
return Result.error("项目id不能为空!");
|
||||||
}
|
}
|
||||||
if(!Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)
|
if(!ProjectTypeEnum.hasValue(payWorkingGroupDataFile.getProjectType())){
|
||||||
&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)
|
|
||||||
&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE3)
|
|
||||||
&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4)){
|
|
||||||
return Result.error("项目状态不正确!");
|
return Result.error("项目状态不正确!");
|
||||||
}
|
}
|
||||||
if(StringUtils.isBlank(payWorkingGroupDataFile.getFileIds())){
|
if(StringUtils.isBlank(payWorkingGroupDataFile.getFileIds())){
|
||||||
@@ -332,10 +327,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
|
|||||||
if(StringUtils.isBlank(payWorkingGroupDataFile.getProjectId())){
|
if(StringUtils.isBlank(payWorkingGroupDataFile.getProjectId())){
|
||||||
throw new JeroBootException("项目id不能为空!");
|
throw new JeroBootException("项目id不能为空!");
|
||||||
}
|
}
|
||||||
if(!Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)
|
if(!ProjectTypeEnum.hasValue(payWorkingGroupDataFile.getProjectType())){
|
||||||
&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)
|
|
||||||
&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE3)
|
|
||||||
&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4)){
|
|
||||||
throw new JeroBootException("项目状态不正确!");
|
throw new JeroBootException("项目状态不正确!");
|
||||||
}
|
}
|
||||||
if(Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)){
|
if(Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)){
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
package com.jero.project.enums;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author liJiaRao
|
||||||
|
* @date 2024-07-04 17:54
|
||||||
|
*/
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public enum ProjectTypeEnum {
|
||||||
|
/**
|
||||||
|
* A
|
||||||
|
*/
|
||||||
|
ONE("工作组", 1),
|
||||||
|
TWO("分标委", 2),
|
||||||
|
THREE("理事会", 3),
|
||||||
|
FOUR("起草组", 4),
|
||||||
|
FIVE("功能安全中心", 5),
|
||||||
|
;
|
||||||
|
|
||||||
|
private String name;
|
||||||
|
private Integer value;
|
||||||
|
|
||||||
|
public static String getNameByValue(Integer value) {
|
||||||
|
for (ProjectTypeEnum enumObject : values()) {
|
||||||
|
if (enumObject.getValue().equals(value)) {
|
||||||
|
return enumObject.getName();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Integer getValueByName(String name) {
|
||||||
|
for (ProjectTypeEnum enumObject : values()) {
|
||||||
|
if (enumObject.getName().equals(name)) {
|
||||||
|
return enumObject.getValue();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
public static boolean hasValue(Integer value) {
|
||||||
|
for (ProjectTypeEnum enumObject : values()) {
|
||||||
|
if (enumObject.getValue().equals(value)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user