导入模板3，增加桩号

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/MeterImport3VO.java

@@ -58,6 +58,8 @@ public class MeterImport3VO implements INode<MeterImport3VO> {
     private String remarks;
     private String contractPicture;
     private String changePicture;
+    private String startStake;
+    private String endStake;
 
 
     @ApiModelProperty(value = "项目id")

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MeterTreeContractMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.meter.mapper.MeterTreeContractMapper">
     <insert id="batchSaveMeter">
-        INSERT INTO s_meter_tree_contract (id, parent_id, ancestor, node_name, node_type, project_id, contract_id,remarks,contract_picture,change_picture)
+        INSERT INTO s_meter_tree_contract (id, parent_id, ancestor, node_name, node_type, project_id, contract_id,remarks,contract_picture,change_picture,start_stake,end_stake)
         VALUES
         <foreach collection="list" item="item" separator="," >
-            (#{item.id},#{item.parentId},#{item.ancestor},#{item.nodeName},#{item.nodeType},#{item.projectId},#{item.contractId},#{item.remarks},#{item.contractPicture},#{item.changePicture})
+            (#{item.id},#{item.parentId},#{item.ancestor},#{item.nodeName},#{item.nodeType},#{item.projectId},#{item.contractId},#{item.remarks},#{item.contractPicture},#{item.changePicture},#{item.startStake},#{item.endStake})
         </foreach>
         ;
 

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MeterTreeContractServiceImpl.java

@@ -1842,10 +1842,6 @@ public class MeterTreeContractServiceImpl extends BaseServiceImpl<MeterTreeContr
             Map<Long, String> FormMap = formList.stream().collect(Collectors.toMap(l->l.getId(),l -> l.getFormNumber()));
             //校验数据,开始桩号和结束桩号必须同时存在，清单编号必须存在数据，有清单编号必须填写分解量
             parseExcelFileToList.stream().forEach(l->{
-//                if ((StringUtils.isBlank(l.get("开始桩号")) && StringUtils.isNotBlank(l.get("结束桩号")))
-//                        || (StringUtils.isNotBlank("开始桩号") && StringUtils.isBlank(l.get("结束桩号")))){
-//                    throw new ServiceException("开始桩号和结束桩号必须同时存在，请修改后重新导入");
-//                }
                 if (StringUtils.isNotBlank(l.get("清单编号"))){
                     if (numberList.indexOf(l.get("清单编号")) == -1){
                         throw new ServiceException("合同段中不存在清单编号:"+l.get("清单编号")+"请检查后重新导入");
@@ -1940,6 +1936,8 @@ public class MeterTreeContractServiceImpl extends BaseServiceImpl<MeterTreeContr
                                 vo1.setRemarks(map.get("图册"));
                                 vo1.setContractPicture(map.get("图号"));
                                 vo1.setChangePicture(vo1.getContractPicture());
+                                vo1.setStartStake(map.get("开始桩号"));
+                                vo1.setEndStake(map.get("结束桩号"));
                                 UpdateIds.add(vo1.getId());
                             }
                             childList.add(vo1);
@@ -1968,6 +1966,8 @@ public class MeterTreeContractServiceImpl extends BaseServiceImpl<MeterTreeContr
                                     vo1.setRemarks(map.get("图册"));
                                     vo1.setContractPicture(map.get("图号"));
                                     vo1.setChangePicture(vo1.getContractPicture());
+                                    vo1.setStartStake(map.get("开始桩号"));
+                                    vo1.setEndStake(map.get("结束桩号"));
                                     UpdateIds.add(vo1.getId());
                                 }
                                 thisNode.add(vo1);