ljx：修改价格指数所有接口

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

@@ -26,7 +26,7 @@ public class PriceIndex extends BaseEntity
     private String code;
 
     /** 名称 */
-    @Excel(name = "名称")
+    @Excel(name = "企业名称")
     private String name;
 
     /** 月份 */
@@ -47,7 +47,7 @@ public class PriceIndex extends BaseEntity
 
     /** 指数 */
     @Excel(name = "指数")
-    private Double index;
+    private Double indexv;
 
     public String getIndustryName() {
         return industry;
@@ -119,14 +119,14 @@ public class PriceIndex extends BaseEntity
     {
         return creator;
     }
-    public void setIndex(Double index)
+    public void setIndexv(Double indexv)
     {
-        this.index = index;
+        this.indexv = indexv;
     }
 
-    public Double getIndex()
+    public Double getIndexv()
     {
-        return index;
+        return indexv;
     }
 
     @Override
@@ -140,7 +140,7 @@ public class PriceIndex extends BaseEntity
                 ", year=" + year +
                 ", unit='" + unit + '\'' +
                 ", creator='" + creator + '\'' +
-                ", index=" + index +
+                ", index=" + indexv +
                 '}';
     }
 }

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

@@ -61,10 +61,12 @@ public class PriceIndexServiceImpl implements IPriceIndexService
     public boolean batchTbPriceIndex(List<PriceIndex> list) {
         //校验数据
         for (PriceIndex priceIndex : list) {
-            Long id = Long.valueOf(priceIndex.getName().replace("企业", ""));
-            if (priceIndex.getCode() == null || priceIndex.getName() == null) {
+            String name = priceIndex.getName();
+            if (priceIndex.getCode() == null || name == null) {
                 throw new RuntimeException("代码或名称为空！");
             }
+
+            Long id =Long.valueOf( name.replace("企业", "") + priceIndex.getMonth() +priceIndex.getYear());
             // 检查数据库是否已存在相同ID
             PriceIndex exist = priceIndexMapper.selectPriceIndexById(id);
             if (exist != null) {
@@ -73,8 +75,9 @@ public class PriceIndexServiceImpl implements IPriceIndexService
             priceIndex.setId(id);
         }
         //批量导入
+        //System.out.println(list);
         priceIndexMapper.insertBatch(list);
-        return false;
+        return true;
     }
 
     /**

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

@@ -11,11 +11,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="year"    column="year"    />
         <result property="unit"    column="unit"    />
         <result property="creator"    column="creator"    />
-        <result property="index"    column="index"    />
+        <result property="indexv"    column="indexv"    />
+        <result property="industry"    column="industry"    />
+        <result property="code"    column="code"    />
     </resultMap>
 
     <sql id="selectPriceIndexVo">
-        select id, name, month, year, unit, creator, index from price_index
+        select id, name, month, year, unit, creator, indexv,industry,code from price_index
     </sql>
 
     <select id="selectPriceIndexList" parameterType="PriceIndex" resultMap="PriceIndexResult">
@@ -26,7 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="year != null "> and year = #{year}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="creator != null  and creator != ''"> and creator = #{creator}</if>
-            <if test="index != null "> and index = #{index}</if>
+            <if test="indexv != null "> and index = #{indexv}</if>
+            <if test="industry != null "> and industry like concat('%', #{industry}, '%')}</if>
+            <if test="code != null "> and index = #{code}</if>
         </where>
     </select>
     
@@ -44,7 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="year != null">year,</if>
             <if test="unit != null">unit,</if>
             <if test="creator != null">creator,</if>
-            <if test="index != null">index,</if>
+            <if test="indexv != null">indexv,</if>
+            <if test="industry != null">industry,</if>
+            <if test="code != null">code,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -53,7 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="year != null">#{year},</if>
             <if test="unit != null">#{unit},</if>
             <if test="creator != null">#{creator},</if>
-            <if test="index != null">#{index},</if>
+            <if test="indexv != null">#{indexv},</if>
+            <if test="industry != null">#{industry},</if>
+            <if test="code != null">#{code},</if>
          </trim>
     </insert>
 
@@ -65,7 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="year != null">year = #{year},</if>
             <if test="unit != null">unit = #{unit},</if>
             <if test="creator != null">creator = #{creator},</if>
-            <if test="index != null">index = #{index},</if>
+            <if test="indexv != null">index = #{indexv},</if>
+            <if test="industry != null">index = #{industry},</if>
+            <if test="code != null">index = #{code},</if>
         </trim>
         where id = #{id}
     </update>
@@ -83,9 +93,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 批量插入 -->
     <insert id="insertBatch">
-        INSERT INTO price_index (id, name, month, year, unit, creator, `indexv`, industry, code) VALUES
+        INSERT INTO price_index (id, name, month, year, unit, creator, indexv, industry, code) VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.name}, #{item.month}, #{item.year}, #{item.unit}, #{item.creator}, #{item.index}, #{item.industry}, #{item.code})
+            (#{item.id}, #{item.name}, #{item.month}, #{item.year}, #{item.unit}, #{item.creator}, #{item.indexv}, #{item.industry}, #{item.code})
         </foreach>
     </insert>