2.0.0 修改参拍记录导入模块

air/src/main/java/com/air/applets/controller/AuctionRecordController.java

@@ -44,7 +44,7 @@ public class AuctionRecordController {
     public R<IPage<AuctionRecord>> getAuctionRecordPage(QueryPage page, String landListedId) {
         LambdaQueryWrapper<AuctionRecord> query = Wrappers.<AuctionRecord>query().lambda()
                 .eq(StrUtil.isNotEmpty(landListedId), AuctionRecord::getLandListedId, landListedId)
-                .orderByAsc(AuctionRecord::getRanking);
+                .orderByAsc(AuctionRecord::getSort);
         IPage<AuctionRecord> recordPage = auctionRecordService.page(page.toPage(), query);
         return R.ok(recordPage, "查询成功");
     }

air/src/main/java/com/air/land/entity/AuctionRecord.java

@@ -44,7 +44,7 @@ public class AuctionRecord extends Model<AuctionRecord> {
     private String landName;
 
     @ApiModelProperty(value = "排名")
-    private Integer ranking;
+    private String ranking;
 
     @ApiModelProperty(value = "举牌企业")
     private String raiseEnterprise;
@@ -91,6 +91,9 @@ public class AuctionRecord extends Model<AuctionRecord> {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "地块编号")
     private String landCode;

air/src/main/java/com/air/land/service/impl/AuctionRecordServiceImpl.java

@@ -74,7 +74,7 @@ public class AuctionRecordServiceImpl extends ServiceImpl<AuctionRecordMapper, A
     @Override
     @SneakyThrows
     public List<AuctionRecord> readRecordExcel(MultipartFile file) {
-        return readAuction(file.getInputStream(), 0, 7, 21);
+        return readAuction(file.getInputStream(), 0, 6, 21);
     }
 
     @Override
@@ -102,6 +102,17 @@ public class AuctionRecordServiceImpl extends ServiceImpl<AuctionRecordMapper, A
         }
     }
 
+
+    /**
+     * 导入土地参拍记录
+     * @author peihao
+     * @param file 解析文件
+     * @param startSheet 开始sheet
+     * @param startRow 开始行
+     * @param startCell 开始列
+     * @date 2021/12/9
+     * @return
+     **/
     private List<AuctionRecord> readAuction(InputStream file, int startSheet, int startRow, int startCell) throws IOException {
         // 读取excel模板
         XSSFWorkbook wb = new XSSFWorkbook(file);
@@ -115,6 +126,7 @@ public class AuctionRecordServiceImpl extends ServiceImpl<AuctionRecordMapper, A
         String winnerEnterprise = getCellValue(sheet.getRow(startCell).getCell(startCell + 1));
         //获取数据
         List<AuctionRecord> result = new ArrayList<>();
+        int count = 0;
         for (int i = startRow; i < rowSum; i++) {
             XSSFRow sheetRow = sheet.getRow(i);
             String rank = getCellValue(sheetRow.getCell(startCell));
@@ -123,7 +135,43 @@ public class AuctionRecordServiceImpl extends ServiceImpl<AuctionRecordMapper, A
             }
             AuctionRecord record = new AuctionRecord().setCity(city).setLandName(landName).setWinnerEnterprises(winnerEnterprise);
             //排名
-            record.setRanking(Integer.valueOf(rank));
+            record.setRanking(rank);
+            record.setSort(count);
+            setAuctionRecord(record,sheetRow,startCell,count);
+            result.add(record);
+            count++;
+        }
+        return result;
+    }
+
+
+    /**
+     * 解析一行的数据
+     * @author peihao
+     * @param record 参拍记录对象
+     * @param sheetRow 行
+     * @param startCell 开始列
+     * @param count 判断是否为第一行，特殊处理
+     * @date 2021/12/9
+     * @return
+     **/
+    private void setAuctionRecord(AuctionRecord record,XSSFRow sheetRow,int startCell,int count){
+        if (count == 0){
+            //举牌企业
+            record.setRaiseEnterprise(getStringValue(sheetRow.getCell(startCell + 1)));
+            //举牌价
+            record.setRaisePrice(getStringValue(sheetRow.getCell(startCell + 2)));
+            //名义楼面价
+            record.setNominalFloorPrice(getStringValue(sheetRow.getCell(startCell + 3)));
+            //无偿移交比例
+            record.setPercentUnpaidTransfers(getStringValue(sheetRow.getCell(startCell + 4)));
+            //实际楼面价
+            record.setActualFloorPrice(getStringValue(sheetRow.getCell(startCell + 5)));
+            //溢价率
+            record.setPremiumRate(getStringValue(sheetRow.getCell(startCell + 6)));
+            //最后轮次
+            record.setFinalRound(getStringValue(sheetRow.getCell(startCell + 7)));
+        }else {
             //举牌企业
             record.setRaiseEnterprise(getCellValue(sheetRow.getCell(startCell + 1)));
             //举牌价
@@ -138,10 +186,7 @@ public class AuctionRecordServiceImpl extends ServiceImpl<AuctionRecordMapper, A
             record.setPremiumRate(getCellPercent(sheetRow.getCell(startCell + 6)));
             //最后轮次
             record.setFinalRound(getCellValue(sheetRow.getCell(startCell + 7)));
-            result.add(record);
         }
-
-        return result;
     }
 
     private List<List<String>> entityToList(List<AuctionRecord> auctionRecords){
@@ -191,4 +236,14 @@ public class AuctionRecordServiceImpl extends ServiceImpl<AuctionRecordMapper, A
         d = d * 100;
         return String.format("%.2f", d);
     }
+
+    private String getStringValue(XSSFCell cell) {
+        String cellValue = null;
+        try {
+            cellValue = cell.getStringCellValue();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return cellValue;
+    }
 }

air/src/main/java/com/air/land/vo/AuctionRecordVo.java

@@ -64,4 +64,7 @@ public class AuctionRecordVo {
     @ApiModelProperty(value = "竞得企业")
     private String winnerEnterprises;
 
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
 }

air/src/main/resources/mapper/AuctionRecordMapper.xml

@@ -19,7 +19,7 @@
                 and ar.land_listed_id = #{param.landListedId}
             </if>
             <if test="param.city != null and param.city != ''">
-                and ar.city = #{param.city}
+                and ll.city = #{param.city}
             </if>
             <if test="param.landCode != null and param.landCode != ''">
                 and ll.land_code like concat ('%',#{param.landCode},'%')
@@ -34,7 +34,7 @@
                 and ar.winner_enterprises like concat ('%',#{param.winnerEnterprises},'%')
             </if>
         </where>
-            order by ar.ranking asc
+            order by ar.sort asc
     </select>
 
     <select id="getAuctionRecords" resultType="com.air.land.entity.AuctionRecord">