发货管理排序需求优化

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PreparationMoneyMapper.xml

@@ -37,7 +37,7 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
                 and hygf_preparation_money.delivery_time between #{dto.deliveryTimeStart} and #{dto.deliveryTimeEnd}
             </if>
         </where>
-        ORDER BY rec_date DESC
+        ORDER BY hygf_preparation_money.sequence_nbr DESC
     </select>
 
     <select id="preparationStation" resultType="java.util.Map">
@@ -82,7 +82,13 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
         </if>
         </where>
         GROUP BY  hygf_peasant_household.sequence_nbr
-        order by hygf_peasant_household.sequence_nbr DESC ) b
+        <if test=" preparationMoneyState == 1 ">
+            order by hygf_preparation_money.delivery_time  DESC
+       </if>
+        <if test=" preparationMoneyState == 0 ">
+            order by hygf_peasant_household.sequence_nbr DESC
+        </if>
+        ) b
 
 </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

@@ -1086,6 +1086,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             up.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.待补货.getName());
             up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.待补货.getName());
             up.in(BaseEntity::getSequenceNbr,collect);
+            preparationMoney.setDeliveryTime(null);
             peasantHouseholdMapper.update(null,up);
         }else {
             preparationMoney.setOrderStatus(DeliveryStateeEnum.待确认.getName());

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/application.properties

-spring.application.name=AMOS-JXIOP-ANALYSE-WJ
+spring.application.name=AMOS-JXIOP-ANALYSE-CZ
 server.servlet.context-path=/jxiop-analyse
 server.port=33400
 server.uri-encoding=UTF-8