|
|
@@ -5,7 +5,6 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
-import com.ydtech.aop.exception.DescribeException;
|
|
|
import com.ydtech.core.page.HttpResult;
|
|
|
import com.ydtech.exception.SystemException;
|
|
|
import com.ydtech.modules.admin.dao.SysAgencyFeeApprovalMapper;
|
|
|
@@ -20,11 +19,8 @@ import com.ydtech.modules.admin.model.vo.AgencyExtractFee;
|
|
|
import com.ydtech.modules.admin.model.vo.SysAgencyFeeApprovalRecordVo;
|
|
|
import com.ydtech.modules.admin.service.SysAgencyFeeApprovalService;
|
|
|
import com.ydtech.modules.admin.service.SysAgencyLeaderService;
|
|
|
-import com.ydtech.modules.admin.service.SysDeptService;
|
|
|
-import com.ydtech.modules.admin.service.SysUserService;
|
|
|
import com.ydtech.modules.base.controller.BaseController;
|
|
|
import com.ydtech.modules.order.entity.BasePageResult;
|
|
|
-import com.ydtech.modules.order.entity.InsOrders;
|
|
|
import com.ydtech.utils.StringUtils;
|
|
|
import com.ydtech.utils.idgen.IdGenerate;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -116,7 +112,8 @@ public class SysAgencyFeeApprovalServiceImpl extends ServiceImpl<SysAgencyFeeApp
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public HttpResult edit(SysAgencyFeeApprovalEditDto sysAgencyFeeApprovalEditDto) {
|
|
|
SysAgencyFeeApproval sysAgencyFeeApproval1 = sysAgencyFeeApprovalMapper.selectById(sysAgencyFeeApprovalEditDto.getId());
|
|
|
- SysAgencyFeeApproval sysAgencyFeeApproval = new SysAgencyFeeApproval();
|
|
|
+
|
|
|
+ SysAgencyFeeApproval sysAgencyFeeApproval =BeanUtil.copyProperties(sysAgencyFeeApproval1,SysAgencyFeeApproval.class);
|
|
|
String status = sysAgencyFeeApprovalEditDto.getStatus();
|
|
|
if (StringUtils.isNotEmpty(status) && status.equals("1")) {
|
|
|
//审批通过
|
|
|
@@ -131,9 +128,8 @@ public class SysAgencyFeeApprovalServiceImpl extends ServiceImpl<SysAgencyFeeApp
|
|
|
sysAgencyFeeApproval.setAuditUser(BaseController.getUser().getName());
|
|
|
//保存审批信息
|
|
|
sysAgencyFeeApprovalMapper.updateById(sysAgencyFeeApproval);
|
|
|
- SysAgencyFeeApproval sysAgencyFeeApproval2 = sysAgencyFeeApprovalMapper.selectById(sysAgencyFeeApprovalEditDto.getId());
|
|
|
//保存审批记录
|
|
|
- SysAgencyFeeApprovalRecord sysAgencyFeeApprovalRecord = BeanUtil.copyProperties(sysAgencyFeeApproval2, SysAgencyFeeApprovalRecord.class);
|
|
|
+ SysAgencyFeeApprovalRecord sysAgencyFeeApprovalRecord = BeanUtil.copyProperties(sysAgencyFeeApproval, SysAgencyFeeApprovalRecord.class);
|
|
|
sysAgencyFeeApprovalRecord.setApprovalId(sysAgencyFeeApproval.getId());
|
|
|
sysAgencyFeeApprovalRecord.setId(null);
|
|
|
sysAgencyFeeApprovalRecord.setCreateTime(new Date());
|
