diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 4d1d47d0..c2967584 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -1061,7 +1061,6 @@ public class DepositoryRecordController { list = depositoryRecordService.findApplicationOutRecordPByUser(userByPort, map, userKey, token); countBy = depositoryRecordService.findApplicationOutRecordPCountByUser(userByPort, map); } - for (ApplicationOutRecordP outRecordP : list) { // 根据主订单获取所有子订单 List applicationOutMinByParentId = depositoryRecordService.findApplicationOutMinByParentId(outRecordP.getId()); @@ -1157,6 +1156,7 @@ public class DepositoryRecordController { outRecordP.setPrice(sumPrice); outRecordP.setMnameStringList(mnameForMobiles); } + return new RestResponse(list, countBy, 200); } diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index bf25e294..d3b81997 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -639,7 +639,7 @@ GROUP BY aorid - ORDER BY pass DESC, applicantTime desc + ORDER BY pass DESC,depositoryManagerPass asc, applicantTime desc ORDER BY applicantTime desc @@ -662,7 +662,7 @@ select from applicationOutRecordInfo - where 1 = 1 + where 1 = 1 and mid is not and ( depositoryId in @@ -705,7 +705,12 @@ GROUP BY aorid - order by applicantTime desc + + ORDER BY pass DESC,depositoryManagerPass asc, applicantTime desc + + + ORDER BY applicantTime desc + LIMIT #{begin},#{size} @@ -715,7 +720,7 @@ select count(DISTINCT aorid) from applicationOutRecordInfo - where 1 = 1 + where 1 = 1 and mid is not and ( depositoryId in @@ -924,7 +929,7 @@ select count(DISTINCT aorid) from applicationOutRecordInfo - where 1 = 1 + where 1 = 1 and mid is not and aorid = #{id} diff --git a/src/main/resources/templates/pages/depository/table-out.html b/src/main/resources/templates/pages/depository/table-out.html index 738bf05b..480c1bcc 100644 --- a/src/main/resources/templates/pages/depository/table-out.html +++ b/src/main/resources/templates/pages/depository/table-out.html @@ -364,6 +364,7 @@ if (data.version !== '') { req.version = data.version.trim(); } + req.groupByForState = true; //执行搜索重载 table.reloadData('currentTableId', { url: '/depositoryRecord/applicationOutView', diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index bf25e294..d3b81997 100644 --- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -639,7 +639,7 @@ GROUP BY aorid - ORDER BY pass DESC, applicantTime desc + ORDER BY pass DESC,depositoryManagerPass asc, applicantTime desc ORDER BY applicantTime desc @@ -662,7 +662,7 @@ select from applicationOutRecordInfo - where 1 = 1 + where 1 = 1 and mid is not and ( depositoryId in @@ -705,7 +705,12 @@ GROUP BY aorid - order by applicantTime desc + + ORDER BY pass DESC,depositoryManagerPass asc, applicantTime desc + + + ORDER BY applicantTime desc + LIMIT #{begin},#{size} @@ -715,7 +720,7 @@ select count(DISTINCT aorid) from applicationOutRecordInfo - where 1 = 1 + where 1 = 1 and mid is not and ( depositoryId in @@ -924,7 +929,7 @@ select count(DISTINCT aorid) from applicationOutRecordInfo - where 1 = 1 + where 1 = 1 and mid is not and aorid = #{id} diff --git a/target/classes/templates/pages/depository/table-in.html b/target/classes/templates/pages/depository/table-in.html index fcd67de6..42f63750 100644 --- a/target/classes/templates/pages/depository/table-in.html +++ b/target/classes/templates/pages/depository/table-in.html @@ -318,7 +318,8 @@ layer.msg("未选中记录，请确认！"); return false; } - } else if (obj.event === 'showEchart') { + } + else if (obj.event === 'showEchart') { let listItem = `
  • 查看面积图
  • 查看旭日图
    • diff --git a/target/classes/templates/pages/depository/table-out.html b/target/classes/templates/pages/depository/table-out.html index d3a27288..480c1bcc 100644 --- a/target/classes/templates/pages/depository/table-out.html +++ b/target/classes/templates/pages/depository/table-out.html @@ -364,6 +364,7 @@ if (data.version !== '') { req.version = data.version.trim(); } + req.groupByForState = true; //执行搜索重载 table.reloadData('currentTableId', { url: '/depositoryRecord/applicationOutView', @@ -477,8 +478,17 @@ return false; } } - else if(obj.event === 'showEchart'){ - + else if (obj.event === 'showEchart') { + let listItem = `
      +
    • 查看面积图
      • +
    • 查看旭日图
      • +
    `; + + $("#showEchart").append(listItem) + }else if(obj.event === 'showLineEchart'){ + console.log("showLineEchart") + }else if(obj.event === "showSunburstEchart"){ + console.log("showSunburstEchart") } }); diff --git a/target/classes/templates/pages/depository/table-stock.html b/target/classes/templates/pages/depository/table-stock.html index 071999d8..61ae6e5c 100644 --- a/target/classes/templates/pages/depository/table-stock.html +++ b/target/classes/templates/pages/depository/table-stock.html @@ -467,8 +467,17 @@ } else if (obj.event === 'downloadFile') { window.open("/download/inventoryImportDownload", "_self"); } - else if(obj.event === 'showEchart'){ - + else if (obj.event === 'showEchart') { + let listItem = `
      +
    • 查看面积图
      • +
    • 查看旭日图
      • +
    `; + + $("#showEchart").append(listItem) + }else if(obj.event === 'showLineEchart'){ + console.log("showLineEchart") + }else if(obj.event === "showSunburstEchart"){ + console.log("showSunburstEchart") } });