任务书-新增任务书主要完成人支持模版导入

src/main/java/com/liang/common/fileupload/controller/FileUploadController.java

@@ -73,10 +73,11 @@ public class FileUploadController extends BaseController {
                         member.setZc(person.getZc());
                         member.setZcmc(person.getZcmc());
                         member.setXl(person.getXl());
-                        if (person.getXlmc() != null)
+                        if (person.getXlmc() != null) {
                             member.setXlmc(person.getXlmc());
-                        else
+                        } else {
                             member.setXlmc("");
+                        }
                         if (company != null) {
                             member.setDwlx(company.getLx().toString());
                             member.setDwlxmc(company.getLxmc());
@@ -100,12 +101,13 @@ public class FileUploadController extends BaseController {
                     list.set(i, member);
                 }
 
-                if (tipList.size() == 0 && list.size() > 0)
+                if (tipList.size() == 0 && list.size() > 0) {
                     xlsMap.put("code", 0);
-                else if (tipList.size() > 0)
+                } else if (tipList.size() > 0) {
                     xlsMap.put("code", 10);
-                else
+                } else {
                     xlsMap.put("code", 20);
+                }
                 xlsMap.put("tipList", tipList);
                 xlsMap.put("list", list);
                 xlsMap.put("fileType", fileType);

src/main/java/com/liang/common/utils/ExcelPoiUtil.java

@@ -224,13 +224,23 @@ public class ExcelPoiUtil {
             //获取每一行数据
             row = sheet.getRow(i);
             PrjMember prjMember = new PrjMember();
-            prjMember.setSxbh(Double.valueOf(row.getCell(0).toString()).intValue());
-            prjMember.setRy(Double.valueOf(row.getCell(1).toString()).intValue());
-            prjMember.setRyxm(row.getCell(2).toString().trim());
-            prjMember.setXmjsmc(row.getCell(3).toString().trim());
-            prjMember.setBxmfg(row.getCell(4).toString().trim());
-            prjMember.setTrgzzys(Double.valueOf(row.getCell(5).toString()).intValue());
-            list.add(prjMember);
+            if (Tools.notEmpty(row) && row.getPhysicalNumberOfCells() > 1) {
+                String one = row.getCell(0).toString();
+                String two = row.getCell(1).toString();
+                String three = row.getCell(2).toString();
+                String four = row.getCell(3).toString();
+                String five = row.getCell(4).toString();
+                String six = row.getCell(5).toString();
+                if (Tools.notEmpty(one) && Tools.notEmpty(two) && Tools.notEmpty(three) && Tools.notEmpty(four) && Tools.notEmpty(five)&& Tools.notEmpty(six)) {
+                    prjMember.setSxbh(Double.valueOf(one).intValue());
+                    prjMember.setRy(Double.valueOf(two).intValue());
+                    prjMember.setRyxm(three.trim());
+                    prjMember.setXmjsmc(four.trim());
+                    prjMember.setBxmfg(five.trim());
+                    prjMember.setTrgzzys(Double.valueOf(five).intValue());
+                    list.add(prjMember);
+                }
+            }
         }
         return list;
     }

src/main/java/com/liang/entity/PrjMember.java

@@ -1,5 +1,10 @@
 package com.liang.entity;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 
 /**
@@ -8,6 +13,10 @@ import java.io.Serializable;
  * @author makejava
  * @since 2023-03-10 11:21:54
  */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class PrjMember implements Serializable {
     private static final long serialVersionUID = -55947996636647050L;
 
@@ -71,149 +80,5 @@ public class PrjMember implements Serializable {
      */
     private Integer xl;
     private String xlmc;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getRy() {
-        return ry;
-    }
-
-    public void setRy(Integer ry) {
-        this.ry = ry;
-    }
-
-    public Integer getDw() {
-        return dw;
-    }
-
-    public void setDw(Integer dw) {
-        this.dw = dw;
-    }
-
-    public Integer getXm() {
-        return xm;
-    }
-
-    public void setXm(Integer xm) {
-        this.xm = xm;
-    }
-
-    public String getRyxm() {
-        return ryxm;
-    }
-
-    public void setRyxm(String ryxm) {
-        this.ryxm = ryxm;
-    }
-
-    public String getDwmc() {
-        return dwmc;
-    }
-
-    public void setDwmc(String dwmc) {
-        this.dwmc = dwmc;
-    }
-
-    public String getDwlx() {
-        return dwlx;
-    }
-
-    public void setDwlx(String dwlx) {
-        this.dwlx = dwlx;
-    }
-
-    public String getDwlxmc() {
-        return dwlxmc;
-    }
-
-    public void setDwlxmc(String dwlxmc) {
-        this.dwlxmc = dwlxmc;
-    }
-
-    public String getXmjs() {
-        return xmjs;
-    }
-
-    public void setXmjs(String xmjs) {
-        this.xmjs = xmjs;
-    }
-
-    public String getXmjsmc() {
-        return xmjsmc;
-    }
-
-    public void setXmjsmc(String xmjsmc) {
-        this.xmjsmc = xmjsmc;
-    }
-
-    public Integer getSxbh() {
-        return sxbh;
-    }
-
-    public void setSxbh(Integer sxbh) {
-        this.sxbh = sxbh;
-    }
-
-    public String getZc() {
-        return zc;
-    }
-
-    public void setZc(String zc) {
-        this.zc = zc;
-    }
-
-    public String getZcmc() {
-        return zcmc;
-    }
-
-    public void setZcmc(String zcmc) {
-        this.zcmc = zcmc;
-    }
-
-    public Integer getTrgzzys() {
-        return trgzzys;
-    }
-
-    public void setTrgzzys(Integer trgzzys) {
-        this.trgzzys = trgzzys;
-    }
-
-    public String getYhxq() {
-        return yhxq;
-    }
-
-    public void setYhxq(String yhxq) {
-        this.yhxq = yhxq;
-    }
-
-    public String getBxmfg() {
-        return bxmfg;
-    }
-
-    public void setBxmfg(String bxmfg) {
-        this.bxmfg = bxmfg;
-    }
-
-    public Integer getXl() {
-        return xl;
-    }
-
-    public void setXl(Integer xl) {
-        this.xl = xl;
-    }
-
-    public String getXlmc() {
-        return xlmc;
-    }
-
-    public void setXlmc(String xlmc) {
-        this.xlmc = xlmc;
-    }
 }