海南加排序

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hwpayment/mapper/xml/HwPaymentDetailMapper.xml

@@ -571,7 +571,7 @@
 			</if>
 
         </where>
-
+		ORDER BY a.payment_time DESC,a.id asc
     </select>
 
 	<select id="pageInvoiceDetailList" resultType="org.jeecg.modules.hwpayment.entity.HwPaymentDetail" >
@@ -596,6 +596,6 @@
 			</if>
 
 		</where>
-
+		ORDER BY a.payment_time DESC,a.id asc
 	</select>
 </mapper>

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hwsupervise/controller/HwTaxPaymentController.java

@@ -57,6 +57,7 @@ public class HwTaxPaymentController {
 	 * @return
 	 */
 	@GetMapping(value = "/list")
+    @PermissionData(pageComponent = "hwsupervise/HwHainanUserInfoList")
 	public Result<IPage<HwTaxPayment>> queryPageList(HwTaxPayment hwTaxPayment,
 									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hwsupervise/mapper/xml/HwTaxPaymentMapper.xml

@@ -44,6 +44,8 @@
         inner join hw_payment  hp on hp.tax_payment_id=a.id
         inner join hw_payment_detail hpd on hp.id=hpd.payment_id
         inner join hw_user hu on hu.id=hpd.user_id
+        inner JOIN hw_order o ON o.id = hpd.order_id
+        inner JOIN hw_requirement r ON r.id = o.requirement_id
         <where>
             ${ew.sqlSegment}
             and hpd.user_id=#{hwTaxPayment.userId}
@@ -51,7 +53,7 @@
                 and hpd.payment_result_time between #{hwTaxPayment.paymentResultTime_begin} and #{hwTaxPayment.paymentResultTime_end}
             </if>
         </where>
-        group by a.id
+        group by  a.upload_time desc ,a.id asc
     </select>