储备项目新-政策处理信息表修改

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/xml/PolicyHandingMapper.xml

@@ -277,7 +277,7 @@
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                ORDER BY a.update_date DESC
+                ORDER BY a.update_date DESC,projectReserveId asc
             </otherwise>
         </choose>
     </select>
@@ -302,7 +302,7 @@
                 ${dataScope}
             </if>
         </where>
-        ORDER BY a.update_date DESC
+        ORDER BY a.update_date DESC,projectReserveId asc
     </select>
 
     <select id="get" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePolicyHand">

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/utils/ReserveProcessProjectProUtil.java

@@ -283,7 +283,7 @@ public class ReserveProcessProjectProUtil {
         int lastRow = importUtil.getLastDataRowNum();
         List<ReservePolicyHand> list = new ArrayList<ReservePolicyHand>();
         //项目储备编号唯一性判断
-        List<String> cbbhList = new ArrayList<>();
+//        List<String> cbbhList = new ArrayList<>();
 
         ReservePolicyHand reserveManagement = null;
         for(int i=2; i<=lastRow;i++){
@@ -323,8 +323,8 @@ public class ReserveProcessProjectProUtil {
                 reserveManagement.setElectricalPickListOpen((String) importUtil.getCellValue(row,46));
                 reserveManagement.setAdministrativeOfficeRemark((String) importUtil.getCellValue(row,47));
 
-
-                if (list.size() == 0){
+                list.add(reserveManagement);
+                /*if (list.size() == 0){
                     list.add(reserveManagement);
                     cbbhList.add(reserveManagement.getProjectReserveId());
                 }else {
@@ -332,7 +332,7 @@ public class ReserveProcessProjectProUtil {
                         list.add(reserveManagement);
                         cbbhList.add(reserveManagement.getProjectReserveId());
                     }
-                }
+                }*/
 
             }
         }