全所统计

jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java

@@ -28,6 +28,10 @@ public interface constant {
      * 超级管理员
      */
     public static final String ADMIN="admin";
+    /**
+     * 企业信息维护人员
+     */
+    public static final String QYXXWHRY="qyxxwhry";
 
     /**
      * 用户角色(企业人员)

jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java

@@ -131,7 +131,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 		if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){
 			queryWrapper.like("project_name",payMailBillSearch.getProjectName());
 		}
-		queryWrapper.orderByDesc("create_time");
+
 		IPage<PayMailBill> pageList = payMailBillService.pageList(page, queryWrapper);
 		if (!CollectionUtils.isEmpty(pageList.getRecords())) {
 			try {

jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java

@@ -64,6 +64,7 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 								   HttpServletRequest req) {
 		QueryWrapper<PayMailBillList> queryWrapper = QueryGenerator.initQueryWrapper(payMailBillList, req.getParameterMap());
 		Page<PayMailBillList> page = new Page<>(pageNo, pageSize);
+		queryWrapper.orderByAsc("post_status");
 		queryWrapper.orderByDesc("pc.create_time");
 		IPage<PayMailBillList> pageList = payMailContractService.pageContract(page, queryWrapper);
 		return Result.OK(pageList);

jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml

@@ -58,5 +58,7 @@
 contact_name as contactName,contact_mobile as contactMobile,post_status as postStatus,send_method as sendMethod ,create_time from  pay_mail_bill pmb left join pay_mail_bill_project pmbp
 on(pmb.id=pmbp.bill_id)
  ${ew.customSqlSegment}
+group by pmb.id ORDER BY post_status ASC,create_time DESC
+
     </select>
 </mapper>