yz
2021-02-22 1466ee58f3893b631a0d6711ede0320f252b2657
增加接口
5个文件已修改
29 ■■■■ 已修改文件
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccessoryService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
febs-server/febs-server-hr/src/main/resources/bootstrap.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java
@@ -16,7 +16,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Map;
@@ -119,4 +118,15 @@
            throw new FebsException(message);
        }
    }
    @GetMapping("{labelid}")
    @PreAuthorize("hasAuthority('empAccessory:delete')")
    public FebsResponse getLabelCount(@PathVariable(value = "labelid") String labelid) throws FebsException {
        try {
            return new FebsResponse().data(empAccessoryService.getLabelCount(Long.valueOf(labelid)));
        } catch (Exception e) {
            String message = "修改Label失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }
}
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccessoryService.java
@@ -63,4 +63,7 @@
    void mvFiles(String accessoryids,Long labelid,Long empId);
    void singledownload(String empIds, Long labelid, HttpServletRequest request, HttpServletResponse response) throws Exception;
    Integer getLabelCount(Long labelId);
}
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
@@ -253,4 +253,13 @@
        FileUtil.del(new StringBuilder().append(mianFileStr, 0, mianFileStr.length() - 1).append(".zip").toString());
        FileUtil.del(mianFileStr);
    }
    @Override
    public Integer getLabelCount(Long labelId) {
            LambdaQueryWrapper<EmpAccessory> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(EmpAccessory::getDelFlag,0);
            wrapper.eq(EmpAccessory::getLabelid,labelId);
        return this.count(wrapper);
    }
}
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java
@@ -61,7 +61,7 @@
    @Transactional(rollbackFor = Exception.class)
    public void createLabel(Label label) throws FebsException {
        LambdaQueryWrapper<Label> queryWrapper = new LambdaQueryWrapper();
        queryWrapper.eq(Label::getLabelname, label.getLabelname()).or().eq(Label::getLabelcode, label.getLabelcode());
        queryWrapper.eq(Label::getDelFlag,0).and(i->i.eq(Label::getLabelname, label.getLabelname()).or().eq(Label::getLabelcode, label.getLabelcode()));
        Label l = this.getOne(queryWrapper);
        if (null != l && StrUtil.equals(label.getLabelname(), l.getLabelname())) {
            throw new FebsException("标签名字重复");
@@ -94,4 +94,5 @@
        wapper.set(Label::getModifytime,new Date());
        this.update(wapper);
    }
}
febs-server/febs-server-hr/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@
      config:
        server-addr: ${nacos.url}:8848
        group: DEFAULT_GROUP
        prefix: febs-server-Hr
        prefix: febs-server-hr
        file-extension: yaml
      discovery:
        server-addr: ${nacos.url}:8848