From dd98020519aa37e787e92e6ff97b1295774b241d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 28 Jun 2023 15:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysFlowableConfigDto.java | 29 +++++++++++++++++++ .../SysFlowableConfigFeign.java | 13 +++++++++ .../SysFlowableConfigVo.java | 25 ++++++++++++++++ .../api/sysstaffinfo/SysStaffinfoFeign.java | 5 ++++ .../SysStaffinfoFeignFallback.java | 5 ++++ .../SysFlowableConfigMapper.java | 5 ++++ .../SysFlowableConfigMapper.xml | 8 +++++ .../SysFlowableConfigRest.java | 14 +++++++-- .../SysFlowableConfigService.java | 26 +++++++++++++++-- .../biz/sysstaffinfo/SysStaffinfoMapper.java | 1 + .../biz/sysstaffinfo/SysStaffinfoMapper.xml | 7 +++++ .../biz/sysstaffinfo/SysStaffinfoRest.java | 5 ++++ .../biz/sysstaffinfo/SysStaffinfoService.java | 7 +++++ 13 files changed, 144 insertions(+), 6 deletions(-) create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigDto.java create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVo.java diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigDto.java new file mode 100644 index 0000000000..f8887e11b2 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigDto.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.portal.api.sysflowableconfig; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Date; + +/** + * @description: 流程设置转办 + * @author: dimengzhe + * @date: 2023/6/28 + **/ +@Data +public class SysFlowableConfigDto implements Dto { + private static final long serialVersionUID = 5037689220100489101L; + + @ApiModelProperty("当前登录人") + @NotBlank(message = "当前登录人不能为空") + private String userSid; + + @ApiModelProperty("转办人用户sid") + private String changeUserSid; + + private Date startDate; + + private Date endDate; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java index 09a7e4fbb7..8dc5ebe573 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java @@ -6,6 +6,11 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import javax.validation.Valid; /** * @description: 转办设置 @@ -23,4 +28,12 @@ public interface SysFlowableConfigFeign { @ApiOperation("查询是否有转办人 ") @GetMapping("/selectByUserSid") ResultBean selectByUserSid(@SpringQueryMap SysFlowableConfigQuery query); + + @ApiOperation("初始化转办人信息") + @GetMapping("/initDetails") + ResultBean initDetails(@RequestParam("userSid")String userSid); + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + ResultBean saveOrUpdate(@Valid @RequestBody SysFlowableConfigDto dto); } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVo.java new file mode 100644 index 0000000000..556e5c4f49 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.portal.api.sysflowableconfig; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 设置流程转办初始化 + * @author: dimengzhe + * @date: 2023/6/28 + **/ +@Data +public class SysFlowableConfigVo implements Vo { + private static final long serialVersionUID = 4223685847449654287L; + + @ApiModelProperty("当前登录人用户sid") + private String userSid; + @ApiModelProperty("设置的转办人用户sid") + private String changeUserSid; + @ApiModelProperty("开始时间") + private String startDate; + @ApiModelProperty("结束时间") + private String endDate; + +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java index 656878a0fb..61de446906 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java @@ -153,5 +153,10 @@ public interface SysStaffinfoFeign { @GetMapping("/selectStaffLists") ResultBean> selectStaffLists(); + @ApiOperation("获取集团所有在职人员") + @ResponseBody + @GetMapping("/selectStaffListss") + ResultBean> selectStaffListss(); + } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java index 54f584f640..8f516e152a 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java @@ -108,4 +108,9 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { return null; } + @Override + public ResultBean> selectStaffListss() { + return null; + } + } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java index 3b300e3c94..d0f7fd073e 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java @@ -2,6 +2,7 @@ package com.yxt.anrui.portal.biz.sysflowableconfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig; +import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -15,4 +16,8 @@ import java.util.Date; @Mapper public interface SysFlowableConfigMapper extends BaseMapper { SysFlowableConfig selectByUserSid(@Param("userSid") String userSid, @Param("nowDate") Date nowDate); + + SysFlowableConfigVo initDetails(String userSid); + + SysFlowableConfig selectByUserSids(String userSid); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml index 091c4bdefe..f680bcb64e 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml @@ -4,4 +4,12 @@ + + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java index faaac787f2..08f0a21b6f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java @@ -1,8 +1,6 @@ package com.yxt.anrui.portal.biz.sysflowableconfig; -import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigFeign; -import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigQuery; -import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVvo; +import com.yxt.anrui.portal.api.sysflowableconfig.*; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; @@ -26,4 +24,14 @@ public class SysFlowableConfigRest implements SysFlowableConfigFeign { public ResultBean selectByUserSid(SysFlowableConfigQuery query) { return sysFlowableConfigService.selectByUserSid(query); } + + @Override + public ResultBean initDetails(String userSid) { + return sysFlowableConfigService.initDetails(userSid); + } + + @Override + public ResultBean saveOrUpdate(SysFlowableConfigDto dto) { + return sysFlowableConfigService.saveOrUpdateDto(dto); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java index 1543fc2446..7836b33bc7 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java @@ -1,9 +1,7 @@ package com.yxt.anrui.portal.biz.sysflowableconfig; import cn.hutool.core.bean.BeanUtil; -import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig; -import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigQuery; -import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVvo; +import com.yxt.anrui.portal.api.sysflowableconfig.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Service; @@ -27,4 +25,26 @@ public class SysFlowableConfigService extends MybatisBaseService initDetails(String userSid) { + ResultBean rb = ResultBean.fireFail(); + SysFlowableConfigVo sysFlowableConfigVo = baseMapper.initDetails(userSid); + return rb.success().setData(sysFlowableConfigVo); + } + + public ResultBean saveOrUpdateDto(SysFlowableConfigDto dto) { + ResultBean rb = ResultBean.fireFail(); + //查询是否包含该用户的数据 + SysFlowableConfig sysFlowableConfig = baseMapper.selectByUserSids(dto.getUserSid()); + if(sysFlowableConfig == null){ + sysFlowableConfig = new SysFlowableConfig(); + BeanUtil.copyProperties(dto,sysFlowableConfig,"sid"); + baseMapper.insert(sysFlowableConfig); + }else{ + BeanUtil.copyProperties(dto,sysFlowableConfig,"sid"); + baseMapper.insert(sysFlowableConfig); + baseMapper.updateById(sysFlowableConfig); + } + return rb.success(); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java index 5e6bdbff87..c53a22f41e 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java @@ -124,4 +124,5 @@ public interface SysStaffinfoMapper extends BaseMapper { List getGressionUserList(@Param("userOrgSid")String userOrgSid); List selectStaffLists(); + List selectStaffListss(); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index abe0a3a3bb..38be52eaef 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -387,4 +387,11 @@ from sys_user su left join sys_staffinfo si on su.staffSid = si.sid where su.isAdmin is NULL + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java index acff837bad..ccdfa8209f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java @@ -225,5 +225,10 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { return sysStaffinfoService.selectStaffLists(); } + @Override + public ResultBean> selectStaffListss() { + return sysStaffinfoService.selectStaffListss(); + } + } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java index 3cbf75fbc3..692d273c99 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -801,4 +801,11 @@ public class SysStaffinfoService extends MybatisBaseService> selectStaffListss() { + ResultBean> rb = ResultBean.fireFail(); + List list = baseMapper.selectStaffListss(); + list.removeAll(Collections.singleton(null)); + return rb.success().setData(list); + } } \ No newline at end of file