优化

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;
+}

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<SysFlowableConfigVvo> selectByUserSid(@SpringQueryMap SysFlowableConfigQuery query);
+
+    @ApiOperation("初始化转办人信息")
+    @GetMapping("/initDetails")
+    ResultBean<SysFlowableConfigVo> initDetails(@RequestParam("userSid")String userSid);
+
+    @ApiOperation("保存修改")
+    @PostMapping("/saveOrUpdate")
+    ResultBean saveOrUpdate(@Valid @RequestBody SysFlowableConfigDto dto);
 }

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;
+
+}

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<List<PcSysStaffVo>> selectStaffLists();
 
+    @ApiOperation("获取集团所有在职人员")
+    @ResponseBody
+    @GetMapping("/selectStaffListss")
+    ResultBean<List<PcSysStaffVo>> selectStaffListss();
+
 
 }

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<List<PcSysStaffVo>> selectStaffListss() {
+        return null;
+    }
+
 }

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> {
     SysFlowableConfig selectByUserSid(@Param("userSid") String userSid, @Param("nowDate") Date nowDate);
+
+    SysFlowableConfigVo initDetails(String userSid);
+
+    SysFlowableConfig selectByUserSids(String userSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml

@@ -4,4 +4,12 @@
     <select id="selectByUserSid" resultType="com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig">
         select * from sys_flowable_config where userSid = #{userSid} and #{nowDate} between startDate and endDate
     </select>
+
+    <select id="initDetails" resultType="com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVo">
+        select * from sys_flowable_config where userSid = #{userSid}
+    </select>
+
+    <select id="selectByUserSids" resultType="com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig">
+        select * from sys_flowable_config where userSid = #{userSid}
+    </select>
 </mapper>

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<SysFlowableConfigVvo> selectByUserSid(SysFlowableConfigQuery query) {
         return sysFlowableConfigService.selectByUserSid(query);
     }
+
+    @Override
+    public ResultBean<SysFlowableConfigVo> initDetails(String userSid) {
+        return sysFlowableConfigService.initDetails(userSid);
+    }
+
+    @Override
+    public ResultBean saveOrUpdate(SysFlowableConfigDto dto) {
+        return sysFlowableConfigService.saveOrUpdateDto(dto);
+    }
 }

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<SysFlowableConf
         BeanUtil.copyProperties(sysFlowableConfig,sysFlowableConfigVvo);
         return rb.success().setData(sysFlowableConfigVvo);
     }
+
+    public ResultBean<SysFlowableConfigVo> initDetails(String userSid) {
+        ResultBean<SysFlowableConfigVo> 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();
+    }
 }

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<SysStaffinfo> {
     List<AppSysStaffVo> getGressionUserList(@Param("userOrgSid")String userOrgSid);
 
     List<PcSysStaffVo> selectStaffLists();
+    List<PcSysStaffVo> selectStaffListss();
 }

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
     </select>
+
+    <select id="selectStaffLists" resultType="com.yxt.anrui.portal.api.sysstaffinfo.PcSysStaffVo">
+        select su.sid  userSid,
+               si.name staffName
+        from sys_user su
+                 left join sys_staffinfo si on su.staffSid = si.sid where su.isAdmin is NULL and si.personTypeKey != '01'
+    </select>
 </mapper>

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<List<PcSysStaffVo>> selectStaffListss() {
+        return sysStaffinfoService.selectStaffListss();
+    }
+
 
 }

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<SysStaffinfoMapper,
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }
+
+    public ResultBean<List<PcSysStaffVo>> selectStaffListss() {
+        ResultBean<List<PcSysStaffVo>> rb = ResultBean.fireFail();
+        List<PcSysStaffVo> list = baseMapper.selectStaffListss();
+        list.removeAll(Collections.singleton(null));
+        return rb.success().setData(list);
+    }
 }