xujun

science-admin/src/main/java/com/yiboshi/science/entity/SystemParameter.java

@@ -53,7 +53,10 @@ public class SystemParameter extends BaseEntity {
     @ApiModelProperty(value = "状态", position = 7 )
     private Integer noteState;
     /** 系统编码 */
-    @ApiModelProperty(value = "系统编码", position = 8 )
+    @ApiModelProperty(value = "系统编码", position = 8)
     @Length(max=50, message = "系统编码不能大于50")
     private String systemCode;
+    /** 是否为必填项 */
+    @ApiModelProperty(value = "是否为必填项", position = 8)
+    private Boolean isRequired;
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/param/dto/ComFileDTO.java

@@ -38,7 +38,10 @@ public class ComFileDTO extends BaseDTO {
     /** URL */
     @ApiModelProperty(value = "URL", position = 7)
     private String downloadUrl;
-    /** 必要附件(不能删除) */
+    /** 必要附件(必须显示不能删除) */
     @ApiModelProperty(value = "必要附件", position = 8)
     private Boolean required;
+    /** 必须上传的附件 */
+    @ApiModelProperty(value = "必须上传的附件", position = 8)
+    private Boolean isRequired;
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/param/dto/SystemParameterDTO.java

@@ -50,4 +50,7 @@ public class SystemParameterDTO extends BaseDTO {
     /** 父名称 */
     @ApiModelProperty(value = "父名称", position = 2)
     private String parentName;
+    /** 是否为必填项 */
+    @ApiModelProperty(value = "是否为必填项", position = 8)
+    private Boolean isRequired;
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/param/query/SystemParameterQueryVO.java

@@ -43,4 +43,7 @@ public class SystemParameterQueryVO extends PaginationVO{
     /** 系统编码 */
     @ApiModelProperty(value = "系统编码", position = 8)
     private String systemCode;
+    /** 是否为必填项 */
+    @ApiModelProperty(value = "是否为必填项", position = 8)
+    private Boolean isRequired;
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

@@ -483,6 +483,10 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
 
         parameterList.forEach(e -> {
             ComFileDTO AttachentFile = processAttachmentFile(e.getName(), e.getDisplayOrder());
+            if (null != e.getIsRequired() && e.getIsRequired().equals(true))
+                AttachentFile.setIsRequired(true);
+            else
+                AttachentFile.setIsRequired(false);
             fileList.add(AttachentFile);
         });
         return fileList;