diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamSetUpController.java b/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamSetUpController.java index c463b44..5fcb681 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamSetUpController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamSetUpController.java @@ -88,5 +88,15 @@ public class NoSignalTeamSetUpController { } return list; } + + @PostMapping("delNoSignalTeam") + @Log(title = "根据id信号班组", businessType = BusinessType.INSERT) + @RequiresPermissions("sys:noSignalTeamSetUp:del") + public R delNoSignalTeam(NoSignalTeamSetUpBean bean){ + Long userId = SecurityUtils.getLoginUser().getSysUser().getUserId(); + bean.setUploadId(userId.toString()); + int result = service.delNoSignalTeam(bean); + return result > 0 ? R.ok(null,"删除成功") : R.fail(null,"删除失败"); + } } diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/dao/NoSignalTeamSetUpDao.java b/modules/bmw/src/main/java/com/bonus/bmw/team/dao/NoSignalTeamSetUpDao.java index d340d12..4eb0c6d 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/team/dao/NoSignalTeamSetUpDao.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/team/dao/NoSignalTeamSetUpDao.java @@ -1,5 +1,6 @@ package com.bonus.bmw.team.dao; +import com.bonus.bmw.team.entity.NoSignalTeamAttendBean; import com.bonus.bmw.team.entity.NoSignalTeamSetUpBean; import org.apache.ibatis.annotations.*; import org.springframework.stereotype.Repository; @@ -22,6 +23,10 @@ public interface NoSignalTeamSetUpDao { List getNoSignalTeam(NoSignalTeamSetUpBean bean); + int delNoSignalTeam(NoSignalTeamSetUpBean bean); + + List getPersonList(String id); + /* TeamBean getById(Long id); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/service/NoSignalTeamSetUpService.java b/modules/bmw/src/main/java/com/bonus/bmw/team/service/NoSignalTeamSetUpService.java index 9957e4c..04fbc8e 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/team/service/NoSignalTeamSetUpService.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/team/service/NoSignalTeamSetUpService.java @@ -17,6 +17,8 @@ public interface NoSignalTeamSetUpService { int updNoSignalTeam(NoSignalTeamSetUpBean bean); + int delNoSignalTeam(NoSignalTeamSetUpBean bean); + /* int deleteTeamManager(TeamManagerBean bean); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/service/NoSignalTeamSetUpServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/team/service/NoSignalTeamSetUpServiceImpl.java index db21d02..96f62eb 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/team/service/NoSignalTeamSetUpServiceImpl.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/team/service/NoSignalTeamSetUpServiceImpl.java @@ -1,11 +1,14 @@ package com.bonus.bmw.team.service; +import com.bonus.bmw.team.dao.NoSignalTeamAttendDao; import com.bonus.bmw.team.dao.NoSignalTeamSetUpDao; +import com.bonus.bmw.team.entity.NoSignalTeamAttendBean; import com.bonus.bmw.team.entity.NoSignalTeamSetUpBean; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -15,6 +18,9 @@ public class NoSignalTeamSetUpServiceImpl implements NoSignalTeamSetUpService{ @Resource(name = "noSignalTeamSetUpDao") private NoSignalTeamSetUpDao dao; + @Resource(name = "noSignalTeamAttendDao") + private NoSignalTeamAttendDao noSignalTeamAttendDao; + @Override public int getCount(Map params) { return dao.getCount(params); @@ -29,11 +35,18 @@ public class NoSignalTeamSetUpServiceImpl implements NoSignalTeamSetUpService{ public int addNoSignalTeam(NoSignalTeamSetUpBean bean) { int msg = 0; List list = new ArrayList(); + List beanList = new ArrayList(); try{ //查询班组是否已经设置 (重复条件,同一分包、同一工程、同一班组,有效期未过期) list = dao.getNoSignalTeam(bean); if(list.size() <= 0){ msg = dao.addNoSignalTeam(bean); + //同步新增班组人员 + beanList = dao.getPersonList(bean.getId()); + for (NoSignalTeamAttendBean noSignalTeamAttendBean:beanList) { + noSignalTeamAttendBean.setTeamId(bean.getId()); + noSignalTeamAttendDao.addPerson(noSignalTeamAttendBean); + } } }catch (Exception e){ e.printStackTrace(); @@ -51,4 +64,9 @@ public class NoSignalTeamSetUpServiceImpl implements NoSignalTeamSetUpService{ return dao.updNoSignalTeam(bean); } + @Override + public int delNoSignalTeam(NoSignalTeamSetUpBean bean) { + return dao.delNoSignalTeam(bean); + } + } diff --git a/modules/bmw/src/main/resources/mapper/team/NoSignalTeamSetUpMapper.xml b/modules/bmw/src/main/resources/mapper/team/NoSignalTeamSetUpMapper.xml index 856d18a..4b8b794 100644 --- a/modules/bmw/src/main/resources/mapper/team/NoSignalTeamSetUpMapper.xml +++ b/modules/bmw/src/main/resources/mapper/team/NoSignalTeamSetUpMapper.xml @@ -2,7 +2,7 @@ - + INSERT INTO bm_no_signal_team ( @@ -41,6 +41,9 @@ update_time = NOW() WHERE ID = #{id} + + update bm_no_signal_team set is_active='0' where id = #{id} + - \ No newline at end of file + + diff --git a/modules/bmw/src/main/resources/static/js/work/Person/InOutSpace/BatchOutApplyView.js b/modules/bmw/src/main/resources/static/js/work/Person/InOutSpace/BatchOutApplyView.js index 85513a5..f0fc879 100644 --- a/modules/bmw/src/main/resources/static/js/work/Person/InOutSpace/BatchOutApplyView.js +++ b/modules/bmw/src/main/resources/static/js/work/Person/InOutSpace/BatchOutApplyView.js @@ -233,7 +233,8 @@ function setInOutData(data) { elem: '#exitSignPath' + layTableIndexSigns[i], url: fileUrl + '/file/upload', multiple: true, //是否允许多文件上传,默认未false - accept: 'images', + exts: 'jpg|png|jpeg|pdf', + //accept: 'images', auto: true, //是否自动上传 ,默认为true max: 1, //最大上传数量 bindAction: '#exitSignPath' + layTableIndexSigns[i], //绑定的按钮 @@ -282,7 +283,7 @@ function setInOutData(data) { elem: '#exitProvePath' + layTableIndexProves[i], url: fileUrl + '/file/upload', multiple: false, //是否允许多文件上传,默认未false - exts: 'pdf', + exts: 'jpg|png|jpeg|pdf', auto: true, //是否自动上传 ,默认为true max: 1, //最大上传数量 bindAction: '#exitProvePath' + layTableIndexProves[i], //绑定的按钮 @@ -323,7 +324,7 @@ function setInOutData(data) { elem: '#salaryApplicationPath' + layTableIndexSalaryApplication[i], url: fileUrl + '/file/upload', multiple: false, //是否允许多文件上传,默认未false - exts: 'pdf', + exts: 'jpg|png|jpeg|pdf', auto: true, //是否自动上传 ,默认为true max: 1, //最大上传数量 bindAction: '#salaryApplicationPath' + layTableIndexSalaryApplication[i], //绑定的按钮 diff --git a/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamSetUpList.js b/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamSetUpList.js index 1aaafa9..08b33e4 100644 --- a/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamSetUpList.js +++ b/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamSetUpList.js @@ -155,7 +155,12 @@ function init(){ html += buttonUpdate(id, "sys:noSignalTeamSetUp:update", pers); } } + + if(state == '已失效'){ + html += buttonDel(id, "sys:noSignalTeamSetUp:del", pers); + } return html; + } } @@ -282,3 +287,46 @@ function updateView(id) { } }) } + +function buttonDel(id, permission, pers) { + if (permission != "") { + if ($.inArray(permission, pers) < 0) { + return ""; + } + } + var btn = $(""); + return btn.prop("outerHTML"); +} + +/** + * 删除 + * */ +function delView(id) { + $.ajax({ + type: 'post', + contentType: "application/x-www-form-urlencoded", + url: ctxPath + '/NoSignalTeamSetUp/delNoSignalTeam', + data: { + id: id + }, + dataType: 'json', + success: function (data) { + layer.msg("删除成功",{icon:1}); + setTimeout(function() { + window.location.reload(); + }, 500); + }, error: function () { + layer.msg("删除失败",{icon:1}); + } + + }) +} + +/** + * 关闭页面 刷新页面 + */ +function reloading() { + var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 + window.parent.location.reload(); +}