diff --git a/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdDynamicCreditController.java b/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdDynamicCreditController.java index f6cac954..a91ad9f0 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdDynamicCreditController.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdDynamicCreditController.java @@ -21,7 +21,9 @@ import com.kms.common.utils.BaseEntityUtils; import com.kms.common.utils.UserUtils; import com.kms.enterprise.domain.BsSgcYxjdCreditApproval; +import com.kms.enterprise.domain.BsSgcYxjdEnterpriseInfo; import com.kms.enterprise.service.BsSgcYxjdCreditApprovalService; +import com.kms.enterprise.service.BsSgcYxjdEnterpriseInfoService; import com.kms.framework.manager.factory.AsyncFactory; import com.kms.system.domain.SysUserRole; import com.kms.system.service.SysDeptService; @@ -78,6 +80,9 @@ public class BsSgcYxjdDynamicCreditController extends BaseController { @Autowired private SysRoleService sysRoleService; + @Autowired + private BsSgcYxjdEnterpriseInfoService bsSgcYxjdEnterpriseInfoService; + /** * 查询动态信用列表 @@ -147,17 +152,26 @@ public class BsSgcYxjdDynamicCreditController extends BaseController { @PostMapping @ApiOperation("动态信用新增") public AjaxResult add(@RequestBody BsSgcYxjdDynamicCredit bsSgcYxjdDynamicCredit) { - BaseEntityUtils.preInsert(bsSgcYxjdDynamicCredit); - bsSgcYxjdDynamicCreditService.save(bsSgcYxjdDynamicCredit); - String loginId = StpUtil.getLoginIdAsString(); - SysUser user = sysUserService.getById(loginId); - SysDept sysDept = sysDeptService.getById(user.getDeptId()); - BsSgcYxjdCreditApproval creditApproval = new BsSgcYxjdCreditApproval(); - creditApproval.setCreditId(bsSgcYxjdDynamicCredit.getId()); - creditApproval.setProcessProgress(sysDept.getDeptName() + "-填写"); - creditApproval.setApprovalTime(new Date()); - BaseEntityUtils.preInsert(creditApproval); - return toAjax(bsSgcYxjdCreditApprovalService.save(creditApproval)); + if (bsSgcYxjdDynamicCredit.getType().equals("0")) { + BaseEntityUtils.preInsert(bsSgcYxjdDynamicCredit); + bsSgcYxjdDynamicCreditService.save(bsSgcYxjdDynamicCredit); + String loginId = StpUtil.getLoginIdAsString(); + SysUser user = sysUserService.getById(loginId); + SysDept sysDept = sysDeptService.getById(user.getDeptId()); + BsSgcYxjdCreditApproval creditApproval = new BsSgcYxjdCreditApproval(); + creditApproval.setCreditId(bsSgcYxjdDynamicCredit.getId()); + creditApproval.setProcessProgress(sysDept.getDeptName() + "-填写"); + creditApproval.setApprovalTime(new Date()); + BaseEntityUtils.preInsert(creditApproval); + return toAjax(bsSgcYxjdCreditApprovalService.save(creditApproval)); + }else { + BsSgcYxjdEnterpriseInfo byId = bsSgcYxjdEnterpriseInfoService.getById(bsSgcYxjdDynamicCredit.getEnterpriseId()); + Double idScore = Double.valueOf(byId.getScore()); + Double bonusPoints = Double.valueOf(bsSgcYxjdDynamicCredit.getBonusPoints()); + byId.setScore(String.valueOf(idScore-bonusPoints)); + return toAjax(bsSgcYxjdDynamicCreditService.save(bsSgcYxjdDynamicCredit)); + } + } /** @@ -167,10 +181,14 @@ public class BsSgcYxjdDynamicCreditController extends BaseController { @Log(title = "动态信用修改", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody BsSgcYxjdDynamicCredit bsSgcYxjdDynamicCredit) { + if (bsSgcYxjdDynamicCredit.getType().equals("0")) { + String status = bsSgcYxjdDynamicCredit.getStatus(); + AsyncFactory.recordDynamicCredit(bsSgcYxjdDynamicCredit.getId(), status,bsSgcYxjdDynamicCredit.getBonusPoints(),bsSgcYxjdDynamicCredit.getRemark()); + return toAjax(bsSgcYxjdDynamicCreditService.updateById(bsSgcYxjdDynamicCredit)); + }else { + return toAjax(bsSgcYxjdDynamicCreditService.updateById(bsSgcYxjdDynamicCredit)); + } - String status = bsSgcYxjdDynamicCredit.getStatus(); - AsyncFactory.recordDynamicCredit(bsSgcYxjdDynamicCredit.getId(), status,bsSgcYxjdDynamicCredit.getBonusPoints()); - return toAjax(bsSgcYxjdDynamicCreditService.updateById(bsSgcYxjdDynamicCredit)); } /** diff --git a/jwtech-system/src/main/java/com/kms/framework/manager/factory/AsyncFactory.java b/jwtech-system/src/main/java/com/kms/framework/manager/factory/AsyncFactory.java index 238a6132..29f219b5 100644 --- a/jwtech-system/src/main/java/com/kms/framework/manager/factory/AsyncFactory.java +++ b/jwtech-system/src/main/java/com/kms/framework/manager/factory/AsyncFactory.java @@ -153,7 +153,7 @@ public class AsyncFactory { } - public static TimerTask recordDynamicCredit(String id,String status,String score) { + public static TimerTask recordDynamicCredit(String id,String status,String score,String remark) { return new TimerTask() { @Override public void run() { @@ -195,6 +195,20 @@ public class AsyncFactory { double v = Double.parseDouble(idScore); byId.setScore(String.valueOf(v+Double.parseDouble(score))); SpringUtils.getBean(BsSgcYxjdEnterpriseInfoService.class).updateById(byId); + } else if (status.equals("2")) { + LambdaQueryWrapper lambdaQuery = Wrappers.lambdaQuery(BsSgcYxjdCreditApproval.class); + lambdaQuery.eq(BsSgcYxjdCreditApproval::getCreditId, id); + lambdaQuery.eq(BsSgcYxjdCreditApproval::getStatus, "0"); + BsSgcYxjdCreditApproval one = SpringUtils.getBean(BsSgcYxjdCreditApprovalService.class).getOne(lambdaQuery); + one.setApprovalOpinions(remark); + SpringUtils.getBean(BsSgcYxjdCreditApprovalService.class).updateById(one); + + BsSgcYxjdCreditApproval creditApproval = new BsSgcYxjdCreditApproval(); + creditApproval.setCreditId(id); + creditApproval.setProcessProgress("审核员-被驳回"); + creditApproval.setApprovalTime(new Date()); + BaseEntityUtils.preInsert(creditApproval); + SpringUtils.getBean(BsSgcYxjdCreditApprovalService.class).save(creditApproval); }