Browse Source

导出Wrod开发

anderx 3 years ago
parent
commit
2a9dc8a498

+ 13 - 12
src/main/java/com/goafanti/RD/bo/InputExcelRdDetails.java

@@ -1,5 +1,6 @@
 package com.goafanti.RD.bo;
 
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.utils.Param;
 import com.goafanti.common.utils.excel.Excel;
@@ -40,14 +41,14 @@ public class InputExcelRdDetails  extends InputRdDetails{
     /**
      * 开始时间
      */
-    @Excel(name="开始时间")
-    private String  rdStartStr;
+    @Excel(name="开始时间",dateFormat= AFTConstants.YYYYMMDD)
+    private Date  rdStart;
 
     /**
      * 结束时间
      */
-    @Excel(name="结束时间")
-    private String  rdEndStr;
+    @Excel(name="结束时间",dateFormat= AFTConstants.YYYYMMDD)
+    private Date  rdEnd;
 
 
     /**
@@ -141,23 +142,23 @@ public class InputExcelRdDetails  extends InputRdDetails{
     }
 
     @Override
-    public String getRdStartStr() {
-        return rdStartStr;
+    public Date getRdStart() {
+        return rdStart;
     }
 
     @Override
-    public void setRdStartStr(String rdStartStr) {
-        this.rdStartStr = rdStartStr;
+    public void setRdStart(Date rdStart) {
+        this.rdStart = rdStart;
     }
 
     @Override
-    public String getRdEndStr() {
-        return rdEndStr;
+    public Date getRdEnd() {
+        return rdEnd;
     }
 
     @Override
-    public void setRdEndStr(String rdEndStr) {
-        this.rdEndStr = rdEndStr;
+    public void setRdEnd(Date rdEnd) {
+        this.rdEnd = rdEnd;
     }
 
     @Override

+ 242 - 0
src/main/java/com/goafanti/RD/bo/OutExcelRdDetails.java

@@ -0,0 +1,242 @@
+package com.goafanti.RD.bo;
+
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.utils.excel.Excel;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class OutExcelRdDetails extends InputRdDetails{
+
+
+
+    /**
+     * 公司名称
+     */
+    @Excel(name="公司名称")
+    private String userName;
+
+    /**
+     * 研发活动编号
+     */
+    @Excel(name="研发活动编号")
+    private String rdNo;
+
+    /**
+     * 知识产权编号
+     */
+    @Excel(name="知识产权编号")
+    private String ipNo;
+
+    /**
+     * 发研活动名称
+     */
+    @Excel(name="研发活动名称")
+    private String rdName;
+
+
+    /**
+     * 开始时间
+     */
+    @Excel(name="开始时间")
+    private String  rdStartStr;
+
+    /**
+     * 结束时间
+     */
+    @Excel(name="结束时间")
+    private String  rdEndStr;
+
+
+    /**
+     * 技术领域
+     */
+    @Excel(name="技术领域")
+    private String technicalField;
+
+    /**
+     * 技术来源
+     */
+    @Excel(name="技术来源")
+    private String technologySource;
+
+    /**
+     * 研发经费总预算(万元)
+     */
+    @Excel(name="研发经费总预算(万元)")
+    private BigDecimal totalAmount;
+
+    /**
+     * 研发经费近三年总支出(万元)
+     */
+    @Excel(name="研发经费近三年总支出(万元)")
+    private BigDecimal recentThreeAmount;
+
+    /**
+     * 研发目的及组织实施方式
+     */
+    @Excel(name="研发目的及组织实施方式")
+    private String rdObjective;
+
+    /**
+     * 核心技术及创新点
+     */
+    @Excel(name="核心技术及创新点")
+    private String coreTechnology;
+
+    /**
+     * 取得的创段性成果
+     */
+    @Excel(name="取得的创段性成果")
+    private String achieveResults;
+
+
+    /**
+     * 咨询师名称
+     */
+    @Excel(name="咨询师名称")
+    private String consultantName;
+
+
+    @Override
+    public String getRdStartStr() {
+        return rdStartStr;
+    }
+
+    @Override
+    public void setRdStartStr(String rdStartStr) {
+        this.rdStartStr = rdStartStr;
+    }
+
+    @Override
+    public String getRdEndStr() {
+        return rdEndStr;
+    }
+
+    @Override
+    public void setRdEndStr(String rdEndStr) {
+        this.rdEndStr = rdEndStr;
+    }
+
+    @Override
+    public String getUserName() {
+        return userName;
+    }
+
+    @Override
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    @Override
+    public String getRdNo() {
+        return rdNo;
+    }
+
+    @Override
+    public void setRdNo(String rdNo) {
+        this.rdNo = rdNo;
+    }
+
+    @Override
+    public String getIpNo() {
+        return ipNo;
+    }
+
+    @Override
+    public void setIpNo(String ipNo) {
+        this.ipNo = ipNo;
+    }
+
+    @Override
+    public String getRdName() {
+        return rdName;
+    }
+
+    @Override
+    public void setRdName(String rdName) {
+        this.rdName = rdName;
+    }
+
+
+
+    @Override
+    public String getTechnicalField() {
+        return technicalField;
+    }
+
+    @Override
+    public void setTechnicalField(String technicalField) {
+        this.technicalField = technicalField;
+    }
+
+    @Override
+    public String getTechnologySource() {
+        return technologySource;
+    }
+
+    @Override
+    public void setTechnologySource(String technologySource) {
+        this.technologySource = technologySource;
+    }
+
+    @Override
+    public BigDecimal getTotalAmount() {
+        return totalAmount;
+    }
+
+    @Override
+    public void setTotalAmount(BigDecimal totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
+    @Override
+    public BigDecimal getRecentThreeAmount() {
+        return recentThreeAmount;
+    }
+
+    @Override
+    public void setRecentThreeAmount(BigDecimal recentThreeAmount) {
+        this.recentThreeAmount = recentThreeAmount;
+    }
+
+    @Override
+    public String getRdObjective() {
+        return rdObjective;
+    }
+
+    @Override
+    public void setRdObjective(String rdObjective) {
+        this.rdObjective = rdObjective;
+    }
+
+    @Override
+    public String getCoreTechnology() {
+        return coreTechnology;
+    }
+
+    @Override
+    public void setCoreTechnology(String coreTechnology) {
+        this.coreTechnology = coreTechnology;
+    }
+
+    @Override
+    public String getAchieveResults() {
+        return achieveResults;
+    }
+
+    @Override
+    public void setAchieveResults(String achieveResults) {
+        this.achieveResults = achieveResults;
+    }
+
+    @Override
+    public String getConsultantName() {
+        return consultantName;
+    }
+
+    @Override
+    public void setConsultantName(String consultantName) {
+        this.consultantName = consultantName;
+    }
+}

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

@@ -127,7 +127,7 @@ public class RDContorller extends BaseApiController {
 
 
     /**
-     * 	Excel批量导入回款
+     * 	Excel批量导入
      *
      * @return
      */

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

@@ -73,10 +73,10 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
     }
 
     @Override
-    public Pagination<InputExcelRdDetails> list(InputRdList in) {
+    public Pagination<OutExcelRdDetails> list(InputRdList in) {
         Map<String, Object> param = getParam(in);
 
-        return (Pagination<InputExcelRdDetails>) findPage("RdDetailsList","RdDetailsCount",param,in.getPageNo(), in.getPageSize());
+        return (Pagination<OutExcelRdDetails>) findPage("RdDetailsList","RdDetailsCount",param,in.getPageNo(), in.getPageSize());
     }
 
     private Map<String, Object> getParam(InputRdList in) {
@@ -95,8 +95,8 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
     @Override
     public Result exportList(InputRdList in, String uploadPath) {
         Map<String, Object> param = getParam(in);
-        List<InputExcelRdDetails> list = (List<InputExcelRdDetails>) findList("RdDetailsList", param, 1, 9999);
-        NewExcelUtil<InputExcelRdDetails> newExcelUtil=new NewExcelUtil<>(InputExcelRdDetails.class);
+        List<OutExcelRdDetails> list = (List<OutExcelRdDetails>) findList("RdDetailsList", param, 1, 9999);
+        NewExcelUtil<OutExcelRdDetails> newExcelUtil=new NewExcelUtil<>(OutExcelRdDetails.class);
         return newExcelUtil.exportExcel(list,"研发活动信息",uploadPath);
     }
 
@@ -110,7 +110,6 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
             e.printStackTrace();
         }
 
-//        List<InputRdDetails> list=  pushRdDetails(file);
         //新增
         return insertBatchList(list);
     }
@@ -133,6 +132,7 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
             in.setStatus(1);
             in.setAid(aid);
             in.setCreateTime(date);
+
         }
         if (relust.size()>0)insertBatch(relust);
         map.put("OK",relust.size());

+ 1 - 1
src/main/java/com/goafanti/common/mapper/RdDetailsMapper.xml

@@ -296,7 +296,7 @@
     where a.id =#{id}
   </select>
 
-  <select id="RdDetailsList" resultType="com.goafanti.RD.bo.InputExcelRdDetails">
+  <select id="RdDetailsList" resultType="com.goafanti.RD.bo.OutExcelRdDetails">
     select
     <include refid="details_List" />
     from rd_details a