bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
bonus 2025-02-21 02:35:23 +08:00
parent d2e04ee62b 2ebb2d4202
commit 0bd8c9f6eb
15 changed files with 290 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bonus-common-biz/src/main/java/com/bonus/common/biz/enums/WorkFlowStatusEnum.java Normal file
View File

@ -0,0 +1,27 @@
package com.bonus.common.biz.enums;
import lombok.Getter;
/**
* @author : 阮世耀
* @version : 1.0
* @PackagePath: com.bonus.common.biz.enums
* @CreateTime: 2025-02-21 00:53
* @Description: 审批流状态枚举类
*/
@Getter
public enum WorkFlowStatusEnum {
WAIT_AUDIT(0, "待审批"),
AUDIT_IN(1, "执行中"),
AUDIT_FINISH(2, "执行完成"),
AUDIT_FAIL(3, "执行中断");
private final Integer code;
private final String label;
WorkFlowStatusEnum(Integer code, String label) {
this.code = code;
this.label = label;
}
}

15
bonus-modules/bonus-material/src/main/java/com/bonus/material/record/controller/DerateRecordQueryController.java
View File

@ -49,6 +49,21 @@ public class DerateRecordQueryController extends BaseController {
}
}
/**
* 减免记录查询列表
*/
@ApiOperation(value = "减免记录查询列表--限制流程节点用户查看")
@GetMapping("/getAuditList")
public TableDataInfo getAuditList(SltAgreementInfo bean) {
startPage();
try {
List<SltAgreementReduce> list = service.getAuditList(bean);
return getDataTable(list);
} catch (Exception e) {
return getDataTable(new ArrayList<>());
}
}
/**
* 减免记录查询列表--app
*/

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/record/mapper/DerateRecordQueryMapper.java
View File

@ -21,6 +21,14 @@ public interface DerateRecordQueryMapper {
*/
List<SltAgreementReduce> getList(SltAgreementInfo bean);
/**
* 减免记录查询列表
* @param bean
* @return
*/
List<SltAgreementReduce> getAuditList(SltAgreementInfo bean);
/**
* 删除减免记录
* @param id

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/IDerateReocrdQueryService.java
View File

@ -20,6 +20,13 @@ public interface IDerateReocrdQueryService {
*/
List<SltAgreementReduce> getList(SltAgreementInfo bean);
/**
* 根据条件获取减免记录
* @param bean
* @return
*/
List<SltAgreementReduce> getAuditList(SltAgreementInfo bean);
/**
* 删除减免记录
* @param id

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/impl/DerateRecordQueryServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.bonus.material.record.service.impl;
import com.bonus.common.biz.domain.BmFileInfo;
import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.record.mapper.DerateRecordQueryMapper;
import com.bonus.material.record.mapper.SltRecordQueryMapper;
import com.bonus.material.record.service.IDerateReocrdQueryService;
@ -27,6 +28,13 @@ public class DerateRecordQueryServiceImpl implements IDerateReocrdQueryService {
return mapper.getList(bean);
}
@Override
public List<SltAgreementReduce> getAuditList(SltAgreementInfo bean) {
Long userId = SecurityUtils.getUserId();
bean.setUserId(userId);
return mapper.getAuditList(bean);
}
@Override
public int delData(Long id) {
try {

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java
View File

@ -70,6 +70,8 @@ public class SltAgreementInfo extends BaseEntity {
@ApiModelProperty(value = "领料数量")
private BigDecimal num;
private Long userId;
private Integer backNum;
/** 领料时间 */

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/ISltAgreementReduceService.java
View File

@ -3,6 +3,7 @@ package com.bonus.material.settlement.service;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.material.settlement.domain.SltAgreementReduce;
import org.springframework.transaction.annotation.Transactional;
import com.bonus.material.work.domain.dto.SysWorkflowAuditDto;
import java.util.List;
@ -27,5 +28,10 @@ public interface ISltAgreementReduceService {
@Transactional(rollbackFor = Exception.class)
AjaxResult editApply(SltAgreementReduce sltAgreement);
/**
* 修改数据审核状态,当所有审批流全部执行完毕时调用
*/
AjaxResult audit(SysWorkflowAuditDto workflowAuditDto);
List<SltAgreementReduce> selectAuditReduceList(SltAgreementReduce sltAgreement);
}

50
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementReduceServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.bonus.material.settlement.service.impl;
import com.bonus.common.biz.enums.TmTaskTypeEnum;
import com.bonus.common.biz.enums.WorkFlowStatusEnum;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.security.utils.SecurityUtils;
@ -8,6 +9,8 @@ import com.bonus.material.basic.mapper.BmFileInfoMapper;
import com.bonus.material.settlement.domain.SltAgreementReduce;
import com.bonus.material.settlement.mapper.SltAgreementReduceMapper;
import com.bonus.material.settlement.service.ISltAgreementReduceService;
import com.bonus.material.work.domain.dto.SysWorkflowAuditDto;
import com.bonus.material.work.mapper.SysWorkflowRecordMapper;
import com.bonus.material.work.service.SysWorkflowRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -15,12 +18,15 @@ import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
@ -33,15 +39,19 @@ import java.util.stream.Collectors;
@Service
@Slf4j
public class SltAgreementReduceServiceImpl implements ISltAgreementReduceService {
@Autowired
@Resource
private SltAgreementReduceMapper sltAgreementRecudceMapper;
@Autowired
@Resource
private BmFileInfoMapper bmFileInfoMapper;
@Autowired
@Resource
private SysWorkflowRecordService workflowRecordService;
@Resource
private SysWorkflowRecordMapper workflowRecordMapper;
@Override
public List<SltAgreementReduce> selectSltAgreementReduceList(SltAgreementReduce sltAgreement) {
return sltAgreementRecudceMapper.selectSltAgreementReduceList(sltAgreement);
@ -180,6 +190,40 @@ public class SltAgreementReduceServiceImpl implements ISltAgreementReduceService
return sltAgreementRecudceMapper.selectAuditReduceList(sltAgreement);
}
/**
* 审核
* @param workflowAuditDto 费用减免审核
* @return AjaxResult结构 返回审核结果
*/
@Override
public AjaxResult audit(SysWorkflowAuditDto workflowAuditDto) {
if (null == workflowAuditDto || null == workflowAuditDto.getTaskId()) {
return AjaxResult.error("参数为空");
}
SysWorkflowAuditDto workflowRecordInfo = workflowRecordMapper.getSysWorkflowRecodeByTaskId(workflowAuditDto.getTaskId());
if (null == workflowRecordInfo) {
return AjaxResult.error("审核记录不存在");
}
// 判断审核流是否执行完毕
if (Objects.equals(workflowRecordInfo.getWorkflowStatus(), WorkFlowStatusEnum.AUDIT_FINISH.getCode())) {
// 判断传入任务ID的类型，类型异常直接终止
if (Objects.equals(workflowRecordInfo.getTaskType(), TmTaskTypeEnum.TM_TASK_PART_TYPE.getTaskTypeId())) {
try {
SltAgreementReduce sltAgreement = new SltAgreementReduce();
sltAgreement.setId(Long.valueOf(workflowAuditDto.getTaskId()));
sltAgreement.setStatus("1");
return AjaxResult.success("执行完成");
} catch (Exception e) {
return AjaxResult.error("修改任务状态失败,SQL执行异常");
}
} else {
return AjaxResult.error("该业务非费用减免任务,无法执行操作！");
}
} else {
return AjaxResult.error("审批流程未执行完毕，请检查!");
}
}
private void initSltAgreement(SltAgreementReduce sltAgreement) {
sltAgreement.setCode(generateCode());
sltAgreement.setCreateTime(new Date());

51
bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/dto/SysWorkflowAuditDto.java Normal file
View File

@ -0,0 +1,51 @@
package com.bonus.material.work.domain.dto;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* @author : 阮世耀
* @version : 1.0
* @PackagePath: com.bonus.material.work.domain.dto
* @CreateTime: 2025-02-21 01:01
* @Description: 审批流审批业务请求DTO
*/
@Data
@Accessors(chain = true)
public class SysWorkflowAuditDto {
/**
* 审批流执行任务id
*/
private Integer taskId;
/**
* 审批流执行任务类型
*/
private Integer taskType;
/**
* 审批流执行任务编码
*/
private String taskCode;
/**
* 审批流ID
*/
private Integer workflowId;
/**
* 审批流节点ID
*/
private Integer workflowNode;
/**
* 审批流状态 0：待审批 1：审批中 2：审批完成 3：审批中断
*/
private Integer workflowStatus;
/**
* 审批意见 0：拒绝 1：同意
*/
private Integer isAccept;
}

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordMapper.java
View File

@ -1,12 +1,16 @@
package com.bonus.material.work.mapper;
import com.bonus.material.work.domain.SysWorkflowConfig;
import com.bonus.material.work.domain.SysWorkflowRecord;
import com.bonus.material.work.domain.dto.SysWorkflowAuditDto;
public interface SysWorkflowRecordMapper {
// 增加审批流任务信息
int addSysWorkflowRecord(SysWorkflowRecord sysWorkflowRecord);
// 修改审批流任务信息
int updateSysWorkflowRecord(SysWorkflowRecord sysWorkflowRecord);
// 根据任务id，查询审批流任务信息
SysWorkflowAuditDto getSysWorkflowRecodeByTaskId(Integer taskId);
}

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java
View File

@ -88,9 +88,10 @@ public class SysWorkflowNodeServiceImpl implements SysWorkflowNodeService {
if (sysWorkflowNode.getConfigValues().isEmpty()){
throw new ServiceException("请选择审核人员");
}
sysWorkflowNodeMapper.deleteSysWorkflowNode(sysWorkflowNode);
for (int i = 0; i < ConfigValue.length; i++) {
SysWorkflowConfig sysWorkflowConfig = new SysWorkflowConfig();
sysWorkflowConfig.setNodeId(sysWorkflowNode.getId());
sysWorkflowConfigMapper.deleteSysWorkflowConfig(sysWorkflowConfig);
for (int i = 0; i < ConfigValue.length; i++) {
sysWorkflowConfig.setNodeId(sysWorkflowNode.getId());
sysWorkflowConfig.setConfigType(sysWorkflowNode.getNodeSignType());
sysWorkflowConfig.setConfigValue(Integer.valueOf(ConfigValue[i]));

26
bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java
View File

@ -3,12 +3,14 @@ package com.bonus.material.work.service.impl;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.settlement.service.ISltAgreementReduceService;
import com.bonus.material.task.domain.TmTask;
import com.bonus.material.task.mapper.TmTaskMapper;
import com.bonus.material.work.domain.SysWorkflowNode;
import com.bonus.material.work.domain.SysWorkflowRecord;
import com.bonus.material.work.domain.SysWorkflowRecordHistory;
import com.bonus.material.work.domain.SysWorkflowType;
import com.bonus.material.work.domain.dto.SysWorkflowAuditDto;
import com.bonus.material.work.mapper.SysWorkflowNodeMapper;
import com.bonus.material.work.mapper.SysWorkflowRecordHistoryMapper;
import com.bonus.material.work.mapper.SysWorkflowRecordMapper;
@ -27,6 +29,9 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
@Resource
private SysWorkflowRecordMapper sysWorkflowRecordMapper;
@Resource
private ISltAgreementReduceService sltAgreementReduceService;
@Resource
private SysWorkflowTypeMapper sysWorkflowTypeMapper;
@ -40,6 +45,8 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
private TmTaskMapper tmTaskMapper;
@Override
@Transactional
public int updateSysWorkflowRecordHistory(SysWorkflowRecordHistory sysWorkflowRecordHistory) {
@ -72,11 +79,30 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
sysWorkflowRecord.setWorkflowStatus(2);
sysWorkflowRecordMapper.updateSysWorkflowRecord(sysWorkflowRecord);
SysWorkflowAuditDto sysWorkflowRecodeInfo = sysWorkflowRecordMapper.getSysWorkflowRecodeByTaskId(sysWorkflowRecordHistory.getTaskId());
if (sysWorkflowRecodeInfo == null) {
throw new ServiceException("任务类型为空");
}
// 根据任务类型修改业务状态
switch (sysWorkflowRecodeInfo.getTaskType()) {
// 领料任务:2
case 2:
//修改业务状态
TmTask tmTask = new TmTask();
tmTask.setTaskId(sysWorkflowRecordHistory.getTaskId().longValue());
tmTask.setTaskStatus(1);
tmTaskMapper.updateTmTask(tmTask);
break;
// 费用减免:13
case 13:
sltAgreementReduceService.audit(sysWorkflowRecodeInfo);
break;
// 工地直转16
case 16:
break;
}
}
}else {
SysWorkflowRecord sysWorkflowRecord = new SysWorkflowRecord();

2
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
View File

@ -392,7 +392,7 @@
where m.del_flag = '0'
and m.parent_id = #{typeId}
</select>
<select id="selectAuditLeaseApplyInfoList" resultType="com.bonus.common.biz.domain.lease.LeaseApplyInfo">
<select id="selectAuditLeaseApplyInfoList" resultMap="LeaseApplyInfoResult">
select
lai.id, lai.code, lai.task_id, lai.lease_person, lai.phone, lai.type, lai.company_audit_by,lai.apply_code,
lai.company_audit_time, lai.company_audit_remark, lai.dept_audit_by, lai.dept_audit_time,

61
bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml
View File

@ -117,4 +117,65 @@
from slt_reduce_details
where apply_id = #{id}
</delete>
<select id="getAuditList" resultType="com.bonus.material.settlement.domain.SltAgreementReduce">
SELECT
sra.id as id,
sra.create_time as createTime,
su.user_name as createBy,
bu.unit_name as unitName,
bp.pro_name as projectName,
SUM(srd.lease_price * srd.num) as leasePrice,
SUM(srd.lease_money) as leaseMoney,
sra.`status`,
a.leaseMoneyAll as leaseMoneyAll
FROM
slt_reduce_apply sra
LEFT JOIN slt_reduce_details srd on sra.id=srd.apply_id
LEFT JOIN sys_user su on su.user_id=sra.creator
LEFT JOIN bm_agreement_info bai on bai.agreement_id=sra.agreement_id
LEFT JOIN bm_project bp ON bp.pro_id = bai.project_id
LEFT JOIN bm_unit bu ON bu.unit_id = bai.unit_id
LEFT JOIN sys_workflow_record swr on sra.id = swr.task_id
LEFT JOIN sys_workflow_type swt on swr.workflow_id = swt.id
LEFT JOIN sys_workflow_node swn on swt.id = swn.type_id
LEFT JOIN sys_workflow_config swc on swn.id = swc.node_id
LEFT JOIN
(
SELECT
sra.agreement_id as agreementId,
SUM(srd.lease_money) as leaseMoneyAll
FROM
slt_reduce_apply sra
LEFT JOIN slt_reduce_details srd on sra.id=srd.apply_id
GROUP BY sra.agreement_id
) a on a.agreementId=sra.agreement_id
where 1=1
<if test="userId != null and userId != ''">
AND swc.config_value = #{userId}
</if>
<if test="startTime != null and endTime != ''">
AND DATE_FORMAT(sra.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if>
<if test="startDate != null and endDate != ''">
AND DATE_FORMAT(sra.create_time, '%Y-%m-%d' ) BETWEEN #{startDate} AND #{endDate}
</if>
<if test="keyWord != null and keyWord != ''">
AND (
su.user_name LIKE concat('%', #{keyWord}, '%') or
bu.unit_name LIKE concat('%', #{keyWord}, '%') or
bp.pro_name LIKE concat('%', #{keyWord}, '%')
)
</if>
<if test="status != null and status!=''">
AND sra.status = #{status}
</if>
<if test="taskStatus !=null">
AND sra.status = #{taskStatus}
</if>
GROUP BY sra.id
ORDER BY sra.create_time DESC
</select>
</mapper>

17
bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordMapper.xml
View File

@ -26,4 +26,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update sys_workflow_record set workflow_status = #{workflowStatus} where task_id = #{taskId}
<if test="taskType != null"> and task_type = #{taskType}</if>
</update>
<select id="getSysWorkflowRecodeByTaskId" resultType="com.bonus.material.work.domain.dto.SysWorkflowAuditDto">
select
a.id,
a.task_id,
a.task_type,
a.task_code,
a.workflow_id,
a.workflow_status
from sys_workflow_record a
<where>
<if test="taskId != null">
a.task_id = #{taskId}
</if>
</where>
limit 1
</select>
</mapper>