diff --git a/dq-financial-api/src/main/java/com/daqing/financial/hrms/UserControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/hrms/UserControllerApi.java index c8629e6c..d6717636 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/hrms/UserControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/hrms/UserControllerApi.java @@ -16,24 +16,27 @@ import javax.servlet.http.HttpServletResponse; @Api(value = "用户相关操作", tags = "提供工作台人力资源等相关方法") public interface UserControllerApi { - @ApiOperation(value = "用户详情",notes = "用户详情",response = EmployeeAndUserVO.class) + @ApiOperation(value = "用户详情", notes = "用户详情", response = EmployeeAndUserVO.class) ResponseResult info(); - @ApiOperation(value = "修改用户信息",notes = "修改用户信息") + @ApiOperation(value = "修改用户信息", notes = "修改用户信息") ResponseResult update(EmployeeAndUserVO employeeAndUserVO); - @ApiOperation(value = "获取验证码",notes = "获取验证码") + @ApiOperation(value = "获取验证码", notes = "获取验证码") ResponseResult code(String phone); - @ApiOperation(value = "修改密码",notes = "修改密码") + @ApiOperation(value = "修改密码", notes = "修改密码") ResponseResult updatePassword(String primaryPassword, String newPassword, String affirmNewPassword); - @ApiOperation(value = "绑定手机号",notes = "绑定手机号") - ResponseResult binding(String phone,String code); + @ApiOperation(value = "绑定手机号", notes = "绑定手机号") + ResponseResult binding(String phone, String code); - @ApiOperation(value = "取消微信绑定",notes = "取消微信绑定") + @ApiOperation(value = "取消微信绑定", notes = "取消微信绑定") ResponseResult cancel(); - @ApiOperation(value = "图像文件上传",notes = "图像文件上传") + @ApiOperation(value = "图像文件上传", notes = "图像文件上传") ResponseResult uploadFile(MultipartFile file); + + @ApiOperation(value = "更新员工图像(小程序端)", notes = "更新员工图像(小程序端)") + ResponseResult updateHeadPortraitUrl(String headPortraitUrl); } diff --git a/dq-financial-api/target/classes/com/daqing/financial/config/SwaggerConfig.class b/dq-financial-api/target/classes/com/daqing/financial/config/SwaggerConfig.class deleted file mode 100644 index 3a33f86e..00000000 Binary files a/dq-financial-api/target/classes/com/daqing/financial/config/SwaggerConfig.class and /dev/null differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class deleted file mode 100644 index 73a0e029..00000000 Binary files a/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class and /dev/null differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrauth/UserLoginControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrauth/UserLoginControllerApi.class deleted file mode 100644 index 89a9bd55..00000000 Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrauth/UserLoginControllerApi.class and /dev/null differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class deleted file mode 100644 index 9119628c..00000000 Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class and /dev/null differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class deleted file mode 100644 index f910927a..00000000 Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class and /dev/null differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/PermissionControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/PermissionControllerApi.class deleted file mode 100644 index 9c20bb1d..00000000 Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrms/PermissionControllerApi.class and /dev/null differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/PositionControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/PositionControllerApi.class deleted file mode 100644 index 6db5f2a2..00000000 Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrms/PositionControllerApi.class and /dev/null differ diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerAppletController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerAppletController.java index beba46a7..53aa3e5e 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerAppletController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerAppletController.java @@ -3,6 +3,8 @@ package com.daqing.financial.crms.controller; import com.daqing.financial.crms.model.request.CompanyAppletRequest; import com.daqing.financial.crms.model.request.CompanyCustomerRequest; import com.daqing.financial.crms.model.request.PersonalAppletRequest; +import com.daqing.financial.crms.model.response.ApplicationRecordResponse; +import com.daqing.financial.crms.model.response.ApplyDetailResponse; import com.daqing.financial.crms.service.CustomerAppletService; import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI; import com.daqing.framework.model.response.ResponseResult; @@ -94,4 +96,35 @@ public class CustomerAppletController { return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); } + + /** + * 申请记录 + */ + @GetMapping("/get/record") + @ApiOperation(value = "获取申请记录", response = ApplicationRecordResponse.class) + public ResponseResult getApplicationRecord(@RequestParam("page") Integer page, + @RequestParam("size") Integer size, Integer type, Integer status) { + + return ResponseResult.SUCCESS(customerAppletService.getApplicationRecord(page, size, type, status)); + } + + /** + * 获取申请额度 + */ + @GetMapping("/get/apply/mount") + @ApiOperation(value = "获取已申请额度") + public ResponseResult getApplyMount() { + + return ResponseResult.SUCCESS(customerAppletService.getApplyMount()); + } + + /** + * 获取申请记录详情 + */ + @GetMapping("/get/apply/detail") + @ApiOperation(value = "获取申请记录详情", response = ApplyDetailResponse.class) + public ResponseResult getApplyDetail(@RequestParam("id") Integer id) { + + return ResponseResult.SUCCESS(customerAppletService.getApplyDetail(id)); + } } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerAppletDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerAppletDao.java index 5870d53a..86ff1f59 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerAppletDao.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerAppletDao.java @@ -1,10 +1,16 @@ package com.daqing.financial.crms.dao; 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.framework.domain.crms.CustomerEntity; +import com.daqing.framework.domain.crms.ext.ApplicationRecordPO; +import com.daqing.framework.domain.crms.ext.ApplyDetailPO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 客户小程序认证(录入) * @@ -23,4 +29,11 @@ public interface CustomerAppletDao extends BaseMapper { Boolean updateCustomer(@Param("customer") CustomerEntity customerEntity); + Integer getCompanyId(Integer customerId); + + IPage getApplicationRecord(Page page, @Param("companyId")Integer companyId, @Param("status")Integer status); + + List getApplyMount(Integer companyId); + + ApplyDetailPO getApplyDetail(Integer id); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyAppletRequest.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyAppletRequest.java index ebf11dd2..fa4fa1e3 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyAppletRequest.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyAppletRequest.java @@ -1,5 +1,6 @@ package com.daqing.financial.crms.model.request; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -33,6 +34,7 @@ public class CompanyAppletRequest implements Serializable { @ApiModelProperty(value = "联系电话") private String phone; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(value = "注册时间") private Date registerTime; @@ -89,4 +91,7 @@ public class CompanyAppletRequest implements Serializable { @ApiModelProperty(value = "关联人id") private List relatedId; + + @ApiModelProperty("企业客户表id,即查询关联人所需的id") + private Integer customerId; } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/PersonalAppletRequest.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/PersonalAppletRequest.java index 56a8fd71..836d38ed 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/PersonalAppletRequest.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/PersonalAppletRequest.java @@ -20,6 +20,9 @@ import java.io.Serializable; @ToString public class PersonalAppletRequest implements Serializable { + @ApiModelProperty("客户表id") + private Long companyId; + @NotNull(message = "客户名称不能为空") @ApiModelProperty(value = "客户名称") private String name; diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplicationRecordResponse.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplicationRecordResponse.java new file mode 100644 index 00000000..3f1fd98c --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplicationRecordResponse.java @@ -0,0 +1,43 @@ +package com.daqing.financial.crms.model.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; +import java.util.Date; + +/** + * 申请记录响应类 + * + * @auther River + * @date 2021/2/22 11:33 + */ +@Data +@ToString +public class ApplicationRecordResponse implements Serializable { + + @ApiModelProperty("id") + private Integer id; + + @ApiModelProperty("客户类型") + private Integer type; + + @ApiModelProperty("贷款用途") + private String amountWide; + + @ApiModelProperty("申请额度") + private Double applyAmount; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("申请日期") + private Date applyDate; + + @ApiModelProperty("申请期限") + private String applyTime; + + @ApiModelProperty("状态,0:已完成,1:已受理,2:审核中,3:拒绝,4:驳回,5:撤销") + private Integer status; +} diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplyDetailResponse.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplyDetailResponse.java new file mode 100644 index 00000000..a585371e --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplyDetailResponse.java @@ -0,0 +1,25 @@ +package com.daqing.financial.crms.model.response; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; + +/** + * 申请记录详情返回类 + * + * @auther River + * @date 2021/2/24 10:12 + */ +@Data +@ToString +public class ApplyDetailResponse implements Serializable { + + @ApiModelProperty("状态") + private Integer status; + + @ApiModelProperty("审核意见/拒绝、驳回意见") + private String remark; + +} diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerAppletService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerAppletService.java index 530eed5b..a4028a77 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerAppletService.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerAppletService.java @@ -3,8 +3,12 @@ package com.daqing.financial.crms.service; import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.financial.crms.model.request.CompanyAppletRequest; import com.daqing.financial.crms.model.request.PersonalAppletRequest; +import com.daqing.financial.crms.model.response.ApplicationRecordResponse; +import com.daqing.financial.crms.model.response.ApplyDetailResponse; import com.daqing.framework.domain.crms.CustomerEntity; +import com.daqing.framework.utils.PageUtils; +import java.util.List; import java.util.Map; /** @@ -26,4 +30,10 @@ public interface CustomerAppletService extends IService { Boolean updatePersonal(PersonalAppletRequest personalAppletRequest); Boolean updateCompany(CompanyAppletRequest companyAppletRequest); + + PageUtils getApplicationRecord(Integer page, Integer size, Integer type, Integer status); + + Map getApplyMount(); + + ApplyDetailResponse getApplyDetail(Integer id); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java index 996563b4..feac8749 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java @@ -1,6 +1,8 @@ package com.daqing.financial.crms.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.crms.dao.CompanyCustomerDao; import com.daqing.financial.crms.dao.CustomerAppletDao; @@ -8,23 +10,24 @@ import com.daqing.financial.crms.dao.CustomerDao; import com.daqing.financial.crms.dao.PersonalCustomerDao; import com.daqing.financial.crms.mapper.CrmsCustomerRelatedMapper; import com.daqing.financial.crms.model.request.CompanyAppletRequest; -import com.daqing.financial.crms.model.request.CompanyCustomerRequest; import com.daqing.financial.crms.model.request.PersonalAppletRequest; +import com.daqing.financial.crms.model.response.ApplicationRecordResponse; +import com.daqing.financial.crms.model.response.ApplyDetailResponse; import com.daqing.financial.crms.service.CustomerAppletService; -import com.daqing.financial.crms.service.CustomerService; import com.daqing.financial.crms.service.ICrmsCustomerRelatedService; import com.daqing.framework.domain.crms.CompanyCustomerEntity; import com.daqing.framework.domain.crms.CrmsCustomerRelated; import com.daqing.framework.domain.crms.CustomerEntity; import com.daqing.framework.domain.crms.PersonalCustomerEntity; +import com.daqing.framework.domain.crms.ext.ApplicationRecordPO; +import com.daqing.framework.domain.crms.ext.ApplyDetailPO; import com.daqing.framework.domain.crms.ext.CrmsConstant; -import com.daqing.framework.domain.crms.ext.CustomerPersonalTOU; import com.daqing.framework.domain.crms.response.CrmsCode; import com.daqing.framework.exception.ExceptionCast; 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 org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -200,6 +203,7 @@ public class CustomerAppletServiceImpl extends ServiceImpl applicationRecordResponseList = new ArrayList<>(); + IPage applicationRecordResponseIPage = new Page<>(); + // 获取客户的登录信息/暂时没有个人类型申请信息,所以个人类型返回空而企业类型返回所有 + if (type == null || (type != 0 && type != 1) || type == 1) { + Integer customerId = this.getBaseMapper().getCustomerId(Integer.parseInt(this.getUserId()), 1); + if (customerId == null) { + ExceptionCast.cast(CrmsCode.CUSTOMER_APPLET_IS_NULL); + } + Integer companyId = this.getBaseMapper().getCompanyId(customerId); + // 查询申请记录信息 + IPage iPage = this.getBaseMapper().getApplicationRecord(new Page(page, size), companyId, status); + List applicationRecordPOList = iPage.getRecords(); + for (ApplicationRecordPO applicationRecordPO : applicationRecordPOList) { + ApplicationRecordResponse applicationRecordResponse = new ApplicationRecordResponse(); + // 状态为已受理、审核中、拒绝、驳回、已撤销情况 + if (applicationRecordPO.getAuditStatus() != null && (applicationRecordPO.getAuditStatus() == 1 + || applicationRecordPO.getAuditStatus() == 2 || applicationRecordPO.getAuditStatus() == 3 + || applicationRecordPO.getAuditStatus() == 4 || applicationRecordPO.getAuditStatus() == 5)) { + BeanUtils.copyProperties(applicationRecordPO, applicationRecordResponse); + applicationRecordResponse.setStatus(applicationRecordPO.getAuditStatus()); + applicationRecordResponse.setType(1); + } + // 状态为已完成的情况,如果同时存在已完成会覆盖以上情况 + if (applicationRecordPO.getBusinessStatus() != null && applicationRecordPO.getBusinessStatus() == 2) { + BeanUtils.copyProperties(applicationRecordPO, applicationRecordResponse); + applicationRecordResponse.setStatus(0); + applicationRecordResponse.setType(1); + } + applicationRecordResponseList.add(applicationRecordResponse); + } + // 设置分页数据 + BeanUtils.copyProperties(iPage, applicationRecordResponseIPage); + applicationRecordResponseIPage.setRecords(applicationRecordResponseList); + } + return new PageUtils(applicationRecordResponseIPage); + } + + /** + * 获取申请额度 + */ + @Override + public Map getApplyMount() { + Double company = 0.00; + Map map = new HashMap<>(); + map.put("company", company); + // 个人类型暂时没有 + map.put("personal", 0.00); + Integer customerId = this.getBaseMapper().getCustomerId(Integer.parseInt(this.getUserId()), 1); + // 如果查询不到认证信息,直接返回0.00 + if (customerId == null) { + map.put("company", company); + } else { + Integer companyId = this.getBaseMapper().getCompanyId(customerId); + // 查询申请记录信息 + List applicationRecordPOList = this.getBaseMapper().getApplyMount(companyId); + if (applicationRecordPOList.size() < 1) { + return map; + } + for (ApplicationRecordPO applicationRecordPO : applicationRecordPOList) { + company += applicationRecordPO.getApplyAmount() == null ? 0.00 : applicationRecordPO.getApplyAmount(); + } + map.put("company", company); + } + return map; + } + + /** + * 获取申请记录详情 + */ + @Override + public ApplyDetailResponse getApplyDetail(Integer id) { + if (id == null) { + ExceptionCast.cast(CommonCode.INVALID_PARAM); + } + ApplyDetailResponse applyDetailResponse = new ApplyDetailResponse(); + ApplyDetailPO applyDetail = this.getBaseMapper().getApplyDetail(id); + if (applyDetail == null) { + ExceptionCast.cast(CrmsCode.CUSTOMER_APPLET_STATUS_IS_NULL); + } + // 判断当前申请信息的状态 + if (applyDetail.getBusinessStatus() != null && applyDetail.getBusinessStatus() == 2) { + // 已完成 + applyDetailResponse.setStatus(0); + return applyDetailResponse; + } + if (applyDetail.getAuditStatus() == null) { + ExceptionCast.cast(CrmsCode.CUSTOMER_APPLET_STATUS_IS_NULL); + } + switch (applyDetail.getAuditStatus()) { + case 1: + applyDetailResponse.setStatus(applyDetail.getAuditStatus()); + break; + case 2: + applyDetailResponse.setStatus(applyDetail.getAuditStatus()); + break; + case 3: // 拒绝 + applyDetailResponse.setStatus(applyDetail.getAuditStatus()); + applyDetailResponse.setRemark(applyDetail.getRemark()); + break; + case 4: // 驳回 + applyDetailResponse.setStatus(applyDetail.getAuditStatus()); + applyDetailResponse.setRemark(applyDetail.getRemark()); + break; + default: + ExceptionCast.cast(CrmsCode.CUSTOMER_APPLET_STATUS_IS_NULL); + } + return applyDetailResponse; + } /** * 获取当前登录用户信息 */ private String getUserId() { - /*HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = request.getHeader("token"); String userId = RedisUtil.get("dq:token:" + token); if (userId == null || userId.length() == 0) { ExceptionCast.cast(CommonCode.GET_LOGIN_USER_FAIL); - }*/ - String userId = "63"; + } + // String userId = "63"; return userId; } diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml index 4f28ade9..3d9ffcd6 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml @@ -18,8 +18,58 @@ UPDATE crms_customer - SET name=#{customer.name},addr=#{customer.addr},phone=#{customer.phone},motify_time=#{customer.motifyTime} + SET name = #{customer.name},addr = #{customer.addr},phone = #{customer.phone},motify_time = #{customer.motifyTime} WHERE id = #{customer.id} + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml index 9222e27c..13faa7a8 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml @@ -26,7 +26,7 @@ + + + UPDATE hrms_employee SET head_portarit_url = #{url} WHERE id = #{id} + \ No newline at end of file diff --git a/dq-framework-common/target/classes/com/daqing/framework/SpringContextHolder.class b/dq-framework-common/target/classes/com/daqing/framework/SpringContextHolder.class deleted file mode 100644 index f9bb0cf9..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/SpringContextHolder.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/client/DqFinancialList.class b/dq-framework-common/target/classes/com/daqing/framework/client/DqFinancialList.class deleted file mode 100644 index 6d962885..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/client/DqFinancialList.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/exception/CustomException.class b/dq-framework-common/target/classes/com/daqing/framework/exception/CustomException.class deleted file mode 100644 index 2710cd15..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/exception/CustomException.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCast.class b/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCast.class deleted file mode 100644 index fc6a852f..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCast.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class b/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class deleted file mode 100644 index e1b29a5f..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$CloudService.class b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$CloudService.class deleted file mode 100644 index ce6888e6..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$CloudService.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$MenuType.class b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$MenuType.class deleted file mode 100644 index af899a7d..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$MenuType.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$ScheduleStatus.class b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$ScheduleStatus.class deleted file mode 100644 index bae26b28..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$ScheduleStatus.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/Constant.class b/dq-framework-common/target/classes/com/daqing/framework/model/Constant.class deleted file mode 100644 index f47d5824..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/Constant.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/request/RequestData.class b/dq-framework-common/target/classes/com/daqing/framework/model/request/RequestData.class deleted file mode 100644 index 9eb8eb6d..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/request/RequestData.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class deleted file mode 100644 index 1bf65b68..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class deleted file mode 100644 index db378b19..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class deleted file mode 100644 index 33f83cf7..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/ResultCode.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/ResultCode.class deleted file mode 100644 index efe51b1a..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/response/ResultCode.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/BasePage.class b/dq-framework-common/target/classes/com/daqing/framework/util/BasePage.class deleted file mode 100644 index 55da2716..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/util/BasePage.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/JwtUtils.class b/dq-framework-common/target/classes/com/daqing/framework/util/JwtUtils.class deleted file mode 100644 index 6c428dd2..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/util/JwtUtils.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/Md5Util.class b/dq-framework-common/target/classes/com/daqing/framework/util/Md5Util.class deleted file mode 100644 index 26f6de86..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/util/Md5Util.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/RandomUtil.class b/dq-framework-common/target/classes/com/daqing/framework/util/RandomUtil.class deleted file mode 100644 index e0495083..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/util/RandomUtil.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/RedisUtil.class b/dq-framework-common/target/classes/com/daqing/framework/util/RedisUtil.class deleted file mode 100644 index 01c9d7c5..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/util/RedisUtil.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/SendSMS.class b/dq-framework-common/target/classes/com/daqing/framework/util/SendSMS.class deleted file mode 100644 index 47719b05..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/util/SendSMS.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/web/BaseController.class b/dq-framework-common/target/classes/com/daqing/framework/web/BaseController.class deleted file mode 100644 index 91d934a1..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/web/BaseController.class and /dev/null differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/xss/SQLFilter.class b/dq-framework-common/target/classes/com/daqing/framework/xss/SQLFilter.class deleted file mode 100644 index d555be42..00000000 Binary files a/dq-framework-common/target/classes/com/daqing/framework/xss/SQLFilter.class and /dev/null differ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplicationRecordPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplicationRecordPO.java new file mode 100644 index 00000000..f9bf32f7 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplicationRecordPO.java @@ -0,0 +1,50 @@ +package com.daqing.framework.domain.crms.ext; + +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; +import java.util.Date; + +/** + * 申请记录接收类 + * + * @auther River + * @date 2021/2/22 14:11 + */ +@Data +@ToString +public class ApplicationRecordPO implements Serializable { + + private Integer id; + + /** + * 申请日期 + */ + private Date applyDate; + + /** + * 申请额度 + */ + private Double applyAmount; + + /** + * 贷款用途 + */ + private String amountWide; + + /** + * 申请期限 + */ + private String applyTime; + + /** + * 业务状态 + */ + private Integer businessStatus; + + /** + * 审批状态(是否受理) + */ + private Integer auditStatus; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplyDetailPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplyDetailPO.java new file mode 100644 index 00000000..210af651 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplyDetailPO.java @@ -0,0 +1,33 @@ +package com.daqing.framework.domain.crms.ext; + +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; + +/** + * 获取申请记录详情持久层接收类 + * + * @auther River + * @date 2021/2/24 10:25 + */ +@Data +@ToString +public class ApplyDetailPO implements Serializable { + + /** + * 审核状态 + */ + private Integer auditStatus; + + /** + * 业务状态 + */ + private Integer businessStatus; + + /** + * 审核意见 + */ + private String remark; + +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java index 464ecb07..3e5d49a9 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java @@ -132,5 +132,4 @@ public class CustomerCompanyDTO implements Serializable { @ApiModelProperty(value = "是否存在关联人 0->否；1->是") private Integer isExistRelated; - } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java index fa9adece..133ebdbb 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java @@ -21,8 +21,9 @@ public enum CrmsCode implements ResultCode { NOT_NULL(false,20004,"上传的文件不能为空"), CUSTOMER_IS_NULL(false,20005,"导入数据失败,当前员工不存在!"), CUSTOMER_NAME_REPETITION(false, 20006, "当前客户名称已存在!"), - CUSTOMER_APPLET_IS_NULL(false, 20007,"未查询到你的信息,请先录入(认证)你的信息!"), - CUSTOMER_APPLET_EXIST(false, 20008,"你已认证自己的信息,无需再次认证!"); + CUSTOMER_APPLET_IS_NULL(false, 20007,"未查询到你的认证信息,请先认证你的信息!"), + CUSTOMER_APPLET_EXIST(false, 20008,"你已认证自己的信息,无需再次认证!"), + CUSTOMER_APPLET_STATUS_IS_NULL(false, 20009, "当前申请贷款信息状态异常,请刷新重试!"); /** * 操作是否成功 diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/HrmsCode.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/HrmsCode.java index 6d20259e..74cd0b23 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/HrmsCode.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/HrmsCode.java @@ -61,6 +61,7 @@ public enum HrmsCode implements ResultCode { USER_FILE_TYPE_MISTAKE(false,88013,"文件格式不正确,请重新选择图片文件!"), USER_FILE_UPLOAD_FAIL(false,88014,"上传图像失败,请稍后刷新再试!"), USER_PHONE_ACCOUNT_REPETITION(false,88015,"该手机号已绑定过用户,请更换手机号!"), + USER_HEAD_PORTRAIT_URL_IS_NULL(false, 88016, "当前图片不存在,请重新选择!"), PHNOE_ACCOUNT_NOT_EMPTY(false,33001,"手机号码为空！"), VERIFY_CODE_NOT_EMPTY(false,33002,"短信验证码为空！"), diff --git a/dq-framework-model/target/classes/META-INF/dq-framework-model.kotlin_module b/dq-framework-model/target/classes/META-INF/dq-framework-model.kotlin_module deleted file mode 100644 index 8fb60192..00000000 Binary files a/dq-framework-model/target/classes/META-INF/dq-framework-model.kotlin_module and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class deleted file mode 100644 index 391b1000..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class deleted file mode 100644 index 6c43d899..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class deleted file mode 100644 index 9deac466..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CompanyTemplate.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CompanyTemplate.class deleted file mode 100644 index 6039346a..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CompanyTemplate.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant$CustomerType.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant$CustomerType.class deleted file mode 100644 index d20f68e4..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant$CustomerType.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant.class deleted file mode 100644 index 5733c727..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.class deleted file mode 100644 index 5a982911..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.class deleted file mode 100644 index 346c0310..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.class deleted file mode 100644 index e13d10df..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class deleted file mode 100644 index 4d872680..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.class deleted file mode 100644 index ed6ee901..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.class deleted file mode 100644 index 0ab14265..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.class deleted file mode 100644 index ca7ccf65..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class deleted file mode 100644 index b66dc2ce..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class deleted file mode 100644 index 6fa62e83..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/ManagerName.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/ManagerName.class deleted file mode 100644 index c088b570..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/ManagerName.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/PersonalTemplate.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/PersonalTemplate.class deleted file mode 100644 index 4bda43cc..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/PersonalTemplate.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class deleted file mode 100644 index 3e4d51f0..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class deleted file mode 100644 index d3d7e9fe..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class deleted file mode 100644 index caea8d09..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class deleted file mode 100644 index d430582d..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptPositionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptPositionEntity.class deleted file mode 100644 index 784933ac..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptPositionEntity.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeDeptEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeDeptEntity.class deleted file mode 100644 index ee2ad0f0..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeDeptEntity.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeEntity.class deleted file mode 100644 index e999bacb..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeEntity.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeePositionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeePositionEntity.class deleted file mode 100644 index 15529923..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeePositionEntity.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeRoleEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeRoleEntity.class deleted file mode 100644 index 10d181d9..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeRoleEntity.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/LoginLog.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/LoginLog.class deleted file mode 100644 index f4df8b49..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/LoginLog.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PermissionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PermissionEntity.class deleted file mode 100644 index 2ffa57fe..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PermissionEntity.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PositionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PositionEntity.class deleted file mode 100644 index cdf8dc16..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PositionEntity.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RoleEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RoleEntity.class deleted file mode 100644 index 87846df8..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RoleEntity.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RolePermissionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RolePermissionEntity.class deleted file mode 100644 index a5368d26..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RolePermissionEntity.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog$SystemLogBuilder.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog$SystemLogBuilder.class deleted file mode 100644 index 9bb67967..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog$SystemLogBuilder.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog.class deleted file mode 100644 index 8feeb790..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/Token.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/Token.class deleted file mode 100644 index 2ee35c18..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/Token.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/UserEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/UserEntity.class deleted file mode 100644 index dc174870..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/UserEntity.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeTO.class deleted file mode 100644 index 059a77e7..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeTO.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class deleted file mode 100644 index 1b7d2804..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/PositionVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/PositionVO.class deleted file mode 100644 index 2a1a4f5c..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/PositionVO.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptAddRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptAddRequest.class deleted file mode 100644 index ee920e0d..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptAddRequest.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptUpdateSortRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptUpdateSortRequest.class deleted file mode 100644 index 2707e266..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptUpdateSortRequest.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/LoginRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/LoginRequest.class deleted file mode 100644 index 9b0585f5..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/LoginRequest.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PermissionAddRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PermissionAddRequest.class deleted file mode 100644 index 05c612aa..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PermissionAddRequest.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PositionRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PositionRequest.class deleted file mode 100644 index 533d3d8e..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PositionRequest.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/UserLoginRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/UserLoginRequest.class deleted file mode 100644 index b2055516..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/UserLoginRequest.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class deleted file mode 100644 index 53ea877e..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/LoginResponse.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/LoginResponse.class deleted file mode 100644 index c52574bf..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/LoginResponse.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/PositionResponse.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/PositionResponse.class deleted file mode 100644 index 8473d2b5..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/PositionResponse.class and /dev/null differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/PageUtils.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/PageUtils.class deleted file mode 100644 index d1cb9dcf..00000000 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/PageUtils.class and /dev/null differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class deleted file mode 100644 index 43dd51cd..00000000 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class and /dev/null differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/SnowflakeIdUtils.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/SnowflakeIdUtils.class deleted file mode 100644 index 9b813b7a..00000000 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/SnowflakeIdUtils.class and /dev/null differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelException.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelException.class deleted file mode 100644 index bd326dba..00000000 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelException.class and /dev/null differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelListener.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelListener.class deleted file mode 100644 index c789ee8d..00000000 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelListener.class and /dev/null differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelUtil.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelUtil.class deleted file mode 100644 index 85cf2538..00000000 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelUtil.class and /dev/null differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelWriterFactroy.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelWriterFactroy.class deleted file mode 100644 index 9a4d365c..00000000 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelWriterFactroy.class and /dev/null differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/oss/OssFileUtils.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/oss/OssFileUtils.class deleted file mode 100644 index ee7a00fc..00000000 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/oss/OssFileUtils.class and /dev/null differ diff --git a/dq-govern-gateway/src/main/resources/bootstrap.properties b/dq-govern-gateway/src/main/resources/bootstrap.properties index ee5f1b55..c5f70ece 100644 --- a/dq-govern-gateway/src/main/resources/bootstrap.properties +++ b/dq-govern-gateway/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-govern-gateway #配置中心地址 -spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.file-extension=yml #redis配置 spring.redis.host=127.0.0.1