diff --git a/dq-financial-guarantee/pom.xml b/dq-financial-guarantee/pom.xml index 8b487c7b..07e37736 100644 --- a/dq-financial-guarantee/pom.xml +++ b/dq-financial-guarantee/pom.xml @@ -25,6 +25,12 @@ 0.0.1-SNAPSHOT compile + + + cn.hutool + hutool-all + 5.3.8 + org.springframework.boot diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java index 7ca8f764..8d10c31b 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java @@ -1,8 +1,21 @@ package com.daqing.financial.guarantee.controller; +import com.daqing.financial.guarantee.model.request.GuaranteeLetterQueryRequest; +import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse; +import com.daqing.financial.guarantee.model.response.PersonalEfficiencyListResponse; +import com.daqing.financial.guarantee.service.IDgEfficiencyService; +import com.daqing.framework.model.response.ResponseResult; +import com.daqing.framework.utils.PageUtils; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 流程效率 * @@ -12,4 +25,15 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/guarantee/efficiency") public class DgEfficiencyController { + + @Autowired + private IDgEfficiencyService iDgEfficiencyService; + + @ApiOperation(value = "个人效率记录列表") + @PostMapping("/personalEfficiencyList") + public ResponseResult personalEfficiencyList(){ + List responseList = iDgEfficiencyService.queryPersonalEfficiencyList(); + return ResponseResult.SUCCESS(responseList); + } + } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java index 4d46fbd0..6a9a0662 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java @@ -69,6 +69,12 @@ public interface HrmsFeignService { @GetMapping("hrms/employee/selectUserRole") ResponseResult selectUserRole(@RequestParam("userId") Long userId,@RequestParam("roleId")Long roleId); + /** + * 根据用户id获取所在部门ids + */ + @GetMapping("/hrms/employee/getDepartmentIds") + String getDepartmentIds(@RequestParam("userId") Integer userId); + /* *//** * 根据角色id查询所有权限 *//* diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java new file mode 100644 index 00000000..b35bfdcf --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java @@ -0,0 +1,57 @@ +package com.daqing.financial.guarantee.model.response; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.daqing.framework.utils.excel.ApprovalStatusConverter; +import com.daqing.framework.utils.excel.BusinessStatusConverter; +import com.daqing.framework.utils.excel.OperatingStatusConverter; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author chen + * @DATE 2020/12/28 16:31 + * @Version 1.0 + */ +@Data +public class PersonalEfficiencyListResponse { + + @ApiModelProperty(value = "提单人") + @ExcelProperty(value = "提单人",index = 1) + private String applicant; + + @ApiModelProperty("客户名称") + @ExcelProperty(value = "客户名称",index = 2) + private String clientName; + + @ApiModelProperty("申请日期") + @ExcelProperty(value = "申请日期",index = 3) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date applicationDate; + + @ApiModelProperty("累计耗时") + @ExcelProperty(value = "累计耗时",index = 4) + private String timeConsuming; + + @ApiModelProperty("完成时间") + @ExcelProperty(value = "完成时间",index = 5) + private String completeTime; + + @ApiModelProperty("任务节点") + @ExcelProperty(value = "任务节点",index = 6) + private Double taskNode; + + @ApiModelProperty("审批状态") + @ExcelProperty(value = "审核状态",index = 7,converter = ApprovalStatusConverter.class) + private Integer approveStatus; + + @ApiModelProperty("业务状态") + @ExcelProperty(value = "业务状态",index = 8,converter = BusinessStatusConverter.class) + private Integer businessStatus; + + @ApiModelProperty("操作状态") + @ExcelProperty(value = "操作状态",index = 9,converter = OperatingStatusConverter.class) + private Integer operatingStatus; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java index b52c529a..daa9fc95 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java @@ -1,12 +1,18 @@ package com.daqing.financial.guarantee.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.daqing.financial.guarantee.model.response.PersonalEfficiencyListResponse; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; +import org.springframework.stereotype.Service; + +import java.util.List; /** * @auther River * @date 2020/11/10 11:33 */ + public interface IDgEfficiencyService extends IService { + List queryPersonalEfficiencyList(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java index f92e1232..ea2757d2 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController; import com.daqing.financial.guarantee.feign.CrmsFeignService; import com.daqing.financial.guarantee.feign.HrmsFeignService; @@ -14,29 +15,22 @@ import com.daqing.financial.guarantee.model.response.BusinessApplicationListResp import com.daqing.financial.guarantee.model.response.DgApplyAmountInfoResponse; import com.daqing.financial.guarantee.model.response.DgEnclosureInfoResponse; import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.util.ArraysUtil; import com.daqing.financial.guarantee.util.AuditProcessUtil; -import com.daqing.framework.domain.crms.CrmsCustomerRelated; +import com.daqing.financial.guarantee.util.OrdinaryUtil; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; import com.daqing.framework.domain.crms.response.CrmsCode; import com.daqing.framework.domain.guarantee.*; -import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse; -import com.daqing.framework.domain.hrms.DepartmentVO; -import com.daqing.framework.domain.hrms.PermissionEntity; -import com.daqing.framework.domain.hrms.ext.UserDeptVO; import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.model.StatusCode; +import com.daqing.framework.model.response.CommonCode; import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.util.RandomUtil; import com.daqing.framework.util.RedisUtil; import com.daqing.framework.utils.PageUtils; import com.daqing.framework.utils.excel.ExcelUtil; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.beanutils.ConvertUtils; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -46,8 +40,10 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; /** *

@@ -209,7 +205,8 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl implements IDgEfficiencyService { + @Override + public List queryPersonalEfficiencyList() { + + + + + return null; + } } \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java index 456b2d79..9680eb81 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java @@ -3,6 +3,7 @@ package com.daqing.financial.guarantee.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController; import com.daqing.financial.guarantee.feign.CrmsFeignService; import com.daqing.financial.guarantee.feign.HrmsFeignService; @@ -12,17 +13,17 @@ import com.daqing.financial.guarantee.model.request.GuaranteeRequest; import com.daqing.financial.guarantee.model.request.InvestigateGuaranteeRequest; import com.daqing.financial.guarantee.model.response.*; import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.util.ArraysUtil; import com.daqing.financial.guarantee.util.AuditProcessUtil; +import com.daqing.financial.guarantee.util.OrdinaryUtil; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; import com.daqing.framework.domain.crms.response.CrmsCode; import com.daqing.framework.domain.guarantee.*; import com.daqing.framework.domain.guarantee.po.DgGuaranteePO; -import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse; import com.daqing.framework.domain.hrms.response.HrmsCode; import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.model.StatusCode; +import com.daqing.framework.model.response.CommonCode; import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.util.RedisUtil; @@ -38,7 +39,10 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; /** *

@@ -457,7 +461,8 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl 0){ //获取之前指定的a角用户 @@ -243,7 +240,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0){ //更新a角 @@ -302,7 +300,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0){ //根据业务id查询贷审会数据 @@ -342,7 +341,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0){ //更新法规部经理数据 @@ -466,7 +467,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0){ //更新法规部经理数据 @@ -528,7 +530,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0 ? "首次a角用户确认担保函更新成功" : "首次a角用户确认担保函更新失败"); //同时往审核流程进程表新增一条记录 String account = DgApplyAmountInfoController.getAccount(); - AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,PromptSuccess.DB_A_ID,"","",""); + String departmentId = OrdinaryUtil.getDepartmentId(currentUser); + AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.DB_A_ID,"","",""); //更新成功后,判断b角用户是否确认 if (i > 0){ QueryWrapper tempB = new QueryWrapper<>(); @@ -577,7 +580,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0 ? "驳回后a角用户确认担保函更新成功" : "驳回后a角用户确认担保函更新失败"); //同时往审核流程进程表新增一条记录 String account = DgApplyAmountInfoController.getAccount(); - AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,PromptSuccess.DB_A_ID,"","",""); + String departmentId = OrdinaryUtil.getDepartmentId(currentUser); + AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.DB_A_ID,"","",""); //更新成功后,判断b角用户是否确认 if (i > 0){ QueryWrapper tempB = new QueryWrapper<>(); @@ -618,7 +622,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0 ? "a角用户驳回担保函更新成功" : "a角用户驳回担保函更新失败"); //同时往审核流程进程表新增一条记录 String account = DgApplyAmountInfoController.getAccount(); - AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,PromptSuccess.DB_A_ID,"","",""); + String departmentId = OrdinaryUtil.getDepartmentId(currentUser); + AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.DB_A_ID,"","",""); //更新成功后,更新b角数据及更新法规部经理数据 if (i > 0){ //更新b用户的审核状态为驳回,操作状态为已处理 @@ -667,7 +672,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0 ? "首次b角用户确认担保函更新成功" : "首次b角用户确认担保函更新失败"); //同时往审核流程进程表新增一条记录 String account = DgApplyAmountInfoController.getAccount(); - AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,PromptSuccess.DB_B_ID,"","",""); + String departmentId = OrdinaryUtil.getDepartmentId(currentUser); + AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.DB_B_ID,"","",""); //更新成功后,判断a角用户是否确认 if (i > 0){ QueryWrapper tempB = new QueryWrapper<>(); @@ -717,7 +723,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0 ? "驳回后b角用户确认担保函更新成功" : "驳回后b角用户确认担保函更新失败"); //同时往审核流程进程表新增一条记录 String account = DgApplyAmountInfoController.getAccount(); - AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,PromptSuccess.DB_B_ID,"","",""); + String departmentId = OrdinaryUtil.getDepartmentId(currentUser); + AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.DB_B_ID,"","",""); //更新成功后,判断a角用户是否确认 if (i > 0){ QueryWrapper tempB = new QueryWrapper<>(); @@ -758,7 +765,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0 ? "b角用户驳回担保函更新成功" : "b角用户驳回担保函更新失败"); //同时往审核流程进程表新增一条记录 String account = DgApplyAmountInfoController.getAccount(); - AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,PromptSuccess.DB_B_ID,"","",""); + String departmentId = OrdinaryUtil.getDepartmentId(currentUser); + AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.DB_B_ID,"","",""); //更新成功后,更新a角数据及更新法规部经理数据 if (i > 0){ //更新a用户的审核状态为驳回,操作状态为已处理 diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java index 916898ef..ebb2c6c3 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java @@ -2,6 +2,7 @@ package com.daqing.financial.guarantee.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController; import com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper; import com.daqing.financial.guarantee.mapper.DgGuaranteeAssignUserMapper; @@ -12,8 +13,8 @@ import com.daqing.financial.guarantee.model.response.DgLoanCommitteeConsiderInfo import com.daqing.financial.guarantee.model.response.DgLoanCommitteeConsiderResponse; import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService; import com.daqing.financial.guarantee.service.IDgLoanCommitteeConsiderService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.util.AuditProcessUtil; +import com.daqing.financial.guarantee.util.OrdinaryUtil; import com.daqing.framework.domain.crms.response.CrmsCode; import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider; @@ -144,9 +145,10 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl 0){ QueryWrapper businessProcessStatusQueryWrapper = new QueryWrapper<>(); @@ -142,7 +140,8 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl 0){ QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java index 713866e0..c58345c6 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java @@ -3,6 +3,7 @@ package com.daqing.financial.guarantee.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController; import com.daqing.financial.guarantee.feign.CrmsFeignService; import com.daqing.financial.guarantee.feign.HrmsFeignService; @@ -10,25 +11,33 @@ import com.daqing.financial.guarantee.mapper.*; import com.daqing.financial.guarantee.model.request.ApprovalMessageRequest; import com.daqing.financial.guarantee.model.request.InvestigateMessageRequest; import com.daqing.financial.guarantee.model.request.MessageRequest; -import com.daqing.financial.guarantee.model.response.*; +import com.daqing.financial.guarantee.model.response.DgApplyAmountInfoResponse; +import com.daqing.financial.guarantee.model.response.DgEnclosureInfoResponse; +import com.daqing.financial.guarantee.model.response.MessageDetailResponse; +import com.daqing.financial.guarantee.model.response.MessageInvestigationListResponse; import com.daqing.financial.guarantee.service.IDgMessageInvestigationService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.util.ArraysUtil; import com.daqing.financial.guarantee.util.AuditProcessUtil; +import com.daqing.financial.guarantee.util.OrdinaryUtil; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; import com.daqing.framework.domain.crms.response.CrmsCode; import com.daqing.framework.domain.guarantee.*; import com.daqing.framework.domain.hrms.response.HrmsCode; import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.model.StatusCode; +import com.daqing.framework.model.response.CommonCode; import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.ResponseResult; +import com.daqing.framework.util.RedisUtil; import com.daqing.framework.utils.PageUtils; import com.daqing.framework.utils.excel.ExcelUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Arrays; @@ -278,7 +287,8 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl 0){ @@ -183,7 +184,8 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ QueryWrapper wrapperTemp = new QueryWrapper<>(); @@ -212,7 +214,8 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ //更新法规部经理数据 @@ -275,7 +278,8 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ @@ -319,7 +323,8 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ QueryWrapper queryWrapperCwb = new QueryWrapper<>(); @@ -354,7 +359,8 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ QueryWrapper queryWrapperT = new QueryWrapper<>(); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java index 25262550..f36bd107 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java @@ -2,6 +2,7 @@ package com.daqing.financial.guarantee.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController; import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper; @@ -13,8 +14,8 @@ import com.daqing.financial.guarantee.model.response.DgWorkConferenceResponse; import com.daqing.financial.guarantee.model.response.GuaranteeDetailResponse; import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService; import com.daqing.financial.guarantee.service.IDgWorkConferenceConsiderService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.util.AuditProcessUtil; +import com.daqing.financial.guarantee.util.OrdinaryUtil; import com.daqing.framework.domain.crms.response.CrmsCode; import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider; import com.daqing.framework.domain.guarantee.DgWorkConferenceConsider; @@ -154,8 +155,9 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl org.springframework.boot spring-boot-maven-plugin - - exec - + + +