1

common/src/main/java/com/jpsoft/excellent/modules/base/entity/Incident.java

@@ -22,9 +22,9 @@ public class Incident {
     @ApiModelProperty(value = "编号")
     private String id;
     @ApiModelProperty(value = "批次")
-    private String batch;
+    private Integer batch;
     @ApiModelProperty(value = "序号")
-    private String serialNo;
+    private Integer serialNo;
     @ApiModelProperty(value = "投诉人")
     private String complainant;
     @ApiModelProperty(value = "联系方式")

common/src/main/resources/mapper/base/Incident.xml

@@ -61,8 +61,8 @@
 		values
 		(
 #{id,jdbcType=VARCHAR}
-,#{batch,jdbcType=VARCHAR}
-,#{serialNo,jdbcType=VARCHAR}
+,#{batch,jdbcType=NUMERIC}
+,#{serialNo,jdbcType=NUMERIC}
 ,#{complainant,jdbcType=VARCHAR}
 ,#{complainantPhone,jdbcType=VARCHAR}
 ,#{areaId,jdbcType=VARCHAR}
@@ -86,10 +86,10 @@
 		update base_incident
 		<set>
 				<if test="batch!=null">
-		batch_=#{batch,jdbcType=VARCHAR},
+		batch_=#{batch,jdbcType=NUMERIC},
 		</if>
 				<if test="serialNo!=null">
-		serial_no=#{serialNo,jdbcType=VARCHAR},
+		serial_no=#{serialNo,jdbcType=NUMERIC},
 		</if>
 				<if test="complainant!=null">
 		complainant_=#{complainant,jdbcType=VARCHAR},

web/src/main/java/com/jpsoft/excellent/modules/base/controller/IncidentController.java

@@ -1096,7 +1096,14 @@ public class IncidentController {
                     incident.setCreateTime(new Date());
 
                     if(StringUtils.isNotEmpty(strBatch)){
-                        incident.setBatch(strBatch);
+                        try {
+                            incident.setBatch(Integer.valueOf(strBatch));
+                        }
+                        catch (Exception ex){
+                            sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("批次数据错误!");
+                            failCount++;
+                            continue;
+                        }
                     }
                     else{
                         sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("请填写批次!");
@@ -1105,7 +1112,14 @@ public class IncidentController {
                     }
 
                     if(StringUtils.isNotEmpty(strSerialNo)){
-                        incident.setSerialNo(strSerialNo);
+                        try {
+                            incident.setSerialNo(Integer.valueOf(strSerialNo));
+                        }
+                        catch (Exception ex){
+                            sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("序号数据错误!");
+                            failCount++;
+                            continue;
+                        }
                     }
                     else{
                         sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("请填写序号!");