Compare commits

..

No commits in common. "4829400ae2795df47181c6013a89d717c736a6f1" and "6cf49d88b1acc3031da00f963ce354e58457376d" have entirely different histories.

17 changed files with 34 additions and 150 deletions

View File

@ -8,7 +8,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.*; import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@ -32,25 +34,8 @@ public class BpmOAEvectionApiImpl implements BpmOAEvectionApi {
List<BpmOAEvectionDO> evectionOff = evectionService.getEvectionListByEndTime(now.minusDays(1)); List<BpmOAEvectionDO> evectionOff = evectionService.getEvectionListByEndTime(now.minusDays(1));
Map<String, List<Long>> result = new HashMap<>(); Map<String, List<Long>> result = new HashMap<>();
result.put("on", evectionOn.stream().flatMap(item -> { result.put("on", evectionOn.stream().map(BpmOAEvectionDO::getUserId).distinct().collect(Collectors.toList()));
Set<Long> togetherUserIds = item.getTogetherUserIds(); result.put("off", evectionOff.stream().map(BpmOAEvectionDO::getUserId).distinct().collect(Collectors.toList()));
List<Long> ids = new ArrayList<>();
ids.add(item.getUserId());
if (togetherUserIds != null) {
ids.addAll(togetherUserIds); // Set 转换为 List 并添加进去
}
return ids.stream();
}).distinct().collect(Collectors.toList()));
result.put("off", evectionOff.stream().flatMap(item -> {
Set<Long> togetherUserIds = item.getTogetherUserIds();
List<Long> ids = new ArrayList<>();
ids.add(item.getUserId());
if (togetherUserIds != null) {
ids.addAll(togetherUserIds); // Set 转换为 List 并添加进去
}
return ids.stream();
}).distinct().collect(Collectors.toList()));
return success(result); return success(result);
} }
} }

View File

@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.evection.BpmOAEvectionCreateReqVO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.evection.BpmOAEvectionCreateReqVO;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.evection.BpmOAEvectionRespVO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.evection.BpmOAEvectionRespVO;
import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAEvectionConvert; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAEvectionConvert;
@ -66,15 +65,6 @@ public class BpmOAEvectionController {
return success(respVO); return success(respVO);
} }
@GetMapping("/get-list")
@Operation(summary = "获得我的出差申请")
public CommonResult<List<BpmOAEvectionRespVO>> getEvectionList() {
List<BpmOAEvectionDO> evections = evectionService.getEvectionList();
return success(BeanUtils.toBean(evections, BpmOAEvectionRespVO.class));
}
@GetMapping("/getByProcessInstanceId") @GetMapping("/getByProcessInstanceId")
@Operation(summary = "获得出差申请") @Operation(summary = "获得出差申请")
@Parameter(name = "processInstanceId", description = "流程实例编号", required = true, example = "1024") @Parameter(name = "processInstanceId", description = "流程实例编号", required = true, example = "1024")

View File

@ -52,9 +52,6 @@ public class BpmOAReimbursementCreateReqVO {
@Schema(description = "备用金差额", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @Schema(description = "备用金差额", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private BigDecimal difference ; private BigDecimal difference ;
@Schema(description = "业务表编号")
private Long objectId;
@Schema(description = "报销发票总数", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "报销发票总数", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "报销发票总数不能为空") @NotNull(message = "报销发票总数不能为空")
private Integer totalQuantity ; private Integer totalQuantity ;

View File

@ -38,7 +38,4 @@ public class Reimbursement {
@Schema(description = "采购计划编号", example = "1") @Schema(description = "采购计划编号", example = "1")
private Long procureId; private Long procureId;
@Schema(description = "业务表编号")
private Long objectId;
} }

View File

@ -36,7 +36,4 @@ public class ReimbursementDTO {
@Schema(description = "采购计划编号", example = "1") @Schema(description = "采购计划编号", example = "1")
private Long procureId; private Long procureId;
@Schema(description = "业务表编号")
private Long objectId;
} }

View File

@ -68,9 +68,4 @@ public class BpmOAReimbursementItemDO extends BaseDO {
* 采购申请编号 * 采购申请编号
*/ */
private Long procureId; private Long procureId;
/**
* 业务表编号
*/
private Long objectId;
} }

View File

@ -6,10 +6,8 @@ import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.evection.BpmOAEvection
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAEvectionDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAEvectionDO;
import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
/** /**
* 出差申请 Mapper * 出差申请 Mapper
@ -28,6 +26,4 @@ public interface BpmOAEvectionMapper extends BaseMapperX<BpmOAEvectionDO> {
.geIfPresent(BpmOAEvectionDO::getEndTime, createReqVO.getStartTime()) .geIfPresent(BpmOAEvectionDO::getEndTime, createReqVO.getStartTime())
.in(BpmOAEvectionDO::getResult, Arrays.asList(BpmProcessInstanceResultEnum.PROCESS.getResult(), BpmProcessInstanceResultEnum.APPROVE.getResult()))); .in(BpmOAEvectionDO::getResult, Arrays.asList(BpmProcessInstanceResultEnum.PROCESS.getResult(), BpmProcessInstanceResultEnum.APPROVE.getResult())));
} }
List<BpmOAEvectionDO> selectEvectionList(@Param("userId") Long userId);
} }

View File

@ -54,10 +54,4 @@ public interface BpmOAEvectionService {
* @return 出差申请列表 * @return 出差申请列表
*/ */
List<BpmOAEvectionDO> getEvectionListByEndTime(LocalDate date); List<BpmOAEvectionDO> getEvectionListByEndTime(LocalDate date);
/**
* 获得我的出差申请列表
* @return 出差申请列表
*/
List<BpmOAEvectionDO> getEvectionList();
} }

View File

@ -20,7 +20,6 @@ import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_EVECTION_IS_EXISTS; import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_EVECTION_IS_EXISTS;
import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_EVECTION_NOT_EXISTS; import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_EVECTION_NOT_EXISTS;
@ -151,10 +150,4 @@ public class BpmOAEvectionServiceImpl extends BpmOABaseService implements BpmOAE
.eq(BpmOAEvectionDO::getResult, BpmProcessInstanceResultEnum.APPROVE.getResult()) .eq(BpmOAEvectionDO::getResult, BpmProcessInstanceResultEnum.APPROVE.getResult())
.likeIfPresent(BpmOAEvectionDO::getEndTime, date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))); .likeIfPresent(BpmOAEvectionDO::getEndTime, date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
} }
@Override
public List<BpmOAEvectionDO> getEvectionList() {
return evectionMapper.selectEvectionList(getLoginUserId());
}
} }

View File

@ -114,7 +114,6 @@ public class BpmOALoanServiceImpl extends BpmOABaseService implements BpmOALoanS
processInstanceVariables.put("factoryType", factoryInfoDTO.getType()); processInstanceVariables.put("factoryType", factoryInfoDTO.getType());
} }
processInstanceVariables.put("loanType", loan.getLoanType());
String processInstanceId = processInstanceService.createProcessInstance(userId, String processInstanceId = processInstanceService.createProcessInstance(userId,
new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY) new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
.setVariables(processInstanceVariables).setBusinessKey(String.valueOf(loan.getId()))); .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(loan.getId())));

View File

@ -276,9 +276,9 @@ public class BpmOAPaymentServiceImpl extends BpmOABaseService implements BpmOAPa
// 获取银行卡信息 // 获取银行卡信息
BankRespDTO bankResp = bankApi.getBank(payment.getBankId()).getCheckedData(); BankRespDTO bankResp = bankApi.getBank(payment.getBankId()).getCheckedData();
// 设置银行卡信息 // 设置银行卡信息
respVO.setBankName(bankResp != null ? bankResp.getBankName() : null); respVO.setBankName(bankResp.getBankName());
respVO.setBankNo(bankResp != null ? bankResp.getBankNo() : null); respVO.setBankNo(bankResp.getBankNo());
respVO.setNickname(bankResp != null ? bankResp.getNickname() : null); respVO.setNickname(bankResp.getNickname());
} }
} }
return respVO; return respVO;

View File

@ -25,6 +25,7 @@ import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
import cn.iocoder.yudao.module.bpm.service.financialpayment.FinancialPaymentService; import cn.iocoder.yudao.module.bpm.service.financialpayment.FinancialPaymentService;
import cn.iocoder.yudao.module.bpm.service.task.BpmHistoryProcessInstanceService; import cn.iocoder.yudao.module.bpm.service.task.BpmHistoryProcessInstanceService;
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
import cn.iocoder.yudao.module.system.api.bank.dto.BankRespDTO;
import cn.iocoder.yudao.module.system.api.dept.DeptApi; import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@ -100,7 +101,6 @@ public class BpmOAReimbursementServiceImpl extends BpmOABaseService implements B
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Long createReimbursement(Long userId, BpmOAReimbursementCreateReqVO createReqVO) { public Long createReimbursement(Long userId, BpmOAReimbursementCreateReqVO createReqVO) {
BpmOAReimbursementDO reimbursement = BpmOAReimbursementConvert.INSTANCE.convert(createReqVO).setUserId(userId) BpmOAReimbursementDO reimbursement = BpmOAReimbursementConvert.INSTANCE.convert(createReqVO).setUserId(userId)
.setResult(BpmProcessInstanceResultEnum.PROCESS.getResult()); .setResult(BpmProcessInstanceResultEnum.PROCESS.getResult());
@ -120,8 +120,6 @@ public class BpmOAReimbursementServiceImpl extends BpmOABaseService implements B
createDO.forEach(item -> item.setReimbursementId(reimbursement.getId())); createDO.forEach(item -> item.setReimbursementId(reimbursement.getId()));
reimbursementItemMapper.insertBatch(createDO); reimbursementItemMapper.insertBatch(createDO);
// 同步更新
// 发起 BPM 流程 // 发起 BPM 流程
Map<String, Object> processInstanceVariables = new HashMap<>(); Map<String, Object> processInstanceVariables = new HashMap<>();
String processInstanceId = processInstanceApi.createProcessInstance(userId, String processInstanceId = processInstanceApi.createProcessInstance(userId,

View File

@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAEvectionMapper">
<!--
一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
文档可见https://www.iocoder.cn/MyBatis/x-plugins/
-->
<select id="selectEvectionList" resultType="cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAEvectionDO">
SELECT
a.*
FROM
bpm_oa_evection a
WHERE
a.id NOT IN (
SELECT
c.object_id
FROM
bpm_oa_reimbursement b,
bpm_oa_reimbursement_item c
WHERE
b.user_id = #{userId}
AND b.deleted = 0
AND b.id = c.reimbursement_id
AND b.result IN ( 1, 2 )
AND c.type = 1
AND c.object_id IS NOT NULL
)
AND a.user_id = #{userId}
AND a.deleted = 0
ORDER BY
a.create_time DESC
</select>
</mapper>

View File

@ -78,23 +78,15 @@
<if test="pageReqVO.userId != null"> <if test="pageReqVO.userId != null">
AND a.user_id = #{pageReqVO.userId} AND a.user_id = #{pageReqVO.userId}
</if> </if>
AND EXISTS ( <if test="pageReqVO.factoryId != null">
SELECT AND b.dept_id = #{pageReqVO.factoryId}
1 </if>
FROM <if test="pageReqVO.type != null">
bpm_oa_expenses_item b AND b.type = #{pageReqVO.type}
WHERE </if>
b.expenses_id = a.id <if test="pageReqVO.costSection != null">
<if test="pageReqVO.factoryId != null"> AND b.cost_section = #{pageReqVO.costSection}
AND b.dept_id = #{pageReqVO.factoryId} </if>
</if>
<if test="pageReqVO.type != null">
AND b.type = #{pageReqVO.type}
</if>
<if test="pageReqVO.costSection != null">
AND b.cost_section = #{pageReqVO.costSection}
</if>
)
<if test="pageReqVO.payeeName != null"> <if test="pageReqVO.payeeName != null">
AND ub.nickname LIKE CONCAT('%', #{pageReqVO.payeeName}, '%') AND ub.nickname LIKE CONCAT('%', #{pageReqVO.payeeName}, '%')
</if> </if>

View File

@ -41,12 +41,6 @@ public class StaffImportExcelVO {
@IdCard @IdCard
private String idCard; private String idCard;
@ExcelProperty("银行名称")
private String bankName;
@ExcelProperty("银行卡号")
private String bankNo;
@ExcelProperty("薪资") @ExcelProperty("薪资")
private BigDecimal salary; private BigDecimal salary;
} }

View File

@ -68,22 +68,21 @@ public class StaffServiceImpl implements StaffService {
@Override @Override
public void updateStaff(StaffSaveReqVO updateReqVO) { public void updateStaff(StaffSaveReqVO updateReqVO) {
StaffDO staff = staffMapper.selectById(updateReqVO.getId()); if (staffMapper.selectById(updateReqVO.getId()) == null) {
if (staff == null) {
throw exception(STAFF_NOT_EXISTS); throw exception(STAFF_NOT_EXISTS);
} }
if (!staff.getIdCard().equals(updateReqVO.getIdCard()) || !staff.getNickName().equals(updateReqVO.getNickName())) { // 校验用户名身份证号是否已经存在
// 校验用户名身份证号是否已经存在 Long cunt = staffMapper.selectCount(new LambdaQueryWrapperX<StaffDO>()
Long cunt = staffMapper.selectCount(new LambdaQueryWrapperX<StaffDO>() .neIfPresent(StaffDO::getId, updateReqVO.getId())
.neIfPresent(StaffDO::getId, updateReqVO.getId()) .eqIfPresent(StaffDO::getIdCard, updateReqVO.getIdCard()));
.eqIfPresent(StaffDO::getIdCard, updateReqVO.getIdCard()) if (cunt > 0) {
.eqIfPresent(StaffDO::getNickName, updateReqVO.getNickName())); throw exception(USER_USERNAME_EXISTS);
if (cunt > 0) {
throw exception(USER_USERNAME_EXISTS);
}
} }
// 身份证号是否已经存在
validateUserForCreate(null, null, null, updateReqVO.getIdCard());
// 更新 // 更新
StaffDO updateObj = BeanUtils.toBean(updateReqVO, StaffDO.class); StaffDO updateObj = BeanUtils.toBean(updateReqVO, StaffDO.class);
staffMapper.updateById(updateObj); staffMapper.updateById(updateObj);
@ -202,9 +201,6 @@ public class StaffServiceImpl implements StaffService {
//设置 性别年龄 //设置 性别年龄
updateUser.setSex(idCardDO.getSex()); updateUser.setSex(idCardDO.getSex());
updateUser.setAge(idCardDO.getAge()); updateUser.setAge(idCardDO.getAge());
// 设置银行卡名称 银行卡号
updateUser.setBankName(importUser.getBankName());
updateUser.setBankNo(importUser.getBankNo());
//设置部门ID //设置部门ID
if (StrUtil.isNotEmpty(importUser.getFactoryName())) { if (StrUtil.isNotEmpty(importUser.getFactoryName())) {
@ -230,14 +226,12 @@ public class StaffServiceImpl implements StaffService {
if (updateSupport) { if (updateSupport) {
StaffDO staffDO = staffMapper.selectOne(new LambdaQueryWrapperX<StaffDO>() StaffDO staffDO = staffMapper.selectOne(new LambdaQueryWrapperX<StaffDO>()
.eqIfPresent(StaffDO::getIdCard, importUser.getIdCard()) .eqIfPresent(StaffDO::getIdCard, importUser.getIdCard())
.likeIfPresent(StaffDO::getNickName, importUser.getNickName())); .eqIfPresent(StaffDO::getNickName, importUser.getNickName()));
if (staffDO != null) { updateUser.setId(staffDO.getId());
updateUser.setId(staffDO.getId()); staffMapper.updateById(updateUser);
staffMapper.updateById(updateUser); respVO.getUpdateUsernames().add(importUser.getNickName());
respVO.getUpdateUsernames().add(importUser.getNickName()); return;
return;
}
} }
// 插入用户 // 插入用户