11/15

src/main/java/cn/cslg/pas/common/dto/business/CustomFieldDTO.java

@@ -15,6 +15,7 @@ public class CustomFieldDTO {
      */
     private String name;
 
+
     /**
      * 报告/专题库id
      */

src/main/java/cn/cslg/pas/common/dto/business/CustomOptionDTO.java

@@ -14,6 +14,7 @@ public class CustomOptionDTO {
      */
     private String name;
 
+
     /**
      * 所属自定义栏位
      */

src/main/java/cn/cslg/pas/common/dto/business/CustomOptionDeleteDTO.java

@@ -10,5 +10,7 @@ import lombok.Data;
 @Data
 public class CustomOptionDeleteDTO {
     private Integer id;
+
     private Integer customFieldId;
+
 }

src/main/java/cn/cslg/pas/common/dto/business/GetCustomOptionDTO.java

@@ -10,6 +10,8 @@ import lombok.Data;
 @Data
 public class GetCustomOptionDTO {
     private String name;
+
     private Integer type;
+
     private Integer customFieldId;
 }

src/main/java/cn/cslg/pas/common/dto/business/UpdateCustomFieldDTO.java

@@ -15,6 +15,7 @@ public class UpdateCustomFieldDTO {
      */
     private Integer id;
 
+
     /**
      * 自定义栏位名称
      */

src/main/java/cn/cslg/pas/common/dto/business/UpdateCustomOptionDTO.java

@@ -14,6 +14,7 @@ public class UpdateCustomOptionDTO {
      */
     private Integer id;
 
+
     /**
      * 选项值
      */

src/main/java/cn/cslg/pas/controller/CustomFieldController.java

@@ -64,6 +64,7 @@ public class CustomFieldController {
         }
     }
 
+
     @Operation(summary = "更新自定义栏位")
     @PostMapping("/updateCustomField")
     public Response updateCustomField(@RequestBody UpdateCustomFieldDTO updateCustomFieldDTO) throws Exception {

src/main/java/cn/cslg/pas/controller/CustomOptionController.java

@@ -42,6 +42,7 @@ public class CustomOptionController {
     public Response addCustomOption(@RequestBody CustomOptionDTO customOptionDTO) throws Exception {
         if(customOptionDTO != null){
             Integer id = null;
+
             try {
                 id = customOptionService.addCustomOption(customOptionDTO);
             } catch (Exception e){

src/main/java/cn/cslg/pas/domain/business/CustomField.java

@@ -20,6 +20,7 @@ public class CustomField extends BaseEntity<CustomField> {
     @TableField(value = "name")
     private String name;
 
+
     /**
      * 报告/专题库id
      */

src/main/java/cn/cslg/pas/domain/business/CustomOption.java

@@ -20,6 +20,7 @@ public class CustomOption extends BaseEntity<CustomOption> {
     @TableField(value = "name")
     private String name;
 
+
     /**
      * 所属自定义栏位
      */

src/main/java/cn/cslg/pas/domain/business/CustomTree.java

@@ -1,40 +0,0 @@
-package cn.cslg.pas.domain.business;
-
-import cn.cslg.pas.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @Author xiexiang
- * @Date 2023/11/8
- */
-@Data
-@TableName("custom_tree")
-public class CustomTree extends BaseEntity<CustomTree> {
-    /**
-     * 报告/专题库id
-     */
-    @TableField(value = "project_id")
-    private Integer projectId;
-
-    /**
-     * 名称
-     */
-    @TableField(value = "name")
-    private String name;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_id")
-    private String createId;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private Date createTime;
-}

src/main/java/cn/cslg/pas/mapper/CustomFieldMapper.java

@@ -15,5 +15,7 @@ import java.util.List;
 @Repository
 public interface CustomFieldMapper extends BaseMapper<CustomField> {
     List<CustomFieldVO> getCustomField(String sql1, String sql2, String sql3);
+
     Long getCustomFieldCount(String sql);
+
 }

src/main/java/cn/cslg/pas/mapper/CustomOptionMapper.java

@@ -10,4 +10,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface CustomOptionMapper extends BaseMapper<CustomOption> {
+
 }

src/main/java/cn/cslg/pas/mapper/CustomTreeMapper.java

@@ -1,13 +0,0 @@
-package cn.cslg.pas.mapper;
-
-import cn.cslg.pas.domain.business.CustomTree;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
-
-/**
- * @Author xiexiang
- * @Date 2023/11/8
- */
-@Repository
-public interface CustomTreeMapper extends BaseMapper<CustomTree> {
-}

src/main/java/cn/cslg/pas/service/business/CustomFieldService.java

@@ -72,6 +72,7 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
         return records;
     }
 
+
     @Override
     public Object addMessage(Object object, List<MultipartFile> files) {
         return null;

src/main/java/cn/cslg/pas/service/business/CustomOptionService.java

@@ -204,6 +204,7 @@ public class CustomOptionService extends ServiceImpl<CustomOptionMapper, CustomO
         return records;
     }
 
+
     /**
      * 删除自定义选项
      * @param customOptionDeleteDTOS

src/main/java/cn/cslg/pas/service/business/CustomTreeService.java

@@ -1,14 +0,0 @@
-package cn.cslg.pas.service.business;
-
-import cn.cslg.pas.domain.business.CustomTree;
-import cn.cslg.pas.mapper.CustomTreeMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * @Author xiexiang
- * @Date 2023/11/8
- */
-@Service
-public class CustomTreeService extends ServiceImpl<CustomTreeMapper, CustomTree> {
-}

src/main/resources/jsons/customField.json

@@ -71,4 +71,5 @@
     "ifGroup": "false",
     "ifShow":"false"
   }
+
 ]

src/main/resources/mapper/CustomFieldMapper.xml

@@ -14,6 +14,7 @@
       ${sql2} ${sql3}
   </select>
 
+
     <select id="getCustomFieldCount" resultType="java.lang.Long">
         select count(*) from custom_field
         <if test="sql!=''">

src/test/java/cn/cslg/pas/service/CustomFieldServiceTests.java

@@ -17,6 +17,7 @@ public class CustomFieldServiceTests {
     @Autowired
     private CustomFieldController customFieldController;
 
+
     @Test
     void addCustomField() throws Exception {
         CustomFieldDTO customFieldDTO = new CustomFieldDTO();