合同计量单元导入排序与显示顺序

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MeterTreeController.java

@@ -300,7 +300,7 @@ public class MeterTreeController extends BladeController {
                             "   WHERE b.parent_id = a.id AND b.is_deleted = 0 AND b.status = 1 AND b.template_id = " + templateId + ") AS notExsitChild" +
                             " FROM s_meter_tree_system a WHERE a.template_id = " + templateId +
                             " AND a.is_deleted = 0 AND a.status = 1 AND a.parent_id = " + id +
-                            " ORDER BY a.sort,a.create_time",
+                            " ORDER BY a.sort,a.id",
                     new BeanPropertyRowMapper<>(MeterTreeSystemTreeVO.class));
             return R.data(query);
         }
@@ -527,7 +527,7 @@ public class MeterTreeController extends BladeController {
                             "   WHERE b.parent_id = a.id AND b.is_deleted = 0 AND b.status = 1 AND b.project_id = " + projectId + ") AS notExsitChild" +
                             " FROM s_meter_tree_project a WHERE a.project_id = " + projectId +
                             " AND a.is_deleted = 0 AND a.status = 1 AND a.parent_id = " + id +
-                            " ORDER BY -a.sort desc,a.create_time",
+                            " ORDER BY sort ,a.id",
                     new BeanPropertyRowMapper<>(MeterTreeProjectTreeVO.class));
             return R.data(query);
         }
@@ -733,7 +733,7 @@ public class MeterTreeController extends BladeController {
                     " WHERE c.is_deleted = 0 AND c.contract_meter_id = a.id) AS isDecompositionData" +
                     " FROM s_meter_tree_contract a WHERE a.contract_id = " + contractId +
                     " AND a.is_deleted = 0 AND a.status = 1 AND a.parent_id = " + id +
-                    " ORDER BY -a.sort desc,a.create_time,a.node_name";
+                    " ORDER BY a.sort ,a.id";
             List<MeterTreeContractTreeVO> query = jdbcTemplate.query(sql,
                     new BeanPropertyRowMapper<>(MeterTreeContractTreeVO.class));
             return R.data(query);

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

@@ -95,7 +95,7 @@
                if((select count(1) from s_meter_tree_contract mtc2 where mtc2.project_id = #{projectId}
                     and mtc2.contract_id = #{contractId} and is_deleted = 0 and mtc2.parent_id = mtc1.id) = 0,'false','true') as hasChild
         from s_meter_tree_contract mtc1 where project_id = #{projectId} and contract_id = #{contractId} and is_deleted = 0
-        ORDER BY -mtc1.sort desc,mtc1.create_time,mtc1.node_name
+        ORDER BY mtc1.sort ,mtc1.id
     </select>
     <select id="getWBSTree" resultType="org.springblade.meter.vo.MeterFullTreeVO">
         select p_key_id,id, if(full_name is null,node_name,full_name) as node_name,parent_id,
@@ -175,7 +175,7 @@
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
-        ORDER BY -mtc.sort desc,mtc.create_time,mtc.node_name
+        ORDER BY sort,mtc.id
     </select>
     <select id="getParentNode" resultType="org.springblade.meter.vo.CopyMeterNodeVO">
         select id as newId,parent_id as newParentId,ancestor as newAncestors
@@ -186,7 +186,7 @@
         from s_meter_tree_contract mtc
         where mtc.contract_id = #{contractId} and mtc.is_deleted = 0
           and (mtc.id = #{id} or FIND_IN_SET(#{id}, mtc.ancestor))
-        ORDER BY -mtc.sort desc,mtc.create_time,mtc.node_name
+        ORDER BY sort ,mtc.id
     </select>
 
 

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

@@ -615,8 +615,13 @@ public class ContractInventoryFormServiceImpl extends BaseServiceImpl<ContractIn
     @Override
     public List<ContractFromVO> getNodeResolveForm(Long contractId, Long id) {
         List<ContractFromVO> vos = baseMapper.getNodeResolveForm(contractId, id);
+        Map<String, ContractFromVO> map = new HashMap<>();
         if (vos.size() > 1){
-            Map<String, ContractFromVO> map = vos.stream().collect(Collectors.toMap(ContractFromVO::getFormNumber, l -> l));
+            try {
+                map = vos.stream().collect(Collectors.toMap(ContractFromVO::getFormNumber, l -> l));
+            }catch (Exception e){
+                throw new ServiceException("当前计量单元下，存在挂载相同表单，请联系管理员");
+            }
             List<String> list = this.getAllFormNumberBySort(contractId);
             for (String s : map.keySet()) {
                 ContractFromVO vo = map.get(s);

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

@@ -2089,6 +2089,14 @@ public class MeterTreeContractServiceImpl extends BaseServiceImpl<MeterTreeContr
                 for (List<MeterImport3VO> voList : lists) {
                     baseMapper.batchSaveMeter(voList);
                 }
+//                int size = resultNodeAdd.size();
+//                for (int i = 0; i < size; i+=1000) {
+//                    List<MeterImport3VO> voList = new ArrayList<>();
+//                    if (i + 1000 < size) {
+//                        voList = resultNodeAdd.subList(i, (i + 1000));
+//                    }else {
+//                        voList = resultNodeAdd.subList(i, resultNodeAdd.size());
+//                    }
                 addNode += resultNodeAdd.size();
             }