From 7dbda93b19443221bb414d9f7b3c3fed56ac802b Mon Sep 17 00:00:00 2001 From: itcast Date: Tue, 3 Feb 2026 17:58:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E8=B5=84=E8=B4=A8=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E5=8C=85=E8=B5=84=E8=B4=A8=E7=BB=9F=E8=AE=A1=EF=BC=8C?= =?UTF-8?q?=E7=8F=AD=E7=BB=84=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bmw/subcontract/entity/CertificateBean.java | 3 +++ .../entity/SubCertificateStatisticsBean.java | 3 +++ .../java/com/bonus/bmw/team/entity/TeamBean.java | 3 +++ .../mapper/subcontract/CertificateMapper.xml | 7 ++++++- .../SubCertificateStatisticsMapper.xml | 7 +++++++ .../src/main/resources/mapper/team/TeamMapper.xml | 8 ++++++++ .../static/js/work/SubManage/certificateManage.js | 12 ++++++++++-- .../js/work/SubManage/subCertificateStatistics.js | 15 ++++++++++++--- .../static/js/work/team/BasicMsg/TeamBasicList.js | 11 ++++++++++- .../pages/work/SubManage/CertificateManage.html | 8 ++++++++ .../work/SubManage/subCertificateStatistics.html | 8 ++++++++ .../pages/work/team/BasicMsg/TeamBasicList.html | 9 ++++++++- 12 files changed, 86 insertions(+), 8 deletions(-) diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subcontract/entity/CertificateBean.java b/modules/bmw/src/main/java/com/bonus/bmw/subcontract/entity/CertificateBean.java index afacce4..8bdc5f3 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/subcontract/entity/CertificateBean.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/subcontract/entity/CertificateBean.java @@ -12,6 +12,9 @@ public class CertificateBean { private Integer subId; //分包商ID private String subName; //分包商名称 + private Integer proId; //工程ID + private String proName; //工程名称 + private String legal; //法人 private String remark; //备注 diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subcontract/entity/SubCertificateStatisticsBean.java b/modules/bmw/src/main/java/com/bonus/bmw/subcontract/entity/SubCertificateStatisticsBean.java index f57ea1a..e2ae387 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/subcontract/entity/SubCertificateStatisticsBean.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/subcontract/entity/SubCertificateStatisticsBean.java @@ -10,6 +10,9 @@ public class SubCertificateStatisticsBean { private String startTime; private String stopTime; + private Integer proId; //工程ID + private String proName; //工程名称 + private String subName; //分包商名称 private String legalName; //法人 private String tradeCertificate; //营业执照 diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/entity/TeamBean.java b/modules/bmw/src/main/java/com/bonus/bmw/team/entity/TeamBean.java index 0b9f346..983a468 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/team/entity/TeamBean.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/team/entity/TeamBean.java @@ -30,6 +30,9 @@ public class TeamBean /** 分包商名称 */ private String subName; + private Integer proId; //工程ID + private String proName; //工程名称 + private String foreman; private String foremanIdNumber; diff --git a/modules/bmw/src/main/resources/mapper/subcontract/CertificateMapper.xml b/modules/bmw/src/main/resources/mapper/subcontract/CertificateMapper.xml index 1778702..d1b2f70 100644 --- a/modules/bmw/src/main/resources/mapper/subcontract/CertificateMapper.xml +++ b/modules/bmw/src/main/resources/mapper/subcontract/CertificateMapper.xml @@ -37,7 +37,7 @@ SELECT bst.id, + bp.`name` as proName, bst.team_name AS teamName, bs.sub_name AS subName, w.`name` as foreman, @@ -63,6 +69,8 @@ FROM `bm_sub_team` bst LEFT JOIN bm_subcontractor bs ON bs.id = bst.sub_id and bs.is_active = '1' + LEFT JOIN bm_sub_contract bsct1 on bsct1.sub_id = bs.id + LEFT JOIN bm_project bp ON bp.id = bsct1.pro_id and bp.is_active = '1' LEFT JOIN `bm_worker` bw ON bw.id_number = bst.team_Idnumber AND bs.is_active = '1' LEFT JOIN bm_team_user_relation btur ON btur.team_id = bst.id AND btur.is_active = '1' LEFT JOIN bm_worker bw1 ON bw1.id_number = btur.id_number AND bw1.IS_ACTIVE = '1' AND bw1.ein_status = '1' diff --git a/modules/bmw/src/main/resources/static/js/work/SubManage/certificateManage.js b/modules/bmw/src/main/resources/static/js/work/SubManage/certificateManage.js index a8ace7b..925ff39 100644 --- a/modules/bmw/src/main/resources/static/js/work/SubManage/certificateManage.js +++ b/modules/bmw/src/main/resources/static/js/work/SubManage/certificateManage.js @@ -7,7 +7,7 @@ layui.use(['layer', 'form'], function () { // getPro(form, data.value); }); getCerSub(""); - + getProByOrgId("","",""); init(); pers = checkPermission(); $("#searchBt").click(function () { @@ -41,7 +41,7 @@ function init() { d.subId = $("#subId").val(); d.status = $("#status").val(); // d.companyId = $("#companyId").val(); - // d.proId = $("#proId").val(); + d.proId = $("#proId").val(); // d.proStatus = $("#status").find("option:selected").val(); }, "error": function (xhr, textStatus, errorThrown) { @@ -101,6 +101,14 @@ function init() { return c; } }, + //{"data": "proName","width":"10%"}, + { + "data": "proName", + "width": "10%", + "render": function (data, type, row) { + return (data && data.trim()) ? data.trim() : "未绑定合同"; + } + }, {"data": "subName","width":"10%"}, {"data": "legal","width":"5%"}, {"data": "name","width":"8%"}, diff --git a/modules/bmw/src/main/resources/static/js/work/SubManage/subCertificateStatistics.js b/modules/bmw/src/main/resources/static/js/work/SubManage/subCertificateStatistics.js index 9c6ff2b..478f762 100644 --- a/modules/bmw/src/main/resources/static/js/work/SubManage/subCertificateStatistics.js +++ b/modules/bmw/src/main/resources/static/js/work/SubManage/subCertificateStatistics.js @@ -8,6 +8,7 @@ layui.use(['layer', 'form'], function () { }); getCertificateSub() + getProByOrgId("","",""); init(); pers = checkPermission(); @@ -39,6 +40,7 @@ function init() { "data": function (d) { d.keyWord = $("#keyWord").val(); d.certificateName = $("#certificateName").val() + d.proId = $("#proId").val(); }, "error": function (xhr, textStatus, errorThrown) { var msg = xhr.responseText; @@ -97,6 +99,13 @@ function init() { return c; } }, + { + "data": "proName", + "width": "8%", + "render": function (data, type, row) { + return (data && data.trim()) ? data.trim() : "未绑定合同"; + } + }, {"data": "subName","width":"8%"}, {"data": "legalName","width":"5%"}, { @@ -115,7 +124,7 @@ function init() { return html; } }, - {"data": "tradeExpirationDate","width":"15%"}, + {"data": "tradeExpirationDate","width":"10%"}, { "data": "", "width":"5%", @@ -153,7 +162,7 @@ function init() { return html; } }, - {"data": "aptitudeExpirationDate","width":"15%"}, + {"data": "aptitudeExpirationDate","width":"10%"}, { "data": "", "width":"5%", @@ -191,7 +200,7 @@ function init() { return html; } }, - {"data": "safeExpirationDate","width":"15%"}, + {"data": "safeExpirationDate","width":"10%"}, { "data": "", "width":"5%", diff --git a/modules/bmw/src/main/resources/static/js/work/team/BasicMsg/TeamBasicList.js b/modules/bmw/src/main/resources/static/js/work/team/BasicMsg/TeamBasicList.js index 7dae200..2d253af 100644 --- a/modules/bmw/src/main/resources/static/js/work/team/BasicMsg/TeamBasicList.js +++ b/modules/bmw/src/main/resources/static/js/work/team/BasicMsg/TeamBasicList.js @@ -9,6 +9,7 @@ layui.use(['form','layer'], function () { example.ajax.reload(); }); getCerSub(""); + getProByOrgId("","",""); init(); }); @@ -28,6 +29,7 @@ function init() { "data": function (d) { d.subId = $('#subId').val(); d.keyWord = $('#keyWord').val(); + d.proId = $('#proId').val(); }, "error": function (xhr, textStatus, errorThrown) { var msg = xhr.responseText; @@ -95,8 +97,15 @@ function init() { return c; } }, - {"data": "teamName", "defaultContent": "","width":"4%"}, + { + "data": "proName", + "width": "5%", + "render": function (data, type, row) { + return (data && data.trim()) ? data.trim() : "未绑定合同"; + } + }, {"data": "subName", "defaultContent": "","width":"5%"}, + {"data": "teamName", "defaultContent": "","width":"4%"}, {"data": "foreman","orderable": false, "defaultContent": "","width":"4%"}, {"data": "foremanIdNumber","orderable": false, "defaultContent": "","width":"8%"}, {"data": "foremanPhone","orderable": false, "defaultContent": "","width":"9%"}, diff --git a/modules/bmw/src/main/resources/static/pages/work/SubManage/CertificateManage.html b/modules/bmw/src/main/resources/static/pages/work/SubManage/CertificateManage.html index 3f2afe7..1d1bf2d 100644 --- a/modules/bmw/src/main/resources/static/pages/work/SubManage/CertificateManage.html +++ b/modules/bmw/src/main/resources/static/pages/work/SubManage/CertificateManage.html @@ -36,6 +36,13 @@ +
+
+ 工程： + +
+
+ @@ -92,6 +99,7 @@ 序号 + 工程名称 分包商名称 法人 证件名称 diff --git a/modules/bmw/src/main/resources/static/pages/work/SubManage/subCertificateStatistics.html b/modules/bmw/src/main/resources/static/pages/work/SubManage/subCertificateStatistics.html index 8407f1b..b94188a 100644 --- a/modules/bmw/src/main/resources/static/pages/work/SubManage/subCertificateStatistics.html +++ b/modules/bmw/src/main/resources/static/pages/work/SubManage/subCertificateStatistics.html @@ -36,6 +36,13 @@ +
+
+ 工程： + +
+
+