ljx：修改价格指数导入问题和添加新的字段

enteprise-admin/src/main/java/com/enteprise/priceindex/domain/PriceIndex.java

@@ -15,10 +15,16 @@ public class PriceIndex extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 代码 */
-    @Excel(name = "代码")
+    /** ID */
+
     private Long id;
 
+    @Excel(name = "行业名称")
+    private String industry;
+
+    @Excel(name = "行业代码")
+    private String code;
+
     /** 名称 */
     @Excel(name = "名称")
     private String name;
@@ -43,7 +49,23 @@ public class PriceIndex extends BaseEntity
     @Excel(name = "指数")
     private Long index;
 
-    public void setId(Long id) 
+    public String getIndustryName() {
+        return industry;
+    }
+
+    public void setIndustryName(String industryName) {
+        this.industry = industryName;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
@@ -109,14 +131,16 @@ public class PriceIndex extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("month", getMonth())
-            .append("year", getYear())
-            .append("unit", getUnit())
-            .append("creator", getCreator())
-            .append("index", getIndex())
-            .toString();
+        return "PriceIndex{" +
+                "id=" + id +
+                ", industryName='" + industry + '\'' +
+                ", code='" + code + '\'' +
+                ", name='" + name + '\'' +
+                ", month=" + month +
+                ", year=" + year +
+                ", unit='" + unit + '\'' +
+                ", creator='" + creator + '\'' +
+                ", index=" + index +
+                '}';
     }
 }

enteprise-admin/src/main/java/com/enteprise/priceindex/service/impl/PriceIndexServiceImpl.java

@@ -60,15 +60,17 @@ public class PriceIndexServiceImpl implements IPriceIndexService
     @Override
     public boolean batchTbPriceIndex(List<PriceIndex> list) {
         //校验数据
-        for (PriceIndex PriceIndex : list) {
-            if (PriceIndex.getId() == null || PriceIndex.getName() == null) {
+        for (PriceIndex priceIndex : list) {
+            Long id = Long.valueOf(priceIndex.getName().replace("企业", ""));
+            if (priceIndex.getCode() == null || priceIndex.getName() == null) {
                 throw new RuntimeException("代码或名称为空！");
             }
             // 检查数据库是否已存在相同ID
-            PriceIndex exist = priceIndexMapper.selectPriceIndexById(PriceIndex.getId());
+            PriceIndex exist = priceIndexMapper.selectPriceIndexById(id);
             if (exist != null) {
-                throw new RuntimeException("代码 " + PriceIndex.getId() + " 已存在！");
+                throw new RuntimeException("企业 " + priceIndex.getId() + " 已存在！");
             }
+            priceIndex.setId(id);
         }
         //批量导入
         priceIndexMapper.insertBatch(list);

enteprise-admin/src/main/resources/mapper/priceindex/PriceIndexMapper.xml

@@ -83,9 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 批量插入 -->
     <insert id="insertBatch">
-        INSERT INTO price_index (id, name, month, year, unit, creator, index) VALUES
+        INSERT INTO price_index (id, name, month, year, unit, creator, `index`, industry, code) VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.name}, #{item.month}, #{item.year}, #{item.unit}, #{item.creator}, #{item.index})
+            (#{item.id}, #{item.name}, #{item.month}, #{item.year}, #{item.unit}, #{item.creator}, #{item.index},#{item.industry},#{item.code})
         </foreach>
     </insert>
 </mapper>