From 5952b7894b45e3f91a520dc23d8ba9498478a66e Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Tue, 11 Nov 2025 11:06:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=A0=E9=99=A4=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subContractor/entity/SubContractBean.java | 5 +- .../com/bonus/bmw/team/entity/TeamBean.java | 5 + .../SubContractor/SubContractMapper.xml | 7 +- .../SubContractor/SubContractorMapper.xml | 6 +- .../main/resources/mapper/team/TeamMapper.xml | 322 +++++++++--------- .../SubContract/SubContractList.js | 9 +- .../js/work/SubManage/certificateManage.js | 14 +- .../js/work/team/BasicMsg/TeamBasicList.js | 5 +- 8 files changed, 208 insertions(+), 165 deletions(-) diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subContractor/entity/SubContractBean.java b/modules/bmw/src/main/java/com/bonus/bmw/subContractor/entity/SubContractBean.java index 5d1679a..cea1fec 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/subContractor/entity/SubContractBean.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/subContractor/entity/SubContractBean.java @@ -39,6 +39,9 @@ public class SubContractBean { private String keyWord;//是否有效 - + /** + * 是否可以删除，0可以删除，1不能删除 + */ + private String isDel; } \ No newline at end of file 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 80fe4e8..0b9f346 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 @@ -52,4 +52,9 @@ public class TeamBean private String idNumbers; + /** + * 是否可以删除，0可以删除，1不能删除 + */ + private String isDel; + } diff --git a/modules/bmw/src/main/resources/mapper/SubContractor/SubContractMapper.xml b/modules/bmw/src/main/resources/mapper/SubContractor/SubContractMapper.xml index 75bbee1..7d92572 100644 --- a/modules/bmw/src/main/resources/mapper/SubContractor/SubContractMapper.xml +++ b/modules/bmw/src/main/resources/mapper/SubContractor/SubContractMapper.xml @@ -118,7 +118,11 @@ select count(1) from ( COUNT(DISTINCT bst.id) as teamNumber, COUNT(DISTINCT btur.id) as personNumber, COUNT(DISTINCT bsr2.id) as fileNumber, - GROUP_CONCAT(DISTINCT bsr2.`value`) as filePaths + GROUP_CONCAT(DISTINCT bsr2.`value`) as filePaths, + CASE + WHEN COUNT(bweh.id_number) > 0 THEN 1 + ELSE 0 + END AS isDel FROM bm_sub_contract bsc LEFT JOIN bm_subcontractor bs ON bs.id = bsc.sub_id and bs.is_active = '1' @@ -130,6 +134,7 @@ select count(1) from ( LEFT JOIN sys_user su ON su.id = bsr1.`value` and su.sub_id = bsc.sub_id and su.is_active = '1' LEFT JOIN bm_sub_team bst ON bst.id = bsr3.v and bst.is_active = '1' LEFT JOIN bm_team_user_relation btur ON btur.team_id = bst.id and btur.is_active = '1' and btur.id_number is not null + LEFT JOIN bm_worker_ein_history bweh ON bweh.sub_id = bsc.sub_id AND bweh.is_active='1' GROUP BY bsc.id diff --git a/modules/bmw/src/main/resources/mapper/SubContractor/SubContractorMapper.xml b/modules/bmw/src/main/resources/mapper/SubContractor/SubContractorMapper.xml index d771eab..635fff2 100644 --- a/modules/bmw/src/main/resources/mapper/SubContractor/SubContractorMapper.xml +++ b/modules/bmw/src/main/resources/mapper/SubContractor/SubContractorMapper.xml @@ -18,12 +18,16 @@ bs.seal_path as sealPath, bs.sign_path as signPath, count(DISTINCT bsc.sub_id) as subContractNum, - IF(bsc.sub_id IS NOT NULL, 1, 0) AS isDel + CASE + WHEN COUNT(bsc.id) > 0 OR COUNT(bst.id) > 0 THEN 1 + ELSE 0 + END AS isDel from bm_subcontractor bs LEFT JOIN pm_organization po ON po.id = bs.org_id and po.IS_ACTIVE = '1' LEFT JOIN bm_sub_contract bsc on bsc.sub_id = bs.id and bsc.is_active = '1' left join t_dict td on bs.major_id = td.id and td.is_active = '1' and td.type = 'sub_level' + left join bm_sub_team bst on bs.id = bst.sub_id and bst.is_active = '1' where bs.IS_ACTIVE = 1 diff --git a/modules/bmw/src/main/resources/mapper/team/TeamMapper.xml b/modules/bmw/src/main/resources/mapper/team/TeamMapper.xml index 12f86ec..362d715 100644 --- a/modules/bmw/src/main/resources/mapper/team/TeamMapper.xml +++ b/modules/bmw/src/main/resources/mapper/team/TeamMapper.xml @@ -3,180 +3,188 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - where bst.IS_ACTIVE = '1' - - and bst.sub_id = #{params.subId} - - - and ( - bs.sub_name like concat('%', #{params.keyWord}, '%') or - bw.name like concat('%', #{params.keyWord}, '%') - ) - + + where bst.IS_ACTIVE = '1' + + and bst.sub_id = #{params.subId} + + + and ( + bs.sub_name like concat('%', #{params.keyWord}, '%') or + bw.name like concat('%', #{params.keyWord}, '%') + ) + - + - - INSERT INTO `bm_team_user_relation` - (`team_id`, `id_number`,is_regular_person, `IS_ACTIVE`) VALUES (#{id},#{foremanIdNumber},'1','1') - + + INSERT INTO `bm_team_user_relation` + (`team_id`, `id_number`, is_regular_person, `IS_ACTIVE`) + VALUES (#{id}, #{foremanIdNumber}, '1', '1') + - - update `bm_sub_team` set - team_name = #{teamName},sub_id = #{subId}, - team_Idnumber = #{foremanIdNumber} where id = #{id} - + + update `bm_sub_team` + set team_name = #{teamName}, + sub_id = #{subId}, + team_Idnumber = #{foremanIdNumber} + where id = #{id} + - - update `bm_team_user_relation` set is_active = '0' where team_id = #{id} - + + update `bm_team_user_relation` + set is_active = '0' + where team_id = #{id} + - + - + SELECT + bst.id, + bst.team_name AS teamName, + bs.sub_name AS subName, + w.`name` as foreman, + w.id_number as foremanIdNumber, + w.phone as foremanPhone, + GROUP_CONCAT(bw1.id_number) AS idNumbers, + CASE + WHEN COUNT(bw1.id_number) > 0 THEN 1 + ELSE 0 + END AS isDel + FROM + `bm_sub_team` bst + LEFT JOIN bm_subcontractor bs ON bs.id = bst.sub_id and bs.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' + left join bm_team_user_relation man on man.team_id = bst.id and man.is_active = 1 and man.is_foreman = 1 + left join bm_worker w on w.id_number = man.id_number + + GROUP BY bst.id + order by bst.id desc limit #{offset}, #{limit} - + - + SELECT + bw.`name`, + bw.id_number AS idNumber, + bw.phone, + bst.team_name as teamName + FROM + `bm_worker` bw + LEFT JOIN bm_team_user_relation btur on btur.ID_NUMBER = bw.id_number and btur.is_active = '1' + + and btur.team_id != #{params.id} + + LEFT JOIN bm_sub_team bst ON btur.team_id = bst.id and bst.is_active = '1' + LEFT JOIN bm_subcontractor bs ON bs.id = bst.sub_id and bs.is_active = '1' + where bw.is_active = '1' + + and (bs.id = #{params.subId} or bs.id is null) + + + and bw.`name` like concat('%',#{params.keyWord},'%') + + + - + - + + SELECT COUNT(1) + from bm_team_user_relation btur + LEFT JOIN bm_worker bw ON bw.id_number = btur.id_number and bw.IS_ACTIVE = '1' + WHERE btur.team_id = #{id} + and bw.ein_status = '1' + and btur.is_active = '1' + - - - + + + - + - - update bm_sub_team - set is_active = '0' - WHERE ID = #{teamId} - - - update bm_team_user_relation - set is_active = '0' - WHERE team_id = #{teamId} - - - insert into bm_sub_team(team_name,sub_id,team_Idnumber) - values - (#{teamName},#{subId},#{foremanIdNumber}) - - - insert into bm_team_user_relation(team_id,id_number,is_regular_person) - values - - (#{param.teamId},#{param.idNumber},#{param.isRegularPerson}) - - + + update bm_sub_team + set is_active = '0' + WHERE ID = #{teamId} + + + update bm_team_user_relation + set is_active = '0' + WHERE team_id = #{teamId} + + + insert into bm_sub_team(team_name, sub_id, team_Idnumber) + values (#{teamName}, #{subId}, #{foremanIdNumber}) + + + insert into bm_team_user_relation(team_id,id_number,is_regular_person) + values + + (#{param.teamId},#{param.idNumber},#{param.isRegularPerson}) + + \ No newline at end of file diff --git a/modules/bmw/src/main/resources/static/js/work/SubContractor/SubContract/SubContractList.js b/modules/bmw/src/main/resources/static/js/work/SubContractor/SubContract/SubContractList.js index ee90c09..5cd80e8 100644 --- a/modules/bmw/src/main/resources/static/js/work/SubContractor/SubContract/SubContractList.js +++ b/modules/bmw/src/main/resources/static/js/work/SubContractor/SubContract/SubContractList.js @@ -139,13 +139,18 @@ function init() { "render": function (data, type, row) { var id = row['id']; var isComplete = row['isComplete']; + var isDel = row['isDel']; let html = ""; if (isComplete == "0") { html += buttonEditData(id, "sys:subContract:update", pers); html += buttonCompleteData(id, "sys:subContract:del", pers); - } - html += buttonDelData(id, "sys:subContract:del", pers); + }else{ + } + + if(isDel =="0" || isDel == 0){ + html += buttonDelData(id, "sys:subContract:del", pers); + } return html; } }, 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 901c81d..a8ace7b 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 @@ -174,12 +174,22 @@ function init() { "render": function (data, type, row) { var id = row['id']; var proStatus = row['examStatus']; + var status = row['status']; var html = ''; if(proStatus == '0'){ html += toBeFinished(id, "", pers); + if(status == '审核无效'){ + html += buttonEdits(id, "sys:project:add", pers); + html += buttonDel(id, "sys:project:del", pers); + } + }else{ + if(status == '有效'){ + + }else{ + html += buttonEdits(id, "sys:project:add", pers); + html += buttonDel(id, "sys:project:del", pers); + } } - html += buttonEdits(id, "sys:project:add", pers); - html += buttonDel(id, "sys:project:del", pers); return html; } } 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 59c6ccc..7dae200 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 @@ -108,9 +108,12 @@ function init() { "render": function (data, type, row) { var id = row['id']; var idNumbers = row['idNumbers']; + var isDel = row['isDel']; let html = ""; html += buttonEditData(id, "sys:teamBasic:update", pers); - html += buttonDelData(id, "sys:teamBasic:del", pers); + if(isDel == 0 || isDel == "0"){ + html += buttonDelData(id, "sys:teamBasic:del", pers); + } if(idNumbers == '' || idNumbers == null || idNumbers == 'null' || idNumbers == undefined || idNumbers == 'undefined'){ html += buttonSwitchSub(id, "sys:teamBasic:update", pers); }