huoran
/
dqFinancial
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
shijie 4 years ago
parent 2dcfb30c7d a8d712be94
commit 26e3d35ac8
5 changed files with 62 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java
  2. 2
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java
  3. 16
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
  4. 10
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java
  5. 16
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java

35
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java
Unescape View File

@ -33,22 +33,25 @@ public class DgCopyForController {
@Autowired
private IDgCopyForService copyForService;
@Log(detail = "抄送",level = 4,operationUnit = OperationUnit.COPYFOR,operationType = OperationType.INSERT)
@ApiOperation("抄送任务")
@PostMapping("/copySend")
public R copySend(@RequestBody CopySendRequest copySendRequest){
Integer businessId = copySendRequest.getBusinessId();
Integer processId = copySendRequest.getProcessId();
//String imgData = copySendRequest.getImgData();
Integer detailId = copySendRequest.getDetailId();
try {
boolean ok = copyForService.copySendUser(businessId,processId,detailId);
return ok ? R.ok() : R.error();
} catch (IOException e) {
e.printStackTrace();
return R.error().message(e.getMessage());
}
}
/**
* 后端自动处理抄送，该接口暂时无用
* */
// @Log(detail = "抄送",level = 4,operationUnit = OperationUnit.COPYFOR,operationType = OperationType.INSERT)
// @ApiOperation("抄送任务")
// @PostMapping("/copySend")
// public R copySend(@RequestBody CopySendRequest copySendRequest){
// Integer businessId = copySendRequest.getBusinessId();
// Integer processId = copySendRequest.getProcessId();
// //String imgData = copySendRequest.getImgData();
// Integer detailId = copySendRequest.getDetailId();
// try {
// boolean ok = copyForService.copySendUser(businessId,processId,detailId);
// return ok ? R.ok() : R.error();
// } catch (IOException e) {
// e.printStackTrace();
// return R.error().message(e.getMessage());
// }
// }
@Log(detail = "抄送",level = 4,operationUnit = OperationUnit.COPYFOR,operationType = OperationType.SELECT)
@ApiOperation("查询抄送详情")

2
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java
Unescape View File

@ -28,7 +28,7 @@ import java.io.IOException;
* @author Qyq
* @since 2020-11-05
*/
@Api(tags = {"回款确认"})
@Api(tags = {"财务确认"})
@RestController
@RequestMapping("/dg-payment-confirmation-consider")
public class DgPaymentConfirmationConsiderController {

16
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
Unescape View File

@ -13,6 +13,7 @@ import com.daqing.financial.guarantee.mapper.DgPaymentConfirmationConsiderMapper
import com.daqing.financial.guarantee.model.request.GuaranteeLetterQueryRequest;
import com.daqing.financial.guarantee.model.request.GuaranteeLetterUpdateStatusRequest;
import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse;
import com.daqing.financial.guarantee.service.IDgCopyForService;
import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService;
import com.daqing.financial.guarantee.util.AuditProcessUtil;
import com.daqing.financial.guarantee.util.OrdinaryUtil;
@ -60,6 +61,9 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
@Autowired
private DgGuaranteeAssignUserMapper guaranteeAssignUserMapper;
@Autowired
private IDgCopyForService copyForService;
@Override
public GuaranteeLetterListResponse selectGuaranteeLetter(String businessId,String roleId) {
GuaranteeLetterListResponse response = baseMapper.selectGuaranteeLetter(businessId,roleId);
@ -388,6 +392,12 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
paymentConfirmationConsiderFg.setImgFile("");
paymentConfirmationConsiderMapper.updateById(paymentConfirmationConsiderFg);
}
//添加抄送数据
try {
copyForService.copySendUser(businessId,8,null);
} catch (IOException e) {
e.printStackTrace();
}
//更新成功，返回操作结果
log.info(insert > 0 ? "资产部经理成功添加回款数据" : "资产部经理添加回款数据失败");
return insert > 0;
@ -463,6 +473,12 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
paymentConfirmationConsider.setAuditOpinion("");
paymentConfirmationConsider.setImgFile("");
int update = paymentConfirmationConsiderMapper.updateById(paymentConfirmationConsider);
//添加抄送数据
try {
copyForService.copySendUser(businessId,8,null);
} catch (IOException e) {
e.printStackTrace();
}
//更新成功，返回操作结果
log.info(update > 0 ? "资产部经理成功添加回款数据" : "资产部经理添加回款数据失败");
return update > 0;

10
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java
Unescape View File

@ -12,6 +12,7 @@ import com.daqing.financial.guarantee.model.request.LoanNoticeQueryRequest;
import com.daqing.financial.guarantee.model.request.LoanNoticeUpdateRequest;
import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse;
import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse;
import com.daqing.financial.guarantee.service.IDgCopyForService;
import com.daqing.financial.guarantee.service.IDgLoanNoticeService;
import com.daqing.financial.guarantee.util.AuditProcessUtil;
import com.daqing.financial.guarantee.util.OrdinaryUtil;
@ -65,6 +66,9 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
@Autowired
private AlInsuranceListMapper alInsuranceListMapper;
@Autowired
private IDgCopyForService copyForService;
@Autowired
private HrmsFeignService hrmsFeignService;
/**
@ -182,6 +186,12 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
}
}
}
//添加抄送数据
try {
copyForService.copySendUser(businessId,10,null);
} catch (IOException e) {
e.printStackTrace();
}
int insert = alInsuranceListMapper.insert(alInsuranceList);
//添加成功，返回操作结果
log.info(insert > 0 ? "业务流程已完成,进入保后管理" : "业务流程更新失败");

16
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java
Unescape View File

@ -12,6 +12,7 @@ import com.daqing.financial.guarantee.mapper.DgPaymentConfirmationConsiderMapper
import com.daqing.financial.guarantee.model.request.PaymentConfirmationQueryRequest;
import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateRequest;
import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse;
import com.daqing.financial.guarantee.service.IDgCopyForService;
import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService;
import com.daqing.financial.guarantee.util.AuditProcessUtil;
import com.daqing.financial.guarantee.util.OrdinaryUtil;
@ -53,6 +54,9 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
@Autowired
private DgGuaranteeLetterAssignUserMapper guaranteeLetterAssignUserMapper;
@Autowired
private IDgCopyForService copyForService;
/**
* 获取当前登录用户信息
*/
@ -311,6 +315,12 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
loanNoticeFG.setAuditOpinion("");
insert = dgLoanNoticeMapper.updateById(loanNoticeFG);
}
//添加抄送数据
try {
copyForService.copySendUser(businessId,9,null);
} catch (IOException e) {
e.printStackTrace();
}
//更新成功，返回操作结果
log.info(insert > 0 ? "法规部经理确认成功" : "法规部经理确认失败");
return insert > 0;
@ -349,6 +359,12 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
loanNotice.setStatus(StatusCode.SP_IN_REVIEW);
loanNotice.setOperatingStatus(StatusCode.CZ_ON_HAND);
int updateById = dgLoanNoticeMapper.updateById(loanNotice);
//添加抄送数据
try {
copyForService.copySendUser(businessId,9,null);
} catch (IOException e) {
e.printStackTrace();
}
//更新成功，返回操作结果
log.info(updateById > 0 ? "驳回后再次财务部经理确认成功" : "驳回后再次财务部经理确认失败");
return updateById > 0;

Write Preview
Loading…
Cancel
Save