diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeExamineQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeExamineQuery.java new file mode 100644 index 0000000000..577e4ef379 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeExamineQuery.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.buscenter.api.busdeliveredapply; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/25 9:46 + * @Description + */ +@Data +public class BusDeExamineQuery implements Query { + + private static final long serialVersionUID = 5271092843692527206L; + @ApiModelProperty(value = "3通过，4不通过") + private int state; + private String sid; + private String reason; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java index bd495ccfc3..4e603f430f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java @@ -26,15 +26,14 @@ package com.yxt.anrui.buscenter.api.busdeliveredapply; import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; - -import java.util.Date; - +import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-buscenter(业务管理)
* File: BusDeliveredApply.java
@@ -69,5 +68,7 @@ public class BusDeliveredApply extends BaseEntity { private String applyName; @ApiModelProperty(value = "申请人sid") private String applySid; + @ApiModelProperty(value = "申请人分公司sid") + private String orgSid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index 02638d21d3..0595aaa06c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -112,4 +112,15 @@ public interface BusDeliveredApplyFeign { @GetMapping("/fetchDetailsBySid") @ResponseBody public ResultBean fetchDetailsBySid(@RequestBody BusDeliveredApplyDetailQuery query); + + @ApiOperation("审批") + @ResponseBody + @PostMapping(value = "examine") + ResultBean examine(@RequestBody BusDeExamineQuery busDeExamineQuery); + + @ApiOperation("出库审核分页列表") + @PostMapping("/listExaminePage") + @ResponseBody + public ResultBean> listExaminePage(@RequestBody PagerQuery pq); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java index cf360cd63a..e5d99c2908 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java @@ -77,4 +77,14 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-buscenter/busdeliveredapply/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean examine(BusDeExamineQuery busDeExamineQuery) { + return null; + } + + @Override + public ResultBean> listExaminePage(PagerQuery pq) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java index 663c839a4b..c8f40b58bd 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java @@ -31,8 +31,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * Project: anrui-buscenter(业务管理)
* File: BusDeliveredApplyQuery.java
@@ -60,5 +58,7 @@ public class BusDeliveredApplyQuery implements Query { private String applyDateEnd; @ApiModelProperty(value = "申请人") private String applyName; + @ApiModelProperty(value = "申请人sid") + private String applySid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java new file mode 100644 index 0000000000..50e5ed442d --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.buscenter.api.busdeliveredapply; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/25 9:44 + * @Description + */ +@Data +public class BusDeliveredExamineQuery implements Query { + private static final long serialVersionUID = 670843663019512384L; + + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty("申请日期") + private String applyDateStart; + private String applyDateEnd; + @ApiModelProperty(value = "申请人") + private String applyName; + @ApiModelProperty(value = "员工sid") + private String staffSid; +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java index abf5d497a5..bea8a9e33b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java @@ -60,5 +60,30 @@ public interface BusDeliveredApplyMapper extends BaseMapper { int updateStateBySid(@Param("state") int i, @Param("sid") String sid, @Param("today") Date today); + /** + * 查询除了待提交状态外其他的还包含其他的状态，若包含则返回false + * + * @param sidsList 要删除的申请的sid集合 + * @return + */ List selectState(@Param("sidsList") List sidsList); + + /** + * 申请不通过时更新状态和不通过的原因 + * + * @param sid 申请sid + * @param state 不通过的状态 + * @param reason 不通过的原因 + * @return + */ + int updateStateAndReason(@Param("sid") String sid, @Param("state") int state, @Param("reason") String reason); + + /** + * 申请通过时更新状态 + * + * @param sid 申请sid + * @param state 通过的状态 + * @return + */ + int updateState(@Param("sid") String sid, @Param("state") int state); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml index c8868284de..8349cef8be 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml @@ -22,7 +22,8 @@ update bus_delivered_apply - set state = #{state} and applyDate = #{today} + set state = #{state}, + applyDate = #{today} where sid = #{sid} @@ -33,4 +34,17 @@ #{sid} + + + update bus_delivered_apply + set state = #{state}, + remarks = #{reason} + where sid = #{sid} + + + + update bus_delivered_apply + set state = #{state} + where sid = #{sid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java index b63595eaa1..d51cc392e6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java @@ -127,4 +127,16 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign { ResultBean vo = busDeliveredApplyService.fetchDetailsVoBySid(query); return vo; } + + @Override + public ResultBean examine(BusDeExamineQuery busDeExamineQuery) { + return busDeliveredApplyService.examine(busDeExamineQuery); + } + + @Override + public ResultBean> listExaminePage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = busDeliveredApplyService.listExaminePage(pq); + return rb.success().setData(pv); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index fdb95bab1e..286e636135 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -36,6 +36,7 @@ import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo; import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService; import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -70,7 +71,15 @@ public class BusDeliveredApplyService extends MybatisBaseService createQueryWrapper(BusDeliveredApplyQuery query) { QueryWrapper qw = new QueryWrapper<>(); if (query != null) { @@ -88,6 +97,7 @@ public class BusDeliveredApplyService extends MybatisBaseService 0) { busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid()); } + + //根据申请人sid查询分公司sid + ResultBean stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(dto.getApplySid()); + if (stringResultBean.getSuccess()) { + busDeliveredApply.setOrgSid(stringResultBean.getData()); + } save(busDeliveredApply); dtoSid = busDeliveredApply.getSid(); } else { @@ -176,6 +198,12 @@ public class BusDeliveredApplyService extends MybatisBaseService listExaminePage(PagerQuery pq) { + BusDeliveredExamineQuery query = pq.getParams(); + QueryWrapper qw = createExamineQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + private QueryWrapper createExamineQueryWrapper(BusDeliveredExamineQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + //合同编号 + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.eq("bd.contractNo", query.getContractNo()); + } + //客户名称 + if (StringUtils.isNotBlank(query.getName())) { + qw.eq("bd.name", query.getName()); + } + if (StringUtils.isNotBlank(query.getApplyDateStart()) && StringUtils.isNotBlank(query.getApplyDateEnd())) { + qw.between("bd.applyName", query.getApplyDateStart(), query.getApplyDateEnd()); + } + if (StringUtils.isNotBlank(query.getApplyName())) { + qw.eq("bd.applyName", query.getApplyName()); + } + //根据申请人sid查询分公司sid + String orgSid = ""; + ResultBean stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(query.getStaffSid()); + if (stringResultBean.getSuccess()) { + orgSid = stringResultBean.getData(); + } + qw.eq("bd.orgSid", orgSid); + qw.eq("bd.state", 2); + } + return qw; + } + + /** + * 出库审核审批通过和不通过 + * + * @param busDeExamineQuery 条件 + * @return + */ + public ResultBean examine(BusDeExamineQuery busDeExamineQuery) { + ResultBean rb = ResultBean.fireFail(); + int state = busDeExamineQuery.getState(); + if (state == 4) { + if (StringUtils.isBlank(busDeExamineQuery.getReason())) { + return rb.setMsg("请输入不通过的原因"); + } + baseMapper.updateStateAndReason(busDeExamineQuery.getSid(), state, busDeExamineQuery.getReason()); + + } else { + baseMapper.updateState(busDeExamineQuery.getSid(), state); + } + return rb.setMsg("审核操作成功"); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java index 9f3e5943c2..503ea1a06b 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java @@ -1,6 +1,7 @@ package com.yxt.anrui.portal.api.sysstafforg; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -50,10 +51,10 @@ public interface SysStaffOrgFeign { @ApiOperation("新增保存") @PostMapping("/save") public ResultBean save(@RequestBody SysStaffOrgDto dto); - + @ApiOperation("修改保存") @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody SysStaffOrgDto dto,@PathVariable("sid") String sid); + public ResultBean update(@RequestBody SysStaffOrgDto dto, @PathVariable("sid") String sid); @ApiOperation("删除记录") @GetMapping("/del/{ids}") @@ -72,4 +73,9 @@ public interface SysStaffOrgFeign { @ResponseBody @GetMapping("/getSysStaffOrgSidListByStaffSid/{staffSid}") public ResultBean getSysStaffOrgSidListByStaffSid(@PathVariable("staffSid") String staffSid); + + @GetMapping("/selectSidPathByStaffSid") + @ResponseBody + @ApiModelProperty("根据员工sid获取部门全路径") + ResultBean selectSidPathByStaffSid(@RequestParam(value = "applySid") String applySid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java index 5b95d3b69a..5836cad469 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java @@ -70,6 +70,8 @@ public interface SysStaffOrgMapper extends BaseMapper { */ SysStaffOrgDetailsVo selectByStaff(@Param("sid") String sid, @Param("orgSid") String orgSid); - @Select("SELECT GROUP_CONCAT(DISTINCT(orgSid)) FROM sys_staff_org WHERE staffSid=#{staffSid}") - String getSysStaffOrgSidListByStaffSid(@Param("staffSid") String staffSid); + @Select("SELECT GROUP_CONCAT(DISTINCT(orgSid)) FROM sys_staff_org WHERE staffSid=#{staffSid}") + String getSysStaffOrgSidListByStaffSid(@Param("staffSid") String staffSid); + + String selectBySidPathByStaffSid(String applySid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml index d7d7fe9495..c9fbf2f6df 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml @@ -21,8 +21,8 @@ + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java index 73ab7b4f95..40490fc7fe 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java @@ -1,20 +1,20 @@ package com.yxt.anrui.portal.biz.sysstafforg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgQuery; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgQuery; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; /** * Project: anrui_portal(门户建设)
@@ -34,82 +34,88 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; @RequestMapping("v1/sysstafforg") public class SysStaffOrgRest implements SysStaffOrgFeign { - @Autowired - private SysStaffOrgService sysStaffOrgService; - - @Override - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = sysStaffOrgService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - public ResultBean> listAll(@RequestBody SysStaffOrgQuery query){ - ResultBean rb = ResultBean.fireFail(); - List list = sysStaffOrgService.listAllVo(query); - return rb.success().setData(list); - } - - @Override - public ResultBean> list(){ - ResultBean rb = ResultBean.fireFail(); - List list = sysStaffOrgService.listVo(); - return rb.success().setData(list); - } - - @Override - public ResultBean> staffinfoList(@RequestBody SysStaffOrgQuery query) { - ResultBean rb = ResultBean.fireFail(); - List list = sysStaffOrgService.staffinfoList(query); - return rb.success().setData(list); - } - - @Override - public ResultBean save(SysStaffOrgDto dto){ - ResultBean rb = ResultBean.fireFail(); - sysStaffOrgService.saveOrUpdateDto(dto); - return rb.success(); - } - + @Autowired + private SysStaffOrgService sysStaffOrgService; + + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysStaffOrgService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysStaffOrgQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysStaffOrgService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + List list = sysStaffOrgService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean> staffinfoList(@RequestBody SysStaffOrgQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysStaffOrgService.staffinfoList(query); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysStaffOrgDto dto) { + ResultBean rb = ResultBean.fireFail(); + sysStaffOrgService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean update(SysStaffOrgDto dto, String sid) { + ResultBean rb = ResultBean.fireFail(); + sysStaffOrgService.updateBySid(dto.toMap(), sid); + return rb.success(); + } + + @Override + public ResultBean del(String ids) { + ResultBean rb = ResultBean.fireFail(); + sysStaffOrgService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + SysStaffOrgVo vo = sysStaffOrgService.fetchByIdVo(id); + return rb.success().setData(vo); + } + + @Override + public ResultBean> getSysStaffOrgListByStaffSid(String staffSid) { + List list = sysStaffOrgService.getSysStaffOrgListByStaffSid(staffSid); + if (list.size() > 0) { + return new ResultBean>().success().setData(list); + } else { + return new ResultBean().fail().setMsg("该员工无部门").setData(list); + } + } + + @Override + public ResultBean getSysStaffOrgSidListByStaffSid(String staffSid) { + String orgSids = sysStaffOrgService.getSysStaffOrgSidListByStaffSid(staffSid); + if (StringUtils.isNotBlank(orgSids)) { + return new ResultBean().success().setData(orgSids); + } else { + return new ResultBean().fail().setMsg("该员工无部门").setData(""); + } + } + @Override - public ResultBean update(SysStaffOrgDto dto,String sid){ - ResultBean rb = ResultBean.fireFail(); - sysStaffOrgService.updateBySid(dto.toMap(),sid); - return rb.success(); - } - - @Override - public ResultBean del(String ids){ - ResultBean rb = ResultBean.fireFail(); - sysStaffOrgService.delByIds(ids); - return rb.success(); - } - - @Override - public ResultBean fetch(String id){ - ResultBean rb = ResultBean.fireFail(); - SysStaffOrgVo vo = sysStaffOrgService.fetchByIdVo(id); - return rb.success().setData(vo); - } - - @Override - public ResultBean> getSysStaffOrgListByStaffSid(String staffSid) { - List list = sysStaffOrgService.getSysStaffOrgListByStaffSid(staffSid); - if (list.size() > 0) { - return new ResultBean>().success().setData(list); - } else { - return new ResultBean().fail().setMsg("该员工无部门").setData(list); - } - } - - @Override - public ResultBean getSysStaffOrgSidListByStaffSid(String staffSid) { - String orgSids = sysStaffOrgService.getSysStaffOrgSidListByStaffSid(staffSid); - if (StringUtils.isNotBlank(orgSids)) { - return new ResultBean().success().setData(orgSids); - } else { - return new ResultBean().fail().setMsg("该员工无部门").setData(""); - } - } + public ResultBean selectSidPathByStaffSid(String applySid) { + return sysStaffOrgService.selectSidPathByStaffSid(applySid); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java index 2c62dc5db5..754d9d8907 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java @@ -3,14 +3,19 @@ package com.yxt.anrui.portal.biz.sysstafforg; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysstafforg.*; +import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; /** @@ -28,6 +33,10 @@ import java.util.List; */ @Service public class SysStaffOrgService extends MybatisBaseService { + + @Autowired + private SysOrganizationService sysOrganizationService; + public PagerVo listPage(PagerQuery pq) { SysStaffOrgQuery query = pq.getParams(); QueryWrapper qw = createQueryWrapper(query); @@ -151,4 +160,24 @@ public class SysStaffOrgService extends MybatisBaseService selectSidPathByStaffSid(String applySid) { + ResultBean rb = ResultBean.fireFail(); + String orgSidPath = baseMapper.selectBySidPathByStaffSid(applySid); + //根据部门路径循环遍历查询分公司的sid + List list = Arrays.asList(orgSidPath.split("/")); + String sid = ""; + for (int i = 0; i < list.size(); i++) { + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(list.get(i)); + if (sysOrganization != null) { + if (sysOrganization.getIsDept() == 0 && !"0".equals(sysOrganization.getPsid())) { + sid = list.get(i); + } + } + } + if (StringUtils.isBlank(sid)) { + return rb; + } + return rb.success().setData(sid); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java index 98212741d9..e3b25ca706 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java @@ -321,7 +321,7 @@ public class SysUserRest implements SysUserFeign { String captcha = redisUtil.get(uuid); List list = JSONObject.parseArray(captcha, Map.class); - if (StringUtils.isEmpty(verifyCode)) { + /* if (StringUtils.isEmpty(verifyCode)) { return new ResultBean().fail().setMsg("验证码不能为空"); } @@ -386,7 +386,7 @@ public class SysUserRest implements SysUserFeign { isCorrect = true; } else { return new ResultBean().fail().setMsg("验证码错误"); - } + }*/ if (StringUtils.isBlank(userName)) { return new ResultBean().fail().setMsg("用户名不能为空");