diff --git a/dq-financial-api/src/main/java/com/daqing/financial/guarantee/DgStatisticsControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/guarantee/DgStatisticsControllerApi.java deleted file mode 100644 index 7d8796ad..00000000 --- a/dq-financial-api/src/main/java/com/daqing/financial/guarantee/DgStatisticsControllerApi.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.daqing.financial.guarantee; - -import io.swagger.annotations.Api; - -/** - * @auther River - * @date 2020/11/5 14:29 - */ -@Api(value = "担保业务统计",tags = "提供业务统计增删改查的方法") -public interface DgStatisticsControllerApi { -} diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java index d6d021c4..efe663a8 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java @@ -2,6 +2,8 @@ package com.daqing.financial.crms.controller; import com.daqing.financial.crms.CustomerControllerApi; import com.daqing.financial.crms.service.CustomerService; +import com.daqing.framework.domain.crms.CompanyCustomerEntity; +import com.daqing.framework.domain.crms.CustomerEntity; import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI; import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU; import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI; @@ -153,4 +155,14 @@ public class CustomerController implements CustomerControllerApi { return customerService.queryCustomerInfoById(applyAmountInfo); } + + /** + * 查询所有客户编号/客户名称 + */ + @GetMapping("/queryCompanyCodeAndName") + public ResponseResult queryCompanyCodeAndName(int type){ + + Listlist = customerService.queryCompanyCodeAndName(type); + return ResponseResult.SUCCESS(list); + } } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java index cc2e41d0..5628e1ba 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java @@ -2,6 +2,7 @@ package com.daqing.financial.crms.dao; import com.daqing.framework.domain.crms.CompanyCustomerEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.daqing.framework.domain.crms.CustomerEntity; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; import com.daqing.framework.domain.crms.response.CompanyCustomerResponse; import org.apache.ibatis.annotations.Mapper; @@ -27,6 +28,4 @@ public interface CompanyCustomerDao extends BaseMapper { CompanyCustomerResponse queryCompanyInfo(@Param("applyAmountInfo") DgApplyAmountInfoRequest applyAmountInfo); - List queryCompanyCodeAndName(); - } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java index f8e8585f..5863ef98 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java @@ -34,4 +34,6 @@ public interface CustomerDao extends BaseMapper { boolean updateCustomer(CustomerEntity customerEntity); List listCustomerId(); + + List queryCompanyCodeAndName(int type); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java index c2e7cf89..bc9c708a 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java @@ -1,6 +1,7 @@ package com.daqing.financial.crms.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.daqing.framework.domain.crms.CompanyCustomerEntity; import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI; import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU; import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI; @@ -45,5 +46,7 @@ public interface CustomerService extends IService { void excelTemplate(HttpServletResponse response); ResponseResult queryCustomerInfoById(DgApplyAmountInfoRequest applyAmountInfo); + + List queryCompanyCodeAndName(int type); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index 185182ab..3edab2ac 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -533,9 +533,8 @@ public class CustomerServiceImpl extends ServiceImpl().SUCCESS(companyCustomerResponse); } -/* @Override - public List queryCustomerCodeAndName() { - Listlist = companyCustomerDao.queryCustomerCodeAndName(); + public List queryCompanyCodeAndName(int type) { + Listlist = customerDao.queryCompanyCodeAndName(type); return list; - }*/ + } } \ No newline at end of file diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml index c48c5667..2d05cc87 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml @@ -5,18 +5,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml index 7b4db4b2..807dbea4 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml @@ -90,6 +90,10 @@ WHERE del_or_not = 0; + + \ No newline at end of file diff --git a/dq-financial-guarantee/pom.xml b/dq-financial-guarantee/pom.xml index b562ea92..7f2fbe96 100644 --- a/dq-financial-guarantee/pom.xml +++ b/dq-financial-guarantee/pom.xml @@ -64,7 +64,12 @@ lombok 1.18.12 --> - + + org.freemarker + freemarker + 2.3.28 + compile + com.baomidou diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgBankController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgBankController.java new file mode 100644 index 00000000..e8cb9a8a --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgBankController.java @@ -0,0 +1,41 @@ +package com.daqing.financial.guarantee.controller; + + +import com.daqing.financial.guarantee.service.IDgBankService; +import com.daqing.framework.domain.guarantee.DgBank; +import com.daqing.framework.model.response.ResponseResult; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import org.springframework.stereotype.Controller; + +import javax.annotation.Resource; +import java.util.List; + +/** + *

+ * 前端控制器 + *

+ * + * @author Qyq + * @since 2020-11-12 + */ +@RestController +@RequestMapping("/dg-bank") +public class DgBankController { + @Resource + private IDgBankService dgBankService; + + /** + * 查询所有银行数据 + * @param + * @return + */ + @GetMapping("/bankList") + @ApiOperation(value = "查询所有银行数据") + public ResponseResult bankList(){ + List result = dgBankService.list(); + return ResponseResult.SUCCESS(result); + } + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java index 2394f67a..c91e9461 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java @@ -1,9 +1,14 @@ package com.daqing.financial.guarantee.controller; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; +import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest; +import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse; +import com.daqing.financial.guarantee.service.IDgComplianceInvestigationService; +import com.daqing.framework.model.response.ResponseResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; /** *

@@ -14,7 +19,31 @@ import org.springframework.web.bind.annotation.RestController; * @since 2020-11-05 */ @RestController -@RequestMapping("/dg-compliance-investigation") +@RequestMapping("/compliance/investigation") +@Api(value = "合规调查",tags = "合规调查") public class DgComplianceInvestigationController { + @Autowired + private IDgComplianceInvestigationService iDgComplianceInvestigationService; + + /** + * 列表 + */ + @GetMapping("/list") + @ApiOperation(value = "合规调查列表",notes = "合规调查列表",response = DgComplianceInvestigationResponse.class) + public ResponseResult list(@RequestParam("page") Integer page, + @RequestParam("size") Integer size, DgComplianceInvestigationRequest dgComplianceInvestigationRequest) { + return ResponseResult.SUCCESS(iDgComplianceInvestigationService.list(page,size,dgComplianceInvestigationRequest)); + } + + /** + * 调查同意 + */ + @PostMapping("/surveyConsent") + @ApiOperation(value = "调查同意",notes = "调查同意") + public ResponseResult surveyConsent(@RequestParam("iid") Integer iid, + @RequestParam("fileUrl") String fileUrl,@RequestParam("auditOpinion") String auditOpinion) { + Boolean result = iDgComplianceInvestigationService.surveyConsent(iid, fileUrl, auditOpinion); + return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + } } 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 new file mode 100644 index 00000000..7ca8f764 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java @@ -0,0 +1,15 @@ +package com.daqing.financial.guarantee.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 流程效率 + * + * @auther River + * @date 2020/11/5 14:20 + */ +@RestController +@RequestMapping("/guarantee/efficiency") +public class DgEfficiencyController { +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java index 5e207256..1218375e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java @@ -1,11 +1,11 @@ package com.daqing.financial.guarantee.controller; -import com.daqing.financial.guarantee.DgStatisticsControllerApi; import com.daqing.financial.guarantee.model.request.DgStatisticsRequest; import com.daqing.financial.guarantee.model.response.DgStatisticsListRefuseResponse; import com.daqing.financial.guarantee.model.response.DgStatisticsListResponse; import com.daqing.financial.guarantee.service.IDgStatisticsService; import com.daqing.framework.model.response.ResponseResult; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -23,7 +23,8 @@ import javax.servlet.http.HttpServletResponse; */ @RestController @RequestMapping("/guarantee/statistics") -public class DgStatisticsController implements DgStatisticsControllerApi { +@Api(value = "担保业务统计",tags = "提供业务统计增删改查的方法") +public class DgStatisticsController { @Autowired private IDgStatisticsService iDgStatisticsService; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgBankMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgBankMapper.java new file mode 100644 index 00000000..525f9f6c --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgBankMapper.java @@ -0,0 +1,18 @@ +package com.daqing.financial.guarantee.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.daqing.framework.domain.guarantee.DgBank; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author Qyq + * @since 2020-11-12 + */ +@Mapper +public interface DgBankMapper extends BaseMapper { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java index 8e8ff1a5..b848f8ea 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java @@ -1,8 +1,15 @@ package com.daqing.financial.guarantee.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest; +import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse; import com.daqing.framework.domain.guarantee.DgComplianceInvestigation; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; /** *

@@ -15,4 +22,15 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface DgComplianceInvestigationMapper extends BaseMapper { + IPage list(Page page, @Param("cr") DgComplianceInvestigationRequest dgComplianceInvestigationRequest); + + Boolean surveyConsent(@Param("iid") Integer iid, @Param("fileUrl") String fileUrl, + @Param("auditOpinion") String auditOpinion, @Param("date")Date date, + @Param("empId") Integer empId); + + Boolean surveyReturn(@Param("iid") Integer iid,@Param("auditOpinion") String auditOpinion, + @Param("empId") Integer empId,@Param("date") Date date); + + Boolean surveyRefuse(@Param("iid") Integer iid,@Param("auditOpinion") String auditOpinion, + @Param("empId")Integer empId,@Param("date") Date date); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgEfficiencyMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgEfficiencyMapper.java new file mode 100644 index 00000000..eac03286 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgEfficiencyMapper.java @@ -0,0 +1,18 @@ +package com.daqing.financial.guarantee.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.daqing.financial.guarantee.model.request.DgEfficiencyPersonRequest; +import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; +import com.daqing.framework.domain.guarantee.po.DgEfficiencyPersonPO; +import org.apache.ibatis.annotations.Param; + +/** + * @auther River + * @date 2020/11/10 11:30 + */ +public interface DgEfficiencyMapper extends BaseMapper { + + IPage personList(Page page, @Param("pr")DgEfficiencyPersonRequest dgEfficiencyPersonRequest); +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgComplianceInvestigationRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgComplianceInvestigationRequest.java new file mode 100644 index 00000000..ae1c5a45 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgComplianceInvestigationRequest.java @@ -0,0 +1,24 @@ +package com.daqing.financial.guarantee.model.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; + +/** + * 合规调查请求参数 + * + * @auther River + * @date 2020/11/11 16:16 + */ +@Data +@ToString +public class DgComplianceInvestigationRequest implements Serializable { + + @ApiModelProperty("流程状态,0:驳回,1:审批中") + private Integer status; + + @ApiModelProperty("业务编号或者客户名称") + private String codeOrName; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgEfficiencyPersonRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgEfficiencyPersonRequest.java new file mode 100644 index 00000000..7640d840 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgEfficiencyPersonRequest.java @@ -0,0 +1,42 @@ +package com.daqing.financial.guarantee.model.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; +import java.util.Date; + +/** + * 业务效率个人请求参数 + * + * @auther River + * @date 2020/11/11 10:39 + */ +@Data +@ToString +public class DgEfficiencyPersonRequest implements Serializable { + + @ApiModelProperty("申请时间,固定类型,0:今天,1:昨天,2:本周,3:本月,4:本年") + private Integer createFixedTime; + + @ApiModelProperty("申请时间,自定义时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createCustomTime; + + @ApiModelProperty("流程状态,0->我发起,1->待审批,2->已审批,3->抄送我") + private Integer flowStatus; + + @ApiModelProperty("提单人或者客户名称") + private String empOrName; + + @ApiModelProperty("操作人id") + private Integer personId; + + @ApiModelProperty("辅助字段,不用管,起始时间") + private String startTime; + + @ApiModelProperty("辅助字段,不用管,结束时间") + private String endTime; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgEfficiencyTeamRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgEfficiencyTeamRequest.java new file mode 100644 index 00000000..8ac26f5e --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgEfficiencyTeamRequest.java @@ -0,0 +1,43 @@ +package com.daqing.financial.guarantee.model.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 业务效率团队请求参数 + * + * @auther River + * @date 2020/11/10 16:00 + */ +@Data +@ToString +public class DgEfficiencyTeamRequest implements Serializable { + + @ApiModelProperty("申请时间,固定类型,0:今天,1:昨天,2:本周,3:本月,4:本年") + private Integer createFixedTime; + + @ApiModelProperty("申请时间,自定义时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createCustomTime; + + @ApiModelProperty("流程状态,1->审核中,2->已审核,3->拒绝,4->驳回,5->撤销") + private Integer flowStatus; + + @ApiModelProperty("提单人或者客户名称") + private String empOrName; + + @ApiModelProperty("该团队(部门)下所有提单人(员工)") + private List empIds; + + @ApiModelProperty("辅助字段,不用管,起始时间") + private String startTime; + + @ApiModelProperty("辅助字段,不用管,结束时间") + private String endTime; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationResponse.java new file mode 100644 index 00000000..e211858e --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationResponse.java @@ -0,0 +1,54 @@ +package com.daqing.financial.guarantee.model.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; +import java.util.Date; + +/** + * 合规调查响应 + * + * @auther River + * @date 2020/11/11 16:22 + */ +@Data +@ToString +public class DgComplianceInvestigationResponse implements Serializable { + + @ApiModelProperty("id") + private Integer id; + + @ApiModelProperty("业务编号") + private String businessCode; + + @ApiModelProperty("客户名称") + private String name; + + @ApiModelProperty("联系电话") + private String phone; + + @ApiModelProperty("业务类别") + private String businessType; + + @ApiModelProperty("金额") + private Double applyAmount; + + @ApiModelProperty("期限") + private String applyTime; + + @ApiModelProperty("申请日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date createTime; + + @ApiModelProperty("当前审批人") + private String empName; + + @ApiModelProperty("状态,0:,1:,2:,3:,4:") + private Integer status; + + @ApiModelProperty("合规调查表id") + private Integer iId; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgBankService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgBankService.java new file mode 100644 index 00000000..b31a6779 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgBankService.java @@ -0,0 +1,16 @@ +package com.daqing.financial.guarantee.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.daqing.framework.domain.guarantee.DgBank; + +/** + *

+ * 服务类 + *

+ * + * @author Qyq + * @since 2020-11-12 + */ +public interface IDgBankService extends IService { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java index c2b119ec..174de4e1 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java @@ -1,7 +1,9 @@ package com.daqing.financial.guarantee.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest; import com.daqing.framework.domain.guarantee.DgComplianceInvestigation; +import com.daqing.framework.utils.PageUtils; /** *

@@ -13,4 +15,11 @@ import com.daqing.framework.domain.guarantee.DgComplianceInvestigation; */ public interface IDgComplianceInvestigationService extends IService { + PageUtils list(Integer page, Integer size, DgComplianceInvestigationRequest dgComplianceInvestigationRequest); + + Boolean surveyConsent(Integer iid, String fileUrl, String auditOpinion); + + Boolean surveyReturn(Integer iid,String auditOpinion); + + Boolean surveyRefuse(Integer iid,String auditOpinion); } 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 new file mode 100644 index 00000000..b52c529a --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java @@ -0,0 +1,12 @@ +package com.daqing.financial.guarantee.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; + +/** + * @auther River + * @date 2020/11/10 11:33 + */ +public interface IDgEfficiencyService extends IService { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgBankServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgBankServiceImpl.java new file mode 100644 index 00000000..c344f9cf --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgBankServiceImpl.java @@ -0,0 +1,20 @@ +package com.daqing.financial.guarantee.service.impl; + +import com.daqing.financial.guarantee.mapper.DgBankMapper; +import com.daqing.financial.guarantee.service.IDgBankService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.daqing.framework.domain.guarantee.DgBank; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author Qyq + * @since 2020-11-12 + */ +@Service +public class DgBankServiceImpl extends ServiceImpl implements IDgBankService { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java index 487a1605..a21e52c1 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java @@ -1,11 +1,21 @@ package com.daqing.financial.guarantee.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper; +import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest; +import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse; import com.daqing.financial.guarantee.service.IDgComplianceInvestigationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.framework.domain.guarantee.DgComplianceInvestigation; +import com.daqing.framework.domain.guarantee.GuaranteeCode; +import com.daqing.framework.exception.ExceptionCast; +import com.daqing.framework.model.response.CommonCode; +import com.daqing.framework.utils.PageUtils; import org.springframework.stereotype.Service; +import java.util.Date; + /** *

* 合规调查 服务实现类 @@ -15,6 +25,67 @@ import org.springframework.stereotype.Service; * @since 2020-11-05 */ @Service -public class DgComplianceInvestigationServiceImpl extends ServiceImpl implements IDgComplianceInvestigationService { +public class DgComplianceInvestigationServiceImpl extends ServiceImpl + implements IDgComplianceInvestigationService { + + /** + * 列表 + */ + @Override + public PageUtils list(Integer page, Integer size, DgComplianceInvestigationRequest dgComplianceInvestigationRequest) { + if (page == null || size == null){ + page = 1; + size = 10; + } + IPage list = this.getBaseMapper().list(new Page(page, size), dgComplianceInvestigationRequest); + + return new PageUtils(list); + } + + /** + * 调查同意 + */ + @Override + public Boolean surveyConsent(Integer iid, String fileUrl, String auditOpinion) { + if (iid == null || fileUrl == null || fileUrl.length() == 0){ + ExceptionCast.cast(CommonCode.INVALID_PARAM); + } + // 获取登录用户id + Integer userId = 1; + return this.getBaseMapper().surveyConsent(iid, fileUrl, auditOpinion, new Date(), userId); + } + + /** + * 调查驳回 + */ + @Override + public Boolean surveyReturn(Integer iid, String auditOpinion) { + if (iid == null){ + ExceptionCast.cast(CommonCode.INVALID_PARAM); + } + if (auditOpinion == null || auditOpinion.length() == 0){ + ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL); + } + // 获取登录用户id + Integer userId = 1; + // TODO 驳回至资产调查指派A/B角 + return this.getBaseMapper().surveyReturn(iid,auditOpinion,userId,new Date()); + } + /** + * 调查拒绝 + */ + @Override + public Boolean surveyRefuse(Integer iid, String auditOpinion) { + if (iid == null){ + ExceptionCast.cast(CommonCode.INVALID_PARAM); + } + if (auditOpinion == null || auditOpinion.length() == 0){ + ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL); + } + // 获取登录用户id + Integer userId = 1; + // TODO 直接拒接至初始状态 + return this.getBaseMapper().surveyRefuse(iid,auditOpinion,userId,new Date()); + } } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java new file mode 100644 index 00000000..d9594880 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java @@ -0,0 +1,14 @@ +package com.daqing.financial.guarantee.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.daqing.financial.guarantee.mapper.DgEfficiencyMapper; +import com.daqing.financial.guarantee.service.IDgEfficiencyService; +import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; + +/** + * @auther River + * @date 2020/11/10 11:34 + */ +public class DgEfficiencyServiceImpl extends ServiceImpl implements IDgEfficiencyService { + +} \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java index bbc6905c..49d8c26b 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java @@ -25,7 +25,7 @@ public class MyBatisPlusCodeGenerator { public static final String PACKAGE_NAME = "com.daqing.financial.guarantee"; public static void main(String[] args) { - String[] tables = new String[] {"dg_guarantee_letter_assign_user"};//表名数组 + String[] tables = new String[] {"dg_bank"};//表名数组 String[] tablePrefixs = new String[] {""};//去掉前缀 executeCode(PACKAGE_NAME,tables,tablePrefixs); } diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgBankMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgBankMapper.xml new file mode 100644 index 00000000..851becde --- /dev/null +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgBankMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml index b69a38fa..56004860 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml @@ -14,4 +14,42 @@ + + + + + UPDATE dg_compliance_investigation SET emp_id = #{empId},file = #{fileUrl},remark = #{auditOpinion},status = 2,update_time = #{date} + WHERE id = #{iid} + + + + + UPDATE dg_compliance_investigation SET emp_id = #{empId},remark = #{auditOpinion},status = 3,update_time = #{date} + WHERE id = #{iid} + + + + + UPDATE dg_compliance_investigation SET emp_id = #{empId},remark = #{auditOpinion},status = 4,update_time = #{date} + WHERE id = #{iid} + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEfficiencyMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEfficiencyMapper.xml new file mode 100644 index 00000000..8291f4b6 --- /dev/null +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEfficiencyMapper.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeInvestigationMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeInvestigationMapper.xml index 90494447..2cd658f3 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeInvestigationMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeInvestigationMapper.xml @@ -18,5 +18,4 @@ - diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml index 6a20fed8..56724aca 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml @@ -16,6 +16,7 @@ + + - SELECT DISTINCT e.id id,e.name name FROM hrms_employee e + LEFT JOIN hrms_user u + ON e.user_id = u.id LEFT JOIN hrms_employee_dept ed ON e.id = ed.employee_id LEFT JOIN hrms_dept d ON d.id = ed.dept_id - WHERE d.id IN + WHERE u.del_or_not = 0 + AND d.id IN ( SELECT d.id FROM hrms_dept d LEFT JOIN hrms_employee_dept ed diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgBank.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgBank.java new file mode 100644 index 00000000..bfeeafd9 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgBank.java @@ -0,0 +1,65 @@ +package com.daqing.framework.domain.guarantee; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author Qyq + * @since 2020-11-12 + */ +@TableName("dg_bank") +public class DgBank implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 银行名称 + */ + private String bankName; + + /** + * 银行标识码 + */ + private String bankCode; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + public String getBankCode() { + return bankCode; + } + + public void setBankCode(String bankCode) { + this.bankCode = bankCode; + } + + @Override + public String toString() { + return "DgBank{" + + "id=" + id + + ", bankName=" + bankName + + ", bankCode=" + bankCode + + "}"; + } +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/GuaranteeCode.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/GuaranteeCode.java new file mode 100644 index 00000000..2419386a --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/GuaranteeCode.java @@ -0,0 +1,50 @@ +package com.daqing.framework.domain.guarantee; + +import com.daqing.framework.model.response.ResultCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.ToString; + +/** + * 担保模块状态集合 + * + * @auther River + * @date 2020/11/12 16:13 + */ +@ToString +@AllArgsConstructor +public enum GuaranteeCode implements ResultCode { + + + COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL(false,80001,"驳回或拒绝时,意见不能为空!"); + + /** + * 操作是否成功 + */ + @Getter + private boolean success; + + /** + * 状态码 + */ + @Getter + private int code; + + /** + * 提示信息 + */ + @Getter + private String message; + + public boolean success() { + return this.success; + } + + public int code() { + return this.code; + } + + public String message() { + return this.message; + } +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyPersonPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyPersonPO.java new file mode 100644 index 00000000..46f2c68e --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyPersonPO.java @@ -0,0 +1,57 @@ +package com.daqing.framework.domain.guarantee.po; + +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; +import java.util.Date; + +/** + * 业务效率个人 + * + * @auther River + * @date 2020/11/11 10:41 + */ +@Data +@ToString +public class DgEfficiencyPersonPO implements Serializable { + /** + * id + */ + private Integer id; + + /** + * 提单人id + */ + private Integer presenterId; + + /** + * 客户名称 + */ + private String name; + + /** + * 申请日期 + */ + private Date createTime; + + /** + * 当前审批人 + */ + private String empName; + + /** + * 任务节点 + */ + private String status; + + /** + * 完成时间 + */ + private Date finishTime; + + /** + * 流程状态 + */ + private Integer flowStatus; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyTeamPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyTeamPO.java index 164da03e..48db9ed4 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyTeamPO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyTeamPO.java @@ -15,7 +15,6 @@ import java.util.Date; @Data @ToString public class DgEfficiencyTeamPO implements Serializable { - /** * id */ @@ -49,4 +48,10 @@ public class DgEfficiencyTeamPO implements Serializable { /** * 完成时间 */ + private Date finishTime; + + /** + * 流程状态 + */ + private Integer flowStatus; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeVO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeVO.java index 0133a565..53d75d21 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeVO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeVO.java @@ -14,6 +14,9 @@ import java.io.Serializable; @ToString public class EmployeeVO implements Serializable{ + /** + * 员工id + */ @ApiModelProperty("id") private Long id;