guarantee-lsq пре 11 месеци
родитељ
комит
9c82853b84

+ 1 - 0
platform-dao/src/main/java/com/platform/dao/entity/custom/CustomForm.java

@@ -79,4 +79,5 @@ public class CustomForm implements Serializable{
     private Integer status; // 表单状态 0 待发布 1 已发布 2 已废弃
 
     private String category; // 分类  category_type  设备 维修 采购 备件 仓库 巡检 点检  保养
+
 }

+ 10 - 13
platform-rest/src/main/java/com/platform/rest/controller/custom/CustomFormController.java

@@ -1,27 +1,25 @@
 package com.platform.rest.controller.custom;
 
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.R;
+import com.platform.common.validation.group.AddGroup;
+import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.custom.CustomFormDTO;
-import com.platform.dao.dto.upms.SysDictDTO;
 import com.platform.dao.entity.custom.CustomForm;
-import com.platform.dao.entity.upms.SysDict;
-import com.platform.dao.util.TreeUtil;
-import com.platform.service.custom.CustomFormService;
 import com.platform.dao.util.ExcelUtil;
+import com.platform.dao.util.TreeUtil;
 import com.platform.dao.vo.export.custom.ExportCustomFormVO;
 import com.platform.dao.vo.query.custom.CustomFormVO;
-import com.platform.common.util.BeanConverterUtil;
-import com.platform.common.validation.group.AddGroup;
-import com.platform.common.validation.group.UpdateGroup;
+import com.platform.rest.log.annotation.SysLog;
+import com.platform.service.custom.CustomFormService;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 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;
+import java.util.List;
 
 /**
  * @Description 自定义表单表 控制器
@@ -55,9 +53,8 @@ public class CustomFormController {
      */
     @SysLog("新增自定义表单表")
     @PostMapping
-    @PreAuthorize("@pms.hasPermission('custom-form-add')")
     public R save(@Validated({AddGroup.class}) @RequestBody CustomFormDTO customFormDTO) {
-        return new R<>(customFormService.saveModelByDTO(customFormDTO));
+        return new R<>(customFormService.saveByDTO(customFormDTO));
     }
 
     /**

+ 1 - 0
platform-service/src/main/java/com/platform/service/custom/CustomFormService.java

@@ -34,4 +34,5 @@ public interface CustomFormService extends IBaseService<CustomForm, CustomFormDT
      */
     AbstractPageResultBean<CustomFormVO> selectPageList(CustomFormDTO record, int pageNum, int pageSize);
 
+    CustomForm saveByDTO(CustomFormDTO record);
 }

+ 16 - 0
platform-service/src/main/java/com/platform/service/custom/impl/CustomFormServiceImpl.java

@@ -1,6 +1,9 @@
 package com.platform.service.custom.impl;
 
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.util.BeanConverterUtil;
+import com.platform.common.util.IdGeneratorUtils;
+import com.platform.common.util.SecurityUtils;
 import com.platform.dao.bean.MyPage;
 import com.github.pagehelper.PageHelper;
 import com.platform.dao.vo.query.custom.CustomFormVO;
@@ -15,6 +18,8 @@ import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 import lombok.AllArgsConstructor;
 
+import javax.persistence.Id;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -42,6 +47,17 @@ public class CustomFormServiceImpl extends BaseServiceImpl<CustomFormMapper, Cus
         return new MyPage(mapper.selectList(record));
     }
 
+    @Override
+    public CustomForm saveByDTO(CustomFormDTO record) {
+        CustomForm form = BeanConverterUtil.copyObjectProperties(record,CustomForm.class);
+        form.setId(IdGeneratorUtils.getObjectId());
+        form.setCreatedTime(LocalDateTime.now());
+        form.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
+        form.setCreatedUserName(SecurityUtils.getUserInfo().getRealName());
+        mapper.insert(form);
+        return form;
+    }
+
     @Override
     public AbstractPageResultBean<CustomForm> selectPageInfo(CustomFormDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);