权限管理
This commit is contained in:
parent
81f4b8347c
commit
5830c60d9e
|
|
@ -2,6 +2,7 @@ package com.bonus.bmw.controller;
|
|||
|
||||
import com.bonus.bmw.domain.dto.FileBasicMsgDto;
|
||||
import com.bonus.bmw.domain.dto.WebFileDto;
|
||||
import com.bonus.bmw.domain.po.BmSubContract;
|
||||
import com.bonus.bmw.domain.po.PmSubTeamContract;
|
||||
import com.bonus.bmw.service.PmSubTeamContractService;
|
||||
import com.bonus.common.core.utils.json.FastJsonHelper;
|
||||
|
|
@ -15,6 +16,7 @@ import com.bonus.common.security.annotation.InnerAuth;
|
|||
import com.bonus.common.security.annotation.RequiresPermissions;
|
||||
import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
|
|
@ -22,6 +24,7 @@ import javax.annotation.Resource;
|
|||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @author 马三炮
|
||||
|
|
@ -108,4 +111,20 @@ public class PmSubTeamContractController extends BaseController {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取班组人员出入场信息
|
||||
*/
|
||||
/*@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pm:company:del"))*/
|
||||
@PostMapping("/getPeoNum")
|
||||
@SysLog(title = "分包班组入场信息", businessType = OperaType.UPDATE, logType = 0, module = "分包班组入场信息->获取班组人员出入场信息")
|
||||
public AjaxResult getPeoNum(@Validated @RequestBody BmSubContract bmSubContract) {
|
||||
try {
|
||||
Map<String, Object> res = pmSubTeamContractService.getPeoNum(bmSubContract);
|
||||
return success(res);
|
||||
} catch (Exception e) {
|
||||
logger.error(e.toString(), e);
|
||||
}
|
||||
return error("系统异常,请联系管理员");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.bonus.bmw.mapper;
|
||||
|
||||
import com.bonus.bmw.domain.po.BmSubContract;
|
||||
import com.bonus.bmw.domain.po.PmSubTeamContract;
|
||||
import com.bonus.bmw.domain.vo.PmWorker;
|
||||
|
||||
|
|
@ -29,4 +30,6 @@ public interface PmSubTeamContractMapper {
|
|||
int addSubTeamContract(PmSubTeamContract pmSubTeamContract);
|
||||
|
||||
List<PmWorker> getPmWorkerByTeamId(Integer id);
|
||||
|
||||
Integer countProNum(BmSubContract bmSubContract);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
package com.bonus.bmw.service;
|
||||
|
||||
import com.bonus.bmw.domain.dto.FileBasicMsgDto;
|
||||
import com.bonus.bmw.domain.po.BmSubContract;
|
||||
import com.bonus.bmw.domain.po.PmSubTeamContract;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface PmSubTeamContractService {
|
||||
|
||||
|
|
@ -21,4 +23,6 @@ public interface PmSubTeamContractService {
|
|||
* 分包班组信息入场详情
|
||||
*/
|
||||
PmSubTeamContract getSubTeamContractById(PmSubTeamContract pmSubTeamContract);
|
||||
|
||||
Map<String, Object> getPeoNum(BmSubContract bmSubContract);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import com.bonus.bmw.domain.po.PmAttDevice;
|
|||
import com.bonus.bmw.domain.vo.PmAttDeviceVo;
|
||||
import com.bonus.bmw.mapper.PmAttDeviceMapper;
|
||||
import com.bonus.bmw.service.PmAttDeviceService;
|
||||
import com.bonus.common.core.constant.SecurityConstants;
|
||||
import com.bonus.common.core.utils.StringUtils;
|
||||
import com.bonus.common.redis.service.RedisService;
|
||||
import com.bonus.common.security.utils.SecurityUtils;
|
||||
|
|
@ -59,14 +60,14 @@ public class PmAttDeviceServiceImpl implements PmAttDeviceService {
|
|||
pmAttDevice.setUpdateUser(SecurityUtils.getLoginUser().getUsername());
|
||||
pmAttDevice.setUpdateTime(new Date());
|
||||
//新增考勤机触发
|
||||
remoteUrkUtilsService.getUserSendToDev(pmAttDevice.getDeviceCode(),pmAttDevice.getProId(),null);
|
||||
remoteUrkUtilsService.getUserSendToDev(pmAttDevice.getDeviceCode(),pmAttDevice.getProId()==null?-1:pmAttDevice.getProId(), SecurityConstants.INNER);
|
||||
return pmAttDeviceMapper.addPmAttDevice(pmAttDevice);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public int updatePmAttDevice(PmAttDevice pmAttDevice) {
|
||||
pmAttDevice.setUpdateUser(SecurityUtils.getUsername());
|
||||
pmAttDevice.setUpdateUser(SecurityUtils.getLoginUser().getUsername());
|
||||
pmAttDevice.setUpdateTime(new Date());
|
||||
//解绑的时候在历史表插入一条数据
|
||||
if (StringUtils.isNull(pmAttDevice.getProId())){
|
||||
|
|
@ -77,7 +78,10 @@ public class PmAttDeviceServiceImpl implements PmAttDeviceService {
|
|||
pmAttDeviceOld.setCreateTime(new Date());
|
||||
pmAttDeviceMapper.addPmAttDeviceHis(pmAttDeviceOld);
|
||||
//考勤机解绑
|
||||
remoteUrkUtilsService.delDevByProId(pmAttDevice.getDeviceCode(),pmAttDeviceOld.getProId(),null);
|
||||
remoteUrkUtilsService.delDevByProId(pmAttDevice.getDeviceCode(),pmAttDeviceOld.getProId()==null?-1:pmAttDeviceOld.getProId(),SecurityConstants.INNER);
|
||||
}else {
|
||||
//新增考勤机触发
|
||||
remoteUrkUtilsService.getUserSendToDev(pmAttDevice.getDeviceCode(),pmAttDevice.getProId()==null?-1:pmAttDevice.getProId(), SecurityConstants.INNER);
|
||||
}
|
||||
return pmAttDeviceMapper.updatePmAttDevice(pmAttDevice);
|
||||
}
|
||||
|
|
@ -87,7 +91,7 @@ public class PmAttDeviceServiceImpl implements PmAttDeviceService {
|
|||
int res = pmAttDeviceMapper.delPmAttDevice(pmAttDevice);
|
||||
PmAttDevice pmAttDeviceOld = pmAttDeviceMapper.getPmAttDeviceByCoode(pmAttDevice);
|
||||
//考勤机解绑
|
||||
remoteUrkUtilsService.delDevByProId(pmAttDevice.getDeviceCode(),pmAttDeviceOld.getProId(),null);
|
||||
remoteUrkUtilsService.delDevByProId(pmAttDevice.getDeviceCode(),pmAttDeviceOld.getProId()==null?-1:pmAttDeviceOld.getProId(),SecurityConstants.INNER);
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.bonus.bmw.service.impl;
|
|||
|
||||
import com.bonus.bmw.domain.dto.FileBasicMsgDto;
|
||||
import com.bonus.bmw.domain.dto.WebFileDto;
|
||||
import com.bonus.bmw.domain.po.BmSubContract;
|
||||
import com.bonus.bmw.domain.po.PmSubTeamContract;
|
||||
import com.bonus.bmw.domain.vo.PmWorker;
|
||||
import com.bonus.bmw.mapper.PmSubTeamContractMapper;
|
||||
|
|
@ -17,7 +18,9 @@ import org.springframework.transaction.annotation.Transactional;
|
|||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
*@author 马三炮
|
||||
|
|
@ -93,4 +96,12 @@ public class PmSubTeamContractServiceImpl implements PmSubTeamContractService {
|
|||
subTeamContract.setContractFile(contractFile);
|
||||
return subTeamContract;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getPeoNum(BmSubContract bmSubContract) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
Integer perNum = pmSubTeamContractMapper.countProNum(bmSubContract);
|
||||
map.put("perNum",perNum);
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,4 +51,7 @@
|
|||
from bm_worker_ein_pro_record
|
||||
where is_active='1' and team_id = #{id} and ein_status!=2
|
||||
</select>
|
||||
<select id="countProNum" resultType="java.lang.Integer">
|
||||
select count(1) from bm_worker_ein_pro_record where is_active='1' and team_id = #{teamId} and ein_status!=2
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue