Browse Source

Merge branch 'test'

anderx 2 years ago
parent
commit
237d3f50b1

+ 0 - 14
src/main/java/com/goafanti/RD/bo/InputRdDetails.java

@@ -1,12 +1,6 @@
 package com.goafanti.RD.bo;
 
-import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.model.RdDetails;
-import com.goafanti.common.utils.Param;
-
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
 
 public class InputRdDetails extends RdDetails {
 
@@ -15,29 +9,21 @@ public class InputRdDetails extends RdDetails {
         /**
          * 公司名称
          */
-        @Param(name="公司名称")
-        @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
         private String userName;
 
         /**
          * 研发活动编号
          */
-        @Param(name="研发活动编号")
-        @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
         private String rdNo;
 
         /**
          * 知识产权编号
          */
-        @Param(name="知识产权编号")
-        @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
         private String ipNo;
 
         /**
          * 发研活动名称
          */
-        @Param(name="研发活动名称")
-        @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
         private String rdName;
 
 

+ 1 - 44
src/main/java/com/goafanti/RD/controller/RDContorller.java

@@ -4,32 +4,21 @@ import com.goafanti.RD.bo.InputRdDetails;
 import com.goafanti.RD.bo.InputRdList;
 import com.goafanti.RD.service.RDService;
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.controller.PublicController;
-import com.goafanti.common.enums.AttachmentType;
-import com.goafanti.common.model.Attachment;
-import com.goafanti.common.model.RdDetails;
-import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.common.utils.ParamUtils;
-import com.goafanti.common.utils.StringUtils;
 import com.goafanti.common.utils.excel.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
 
 @RestController
 @RequestMapping(value = "/api/admin/RD")
@@ -43,24 +32,8 @@ public class RDContorller extends BaseApiController {
 
 
     @RequestMapping(value="/add",method = RequestMethod.POST)
-    public Result add(@Validated InputRdDetails in ,BindingResult bindingResult) {
+    public Result add( InputRdDetails in ) {
         Result res= new Result();
-        if (bindingResult.hasErrors()) {
-            res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
-                    ParamUtils.getParamName(in,bindingResult.getFieldError().getField())));
-            return res;
-        }
-        if (rdService.checkRdNo(in.getRdNo(),null)){
-            res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_BEING_ERROR,"研发活动编号"));
-            return res;
-        }
-        if (StringUtils.isNotBlank(in.getRdStartStr())){
-            in.setRdStart(DateUtils.StringToDate(in.getRdStartStr(), AFTConstants.YYYYMMDD));
-        }
-        if (StringUtils.isNotBlank(in.getRdEndStr())){
-            in.setRdEnd(DateUtils.StringToDate(in.getRdEndStr(),AFTConstants.YYYYMMDD));
-        }
-
         res.data(rdService.add(in));
         return res;
     }
@@ -70,22 +43,6 @@ public class RDContorller extends BaseApiController {
     @RequestMapping(value="/update",method = RequestMethod.POST)
     public Result update( InputRdDetails in ,BindingResult bindingResult) {
         Result res= new Result();
-        if (bindingResult.hasErrors()) {
-            res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
-                    ParamUtils.getParamName(in,bindingResult.getFieldError().getField())));
-            return res;
-        }
-        if (rdService.checkRdNo(in.getRdNo(),in.getId())){
-            res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_BEING_ERROR,"研发活动编号"));
-            return res;
-        }
-        if (StringUtils.isNotBlank(in.getRdStartStr())){
-            in.setRdStart(DateUtils.StringToDate(in.getRdStartStr(), AFTConstants.YYYYMMDD));
-        }
-        if (StringUtils.isNotBlank(in.getRdEndStr())){
-            in.setRdEnd(DateUtils.StringToDate(in.getRdEndStr(),AFTConstants.YYYYMMDD));
-        }
-
         res.data(rdService.update(in));
         return res;
     }

+ 1 - 15
src/main/java/com/goafanti/RD/service/impl/RDServiceImpl.java

@@ -6,28 +6,20 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.RdDetailsMapper;
 import com.goafanti.common.model.RdDetails;
-import com.goafanti.common.utils.DateUtils;
-import com.goafanti.common.utils.excel.FileUtils;
 import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.common.utils.pdf.PDFUtils;
 import com.goafanti.common.utils.word.WordUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.itextpdf.text.*;
-import com.itextpdf.text.pdf.*;
-import com.lowagie.text.rtf.RtfWriter2;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
 import java.util.*;
-import java.util.List;
 
 @Service
 public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RDService {
@@ -124,18 +116,12 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
         List<InputExcelRdDetails> relust= new ArrayList<>();
         List<String>errors=new ArrayList<>();
         for (InputExcelRdDetails in : list) {
-            boolean falg = checkRdNo(in.getRdNo(),null);
-            if (falg){
-                errors.add(in.getRdNo());
-            }else {
-                relust.add(in);
-            }
+            relust.add(in);
         }
         for (InputExcelRdDetails in : relust) {
             in.setStatus(1);
             in.setAid(aid);
             in.setCreateTime(date);
-
         }
         if (relust.size()>0)insertBatch(relust);
         map.put("OK",relust.size());