收储样例实际3

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/StorageServiceImpl.java

@@ -118,7 +118,11 @@ public class StorageServiceImpl {
                     vo.setDateType("3");
                 }
                 vo.setNodeId(item.getNodeId());
-                vo.setSupplyMethod(item.getGyfs());
+                if(StringUtils.isBlank(item.getProjectId())){
+                    vo.setSupplyMethod("收购");
+                }else {
+                    vo.setSupplyMethod(item.getGyfs());
+                }
                 vo.setGeom(item.getGeom());
                 vo.setYear(item.getGysj());
                 vo.setArea(String.valueOf(item.getMjMu()));

siwei-modules/siwei-apply/src/main/resources/mapper/GjShijiShouchuMapper.xml

@@ -179,6 +179,7 @@
         <if test="endTime != null and endTime != ''">
             AND scsj &lt;= #{endTime}
         </if>
+        order BY "项目名"
     </select>
 
 </mapper>