--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/util/excelutil/ExcelUtil.java

@@ -32,7 +32,6 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -622,7 +621,8 @@ public class ExcelUtil {
 		for (int i = 1; i < sheet.getLastRowNum() + 1; i++) {
 			// 读取行
 			Row row = sheet.getRow(i);
-
+			System.out.println("rowrowrowrowrowrowrowrowrowrowrowrowrowrowrow----+++++++++++++++++++++++++");
+			System.out.println(row);
 			if (row == null) {
 				// 遇到空行，如果声明以空行结束，就这么做，否则只跳过本次循环
 				// if(sheetParams.breakByEmptyRow()){
@@ -656,6 +656,7 @@ public class ExcelUtil {
 				obj = targetClass.newInstance();
 				objectList.add(obj);
 			} catch (Exception e) {
+				e.printStackTrace();
 				throw new BaseException("创建对象时发生错误，" + e.getMessage());
 			}
 

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/series/SeriesController.java

@@ -83,13 +83,10 @@ public class SeriesController {
 	@ApiOperation(value = "更新丛书", notes = "更新丛书")
 	@PostMapping(value = ResourceRequestPath.UPDATE)
 	public CallBack<Boolean> update(@RequestBody SeriesForm form) {
-		Series series = new Series();
+		Series series = service.selectByPrimaryKey(form.getId());
 		BeanUtils.copyProperties(form, series);
-		Criteria criteria = service.createCriteria();
-		criteria.andEqualTo("id", form.getId());
-		criteria.andEqualTo("seriesName", form.getSeriesName());
-		Integer nameCount = service.selectCountByCriteria();
-		if(nameCount>1){
+		Integer nameCount = service.queryByName(series.getId(),series.getSeriesName());
+		if(nameCount>0){
 			throw new BaseException(ResponseCodeEnum.REPEST);
 		}
 		if (!service.updateByPrimaryKeySelective(series)) {
@@ -148,9 +145,12 @@ public class SeriesController {
 				series.setCreateTime(date);
 				if (!service.insert(series)) {
 					// 第几行添加失败 2是起始行
+					System.out.println("-----------------------------+++++++++++++++++++++++++");
+					System.out.println("#####################################################");
 					int fail = i + 2;
 					sb.append("," + fail);
 				} else {
+					System.out.println("0000000000000000000000000000000000+++++++++++++++++++++++++");
 					success++;
 				}
 			}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/series/SeriesMapper.java

@@ -26,10 +26,10 @@ public interface SeriesMapper extends BaseMapper<Series>{
 			+ "</script>")
 	int isExistName(String name);
 	@Select("<script>"
-			+ "SELECT count(*) FROM res_series WHERE seriesName = #{name}"
+			+ "SELECT count(*) FROM res_series WHERE seriesName = #{seriesName}"
 			+ " and id !=#{id}"
 			+ "</script>")
-	Integer queryByName(@Param("id")String id,@Param("name")String name);
+	Integer queryByName(@Param("id")String id,@Param("seriesName")String seriesName);
 	@Select("<script>"
 			+ "SELECT count(*) FROM res_series WHERE seriesName = #{seriesName}"
 			+ "</script>")