完善

platform-dao/src/main/java/com/platform/dao/dto/customize/CustomFieldTemplateDataDTO.java

@@ -94,5 +94,4 @@ public class CustomFieldTemplateDataDTO extends BaseDTO implements Serializable
     private Integer status;
 
     private List<Integer> statusList;
-
 }

platform-dao/src/main/java/com/platform/dao/entity/customize/CustomFieldTemplateData.java

@@ -79,4 +79,9 @@ public class CustomFieldTemplateData implements Serializable{
      */
     private Integer status;
 
+    /**
+     * 删除标识 0 nomalr 1 deleted
+     */
+    private Integer DelFlag;
+
 }

platform-dao/src/main/java/com/platform/dao/vo/query/customize/CustomFieldTemplateDataVO.java

@@ -122,4 +122,9 @@ public class CustomFieldTemplateDataVO extends BaseVO implements Serializable {
      * 调拨申请部门
      */
     private String currentDeptName;
+
+    /**
+     * 删除标识 0 nomalr 1 deleted
+     */
+    private Integer DelFlag;
 }

platform-dao/src/main/resources/mapper/customize/CustomFieldTemplateDataMapper.xml

@@ -13,7 +13,8 @@
                              fieldTemplateData.created_user_name,
                              fieldTemplateData.update_user_id,
                              fieldTemplateData.update_user_name,
-                             fieldTemplateData.status
+                             fieldTemplateData.status,
+                             fieldTemplateData.del_flag
                         </sql>
     <sql id="Ref_Column_List">
                                                                          fieldTemplateData.type,
@@ -79,6 +80,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="delFlag != null">
+            and fieldTemplateData.del_flag = #{delFlag}
+        </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.customize.CustomFieldTemplateDataDTO"
             resultType="com.platform.dao.vo.query.customize.CustomFieldTemplateDataVO">

platform-rest/src/main/java/com/platform/rest/controller/customize/CustomFieldTemplateDataController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import lombok.AllArgsConstructor;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.rest.log.annotation.SysLog;
+
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -30,18 +31,18 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping("/customize/fieldTemplateData")
 public class CustomFieldTemplateDataController {
 
-  private final  CustomFieldTemplateDataService customFieldTemplateDataService;
+    private final CustomFieldTemplateDataService customFieldTemplateDataService;
 
-  /**
-   * 通过id查询单条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @GetMapping("/{id}")
-  public R<CustomFieldTemplateData> getById(@PathVariable("id") String id){
-      return new R<>(customFieldTemplateDataService.getModelById(id));
-  }
+    /**
+     * 通过id查询单条记录
+     *
+     * @param id 主键
+     * @return R
+     */
+    @GetMapping("/{id}")
+    public R<CustomFieldTemplateData> getById(@PathVariable("id") String id) {
+        return new R<>(customFieldTemplateDataService.getModelById(id));
+    }
 
     /**
      * 通过id查询单条记录
@@ -50,25 +51,26 @@ public class CustomFieldTemplateDataController {
      * @return R
      */
     @GetMapping("/voData/{id}")
-    public R<CustomFieldTemplateDataVO> getVOById(@PathVariable("id") String id){
+    public R<CustomFieldTemplateDataVO> getVOById(@PathVariable("id") String id) {
         return new R<>(customFieldTemplateDataService.getVOById(id));
     }
 
-  /**
-   * 新增记录
-   *
-   * @param customFieldTemplateDataDTO 自定义报表DTO
-   * @return R
-   */
-  @SysLog("新增自定义报表")
-  @PostMapping
-  @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-add')")
-  public R save(@Validated({AddGroup.class}) @RequestBody CustomFieldTemplateDataDTO customFieldTemplateDataDTO) {
-      return new R<>(customFieldTemplateDataService.saveModelByDTO(customFieldTemplateDataDTO));
-  }
+    /**
+     * 新增记录
+     *
+     * @param customFieldTemplateDataDTO 自定义报表DTO
+     * @return R
+     */
+    @SysLog("新增自定义报表")
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-add')")
+    public R save(@Validated({AddGroup.class}) @RequestBody CustomFieldTemplateDataDTO customFieldTemplateDataDTO) {
+        return new R<>(customFieldTemplateDataService.saveModelByDTO(customFieldTemplateDataDTO));
+    }
 
     /**
      * 新增自定义表单记录
+     *
      * @param customFieldTemplateDataDTO 自定义报表DTO
      * @return R
      */
@@ -78,48 +80,49 @@ public class CustomFieldTemplateDataController {
         return new R<>(customFieldTemplateDataService.saveModelFormByDTO(customFieldTemplateDataDTO));
     }
 
-  /**
-   * 修改记录
-   *
-   * @param customFieldTemplateDataDTO 自定义报表DTO
-   * @return R
-   */
-  @SysLog("修改自定义报表")
-  @PutMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-edit')")
-  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody CustomFieldTemplateDataDTO customFieldTemplateDataDTO) {
-      customFieldTemplateDataService.modModelByDTO(customFieldTemplateDataDTO);
-      return new R<>();
-  }
-
-
-                  /**
-       * 根据主键 修改select类型值
-       * @param id
-       * @param type
-       * @return R
-       */
-      @SysLog("修改自定义报表")
-      @PutMapping("/Type/{id}")
-      @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-edit')")
-      public R updateTypeById(@PathVariable("id") String id,Integer type) {
-          customFieldTemplateDataService.updateTypeById(id,type);
+    /**
+     * 修改记录
+     *
+     * @param customFieldTemplateDataDTO 自定义报表DTO
+     * @return R
+     */
+    @SysLog("修改自定义报表")
+    @PutMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-edit')")
+    public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody CustomFieldTemplateDataDTO customFieldTemplateDataDTO) {
+        customFieldTemplateDataService.modModelByDTO(customFieldTemplateDataDTO);
         return new R<>();
-      }
-                                                            
-  /**
-   * 通过id删除一条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @SysLog("删除自定义报表")
-  @DeleteMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-del')")
-  public R removeById(@PathVariable String id){
-    customFieldTemplateDataService.deleteByPrimaryKey(id);
-    return new R<>();
-  }
+    }
+
+
+    /**
+     * 根据主键 修改select类型值
+     *
+     * @param id
+     * @param type
+     * @return R
+     */
+    @SysLog("修改自定义报表")
+    @PutMapping("/Type/{id}")
+    @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-edit')")
+    public R updateTypeById(@PathVariable("id") String id, Integer type) {
+        customFieldTemplateDataService.updateTypeById(id, type);
+        return new R<>();
+    }
+
+    /**
+     * 通过id删除一条记录
+     *
+     * @param id 主键
+     * @return R
+     */
+    @SysLog("删除自定义报表")
+    @DeleteMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-del')")
+    public R removeById(@PathVariable String id) {
+        customFieldTemplateDataService.deleteOne(id);
+        return new R<>();
+    }
 
     /**
      * 批量记录
@@ -130,47 +133,47 @@ public class CustomFieldTemplateDataController {
     @SysLog("批量删除自定义报表")
     @DeleteMapping("")
     @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-del')")
-    public R removeIds(@RequestBody List<String> ids){
+    public R removeIds(@RequestBody List<String> ids) {
         customFieldTemplateDataService.batchDelete(ids);
         return new R<>();
     }
 
-  /**
-   * 获取分页
-   *
-   * @param pageNum 当前页码
-   * @param pageSize 每页条数
-   * @param customFieldTemplateDataDTO 自定义报表DTO
-   * @return R
-   */
-  @GetMapping("/page")
-  public R<AbstractPageResultBean<CustomFieldTemplateDataVO>> query(CustomFieldTemplateDataDTO customFieldTemplateDataDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(customFieldTemplateDataService.selectPageList(customFieldTemplateDataDTO, pageNum, pageSize));
-  }
-
-  /**
-   * 获取列表
-   *
-   * @param customFieldTemplateDataDTO 自定义报表DTO
-   * @return R
-   */
-  @GetMapping("")
-  public R query(CustomFieldTemplateDataDTO customFieldTemplateDataDTO) {
-      return new R<>(customFieldTemplateDataService.getModelListByDTO(customFieldTemplateDataDTO));
-  }
-
-  /**
+    /**
+     * 获取分页
+     *
+     * @param pageNum                    当前页码
+     * @param pageSize                   每页条数
+     * @param customFieldTemplateDataDTO 自定义报表DTO
+     * @return R
+     */
+    @GetMapping("/page")
+    public R<AbstractPageResultBean<CustomFieldTemplateDataVO>> query(CustomFieldTemplateDataDTO customFieldTemplateDataDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+        return new R<>(customFieldTemplateDataService.selectPageList(customFieldTemplateDataDTO, pageNum, pageSize));
+    }
+
+    /**
+     * 获取列表
+     *
+     * @param customFieldTemplateDataDTO 自定义报表DTO
+     * @return R
+     */
+    @GetMapping("")
+    public R query(CustomFieldTemplateDataDTO customFieldTemplateDataDTO) {
+        return new R<>(customFieldTemplateDataService.getModelListByDTO(customFieldTemplateDataDTO));
+    }
+
+    /**
      * 自定义报表导出
      *
      * @param customFieldTemplateDataDTO 自定义报表DTO
      * @return R
      */
-  @GetMapping("/export")
-  @SysLog("自定义报表导出")
-  @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-export')")
-  public void export(HttpServletResponse response, CustomFieldTemplateDataDTO customFieldTemplateDataDTO) {
-    List<CustomFieldTemplateData> list = customFieldTemplateDataService.getModelListByDTO(customFieldTemplateDataDTO);
-    ExcelUtil.exportResponseDict(response, ExportCustomFieldTemplateDataVO.class, BeanConverterUtil.copyListProperties(list, ExportCustomFieldTemplateDataVO.class), "自定义报表");
-  }
+    @GetMapping("/export")
+    @SysLog("自定义报表导出")
+    @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-export')")
+    public void export(HttpServletResponse response, CustomFieldTemplateDataDTO customFieldTemplateDataDTO) {
+        List<CustomFieldTemplateData> list = customFieldTemplateDataService.getModelListByDTO(customFieldTemplateDataDTO);
+        ExcelUtil.exportResponseDict(response, ExportCustomFieldTemplateDataVO.class, BeanConverterUtil.copyListProperties(list, ExportCustomFieldTemplateDataVO.class), "自定义报表");
+    }
 
 }

platform-service/src/main/java/com/platform/service/customize/CustomFieldTemplateDataService.java

@@ -50,4 +50,6 @@ public interface CustomFieldTemplateDataService extends IBaseService<CustomField
      * @return
      */
     CustomFieldTemplateDataVO getVOById(String id);
+
+    void deleteOne(String id);
 }

platform-service/src/main/java/com/platform/service/customize/impl/CustomFieldTemplateDataServiceImpl.java

@@ -9,6 +9,7 @@ import com.platform.common.util.SecurityUtils;
 import com.platform.common.util.StringUtils;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.customize.CustomFieldTemplateDataDTO;
+import com.platform.dao.entity.customize.CustomFieldTemplate;
 import com.platform.dao.entity.customize.CustomFieldTemplateData;
 import com.platform.dao.enums.CustomFieldTemplateDataStatusEnum;
 import com.platform.dao.enums.CustomFieldTemplateDataTypeEnum;
@@ -64,6 +65,9 @@ public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFi
                 record.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
             }
         }
+        if(record.getDelFlag() == null){
+            record.setDelFlag(false); // 默认正常数据
+        }
         AbstractPageResultBean<CustomFieldTemplateDataVO> pageInfos = new MyPage(mapper.selectList(record));
         if(resultWriteFlag){
             if(pageInfos != null && pageInfos.getRows() != null && pageInfos.getRows().size() > 0){ // 统一判断
@@ -128,4 +132,12 @@ public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFi
         BaseFormCheckServiceFactory.getCheckService(vo.getRemark()).resultWrite(pageInfos);
         return pageInfos.getRows().get(0);
     }
+
+    @Override
+    public void deleteOne(String id) {
+        CustomFieldTemplateData updData = new CustomFieldTemplateData();
+        updData.setId(id);
+        updData.setDelFlag(1);
+        mapper.updateByPrimaryKeySelective(updData);
+    }
 }