From 378c0bf641a86f5b21c3528b730e67554937f6b4 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Thu, 31 Dec 2020 17:49:35 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DgEfficiencyController.java | 150 +++++- .../PersonalEfficiencyListRequest.java | 30 ++ .../PersonalEfficiencyListResponse.java | 20 +- .../service/IDgEfficiencyService.java | 4 + .../service/impl/DgEfficiencyServiceImpl.java | 434 +++++++++++++++++- .../domain/guarantee/po/StatusPO.java | 31 ++ .../utils/excel/TaskNodeConverter.java | 87 ++++ 7 files changed, 725 insertions(+), 31 deletions(-) create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/StatusPO.java create mode 100644 dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java index 905c50cd..4296eb83 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java @@ -1,23 +1,28 @@ package com.daqing.financial.guarantee.controller; +import com.alibaba.fastjson.JSONObject; +import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest; +import com.daqing.financial.guarantee.model.request.PersonalEfficiencyListRequest; +import com.daqing.financial.guarantee.model.response.PersonalEfficiencyListResponse; import com.daqing.financial.guarantee.service.IDgEfficiencyService; +import com.daqing.financial.guarantee.util.DateUtils; +import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.ResponseResult; +import com.daqing.framework.utils.excel.EasyExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import com.daqing.financial.guarantee.service.IDgEfficiencyService; -import com.daqing.framework.model.response.ResponseResult; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import java.util.Map; +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 流程效率 @@ -33,6 +38,9 @@ public class DgEfficiencyController { @Autowired private IDgEfficiencyService dgEfficiencyService; + @Autowired + private HrmsFeignService hrmsFeignService; + /** * 团队效率 */ @@ -51,4 +59,126 @@ public class DgEfficiencyController { Map result = dgEfficiencyService.approvalNum(); return ResponseResult.SUCCESS(result); } + + @ApiOperation(value = "个人效率记录列表") + @PostMapping("/personalEfficiencyList") + public ResponseResult personalEfficiencyList( + @ApiParam(name = "personalEfficiencyListRequest", value = "个人效率列表查询对象") + @RequestBody PersonalEfficiencyListRequest personalEfficiencyListRequest){ + List responseList = dgEfficiencyService.queryPersonalEfficiencyList(); + + if(responseList.size()>0){ + List arr = new ArrayList<>(); + for (PersonalEfficiencyListResponse res : responseList) { + arr.add(res.getApplicantId()); + } + //根据提单人id查询其部门名称 + ResponseResult responseResult = hrmsFeignService.getAccountAndDeptNameById(arr); + List employeeMessage = null; + if(responseResult.getData() != null){ + employeeMessage = (List) responseResult.getData(); + } + + for (PersonalEfficiencyListResponse response:responseList) { + for(LinkedHashMap res : employeeMessage){ + if(response.getApplicantId().equals(res.get("id"))){//如果提单人id相同情况下，就往对象里面赋值 + response.setApplicant(JSONObject.toJSONString(res.get("account")).replace("\"","")); + } + } + } + } + //根据条件筛选数据 + if (personalEfficiencyListRequest.getOperatingStatus()!=null){ + // 已发起 + if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_LAUNCH)){ + responseList = responseList.stream().filter(p -> p.getOperatingStatus().equals(StatusCode.CZ_LAUNCH)).collect(Collectors.toList()); + // 待处理 + }else if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){ + responseList = responseList.stream().filter(p -> p.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)).collect(Collectors.toList()); + // 已处理 + }else if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)){ + responseList = responseList.stream().filter(p -> p.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)).collect(Collectors.toList()); + } + } + + // 时间筛选(固定时间) + if (personalEfficiencyListRequest.getCreateFixedTime() != null && personalEfficiencyListRequest.getStartTime() == null && personalEfficiencyListRequest.getEndTime() == null) { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + switch (personalEfficiencyListRequest.getCreateFixedTime()) { + case 0: + personalEfficiencyListRequest.setStartTime(dateFormat.format(DateUtils.getDayBegin())); + personalEfficiencyListRequest.setEndTime(dateFormat.format(DateUtils.getDayEnd()));// 今天 + break; + case 1: + personalEfficiencyListRequest.setStartTime(dateFormat.format(DateUtils.getBeginDayOfYesterday())); + personalEfficiencyListRequest.setEndTime(dateFormat.format(DateUtils.getEndDayOfYesterDay()));// 昨天 + break; + case 2: + personalEfficiencyListRequest.setStartTime(dateFormat.format(DateUtils.getBeginDayOfWeek())); + personalEfficiencyListRequest.setEndTime(dateFormat.format(DateUtils.getEndDayOfWeek()));// 本周 + break; + case 3: + personalEfficiencyListRequest.setStartTime(dateFormat.format(DateUtils.getBeginDayOfMonth())); + personalEfficiencyListRequest.setEndTime(dateFormat.format(DateUtils.getEndDayOfMonth()));// 本月 + break; + case 4: + personalEfficiencyListRequest.setStartTime(dateFormat.format(DateUtils.getBeginDayOfYear())); + personalEfficiencyListRequest.setEndTime(dateFormat.format(DateUtils.getEndDayOfYear()));// 本年 + break; + default: + personalEfficiencyListRequest.setStartTime(null); + personalEfficiencyListRequest.setEndTime(null); + } + //获取毫秒数 + long longStart = getLongDate(personalEfficiencyListRequest.getStartTime()); + long longEnd = getLongDate(personalEfficiencyListRequest.getEndTime()); + Stream booleanStream = responseList.stream().map(p -> getLongDate(p.getApplicationDate()) > longStart && getLongDate(p.getApplicationDate()) < longEnd); + } + return ResponseResult.SUCCESS(responseList); + } + + public static long getLongDate(String stringDate){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + try { + Date date = sdf.parse(stringDate); + return date.getTime(); + } catch (ParseException e) { + e.printStackTrace(); + } + return 0L; + } + + @ApiOperation(value = "个人效率记录列表导出") + @GetMapping("/personalEfficiencyListExport") + public void personalEfficiencyListExport(HttpServletResponse httpServletResponse){ + List responseList = dgEfficiencyService.queryPersonalEfficiencyList(); + if(responseList.size()>0){ + List arr = new ArrayList<>(); + for (PersonalEfficiencyListResponse res : responseList) { + arr.add(res.getApplicantId()); + } + //根据提单人id查询其部门名称 + ResponseResult responseResult = hrmsFeignService.getAccountAndDeptNameById(arr); + List employeeMessage = null; + if(responseResult.getData() != null){ + employeeMessage = (List) responseResult.getData(); + } + + for (PersonalEfficiencyListResponse response:responseList) { + for(LinkedHashMap res : employeeMessage){ + if(response.getApplicantId().equals(res.get("id"))){//如果提单人id相同情况下，就往对象里面赋值 + response.setApplicant(JSONObject.toJSONString(res.get("account")).replace("\"","")); + } + } + } + } + try { + EasyExcelUtil.download(httpServletResponse,PersonalEfficiencyListResponse.class,responseList,"个人效率记录列表","第一页"); + } catch (IOException e) { + e.printStackTrace(); + } + + } + + } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java new file mode 100644 index 00000000..91571f33 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java @@ -0,0 +1,30 @@ +package com.daqing.financial.guarantee.model.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +/** + * @Author chen + * @DATE 2020/12/31 15:35 + * @Version 1.0 + */ +@Data +@ToString +public class PersonalEfficiencyListRequest { + + @ApiModelProperty("申请时间,固定类型,0:今天,1:昨天,2:本周,3:本月,4:本年") + private Integer createFixedTime; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("起始时间") + private String startTime; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private String endTime; + + @ApiModelProperty("操作状态") + private Integer operatingStatus; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java index b35bfdcf..81b245ab 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java @@ -1,15 +1,14 @@ package com.daqing.financial.guarantee.model.response; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.daqing.framework.utils.excel.ApprovalStatusConverter; import com.daqing.framework.utils.excel.BusinessStatusConverter; import com.daqing.framework.utils.excel.OperatingStatusConverter; -import com.fasterxml.jackson.annotation.JsonFormat; +import com.daqing.framework.utils.excel.TaskNodeConverter; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * @Author chen * @DATE 2020/12/28 16:31 @@ -18,6 +17,14 @@ import java.util.Date; @Data public class PersonalEfficiencyListResponse { + @ExcelIgnore + @ApiModelProperty(value = "业务id") + private Integer businessId; + + @ExcelIgnore + @ApiModelProperty(value = "提单人") + private Integer applicantId; + @ApiModelProperty(value = "提单人") @ExcelProperty(value = "提单人",index = 1) private String applicant; @@ -28,8 +35,7 @@ public class PersonalEfficiencyListResponse { @ApiModelProperty("申请日期") @ExcelProperty(value = "申请日期",index = 3) - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date applicationDate; + private String applicationDate; @ApiModelProperty("累计耗时") @ExcelProperty(value = "累计耗时",index = 4) @@ -40,8 +46,8 @@ public class PersonalEfficiencyListResponse { private String completeTime; @ApiModelProperty("任务节点") - @ExcelProperty(value = "任务节点",index = 6) - private Double taskNode; + @ExcelProperty(value = "任务节点",index = 6,converter = TaskNodeConverter.class) + private Integer taskNode; @ApiModelProperty("审批状态") @ExcelProperty(value = "审核状态",index = 7,converter = ApprovalStatusConverter.class) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java index 05c36682..a7a4c729 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java @@ -2,10 +2,12 @@ package com.daqing.financial.guarantee.service; import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest; +import com.daqing.financial.guarantee.model.response.PersonalEfficiencyListResponse; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -16,4 +18,6 @@ public interface IDgEfficiencyService extends IService { Map approvalNum(); HashMap> queryList(DgEfficiencyTeamRequest dgEfficiencyTeamRequest); + + List queryPersonalEfficiencyList(); } 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 index d50c3597..8f8753fb 100644 --- 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 @@ -1,25 +1,33 @@ package com.daqing.financial.guarantee.service.impl; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController; -import com.daqing.financial.guarantee.mapper.DgAuditProcessMapper; -import com.daqing.financial.guarantee.mapper.DgEfficiencyMapper; +import com.daqing.financial.guarantee.mapper.*; +import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest; import com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest; -import com.daqing.financial.guarantee.model.response.EfficiencyApprovalResponse; +import com.daqing.financial.guarantee.model.response.*; import com.daqing.financial.guarantee.service.IDgEfficiencyService; import com.daqing.financial.guarantee.util.DateUtils; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; -import org.springframework.stereotype.Service; - - +import com.daqing.framework.domain.guarantee.DgAuditProcess; import com.daqing.framework.domain.guarantee.po.DgTeamEfficiencyPO; -import java.text.SimpleDateFormat; -import java.util.*; - +import com.daqing.framework.domain.guarantee.po.DgWorkConferencePO; +import com.daqing.framework.domain.guarantee.po.StatusPO; +import com.daqing.framework.model.response.PromptSuccess; +import com.daqing.framework.util.RedisUtil; +import com.google.common.collect.Maps; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; -import java.util.List; +import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; +import java.util.*; /** * @auther River @@ -30,9 +38,44 @@ public class DgEfficiencyServiceImpl extends ServiceImpltimeList = dgAuditProcessMapper.selectTenDays(Integer.parseInt(userId)); + List timeList = dgAuditProcessMapper.selectTenDays(Integer.parseInt(userId)); //近十天审批数目的值的数组 - ListapprovalList = dgAuditProcessMapper.selectApprovalNum(Integer.parseInt(userId)); + List approvalList = dgAuditProcessMapper.selectApprovalNum(Integer.parseInt(userId)); Map map = new HashMap(); - map.put("timeArr",timeList); - map.put("approvalNumArr",approvalList); + map.put("timeArr", timeList); + map.put("approvalNumArr", approvalList); return map; } + + @Override + public List queryPersonalEfficiencyList() { + int size = 100; + List efficiencyList = new ArrayList<>(); + //获取当前登录用户id + int currentUser = Integer.parseInt(this.getUserId()); + //获取当前用户拥有的角色ids + String roleIds = RedisUtil.get("dq:userRole:" + currentUser); + //字符串格式 + List roleIdList = new ArrayList<>(); + if (roleIds != null) { + String[] ids = roleIds.split(","); + roleIdList = Arrays.asList(ids); + } + //数字格式 + List roleList = new ArrayList<>(); + if (roleIds != null) { + String[] roleId = roleIds.split(","); + for (String id : roleId) { + roleList.add(Integer.parseInt(id)); + } + } + //查询用户处理过的业务 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("user_id", currentUser).groupBy("business_id").select("business_id"); + List auditProcessList = dgAuditProcessMapper.selectList(wrapper); + if (auditProcessList != null && auditProcessList.size() != 0) { + List businessIdList = new ArrayList<>(); + auditProcessList.forEach(dgAuditProcess -> { + businessIdList.add(dgAuditProcess.getBusinessId()); + }); + + //根据业务id查询业务流程，统计耗时，完成时间 + businessIdList.forEach(businessId -> { + //new返回对象 + PersonalEfficiencyListResponse efficiencyListResponse = new PersonalEfficiencyListResponse(); + efficiencyListResponse.setBusinessId(businessId); + //根据业务id查询业务 + DgApplyAmountInfo dgApplyAmountInfo = applyAmountInfoMapper.selectById(businessId); + //业务申请日期 + Date createTime = dgApplyAmountInfo.getCreateTime(); + //客户公司id + Integer companyId = dgApplyAmountInfo.getCompanyId(); + //提单人id + Integer presenterId = dgApplyAmountInfo.getPresenterId(); + efficiencyListResponse.setApplicantId(presenterId); + efficiencyListResponse.setApplicationDate(new SimpleDateFormat("yyyy-MM-dd").format(createTime)); + efficiencyListResponse.setClientName(String.valueOf(companyId)); + //获取累计耗时，完成时间，任务节点 + HashMap hashMap = getTime(businessId, currentUser); + Object countTime = hashMap.get("countTime"); + Object endTime = hashMap.get("endTime"); + efficiencyListResponse.setTimeConsuming(String.valueOf(countTime)); + efficiencyListResponse.setCompleteTime(String.valueOf(endTime)); + efficiencyList.add(efficiencyListResponse); + }); + //获取每个业务id的三种状态 + HashMap hashMap = Maps.newHashMap(); + //角色不为空 + //担保业务员角色、担保经理角色 + if (roleIdList.contains(String.valueOf(PromptSuccess.DB_YWY_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DB_JL_ID))) { + //业务申请列表查询 + IPage positionVO = applyAmountListMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId()); + List records = positionVO.getRecords(); + if (records!=null && records.size()!=0){ + records.forEach(businessApplicationListResponse -> { + StatusPO statusPO = new StatusPO(); + Integer businessId = businessApplicationListResponse.getBusinessId(); + String name = businessApplicationListResponse.getName(); + Integer status = businessApplicationListResponse.getStatus(); + Integer operatingStatus = businessApplicationListResponse.getOperatingStatus(); + Integer businessStatus = businessApplicationListResponse.getBusinessStatus(); + statusPO.setBusinessStatus(businessStatus); + statusPO.setName(name); + statusPO.setOperatingStatus(operatingStatus); + statusPO.setProcessId(1); + statusPO.setStatus(status); + hashMap.put(businessId, statusPO); + }); + } + } + //担保经理角色、担保A角角色、担保B角角色、担保领导角色 + if (roleIdList.contains(String.valueOf(PromptSuccess.DB_JL_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DB_LD_ID))) { + // 担保部调查列表 + IPage positionVO = guaranteeAssignUserMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); + List records = positionVO.getRecords(); + if (records!=null && records.size()!=0) { + records.forEach(guaranteeListResponse -> { + StatusPO statusPO = new StatusPO(); + Integer businessId = guaranteeListResponse.getBusinessId(); + Integer status = guaranteeListResponse.getStatus(); + String name = guaranteeListResponse.getName(); + Integer operatingStatus = guaranteeListResponse.getOperatingStatus(); + Integer businessStatus = guaranteeListResponse.getBusinessStatus(); + statusPO.setBusinessStatus(businessStatus); + statusPO.setOperatingStatus(operatingStatus); + statusPO.setProcessId(2); + statusPO.setName(name); + statusPO.setStatus(status); + hashMap.put(businessId, statusPO); + }); + } + } + //资产经理角色、资产专员角色、资产领导角色 + if (roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.ZC_ZY_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.ZC_LD_ID))) { + // 资产部调查列表 + IPage positionVO = assetsInvestigationMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); + List records = positionVO.getRecords(); + if (records!=null && records.size()!=0) { + records.forEach(assetsInvestigationListResponse -> { + StatusPO statusPO = new StatusPO(); + Integer businessId = assetsInvestigationListResponse.getBusinessId(); + Integer status = assetsInvestigationListResponse.getStatus(); + String name = assetsInvestigationListResponse.getName(); + Integer operatingStatus = assetsInvestigationListResponse.getOperatingStatus(); + Integer businessStatus = assetsInvestigationListResponse.getBusinessStatus(); + statusPO.setBusinessStatus(businessStatus); + statusPO.setOperatingStatus(operatingStatus); + statusPO.setProcessId(3); + statusPO.setName(name); + statusPO.setStatus(status); + hashMap.put(businessId, statusPO); + }); + } + } + //信息经理角色、信息专员角色、信息领导角色 + if (roleIdList.contains(String.valueOf(PromptSuccess.XX_JL_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.XX_ZY_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.XX_LD_ID))) { + // 信息部调查列表 + IPage positionVO = messageInvestigationMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); + List records = positionVO.getRecords(); + if (records!=null && records.size()!=0) { + records.forEach(messageInvestigationListResponse -> { + StatusPO statusPO = new StatusPO(); + Integer businessId = messageInvestigationListResponse.getBusinessId(); + Integer status = messageInvestigationListResponse.getStatus(); + String name = messageInvestigationListResponse.getName(); + Integer operatingStatus = messageInvestigationListResponse.getOperatingStatus(); + Integer businessStatus = messageInvestigationListResponse.getBusinessStatus(); + statusPO.setBusinessStatus(businessStatus); + statusPO.setOperatingStatus(operatingStatus); + statusPO.setProcessId(4); + statusPO.setName(name); + statusPO.setStatus(status); + hashMap.put(businessId, statusPO); + }); + } + } + //担保部A/B角、法规经理角色、法规部C角、法规部分管领导 + if (roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))|roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))|roleIdList.contains(String.valueOf(PromptSuccess.FG_C_ID))|roleIdList.contains(String.valueOf(PromptSuccess.FG_LD_ID))) { + // 合规调查列表 + DgComplianceInvestigationRequest dgComplianceInvestigationRequest = new DgComplianceInvestigationRequest(); + IPage list = complianceInvestigationMapper.list(new Page(1, size), dgComplianceInvestigationRequest, roleList, currentUser); + List records = list.getRecords(); + if (records!=null && records.size()!=0) { + records.forEach(dgComplianceInvestigationResponse -> { + StatusPO statusPO = new StatusPO(); + Integer businessId = dgComplianceInvestigationResponse.getBusinessId(); + String name = dgComplianceInvestigationResponse.getName(); + Integer status = dgComplianceInvestigationResponse.getAuditStatus(); + Integer operatingStatus = dgComplianceInvestigationResponse.getOperationStatus(); + Integer businessStatus = dgComplianceInvestigationResponse.getBusinessStatus(); + statusPO.setBusinessStatus(businessStatus); + statusPO.setOperatingStatus(operatingStatus); + statusPO.setProcessId(5); + statusPO.setName(name); + statusPO.setStatus(status); + hashMap.put(businessId, statusPO); + }); + } + } + //工作会 + if (roleIdList.contains(String.valueOf(PromptSuccess.GZU_ID))) { + IPage list = workConferenceConsiderMapper.list(new Page(1, size), "", roleList, currentUser); + List records = list.getRecords(); + if (records!=null && records.size()!=0) { + records.forEach(dgWorkConferencePO -> { + StatusPO statusPO = new StatusPO(); + Integer businessId = dgWorkConferencePO.getBusinessId(); + String name = dgWorkConferencePO.getName(); + Integer status = dgWorkConferencePO.getAuditStatus(); + Integer operatingStatus = dgWorkConferencePO.getOperationStatus(); + Integer businessStatus = dgWorkConferencePO.getBusinessStatus(); + statusPO.setBusinessStatus(businessStatus); + statusPO.setOperatingStatus(operatingStatus); + statusPO.setProcessId(6); + statusPO.setName(name); + statusPO.setStatus(status); + hashMap.put(businessId, statusPO); + }); + } + } + //担保部A/B角、贷审会 + if (roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DSH_ID))) { + IPage list = loanCommitteeConsiderMapper.list(new Page(1, size), "", roleList, currentUser); + List records = list.getRecords(); + if (records!=null && records.size()!=0) { + records.forEach(dgLoanCommitteeConsiderResponse -> { + StatusPO statusPO = new StatusPO(); + Integer businessId = dgLoanCommitteeConsiderResponse.getBusinessId(); + Integer status = dgLoanCommitteeConsiderResponse.getStatus(); + String name = dgLoanCommitteeConsiderResponse.getName(); + Integer operatingStatus = dgLoanCommitteeConsiderResponse.getOperatingStatus(); + Integer businessStatus = dgLoanCommitteeConsiderResponse.getBusinessStatus(); + statusPO.setBusinessStatus(businessStatus); + statusPO.setOperatingStatus(operatingStatus); + statusPO.setProcessId(7); + statusPO.setName(name); + statusPO.setStatus(status); + hashMap.put(businessId, statusPO); + }); + } + } + //法规经理、担保部A/B角、资产部经理 + if (roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))|roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID)) ) { + //担保函 + IPage iPage = guaranteeLetterAssignUserMapper.pageByCondition(new Page(1, size), currentUser, roleIdList, null, null); + List records = iPage.getRecords(); + if (records!=null && records.size()!=0) { + records.forEach(guaranteeLetterListResponse -> { + StatusPO statusPO = new StatusPO(); + String name = guaranteeLetterListResponse.getName(); + Integer businessId = guaranteeLetterListResponse.getBusinessId(); + Integer status = guaranteeLetterListResponse.getStatus(); + Integer operatingStatus = guaranteeLetterListResponse.getOperatingStatus(); + Integer businessStatus = guaranteeLetterListResponse.getBusinessStatus(); + statusPO.setBusinessStatus(businessStatus); + statusPO.setOperatingStatus(operatingStatus); + statusPO.setProcessId(8); + statusPO.setName(name); + statusPO.setStatus(status); + hashMap.put(businessId, statusPO); + }); + } + } + //财务部、法规经理 + if (roleIdList.contains(String.valueOf(PromptSuccess.CWB_ID))|roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))) { + //回款确认 + IPage iPage = paymentConfirmationConsiderMapper.pageByCondition(new Page(1, size), roleIdList, currentUser, null, null); + List records = iPage.getRecords(); + if (records!=null && records.size()!=0) { + records.forEach(paymentConfirmationListResponse -> { + StatusPO statusPO = new StatusPO(); + String name = paymentConfirmationListResponse.getName(); + Integer businessId = paymentConfirmationListResponse.getBusinessId(); + Integer status = paymentConfirmationListResponse.getStatus(); + Integer operatingStatus = paymentConfirmationListResponse.getOperatingStatus(); + Integer businessStatus = paymentConfirmationListResponse.getBusinessStatus(); + statusPO.setBusinessStatus(businessStatus); + statusPO.setOperatingStatus(operatingStatus); + statusPO.setProcessId(9); + statusPO.setName(name); + statusPO.setStatus(status); + hashMap.put(businessId, statusPO); + }); + } + } + //法规经理 + if (roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))) { + //放款通知 + IPage iPage = loanNoticeMapper.pageByCondition(new Page(1, size), roleIdList, currentUser, null, null); + List records = iPage.getRecords(); + if (records!=null && records.size()!=0) { + records.forEach(loanNoticeListResponse -> { + StatusPO statusPO = new StatusPO(); + String name = loanNoticeListResponse.getName(); + Integer businessId = loanNoticeListResponse.getBusinessId(); + Integer status = loanNoticeListResponse.getStatus(); + Integer operatingStatus = loanNoticeListResponse.getOperatingStatus(); + Integer businessStatus = loanNoticeListResponse.getBusinessStatus(); + statusPO.setBusinessStatus(businessStatus); + statusPO.setOperatingStatus(operatingStatus); + statusPO.setProcessId(10); + statusPO.setName(name); + statusPO.setStatus(status); + hashMap.put(businessId, statusPO); + }); + } + } + //再次循环，拼接数据 + efficiencyList.forEach(personalEfficiencyListResponse -> { + Integer businessId = personalEfficiencyListResponse.getBusinessId(); + Object o = hashMap.get(businessId); + //有数据 + if (ObjectUtil.isNotNull(o)){ + //强制转换 + if (o instanceof StatusPO){ + StatusPO statusPO = (StatusPO)o; + String name = statusPO.getName(); + Integer operatingStatus = statusPO.getOperatingStatus(); + Integer processId = statusPO.getProcessId(); + Integer status = statusPO.getStatus(); + Integer businessStatus = statusPO.getBusinessStatus(); + personalEfficiencyListResponse.setTaskNode(processId); + personalEfficiencyListResponse.setBusinessStatus(businessStatus); + personalEfficiencyListResponse.setOperatingStatus(operatingStatus); + personalEfficiencyListResponse.setApproveStatus(status); + personalEfficiencyListResponse.setClientName(name); + } + } + String timeConsuming = personalEfficiencyListResponse.getTimeConsuming(); + String totalTimeConsuming = countTime(timeConsuming); + personalEfficiencyListResponse.setTimeConsuming(totalTimeConsuming); + }); + } + return efficiencyList; + } + + //根据业务id和用户id统计耗时 + private HashMap getTime(Integer businessId, Integer userId) { + HashMap hashMap = Maps.newHashMap(); + //根据业务id查询业务流程表 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("business_id", businessId).orderByAsc("create_time"); + List auditProcessList = dgAuditProcessMapper.selectList(wrapper); + long countTime = 0L; + if (auditProcessList.size()>1){ + //遍历业务流程数据，统计该用户的耗时 + for (int i = 1; i <= auditProcessList.size() - 1; i++) { + //从第二条数据开始，获取该数据 + DgAuditProcess auditProcess = auditProcessList.get(i); + //该数据是当前用户处理的 + if (auditProcess.getUserId().equals(userId)) { + //获取上一流程的时间节点 + DgAuditProcess previousProcess = auditProcessList.get(i - 1); + Date previousTime = previousProcess.getCreateTime(); + Date currentTime = auditProcess.getCreateTime(); + long currentTimeTime = currentTime.getTime(); + long previousTimeTime = previousTime.getTime(); + //累计耗时,毫秒 + countTime = currentTimeTime - previousTimeTime; + } + } + } + //查询结束时间 + QueryWrapper wrapperTime = new QueryWrapper<>(); + wrapperTime.eq("business_id", businessId).eq("user_id", userId).orderByDesc("create_time").last("limit 1"); + DgAuditProcess auditProcess = dgAuditProcessMapper.selectOne(wrapperTime); + Date endTime = auditProcess.getCreateTime(); + hashMap.put("countTime", countTime); + hashMap.put("endTime", new SimpleDateFormat("yyyy-MM-dd").format(endTime)); + return hashMap; + } + + public static String countTime(String totalTime) { + long time = Long.parseLong(totalTime); + long days = time/ (1000 * 60 * 60 * 24); + long hours = (time% (1000 * 60 * 60 * 24)) / (1000 * 60 * 60); + long minutes = (time% (1000 * 60 * 60)) / (1000 * 60); + long seconds = (time% (1000 * 60)) / 1000; + return days + "天" + hours + "小时"+ minutes +"分钟"; + } + + /** + * 获取当前登录用户信息 + */ + private String getUserId() { + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String token = request.getHeader("token"); + return RedisUtil.get("dq:token:" + token); + } } \ No newline at end of file diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/StatusPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/StatusPO.java new file mode 100644 index 00000000..dce15077 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/StatusPO.java @@ -0,0 +1,31 @@ +package com.daqing.framework.domain.guarantee.po; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +/** + * @Author chen + * @DATE 2020/12/30 9:45 + * @Version 1.0 + */ +@Data +@ToString +public class StatusPO { + + @ApiModelProperty("客户名称") + private String name; + + @ApiModelProperty("进程id") + private Integer processId; + + @ApiModelProperty("审核状态") + private Integer status; + + @ApiModelProperty("业务状态") + private Integer businessStatus; + + @ApiModelProperty("操作状态") + private Integer operatingStatus; + +} diff --git a/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java new file mode 100644 index 00000000..8df4881c --- /dev/null +++ b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java @@ -0,0 +1,87 @@ +package com.daqing.framework.utils.excel; + +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.CellData; +import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.property.ExcelContentProperty; + +/** + * @Author chen + * @DATE 2020/12/30 15:26 + * @Version 1.0 + * 任务节点转换器 + */ +public class TaskNodeConverter implements Converter { + + @Override + public Class supportJavaTypeKey() { + return Integer.class; + } + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + return CellDataTypeEnum.STRING; + } + + /** + * 这里读的时候会调用 + * + * @param cellData + * NotNull + * @param contentProperty + * Nullable + * @param globalConfiguration + * NotNull + * @return + */ + @Override + public Integer convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { + return 0; + } + + /** + * 这里是写的时候会调用 + * + * @param value + * NotNull + * @param contentProperty + * Nullable + * @param globalConfiguration + * NotNull + * @return + */ + @Override + public CellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { + + switch (value){ + case 1: + return new CellData("业务申请"); + case 2: + return new CellData("担保部调查"); + case 3: + return new CellData("资产部调查"); + case 4: + return new CellData("信息部调查"); + case 5: + return new CellData("合规调查"); + case 6: + return new CellData("工作会"); + case 7: + return new CellData("贷审会"); + case 8: + return new CellData("担保函"); + case 9: + return new CellData("回款确认"); + case 10: + return new CellData("放款通知"); + default: + return new CellData(String.valueOf(value)); + } + + } + +} + From b5dba4b13f70d1cdefc9108227723b7d5d17d707 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Mon, 4 Jan 2021 10:05:46 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=95=88=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DgEfficiencyController.java | 22 +++++++++-- .../PersonalEfficiencyListResponse.java | 2 +- .../service/impl/DgEfficiencyServiceImpl.java | 2 +- .../guarantee/util/TaskNodeUtil.java | 37 +++++++++++++++++++ 4 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/TaskNodeUtil.java diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java index 4296eb83..139e1147 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java @@ -7,6 +7,7 @@ import com.daqing.financial.guarantee.model.request.PersonalEfficiencyListReques import com.daqing.financial.guarantee.model.response.PersonalEfficiencyListResponse; import com.daqing.financial.guarantee.service.IDgEfficiencyService; import com.daqing.financial.guarantee.util.DateUtils; +import com.daqing.financial.guarantee.util.TaskNodeUtil; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.excel.EasyExcelUtil; @@ -22,7 +23,6 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * 流程效率 @@ -132,8 +132,25 @@ public class DgEfficiencyController { //获取毫秒数 long longStart = getLongDate(personalEfficiencyListRequest.getStartTime()); long longEnd = getLongDate(personalEfficiencyListRequest.getEndTime()); - Stream booleanStream = responseList.stream().map(p -> getLongDate(p.getApplicationDate()) > longStart && getLongDate(p.getApplicationDate()) < longEnd); + //迭代器进行筛选 + Iterator iterator = responseList.iterator(); + while (iterator.hasNext()){ + PersonalEfficiencyListResponse next = iterator.next(); + String applicationDate = next.getApplicationDate(); + long longDate = getLongDate(applicationDate); + //当前日期小于开始日期或当前日期大于结束日期，删除该元素 + if (longDatelongEnd){ + iterator.remove(); + } + } } + //转换任务节点 + responseList.forEach(personalEfficiencyListResponse -> { + String taskNode = personalEfficiencyListResponse.getTaskNode(); + String converter = TaskNodeUtil.converter(taskNode); + personalEfficiencyListResponse.setTaskNode(converter); + }); + return ResponseResult.SUCCESS(responseList); } @@ -180,5 +197,4 @@ public class DgEfficiencyController { } - } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java index 81b245ab..bddd6151 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java @@ -47,7 +47,7 @@ public class PersonalEfficiencyListResponse { @ApiModelProperty("任务节点") @ExcelProperty(value = "任务节点",index = 6,converter = TaskNodeConverter.class) - private Integer taskNode; + private String taskNode; @ApiModelProperty("审批状态") @ExcelProperty(value = "审核状态",index = 7,converter = ApprovalStatusConverter.class) 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 index 8f8753fb..4a14c634 100644 --- 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 @@ -490,7 +490,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl Date: Mon, 4 Jan 2021 11:35:07 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DgEfficiencyController.java | 18 +++++++++++++++--- .../PersonalEfficiencyListResponse.java | 12 ++++++++++++ .../financial/guarantee/util/TaskNodeUtil.java | 1 - 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java index 139e1147..ebb70ad4 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java @@ -144,11 +144,23 @@ public class DgEfficiencyController { } } } - //转换任务节点 + //转换任务节点，并统计操作状态个数 responseList.forEach(personalEfficiencyListResponse -> { String taskNode = personalEfficiencyListResponse.getTaskNode(); - String converter = TaskNodeUtil.converter(taskNode); - personalEfficiencyListResponse.setTaskNode(converter); + if (taskNode!=null){ + String converter = TaskNodeUtil.converter(taskNode); + personalEfficiencyListResponse.setTaskNode(converter); + } + if (personalEfficiencyListResponse.getOperatingStatus()!=null){ + switch (personalEfficiencyListResponse.getOperatingStatus()){ + case 0: + personalEfficiencyListResponse.setInitiateNum(personalEfficiencyListResponse.getInitiateNum()+1); + case 1: + personalEfficiencyListResponse.setPendingNum(personalEfficiencyListResponse.getPendingNum()+1); + case 2: + personalEfficiencyListResponse.setProcessedNum(personalEfficiencyListResponse.getProcessedNum()+1); + } + } }); return ResponseResult.SUCCESS(responseList); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java index bddd6151..50d80a57 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java @@ -21,6 +21,18 @@ public class PersonalEfficiencyListResponse { @ApiModelProperty(value = "业务id") private Integer businessId; + @ExcelIgnore + @ApiModelProperty("发起数") + private Integer initiateNum = 0; + + @ExcelIgnore + @ApiModelProperty("待处理数") + private Integer pendingNum = 0; + + @ExcelIgnore + @ApiModelProperty("已处理数") + private Integer processedNum = 0; + @ExcelIgnore @ApiModelProperty(value = "提单人") private Integer applicantId; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/TaskNodeUtil.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/TaskNodeUtil.java index 47a1f6de..130eb60e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/TaskNodeUtil.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/TaskNodeUtil.java @@ -1,6 +1,5 @@ package com.daqing.financial.guarantee.util; -import com.alibaba.excel.metadata.CellData; /** * @Author chen From e57df6c00fbab94c4dd14e48c31447674cd9e8d0 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Mon, 4 Jan 2021 11:36:46 +0800 Subject: [PATCH 4/8] Merge branch 'master' of D:\git_repository\msc-Demo\dqFinancial with conflicts. --- .idea/compiler.xml | 12 +- .idea/encodings.xml | 5 + .../financial/hrms/DeptControllerApi.java | 6 + .../financial/DqFinancialApiApplication.class | Bin 809 -> 0 bytes .../financial/config/SwaggerConfig.class | Bin 2094 -> 2094 bytes .../crms/CustomerControllerApi.class | Bin 2076 -> 1901 bytes .../hrauth/UserLoginControllerApi.class | Bin 746 -> 1123 bytes .../financial/hrms/DeptControllerApi.class | Bin 1510 -> 2452 bytes .../hrms/EmployeeControllerApi.class | Bin 1126 -> 3237 bytes .../hrms/PermissionControllerApi.class | Bin 1244 -> 1356 bytes .../hrms/PositionControllerApi.class | Bin 1046 -> 1783 bytes .../service/impl/CustomerServiceImpl.java | 18 +- .../mapper/crms/CompanyCustomerDao.xml | 2 + .../META-INF/dq-financial-crms.kotlin_module | Bin 16 -> 0 bytes .../target/classes/bootstrap.properties | 81 ++- .../crms/DqFinancialCrmsApplication.class | Bin 1059 -> 1067 bytes .../financial/crms/config/CorsConfig.class | Bin 1478 -> 0 bytes .../financial/crms/config/IPageConfig.class | Bin 715 -> 0 bytes .../crms/controller/CustomerController.class | Bin 6289 -> 6984 bytes .../crms/dao/CompanyCustomerDao.class | Bin 748 -> 1046 bytes .../financial/crms/dao/CustomerDao.class | Bin 1660 -> 1892 bytes .../crms/feign/HrmsFeignService.class | Bin 1669 -> 1925 bytes .../crms/service/CustomerService.class | Bin 1643 -> 1895 bytes .../service/impl/CustomerServiceImpl.class | Bin 21978 -> 24903 bytes .../mapper/crms/CompanyCustomerDao.xml | 58 +- .../classes/mapper/crms/CustomerDao.xml | 9 + .../DgApplyAmountInfoController.java | 20 + .../controller/DgEfficiencyController.java | 188 +----- .../mapper/DgApplyAmountInfoMapper.java | 5 +- .../guarantee/mapper/DgEfficiencyMapper.java | 3 + .../model/request/DgStatisticsRequest.java | 12 +- .../PersonalEfficiencyListRequest.java | 30 - .../DgStatisticsListRefuseResponse.java | 18 +- .../PersonalEfficiencyListResponse.java | 7 +- .../service/IDgApplyAmountInfoService.java | 5 + .../service/IDgEfficiencyService.java | 5 +- .../impl/DgApplyAmountInfoServiceImpl.java | 55 +- .../service/impl/DgEfficiencyServiceImpl.java | 457 +-------------- .../service/impl/DgStatisticsServiceImpl.java | 65 +-- .../guarantee/DgApplyAmountInfoMapper.xml | 22 +- .../mapper/guarantee/DgEfficiencyMapper.xml | 10 + .../mapper/guarantee/DgStatisticsMapper.xml | 6 + .../target/classes/bootstrap.properties | 70 ++- .../financial/hrauth/aspect/Operation.class | Bin 7203 -> 6943 bytes .../hrauth/aspect/SysLogAspect.class | Bin 7384 -> 7115 bytes .../controller/UserLoginController.class | Bin 3030 -> 8543 bytes .../financial/hrauth/dao/LoginLogMapper.class | Bin 412 -> 1022 bytes .../hrauth/dao/SystemLogMapper.class | Bin 415 -> 754 bytes .../financial/hrauth/dao/UserLoginDao.class | Bin 1015 -> 1624 bytes .../hrauth/service/LoginLogService.class | Bin 345 -> 582 bytes .../hrauth/service/UserLoginService.class | Bin 801 -> 1107 bytes .../service/impl/LoginLogServiceImpl.class | Bin 779 -> 2123 bytes .../service/impl/UserLoginServiceImpl.class | Bin 7027 -> 10945 bytes .../financial/hrauth/util/IpUtils.class | Bin 1748 -> 1748 bytes .../mapper/hrmsauth/UserLoginMapper.xml | 41 -- .../hrms/controller/DeptController.java | 8 + .../daqing/financial/hrms/dao/DeptDao.java | 3 + .../financial/hrms/service/DeptService.java | 3 + .../hrms/service/impl/DeptServiceImpl.java | 13 +- .../main/resources/mapper/hrms/DeptDao.xml | 4 + .../target/classes/bootstrap.properties | 76 ++- .../hrms/DqFinancialHrmsApplication.class | Bin 1059 -> 1126 bytes .../financial/hrms/config/CorsConfig.class | Bin 1478 -> 0 bytes .../financial/hrms/config/IPageConfig.class | Bin 715 -> 0 bytes .../hrms/controller/DeptController.class | Bin 4190 -> 5222 bytes .../hrms/controller/EmployeeController.class | Bin 4530 -> 10197 bytes .../controller/PermissionController.class | Bin 3356 -> 5062 bytes .../hrms/controller/PositionController.class | Bin 3583 -> 4265 bytes .../hrms/controller/UserController.class | Bin 3196 -> 4428 bytes .../daqing/financial/hrms/dao/DeptDao.class | Bin 1127 -> 1466 bytes .../financial/hrms/dao/EmployeeDao.class | Bin 1606 -> 6339 bytes .../financial/hrms/dao/PermissionDao.class | Bin 416 -> 934 bytes .../financial/hrms/dao/PositionDao.class | Bin 1239 -> 1602 bytes .../daqing/financial/hrms/dao/RoleDao.class | Bin 398 -> 523 bytes .../hrms/dao/RolePermissionDao.class | Bin 428 -> 760 bytes .../daqing/financial/hrms/dao/UserDao.class | Bin 398 -> 1049 bytes .../financial/hrms/service/DeptService.class | Bin 857 -> 1437 bytes .../hrms/service/EmployeeService.class | Bin 1003 -> 3083 bytes .../hrms/service/PermissionService.class | Bin 481 -> 811 bytes .../hrms/service/PositionService.class | Bin 926 -> 1255 bytes .../financial/hrms/service/UserService.class | Bin 558 -> 1089 bytes .../hrms/service/impl/DeptServiceImpl.class | Bin 8654 -> 12528 bytes .../service/impl/EmployeeServiceImpl.class | Bin 2861 -> 27945 bytes .../service/impl/PermissionServiceImpl.class | Bin 4192 -> 7805 bytes .../service/impl/PositionServiceImpl.class | Bin 9681 -> 12181 bytes .../hrms/service/impl/UserServiceImpl.class | Bin 1843 -> 9144 bytes .../target/classes/mapper/hrms/DeptDao.xml | 50 +- .../classes/mapper/hrms/EmployeeDao.xml | 546 +++++++++++++++++- .../classes/mapper/hrms/PermissionDao.xml | 18 + .../classes/mapper/hrms/PositionDao.xml | 15 + .../target/classes/mapper/hrms/RoleDao.xml | 3 + .../classes/mapper/hrms/RolePermissionDao.xml | 7 + .../target/classes/mapper/hrms/UserDao.xml | 32 + dq-framework-common/dq-framework-common.iml | 151 ----- .../framework/SpringContextHolder.class | Bin 1981 -> 2048 bytes .../framework/client/DqFinancialList.class | Bin 936 -> 936 bytes .../framework/exception/CustomException.class | Bin 1021 -> 1051 bytes .../framework/exception/ExceptionCast.class | Bin 578 -> 608 bytes .../framework/exception/ExceptionCatch.class | Bin 3871 -> 3923 bytes .../model/Constant$CloudService.class | Bin 1417 -> 1495 bytes .../framework/model/Constant$MenuType.class | Bin 1389 -> 1467 bytes .../model/Constant$ScheduleStatus.class | Bin 1377 -> 1455 bytes .../com/daqing/framework/model/Constant.class | Bin 764 -> 764 bytes .../framework/model/request/RequestData.class | Bin 842 -> 883 bytes .../framework/model/response/CommonCode.class | Bin 3419 -> 4344 bytes .../model/response/PromptSuccess.class | Bin 529 -> 3051 bytes .../model/response/ResponseResult.class | Bin 4687 -> 5044 bytes .../framework/model/response/ResultCode.class | Bin 223 -> 223 bytes .../com/daqing/framework/util/BasePage.class | Bin 1496 -> 1559 bytes .../com/daqing/framework/util/JwtUtils.class | Bin 4264 -> 5414 bytes .../com/daqing/framework/util/Md5Util.class | Bin 1149 -> 1012 bytes .../daqing/framework/util/RandomUtil.class | Bin 932 -> 962 bytes .../com/daqing/framework/util/RedisUtil.class | Bin 7943 -> 8322 bytes .../com/daqing/framework/util/SendSMS.class | Bin 3531 -> 3886 bytes .../daqing/framework/web/BaseController.class | Bin 933 -> 967 bytes .../com/daqing/framework/xss/SQLFilter.class | Bin 1443 -> 1473 bytes .../domain/crms/ext/CompanyTemplate.java | 28 + .../domain/crms/ext/CustomerCompanyVO.java | 31 + .../domain/guarantee/DgApplyField.java | 142 +++++ .../domain/guarantee/po/StatusPO.java | 31 - .../domain/hrms/ext/EmployeeListVO.java | 3 + .../domain/hrms/ext/EmployeeTemplate.java | 6 +- .../domain/crms/CompanyCustomerEntity.class | Bin 6242 -> 14910 bytes .../domain/crms/CustomerEntity.class | Bin 6815 -> 8328 bytes .../domain/crms/PersonalCustomerEntity.class | Bin 9061 -> 10974 bytes .../domain/crms/ext/CompanyTemplate.class | Bin 6760 -> 12218 bytes .../crms/ext/CrmsConstant$CustomerType.class | Bin 2049 -> 2153 bytes .../domain/crms/ext/CrmsConstant.class | Bin 627 -> 627 bytes .../domain/crms/ext/CustomerCompanyDTO.class | Bin 7330 -> 16966 bytes .../domain/crms/ext/CustomerCompanyTOI.class | Bin 7877 -> 9658 bytes .../domain/crms/ext/CustomerCompanyTOU.class | Bin 8773 -> 10876 bytes .../domain/crms/ext/CustomerCompanyVO.class | Bin 7106 -> 14685 bytes .../domain/crms/ext/CustomerPersonalDTO.class | Bin 9335 -> 11837 bytes .../domain/crms/ext/CustomerPersonalTOI.class | Bin 10958 -> 13857 bytes .../domain/crms/ext/CustomerPersonalTOU.class | Bin 11854 -> 15147 bytes .../domain/crms/ext/CustomerPersonalVO.class | Bin 10034 -> 12361 bytes .../domain/crms/ext/CustomerTO.class | Bin 4223 -> 4821 bytes .../domain/crms/ext/ManagerName.class | Bin 1374 -> 1516 bytes .../domain/crms/ext/PersonalTemplate.class | Bin 10420 -> 12971 bytes .../domain/crms/request/CustomerRequest.class | Bin 3342 -> 3764 bytes .../domain/crms/response/CrmsCode.class | Bin 2795 -> 2881 bytes .../framework/domain/hrms/DepartmentVO.class | Bin 4570 -> 5793 bytes .../framework/domain/hrms/DeptEntity.class | Bin 5935 -> 6733 bytes .../domain/hrms/DeptPositionEntity.class | Bin 2520 -> 2790 bytes .../domain/hrms/EmployeeDeptEntity.class | Bin 2520 -> 2790 bytes .../domain/hrms/EmployeeEntity.class | Bin 6094 -> 7237 bytes .../domain/hrms/EmployeePositionEntity.class | Bin 2533 -> 2803 bytes .../domain/hrms/EmployeeRoleEntity.class | Bin 2492 -> 2762 bytes .../framework/domain/hrms/LoginLog.class | Bin 3024 -> 3318 bytes .../domain/hrms/PermissionEntity.class | Bin 6941 -> 8705 bytes .../domain/hrms/PositionEntity.class | Bin 4163 -> 4760 bytes .../framework/domain/hrms/RoleEntity.class | Bin 3343 -> 4190 bytes .../domain/hrms/RolePermissionEntity.class | Bin 2544 -> 2898 bytes .../hrms/SystemLog$SystemLogBuilder.class | Bin 3469 -> 3642 bytes .../framework/domain/hrms/SystemLog.class | Bin 8152 -> 9618 bytes .../daqing/framework/domain/hrms/Token.class | Bin 2491 -> 2761 bytes .../framework/domain/hrms/UserEntity.class | Bin 6866 -> 9587 bytes .../domain/hrms/ext/EmployeeTO.class | Bin 2746 -> 3035 bytes .../domain/hrms/ext/EmployeeVO.class | Bin 1823 -> 2149 bytes .../domain/hrms/ext/PositionVO.class | Bin 3052 -> 3800 bytes .../domain/hrms/request/DeptAddRequest.class | Bin 1889 -> 2092 bytes .../hrms/request/DeptUpdateSortRequest.class | Bin 3001 -> 3423 bytes .../domain/hrms/request/LoginRequest.class | Bin 3199 -> 3512 bytes .../hrms/request/PermissionAddRequest.class | Bin 4059 -> 4754 bytes .../domain/hrms/request/PositionRequest.class | Bin 3129 -> 3703 bytes .../hrms/request/UserLoginRequest.class | Bin 2924 -> 2465 bytes .../domain/hrms/response/HrmsCode.class | Bin 3872 -> 9105 bytes .../domain/hrms/response/LoginResponse.class | Bin 1879 -> 2598 bytes .../hrms/response/PositionResponse.class | Bin 2965 -> 3501 bytes .../utils/excel/TaskNodeConverter.java | 87 --- .../daqing/framework/utils/PageUtils.class | Bin 2369 -> 2477 bytes .../com/daqing/framework/utils/Query.class | Bin 2261 -> 2310 bytes .../framework/utils/SnowflakeIdUtils.class | Bin 3373 -> 3444 bytes .../utils/excel/ExcelException.class | Bin 407 -> 437 bytes .../framework/utils/excel/ExcelListener.class | Bin 1392 -> 1448 bytes .../framework/utils/excel/ExcelUtil.class | Bin 6467 -> 6627 bytes .../utils/excel/ExcelWriterFactroy.class | Bin 2229 -> 2282 bytes .../framework/utils/oss/OssFileUtils.class | Bin 2142 -> 2176 bytes 178 files changed, 1361 insertions(+), 1106 deletions(-) delete mode 100644 dq-financial-api/target/classes/com/daqing/financial/DqFinancialApiApplication.class delete mode 100644 dq-financial-crms/target/classes/META-INF/dq-financial-crms.kotlin_module delete mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/config/CorsConfig.class delete mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java delete mode 100644 dq-financial-hrms-auth/target/classes/mapper/hrmsauth/UserLoginMapper.xml delete mode 100644 dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/CorsConfig.class delete mode 100644 dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/IPageConfig.class create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyField.java delete mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/StatusPO.java delete mode 100644 dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 89d5c3e1..7b320794 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,16 +7,16 @@ + + - - - - - - + + + + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 8703e7ad..8c3bc4a0 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,8 @@ + + @@ -13,8 +15,11 @@ + + + diff --git a/dq-financial-api/src/main/java/com/daqing/financial/hrms/DeptControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/hrms/DeptControllerApi.java index a07fff28..443503fe 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/hrms/DeptControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/hrms/DeptControllerApi.java @@ -70,6 +70,12 @@ public interface DeptControllerApi { @ApiOperation(value = "查询该部门下所有子部门及部门下的的员工", notes = "查询该部门下所有子部门及部门下的的员工") ResponseResult children(Long id); + /** + * 获取所有部门id和名称(用户团队效率的部门筛选) + */ + @ApiOperation(value = "获取所有部门id和名称(用户团队效率的部门筛选)", notes = "获取所有部门id和名称(用户团队效率的部门筛选)") + ResponseResult listDepartment(); + /** * 根据部门id查询该部门下所有员工 */ diff --git a/dq-financial-api/target/classes/com/daqing/financial/DqFinancialApiApplication.class b/dq-financial-api/target/classes/com/daqing/financial/DqFinancialApiApplication.class deleted file mode 100644 index 38b18cb5223af23a6958e97253943f060204b09e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 809 zcmb7CO>fgc5Ph4bbufXpDHO_=#4XLC+j8JysFbGkWPwCbIB;4!8?&vwo37Wie~S}{ z13!Qtg_w1M5~TEiE$w*c&Agd;<6pmj`~+}>ry-iSA7D4c13V0{$FT8AY2}U?*1G#6 zhUUPGCBtT{w0v6?iL@U?l9Q(sn^fc@VU@qnolW;yl?;b*Y6?CUmr7@RqO{Pd5;;G; zJp23IpQ`?JnyXYeWpqS!3ZXQ^Zue7sF1`q!3rZb2OAJxnhp-tj@2r3s!l9{bD$kT} z?AeWF4m>l%-up^BRmhPl6}8^i+PJz6;y;d!&3HNWbthI7^2*o?o*3h}sGLcSo~W#{ zk`L>U69WF7<8?ewHrIS?(yEYpM$XGCk!8}p;9^mbztLX3;T($ESjPs#!T-q@;87co z@q}S(q20UWT&9kpcjG{_5tiDgo!g3*kaU-JFvvw&Mk{3BUnvzS@TV&G@TVc=$vWe{YLV-RDIXOLk~U{GREWKd<0 XnLLL*mQ$5Mm_dy}l0kJc6Ne4}>!rHL=$AZ>(`)21D4(kh*8A{^@A;wXEPxI2ru zkhroab>e?7kf*hIm^x`~Y&>%L%Z3;(EIDY*@| zCVbJ54E)4B6x5`5PAySxO21wcjU92?6w-fqiZEUCD!~hDa^0)QAg|pf?O#=*i2AWx z-7RhfZ<-Ta>sNmr?gdfq1Rwm;;0In+JQj^J){1Zj9UK}AdS*;VA2pLILe)<-0)_!1 zQHeps)DkZvLANXnb#569!yRq4wWhSKv`sKc89(s^N4sH5$&`{Ql4BSTj;<$$3oECrdLc3UC)EmZdu9 z=N2U9RWdT?gtkgO^L6N4JiuS^W;V0n=5G=Mx{h-flsMKdrKGiU<< DxCL7! 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 index ce4e2fc4956316a9f0a884949bd7bb9e1085100e..89a9bd551a1b55278cda97a8c6acc7c53185526f 100644 GIT binary patch delta 343 zcmaFG`j|uD)W2Q(7#J8#806R)WY`&GCknJm2>7O!WaOs=Bo-y+rk11@6*DrhloqEJ zO`P1wRG=|2UTmVJ2uDzAacW6GdCKG%M*GPkjO|K1Ir-_Cc|oa#rK!awj0|kgXYPKw zcPb+TXK6u7Vo54c=|p*b4j3DxO-%I3{&ml$?0m7U_4&GmPbbcJy1woCg2u^<7_Zc` zurM+(Gq5l)F|Y!i#|ktLNU;O400Scf2T+)^n1PFd8%O{Z@-XmXD&z($1lnKBzz0;r z57Y@aOb}`qk{ThP8es+zs2VFI8<7-=0;R=(dYKr+!Hy9I+93ht0qu}vkcwttEM|}f E0QoONt^fc4 delta 160 zcmaFN@rqU8)W2Q(7#J7~8N}HcMA;d{CJMApTwgzVA!9o`+w+;bpYEMH`5M!e5@r@g z24)5p21W)}plSgi&BnmQz+TM2!N3V5fU;b0S#Gc_BS@ATD8a+P3)O}s!3WgM4>XAh XXcovsVW1L0h>1cB!qE(j#S9_<8{!r8 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 index 5ab9365058ea9c47311b0b21b44ccdaa385294e6..9119628c245038e659f6cb9313fad453feed63f9 100644 GIT binary patch delta 1110 zcmb7?TTc^F5XWbCTU$g+m5ZQwtBOUa1;rZ}WAPGAFrpY=d~wq~!kQLpyEPIYT7pIj z6ex=VBH>~PeNjwIpkkC~eeolh$nLiN62>_#q}Upx4`=u6ncw_p=6_bpA1O3{{ki-Z z0P3LL0H+ObCSrbUF<&E6TZhohdwDmJh}Xw}Ngy7{AqY3g13&RekAV)PwVjvzUc!L?cg!c9m4mE}JJ(Q&?-F@|dCjq+AUCrkdL2!d zf3PtfCkj4!jH@csOI|`y@yeQti*IkWw@6-5zRT4I47}6X;cu51aA{L>iG^7$6x3dY zlHJkdXjC2SO>dM~U;O10H8Q3y%_%E0TGxVA?VZ*pXOxeN$?+kzXR%rhzt{SnDl3yp zOh#}u*yU)vkeDA0lNqq9wP3Gx@t5iq$#pLCIUc(3Fp)QaX_>cnhv zY)X6H6CZen=A?~^znMq|LnvQFH7~h6u8vMZ8aq*4x+*ZRiQW(0RBO{8wD4P+r5lan z?S13Qj46K^sKslw6p%-feO=)8^#<9fTMgvv7~nt$Ea>r%)1w}~47kjI6X9{54>m(S zJ`mgjTk$k2YNAmSMhh^9TbJ2}65DaHP?()iL=%cIp%_X6nZi4A3zt%|6v;B!nE`jL zfyJo~Ioe@41Vfg4q9eeJ?H59C&6W3zBV+gQtJmqvD+ERyKXv+yWc?TFD GocaaWG)%n! delta 316 zcmbOt{ES=R)W2Q(7#J7~8C2OBl-U_nCJIzfTz{82MI(Chd`7X!y3Br)6PcPPzhs&; zxruq(WIGnk$(vZ+CtqNDSkKPF$iU3N!obMD3N%3gNV738F|Zdia4>KJ37{+&12?8D z4@i~=D9g*hhbhYslH~`=3NQ#_$_jyGg@Cfc3?em9X;C1}26PC}Vo{K^D1%rsgE&x) x1cM}|2~r>>Qb1X0Z05^=WMzQ9kOlgPi9rtRGhv`9@(`aXFepYdFcvc?0RX2k0~ro1LI0aJhP@3`HAf1>I0-tKZMFfd*HaC`giexB#~Jm2@Pzek@E(RTWv zgqlj|s6s(zNSeOj!JC9T@CjWLN1RG)~PQrZ+*RkXMq(Y1KZhDcOT$T8&% z$CFk=Nw9X^I4vji7*l0~nMqwUncVE%;6J5WH4-g6%&e1o?5H9nEM}Mz&EYXzmo}#~ ziznD|Zt@lt<~7|?EDkLat&4D7HrthWoEfr`erPuo|%9KSF${_T)^gfI*;7^?^b!S%kO z`hRl1h$EKErXy$HyK49LNEA}JX-U)Rz;X(UW!;!KK} zmh7js**zDUzEDz$Bfue(e~P~f<`s*lRif2)SLgWPL;Ldq=jLGM@gKni_<^45SBFG9 zrZ1wP1FR!YK7!yJZ$hHOC^A%!M1E>g7FT8Qx=_bTkMX#sSSbTaKlY+Op>%g3^ts~S zQ>dAVJ(riki0J#%7m>Voy_u`FWoms#QWxd)iCfMcvdN4#w2geyvXb&aT#mU9CR{6!SlCYgX@>aYPr;%0gF@pZJQ)AeZV;TM_FuFUYc%#eNA~5uiQaUhhV_@dhgvQ>rl*W3 z6Zyuj^s}^I*DN@uG6O4rv-lK|XvGX)1?bWx-rB!EnCpcSV|nU zHaVAjGf(@2Lm2IY$?RMkL0YrFbbDfbBhG_wB$9*MmTQU@<%;UA*=c#A(()foO)aNb z)Cx-^Q4zknh!%zL=|dr$ig7AN=I~d7-$Fp<;&G`-Wi$^L0Ly899=KpCutESU09;5f zc)S9=bA19P&gbtq|$)qFy009*OBJdNw=aFN zf8n#n^^?D|0FY*5U}9h|X5e7p1QI}5E(UH)Sssuq z4^Wnufe%xbA0*2Uloh~cvLHxS5GX6eAZ(4PSp+040(68Z&_PTLVqk{}1J#K`945ga L8O^|0%pe5-KPNXC 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 index feb1f657519a6595af9107cc0927578115725d93..9c20bb1d8561e8ba4de11fe9e3f3bef4ebf28381 100644 GIT binary patch delta 360 zcmcb^d4@~i)W2Q(7#J8#7*yFAl-U_nCJL0w3HYX#WaOs=Bo-y+rk11@6*Dq$6{HsB zW)>G`=I3o}_F?4VM(~R#pJi-iX39*N9KbY>g*h{&c=H=31;%F;VnCJR3@iwhSX?FnQYZmbD9Ip&P$-RQw+u+33{Z(IP>zW~4(thGpl9TP RJfIgj6&Mtw85oNhlmHjID|7$= delta 251 zcmX@Zb%#^n)W2Q(7#J7~85GzVE?iy1f=IDrHUBLf!$H&7H!mIoxu1C-@u;KP*V2g&jSWd#@nF=d57vO+*v zVFnhMY#@*UwO9lsEdrDlWe|f&BV@%vvf@A|N&ub9#2^WFm@rUY3gT>O2AOCE#$pCp E01_1!<^TWy 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 index 11730f478d66764b3b25a665ec5d263f2cb38a89..6db5f2a2628994e840cfe16c1468c83577530807 100644 GIT binary patch delta 798 zcmaKp%}*0S7{=e(7Plys7Ay!=1c6dNSEKPG5EBz)LQ<4eLrgqv+{rT7?k+o9qs9b@ znpi^7yosg0|)nx_u6Ie}Kou)PR-+8m;YWb7*=m~)l;W-%eY>e3eiaSA%$(W{DvVh9YSHcCO=f0 TwKZhhzT%Q=rRq delta 251 zcmey)JB>r&)W2Q(7#J7~8D!WQq}UmxCkoU|-1vO*Mn;v%B20Oc-!laZ3q9>v@N(vo z7mYnn_Vzy6zwlY(`pH{ZKGw6cFfuSRurM$(umVjG0Mcv>ObqPB3>*xcKmsVs#lVdz z%L9_-0m|}X)5`~v().FAIL("导入数据失败,员工" + manager.getManager() + "不存在"); } } - this.saveCustomerCompany(customerCompanyTOI); + this.insertCompany(companyCustomerRequest); + // this.saveCustomerCompany(customerCompanyTOI); } return ResponseResult.SUCCESS(); } catch (Exception e) { 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 deee2166..f481e16e 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml @@ -34,6 +34,8 @@ diff --git a/dq-financial-crms/target/classes/META-INF/dq-financial-crms.kotlin_module b/dq-financial-crms/target/classes/META-INF/dq-financial-crms.kotlin_module deleted file mode 100644 index 8fb60192d378759239a3ecbf60eac8c8de446e9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 RcmZQzU|?ooU|@t|UH|}6022TJ diff --git a/dq-financial-crms/target/classes/bootstrap.properties b/dq-financial-crms/target/classes/bootstrap.properties index 95bb071b..fe1ce1cd 100644 --- a/dq-financial-crms/target/classes/bootstrap.properties +++ b/dq-financial-crms/target/classes/bootstrap.properties @@ -1,7 +1,8 @@ +# 开发和测试环境（dev） #服务名称 spring.application.name=dq-financial-crms #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354 #spring.cloud.nacos.config.group=prod @@ -15,4 +16,80 @@ spring.cloud.nacos.config.ext-config[1].refresh=true spring.cloud.nacos.config.ext-config[2].data-id=other.yml spring.cloud.nacos.config.ext-config[2].group=dev -spring.cloud.nacos.config.ext-config[2].refresh=true \ No newline at end of file +spring.cloud.nacos.config.ext-config[2].refresh=true + +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password=123456 +spring.redis.database=0 +spring.redis.timeout=30000 +spring.redis.jedis.pool.max-active=8 +spring.redis.jedis.pool.max-wait=-1 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 + +#请求处理的超时时间 +ribbon.ReadTimeout: 120000 +#请求连接的超时时间 +ribbon.ConnectTimeout: 120000 + +# 正式环境（prod） +#服务名称 +#spring.application.name=dq-financial-crms +###配置中心地址 +#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 +#spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password=dq123456 +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 + + +# 测试环境（prod） +#服务名称 +#spring.application.name=dq-financial-crms +##配置中心地址 +#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +#spring.cloud.nacos.config.namespace=1912aa66-6e18-4680-8943-5b8fae71414c +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password= +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class index 518270b3722c5358bfd4761a6858da7dceed4ed1..a37e7e3b3924ad8bb6c8c8f5b46b20bdc8180b91 100644 GIT binary patch delta 66 zcmZ3?v6@5b)W2Q(7#J8#7*x0zSQup38DzN_&<&XY delta 59 zcmZ3@v6w^Z)W2Q(7#J8#7?imfSQw<)8DzK^WEtex8RR!gxiU>oXYyoI;9*c?P};nW PDUXp|G@602m_Z5vg-8o> diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/config/CorsConfig.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/config/CorsConfig.class deleted file mode 100644 index 6f15215679ed0e5c5751ab52320d29add4a3cbca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1478 zcmb7EZBG+H5Pr54uGUjZc~MjZ5w&k{fQUj7g+}9tB8eyoe%sz{%i{G;_paa%@rURa zFp~HK{87f)YeUf%B5g9WJAG#6nV0Ra-#>l=Sitin1~6sdUJ@~_?Y4F$UhCcY{*+=sIYc%iI|Z5c@F*_!A1VMH`)S+|<0 zS)uqGTKoiRtqbnymNko`F6imBv(4=Bea^7hm0g!`e^pg9k;WjyN;fXL|Nql3hM9BS z+gw|{G_YXe5f)86#uEmXGqHqa6GbgnuuQ9H<;eIHw3XSjVt1^DuH_j+{sODWkkak5 zTuyttS=keINW*WN)_vcl_A?m!+--=>D#J+TeYV_zpaBgAB3yG_|DdFVBWUj2r7@3W zx`6dNOL51E;KJEdvL-3X@M-K;s9!_zALuK=9sOobd2fht*LP^yl&HyoUQ0*68D4aW z+;w42X5JAbVzQLEpjUHg$rpE!qJJ#?iGlu1Fi3KUZWd`qx;J+O_AUB(m}FmMOksr1 zW)pyGxK1~!6gMb{cK(7M`U1E4Y({5$#%VHDDdLtKhvGLo0`X|r&M zE62FHlRrZLSMrWQXPiWWhUHdlGTsrFN+-Olw9v5DBi7{SjgVFVmmEBR0Ig!2kdN diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class index 8dfdaae24ee26391ad801cf1fa29d47f23edf022..b5038199c2ab59132c9cb76fb178803591f217e1 100644 GIT binary patch literal 6984 zcmcgw`*#%O8GdFruq3;=01_@D1=JcYG9VYxfVd<9w%tIQO=88iIN6Db~YDV zYiVmuZ4qoME!GxPEWIFtrG_AC?>(o#^q(M+{tup>KHtpj?CfS2w~MDIXJ_X7=KH?) zd7t+>`R9MGe+Xa;{@#Gk;rRf**8m@$ug40!5X1z&FNQCQryq#R59@IPFNwL6L7c+N z0sLqle%yec;1w}>dLDi%R{Ts1&WH`Kis8@2(`(}L3o-nqcseUC=fvf8ad|^r-V~Sf z0lXE!uL8Irp*fz*ntDn#VyZEs#Z?KLqj5bYCzNAadRQLP(n>n6DM>kQq_T3>ULL_Awx;2qq=ca9#oZdRvuE~ zrf!VOin~D$=S+Q6Gt>l+ox4LzYvyAT{B3InB-C~22|{d+YH4+UE;XnceF~*XSP<3Y zN^(FkG%&(L%#XoWzh2nbJH1uRrHC&xK+$qYhKbBLC@u-$HC7f=H9#KXVIjNAC zNZM3~RinM!l$SqO-GrV}w6sm5q4L5A;N$L(v1kh)t_R5~deYBobURk_!B;60Z# z39>Gu43mR}Ww7vNR(nQJmbbGbOTwe&g;j%7LQA)59@Y~*iU4V<25H_>*2<&mpggFh z6J7)FRn2ZClc6^d{G1UbnIpgk*+cc}VsCQA6uH&5ss%baTgOo3Ji)(kFhAoG5<-^b zPSsSjBo*1?wR2P_${OwB(-LILV-@Q#35~X@uD~Xmmn7zcO2Xc@r%HF#2*IxI3o>r0)GHsvk|LRyFM)N!S4n%78 zhlTkV^qf^y99F`?{K%}pBp^XL$igC_dUAU7tS1T^@p#N_H!=uz*l|O&P zx{}3~t7B6xLk>O@-|DYb-7>z_e+RzRPeV4#rFu2m69vVc74F1Bbu6wXyT&rQVdjaK zu+C1XV^;gXOeY^U&5XQ{7twTZB45$kMU7{6whNtvs`m+#ctkS?S))ERl}XYv5}NGS zg$WyJBvp)bxUFJxNioc{jAEE_cm8RQmQ-uCSKSadOW5>3%X3w=u}fHFRj)kTk@S$h zdpyFzGhQ5dZZ}b`z;_OZGnwRgIHj|T6Gz-(@HMl%dykXQQ51Exfst^3RMX|`s4~pf z%hOS0<#0wjkWmdQ6VY`y&77N>IdN(F(i<}qlONwWJ$-Ugwg=OvPJDdf@~xL9r%#@~ zdE@xaYp>q?==GW7@38FIRe3g%i*16Pbi!UNoKEa#+rzTf7OAl=*O|VRZn%31K~c8^Z5!F@(3VBZNzMCxFW#T*15I^xw0g3E?XKKrgFC zN{>O4n6X?uu4YL>& zBscIu2p@{!NBCn1f5M+b_=_0+RSXkQL(s(KD3T#$a4dvT{EZIkMOa+wZu{lKwzcr7 zb71g@8fS|kS3YdEQ!yZ!b&EZ_gt1~g6+SH`OnBSz|L13yh{&wm!*8p8@kB=s#QHlr zx?(X2`@EoRf@-Y<^NaGgox2w}h1T(Ed-C3LUj@Ys6XOQ2mE7!6;`$wWDy66GkLkw9 z{(*2b(s`&S+#Bweu(5omu6P1vZmv*jO7<{suyhKkR-yL~tMsZxB8Qeb8_%3y(9GtS z!84cNZHo9rd!P*cvkzHwP{Ovh8Z&gTvn$%w*L7%5I1**ebu53VGu#)JaF^BNI@ZZ| z^AdJe;K5sREA{dMY<(;|keAq~@mrr=l%3F7CW_B44xT*GR&JD?J^7$?YdIyf7CY8w z0i7)?4-WSCkeWRBmZC;+zdFkQPPle6jc?{n5pLb}2SAKG{oi-9%#148x!ti?KxB5 zV(nGbty}-#6z0_78s=W+JMVeBtn=2|dz|yQ8yhSb;%OtFeBwlG!b9+5GoKs%TmZfT zCt>N*L>OE6+xirwEVkicG4JQZcJAJq<@!es;?cr*qdgYr+p)tzzl&>yte}N@3IQKV z0q?T_x7y2Gz(MT9V?0WLn?nyR3u>1IDkRw5&L2VTZ1YsNy7m4;z>)xl{OSt!x(m>gK&e`hfZ`+|2;fMID$R1moxh~(*XY` zSQbEJ!O}b%yE!e~O_=Bl{Mjb@qQyo)uo2};3EkL_IhGR{4iPIIA{P3vbNLz6Q{4+_ zwCT7@XvlqjODpkjT40b^;vV!XUGyt)fI17Ti>P<6i`DlD7DraP&kWgmB|4J3`zlyI_ zfZtjM{^Bz1n}nCE0RIr4t_J?0vhbBE;15=0e@T__pC$ZnR)Bv;?8mEs&(@NjEV6G0 zoywbnmipKd=X0j*<}WbFCM=}0)6fuxNwnk4LmoN{x$!U;u#2rAZ`o{lrzr2`+T|Ug zJT}aZywVhV_v{pVrh=>#(god89^DFos&fJR@(SsE`D|HlR*+>NTaaZqvKG@aCa0OX zb4;1}Og2)Q$wo2eXq(^;KX_GPWT*IvK zU;n;z8Nh0M??)v@OpN+rV59^$;gE&Hcv{S7WcI9d&z0bLB*piFg)tm4any$w{dfs4 zi}RQdJHa_LV?r%k+R;w=+zPo0gq-4hCH^fpgT zs?O7_)Tr+8tk4tQJ|n(NS9$BqmU#bQ_rPKOo2MyIwr4mo6z`86%s6*!X;WyFZT_4m z^}A`QOmxm2)feUmPhS_FwI zw;%nYp)y1IoT^Ms&pYZ0mM6MLVlCIorO@nXnp34skC*KaRSXaIb`KTWoy?P^rV~}H zmr5wy%w~uP9IIGYUXF`7S{$hp`&($O5sG_OclayOq72-hgGOp{1zj za=4w~-5lM}C(FahTu`GERLcb*mgz-0`%Hsh=Gu#Ga2Nv) zg_UKr(1d0N3y(+9n2X~shr<@t8rYb&iNoDk=j8k8hF(XC#qcq@onk+L`PhUIHdDP0 zUVIBvY(*=!I|yN3ADpMPmDzgS!}Ba`#0Inw@LsOV7f5^Vqvw8l{BT`G$V6+|f*IWP zbc<|DMYoM?Y2Df!UQ>A6xvB`X2_8!GOGU&%mG=R7lnJ`>kiuD{Fwr|0XQ6`dTeASh zRaB@p6WeA0HfI1N|ATDl{M)gE{t~DFhbWtTMoUVwoys^Kg@^F4!!#bqXNocB-U3WJ z@klXDJDF^zmU2v;#W3xnCZbd8jrmLiWQrGH>cV5iFm=tz^ms8$yV311d4u^(qhvZ% zfT;(2iec)Rld1PVn36N!j?Wy6Sl$vTSE(hdb{g*GKVpG_+>4SfvoTig5eIel&)0`1 zh?@EN`tpEskHC}Mz!z2WG5@TDq1g$KGvSH0m%nJBqlnlL>HwN7v$#^r|LtsJC_!hY(Qyo1_l6)KuKo+ delta 70 zcmbQn@rG6S)W2Q(7#J8#7)03_gxDE`*%?GO3bQe8mSd`BWMrN^i`i0+fti5^sDz1u Umw^vV^D_tlX*LE%20;b}0P>3oga7~l diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class index 060ed43c61c3783c0b64013fbe56719cff13e085..a4266a6b862f7ac6ae3f601a79c5db8f53184956 100644 GIT binary patch delta 251 zcmeyv^Mp_M)W2Q(7#J8#81&c~wAmSS*co&;3QMtgi5Hfp7F9au=N2U90jZQ!$GjB3 z#N1Ry24M|PO`oj9vPAvTlFS@^pUmPCYeoi^lF9<0q#LH>KYIuauV~>^*!@SQqxn5tf9t&#ez$UGV{_mYq7*KGICDtV7=zU!pNY&pvb_)zy@?L rDF(rgTj3@Qu^088NuqyPW_ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class index 19fe26e927ed991c6f4018dc8da5ba1889d1725f..51fac9d91e19f4270aa87033c5ea92613e298ffd 100644 GIT binary patch delta 191 zcmZqWZRHm@^>5cc1_lNb1~qmD6?O*IjRLz_L5cc1_lNb24!{zMRo?IjRLz_CU>#!VPu)?&h|)}fr&vDD9ywm$G{1s PxfvK4r%3e<+C~Z zTSr*T270bfd2D(XYjCSgU520=&06b%UQ!YX+aWDG6mtfAGTwZY85cas3e{_;2=j7Ay5y+5 z^biV>Z&ATUu{OIx7(AV;24X(B&E1P4AWX}H<`9+uRD=?gC(=qPRiFyWm|B%^K|Tf6 XB)twB6WU1W+8;@h8NUfzX>R))Oyqb< delta 240 zcmaFP_nJre)W2Q(7#J8#7_`|LG}sw5*%`Dp3M(;*3l}Grr8<`um*nTB7CGnV79{3X zGBVgqe!!?N59NmVds=HoF)|1xqbi$hz*HhBT3V2jSVGW*Q0ykmXL_?)pH-8Qk!x}! x+blPE21W)ppetD!859^8SQr@;8I%x0%3vWC22@oHObh}*Eldom3~FFn9RR~8Illk^ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class index cb384b7c3f54509f40a5f4262bcec4b2648571f0..d6bb34fa6a2fd405e59aaebd201c5974848da66d 100644 GIT binary patch literal 24903 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 D>=KN0 diff --git a/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml b/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml index 7ca13ac9..deee2166 100644 --- a/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml +++ b/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml @@ -5,18 +5,31 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT cu.*,cc.* + FROM crms_company_customer cu + left join crms_customer cc on cu.customer_id = cc.id + + cc.del_or_not=0 and cc.status=0 + + AND cc.code LIKE CONCAT('%',#{applyAmountInfo.code},'%') + + + AND cc.name LIKE CONCAT('%',#{applyAmountInfo.name},'%') + + + AND cu.id = #{applyAmountInfo.companyId} + + + + + + \ No newline at end of file diff --git a/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml b/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml index 36ac5037..b871d350 100644 --- a/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml +++ b/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml @@ -90,4 +90,13 @@ WHERE del_or_not = 0; + + + + + \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java index 5c09e546..97a9e1d3 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java @@ -18,6 +18,7 @@ import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService; import com.daqing.financial.guarantee.service.IDgApplyAmountListService; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; +import com.daqing.framework.domain.guarantee.DgApplyField; import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse; import com.daqing.framework.domain.hrms.UserEntity; import com.daqing.framework.domain.hrms.ext.EmployeeTO; @@ -327,6 +328,25 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA } + /** + * 获取业务申请所有字段 + */ + @GetMapping("/queryFieldField") + @ApiOperation(value = "获取业务申请所有字段") + public ResponseResult queryApplyField(){ + return ResponseResult.SUCCESS(applyAmountInfoService.queryApplyField()); + } + /** + * 修改业务申请字段 + */ + @ApiOperation(value = "修改业务申请字段") + @PostMapping("/updateApplyField") + public ResponseResult updateApplyField(@RequestBody DgApplyField dgApplyField){ + + Boolean result = applyAmountInfoService.updateApplyField(dgApplyField); + + 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 index ebb70ad4..b26c3ef9 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java @@ -1,28 +1,23 @@ package com.daqing.financial.guarantee.controller; -import com.alibaba.fastjson.JSONObject; -import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest; -import com.daqing.financial.guarantee.model.request.PersonalEfficiencyListRequest; -import com.daqing.financial.guarantee.model.response.PersonalEfficiencyListResponse; import com.daqing.financial.guarantee.service.IDgEfficiencyService; -import com.daqing.financial.guarantee.util.DateUtils; -import com.daqing.financial.guarantee.util.TaskNodeUtil; -import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.ResponseResult; -import com.daqing.framework.utils.excel.EasyExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import com.daqing.financial.guarantee.service.IDgEfficiencyService; +import com.daqing.framework.model.response.ResponseResult; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.stream.Collectors; +import java.util.Map; /** * 流程效率 @@ -38,9 +33,6 @@ public class DgEfficiencyController { @Autowired private IDgEfficiencyService dgEfficiencyService; - @Autowired - private HrmsFeignService hrmsFeignService; - /** * 团队效率 */ @@ -50,6 +42,16 @@ public class DgEfficiencyController { return ResponseResult.SUCCESS(dgEfficiencyService.queryList(dgEfficiencyTeamRequest)); } + /** + * 统计不同业务状态下业务数量 + */ + @GetMapping("/businessCount") + @ApiOperation(value = "不同业务状态的业务数量", notes = "不同业务状态的业务数量") + public ResponseResult getBusinessCount(){ + + return ResponseResult.SUCCESS(dgEfficiencyService.getBusinessCount()); + } + /** * 首页-近十天的审批数目 */ @@ -59,154 +61,4 @@ public class DgEfficiencyController { Map result = dgEfficiencyService.approvalNum(); return ResponseResult.SUCCESS(result); } - - @ApiOperation(value = "个人效率记录列表") - @PostMapping("/personalEfficiencyList") - public ResponseResult personalEfficiencyList( - @ApiParam(name = "personalEfficiencyListRequest", value = "个人效率列表查询对象") - @RequestBody PersonalEfficiencyListRequest personalEfficiencyListRequest){ - List responseList = dgEfficiencyService.queryPersonalEfficiencyList(); - - if(responseList.size()>0){ - List arr = new ArrayList<>(); - for (PersonalEfficiencyListResponse res : responseList) { - arr.add(res.getApplicantId()); - } - //根据提单人id查询其部门名称 - ResponseResult responseResult = hrmsFeignService.getAccountAndDeptNameById(arr); - List employeeMessage = null; - if(responseResult.getData() != null){ - employeeMessage = (List) responseResult.getData(); - } - - for (PersonalEfficiencyListResponse response:responseList) { - for(LinkedHashMap res : employeeMessage){ - if(response.getApplicantId().equals(res.get("id"))){//如果提单人id相同情况下，就往对象里面赋值 - response.setApplicant(JSONObject.toJSONString(res.get("account")).replace("\"","")); - } - } - } - } - //根据条件筛选数据 - if (personalEfficiencyListRequest.getOperatingStatus()!=null){ - // 已发起 - if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_LAUNCH)){ - responseList = responseList.stream().filter(p -> p.getOperatingStatus().equals(StatusCode.CZ_LAUNCH)).collect(Collectors.toList()); - // 待处理 - }else if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){ - responseList = responseList.stream().filter(p -> p.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)).collect(Collectors.toList()); - // 已处理 - }else if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)){ - responseList = responseList.stream().filter(p -> p.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)).collect(Collectors.toList()); - } - } - - // 时间筛选(固定时间) - if (personalEfficiencyListRequest.getCreateFixedTime() != null && personalEfficiencyListRequest.getStartTime() == null && personalEfficiencyListRequest.getEndTime() == null) { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - switch (personalEfficiencyListRequest.getCreateFixedTime()) { - case 0: - personalEfficiencyListRequest.setStartTime(dateFormat.format(DateUtils.getDayBegin())); - personalEfficiencyListRequest.setEndTime(dateFormat.format(DateUtils.getDayEnd()));// 今天 - break; - case 1: - personalEfficiencyListRequest.setStartTime(dateFormat.format(DateUtils.getBeginDayOfYesterday())); - personalEfficiencyListRequest.setEndTime(dateFormat.format(DateUtils.getEndDayOfYesterDay()));// 昨天 - break; - case 2: - personalEfficiencyListRequest.setStartTime(dateFormat.format(DateUtils.getBeginDayOfWeek())); - personalEfficiencyListRequest.setEndTime(dateFormat.format(DateUtils.getEndDayOfWeek()));// 本周 - break; - case 3: - personalEfficiencyListRequest.setStartTime(dateFormat.format(DateUtils.getBeginDayOfMonth())); - personalEfficiencyListRequest.setEndTime(dateFormat.format(DateUtils.getEndDayOfMonth()));// 本月 - break; - case 4: - personalEfficiencyListRequest.setStartTime(dateFormat.format(DateUtils.getBeginDayOfYear())); - personalEfficiencyListRequest.setEndTime(dateFormat.format(DateUtils.getEndDayOfYear()));// 本年 - break; - default: - personalEfficiencyListRequest.setStartTime(null); - personalEfficiencyListRequest.setEndTime(null); - } - //获取毫秒数 - long longStart = getLongDate(personalEfficiencyListRequest.getStartTime()); - long longEnd = getLongDate(personalEfficiencyListRequest.getEndTime()); - //迭代器进行筛选 - Iterator iterator = responseList.iterator(); - while (iterator.hasNext()){ - PersonalEfficiencyListResponse next = iterator.next(); - String applicationDate = next.getApplicationDate(); - long longDate = getLongDate(applicationDate); - //当前日期小于开始日期或当前日期大于结束日期，删除该元素 - if (longDatelongEnd){ - iterator.remove(); - } - } - } - //转换任务节点，并统计操作状态个数 - responseList.forEach(personalEfficiencyListResponse -> { - String taskNode = personalEfficiencyListResponse.getTaskNode(); - if (taskNode!=null){ - String converter = TaskNodeUtil.converter(taskNode); - personalEfficiencyListResponse.setTaskNode(converter); - } - if (personalEfficiencyListResponse.getOperatingStatus()!=null){ - switch (personalEfficiencyListResponse.getOperatingStatus()){ - case 0: - personalEfficiencyListResponse.setInitiateNum(personalEfficiencyListResponse.getInitiateNum()+1); - case 1: - personalEfficiencyListResponse.setPendingNum(personalEfficiencyListResponse.getPendingNum()+1); - case 2: - personalEfficiencyListResponse.setProcessedNum(personalEfficiencyListResponse.getProcessedNum()+1); - } - } - }); - - return ResponseResult.SUCCESS(responseList); - } - - public static long getLongDate(String stringDate){ - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - try { - Date date = sdf.parse(stringDate); - return date.getTime(); - } catch (ParseException e) { - e.printStackTrace(); - } - return 0L; - } - - @ApiOperation(value = "个人效率记录列表导出") - @GetMapping("/personalEfficiencyListExport") - public void personalEfficiencyListExport(HttpServletResponse httpServletResponse){ - List responseList = dgEfficiencyService.queryPersonalEfficiencyList(); - if(responseList.size()>0){ - List arr = new ArrayList<>(); - for (PersonalEfficiencyListResponse res : responseList) { - arr.add(res.getApplicantId()); - } - //根据提单人id查询其部门名称 - ResponseResult responseResult = hrmsFeignService.getAccountAndDeptNameById(arr); - List employeeMessage = null; - if(responseResult.getData() != null){ - employeeMessage = (List) responseResult.getData(); - } - - for (PersonalEfficiencyListResponse response:responseList) { - for(LinkedHashMap res : employeeMessage){ - if(response.getApplicantId().equals(res.get("id"))){//如果提单人id相同情况下，就往对象里面赋值 - response.setApplicant(JSONObject.toJSONString(res.get("account")).replace("\"","")); - } - } - } - } - try { - EasyExcelUtil.download(httpServletResponse,PersonalEfficiencyListResponse.class,responseList,"个人效率记录列表","第一页"); - } catch (IOException e) { - e.printStackTrace(); - } - - } - } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java index 4eadf931..3980a1c3 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse; import com.daqing.financial.guarantee.model.response.DgApplyAmountInfoResponse; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; +import com.daqing.framework.domain.guarantee.DgApplyField; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -30,7 +31,7 @@ public interface DgApplyAmountInfoMapper extends BaseMapper { List selectListByIds(List ids); - int selectBusinessTaday(@Param("dateTime") String dateTime); + DgApplyField queryApplyField(); - String selectMaxBusinessTaday(String dateTime); + Boolean updateApplyField(@Param("af") DgApplyField dgApplyField); } 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 index 7c7cd8c3..4b57155b 100644 --- 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 @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @auther River @@ -19,4 +20,6 @@ public interface DgEfficiencyMapper extends BaseMapper { List queryList(@Param("et") DgEfficiencyTeamRequest dgEfficiencyTeamRequest); List queryBusinessId(@Param("et") DgEfficiencyTeamRequest dgEfficiencyTeamRequest); + + Map getBusinessCount(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgStatisticsRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgStatisticsRequest.java index 85e1c8d6..9c6ff595 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgStatisticsRequest.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgStatisticsRequest.java @@ -18,8 +18,8 @@ import java.util.Date; @ToString public class DgStatisticsRequest implements Serializable { - @ApiModelProperty("部门id") - private Integer deptId; + @ApiModelProperty("部门名称") + private String deptId; @ApiModelProperty("业务类型") private String type; @@ -30,17 +30,13 @@ public class DgStatisticsRequest implements Serializable { @ApiModelProperty("申请时间,固定类型,0:今天,1:昨天,2:本周,3:本月,4:本年") private Integer createFixedTime; - @ApiModelProperty("申请时间,自定义时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date createCustomTime; - @ApiModelProperty("客户名称或者编号") private String codeOrName; - @ApiModelProperty("辅助字段,不用管,起始时间") + @ApiModelProperty("起始时间") private String startTime; - @ApiModelProperty("辅助字段,不用管,结束时间") + @ApiModelProperty("结束时间") private String endTime; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java deleted file mode 100644 index 91571f33..00000000 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.daqing.financial.guarantee.model.request; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.ToString; - -/** - * @Author chen - * @DATE 2020/12/31 15:35 - * @Version 1.0 - */ -@Data -@ToString -public class PersonalEfficiencyListRequest { - - @ApiModelProperty("申请时间,固定类型,0:今天,1:昨天,2:本周,3:本月,4:本年") - private Integer createFixedTime; - - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @ApiModelProperty("起始时间") - private String startTime; - - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @ApiModelProperty("结束时间") - private String endTime; - - @ApiModelProperty("操作状态") - private Integer operatingStatus; -} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsListRefuseResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsListRefuseResponse.java index c265b9a9..8d9c5d3d 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsListRefuseResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsListRefuseResponse.java @@ -45,27 +45,27 @@ public class DgStatisticsListRefuseResponse extends BaseRowModel implements Seri @ExcelProperty(value = "期数",index = 5) private String applyTime; - @ApiModelProperty("创建时间") + @ApiModelProperty("申请日期") @ExcelProperty(value = "申请日期",index = 6) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; @ApiModelProperty("拒绝人") @ExcelProperty(value = "当前审批人",index = 7) - private String empName; + private String refuseName; - @ApiModelProperty("节点状态") + @ApiModelProperty("拒绝节点id") @ExcelProperty(value = "任务节点",index = 8) - private String status; + private Integer processId; @ApiModelProperty("拒绝时间") - @ExcelProperty(value = "任务分配时间",index = 9) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") - private Date dateTime; + @ExcelProperty(value = "拒绝时间",index = 9) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date refuseTime; @ApiModelProperty("拒绝原因") @ExcelProperty(value = "拒绝原因",index = 10) - private String remark; + private String refuseOpinion; @ApiModelProperty("提单人姓名") @ExcelProperty(value = "提单人",index = 11) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java index 50d80a57..3e75a3cd 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java @@ -47,7 +47,8 @@ public class PersonalEfficiencyListResponse { @ApiModelProperty("申请日期") @ExcelProperty(value = "申请日期",index = 3) - private String applicationDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date applicationDate; @ApiModelProperty("累计耗时") @ExcelProperty(value = "累计耗时",index = 4) @@ -58,8 +59,8 @@ public class PersonalEfficiencyListResponse { private String completeTime; @ApiModelProperty("任务节点") - @ExcelProperty(value = "任务节点",index = 6,converter = TaskNodeConverter.class) - private String taskNode; + @ExcelProperty(value = "任务节点",index = 6) + private Double taskNode; @ApiModelProperty("审批状态") @ExcelProperty(value = "审核状态",index = 7,converter = ApprovalStatusConverter.class) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java index c1b5b286..8f321a6e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.financial.guarantee.model.request.BusinessApplicationRequest; import com.daqing.financial.guarantee.model.response.BusinessApplicationDetailResponse; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; +import com.daqing.framework.domain.guarantee.DgApplyField; import com.daqing.framework.utils.PageUtils; import javax.servlet.http.HttpServletResponse; @@ -34,4 +35,8 @@ public interface IDgApplyAmountInfoService extends IService { int approvalBusinessApplication(Integer id, Integer status, String remark, Integer companyId); String getRoles(); + + DgApplyField queryApplyField(); + + Boolean updateApplyField(DgApplyField dgApplyField); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java index a7a4c729..55b398c2 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java @@ -2,12 +2,10 @@ package com.daqing.financial.guarantee.service; import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest; -import com.daqing.financial.guarantee.model.response.PersonalEfficiencyListResponse; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; import org.springframework.stereotype.Service; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -17,7 +15,8 @@ import java.util.Map; public interface IDgEfficiencyService extends IService { Map approvalNum(); + HashMap> queryList(DgEfficiencyTeamRequest dgEfficiencyTeamRequest); - List queryPersonalEfficiencyList(); + Map getBusinessCount(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java index 1a00b383..ca15ff73 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java @@ -10,7 +10,10 @@ import com.daqing.financial.guarantee.feign.CrmsFeignService; import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.mapper.*; import com.daqing.financial.guarantee.model.request.BusinessApplicationRequest; -import com.daqing.financial.guarantee.model.response.*; +import com.daqing.financial.guarantee.model.response.BusinessApplicationDetailResponse; +import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse; +import com.daqing.financial.guarantee.model.response.DgApplyAmountInfoResponse; +import com.daqing.financial.guarantee.model.response.DgEnclosureInfoResponse; import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService; import com.daqing.financial.guarantee.util.ArraysUtil; import com.daqing.financial.guarantee.util.AuditProcessUtil; @@ -37,7 +40,6 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.text.SimpleDateFormat; import java.util.*; /** @@ -50,7 +52,8 @@ import java.util.*; */ @Slf4j @Service -public class DgApplyAmountInfoServiceImpl extends ServiceImpl implements IDgApplyAmountInfoService { +public class DgApplyAmountInfoServiceImpl extends ServiceImpl + implements IDgApplyAmountInfoService { @Resource private DgApplyAmountInfoMapper dgApplyAmountInfoMapper; @@ -92,6 +95,27 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl> queryList(DgEfficiencyTeamRequest dgEfficiencyTeamRequest) { // 时间筛选(固定时间) - if (dgEfficiencyTeamRequest.getCreateFixedTime() != null && dgEfficiencyTeamRequest.getStartTime() == null && - dgEfficiencyTeamRequest.getEndTime() == null) { + if (dgEfficiencyTeamRequest.getCreateFixedTime() != null && (dgEfficiencyTeamRequest.getStartTime() == null || + dgEfficiencyTeamRequest.getStartTime().length() == 0) && (dgEfficiencyTeamRequest.getEndTime() == null || + dgEfficiencyTeamRequest.getEndTime().length() == 0)) { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); switch (dgEfficiencyTeamRequest.getCreateFixedTime()) { case 0: @@ -143,7 +102,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl existMap = hashMap.get(Integer.parseInt(departmentId)); if (existMap.get(processId) == null) { - existMap.put(processId, time + "(1)"); + existMap.put(processId, time + ",1"); } else { // 计算当前部门在当前节点的操作次数 - int count = Integer.parseInt(existMap.get(processId).substring(existMap.get(processId).indexOf("(") + 1, - existMap.get(processId).indexOf(")"))) + 1; + int count = Integer.parseInt(existMap.get(processId).substring(existMap.get(processId).indexOf(",") + 1)) + 1; // 计算当前部门在当前节点的累计时间 - String existTime = existMap.get(processId).substring(0, existMap.get(processId).indexOf("(")); + String existTime = existMap.get(processId).substring(0, existMap.get(processId).indexOf(",")); // 累计时间加上本次时间 - existMap.put(processId, (Integer.parseInt(existTime) + Integer.parseInt(time)) + "(" + count + ")"); + existMap.put(processId, (Integer.parseInt(existTime) + Integer.parseInt(time)) + "," + count); } hashMap.put(Integer.parseInt(departmentId), existMap); } @@ -178,9 +136,17 @@ public class DgEfficiencyServiceImpl extends ServiceImpl getBusinessCount() { + + return this.getBaseMapper().getBusinessCount(); + } + /** * 查询审批数目的值的数组 - * * @return */ @Override @@ -189,373 +155,12 @@ public class DgEfficiencyServiceImpl extends ServiceImpl timeList = dgAuditProcessMapper.selectTenDays(Integer.parseInt(userId)); + ListtimeList = dgAuditProcessMapper.selectTenDays(Integer.parseInt(userId)); //近十天审批数目的值的数组 - List approvalList = dgAuditProcessMapper.selectApprovalNum(Integer.parseInt(userId)); + ListapprovalList = dgAuditProcessMapper.selectApprovalNum(Integer.parseInt(userId)); Map map = new HashMap(); - map.put("timeArr", timeList); - map.put("approvalNumArr", approvalList); + map.put("timeArr",timeList); + map.put("approvalNumArr",approvalList); return map; } - - @Override - public List queryPersonalEfficiencyList() { - int size = 100; - List efficiencyList = new ArrayList<>(); - //获取当前登录用户id - int currentUser = Integer.parseInt(this.getUserId()); - //获取当前用户拥有的角色ids - String roleIds = RedisUtil.get("dq:userRole:" + currentUser); - //字符串格式 - List roleIdList = new ArrayList<>(); - if (roleIds != null) { - String[] ids = roleIds.split(","); - roleIdList = Arrays.asList(ids); - } - //数字格式 - List roleList = new ArrayList<>(); - if (roleIds != null) { - String[] roleId = roleIds.split(","); - for (String id : roleId) { - roleList.add(Integer.parseInt(id)); - } - } - //查询用户处理过的业务 - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("user_id", currentUser).groupBy("business_id").select("business_id"); - List auditProcessList = dgAuditProcessMapper.selectList(wrapper); - if (auditProcessList != null && auditProcessList.size() != 0) { - List businessIdList = new ArrayList<>(); - auditProcessList.forEach(dgAuditProcess -> { - businessIdList.add(dgAuditProcess.getBusinessId()); - }); - - //根据业务id查询业务流程，统计耗时，完成时间 - businessIdList.forEach(businessId -> { - //new返回对象 - PersonalEfficiencyListResponse efficiencyListResponse = new PersonalEfficiencyListResponse(); - efficiencyListResponse.setBusinessId(businessId); - //根据业务id查询业务 - DgApplyAmountInfo dgApplyAmountInfo = applyAmountInfoMapper.selectById(businessId); - //业务申请日期 - Date createTime = dgApplyAmountInfo.getCreateTime(); - //客户公司id - Integer companyId = dgApplyAmountInfo.getCompanyId(); - //提单人id - Integer presenterId = dgApplyAmountInfo.getPresenterId(); - efficiencyListResponse.setApplicantId(presenterId); - efficiencyListResponse.setApplicationDate(new SimpleDateFormat("yyyy-MM-dd").format(createTime)); - efficiencyListResponse.setClientName(String.valueOf(companyId)); - //获取累计耗时，完成时间，任务节点 - HashMap hashMap = getTime(businessId, currentUser); - Object countTime = hashMap.get("countTime"); - Object endTime = hashMap.get("endTime"); - efficiencyListResponse.setTimeConsuming(String.valueOf(countTime)); - efficiencyListResponse.setCompleteTime(String.valueOf(endTime)); - efficiencyList.add(efficiencyListResponse); - }); - //获取每个业务id的三种状态 - HashMap hashMap = Maps.newHashMap(); - //角色不为空 - //担保业务员角色、担保经理角色 - if (roleIdList.contains(String.valueOf(PromptSuccess.DB_YWY_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DB_JL_ID))) { - //业务申请列表查询 - IPage positionVO = applyAmountListMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId()); - List records = positionVO.getRecords(); - if (records!=null && records.size()!=0){ - records.forEach(businessApplicationListResponse -> { - StatusPO statusPO = new StatusPO(); - Integer businessId = businessApplicationListResponse.getBusinessId(); - String name = businessApplicationListResponse.getName(); - Integer status = businessApplicationListResponse.getStatus(); - Integer operatingStatus = businessApplicationListResponse.getOperatingStatus(); - Integer businessStatus = businessApplicationListResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setName(name); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(1); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //担保经理角色、担保A角角色、担保B角角色、担保领导角色 - if (roleIdList.contains(String.valueOf(PromptSuccess.DB_JL_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DB_LD_ID))) { - // 担保部调查列表 - IPage positionVO = guaranteeAssignUserMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); - List records = positionVO.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(guaranteeListResponse -> { - StatusPO statusPO = new StatusPO(); - Integer businessId = guaranteeListResponse.getBusinessId(); - Integer status = guaranteeListResponse.getStatus(); - String name = guaranteeListResponse.getName(); - Integer operatingStatus = guaranteeListResponse.getOperatingStatus(); - Integer businessStatus = guaranteeListResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(2); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //资产经理角色、资产专员角色、资产领导角色 - if (roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.ZC_ZY_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.ZC_LD_ID))) { - // 资产部调查列表 - IPage positionVO = assetsInvestigationMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); - List records = positionVO.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(assetsInvestigationListResponse -> { - StatusPO statusPO = new StatusPO(); - Integer businessId = assetsInvestigationListResponse.getBusinessId(); - Integer status = assetsInvestigationListResponse.getStatus(); - String name = assetsInvestigationListResponse.getName(); - Integer operatingStatus = assetsInvestigationListResponse.getOperatingStatus(); - Integer businessStatus = assetsInvestigationListResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(3); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //信息经理角色、信息专员角色、信息领导角色 - if (roleIdList.contains(String.valueOf(PromptSuccess.XX_JL_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.XX_ZY_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.XX_LD_ID))) { - // 信息部调查列表 - IPage positionVO = messageInvestigationMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); - List records = positionVO.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(messageInvestigationListResponse -> { - StatusPO statusPO = new StatusPO(); - Integer businessId = messageInvestigationListResponse.getBusinessId(); - Integer status = messageInvestigationListResponse.getStatus(); - String name = messageInvestigationListResponse.getName(); - Integer operatingStatus = messageInvestigationListResponse.getOperatingStatus(); - Integer businessStatus = messageInvestigationListResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(4); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //担保部A/B角、法规经理角色、法规部C角、法规部分管领导 - if (roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))|roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))|roleIdList.contains(String.valueOf(PromptSuccess.FG_C_ID))|roleIdList.contains(String.valueOf(PromptSuccess.FG_LD_ID))) { - // 合规调查列表 - DgComplianceInvestigationRequest dgComplianceInvestigationRequest = new DgComplianceInvestigationRequest(); - IPage list = complianceInvestigationMapper.list(new Page(1, size), dgComplianceInvestigationRequest, roleList, currentUser); - List records = list.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(dgComplianceInvestigationResponse -> { - StatusPO statusPO = new StatusPO(); - Integer businessId = dgComplianceInvestigationResponse.getBusinessId(); - String name = dgComplianceInvestigationResponse.getName(); - Integer status = dgComplianceInvestigationResponse.getAuditStatus(); - Integer operatingStatus = dgComplianceInvestigationResponse.getOperationStatus(); - Integer businessStatus = dgComplianceInvestigationResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(5); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //工作会 - if (roleIdList.contains(String.valueOf(PromptSuccess.GZU_ID))) { - IPage list = workConferenceConsiderMapper.list(new Page(1, size), "", roleList, currentUser); - List records = list.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(dgWorkConferencePO -> { - StatusPO statusPO = new StatusPO(); - Integer businessId = dgWorkConferencePO.getBusinessId(); - String name = dgWorkConferencePO.getName(); - Integer status = dgWorkConferencePO.getAuditStatus(); - Integer operatingStatus = dgWorkConferencePO.getOperationStatus(); - Integer businessStatus = dgWorkConferencePO.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(6); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //担保部A/B角、贷审会 - if (roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DSH_ID))) { - IPage list = loanCommitteeConsiderMapper.list(new Page(1, size), "", roleList, currentUser); - List records = list.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(dgLoanCommitteeConsiderResponse -> { - StatusPO statusPO = new StatusPO(); - Integer businessId = dgLoanCommitteeConsiderResponse.getBusinessId(); - Integer status = dgLoanCommitteeConsiderResponse.getStatus(); - String name = dgLoanCommitteeConsiderResponse.getName(); - Integer operatingStatus = dgLoanCommitteeConsiderResponse.getOperatingStatus(); - Integer businessStatus = dgLoanCommitteeConsiderResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(7); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //法规经理、担保部A/B角、资产部经理 - if (roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))|roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID)) ) { - //担保函 - IPage iPage = guaranteeLetterAssignUserMapper.pageByCondition(new Page(1, size), currentUser, roleIdList, null, null); - List records = iPage.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(guaranteeLetterListResponse -> { - StatusPO statusPO = new StatusPO(); - String name = guaranteeLetterListResponse.getName(); - Integer businessId = guaranteeLetterListResponse.getBusinessId(); - Integer status = guaranteeLetterListResponse.getStatus(); - Integer operatingStatus = guaranteeLetterListResponse.getOperatingStatus(); - Integer businessStatus = guaranteeLetterListResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(8); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //财务部、法规经理 - if (roleIdList.contains(String.valueOf(PromptSuccess.CWB_ID))|roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))) { - //回款确认 - IPage iPage = paymentConfirmationConsiderMapper.pageByCondition(new Page(1, size), roleIdList, currentUser, null, null); - List records = iPage.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(paymentConfirmationListResponse -> { - StatusPO statusPO = new StatusPO(); - String name = paymentConfirmationListResponse.getName(); - Integer businessId = paymentConfirmationListResponse.getBusinessId(); - Integer status = paymentConfirmationListResponse.getStatus(); - Integer operatingStatus = paymentConfirmationListResponse.getOperatingStatus(); - Integer businessStatus = paymentConfirmationListResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(9); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //法规经理 - if (roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))) { - //放款通知 - IPage iPage = loanNoticeMapper.pageByCondition(new Page(1, size), roleIdList, currentUser, null, null); - List records = iPage.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(loanNoticeListResponse -> { - StatusPO statusPO = new StatusPO(); - String name = loanNoticeListResponse.getName(); - Integer businessId = loanNoticeListResponse.getBusinessId(); - Integer status = loanNoticeListResponse.getStatus(); - Integer operatingStatus = loanNoticeListResponse.getOperatingStatus(); - Integer businessStatus = loanNoticeListResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(10); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //再次循环，拼接数据 - efficiencyList.forEach(personalEfficiencyListResponse -> { - Integer businessId = personalEfficiencyListResponse.getBusinessId(); - Object o = hashMap.get(businessId); - //有数据 - if (ObjectUtil.isNotNull(o)){ - //强制转换 - if (o instanceof StatusPO){ - StatusPO statusPO = (StatusPO)o; - String name = statusPO.getName(); - Integer operatingStatus = statusPO.getOperatingStatus(); - Integer processId = statusPO.getProcessId(); - Integer status = statusPO.getStatus(); - Integer businessStatus = statusPO.getBusinessStatus(); - personalEfficiencyListResponse.setTaskNode(String.valueOf(processId)); - personalEfficiencyListResponse.setBusinessStatus(businessStatus); - personalEfficiencyListResponse.setOperatingStatus(operatingStatus); - personalEfficiencyListResponse.setApproveStatus(status); - personalEfficiencyListResponse.setClientName(name); - } - } - String timeConsuming = personalEfficiencyListResponse.getTimeConsuming(); - String totalTimeConsuming = countTime(timeConsuming); - personalEfficiencyListResponse.setTimeConsuming(totalTimeConsuming); - }); - } - return efficiencyList; - } - - //根据业务id和用户id统计耗时 - private HashMap getTime(Integer businessId, Integer userId) { - HashMap hashMap = Maps.newHashMap(); - //根据业务id查询业务流程表 - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("business_id", businessId).orderByAsc("create_time"); - List auditProcessList = dgAuditProcessMapper.selectList(wrapper); - long countTime = 0L; - if (auditProcessList.size()>1){ - //遍历业务流程数据，统计该用户的耗时 - for (int i = 1; i <= auditProcessList.size() - 1; i++) { - //从第二条数据开始，获取该数据 - DgAuditProcess auditProcess = auditProcessList.get(i); - //该数据是当前用户处理的 - if (auditProcess.getUserId().equals(userId)) { - //获取上一流程的时间节点 - DgAuditProcess previousProcess = auditProcessList.get(i - 1); - Date previousTime = previousProcess.getCreateTime(); - Date currentTime = auditProcess.getCreateTime(); - long currentTimeTime = currentTime.getTime(); - long previousTimeTime = previousTime.getTime(); - //累计耗时,毫秒 - countTime = currentTimeTime - previousTimeTime; - } - } - } - //查询结束时间 - QueryWrapper wrapperTime = new QueryWrapper<>(); - wrapperTime.eq("business_id", businessId).eq("user_id", userId).orderByDesc("create_time").last("limit 1"); - DgAuditProcess auditProcess = dgAuditProcessMapper.selectOne(wrapperTime); - Date endTime = auditProcess.getCreateTime(); - hashMap.put("countTime", countTime); - hashMap.put("endTime", new SimpleDateFormat("yyyy-MM-dd").format(endTime)); - return hashMap; - } - - public static String countTime(String totalTime) { - long time = Long.parseLong(totalTime); - long days = time/ (1000 * 60 * 60 * 24); - long hours = (time% (1000 * 60 * 60 * 24)) / (1000 * 60 * 60); - long minutes = (time% (1000 * 60 * 60)) / (1000 * 60); - long seconds = (time% (1000 * 60)) / 1000; - return days + "天" + hours + "小时"+ minutes +"分钟"; - } - - /** - * 获取当前登录用户信息 - */ - private String getUserId() { - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String token = request.getHeader("token"); - return RedisUtil.get("dq:token:" + token); - } } \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java index a9e52f76..36549508 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java @@ -51,7 +51,8 @@ public class DgStatisticsServiceImpl extends ServiceImpl iPage = this.getBaseMapper().list(new Page(page, size), dgStatisticsRequest); List dgStatisticsPOList = iPage.getRecords(); if (dgStatisticsPOList == null) { return null; } - // 部门筛选 - if (dgStatisticsRequest.getDeptId() != null && dgStatisticsRequest.getEmpId() == null) { - ResponseResult> result = hrmsFeignService.listEmployeeByDeptId(dgStatisticsRequest.getDeptId().longValue()); - if (result.getData() == null || result.getData().size() == 0) { - return null; - } - for (int i = 0; i < dgStatisticsPOList.size(); i++) { - boolean flag = false; - for (EmployeeVO employeeVO : result.getData()) { - if (Objects.equals(dgStatisticsPOList.get(i).getPresenterId().longValue(), employeeVO.getId())) { - flag = true; - } - } - if (!flag) { - dgStatisticsPOList.remove(i); - i--; // 索引要减一,不然会触发"快速失败"异常 - } - } - iPage.setTotal(dgStatisticsPOList.size()); - iPage.setSize(iPage.getTotal() % size == 0 ? iPage.getTotal() / size : iPage.getTotal() / size + 1); - } - // 提单人筛选 - if (dgStatisticsRequest.getEmpId() != null) { - for (int i = 0; i < dgStatisticsPOList.size(); i++) { - if (!Objects.equals(dgStatisticsPOList.get(i).getPresenterId(), dgStatisticsRequest.getEmpId())) { - dgStatisticsPOList.remove(i); - i--;// 索引要减一,不然会触发"快速失败"异常 - } - } - iPage.setTotal(dgStatisticsPOList.size()); - iPage.setSize(iPage.getTotal() % size == 0 ? iPage.getTotal() / size : iPage.getTotal() / size + 1); - } // 获取所有的提单人id Integer[] presenterIds = dgStatisticsPOList.stream().map(DgStatisticsPO::getPresenterId).toArray(Integer[]::new); if (presenterIds.length != 0) { @@ -191,7 +154,8 @@ public class DgStatisticsServiceImpl extends ServiceImpl iPage = this.getBaseMapper().listRefuse(new Page(page, size), dgStatisticsRequest); List dgStatisticsRefusePOList = iPage.getRecords(); @@ -232,7 +190,7 @@ public class DgStatisticsServiceImpl extends ServiceImpl> result = hrmsFeignService.listEmployeeByDeptId(dgStatisticsRequest.getDeptId().longValue()); if (result.getData() == null || result.getData().size() == 0) { return null; @@ -251,18 +209,7 @@ public class DgStatisticsServiceImpl extends ServiceImpl - + SELECT * FROM dg_apply_field - + + UPDATE dg_apply_field SET + customer_type = #{af.customerType},customer_code = #{af.customerCode},customer_name = #{af.customerName},customer_unicode = #{af.customerUnicode},customer_phone = #{af.customerPhone},register_time = #{af.registerTime}, + register_fund =#{af.registerFund},register_addr = #{af.registerAddr},employee_number = #{af.employeeNumber},business_addr = #{af.businessAddr},business_type = #{af.businessType},business_scope = #{af.businessScope}, + legal_person_name = #{af.legalPersonName},legal_person_sex = #{af.legalPersonSex},legal_person_card = #{af.legalPersonCard},legal_person_phone = #{af.legalPersonPhone},legal_person_account = #{af.legalPersonAccount}, + legal_person_addr = #{af.legalPersonAddr},legal_person_affiliated_person = #{af.legalPersonAffiliatedPerson},loans_amount = #{af.loansAmount},loans_time_limit = #{af.loansTimeLimit},loans_bank = #{af.loansBank} , + loans_use = #{af.loansUse},loans_else_use = #{af.loansElseUse},loans_measure = #{af.loansMeasure},accessory_business_license = #{af.accessoryBusinessLicense}, + accessory_id_card = #{af.accessoryIdCard},accessory_marriage_certificate = #{af.accessoryMarriageCertificate},accessory_person_card = #{af.accessoryPersonCard},accessory_constitution = #{af.accessoryConstitution}, + accessory_audit = #{af.accessoryAudit},accessory_credit = #{af.accessoryCredit},accessory_couple_credit = #{af.accessoryCoupleCredit},accessory_commitment = #{af.accessoryCommitment},accessory_prove = #{af.accessoryProve}, + accessory_conference = #{af.accessoryConference},accessory_assess = #{af.accessoryAssess},update_time = #{af.updateTime} + WHERE id = #{af.id} + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEfficiencyMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEfficiencyMapper.xml index 1f26c8ed..27fab062 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEfficiencyMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEfficiencyMapper.xml @@ -43,4 +43,14 @@ ORDER BY p.create_time ASC + + + \ No newline at end of file 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 7830e8f1..8de2fb6d 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml @@ -36,6 +36,9 @@ AND a.business_type = #{sr.type} + + AND a.presenter_id = #{sr.empId} + AND a.create_time >= #{sr.startTime} @@ -68,6 +71,9 @@ AND a.business_type = #{sr.type} + + AND a.presenter_id = #{sr.empId} + AND a.create_time >= #{sr.startTime} diff --git a/dq-financial-hrms-auth/target/classes/bootstrap.properties b/dq-financial-hrms-auth/target/classes/bootstrap.properties index 3187c1a2..89e224ba 100644 --- a/dq-financial-hrms-auth/target/classes/bootstrap.properties +++ b/dq-financial-hrms-auth/target/classes/bootstrap.properties @@ -1,8 +1,7 @@ - -#�������� +# 开发和测试环境（dev） spring.application.name=dq-financial-hrms-auth -#�������ĵ�ַ -spring.cloud.nacos.config.server-addr=192.168.31.142:8848 + +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.namespace=7632bdaa-3381-4669-b3f9-2fc73be451e8 #spring.cloud.nacos.config.group=prod @@ -18,12 +17,71 @@ spring.cloud.nacos.config.ext-config[2].data-id=other.yml spring.cloud.nacos.config.ext-config[2].group=dev spring.cloud.nacos.config.ext-config[2].refresh=true -spring.redis.host=192.168.232.128 +spring.redis.host=127.0.0.1 spring.redis.port=6379 -spring.redis.password= +spring.redis.password=123456 spring.redis.database=0 spring.redis.timeout=30000 spring.redis.jedis.pool.max-active=8 spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 + + +#正式环境（prod） +#spring.application.name=dq-financial-hrms-auth +# +#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 +#spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4 +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password=dq123456 +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 + +#测试环境（prod） +#spring.application.name=dq-financial-hrms-auth +# +#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +#spring.cloud.nacos.config.namespace=d4e087eb-2a9b-4ef1-9f22-76269a30d081 +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password= +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/Operation.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/Operation.class index 3ebaf4a1dc5bab0356c58611910454c6785489fb..ea04fc2a3b20293db001fa9d6889b75b70d34af0 100644 GIT binary patch delta 2328 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 delta 3450 zcma)93!GGC75|@keRuA?`(Tz`8057)_sQ^BUb7%zif%5fq=uLz%kH=?3p2|;1Ogf) z%#t+mR<8R+dO)nO0Ux$ol{8&hj$U{r&ED&pF?DedqkY zGj|V9J~B1=^r=1j0hGyf6SJ_@#N+t3h3{aSiS5{-&}qVtod#~O@Li;Wn1NjiyG@u{ z*F=}X9t(T%gu*_(x!=G66InQD;Ylt0o)&)J#8dcz!XeH4P~k@=!q{ry$0m|tJZ+*M z4r|d*Ec_JDX!d71+OrDJnHYwjTX-J7u<%R#%D}Hp^u-YaztO_qT6h63TKFA)ua`e4 zykwyif7HvL47{wJ9yRcaiDUS)iR1W-fmikWuLk~R;58HZ$MJUquN!znNBoC@f9maj zDZFXo-}sNhe|N~Mo{V5?bFAr_L_;htC~*4th6P-v+!5cQL2oL&MMa)Z;cbC=*~*$& zV@rJ^-b}vpsBeNNZ=J$=g%b+@V@VWFD!ij`smnzTHdK;fOQvKAMmdWzbDfB34{(cN z<4RNtJoUAjkb)C zkxE8|Y#A*D?2#>nQe;c9c%74G|Eo&GYfGtkdCt|Vbsl3#tzD}mV#`<=$G+M!UM2{# zR+iqBXj)O-R2!?+lr3dC3IwV(-Vjf$h}$wzCONfMVb)|fkrG>`$W%eZc_VYUbHK_B zL~SXTX`Rno<2+tZY`HTud%BF}?m*{B>B|ZQ>S8Tb@t9zCLFI?-V{aSF3oFmGplb0F zmbqLIq{nLs^@>_SsNigs%0#@53S~M@ZT0f{xbt>qj&rG}zw=sVyW`88nq|^eN=vt z%BMIpO;j;lrDSm$jKN%)z;GHEcOjFGufz5D1Ot}P)eTq(#UNwwN!$p7p=>NdHG&K@ z0*g^Yy&Y)_i!pjEY)0y_$Y4BLBx%BFnKrRBEYcX#R4rnJjz`LH6Y6-{fQ-e>sE3yo z0E7Fxc{IO5gThjUWj;ROuS9%gHGAM3s()~0o1pt^nwOb4~~3cUl;PlMW%l*hAmLLFx=Uc*FQPJi}@Rr zbaWpp?ZQYwRP};%lm@9kh0%P63b^zr^guSM!htRn3c654BO`2dp;*v{3Qd*hNTtzW zIM@YF+Ni0C2nj2E+WlDV-b|)2E;PQ!XV}_}2`Q9CRY!Mc2Tbi%15j<_DJ$>{o+IFV zF3@J94-a@FFY_YG783(CC}w5K`JTmkRy(IVz(ugB0 z=)5G|Y#>fYU=UVdC84v0Kv<<)LZgxR6e){tCSx@L6r`cw1(Bia+lvTNNvva%T6Qbe zvk#j33_W{k{j3X59}|7bg`%J7?!j&NETNdJz&*I##q8&3ltuL;6uqrw*y?o_x-;fo4)GxiA#dGUBk6y%NzoZN}egEz9 z_t`d!x-d;pSsa?4!o_n+=9ccCdlVb-7zgxLY$AUz z|2NSCyNDO~R`yeC2goPe+{*zvyqo3=S)c}9z=wIAJTB@-A$Sr)h-xF($mIpdLcj$* zQO-NCQ3(8jZ}C#55qUj*8vG6E{kX`dL;V*F&Df2Zo#?MW6U3b%?gvH*PvK?G`W8Im YV$CG=DEY_utmUIWR!VvA*93y^0wGD14FCWD diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/controller/UserLoginController.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/controller/UserLoginController.class index 801167bd4ae7d31d46a37ee2edd6f00581b9b149..4b0088102a86af825e26e1b1bfd57485c632a963 100644 GIT binary patch literal 8543 zcmbtZ349dQ8UJ3c+3XGwmNNnh2pCAhh(^Fbz$65T28cPJh!!WilVo7C6Lx2l&{iv+ zconrCpeRzMS}TVNAwUs(*;acWwzYRlIC|fgNBjR~_L$wQOCrfHGjHC!_r34@zyF)O z{@#&Sh^S1Ixyeg=T(s9k`|_!R_Iv0>ddW>M(*bTBbW<-K;>SL|9Ok|wd^yU4Kj)@n z^oom)yXjT>JU@IvqA&9OOK$oyy~bm{;-as5=xg-4i{9YQuXE=&JoHWamYcp!-{H%5 z`SLv%ecw$#pf@G@p_`_#Qa|GRk6rW@-+$twpStL0F8aBLenG!v3BO`Zel5{&+*C?? z+;oEaxpk5+r}%Q3`_6Fdw{H3!{oX}?$R>IdBLB$d{E6rPnS0)H(O)F`tDF8tf0yVV zg0cffn;>tU5o%Myf!4D1N}bWxriB&=Du{%&5T5j4qZaDYeVU-Tbv~m*@v9s4V4Kpa z2i2fYR|86WNR6273WoDAr8#9DWED0!8lRw4Mogny4{3ggmAkd-cGavlf~`8tn3GXGpEXKZ z?U(`)9=0-WU}gzU1EW*ePwkOtLHgs2qFTqP){ z+VI2aBkJ^^wj$EeqJ^4NIL``~PYtY6Lpnc4J9Er-9o}4+acTI#3>krd7D_}3-i!9J zN0AQ*c*N(^!jLw)XlC7dwM$h3Dk9!!a*QzQva})V)>@PnJ?M8vtKJBk%hk?KdtPpr z8i>GvVM_8cIi?mi1(gk2?3J2Rs$x%_jQL)C*w+K#Xi z(l$o0bix@8cE^I5>F0JJA_2?_cOrE)r6JnDJrXeCm>kX~K?~B)9@NT61IULsWY%)c zY&ZP%D(h})Ap~TYl5FJkI^9sh-743t!|!3GvQuB#sfDZ}gJKiTJb&-$eVb3-bfd^|-E-=x&4MN+muJ(a&g2puZzVyGg7E2nOQf=jn-DxTd1_qOq!J%|zC`_B zW%xHixVud=t5n~H`fk6V&LPAT0ntp%I>&I94?d2mD+&_VB3z9o)JFkWMJmxh0XT}& zDEZ8t_nkVnw}0OqRv>b%x)9Vc1Y0eLK1W0CvX2T8G;i>BC#{a$wJRGya_XVyPHs7L zYWvatV-E|;k8~n&G%JupD$Lllb2M-$6`8su@=$T8KjFmjy(b?!+<*Ax{;m5@_uhVL z@2>s_w#6dovLe_V3J6+OG!Q#KAg;Jo3y|y8HVgjKK(YrrB6dZeX)W!+{t#$E>RC_u z8$&(-m(_OH^!T(+YwMNhUofq^#|okKa_*o380l_7V6;$&GSNa@3nx(Ft`Gp1cXO~4 z64=_hH6M0#rV!Op69lbH+D)@lS%wSm)aZz5ynwgXT+`T~1+hHi zbr9%^%+)*EEGI}>ki7*Mm*8~+#0BZwuBqs%?EuRtJ$rGm`ZXXtCWBZGOT&_3Fdp1t zvF$oRwpl$EamuK&ME@2vTw!IESY+WV-fZjJjUd3<53mo`0wqI3K#nTRx96Q>b&X_A zk|d=Pk&L_VKs~^91&y-UM5=+Vuom>&%qXuTy4B~yg|SXq4_i}edUWO#qLw$!J&g@MbN|yn?5I;skVVCk!dac7aNmIZ__(6 zwbQ#2y(iQEfZ+7D5VFX^g*s`YOkE;drloYHBywbtOHJUZS5{pui9A_I!X=A*?kY%N z)5@0hz$00>sYwzZ8M21SbOluky5!^&yH6asqyLq?CywvxfBebQ`)`ee0u`BlBr#kT zBSZlTsj;cDsYVtfg;%C!R4a*5vKTGKNMfuk#!-_j#`C3+waIO6T3R|^66eWcf^Z2M zm(b28vsDp2VAZ-eTI&uSWHC`p5;Qhm`;K=N6|y*=SD4Q@Q?4l8-QBa>BSuIKnn1AG zzM$gYsGusep4shYN8mzbi5hNiG1QQMv4uSq0F@cBHNgsIBvz5c1+thd3S==wOqFSy zxDbrndGN|uOjiCz>sb=hWHFt+F@wcjB#LA)lP|NluUHgFqC^&@Vm83!)XqH|jI9rx zxq0)+E%*1|y)&h=|Ctw0AK1+ap~$pLTr6nJ>3zH7jPgX^ef@j3_3wC2P`Ojt)Kg;S zBZwsC$l?-lDRLx}kTit~!kaQF?xu{aUC=ZuDZrzfgW*VLrx7wWe+};eIJCrfOTbZV zSnWzjZ&@ZaQL<@I#DaQ;0Ml_}&w|o}JYGnR&DGU4jg2V;#je&5dho#(?Q}%k_33m1 zLZ*=OL{(N9MgS*&pxDR(oq(hk`!x<9e2l~~860~q&ZueE&KP#a$)%OGb%N@Lpn7vE zH*_A46S^x-ebN*FzE&iChd`y_P{12#gOkPC85abZX>O>qGLl(Ip3P4HJ%ge}P7UJ+ zcx$=(nicD=X{cVgq-GuD!@E%(Dsfx~lW-upJr7H_8leu=6m)r-rPn$rSv;8%L5#0m zkov6&kS)2uyc zMwveUoVm}7#2I0+GdT(^WnXSH?Ig$8Z^FX*~c7pMq@SpOi97v?!6y z^II)=5}#tglt5zBm^(02qPrt%#bp|?B$&Z5Jv(VdJ~1haB{W!={jrY89)MMlnns1e zdfbs}(Y$ghpD4t|L#XY6ER@kDX)j9~D?Y*SH>3gcv8y9QtE~eKQ*#esFY)BXQzmO)$TIE%=$sjTKpe1O!Q|Ib{8V+NF zN}aiYrr=w`4T*uVx z=v1~~I3_gXZ`E27VOovWhti14P8GK>gSa(uao3`?mac>ISi1%&#HaCsSqCVm_%P*W z(ejc$%1g+0V+6sy9ypjSootVfs*9O)J$)E5J&?E#tt`3$qjCkh$%@A~bS11&sfASu zlaKrukWXSPZW{ht@#hg3+!pN+IH2fJJ%i|HJts!>l(O(Y99PA}?Udg~`Oi{bAGulQ zY|Fj2&b4slRSume#&w)u;rLxg8z4J?xtR41jTcoCb!4_77_-3`gbg@NQI6&7 z#aM@Z>51Cl$)bdt?PR*nQg^I9EUvDHLKKF&H()Xx8^Vp#B-ycMOsR4uH3V&n}Ui>J1ENa8UxaY#IdGO+}UK+l<#5CY@++oa%0Wg(EETD?t}5L9;65HmXY}& zeG)CM%!Bk0Jq*nm4J68bo1V#%%w7Rpn^aodOG+$FJ(9J`aMd5H1 zwk^gS+ZDqp`(2tNB--J2g5zTl#TlNwT|F^~YJL*cY-3^^*Ngk;vM8c^ymKw%+}?TK z`F(VGDy|=gnXg)g*n5!^*LPYmb$?+evY^Pa<1e4=`dKeG0_HX!~>; zZCxmy7;BjV-T5cqThT|0UZyczmH57ntG(Gw!-~7{ltrJm;&?ucdlt{nVU$fhK10u= K{aK5KyzqapJ85eG delta 954 zcmaJ@#p&w0H$y+j0nyJ zaXyII5G>4@xPbXE7I0B{m%_M=k_xY=ZBgZx3@jVCYGB1J$jhzQT3V0Enjo^W=~Nz+ zoX4w9xmGo>>OSxM?q;lS3w_unFzQb#m1?~%2+UV&wMQ1Z5jAkl!d_fwwS^nFX(5MO z2G%UB1YKO3noZk74LWIieM_Q@VvKUMLK_%;2YE|JL)o@DY+8c(dwXr=27-;L&{a!^w(XzSrtV8NZ(;N5?p5DZ3!VT>J zH`s#9AS9G|9|DNE6RAu?-6c$7z!*%7dmw|*8Ap9i%G-}2LYV9trl;Wm&jZ3VJmnHh z{iZyEgKAzKqr?P45H)0+E6Zgn(GU3v2~yu}GG9{JHZpn2Fxf`NZjrHlGF_|~#$kd@ z5R6y&fus}-z$!b zk0zO~cq+cKxo^0dPbJw{mrZ2-nAAmtF}8(uk#XHRoWpg9OylluE~nNN{4PkPAAESv zxv#`Jo`ouM(9=d^;x|#l#N#%mquw`ud~xZ_2jxnW1BStMIMld=J6YvoVL4AqkpITJ1gQoo*_XqI~Q&+VLE zKB;RByf0A?y5&Cr>mY3$`zB=i(w42l3(S44-S#zx?k%HU0{ie1uzez+-EDusqKnbr zF0)dieWgh=_&qO|Mj!r3g(1H17oE?=(2$`4#ua>0vw}vZRjh~Dtq*7fv(_##2DCv} fVK)bu3|+&x9%&Q7{pl8McTqR!ChQQ$J48PK3>Z-J delta 73 zcmeyzK8IQU)W2Q(7#J8#7JWwbAXp*%i zPR$d2+3QnF5>paO67@a7Y8e>>d{av@@>2p5ixP8FOHzx985vkW4q{~B49-jknp;`~ zWY40OizeEM@uE0kVv6BL#dt<5Mi!vO46F=H3~ayr%L Qco=wrG#djW10Mqe0HTFuT>t<8 delta 73 zcmeywI-gno)W2Q(7#J8#7z@n)_f&v1HAR_p$i^hRTG%+MZP1G322Ck)ww*-oY315NuB*x9b z2XJw9^A+6OjHd-HQHGPAeD{36^PPUmZ%XLp>**Q5CR7<~GS+2mJcQnvrd$}JTI?J) zxG<^=VKdKqTm1LdUu?_&r9Bt@V=a-?wy6Z8_LnxcwGG#a1^ zwn+bNqvV-I%=N@+HZj5zcRdO6%yltO%3ycW*}Z_2%OMHr5uBvUNfT!g85cu)Nm}|t Wh6h;!NmxeC`R1_#_-Qx8D)0@#356H{ delta 70 zcmcb?^POGz)W2Q(7#J8#806R)q}dr{*coIu3g2hkoXwoZ$jCbR5=(;|12cmtPze)* U7=t*NmSB(s(rgTj3{ngX08R diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/LoginLogService.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/LoginLogService.class index 1cc34945794dc93dcd27facaa0203e2a167c34a0..64604e5502ccda58649694340865968c3bcab3b1 100644 GIT binary patch delta 260 zcmcb~bd1IG)W2Q(7#J8#7zEiF_}Cfv*%<^F88{0|Q;RAC64O%|8G1B)vJ%S@^>Y&Q z()B&_N>bBPi>$E-P0UoPFG>Y!EH2RxElw@+$xqMB0}??HF>6hqE#nv&F_Vnzm*0Y;LME@dW?FEEI{=PtPG3{Y(RhUGBdCPDGng!1Y#xzE-=Z>zyqdv0e7}XkN^Mx delta 48 zcmX@ca+68;)W2Q(7#J8#7`WLPIM^9D*%`PtJ~d_(W?*1qU;#=nF|abQfoXOC5$gwG diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/UserLoginService.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/UserLoginService.class index 47578bf1a6cecd0227b11de79995e59314bc8903..69c7d87253ec3b60ef5a73e2e996e0045708cf53 100644 GIT binary patch delta 280 zcmZ3;c9}!@)W2Q(7#J8#7-ZNPB-t6H*cqf58Mx9@OPmsuvjfUg7#aL0&e!G$N-a(; z0dhBndoi+=7NjJWq)wDI;s7&%!V|;g#DtPE^HKsb^7B$1^HTf^Qu924n(cv_BbH5JXMVWc& z)|#G-3~agiNtrpRo98i_GcvMGzQ$zf&BDmQ%fQC~lmq&Pm63s+fdMGQ&me#h5(Eng WF$g1sM1YE!7(~IO7=t*NmH+_7#X7Ski#W8eqV0syN!5?TNN diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.class index d71db32d5406587940c800263d0e7bb3fdf6c85c..ea0e13d6166795b28cb67f61e6d349a5933c88b6 100644 GIT binary patch literal 2123 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 V^b_^@Qx)a;nDjIJ{aciN{!f2v%u)aV delta 3002 zcmaJ@dq9)d75|-(i$XvGqFq}WFKYZb30A(~!MLTw>cmzVlqj=1U&ttcWFJOOL10;Uq}Gs>+wsey`kV&Dm={+ z+l*gJaYoj3PQh;!{8qv5j#V4HbSz*DkZN8Z?CV~&k>C(^XKG5KKN9F#(-c_S7Ff{} zRPcN8zG*VGh>5lWal0u+oKVxnA#=Tnx)r=7RArNRLg^5BmitAWb&;8?Q^3Qf`|hbC+I1a2i%b%jI4D+1wA_sZ}r{=V(R9KzvBi=j&Lt}~Gi2;M%GaoX@(D?I1=a_O2O`})#dU#5P@|bt zs8JDJqf?n99h!W>wV^d4pauIc&$Z;<9wl>r+@2qXE^L92gHhLFUHxg|9!Jc4Oq&7Uz zD_*gAGF&Y;`C15fT|x8}41z-51hJ1`i9n~&X$hraK~!W6oVt>TJAOBa8EGMD;B!8 z(;U6v1&Ss%Wjd%xTyjpysSSrh;ojQt${-=7-S2JfZ17)8PoCRF=hUogC}z^wrK6Ql zu)jaBI>>Zni2aUYXWmb+cJ&4M;1_kY5$1|XuBpQ2NjDpU>j)KMi`ywSXG|A4o(Cpy z=(g~hU@u?fzF;W4KB!wY8}&hq+FZ0$9P~5_Uq-sP=&7Mn?txM-px#Q@WBaCx>p_#c3C@=Nj~I%2oUy6GAU<66WwpFxr#H z;G!`&6|BWNo-+|U$y)o+uh$v{6);}@#RyI~alE*sc(KXjw*87NG2=z0@EjB17=<&= zL8<{w5->A{GzRIcr88&*uH`3@5%+cTYGw?c7_x>iA?h2auy7dJ2`D$F8TUak9)dAp z2otYSHk;22eCR44vYihplZl+fTom!)l`#)quH4VHFXuW3xVWu|=&Y5+YrD#txWby3 z`HNs6$}9{Z8|!u2wlZlOm`bBgU@FY^Wak*BD7gDF%9ul1KsVC35u2DjZW+US>||wT zPmMD&j7f1ia*X@on|T_}qnI2+t}dqxVd|iyB^u{tS`0Vx;wxmDrt3_z-wfT4rS6xC zyc*`Rfa5Bum|1g$-YdL1iZ~XN>nP3{LP@1Op;;rC%?D8GD2rp}jG}xPHyJRBXho&j zZGH`fZtm5&L#T9{-KH3-+~yI?W1smkd`w1gn}_jnzMh9rHi8OXSRno4;i~_SPYwG> zl-tDF)N-V{8*_;wo{U!}Q(vjLmDAvY>UoES(u(hJvs*F7(BM|CCbj4~eX$JdR)*22 zCpg{Belau|@3_(BD$K{Q5j67_EtOG=+roQryDo8CWaX`H%Mkq6`fe|#ao=s?#`q-C zv6=hsQ^?1?d^5N39lehqoQJr#KFi&=ja%bk?7(&mvOIxZcnN~PsvgA|Jce`Fjr05! zdI@{@%VIAX@i^JBFG`tslB)0&Ex-Y4z(H!o)3glF&`KPlwRo1Ic#gK=dD@M`bO3{N z7)R&?j?#-bt~dCt+;;WwaC-9Ma|4dII&1fE!u+>R$7QQ?rw8daPCv@H9aPFi^kTD# zLpr#Y`(WlY9>k|{KYwBz=32Mn0a)~lkPT%F`Fsn?$B=Bij1XT11rL^tp;y6Ya>uX4 iJxtX2%l#1R2~3N8zqjFY`uMQEYU7Ny^KVB#cK#Qzg{SZU diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/util/IpUtils.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/util/IpUtils.class index 07f13442471bcdd384e407d76389c77faf59166b..bbdd262fb07bf37ecc21bbf5c06bd6d2a10b0102 100644 GIT binary patch delta 95 zcmcb@dxdwySr$gV$>&(sTZ%ETFo-j-F-S0QFi0{8GDtDVF-SA0GsrL)GRQL6GRQNy xFeos1Gbl2IGbk~{0A=DBG#TO&(sTZ%KVFi0@4F-S6SFi0^7GDtJXF~~5eGsrR+0$H{U3Jfj` xiVWTiN(|u)$_z0K8Vqp^S`6_FI+M4tuHrOjU}vxZ>a?7k$rjA$G - - - - - - - - - - - - - - - update hrms_user set password = #{password} where phone_account = #{phoneAccount} - - - - - - - - - \ No newline at end of file diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java index c80c4399..e2e96909 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java @@ -134,6 +134,14 @@ public class DeptController implements DeptControllerApi { return ResponseResult.SUCCESS(deptService.listEmployeeByDeptId(deptId)); } + /** + * 获取所有的部门id和名称(用户团队效率的部门筛选) + */ + @GetMapping("/listDepartment") + public ResponseResult listDepartment(){ + return ResponseResult.SUCCESS(deptService.listDepartment()); + } + /** * 根据员工id获取对应部门下所有的客户经理 */ diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java index 54473c64..8d9205ce 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 记录部门信息 @@ -34,4 +35,6 @@ public interface DeptDao extends BaseMapper { List listEmployeeById(Long id); List listEmployeeByDeptId(Long deptId); + + List> listDepartments(); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java index 3ccf9063..695c4ed3 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java @@ -8,6 +8,7 @@ import com.daqing.framework.domain.hrms.ext.EmployeeVO; import com.daqing.framework.domain.hrms.request.DeptAddRequest; import java.util.List; +import java.util.Map; /** * 记录部门信息 @@ -37,5 +38,7 @@ public interface DeptService extends IService { List listEmployeeByDeptId(Long deptId); List listEmployeeTrees(String account); + + List> listDepartment(); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java index b838eb55..09121a7d 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java @@ -20,10 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; @@ -255,6 +252,14 @@ public class DeptServiceImpl extends ServiceImpl implements return this.getListEmployeeTrees(deptDao.listDepartment(), 0L, account); } + /** + * 获取所有的部门id和名称(用于团队效率部门筛选) + */ + @Override + public List> listDepartment() { + return this.getBaseMapper().listDepartments(); + } + private List getListEmployeeTrees(List list, Long parentId, String account) { return list.stream() diff --git a/dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml b/dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml index effabbb7..83814fa8 100644 --- a/dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml +++ b/dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml @@ -85,4 +85,8 @@ AND d.id = #{deptId} + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/bootstrap.properties b/dq-financial-hrms/target/classes/bootstrap.properties index b5a7eb56..69b5c7fa 100644 --- a/dq-financial-hrms/target/classes/bootstrap.properties +++ b/dq-financial-hrms/target/classes/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-financial-hrms #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.namespace=4c56c2f9-b6a3-4e7b-88b8-b1001e86dfd6 #spring.cloud.nacos.config.group=prod @@ -17,9 +17,81 @@ spring.cloud.nacos.config.ext-config[2].data-id=other.yml spring.cloud.nacos.config.ext-config[2].group=dev spring.cloud.nacos.config.ext-config[2].refresh=true +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password=123456 +spring.redis.database=0 +spring.redis.timeout=30000 +spring.redis.jedis.pool.max-active=8 +spring.redis.jedis.pool.max-wait=-1 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 + +#请求处理的超时时间 +ribbon.ReadTimeout: 120000 +#请求连接的超时时间 +ribbon.ConnectTimeout: 30000 + + +spring.servlet.multipart.max-file-size=10MB +spring.servlet.multipart.max-request-size=10MB + +# 正式环境（prod） +#服务名称 +#spring.application.name=dq-financial-hrms +##配置中心地址 +#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 +#spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43 +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password=dq123456 +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 +# +#spring.servlet.multipart.max-file-size=10MB +#spring.servlet.multipart.max-request-size=10MB + +# 测试环境（prod） +#服务名称 +#spring.application.name=dq-financial-hrms +##配置中心地址 +#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +#spring.cloud.nacos.config.namespace=ed20f51f-6038-44e6-8e28-7ac72625e7b0 +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# #spring.redis.host=127.0.0.1 #spring.redis.port=6379 -#spring.redis.password=123456 +#spring.redis.password= #spring.redis.database=0 #spring.redis.timeout=30000 #spring.redis.jedis.pool.max-active=8 diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/DqFinancialHrmsApplication.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/DqFinancialHrmsApplication.class index 0bbc7ab2654a145f2234f7b31be8cc35d2374d6a..4b97bd4028c092d4f5749f4f7f7c05b9ff868771 100644 GIT binary patch delta 154 zcmZ3?@r*<2)W2Q(7#J8#7*x0zSQup38DzN_oW*3vrpUvf#GpKR9n(Wb!O0Vt?O8<_ q*cn78Ut!i!S7Tsh5Mf|s5RGPFEM^d65C>W<0mPDUF)0RV1_l83f+70= delta 102 zcmaFHv6w^Z)W2Q(7#J8#7?imfSQw<)8DzK^WEtex8RR!g1u#us$z;c-z{8-(pfvd{ w(?dqy$>*8vSp^u_83ZQ_v*;)*0riM5FfxcnGcXo2h%tx*jgkOjNw}C4050ng#{d8T diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/CorsConfig.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/CorsConfig.class deleted file mode 100644 index 5999cda2358cf4952773e315ff0b766bf606ace3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1478 zcmb7EZBG+H5Pr54TF+BTc~MjZ5w&k{fQUj7g+}9tB8eyoe%to8W$}8adspy>_(Svy z7)ksA{wU+@T|?0pB5g9WJAG#6nV0Ra-#>l=Sio}w1DHzSo`IOw_YK4`W#9oa`jkx~ zr*&S7f)>+B%xJ8Yz^s9*m`h+jfrkuzE7Fz0Dnm~uyUh?UdA4BaFH2XvZZ;}Hz2y~$ zEa|dW<<2%&Qr}y~c(5ydhUs$EYgjh_B;C4IlP-6wk~`L}YWP;wb8E70l|1E_!ef!a zsM77FbONEsIg>4Ws&4ro6}i_GZ-@g=eXtHhg<@$;=p4bxdAzBdb?yth9kQu-AU$`> zYpNU#=i8KZoR=RP~{r{hSG0dFn z-salsWdaK(9%0eMV?1GCITK4*Hc`}K1wNcZNBz`lh)50mT*jVX-K z*^B_VhU;{rN^ygNXy-5Jp)as}jM&Z*ddkO$lkVLp#J{8O5Q#!Md5BA)G(vefpEe7J zxN?lEJNYB@e}Ne+=5CaOBuC~o5>rZ9#ao#rqevYCi7w%8;wPncW8Dn+O< V!o>&|@t+_aqr$bEJh9#d{s3gkoa+Dp diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/IPageConfig.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/IPageConfig.class deleted file mode 100644 index 536b9a739f7ab2b51f730c9c1676c8c16aa96df4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 715 zcmbtS-A)rh7(LULZY@Phv7(pU0Z}F)gqs>8U`(1cVw5!Ta&|l2PTid;v$LpgrB@`7 z@BluP@tbMYCf-2Yi|=pGIeWg@`SJ7m7Qi8%G_it55xPxOe105Zi=qBPY2{urRCjiV z47F1;k__turRCc)kEJ~qaYmEQz$79Y3afm-7}nfG6%6}>#N>P=E|gCBSZSdXB{Dv- zdBGE-$13IhcOsRiq3$tsXCft-Q%3i-lQxkvXDq|(o!uZ63zMsnDS7@iCR8!Y%7V); zPU?avoLZt6oHYMcA^E58OYKxHhpJFy_E>AM8q-)L6BU;gS6zp>!26UM8z19l_C4t`HJfnP>?zRLgr diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class index 0567b3c4237bf516da4409266e8bbbbdda5587d9..ed083208bbe77f1594a888072044a1656475566d 100644 GIT binary patch literal 5222 zcmbVP`*Raj6h1di8k%m?mPer$6cM!#V39Yrf_);GLT#WG5M-0xHrpnFp@J z6Qy?rwW?a)PHNVYp4J4(iL{xMRpq8`%*%7Sp%`gh$;ufkSC9+tB6+O5VNg)_bkVT& zoHnBu^i) zo6EYTsW96-q#L?@N>Ed8-;AK}sHp;8dqOv~^Tk|Bvo0#|CTMfQOe@(L#nO51eGJ8<`ms_UGRd5=WTZH9?w6`Snc|);_ z7HBP28-Ltb8_Y`m1Wgrv1WB^Xj9hT23G2q3S!O7!po=9;XtY68AzdvgrECluWab3z ze=Hpciph*mzOAcoL%?-QVoI?ys~rwnYIZ{wl&+&e`E=MI2T_k=I7atErx0|e_o^$w zGA9ihZ_-r=uyc($LC5Q+XUsuW?nY606=#I22lij_MD4&$+I$=}s)(qPPMbLK_~daK zh~FkCatanM>(8#&-JB+g>~7*Cg%80dTm=YoEtkLOhS4II-#4W*dRDbG1LZ51-?wse z8_(sl=8C3`tZ??vLc++L`?5_AUJ&QcSglxgPUGm>orV4{9hE!TY-g1<{uWD`MJugM z=zKbFVF2Z`^#C(g>sk=p`3t`7U?=!S5xmtonai?haV{}TghV@Omqa_LJ4)|K^gewc z(T8+MqK|m^nC=QXkU zMBmW25`D+R_w<8A*XX`PH|VZJDY`G{u-|Is1+C_t20g5-)eETwEsYFUz^gP=nYH1( zj#gLOZNR+{vgMlq+YvNWN1I~N2i>D^b%`b~jgF2dljyn=!)FtMBo^YVZfCeGP=~k( ztU1anD&CE_(TZ<(+wF*Ar!ylfEb(st89Bh zr_jJ7Y6{UyJAbB@hZO#Wnjcc+SNyTbF&M*AqF!pHe#hu;ccW*NT|G3OUR zQ6JW0*T1w)j6|_(0P~2zGIGL+WAQ%x_FpAYpaTemD9W)M#EYO8=n!mhgbJSQdpm=C zM9qQ{e^T`F1KKn@@Q_-nAs&O%;||0wcbf+>2I3Cme^UHA1!K&K`{fwkm|n(n96uM& z3A~-87b)UESnxvtPq7eHvlRBxJ{I5}_-U}hz59jTGgDCtZSm7Ih;KvqAtNPtr%Lcn zSJU+}4SPAghAo`a9xtb@A^Mx7$yLhsd6c;_akDy!;LrQA+EdDE4~@_$yv9M^7>&cU zm&FlySj*ak154s8o?)y7Y{#vI&eqUd+eUhug`QsbA?q$7>vr(ep|>#~(lUYPstJ6R z5;Z`^Hv*{uWU21y@I3&y1XHpjzBb4<7lqbMspPv(BxEW zEp9pk(cGzl#ufg$a(@FPTq_mch?kPMmx|4S?(X{B#Y?G(({-oLJa^XvQ}Lz~yi;8> z@QhSk$Kyt+QF77*cDA{Va*GI(!ac{odnB}Z{?`_=0z;{qk!=l(?57%$)j?!>O=L`_ WidaIVIelg`-sUi$2QardGXDd51rKEa delta 1537 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 K6YaX`BhLfThv~xr literal 4530 zcmcgvOLG)e6#jZ9$&h4{z-R(UPz1pw1X>_G!^03l2uvR4#Y@G`%uUkJ(>-+eBn+td zTDWoHO1Cboa;a5TLA1(p?f;<4Ut#&(?w+2Wq!VHmF6Q3b_ug~PciwmY`scSl0QBLj zCS-805j*fvGc?SlkZVF6?#Ur9cSH*F@?$}MEXqM|!hJlDD?<(iIhb;=QYfbIFa=vd znb!1hW=_`(bJ)8qoVT@tShnm3>YUI_N1fMlu4R{1EhJC}O0Ko6 z+agc44d-=JcP}bPc6HAxs2jBMgxHqVO)*v~%n5s1qcjDXtd-M@SA`MM&F6g}Z3wCp4*qD{LCRFV^qNVosgY&3x45!@?ca zibci;In^&|Mu`g4tG@AjYam1dQY*QOQ7&0ak~idqtLcV<^owu5fAQ?c7hiw(_YXgj zogtQlkz_U{6|`7IVSDj8!}wZlq17^kSz_>yM@gg;CdacwQC8FCB4O7W`z5R-iNriI zHZ?Rktzd6$8p-3DRNCcv{E2whDOP!TV^4MQX8akqe{?w*jGASOGgyVW_q_Vm> zZz;GMO@ypPe{C^>6MCL86Nz7snSv%&3R0iw`A-yV9_@tYE>^N%qII+-x?-WLCUnB| z+92?^sLshv+jYWnqOq>}NHI|ZjVZLTXGs%mjasTG_Z3&O2b(*ZMoMHJo3E}tkB1>9 z>y?^iEvL;oYI_A!Ea(@5zTV;8^DmDc@yHDu$MksrMY7+it_Q3wa^OSV9=#iE$)Z=$ zYmBv&Y0$Mr2kh`FXf3m*DXV1X#8q9k&7GCAYSTL^8{K+6JFa%KDY;d08X&&i$CG+B zrs~}m@0C&UUmClxJB?S-o`RExi;{xlu^o29ewoG+meY8IvH~@heEoVLX>X-5fX8V( z!Q&J@PU91Nn#NOnmc}?fPh$pOq;V5pGODA@BZZ&6W5ag_qqO?E7@xZ@a_mSoNNbs` zb=p8tXX9C4{5tP81&wroU6y@Z!P97M{~sPXYu^y5shPpSp{Xea*P>W_lWeuqq?mPn zYV`z6bxY-ImycTgv3xC(@oMukireE5++lU`3uch49-&t-25eg^v)nakj;u2Z4%XDs zP=_i-P>z~yQLvVTWJvPefmn~{pnRF;WS8&nrs)0AGmknz9#$;k9*pANs6($G^yHFZ z$ytRIZ}QJa27Gn$mylV>xr5KC2F^P^dO0OW5z@OMQ`W%g`RXst_eV(fOe2P%j3@+dzxwew0R50PGRj+W{ zSErSSRdp_T7}L^I@A5~C7dQ>zasX+V45YQ%0!U2>+>F6<0nNDN;pyvP=H760A!L(W>U$tJ`$DU{{`w)0RaBoI5Kv5gZ4Hi_{%HjoC8cdun*joYVp+KtEHC38g6U2 zlSK~eJ-F73*YH&hU&~@YWDj0f`x|O`GmEd|tsZVNW=vpA)O_c*<;oJ-cAv3q z%Rej7F+8#$&^hIl2(mwK+46F&vLxMklhOood8cTW7fjbu@6lnWziLtZ_@}5;bZp;s z%4O-Mw3>#Vm3>8Dwme_pzWfby%`|Gh zRW|ZG;g|i5nAfXy+|x~W&$O0Yaw?`}hptInGEF!5>*HsYXvns@A# z@g1s?u}ZNb2{VCg5=R1$?*J^hUXuQ*Q<^oEU47}&ZBMj}n%i>8ShDO=I$$nH|B_j) zGPFm{MChruWzET3HR<^Q8)ah8T%#~+cn4bV&H=I#tcqswLBx1;=GL-x$93|I@fPi7yowJCV#v62iZixSFk{%%>T3 z2Hi|}#;Cvr8X?H)BpG(-(+;ad&Gu|zC-7w3-hL)Pl_Y{@)N$@*$hzxEiBR=Npf9m% zcreydl<%@kvq-a)r*m#TIX26Tj(tW;Ap^nboKu#~;`b%u!;%$(xOnfiuaSGI{tbqh z8o!5PcCSc3K_sBLVO|S78UVNxG&{Q4SoQs?F~dc*NFGE5<+?2NJJxLH0eAVRm zvAf1@d6D%}V|$Som3#Y)CZXAaQ*(>*yrnwWPy#3EKPMFD?HXvSQpmRBC*;J@y7#sw z4Jum_K>b0}Pu!&A2p-Y#1sv4yu8#NczQC8#(?WYaQOCFO9Ub4r_XHkmN&ab#O~+Y$ zU$Ho@;RiZ?h!1pph#%?ru{!>VdYZ-iI_B|H4L{TIbNoW!T&wv**+8{_dBIRE8vTGG!6IF{XdwU23 ztLDPgaHLEWOp1D$Wn|IvSLcHPDaQdRfRi3^w8GV?sp&#NU?x3;gkX0%hGWRtR3I8!tTY-@%8rrF&N0fq}d6BtA0W;DJ^6ZhcouZ zIT%Wtv2wgEiYSq(PLJ<|OxWA%p&j)3nDwD_+QhXlaQK`oS>9F7`uyWU)B=aMmmUzP za2sc7eTaV$1s>)vqY5qeL;UC1&HXUfS& zJ-mQX9Oaw9F&yWrh)v$ka32``2Qr)J5XgUw&KEyI*W%F)bpMT?Is$gt;MyU|J{+*z zACg5Zv)GLj0g^A0LWv7c9^(_c10Lu9SS9W{sXDkHP~whmLd)P2^jxZoJQj%zH3&tX zKpz<^EglX@BavjnztShkzK_CB;YqT7inqEr+Hq6%>f^`L{Ec0M@Gy=uJku4Rr`4gy zdxCA`%MrEaVr_qbClnMG{JpBO*_F7U9#VKxe6z5_T69EcM zp_t?afhjyg{>nJdMgVdFfDQC+LT`=X995f0VaUZ8a+t<>a*Z%d2O=(PtK;t0{GX$a z`4s=QbexHGyx6Scvv@8tatj^%T4PwCj*BS_X&v*pl<1gG+4*ve;Yu@xS;l;5=cbtN z|BRTw&RBjW1!N!<^UrUI`RAcxUim#oadX_02rTf+e4Gnqepk6L7{%Lt8Ei>}bnZzy zWhKB7Cc6}0rpF7h)&4^!-GqC61A9I}?k@J` zkLLDm;{E{kewK`Z+~8dd9pmpV9@xNv%O4{={v3~v$H!xxO5vf-O+1*vSXVvwhq@Y) z|A9c*>$LqF*o!x*>sw5iw{ZpU1U5Juf{A@mz>9c^_T9@gx`wY1>?kdLolhO4JAjw@ g)Jf{TpiXsdYuW6g_VcM~7DisHNC1sjWh>inLm#wbrkKUsX_B)cQrGRT86#bz>T%{)9S- zD}R8A8%a$xE?l~B>B^n|#CYz2!|2Mz-23i%_nmX@g|DeMJ@emwef|RA0Pb0cps*D- ziXoiF853tMY(hc8IYG{wn3H@#kc$>dC`)-s!et3pOw5~DFi~l|{%M4)Z2jTNqwHF} z_RLuely#~4UrjU1Ds{BU9`mX92s zZf5RcHkoOFF~KU!teAtDk5COB3~XnVX0WM;Q8ydVi#}Eg{TN_OIP2kbQF<-D0a1&% z^vB)0yVY-@13Qr9i$UHAR}&x!A-jd-QpmDvdBkT&g4jeAL^blG85i=Cd$K zQ%F;2g!e&3819f^US|01S%g}}DE5k`2<;Pam3@jM?-xzp6iFc7?aT)_@9b!`?O_}t z{y*B|*q#U5RaSqLQ$FRKr#$8=o1#3<21Txelu9@%8lTe!DxYAz=S6ed%?(a+tSO&l z%#(~^0*6S_8g{~EJlq_^c@atae9zK%!AJ66zVn{%$$x!M;fO4YzK5Q+w^O3kvQNct kbs9(8R;PX2nekMP{jFl)xVwrI?oSxwQckiy<+acL29gd{w*UYD diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PositionController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PositionController.class index ba3901d61ccbae4e1f9860a3ed9bdc80f8246e28..ec4dc998ef64fca345f21e9739659421fa14e2f7 100644 GIT binary patch literal 4265 zcmb_f>r&fB7(HtY=3-2MLZGE>N}Gg`i$d-RNhpwzkQz#HLK5gD!WKrsmK;fjl3rh< zPtd>ZOlJb^Odp`n)amr>N|t5EP=;n0uXb0v-*>+A-Nax2{Qf6^OZc%J-B@YE5q#c( zFYskM68K6E&*V~1U{x+w^rE!75#j@p@MPtcy&DDZ2X<4?X zOS!JVwY2TzHMitY;+mrujV;^R&{hrIa)Fn>riT}_$+Bl}nU0a8*p{27WqP*- znnq473B;%E93gh4P0N@s7gr7Ep-ycAJ!w0u7nXF#l2anQ9^e>S&Z|a3INo&@8@`h_eBUDinBL`O&@G)iQwxxp#rc0}= zk@RzYQ`ZVQgLc;PjJ)BD@4uDtWIP_$J@JyBr;WW0bjYYNU-D%u1H##!bMrDjtMCHF zJeJcvUEoAxzm`3-;A#t0^GMEU>!kxb}8$^+#6Y`*LTQ_Z!&Yty6)G+30ys}=k6#})m%(y6`XxC2r356<|eJ& zJTtw@y$m-k%`=D1h(yjPd9%`lzyVc>0{yl1dAn4p(ZfD@;n|z@WZov}Z5cCf>0a3( z-X}qUDD1xCuADsv21}h&om8F9kh6iK7@uq8D!^U?pLrl*9`>Ou~_a3s&O` z(JzRwS?=5Mq>OSBn^M{qzD{5}iI?~$iEr^;5)bfw5*hr!REUbM{W#gTmoqA>75LND z=SG$|wY`PC?t;mZDKNJ8jXl1N1d_51R^$oX`ajs5>H%EBjbyr!0iwyD4g>kV_M*D;EA)u$3E#q`!!rg8bnI{f->UCE=s9u|{2 zE%<;R`rYidJ^aOFy7Ae^{@cQ5KcB69G7~uta;5Pp_-r111@S8Lt8&xj`EYt(O=EI* z4A+)%o$DKW65sw`#E+5K3vZ72afw$Ef3u$WTeuw%zf5vubPNR1(GkO3h4nKHNWVsm z*CQAQLed8?fsd)O1D%+}6y*lNFwv0MX@w~%gCQVxg3~*=8vvW70O_}G1#Ab&U3A94 zpsf#sY3jS95cT^PLPXt|!95BMaLhz-+~>B>&1^k45AX@YNv7Sy075F@CMET&F!a;K z&%gPI?o_Bdg*4`|??R?(#SVu8OHK5LLFi}k273XMcH!7DQF`zmgd=yuU1 qD&V5U;jsee1LzCD$vPtwvl`@&C~`?*d91MXaQ%eqr#$7ewEQn9T59Y7 delta 983 zcmb_a$x;(h6g{tFc&77`7!U{{N>B+&JAp=m1EOJ2R2&eefC`EOj-|bFWtG3spWw=c zi&U(#%7q``AGo&s3rjt>)77+=ORKBj9s1mR&pof-4gTt1`1149X8=_^w~@ho0%@F2 z;sP$((6}VWf`pef7A2UMhYs4Uf#py}y^QwLD%!a75vobYLM{LSeS84Z1|W}qMhXRN z!zT24E5>;(SerFK5lM~~d=W98eF0v)?HFKPlEjL{SlH37`hjj$*Vu_&jN^(h_)OCT z5AiK6LAe-4nRzWVD|8eb?3VfTUwVmDCBmV?369U9ia5U)LJkG&!Cux%ZXZ2iT;TE} z@^neN9CL z8=)Yh|4*>P!o?Tt$lrn;#j!xJhW92t6cMaO4&xCHxlphiCUBfBlSp9_C%92?NfZAR z<)lB;$R+urxGYzwV=5Rt#|EN#*7*Rhl<9i4@#EAvVan&w(}si`vY5sU+XR!RBa>&D bZf|?)&uuN7Cd|T||0i|QJHz;F2tW559e7h$ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/UserController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/UserController.class index 949f07001255600dd0acb5bb4343d5dde3b6035d..c06c41703c07b972fcfa44e0f2f062817edf7a68 100644 GIT binary patch literal 4428 zcmbtYYgZFj6x}xogd~IVs1FocAGIQg;{&aVeE@=50VxR9N3}yTfx*d4oJ>G!-;dAz z++WbIeXT0(TKxh2Oz+P5N9UK>4njvg2C?bKWXh3${7zIIeH_mg|%RE(QjR9<}8?qhPMO z-eY~iG@O#2H?qF#t?5QZKp!sq?yBXPIjU{GVmX%oCZYG9m={Qlx;etzJz+WKRJpKV zdbbT)Q$A%4d*1LY`5rDN{3VO#&;NrnS=aGB*S1Yh`7>I1rR{{}F^q#hO+OyG%Bk^Zrd zw+$xOi0j%+1cGm!^^NRfI-{bOgu`PX&^BrMOKxu3khJ@zr{bydw*EcIaqRamjVm`3O|+3KC-4D3w@}asqZ8TU)JfUD+X?-OS;F z;jKjgGLE?#y|o+pyyX?9s@HahSsd+3N*>9)z`bq3-yzr*ReO}3<}4e6X$vIvjakc; ztR0r>^sHOYKmu!T00NgAwaM-DyX5TL=;+w&tiYzz9(c3UvNriYn%)*dn0eYl(5u)A zWRvBM&;4oW^$2O(GU5wY_uE^yf{_%3E307z3w{*C{+Fs>)>4!m>tMhnpe-%iPnBX=oaID($sLl4m9Illd z!eQRc_dsATVmKg=GXENg$)d!ygPb>W?BH zFrQkm0Y`9@Z-Vvh7royAiIKL$^mnbgqHikn$#Sl<;2&lD&)aDo1 zRmvc8J3@6=$wk25HyoQNd0fFgIk1l1 z30zKeCAOCb513#N74pGAO$GUJj4R|+jcbZlIlInToHAX?n?#fw-PO6#8mBNQ1`0$$ zh`hR?ygCx6D`61Eqv^G1dY#jEaFZtG0ei+V!LcXsbscSSObt{yS}!(B%-v<>VP7Cz z@vtY14HYu}GI6vpO7Y0AF8Wo8QYuCfaC1GMCWv*iQVdMK#pFJTbsg<22L1nn)Mr6h zQAmS=a4IL>lcP;+ko4XHwYCIA2c literal 3196 zcmbVOZC4vb6uujhtc10+sYUS>`(}XB(H2@Hh(Ze38cHNU6?~f{15CTwP4@*(^!T6j z9M7@!gU8SQD38zVZjwzJdQv{X&TQ^H_qorVd++}H-(P>B8e7NsQ~`t^!%wmH0M zlr7p-ZtikNs(th_=^aV9pLfdQH&F zFvXAkB5S{DGa~C z3@X#MPCEwe(j$Yup>H*sj!&v~Gwxp)27OF>2JO?HPTv{yJ^f(NkMxs9x8oq)af6|| z>^QuMGDvf`7>wj=UG>#M2wepylo=e2IHGPJ3k8Vd<8gfpYUo$h2TFc&k3Pf)lYtK? zjS}jr;W>(38qf356Sok%i`X$dH9S*Of0Fh)772PIG9r4DE@5qi1~i7f0)30dDHR;9 z!g>hrMyLLu#Po9-O3=nLO8$mdLjg<%1{CnQ5bS3_o@p!4b}Qd zL}?uWN|=^zdV(HBy2bg-Lzjhs&sb>Q<}(_wXlrvL#^RQ87-(|4qsc4`@acFef!F#I zD5x**S0!+#P2g@XfqD8gQs6wArskD+ra0!M z_$B71GBOB&WL$F#a`G!vQ=KY3Qy3YTGJ!R-#4)U%FRj4OV{_w&r7$4NQ3#o zB}JKe=}gvkn}eBx85ubzFK1pp;%6wMi zA@>7|`kgZV4zD{EmxYnfEvlrEt}CD_b1U|;=T>HKWU#Lwu@%v8T6sx>x)|~5lAqySPg=rU-J-=eJIxB5+ z+bKdE*vu@jr53;jcUd)p`D2L)snE=8hl~R=`M@G=E z^k6gKzKEUn;B2d?g53zTi0(oco}{_ng8V~eovi^E{IqBYaVrS&|I|DFKVK3$6ywQI z+?947pKjsIVn*0y=wtHg{l@C7!t;%J&n-Km;4J!iS{6r`;_J|&gFHS>QQ1hW07ugQc!S1Ug5s5F$kF--t*T(uWnIZ(W&E< zAx;*3WG5kw0|OCOSTwTb`9-H(aJM{*Ze|XEE(V0eP8d3>V8wzHFpM!9m}o4TI|v^V zm?A|YWJ1(s_mXf&#$SMpUB1em{YbjIm2i`t&ya*2r(I#3LfgBdDNw+<4h^vL0jul9(kH5Y0A~FjDi%&Q?QZdt4P0 zW*YFd#>My)SCk2TYeJ4H)m1Oh2k?jztfAyEvEz{CewYNlnn^;!V9`a|7~IbFE;>ny z8#y&ep^!(FdB*s|b?t}jDkJK#awX@(qoi16L_@^6wP<3`03Y-JcE;;2YBWhb%##93 zvTsUJBHmL!vglM|Yek=YBQ{_t(v^5DCYTt{=GCnHYSOyB!?lc^X=&pEW=_r6TKPl_ zc-t%9jcP^i>j%R-vB09U3Deeio#R%5p)22j528KXNg5z8X+4I=V4^w)VUa);@zA#F z%ck&I-Ku`nJGP`x>~F6(#Y%*$DcV1`eIC?t|KrU&;|dP~3`J{NE-#RpJ0eAjW9Ktr zNR+n<%R@~5iis8-Rs7rxwE9Har`Z`S9}vymqLuW+&Vz$-rS91am0PiAtK!xsV2=cB zmmAaDmGyr8V?tO57O2b!JdwGapqVVTO4jVmG?2bvboMNBo!8^gB-kSQ4~&uTCpLV} z(IY11eNq_)7Kua&3w!f7CKOsufVrh4&&95DUa)94L4`+6O_?u=7y4Ko|F_yxLTmZlf}j*!49)yxu#+rPir=L++SP&1JH+iF@++X3NEI z(c5s)Bn|exgV&W!(N&q+cj=lDscgTO@albNeL%D6CD-XgO$eR!8;F%4Q=4qx0L)GL zC=D}5c_W&a_AJn%Mg}KhJ}qhVHe8qjh-TOlHo8S08&u^|AuGC_72Tm_!vL|jDV3E@ z-rdEf_YSDL3f)iAx@*{5ak=BZYtUWKrgS44)lIse4#}t4Ri7m*|A9=$L;Bn(qCBzV z7fBJS9ilIjqOYXrYx>40GASyyrh2I*d&|VNJ{SgDXiH*LXxmhP(+ty22E&0_kEm)` zsxdNoe1L5qDC|uKu~IyWXcxZp(Gz-#|3mP( GLG(AZ(#RD6 delta 135 zcmX?Xc#KE*)W2Q(7#J8#7?jx=6xbOQ*%_2J3X3vr{>seGwAoKEijk3Z@=BqkC`JYj zpfV-~Q5Hr9F$Qr4W(GDOpOc9}0!T>$F+^I5feXmyV*(P44BSA>Qw)@4hRRAa$N(jn Q7-SjbfHWIWTAqOc0JDP*761SM diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PermissionDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PermissionDao.class index d9ff33f10b71800ac60e07457796e981559cc751..5c0faf4b9448e78d961006e32cd15c05a6c2ed54 100644 GIT binary patch literal 934 zcmcIj!EV$r5FNMO4J`#qp;TOvKp-UM!fh)gR)B<*ifSuypH0l}l-N#fr!>FDfe+xL z5EBQKZd(aBaInUiym>S4W%B*U*KYvu681B=pTS-R4;1WI9O9AohC^Uyr|ryD`h6J` zJbId+&>3M9xx!pflV_I`3U&^4T)OgzJQ*Fem%4TCsyB~$VJS9VD>%Q*bkGx3WEYq_ zyO_MX!hMhz&R|KWESOIn`xoawW9baB#icg^y$-drL1Q=aAYt|^EunH*qof<(luz>B&4pIfQ9oK4b`>wIHjNu)AcVbzP9z&v1@#x z-*F{g><*AOnmnI`GeX0Y~uFwiwnS(Y{69ZU%n)VD}7}V)2^nC>g`Y< zvJL)&A7cdy*5s_qU$VBLU;{>SAIsB7K_=lw_X0LyOX7BizA0xrKqlZ@*Mo0g1q)|S SbO&}4;a%93I2NvZ06zhjDIKo> delta 73 zcmZ3+zJOW&)W2Q(7#J8#7-k3jRB~ZfdK$PObZzR diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PositionDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PositionDao.class index 288728e23283b2da46ab03a8ca4787eb43a8b5ce..585ff26da0d46545d2266b01ce21504a5a5d5566 100644 GIT binary patch delta 332 zcmcc4d5A~&)W2Q(7#J8#7*yC96xkV+*cp^J3NK``7tP5mE(ypl&Me8y&+|-i%uDf0 z%uQuv5Yo`}$x19s)GsZ`%+dD&Dzau|aK#XuT*qWqFN@U-r%IR9f)dXZMg}Dfbfd7C z&7J~QUChXkj;`DWqCF=uFJ0d!KQG2v%uqQQ23fFnIR<$k L%?6ZKU|;|M;q*}C delta 70 zcmX@abDdN8)W2Q(7#J8#7-ZQQq}Umx*%@Ru3NK{Z{D?Vd24)6fpb{nq UQ3f$EEzTeTq}do486+7P06WhMNB{r; diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RoleDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RoleDao.class index 7df8fd001f7f84fe77268cda0342e93869f861dc..b8eea437594b25f2c83562dd378cba36781dc1ab 100644 GIT binary patch delta 166 zcmeBU?q-QO^>5cc1_lNb1_5>kUUmjPb_RY%2Em-n;*y~JoK(*g$GjB3#N1Ry1|bbi zpRB~PME%l|%p83mpaN?~2F~Ej^t{B9(juS&M+^lMQ0_2Z^>5cc1_lNb23~dsE_McPb_O0s2F~Ej^t{B9(xTLjJpqjJ3=GT+EI>s} V46F=nV49tQ14y$m0F^Q@0015)3Y7o= diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RolePermissionDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RolePermissionDao.class index 11c28e39b05b4a54ab9bc61417d670be0b25bee5..86bfe17933a61f7f0c017ef7dd93b43fb941fffe 100644 GIT binary patch delta 348 zcmZWlyGjE=6g}6?W{pOTufoP6AZRrfb{hokgcZUH_7iv5jO@ zPv{?Jw{jvy6Lcjq?L&I>cR=V}sxY?2P&!$wpd9BSJx_P8bZKO0oFdfRbo{Go@Yz&J zQ;N)*GCloQ{!k3^e%_d%Yjv%?9#!gl%b77Y$S^;caFAJ73VA1Q#!BcBkG+sT2C+z` zgm@yW=4szjMlC`MF(S12BQYUiT4pSvgB9j3fw0Qxde)*ZZ4K)S&jxzTZI(BI55yW> A0RR91 delta 72 zcmeytx`tWq)W2Q(7#J8#7fgc5S>k%xM@TBMJeU0sG
  • ;;KK5K;q0s+5X~2slsd#ol7?n%#A){51~z z0Dcr=)^R_>4&$6220sSqb* z?UwP?vJ3BF)@vFstSnP?P`F zeTM-JDy=2@6@q03%h0A%hfZw<0RTZOO{fd2l;xwkEguDIw0g95J=ZN-eM|V??HbXn yH)%Gm(`?>Mvq>~t*K@XS&e^7%+psfh>JG&(!7e>pa2NK<_dU2z?+yh$0QdtYS`Fg> delta 61 zcmbQq(Z?)&>ff$?3=9k=47}_NTr$}=!9Gq3<5_Y*uXS90|$_1 LV_;<9WMBXQS#t*% diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class index dd60d5598eec44f7fbbdb1f3f8aece6ac8e2fb5e..2ea370cacc44bc6a3984975d91e328ca422ec5c8 100644 GIT binary patch delta 577 zcmcb~HkVuY)W2Q(7#J8#7}VJrRM;6**%{O}3WqV)%jRSjm$;-BBo>wArskD6=B2pi z7Ubktrly7zrKU16sA%|PC6*=X=OpH(>j#$lhYZ~yaYh5fjPjb(ldpTK?&JBpM31r zqgV=7G;ynOeQHICKFqK%e``CSJ4H|}0D8OxWC>delp%;L4+?=|Mg~5R7$S%m8Qe9{ zL%;?pM0^tqAY4UApn;u(8Hjd3_iR4RD9^~qHTgADKs^%!8!&!YfldTcTtLjkAj-nX zAjTlh0CXQjN`ip_C?v@s1(ZYxK~+lwrDTw$WZ?#Zq~sWc5xP+AkZ0gzkYIzSWb1cL+l;*dpmvNUlfl{7*c1)E)W zeWot@0DY)_Ju@0vLRJ#O!ijX|+|Pf0&AP_a=oM{?Fr#Ii`h?#nSB|v zaI|9$FwkH5GCICw0~R)OT^x(f>{`gsZIpFxH+jbal$xsPM^q*8LOo$GDuK?Z67koV z*djC7F@6YC9p)kw2wX3YJsq;1#fA_rvwU=Tuc&u2JPMXGk+edYMamCZW4EARiKGY! z?AOa{HQ=%pxQcCR@yP1CEbCU8|CO{EZ)y{mI}l-?J01T(5O|oMrH20rz0ZUFMa04} z9G9FVn-=!jmR$I_b@j$Rftip+3>#A6I?~p=M9Qy~N*K|IKo3~x@hHMrdm&?r4hRh2 zesE(Fd5cxR8Uo=*jP4>rcE)jcjaV;wH4Yq0f$YiYvz#CbQ;}KQ0zMYf`6XJ|$H+Ry zAQ#!tW^Q{J2!*!$N!de+BRNK>(?cl(`WXN862Umr@+cS50tw7($9pQQt|kf8@sdEB z^{xm9Gzvl_!Hff6u|D-;SMmVCPq)*jP42Q2Hmq`hX9SktU`K^0#q-tJJgnmJx^0Wt zm*zvDNG_q#KTjKVNIhso6mFieh;J+r`7vft!^Q2-+HKrIqa{DpzhVDI{g7 z-#t6^TrC+_E}L&qGMRLQwPb|&**%&}J0q%hozuh;nGe)LgiLRrZy+5cL&TZ7W^~j& z;YPj@X@dE^=}Cot9RKTFL!S4KFmO}Tc;6BpcSKCRQQwk03fx%V4VbUkN-rt58SV6N zIq~82IqFhV5E{N!*qiH#IJBACF#=ao1>^FjYB7OZ`41@fE#Kyrn_N{8vMToYx?&9R zPLWL~sfoaC<>s74RSDoF1%K0czgw*!ieU!dtN1oUpoaf0;BN|M@n{Y%qM|vv1c0J> zSU^#tvWV|X@SahbpN7k5xs1OnTJ?QcDRcY*T73wsMaLh($C>C8?ch`REE6T+KZh^$ z(U+4BuEMpV_E+VlUB?W*h8vl7UHfcIioStwGp+Bm*7uX5n?N(IAGFr3eCK}DqTA)k z+`(k-!cWG*>=d9j+|w36!!KC_e?@W9_9j}a!TmCe2l*He#}>b##X4-1Sv-PPmb(f) MWumlUQ@?Hf5ADu)p#T5? delta 87 zcmeB{c+D<+>ff$?3=9k=4ASfj66_3;>A8IhBrO61YtiTg9@_t;F6+D?6$KP z0p0DHQoOO(kTH>kg^_`Uft7)gfeq+;CI)sOp9780$-o7a;RedHGBWT0DTq>Dpi({t UexO#UlmOTSh@>Ec5SS+n0Oh|_`2YX_ delta 68 zcmZ3@_K;cl)W2Q(7#J8#82H#3xY-$a*co^y3fF9&&8W|)%*evXz{0@Fz{tP`RKmo- O4#W@^2LmTqgbM)0{s?RU diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PositionService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PositionService.class index 937a93812cf0467b2a40115c9f91c1b206116df0..77eda4b04b2fabe4e5df85c33eaf3553c6feb6b5 100644 GIT binary patch delta 295 zcmbQo{+v_z)W2Q(7#J8#7?jx=6xbOQ*%_2J3O``<5Y5RfE(ypl&Me8y&+|-i%uDf0 z%uQuvP}1uL3Re^=cFRpC!~SJd`ApHkdeF~BSG51#%=z{sLja8K3SGI-Y~0>n%Vl0Ydb25AOHC|?FB29c3vkOQlb2LPF0Ow9lQ delta 58 zcmaFPIgefV)W2Q(7#J8#7-ZNPB-t6H*cqfZ3O``nEXb_M$jCa`nk8R|fr&u`sDz0@ Kj6obsO8@|s7zyeC diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/UserService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/UserService.class index 392ea20adb936d866fb1d1cbc9562f5d7d9ec33c..f8c3f8dfa52b79dd5554a7d0f165409abc17e5a4 100644 GIT binary patch literal 1089 zcmbVLTW`}a82#L}4ei+0QpOzyPjnB%5AXs-NCOoK(XvVvdv{`|^+@c@aa#JmWmhMX9GD@;%7ht9 zr$1MD&ZydaZu30s-3(p1{X*M}r78XoPT>8pLUkMcH%PTfsqg@4#>{NW`nyW3%Uz#^ zp)~P_DmGXMdoGL&Wx%Y|>W${8`*97g`kt+1sTF1ne5p8!o#orpAkdkz1fJK_`CVUq zPb$Sz)AHzNQIIli;9PU zv95U~3C&t6Ep!lgnwR)TA#DN#8aQ_Ft$Ix~BD4T-Zi9#D6+~MEIu7c>ZV6p=&>rk> up}ieAz~CN^zB{@GgEIQMgAU=w7V0zrA-L(_TW}lK4Y=dJcj2C!@BaWSJw*Hf delta 202 zcmX@ev5v*))W2Q(7#J8#7zEfEc-a~F*ctd488{0|Q;RAC64O%|8O$|&vJ%S@^-D`K zbM$=^3#=!~iSvUv#rhxxp&-`8^sT2X*nt!W5Hm4w0x^We#lQ^~ G;Q;{KTQGY7 diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class index f08fbac94a634d3e32a655c069a1a9ded209626f..bb4009af358ca79573ece07a73314d379b71df11 100644 GIT binary patch literal 12528 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 diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.class index 79cfc9c9a2d8f626fe8d45aea042908d830614ef..2c9e233f8eedbb3b21f37f0e0f12209dd2a62ddd 100644 GIT binary patch literal 27945 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 diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.class index d90071dab8fe4e8b468ec1bb9dd90e219dab69a3..d0e06fbb05f5cb1db5bde6b87843e654cd75d192 100644 GIT binary patch literal 7805 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 CR%hG* delta 1232 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 diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/UserServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/UserServiceImpl.class index 9a5c202bbe269a10483407010396bb23488ad5b0..b38300cc399798bc887925a0545c38c42728aa89 100644 GIT binary patch literal 9144 zcmbta31C&_mHtkWmz%uYuml1I&;o9O1g>l<0f8h031%}Jf?&LP?z(#p2h%lZF!p2l3o9Q6FjOVm@z6xK#3qkxIUJT-^c*(%mD)4oE z|NRP_H1Lfes=bYWVBnion1^ra@{8YBVF>B+WeKy{Dy5ccmqk>BEY_`OX;Y_^mIP&~EHmWnAP&em6?mdb z-Y3f|WQ8FsgL1B%N6X3ihFoCCg@V#(VpLGmkw}hOsp!bYLsmy(bks?15mY&`@n~Yg zadz4XK|@C<5wpVfb&>d}H4=&2@leE$T4TvrilYguEx(w1>v}WsbR^~sMpBXCsM8#e zC(?F0l8C1SmwJbdCrN1}X~&$SiR58x*sCeSSDug^9ki1XefI~;(qj?#_%jQVa*{_P zA;*eP7;AuUecnJj-+6plBtAk_G}W(~p^Tgi;Y7@i#66uj$I>~SG{?hAY_MBJ$gtNQ zRvr)8M{FxPWcSEKfSAOf)T6P%xKg*c=~A#GU3)C_!gsbP%QtS#3xIiFG>Zu|&AX zR)wdXB>kqTsN1HKbXz(tUAxd}`}4!LdQLFIP_o0jBI=!O^+ib?b%w1N*^P|b$+Xp( z?dhH^g&NN}OMrSFCB1Vz>FlFvIxa`7mdwbA!-#3uH=ZtBRO>B@B&_!Cwqqe@Tv=AD zjkr9md(SMvb8_|Ru#Yd^yBR6eO5Ut;h!lB_GbXbdczu_osz zM$)-1lSzLc4>ZGl)bb8#{&8E*A==B!TF9PYrVJA)lZVg3!(5>u?jK=MB zCP{<8*Jl7mw{fiDWBTW7@j>A6J3Vba+$ zV_8w?)0I9PY@4}!CekJS`0!AYbi#vLn9 zE^x$-W=N?jlRw2o6fqNDz~d&y5Fx&pvQ{ipE|PVItT$zYY$Pn3vI&n9p-s71E+H5e z#rzoYHEI#l#+gSQt0$R=ji>uEp^%dzKFK;$E|tyfTqLlH5-7}1Gr`o9CZR&kFWfd$ zgPP-2L$r%2TjerSw#jx=cF1-Dri#;SNQ)`0vXjzEn<=~Ga#MCwZfRH1_Ly>obQscU zN|$sS(qqb%(rZYcDg82F%AjmEWv^Ui%0At*Uz@9?*OUX=9Mt9-88YQsu?Zrk4C_ls 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 httkby<_aF+9rzTU=3EKBa86Ujh$}-Nyg` literal 1843 zcmb7FSx-|z6#fQUN=ubRS>39llyyWwO-eMzB_Sz_A{ZWcn6^V1?7efjcP`2w@Y$cD zFOW#$gOC0w4E=h*&ymIC1&?!j&y(m;j)0fvpQCSnd zvT{usGg~TPc$_b4hnK{Ta?5;Exxy_fQQ=#@6YxO#yQ(O;a=Z#(C26IqSR^^eklYES zzqc&P6yi}fzb$qJ4~?quCE?}98*qK$$WPk;7}*1E&#aPXKqwuaAS-3keGGvL@*?b+ z2&y2oqe?pD&R#(n6?l~};6?3A?nom_!U(=-aS3vuvEDuJU(NH4Ar`7)MNsK0#-|SC z>NIZ(+p=hKPY7_Mr3@CDmtNA2P;RxewwW(oqs(4}-?JpmmM$&ZPDmqt>PB)!m0e*% zpPIXIthwjR``lOX>*Vs}XCvJ}X}6IKbwp^awvj+3p(EbB5IWalQySbGQK@$kE$bLb zca&PupPMJ1#tT_L4XQ>SqO7a213({zMlry}5Q?YN{di~9^Y>vuAxi`p%z zC@~%lS@rA(UwEGM(-^`7hS5_(9SxXGYmVVzy>IhwHXHKO@;sXv4AWXarl&`%fCwJ_>N8oGrWL7tOHqP*_yOG*8w4Tyziz$t-;U+!(U0_Jle?%LtL^Aqz zlf-Fdw8ke6z`jT39{P4f%3k!+K3#P{A1;wZQ-OZ8M~A;4Mmr!gafr6{1GG=>BX)>5 zZ9DdnSUN=K`qTlE-^iyO7PpU1fX*i|Kxq9K#7Gn)Q^l#pAVjhcQmjGp9KtXqJwoRO sXsz0=9NDgt?iy+1^kCC+oqlb&L2%VwhHAH(TewZD?ZGJh?gY5|7v@qdBme*a diff --git a/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml index 8ffcc49b..83814fa8 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml @@ -19,7 +19,13 @@ + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml index 0988e6e1..fa2321dc 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml @@ -3,7 +3,7 @@ - + @@ -18,8 +18,123 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -69,6 +184,50 @@ AND d.id = #{id} + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE hrms_user SET del_or_not = 1 WHERE id IN + + #{id} + + + + + + + + UPDATE hrms_user SET status = #{status},disable_start_time = #{disableStartTime}, + disable_end_time = #{disableEndTime},disable_cause = #{disableCause} + WHERE id = #{id} + + + + + + + + + + + + + + UPDATE hrms_user SET password = #{password} WHERE id = #{id} + + + + + + UPDATE hrms_employee SET name = #{name},job_number = #{jobNumber},gender = #{gender},birthday = #{birthday}, + phone = #{phone},company_mail = #{companyMail} + WHERE id = #{id} + + + + UPDATE hrms_user SET account = #{account},motify_time = #{modifyTime} WHERE id = #{id} + + + + DELETE FROM hrms_employee_dept WHERE employee_id = #{id} + + + + DELETE FROM hrms_employee_position WHERE emp_id = #{id} + + + + DELETE FROM hrms_employee_role WHERE user_id = #{id} + + + + INSERT INTO hrms_employee_dept + (employee_id,dept_id) + VALUES + + (#{id},#{deptId}) + + + + + INSERT INTO hrms_employee_position + (emp_id,position_id) + VALUES + + (#{id},#{positionId}) + + + + + INSERT INTO hrms_employee_role + (user_id,role_id) + VALUES + + (#{id},#{roleId}) + + + + + INSERT INTO hrms_employee_role + (user_id,role_id) + VALUES + + (#{item.userId},#{item.roleId}) + + + + + INSERT INTO hrms_employee_role + (user_id,role_id) + VALUES (#{userId},#{roleId}) + + + + INSERT INTO hrms_employee_role + (user_id,role_id) + VALUES (#{userId},#{roleId}) + + + + INSERT INTO hrms_employee (name,job_number,gender,birthday,phone,company_mail,user_id) + VALUES (#{name},#{jobNumber},#{gender},#{birthday},#{phone},#{companyMail},#{userId}) + + + + INSERT INTO hrms_user (account,create_time,motify_time) VALUES (#{account},#{createTime},#{motifyTime}) + + + + + + UPDATE hrms_employee SET gender = #{gender},office_phone = #{officePhone},phone = #{phone}, + company_mail = #{companyMail},spare_mail = #{spareMail} + + ,head_portarit_url = #{headPortaritUrl} + + WHERE id = #{id} + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/PermissionDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/PermissionDao.xml index 9daf7734..33e21a54 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/PermissionDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/PermissionDao.xml @@ -9,6 +9,7 @@ + @@ -19,5 +20,22 @@ + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml index 88fb9584..9cf3737d 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml @@ -81,5 +81,20 @@ p.id != #{id} + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/RoleDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/RoleDao.xml index 14d82ba9..5df619cf 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/RoleDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/RoleDao.xml @@ -12,5 +12,8 @@ + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/RolePermissionDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/RolePermissionDao.xml index 0073b5e7..021a5b51 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/RolePermissionDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/RolePermissionDao.xml @@ -9,6 +9,13 @@ + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/UserDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/UserDao.xml index 8885d686..ce325376 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/UserDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/UserDao.xml @@ -21,5 +21,37 @@ + + + + + + UPDATE hrms_user SET password = #{password} WHERE id = #{id} + + + + + + UPDATE hrms_user SET phone_account = #{phoneAccount} WHERE id = #{id} + + + + UPDATE hrms_user SET wechat_id = #{weChatId} WHERE id = #{id} + + + \ No newline at end of file diff --git a/dq-framework-common/dq-framework-common.iml b/dq-framework-common/dq-framework-common.iml index f683c485..5dc05fe8 100644 --- a/dq-framework-common/dq-framework-common.iml +++ b/dq-framework-common/dq-framework-common.iml @@ -1,6 +1,5 @@ - @@ -11,154 +10,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 index 50fa758b351c0064e2f3b3b1c5c258805c19ed58..f9bb0cf966084c38dfbf016ba662f13fc91f9727 100644 GIT binary patch delta 340 zcmYk0%}T>i5QWc8O|D5Jsi0M{HU2aJ&*4Jq zN~n8%8lRwe5=C5`IcJ9Xm>E06Li9O#dk4_Kxdjsq6Vqtsafnu0jx4rOnvTUy?*aD86^Gt(W7|Q${iaESWL@`jd>K)RIyQoBj7)M_@m)e zU5K1|)#IWru*3&Sl!h{YAcUNn=*`f@DyM6d4Z&)`#X5bNBIeS5u#F6>5bGM9&?6@P zVR?AOM24AKcFp@kH;Go&*r@3~wxFpmqdga3=69V}0dtCoz#j(U(mX_pfXHSEzH MrhWPWcfu~}-)O5S-v9sr delta 266 zcmYj~y-osA6olv8$X@n`Km(Gn^0x?xiXx&cf6H5#SW)p1Rwg{ceFRG?Lq{Sl3GYK| zoJ%Yy&di*gFLOR~KiT;3yWIikWA4F4-$feFJ_dNP^6GIN+7#O~(im$@G^QG}@AyqN zU$R!kB)}z#R;~i%QLrfr(A+F979z^*Q;Dw-vYrH#37tW!j0(S2IRS*~p^O^6#8If9 z*of@PnMVz>a>n{-kd=S-nrzb?oo=dyHpH~`%)LQ|cR|N|=tOSKR(Ha?Q}aE#^elfo L&>zY4-tqJY-yj}x 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 index 1f3f5a05940bef963a89f4b696fd34bfbc34c08b..6d962885e90f378d44025fadd2916340a0109331 100644 GIT binary patch delta 17 ZcmZ3%zJi_O)W2Q(7#J8#HgYUr1^_+61~&iz delta 17 ZcmZ3%zJi_O)W2Q(7#J9gH*zds1^_+11~vcy 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 index 5821baa47a39d707352d8bb7b86ba6ca7c796c21..2710cd15b5f130665ee19576df6233a0e42eedcf 100644 GIT binary patch delta 203 zcmey%KAXew)W2Q(7#J8#7);q2WVjd@8Du#az^-Z ze7|QF4}&&?4m*P`4}%_qK8Ry5`68pZs3C(94}&p?5MVIjVc=unXJpWu*e^Pnk5O{7 oHj@M+BhzFT=3)VHpfgz+f$|JMXGkzePTs?8#V!TpF)>I30OJZJq5uE@ delta 193 zcmbQu@t584)W2Q(7#J9g8BEw2q`4Rv8DuyZWI?nXH-kKb0*Ix^!Jq`g)^}6CGbpwq9&^8N}HcBqqv!5ft!EEy>7F2}mqT m%uOvxEh?VO&-k8^Y4U$YD-l7UPF6++ejvrjAOs|t7=!_eH4*Os delta 57 zcmaFBa)?Ft)W2Q(7#J9g86>zESQ&)b8AP}km>5La8N}Eb#3#yrnXJP2mXUF?5R(-r MBZDANB@=@X0CoQgMF0Q* 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 index 5433d84a5b2d973a2735dc3ad76f53128549d1e2..e1b29a5fb69cbfc97398c174c6e4200de295fdc0 100644 GIT binary patch delta 549 zcmaKpOHY$Q6o#MaXFKh5AjH(z#H5KD3KHUiC{ff}#k+E;iWgAi6RLQ@YFouCh>C)D z7}oj+T-hBatXQ#e;a_o0JVRU>7w2T&Gv|5Ff#cxg9Sr|Q-&_O6KtX< zPOle*B&Rv!D`$P`Gh{jEThALVa8c8*88FmwDZyn14Oi&)so>L)A@nlzGURHKVMdY^ zxu&^pNHe;@qc=1+4Y#=MEypx><`#adQf*eHBB_2wLszjnS{msM%i&nDS}a#;UxKB` zy1SNpZYY*%DO1r@E%$j~*~}J8Bik(FJhVLGvF3^8DbEz!=YuBqGnQ|i&`esMGo^W9 zdC4oywB(Y=yd!870X9Hxsq;6ezwdp?rZN!CQ%OgrfxiH|kt7igU~@*YDbTT!uwBvG(4W*qs#JEMerFmA_~r F@dr*MSGNEF delta 538 zcmZvZyH8X>9EHERH|%id&QcJFBqR%J1T-raiVz;=ux!BIsQ-2v4c zE2YPo-jL&*a3?37oKnm{hW~uNX{za3o9Xcc#R*W#}D#s+_OUpk+uDB>FJTXvw@2_}W6Pihqni^^a>BRmCN* zHE&pQlMBU9vZO?KW>tTzF2|zj11{ED$N&HU 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 index 0c3ad7c6aadb95c515dd479f90c9d4cb3ca49a55..ce6888e67999bdd6385d2d8361e2ba2afefc778f 100644 GIT binary patch delta 305 zcmXAjJxjx26osERi6l)@Olz$aMJdMbsOe#J$IeBe8i=1~E4Q_hvt1u2b(IATZ$+xIX+kVu&@AzGL6J%4-i`%!| z@Gh~nmrR4E$*CZC`V0y#vz)p3oVyg6Qrp7YuT~a9OJ@0WyJ1d^V z)^V3K_k7>Ir?|WDEnI&8eQkk^MS#z}CgDNSlw_I%25t=9Wu&NS%dsmHMZ@t?aqRdc z$v4ZjFux);h4&E@OeN2PXIyCuA(F<{d|t+WI~zhx6t?I9nSW 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 index a639a2bca640bbb693c4b9d11e929f6693dfed00..af899a7d7c04a5b7ec6cdf2a8135977ecd7af454 100644 GIT binary patch delta 304 zcmXAjO-jR16otQ+M3SZ{wzXD@pcLbO)LQFr)z<2y1EE_8G@xKpOzYf<3((AU4dP6} z1&BKk+<{Yv;(N{D+;h)8=fM53-_q@mzt?x5##su3s?8QPlak4f%{aSi>?vp8B5O-N zP@-;8P<&`Hsrbm`__=*2a@q4>c+u~6{K)SG!yp>OpTe8A-5|W_xuLuXGKuI%-OJFw zihspZszKA_MBv?Ddj*FXS`IF!4n?NaHvjUim4(nAjCy`fK078T--4zr^tfd-Dho_V z14bQmR4k*jn1v;YqLj-L8Y>7^@#06Lnodddy33PKL0dk%GV%!>UwkedUlrr+ z>Rp(F=$hF3%uJXnW`g8norD1u<^gpU0askR)cDG!YC;Ipmt*C*1)h16^Kz35`wg5- oQnYOLXd{T}n4=tI&xTKzp6R4F)w7Xsb24u!S!(M`1{4?3KPcZDE&u=k 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 index 67e8483f2a4d2cce996d16d22cfa3498a31dfed7..bae26b28e36fbc56fa669b486433e48e91daab71 100644 GIT binary patch delta 291 zcmXAjJ5Iw;6hzN^HrO~eI3FP)BnV*s0YV6$5Fp6{K=i3B#S%!wkxb~>!|Uj2C_spg zf(5VxN-CB>hj@;QduQg(jC8-9mt5!b@BIU))1JU&$Dzuu#k9qqgGW7G`>AtaGwEnN zOvRB+A;pHp@oVQnzC>l#38MI}AH@15@G>z-de?DyqYU{t z-sHsMR6Wavf9A44%cV#uWs7gWvLu95uGuV<^?zf6xqFbQhoLUaR&|NIHegi3pscxP w5csgHr>NzM9?2?#HP+RWS<7W5n+-PAkJ+8i5*4;a$!&BIN9RpyOtokJ0nFem82|tP delta 215 zcmXAiOHKko6h%)J1=SQSv_eQ67)6oB#t*+nTiR%^!xcHM8B-Tvh%*K*z(tU_0mqDt zRn6p`d*3_B`)K@_;`?v&13i|7!=tVlqSla7LjLU5b#Yc$;eL$ zNGwXsO)W_+DxUaqF{9|@UdB>Jrpe4qWkMoA6IdA;_!$HkSQtbZ_!yWbH!wK}K!pW? k!i)@J4C0fIGFfv=Fh~MA?a7!=qU6er4_W|W)wXECG5Pff`JhTB^jh9n=o6jO9KsMVvqp< DOr#Pr 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 index d939627d206ac6bcda040d044a1291383fe1865f..1bf65b68d35deb2547b47971b84461d394c6c2b6 100644 GIT binary patch literal 4344 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 LdjoHh?m+MV|7bl{ 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 index 41b580d31e3f6ef378484d1ceea2a9e9edf798c0..db378b1982b4abe4436c4e69f41aaa2ffb83ccd4 100644 GIT binary patch literal 3051 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 U8TT03&=z2(q!N_GK^LX|4`cbvO#lD@ literal 4687 zcmbVPTXS1i75DUl^#LKB+CH|*L8aceszazhd>$%(AmN-W8d z<(5DxG+de%dVvCM8D{zdd+oK? z{?_$u|MP!;`YV7Vc&i!x$Th)1UWS4U>n*s3q6`}{lp@${!qa%BnS0-Ka9!qaIrz3P zpOpjO5zccmd{>6=$?&`=z9H22h5A7RKWs)9at?kZ^9wTEbnv3gFFE+J%s+APvV&KI zd^LjCEJQXo)9K8{h6U?_1v_0>&XAlVx$KoZ3$ght-qYU5nwMW0Ieqy`CS4k{(3Hxq zhM;$_8&-FhLm!>TokJCRpRA--@o}0HY z7q6EyJ2SQ^yOAnqd@w%1oR6$zR5+N*@c|~jtY=m3@1aNQWPd0=pmM&Mf(zxeua&JN ze)C4ARJqTNUyzVT$kWMg$LGonePc(xQ1D1tIZ@JuXDfHsNc&1DoVm8?t+7061j>=6 z$yUKas8CwX6j{qsNe6YYH!Gf5xN4(P*SqvyWqoW1{vS_Bq3lYPy!6!tZ(Y?gTc2t~ zPTI?#5Zo4=Rc~Wednok8nYo1%bbu}s!ZzrfgB2uBsi2Kl5u}p_YMYEP+!sopuX-rU zXx871k1vh-c8sFQdsz%js<2s1XHI6NWwo=md^I*KN#tS}D=rS=K^LFHAs2%fir}Zh znGwzj;XG#Hp-o33l@aAhDy!7^e{`|bKSLt@m{@^$7 z{QKSC?sqXI2jUoTaS2blcvN7_3XGHZl8Ytb&EYW@9_atBY8`0jJ-V4)TbBIks@%^PU}_T2Q{snc^+xS?3&Rb%rqWLv zIxthnIwO@dF$(${IZ21f9;kt%$F)Pe&fMjc7ywF&)sjk=C*Qaf1*0< z=PRL~&k-8|NkLKp$wD}2y z4BdhK4*5ZRo?|CM91l@4jwWi|O|9)n;vsSq`aB;*N4cUVg~L*mAPFc+?hfJ$q+Q-D zQb+JGXTfsJV7X3Nk?vPml7B?Vf&d~F7Ah!IM5ue94H3jJVU1uf%{oBP0sxbNuj3$=Zn1Rtxpz_o59-Q-kK+|0`|DH=rc_Pdiv{Vj^n*+z8xvg@*ZaWlB z#9Hpcl|upFp+^)ZZGI~z=tfaGNi_i#ii=bu<|{S9w#B|=Y?o1^qo8jY_nFpOF-Y(r7Ok;d#q#~OJ{u$RZ~EHI^pOHVsopbF1TIYz6RB?O`3@K(X~oA{pk7{ zQm1`>iul-b>!7r^t9`H`wH6-7yiqq#w30VrRle1t)#C-6@uB1!Y6lv9+vZvj- zfW>;6gNp_ZQ0`@ z#zm~WXkX;2ebgTM2U@!A_tAC>?ohYAg+1l79it(Nbc}|(Ln0G?AF*55)g9^%mxXM} zb=%i#bkt92bd{*zz*+T4=s*r%VG|3m`^@4Tc|p#TI8VyvyI?;qkP2Z1`|wp#Vbw9U z&u^GK(K^0H9bf0&2hb96{)^oae8Y7=LT3aQ`RiC8VXr2e_>Z8xM@&o}=PWrJ5|?c+ zRDa5r>z<;7EZ?(g%2qo7pE4#S^1YF7)w$@{xINJu9a|OWzXd0H`W8Y_?^2l;yEMU_ z_C*n)>z!!w79vAi=v4fUQCl{;ZL{M@K)BUg-_b|)oyO5Ynt53jL5NA1R^PxlTl_Nd z2Qkfm(KDoMpC#vvQ^l1Tgg@p-I!ISqY>w8)w9G65vU&iv+M-|8ZqT<@0v!mI1m!vl)ZP#fBZR!pk&mIFA=&8JEderMmQnyFm*o>!8(kyg5b&<$P-IzowNh$pu$P$mH LuHY(92C(*j0v~gt 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 index a9527cda913a96dc78a18533f70929bdc0b58b5f..efe51b1a8b014bd7772e8e9ffa8cb3cc6212ba7b 100644 GIT binary patch delta 16 Ycmcc5c%PBu)W2Q(7#J8#CURT{06i=QtpET3 delta 16 Ycmcc5c%PBu)W2Q(7#J9gCvsc|06i!MtN;K2 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 index 99fe907f544c8bb6c600dc58ae6f2435cf19ff0f..55da2716be30675df7a5cad632a91248d5ab5026 100644 GIT binary patch delta 322 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 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 index e1ec5d749bc868a5c5a752b6f2501d5211de7a2f..26f6de86411ab3b27a7aeb24ff764a3ec0003303 100644 GIT binary patch delta 430 zcmYjN%T5A85Ug3)on;x9hoa&G#kcDN7w{PqCl;8Z?nfrn{%Qs=6~@_J{P}z8{|e6tU?bf-wi<$U2z7WCT-~wlU+t#;k)m z%u9F@3pd-(iTFWKJ1w6amMW!-pcYiBw_?Y2_O6eEtJ+!lvMRCII1-t>gQ&!k!ZLCa zD+)gH5(UL+s{(Sj9t_A5o)p%>bSVfAUlj+)GegC>|8>9 zY^FM7VWFReDTwM30~n-KkJ#cUy`Q>AIBB+FwIKi3bl3$yIErkSw?Z02#D{sqRF7!$ OgmzC85g27Okof_OF)ecd delta 539 zcmYLFOHUI~7(KVNbElVUi$z4`Wl;fnbSR}*-YS7rO^k$DtkF)xvqSZL?3I!dgciX#EFeeC&%Q8f&XBnpgo!)C+tcdB(?Kz}+Y z?nTvluIB!5H69@)v8YkRlEgcW5|#x9TCG+t^t|SwYgFp)e$ETO3nZG+x4DwUipDC| zB-S-Huqp9g;{!el$b4#{uvlE8-V+Q6WZNg%&b2rz^cyoL@FQpMOL;r+!UMk{VEJ7p zP?{=t8|rRQadx9dHK?q%e@%9N#%iB?`4#5$K$vCurWrXzK}<}aL;NO*p^vZCO{Vdf zT>o!C2K|hZW+P_Oonp_}sp(Bo60F8qw^)0aN#Q95S$oDyTZ_Zb@q!k{`71F-9LmHq zi3?ceGsu}gunC#u1r+JSK1LlJwK2ruVX_h9GfRW62GhfAu(`qrEd@py#ff9QFUe!b F-UCpWPG|rC 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 index 4bcf751f2a67a3b7618188aec11e9f3594568fb6..e049508321708f07ec69047bad9542d01ca22154 100644 GIT binary patch delta 182 zcmZ3&eu&-i)W2Q(7#J8#80@(icp20<7}VJrG`JX;88q1$w73{p8PvEKv>9|jEL{*w z47F2}mqT%uOvxEh?UD$LMch0+h%~EKAfc zEy>K$4@%5S$(}WiaDmFlVsfVX$Pd;$g66u;F2_Ww6`4mr;(9k!kWBru`zy UK$o#HGDrg{Mg|oi$;6-v0MfW1B>(^b delta 136 zcmX@azJ%TJ)W2Q(7#J9g8SJ3EOEFBO_ z7bK?#BJ|lA4A>bACp!LQF#_tD9LVU;Xgql#qo|Y-4}%GVDG!4ggE{lkcR8rI1<-;FcCMfxzR(PYx#7O8#m(?KHciUZMdCJcX)6o?&8zkZ0_;mUfjnS z_p@2YpAWEkP~aiH@URz;;88Y@v02Zibbup|d+`J|uz8ZrQvw@3NWma~Jk91AHqWxz z+xld8A7GxTxpT(OyW3B0P$ckgx)fTN)<)U5Bd`}H*rsW0^m^}Hsr1zRPK#xZ<) zUEmFgH!&nph+%zS%1Omso~R1$Ih&hFub$V?-kO1$OiIml9uLkHBV5{#xQ2d@J!C zzNeleFf+TCh1$Cs+gc^|Vv@uU_>nmi);|2irGFOKFYyb075Gi!cl@CttAA(KK(YKg zMziaMzC6EEqdfq!=&>OiZcIZCYKTXJQtYjh{AF+1WUbg2VAs#|o0x z6r7MyTof)6i&CPlK@f$xm`9C;c^aNF@-R=6K&c`yALRtII-y`n7)F{f+#<6!lE&E; zYfdtlFTg@d+>=mZ)sI7kYErf590v!@L9==v3^ekD#Im}-BaSzo}bk|QD;p0bF@ zJd-}0h?6LBi$A)46&9)fJvbSQNA=I1C8PVVQuR+!^=BkT*XQKX^*PxZvau6OQ4PDk zF0rU8ESwKD2+}pchgv$>XcD~ai>dF(B-pdWRKgUshEi(jF}AUe#uvh=1fH2xQW*x1 zLp>VI<`~i#uAklj#~Q8J0d3Y>z)b{v8k$M9!K4CfYO!dswx$(rCNOU|Z%r%O$rH6T zEd=Mr>F6MSlLGnE4SoVHy4prbkw)3mPM)Yg$!M^X0J?An0jv#F_ZT%NAO_2ErfMgN zHjRHlAPL<#%LL_Cd9w^gM(k{gokRCxpe+zMH=1WRxs7t?QMvQcLy{jwzU^?(ZwsWY zhiwA_IeOEfwTgoShZ8y>#fqCAgF{*_9mqo44RHQr1|8 z(F+@1kAoKWa;zbkMJYwr-utY*mqc?k4131h`zvrI!3?F$EDx`!-%`Sleq5#2;t&Ps zu;$_dd)i58=4H;G`|PL34PAkjr_P!i22Hd;6D`p32Z6HZe?VQhS|3i$6xUDz8?OBi D_mxdu delta 1885 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 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 index eee676c8cc91ef55d108a06cd56a1b791d2e5016..91d934a1ae4993c1955a3ddaaf6653f0689bddec 100644 GIT binary patch delta 123 zcmZ3=ew#W nPBvv81{DU?%@#~7jEqc^ZJDzK*%%lZB!Gr6GDreRCI%@0%kK=V 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 index 92132ee562b44d44189d4e55ba2760712eb28bdb..d555be42c6c8da88799592bda57c0a94d0fc34c0 100644 GIT binary patch delta 213 zcmWlTxlTes7=^$8qM2bB6AM8?i3^Df`%=&#D!8F23JnD$USnfSfET&BkDzZrXQGL% zZ)0a=7>e(l?{w!a_8rUq{C|7_Wd?>MhlVUUO+oHk5;t@ex0XA4ihIigeIXtGM&iNe+PvxIJ@Mw#m5glcx#O$Cwku)ZrN_YnqZT7u delta 173 zcmWlTsR}|-6aeQugnPa3HW9?AsNlXAi~GKB$zZbj7k2Rz`~-tw5UhTYNqmNZnKm!? z>K5ML#}g>AHH1hTGGsM5P5!S1O;Jl?aPS{>KMk6O7HvgG(LL`!zN#XA zIZ7 departmentNameList; - @ExcelProperty(value = "职位(eg:总经理&董事长 请按照格式填写正常且已存在的职位名称)",index = 4) + @ExcelProperty(value = "职位(eg:合规部专员&合规部经理,请按照格式填写正常且已存在的职位名称)",index = 4) private List positionNameList; - @ExcelProperty(value = "角色(eg:超级管理员&普通管理员 请按照格式填写正常且已存在的角色名称)",index = 5) + @ExcelProperty(value = "角色(eg:超级管理员&员工,请按照格式填写正常且已存在的角色名称)",index = 5) private List roleNameList; } 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 index 2a0b2e0825ceb76eb074c833e1b847bb2de2a955..391b1000e7867201316ec6124062d32d14706232 100644 GIT binary patch literal 14910 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 veu>l_x>a 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 literal 6815 zcmb7J33Oal8UAlF%bS@uStjdC(o*OEZIdz zeHK6P(hvRk{Sk{Fv&)|_dXdFTEM8{uQx-pC@pBfhuy~clFIfDN#cM2n#SUKg(i?u7 zL(eGmYySNWi%EqF3LQ~sN};0)y{XV!3jJ20-zoHah5n$>+Y0?rp+7PA&tCeAm;NfK zAsf#mjO3blCYwm7&hJ|$NSrGu*qcseb4Dt+#z^MlZtMpC6M||IF&Onvw}`A=~qXtGLngyIT?wv`;3uD<+72% zbZ#)8Ou~tGB%aM0LvcZMiP+?UEl00^V)DSm)B_WO=JzMkk?eY7XegeE7-jE~rK5>~ zbS$1+kx7rnGr0|LpHyr=x{m(a=VH*dQSE|6roJaWXEpW3-`YV3YN{%9s{IA5O|E$G}=SkhOB4;>sD8SB{Zwj+#xJNc|sD(Ey5y{Cj#apN}WPJpg62ImDAdVB-p1U$=)OyB*{LdM2*yPjv#h_ z*vJmcJVn>&Lx5JS>>F5)2m*UD@oYYcURG;{#~qf@aEImQE8)^cyTfu{-C?7U#3LfW=y-e1yeE z>0*^GrHk<%d@%nX?Np@)>GLWj=yH{AWOM~3RT`m`N@<=O<>8eqGAyzzaxC&pxr)Vl zx>}_TEWSp&1+|rLFmnIS%qNmDuEEgsotu}4Em7%j^mi8jK#BIu;dn1G5l0-z-!sRG zxt!*xOT=*pQhMf?kp~O_TD2iZ#pugXG5#3&dgjOs01o1*rA{oz4F)P; zrs*0eP!%&3ABF;zGE;FO6sVq=ii@B?Ma@)P0tKpUroy0OFo_C=jA6$k_!andFW67w zAu}X#NRK($MwbDrl0ZW=jFI39gq&{tDAnw%Fh0)F7)9$~Tw7^;qN6d2-ND#ZX?&8S zF`9&fvAfdv6h~t;7YAccrSYkb#%M|o#@Xt=zff9oXe_JGOV)Vl9PQ<(8uW$PJU{u^&`8Zpik1ZPJUd~`jO34&~?u1 za#!m|wp>9Qo!8~5){pGaf9)%uY~mY~h_S*JVBbT=qXx<_*}$MYP8c2Q7sYaSb^S@(j}tSg$ANs2}CYKo22qWeH<(fyi_ zNq&pu)BHA4s~!NURadnDlT?cYWFxidL6F+?IxWbgI*Sz4>TINTy&j}?y+NyIQiDaR z*BWdjO>YEA(?eP#lR_4$Q485f9eNW;9eT6Y#H416)TA}rNS%5MNS%7C*21J#i`1gE z+DKh`8%SMxyVk~}c8k=ewcALubPc3gdWWVlsly^^T8E7^TkiyEw%(<6GO5cVb!uHj zl52Ox)y2H`h_FnJVuKd%&=&dv5~oGHMO$$fs-duWm9}B7mKKPY=q4Z+oh=T~7lGU~ zAReZhfjqdA-%MjbUdo6q^d%sLZW1ZF1;|I+#V~CL^3%BJqg#Oj^tkAy+kjMh74LC7 zP>|jbv*`|?I^5UZp*w-mrq(~IFHnofqoBS5)GEgCEp;DIo4B3g^i`mCaS)g6oj{s6j2rDPpbqgGF7o#Sb&5&q zqz8byuws0cS>^qH{PMBq<~nlRRFbEjySS;?rmb+pcTjwiNjEif;iLgo8Esg6nrn$! zdtD8Shf#S-L-#K7E*z(0F6H?q-Ng#cWoZJ*LW2QlUVl zRjckbRj5tN%3D;m>58dRN-9*Wv})IVrV7PsS^0`8P4}BBe@TTBmR22lz*M1nEvrCL z)v2qdN-e3>qN+;|nktmDWfd%{X6bdNs;;C$k;`Yz*6U3b>f5raH&tEELAqCNzZIlf zaVdSB_8>TJaWV2}55nUYYiS<>S4(rn8T1g4i%v%lJ`CihwZc!20D15M{x&@dKmA|8maeV< 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 index 1ef94e7f64b99f053d3e6c8c4b92523856d02083..9deac466143d8a4d83304f7ac504ac21567c96e9 100644 GIT binary patch literal 10974 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 literal 9061 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 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 index e5f520daec84415e17e5368870ec5ea2b5cafef8..6039346aec4054efd5e9bc0c4ca1805aa141528b 100644 GIT binary patch literal 12218 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 literal 6760 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 Kbky!l$NmRwa)f#S 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 index 9ae841edcd9e386ad2b120a0b41d2e6a0fc4b4a1..d20f68e49116586544c94acdbc13a4a8da958128 100644 GIT binary patch delta 431 zcmY*UyG{Z@6g{&pJIlJn1s{l-s0kvz0r80-zC}gB%9eyBng}E-lqOnRPGRQ<*by27 zi63C%Uto-lA3$N8aZQZH+?jhG_nx^mK8)-$C1nORzgeml z{UweOxa_8E1uS#+>OGNtM!yL@ZqD+8KA%QFn?;H|*^AAJ v9uPurW+ZFt?)bA zh>ag0A-uKD-eILo|WcBSQeg*k`z38SU00+lE{n=my}0| zO_wcC|F?~~cXnjU#&BdIN(rH7DVb(M0uYPj(kQr_8B1KlVwnH zV(f~*Z#+IU;`qJx)V#Yf)L8x2z7j&H@6Lj>jDe-fPBAx5THg#Q(?Ul}=_-A}gw_^0 z1d~i5)Qc0O|7fR03!P0fqcSq=ZYP3S<}`aQ|Ffpguz3P?FT<`j>k=}rn(}hEy=j5P R*2X3J^y_KfW{uub_80s}Fx3D6 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 index 3f09bfd0c1f06a7716399c1d88ed5e56d3cf55fd..5733c727dc390a61907355d0bcb811e37dc2e5d8 100644 GIT binary patch delta 17 Zcmey&@|lI>)W2Q(7#J8#HgaS$0RTo_29W>& delta 17 Zcmey&@|lI>)W2Q(7#J7~H*#b%0RTo$295v# 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 index bb996577a16c406631459160b12303d51f35e220..5a982911b58d38406f849e7667e0c14894539daf 100644 GIT binary patch literal 16966 zcmeHNdwf*Yoj>Q!By*EYUX$mA5CRO4Cn3DKAQ}}F%d3J|w6zXoBqPa8OeQF574U_M z1?mGu5Z|cyED8vyZFkk(?t9yAcWv!zO$fGCcemT!cB{4D-#O>by_q@csQBN0KKPsO zJ-_ewd(OT0oO6Honjik@@Jo!bY5duIb`f8k$7=Z!3QH+`mBKj`mQh$v;amzUD4a*( zYZO*eIG@4=6uwU38x$_2@J$LAQHW4jMPW6C4hm5U7gJb6p_4+4!X*K|HXpxT6uN12 zaY6|SJrpjb&`Y6@LXtv1g>@7zqi{Ke^%Sn4a3zJSD13{;)fBFwuz|ux3Y#cgOW`^S z*HgHG!i^L*Q@Dx7a&v&+lF#Px#U|fEzqgwF+w{BD;`9mgu*yN9xe6PtLHTh#Ef1F(R z1^5#I{v>Dq)rpQMXQ73cMAk)GyCU&5t;>?VvG|%foLT4e$CI({=!#fhY*kmZJswXa zBgt4I-p5(P!dRlU@3P36HPPPIh?{9`?};sfW!KW)L{GFgxgI__>mptK=p;D!)C0#h z9~?S*=it_Z=sLN+2d!nEt{23UQ5ZrK95}jh;Ly&YXO9ftdkbfQ?npd>3}+=C`oe@5 zr{jBM>(I6v;2V#0yS)u=yLD*qGiZ%;bU+?FzVY^<{YM6OJu|p_1BTYqnTQivHV@tY z{PCxEb5`0LT@&j|Mth?jr$u^V$w(I{$M!!uc*BjoUdhWATpuzGUxu%G|VJ z@Y#Eh-@gSThUfZdq!*Vccx>~wp?$XuzVO^TcW>h?mpl`3Mc?)4;FiOKd-iZv(AOF1 zjdmuwI_UI*$2Z+SaA=n^>e9%?7st9{kt7C^=L-h-LtsAo7%VE zHF)shfkTfUy8|a2=!(VH;<9m;Cr@tR@L|r1R`vJA;?cgoWr_aY)pX_<^We?*AKU%# zvBMZ;XEYfvuJa%!6`V^C6=%JSej_w>fvS;AXhJhmw4&ApAI_DBC#|%l`mi}a{ ztMzmYmu{iFV8?bGcxT6R9znaj5i;xCh&&qYQh76~Q{x@ldEM|E6Lf~JOoonZJ-+Q> z$E487E?bSshc0FM_?Bx2@4*Q2x}s|$U5mx+C_J|R4qT9y!M(TPTH`K=+?mn1xC^6I z_SlBKgPZr&wY|Mz8bOj4q1x&A%LT_nc@K%^J?eAG_=6!EKKWK6w}QC8y5e!*!Ee=ArfdqxZD6%mV}S zXl^VXOU~oWSKqJ#>qXxC;)R$k@+6l>unEvskyst+S`q1u(XnduCp%-9^0ODNPIR|+ zL@vb!(t2?(uJmPz-nFeAiS9@&-nzQCyRS8Rd9w91EF7FhubR@QFJFS`5?B*W%0A2M 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 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 index 25db87175aa0dc892083681c8849d0c03b112534..346c031050d9f90d940c923da1fb2bb4e7796a66 100644 GIT binary patch literal 9658 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 VS*yeKv(_tmj}r9X@+k8^{||Ce`tSe% literal 8773 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 delta 1232 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 literal 10958 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 Q8Pj9`=!Zgz@*-OQ4@o=4AOHXW 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 index 144e2e3473661556f48bc546bbd2fa89f2e790aa..ca7ccf657e7d04475a63a1a36b0ca8ca4486dfbf 100644 GIT binary patch literal 15147 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 D8EW3) literal 11854 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 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 index c94c638fffb0af68ae033f99a64ffe7047b5e575..b66dc2cef8b26030aa464fb1b1384c066fd71683 100644 GIT binary patch delta 3534 zcmbuBd2AGQ6vw~sx4WI$ZMPS_ptST9gh(PWpeRrz0VNcXLqHOBg$*@DkXnzJkTsHM zG%D6bNlf5Bqd^p91vx4Rf(Ra{pr8l>B6vYPLFB04`E_=t+jgNVNi+M|&%F13zj^a! zwyVbPxGT8x!upK>u94dVxT&dpVwE2SQfeLgScfv}P;N*?fS;Atp(-HNO-sfPBM!E{ z53vr{T8Ha+Mur-4eEB#>;5}@Pz8Va9e#altjLadPsWL4(I&&01 zr^lYoG(`fj7qad#MMYZ+N9Ml9cK8HikqyBLEQgAYDRT5gtzXxAk*lX@{f5?iT|G_f zm0I`d=@glv^_yDHcJ&=vzlBv?a;2+7TF10L?dq`BZ)-iGms7h=>(yF6;p%#=*XSj8 zxq7bF?`U0E>=c==^;%uzPFFW-y-r8J;_8RAUaxhFs~^#NgVsZOJGB>R-K=%Q)sJfZ zuGZUKy-@3oT4$9wMIP6Blh#v9Mi$vO?Mbb9zoGCfZ)0=p<&vOBJkeNLWn>H9=N-*g zC$JUIGoVTx#5Ot)`m25TfaJv(wE^2nKGdq!_>h!_IqF61AQ@;-&tWIYM3b72k4Szj zQT6zk6u=ra4xfM5IK6uu=zddWel!U1Bj9FZ1m7D@RCWsurv9 zJ*iwx!b%(^Rj39$haX6l>R~*EW27pz1ob#hs#Z%8#*d^cR5M27rwFmH+JYMVOzNi& zqa44Gu2jcSj9*Fpae~j@F^n+GbI3Gs@;nL*wD8ZA^C)UV|Nq6v<(Igu3YFY{!scNQ z?G_HL7kp#!v0qRzv~(+5A@P%2^+fZ{Ma78@436!r7@#=Or>ZI=f8sA{pDM=RB!z$~ zz$s>XP{}TxCV4Sjj^H1X57T8k@31w|jj{s&k_;@8CY&XiSS}CZ9LbMuG6UyH0UVMV zTp*?6tW?nla$W^EEGSfz?uUifPSqggqL$53~hl(E3eG`t|FGnhc6xx5Ar4| z)fSf4F3gSWXzgGlG1!f7eucf_5vv+SQilC@Mm{>4R@K;a_m;+bY3Xg^|v*`zNRkn67Pl6 zHapE;FSql09rHTRU)uz9BQ;@gtj^f0_PF$_ZmRwKTj^~JrBsZkFkg?0k)Pr7+oUoc=p0 k$-v%F(n|3gku2Zw)}B}_fW`dbkDaL=Bt|;_XHt^!AM}TEOaK4? delta 1192 zcmXBU>u*$56b10L_Pp*qOJ~{wEestxrL|2km|ztZTbtk`6nUu8XrcyD3`!$Gqwzx% z@so*4y#x{?{s9F=I~FO_Qb8=BA{7-BsT8aD0(`%K>bl3=WS`&cvrjVF``mlrp58@; zgA+Rk0nFiT3EaSV992vNAsK{}LU(#;F~)pCKW7A?Ho*dC2C54}F$nbv-Rl<3)z0NH zwj?l{agSF7>y;kodA!Qw)gG_$IN#&7LAupro5$-swtIetwUt5c<`@^pxP%BV@4RmX zk@Z_66{Y1|9Vv}RUkaBtCYx>2j~Gh9$A%b}rm!1B{z&@X&>5Wd=Vn?$%Xo|5nQ7O0 zYpE~ek3->%7f**!eZQuCvwEK~1mo z!_Fn=A?G)ob2ULtpF4ZM^LFQc=QmwVYFbdU!{zUG?sx8W-sv2f9@Ok|zTJ7id5iN~ z&J)gq&P(!bX$Cz3@f;97TUb@6iqXs`nO&Wl%w{F=J#d*2C%21E)_W$z? z%_@x)n@#h~`k97o*E#&8jfmCYXUUMTD*U2DA=L3AewD(Q&r|qKir@|o<98{FwcLt7 zq!^xOH~y47^zbqKCB?Cicd8G;JWsL}|42!kXFbkKDeB{Z3sRbM?!q}-6f<0?CQV3X zd;tAwXE4vF@G>Elb2HYFQdZMkNt1Fsf)0kH3ZBJf3`>=2|71p_Dg>`>^3oQ@V)`%{ Gz5f6Y9vZj+ 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 index c4e917ca97b95b989117dcce9f6a94b28a15f355..6fa62e83a5c890e24f9ca1bc452eb67f254ae962 100644 GIT binary patch delta 1255 zcmbVLOHUJF6g^+3o%vd(1shNkqk*W2QHcp5ny3*;jOd~Yf}--!0u>YxEcGoG1z-5! zF(@jCqO9B)C2C@fKftgtQ5PB)ZjF0ghF*ZDU;ljZ z3P3i7e8@nH7harEa8^O9f;I)`6r5LZ!N5fypO+N0tE9_{T~TmV!8HXP3OW^ZDNDBj z%ZF67Nc5=Zbp%Gyx4u_#nx5VflHOgV`A zCI<1q>eoY}dH9Q7pb3|?)|VUH!WDP~79s@#Tagc!)#k`cY`MUeM;v*XEpM~s)TD_b znYLVrA{Hrib)-@eO;)+{nWRgvmSz;Vml2bkyM~ zD#;8)@d#C95?$y-gv^Uxv|}Hc56@7GYO*A}WUPkF#7AtzelkBk$GQ0fqybKlL2DV3 zg^qbFU&j9H*?%$S8uAAM1`dv5wt)uzq!^`YQ}6%M-+S^4l=4Gv@D_0Yd4bgn%K7Pu zEtcEs=7pf7w)e#935?jwizWx-O^8wVaJ0i@E{^*gN0_ehW(?pcnH%fSieqFRo0^mR?{tYy?u=okZ&s7}X2^F+{L8^AJi%t` NQ*xhi+Wxo1e*v~Y%(wsm delta 655 zcmXYuNo-9~7{`C-4fme+-fds=N-RXu(ncaI3?U)GTVVB2Q*|_!s@6P})+;sE^y;GM zz}iNd7ehqsY#JL$ZCF{`voie8jojpSe)l`yx!?J|`=$PGO>yeayAQx(o~Nm$FGY%e zhl>tHhXIF64woGUeXgXnUUj(U4qbP4!{MgGki#v9+YWbJ%3Ys(X=c!8DY33Z}PQ?Ki}Y2|Lnx->{KQnDA}nnH3e1o4RIt#5b2GWnR_2N=v}$9f320-DlI!?Q zyJB$`@QYot1RMCuZdsB7)9jIXbn}Y6GM^K?WS`73Oo{!n6eA4LAxra`!yJ%hc(2Go zS->~e(+r)8er3!IVZ@3VxnGRq5QaZZ-f Q7kk5{xl#XoG|3D90HpSGF#rGn 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 index 4c36b24ae195ad0c46c490d8614db2ccb72ec09c..c088b57001f4d683c33badb14abfe4744428912d 100644 GIT binary patch delta 414 zcmYL^yG}wu5QhKRv$)42BHqC$h(|?GQ3P*z!-h(X24CQaCoxf@L0WrD%~rmEt=1M+ zRz8Fct&gDKEFm%3%*_5XJKw)w&Ua7gv-$Q8AdjMh5VGB{u%eK2IOk1RHS(GX>k1nV zY-DY0nq084W%9Pd&SR<3A1?d#^Xs!CujXC(b-#A2lT;n*t<=5hMcKPK@lG#&-pteb zo}LGihy@WrG>8dP%^{_WBIoR4k3gv)GWt$5NNCU6kBqa!0HF_IkQs--AWN_M#X2NQ zH!b%#j!EtfBZCA+xj&6KrdYF(Mieerk~Q!|m$H8lQkeP0h{7x%o6sS|nIOT|AoPJO z#1ieToo1qqXQK=<_y_$Y(~SR+ZYhm`F3}h=Cw#v9tfX RApSIeSq3U4+p^gh3Ze*t2niShc1R$9{Dd?#DQP$X72+y%u;KwFLT1En9Rq2eD8~&BIBxwcZzB_D_3utFTa79%YR-rqSw4fk8wx)4d;JG9wSiz 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 index c790d53f86edb3bedd807a4e463d6cc8a07f5297..4bda43cc6a704bb745003b7630a8aa6222ed9f35 100644 GIT binary patch literal 12971 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 literal 10420 zcmb7Kdtg)NbwA&=C0)s~Ez6ei#cx~24@3k>NSX_z0ZI~5Oej!Nl6H--6|6*-h%6K6 zwk|JNmX-ny&4WR=Gyyk(G!KY*g`|%)>AJP+)^6R_C2KnilRer!vPYM$+wa`(%D%e# z{_y@e`hDN|{mzxXd%p9Xd+l%k>ip|Ov_yO&Kx;(3pCY1xO@vJ&n|W-S*cfc)vuS42 z!lso?8=H1E9c((;bg}7X6J^uGW`R%i2JqR(ravGC#6m_fHjCI?!6wdTF`Ff9u4Ho+ zo2%I@WpfRiYuS8&&2?-{Hp|#7XS0ICU+)ti3{Xte>*5CfT&asyx>&7?59wl!E^g$x zn{;urF4pSe7F~Q;7wdE}sEhTwxK$S$bny{gY}CajU2N9HN149GCvNkJj|uXPCNhcb z$(*3@y1NrQ6Y+E+vpv2kpG#%7FB4>J9M9xaqsc9)vDCJ7a%Coy%_s7yY-UW*0!y$f zzB7?d4O^4(Avp56L@JXXi?7e-*N>;u2;v(}j*a0Wf|?3n`O>9F&P-p}KYd{D)Y*NP zAG$bo_Wbm7=LN;q4P{5;2(>M-EfG)d8cL?)iJ8mA*YL!KTy{q?m*0(;9$a-C5tlk6 z_FaDQOyTJhg}qN*I&!kG=VW33*}@A?7LI&*`tZYrgHIOD94kybRyeS)ANo{gIJv6= zNkf7vGl|jJZwJEk#7m{$&MSq?7vLv`hp}Q!mmfGZed~Y{y78 z!xxZ(=|itxe(|VFASYQ+A;_B=UY*Ddv*P@TsS6h`zxY65|Cv%n(CK1brJxFHmFpdM za&0D`#O=k3g$w6Szx(>br9r%MlI0#;c6$=5!ntti{)xgPCrY{XayM zk0Iu}C!W0gz-JM2>g)?VbG2F6GdXqPaVxkkNKcOLNN0ERZ*M}HOkF%u*!P90i~CBy zd(i3PpYDfpM|Ld5I|APdmnb~?bg9NGCz%}(6ud8+y9ZlqYci3u)=6Fqcjl=BrMlv^ zEElV*1l5gYhf-MOld-wYBQGDI$XJ4OsEaMULAB}BPF#OeDnD+o zWmDnhJyRF=UwUXy*}V!nT^yhqw>p;`OARM8L&=qL6Yze1d7o+%1f4FH*9fZFHa?ch zpdM_>j^~DWPfVRXj77V2^w_2I?j>-#SYInBlpIawkfuYs*QGM|pm+&to<2Qs>HcGK zZ%v&)U%HO9E-%Lk32Jf2*_cer!ZwoHA*j=(D(pFhon9I_qU3P=IzbV4{0*`MxC5(d zfjjVQX$WJFE>C4r`RlRQ`}((_6s^tTu#c&yNM?x+WUqi9aIIb5P;l}q`Cy2Ygqkf{Ouor3N+ICE z(mE5w)SB6{P{qTUjm)DBGn=y(quWY0Ujt?~m2apprq{VQ3153-Y2w#mYLzRQ>oK>c zEJ529v!&_Qq+r;~6&Q1@c%-jf_nKp>Y|SyJSaZd!Yt0o5d%e8Ld&d)L zY?PAqzIEH($)WtR{@VqKEN`&ce#v&>q|fF@_z(&5MvKn$R@K(@?AUL)W!DjqJ~@yM z*2DDs~J(=_?L(%W1U*e(AArl{H;F?rlwR7`B|QBfVa#U9&Y7 z)p0V{N}6M)T2f|Gq{e2JPnql>`;tI zLD{@q8rKnMFO7TFitIk_8f0Mibi^XN&kSr*NiTPFDg~t(-lZ0olIAM|*&Cr*9l`eM zLy629-YMvUMiOHq@+iW&v=$p-!^X9PYp_#*y;zy?bRMkP9pH(|g!e>cetV;KHv6K* z)UAwKsp^Xs^Rfo=k~T9Cb>x{pI@`nfqqEsl9W70ga8!{7p=jByu8F#CXl>Me*XnRd zcQ?{nHdngdjb;AgYUZ=@2*oKYo1+_3e2_=n$M6+gcY^f0bRHmBLV z%4U+yf6*@l&6};oauHXJr_$D=jNx9sKD#Qf2#VXq9XLB<9h{0QEX2tOq{lj}bOiLr zI%Gludt)6)NlW-~%Of)ro=~i#BsVb?jCIUpCx%rR+9gkpiW!PgZLGtYqnK%kb(Cc( zro*ugSDs=L*DlFaOx49YN^=!+_51}&vlX-L<+ILw1*55)VPz~_qCY4?^o*e1@@Mza zWIlnn0*Uyl#8`4;_P#;%sVEc;){RPKCqKR+8=oa7)kI_0B#9;j$ zB*y4g+OU>Bf+2QYIdhYPxtWtW@f-d;VEbCa4_#>W)4hL zr*dZA!5nAiPB2lz%9*r3Fn^Pop9T}fu$+0ngZTh69|RK>vz+;` zgSm&9d%;9mEoVOBVEzs>9|aS&x19M|2Xh}YKL;iXbUE{YgL#mdp9d3FyqtN+!TbU< z9|seqzMT1_gZUIQ57R=haO%Jw#r}xnQ{dAxaE8Ro02+M})@x0M==Xqwl0d&tPh%wb zM1U<7pC;`km$*qO#tEVjSGdJ(N-<6zg}Bl!jw;1Cu@qvDTRfl?9Vhr5Goq zLhN&kuThF|vMR*7TfAH;#)+&D``zMIN-<7yg*f0A->ej)15k*o+~W00F**l@IOrB{ zR*KPaD8$un@$E`6Iu(Vu#x1^6DMp8*5ZAiJcPYi_j1=OKTbx#k(NQVHb#8G^DMlxz z5Qp93T}m-JIEA?0E&jApjLuIXZg7hqR*KKiSzBzPXlY!u1{S_bn!1QJN`_s;xWLIC zLC`sMoQk=|ksXAf^XfR2bB!bW3qcpuaXfR4BfAeluc_mB=Nd=$CW0=~>#BA3%{7kf zTm-$Lj-$^tj_hj$eN`RDKi4?2>k;%db)3LlQfgO6qc8G%hNFAqPu5o1lDEL8N?)SrrD=q;);D&M5K2?{PUDkrI_$S_O~D2C}Z zJk0UFN#O~qHav#cL7H#+K$>srhL1_QP4XGKgVb#LL25PwhM!3Ro8&hF4pNI*1yYL{ zG^&^sv`Ih?Qma`FQma{GR5Pi@CRH0X4pN(03sRdIGHRI=vPrc@$U$m1>p*HZ!$uvG z!ZxYS2s=m}W<5w9W`j}Bqz0Q*Z!|baon{22PP5U7FsacdMT|xVsmq)PQkU6e%wtlM zO`2ykIY`~60aCX)-!Pao-zFKxd;|dNj2hicirS=Z zBkCaan>`@)n+uE{CM~c@J;nkDX~66SX~66=dYRN`lX{K5BB}DE>#@ap<`G9^;uqTm z?QQxl{Ry^3MEe$f56?jwMYVJEr!iO13et}>jeZ1FO+OL8q`v{e z-(JPr^fpkf@QNSOJ3t}PBhJ#_0@aCy;uZQaP*~g|9;2TC)r$>cAN>@l0e|nv(BAD_cNdlZIBMo&w)C%O?XiLXP_=Ehu07P0@SVT zq9pw*P*i&YuW$Yhs7E_WH_&@P3$)kpYUkg9dbO`pGyMlpA66Q#Chex=I(%~T=i%z4 zyqP3>KTq*y;`V$GVfeWhZyjYA{I`Y%9%-J?vgMU4tcunWS~h}uriT_zkZ;i>ExeQG z4YQIRMy2i1xynh`eA8pOP~a?)Zg`5WX47lAyfZG8J*jFjeU=Lq&sO=0u2xgGT>6X) zbx^9>Ouywq3A9!IqO08uSgyc~3x!dtI?O7|g_>xqs*0{oGibSjGp=CK)n!&&E)+>y zRb6y-n>CiJX2ylmDX$eZYb_V5rmdC~y(1IEPNNF!&HtwN zkv<-z-!FkQ{A>REMTg6GdY2liX7YFhGM_d#3i=9FP z(&>4;#jXJI(>KKpq7o=TKgQ1X09DcZA|Sj#LD5J*7e1hBv4nmgbf6lsj?M``P_5Wb zUlakLka&-HT;wX)XAW#@pVo+2A)r;@bm7)fyLHrCmzZNKhe~H3dV7VQz>op*v z_byOu>ls=UzG9N%yese#UM#V}c!|U~QsUt&C2nSXmBctj;^C_$Zk?p1;cFzu!Lc-a zt;Fq&KOiyAilyP}B<{pV*pwK@Lp;1p;%??Fml!8PJiJ2U9>&*8j6)zE{-DIYjBk(_ obw3_nDRDpJRTAT;#lx#%Ch0@&$Im*)#Vlsam~5#Ci-^pyVXRCUI%V_w$F$vLvsSC^Fihv?2Onf} zgT(*fgH#9+5g+{rzT(d?^_;6eOeB(%=RD_mpZ7iQd(NZgS1pClKi_=-(1~e3mLcwg zL_)!c0$ag(1s5bn{oKbCTvXO^#gYnA3N9%~t3XELvLAJbo5-p?XCklm2@_XLTs3jc z#H13gOWg2C+}_Qf zna=YJ`pFDL@DTgRyhvgk`^hA-uyKIQ#4Kw>$b5K)UJQ`=@fvM7NEX0*{#TUD!Xb_v zLcKJ9U|^xd;W;do800d=9GZSp-~TDf)A&HmlF zA9%{yms`QYF&w9A-~mpMY3%kkPBPhpAVzVDOy|Q#aGK1ZrvqomyvU;wXUU{H$v5~* z6m$+E1e=EtC6=h2H6=8_s2D1qf<9j>`@DbnDpnnTt7WsCZ?5_O5h$mam6Y{#SC`wh Yj%u(PP$ikkhZ=V7S$E|*ex8QdFA43DK>z>% delta 556 zcmXAn%}Z2K7>A#8XRhboJGYF9FpQumT1W(qW?5;DIrgRYp_U(|mQ7isY2#Q;1(HFF z7Ev6kzrjTdnP?H>B52d1zo1pi7X1TJ^uAXvJnzHrp7)${U+%}9uNs%W{rkKQ9OP-l z4#q<)6N*X2b;S+El;vh5wWzqIOK+=9EAA-nDoXld#xfhRh4FxUTIT}hwcZaX2P_0s z0v0uRV0oCbJX&3D^J?F{e&cfKzxyuG71K;hOkV8}tucocM>K0wT;!4)@{cxFd2FcP zziVo7p)xmHEDu)ai|sL0p12i1XU1wj{I{Mlt{mj8;W+IW_cig3#J7i`|FzYgz?9xfPCEvyu3gqzEON}1MQZ(^_Q(|f1Yfg*#^zo82 zVs*?=;;fjZOp$Y90dJ(US1jZ`owBx@h)?XMUo69#O!K^0EIZ0rHg4m7XIi%wBsKEL zBsNn1xUTqJa>rkBwlKh;3LED&Ohzpv?0z&0YqA>*MP>K&K^@##%(@uC!i!-ecUZU{} znEM6%3Pv{?W8&78U%{P;2|Hc5FrGtOS1!(-|M{KA{onbK{M<41<6wC=PL;TmSsv5E4ixNk%ICh~ir}jRl_LznjM`7ilgljOcGxQopwn zor9QQ;xOYewCZEX9?kvYj?w>ium!zCetToWU^laf=%3^&SD&}e^oWgQ3>V|TC5|D) yF~Tv%ahXd7uJD!o_NKkAf7bF%Yh7(EGyLqPnHD3=qo7mv#}kcR*Kqx4=Z(LhY;6eu delta 481 zcmYk2SuX=&6o%h#bj+DC;tID-+-MY4kr0}wsj-*Z_a)U7RZFL8=Qr^E60ux}5V!t{ z#I*~-cZk%@S>E@YCnx8*>a{Zd@_GLVpb6(Dd>FMbhH(R}1|}>7Fv;Q+hiMKo24*do zm?O+{Ua*w7NLb>$tdxsr^)MmL-Wu<(6Y2;XY-bp-NvJ1ex!fW&5VpD8Av6+pxy%tl z1dq$Sfjt9-tD83=Z?%k!l)RVj<3J!R6Ixie5y7F%`RbA`;sU0V%X-fCYO2A;5sqzi zBBs<@Z!eild0xauKcZ}%2pBg7r}GOBlw;4=M2tlNwRI 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 index 1fd6cc33f322c8b14b032468c17ccf1958ea5616..caea8d09a7fb6f3a89d83e74785365f37b3f1920 100644 GIT binary patch literal 5793 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 RKFn{H{(KOx<3kS@{|{pT)l~oh 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 index 9d87ab002cb9092e917be722d71a4b0e5656675c..d430582d36af4939e1008a1694bf3fd98066507c 100644 GIT binary patch delta 1597 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 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 index ce466ac3f30b13f8735428bbd76561f80252f441..155299237b12aa62ae56e0df44df755fbd2e0d9b 100644 GIT binary patch delta 751 zcmZ8e+fEZv6kTUJ(=)9Dsh80v5>iu4L<@>2wpG+Bf(5H!xp=ojJKB+An@$sb>qkst z{0S2cK560y_zfmL`QoduAg(h?iX=08uf6t~J?rfAH0 z+JqRG!UYQ>7_~5=&}oIvsBi<*!I+-Q)ZtmEICHceBWGl8x8MBg6g>JX|Cf!AVqciAcu`rZGum(9Km`CW@kgW4J;j(Z*4-IhZKW z+$mVn+(f^`wJjW$xX#BETS)$evE2~kG^UP|W!Ax^@i-MTKbYq@!EV^hhwiyJQp){k z@XoBzeSa+7oxx4A2If&D(h$cSX8CahX)a-oNT=T;xJ6`y{$3%vO+u$XA?OK0Y*XH= xHAUDkb_6>b{eLQyjoFCq()FZ!S*q!icNx@TUh)nPrqS~t^FHzmd{aK|{sD*iZ3F-S delta 457 zcmXAmxk^Jp6o$V^ZZbF52oebjiYQu$xbKM?P2Bf=-jHQ1-iKMh_W0az>1YsD{Go{PwIx1P1~?#Y1_(< z-R^4kJi;uy?Av-^<)X1CJ0eCFnQb9O?Z=AH_V%A|bH zMbF=>YRBjg(?)xkK1&^zI;|v0nLQ`wUXTuR!KJx(8vL`&72li>rIdLHCbgo6Zj|{h zac_xJI$5slVJMnGX>+gdOfeWSlWt^vfI;!2+!CV|A5CP4i|40>bB2T*rkP?`D8M3P zj0gqE(m+B;lcR=FAy+zOcuD_qS-ZI&aYxdC?K73QIqpB)${UEJ{G8xS|{{c%fYLuV7|^NvmCVY z-8v?^hB4sb6nZ^eFzB>FXH2+(5xv{)S2aW)YIvb1>};ZpTPsWUPa!N_a*KQWxUD15 zg){`$J_k#`>(JdX-5=9G++t=^eKe-|H(2NaL|*sE_adRc$y_^+K~D1V1_hjCzZ(&T z$R%(bRa_*pF^UmfB63j1Ra_==QO6NnA(Cj|5ZOT}6lv}RJgI(Tm&CO-9FVxqM~O9L zHehl)L?4Zrb@I$McraXNKoznDjuY(0%|h&+heOJ^@6~VB9Nqs?x%Mb-l65eNF(L~o zjHASl6Ugxp#))kDJ%|Y+C-(Om?m7vZ{)C_>2(eCir?w2?!`TvSY3zTgSa#NjyG_@T e{?AfPpS(*wl#DXBxtK-IS>_$&@9;g`#NEFa4Q3z! delta 489 zcmXAm$x2*76o$XL-nMREuMk?ARt!;zLJW>^Hfn6=c8K#F=kA1tCc`ehm{?VU5`DFeS1659BPgf?~1uFe^6M0F5Ur^>g;?9Vxbh=#GFchCaX%p&8^WRID_g-ST zhhFiMoYF@V4)x^e7q5iR9Pw4iWs(U7gksDw%%D&y1?m_Q(u7p=O~{i@Sx(abdHofA z;>hxLtG8UPO)|b8<(|hA9ixniFCW3Ukb}>Rq}be#^6E(;SLUaf5{gNuENU`-zH&xB R(qWblQp?1jlT%yd`zz*8OXvUq 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 index 38fc931fdbdfa536be2ec6185fcd0e4e341b7428..f4df8b497b6fab651c04ad07b4ac0e4e5cc41dae 100644 GIT binary patch delta 803 zcmZ9J-%ry}9L3M=+O;dyfB_j%K{KK;frQQJ42n9$De9CTQ~U)|SOsOs+y;n0vX~g- zgHQIK&_~^y5B>o@@$QrV1c`}?=UbUWllI(mKRvxY_jbK~qoexe*Qd__l6Y=oFQy_e zaaUwo#1)wlnKhBOIeH@ZMCK$vFYdm`1Ca$`1rv)lnlWYJp^Qr+MGKE)ELkX9s90FG zutH#9)x_fuFTbjm=B!tlU&@cTC3n%Qc%^b}QfpDIJH{*S>_XNp=G>Wr#~RGn3ZaG}$aU>iZLDIpXOpnU+7*Y<7i;Vg;y|-fxPaLe_sY0Y@|8m(Y4d(|0JoCTn${5;5QP^ zD#DvAud|_2>;$DY8E?!r0bMZafqF*&7X`6+8^YUijp+ZBY4+s5_ft(TqBnU`8gB6` NKoj|G-gnBF{0+u5bLjv8 delta 513 zcmXAmO-~b16o#KW?Krp7F_H>_Dp6}(LZStQpeR*~RsbDB>5kwCakO7+0>i z3m5(aceOhc+_`b(UVjHWiRaWz?sJ}bb0_benZ5L{-tC|J-@XH9cpK8sVuFBsiu;Ns z#RJ8|fJdRsWyNE~itewdtt!?ORn67|o`iI>Frs)J;zAIsAAgvi4Ue5G$R_kHY5g4H0rCh zLSrSNHkuWuPg{zYHutT2HcyiPxlaj?4VUufOah4^yF6L8Zf`ZrqK9J#tSinb) zG9_kZr@XDS?}lTC^O6|3rpf;A<%jD@ZgqM;CsRW+9FyFq!Ywh6Zi?KNXS6rV9kDpG f^vcp+gM0wD6us*!$`AG^aa?9n^0KVEbr${s>9S3r 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 index 519752241926ecb27f16356e71468d0d65604c8d..2ffa57fe4790b57480229bb0ea157144748d6d6b 100644 GIT binary patch literal 8705 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 Rr+Mwc%PMe&|ExBg{RzOJ%5DGv delta 658 zcmXYvJ4_T&6o$XM%g)U1&H}C)O^gW!YzW4zr6%YWYK)4gATHwjg@R86AAqX@KJWqS zprEYS8XJp^nh--{XDl=!A<>G$%Ff10<9{b+a=-h{x%bYw=VT^UeyqxW`a3-XWO$ii z1-)_N^jY*J%+L z8_4?Xp(Pk{s-maq2wpiEugD9ZB2&S<(`I@~_3p2TF+nDgbq(8TzyyP#?+AS^^hS0n zUYoRgcCk&~ANp>Z4!zpXri{&rVI7#Cr9QvT1Y^l`Fr7;0_mb1XV&l`wdLq>D zhkc4gspU6qvNAUFjs3Eit~1L4nL{UUIVf|v$QusHJPM3*SQclTVUEZWyrYAovLqik z&M}$KcQ(m$q?oT!OHN434Ql#HS%q;}M!T$1sns>rGgrQLVXGoWkGl51l8wRYiqByo zsmgS&lQW9Pl;*4~qSWs>r!!Hinc}>xjCuyRAd6|V>*BVMODd{M<}$(>z1c!uvxIJ0 dTwm-7ek_<=dRc#5gez(aD#dVBqppi<{{V|pc~t-a 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 index 75d1523fdc30f1a9b1e05de1bd944e6a39cafede..87846df82a5427d1d207e47ff50ae3e1963b87ef 100644 GIT binary patch literal 4190 zcmb7H-E$jP75}Zgt6fPeSyAJpYC;=YL;V?rmaoc5p-ob7v0Y<3CM|__Ep4JrB&{Q@ zQd~X?EwoTtC?7L03@;2b%}ZuzXQ(>^3O<`-pn$-?(7{J_G?7Jg{q6$`J5`bQ>yY~nQy#je}& zoaVOM>3V+q!tyx{+M^osXZ?0JaN5DP)9kqhLzW*+L&~euXyuA?-KjL4_T|co-@d%0 zp}f&+2VTqF_PX9q(|xGj_5&xN%dUpSm73qG>^OeQtNXo5Yj1};-Q8xdTX6=s%9caB z(m+Kx6*q|j6r%zWqajie53&EOVT59qCu$@{u~J=f zul1ZJpFQ%#$9Ar`wP0!X33A;ZWk|HeTKhr6?J#I*)wGb_3N@ja36+XpS*2EsVz@Cv zu0v{nL^m12Mp&m%ag_qasaI5>xJpH$C>cef7WvJK;Zm$`T-C@4Qv`WvO9!VoN9gjCR9S_WyR&iK?uNur_ zwCVRcHTMy($@4QgWcEq9Of*yubj-taghf0L895?Pb$CQ<-l(6j@ezE~#v)GIsK{^% zAG2|v4EN)thIzS#4tUyZ?BFpQOE_&~O{6n;(8gzE_$(f>@vsbMWmyBcaddbes%#(b zdCj`;r!dTO#;c#P@e}-1hM$pI3n!$kX9!w25i2Ye`Gph1(yH~axLngz%1cR`wb2Ie zq2e$EMPdzyLzU-OHp4sKdseO>HrLtRb=!=3G3gk_4)aJVtoI1Me~3O1j}P<3bSE_2 z1rvAR1lJnw=369%d-%s*aeXh>CC)R{%yy}qb1{zvuGq#9%T9(fn;FjRXE?K^oDb2K zt>^ejt}2{0&c@u^(B2GTpW>Jfl_h+dvaJAk09CFu=`hDpGmFgC`G?@cr&c@vD&WD%_y^=mE(mX;tL*t^zNIr+pC%K$Bs7v9QhREe&=yEyPrG8MCLfL`K zO6c-Yd?6`H=XS2JFSMzK>iV zVOI@8>}tAf2qygwN;i-%8|8Eil&_iu<*QcN6p$5x%(4{&6{;D63e{{mBcN;q%9OJ) z&}217&}7vv=LBR&AWAV%v6?5SSS^(E0xCqHe7VpE={K4G1jg^AU#hwcczz4(_#z8A zh5uk9JSo%oCpM{@z#RU8ElN6x{}wJ#GO&u@VVhDKO}vILQ8LlN%eY9%;=AT59;cMS zFW}+{N?Gia@L#5s!=Ly*dy$jbr#Kr2?K}yepV8ty?IVc=}x&G2!sn z(%!}GO3eIUV*jA6lN`FdW1~~?0MnK0zz|kQl~V7klDZ9yL6r>FMyeDY-HniLd>d26 z3nnGELWYiBFD{+d&xE8pUR-LBQdV*P2F%5M9C}*xc2$>+vL5YNLNv9NuNvVNITjjO zWuw1UsHVfM^k9q3Q&y8zGu$HSA}h1MRjgX!mNnQS6=`)mnHW#145E}L@LM+U67w_g z8(gN8Vk>`*2FozPcj^o9DCxYP8@NKrVB1&Od?7}_@1Q0neg)zvT9hnlu68%<_o&d> zTuoy``7hpkbT(Y4L@@=U59nj`QB?#>$6!O`xHbZtqu?PvVIwlJ-e)qjO5TeMGf9R+ z+Yj8PIqS_2EX683&zj2@#>GFP^!VGjt#o)FQ$ntN94Q@DGVg?`((Ovli(FPRuYn__ tJCr;r@-ZbB1#_IkK0Y-58jXLnT#R^-f*&4`UC7r{j`3XMAHSYD{{wgZ4GRDO literal 3343 zcma)8Yj4|R6n@;sv6DD$mfgrUSYd^=O}nshPq)F=c979_qwNYCm(5Mw##<71iL=ph z9ZU$p7x;w44`5%01Ohq<5CT37i9fI(gM@gFou*D?q*m&A&wI{uj?c}<`TO6We*d-UPHkmeL1wO5bM30NXgBPoiglt^b6nG<%Z7rn>7rB3EtyW$ zE;-Fyb!~~7#%iV6$eC?iZo#Bop+sNmHF>Clh`YARV{}XAh0+4iVqKU$dv1Z&HM2_V zbRgDww{CmUCQ4SLShrUtKn3w)-7;Nkf#J7vYr1wNH%Tcy#;cBNFR%If=ux|7yT=vu z4h=8zDHBeKR{hg<&6;gim#n&%hdkFQvaTkp%e-2`h+DSX1u2RT}gqK}BqC@2U?nyj0<_Z0YiTh&zlJXQCy%xQS>BwzL-L+0$ZhEj^k!U!fD;>& zA--7W5F2 z%)oIWui`ZYyEhk~o@e6T-x3U+uR+sVy)tJc0D3xN$ZS68hX$8ap{jS0MD9SN|u9r%sO z|6e>F=Eq?#6zoG3d+;D0BEO%@yaxmPXJ2?9o&vPKNpE-Krm%3+eVmxSz;Y{m5L2pGi!S${=*)rEb-a%%%7_ z749dxRX;M<;)m;nl<_EQtYMOI-OrAE12u9d`v9VN*} z#{NPg6S;?Nw_%KBBI}56AQE|%kVHP3Q3VsdhxBbEGioLp02z6WAS175Gy&-?ke1N{ zpkzKqP%0MwUH5Y(49G6?}0EfBd4P~=Y6tLDF_xBQgbgL5ARoMu6G z;!nKHcejTt;|EMr*2@*~EoR6?ShO!NOHSqeGn^q8MFm%ImK=Yk!on-$bbQG+&5?`Y zD~|I#xj5Fjs20d2@GIBVIdTR)a^L%H;Hu}3PsXZB{lkOyr(JCatuj;zT9I!;%gsM@ zqSMXisqv$cV_whprN+zbn4ZeshBmg2{!1cHtW4q;teL)%N1V6 zo8%(=0?yzqaw^eBaFJXTE_UM*IgQr*MzsoYjUHrKPyd3{`McPbPOoFT)MFhx(mQ=V z!6UuP=Q%Ok)4P2>DVPU*zEAiJ`E~5+USYwVKi$ft2TR_>6}^v6f-#i%&ySAvAI4IT Ae*gdg 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 index cab195532fa643305bc1ac4f982225180a99e48c..a5368d263d0e80b5dfc7c32ab4f9c6e7e8ddf2f8 100644 GIT binary patch delta 1327 zcmah}O-~b16g_V~I@4NA4HQg7gAx2_l@CQhiiip*Xcd8?C<+6NGEjuHBpNs4A7DXd zsuGbMJevKdV30x*vYOc?X~! zOCdy&3PQ)YG}olLZeSwB^@cPzWx}LHx1_l(-6;dpA%u}KVaatynpqQbCTtUTq<7cA zya7iblC?9Al^(YrKEv`w9SjrT+Ot{%i8@3T5sKY){Aw4gPN zPKnwiIx5Y1T<{WFhq-{oFcy&Z9%_y16%2b%v~RA!9!_H$1ordSki`MtAt~J$AGL55 zT=m#1i01?f;y4NEsn#qtDrq7Zow;djBt~smMTrCZB-EL3YKR>GURz$F5qofs+VQ@>;RC zHOf!0ohTllo13aoii1;(spOeO50S=mHGtDZI+Ez+C&8Jdu@`5E3}mniXNgRlBX=BO z!~BKq2Kw9$)EemL*AyGrnS;TturSju%GdakynL?0pQ#>y5B(`w%a3Aiq=g-od)rM7 z#a-$qW0jCMf-yOfX79B*U11_U>;*{WC!%5mgBW6sj$vFRQV`;LiQFpo@tP%xG|r_C zmx*-0=lcl!VL)TgLaQ#xtNtWMihl&7tmGfT*k9Acj*$QW delta 996 zcmah|OHUI~6#ni!I@57XjD~grzCsmkMXaLK7a~%zD1t~)0TqO5nh;Iejk{U9U}0|J z&bV~rLK2OMCPud|O^hqu>DnKl#_x0{JlaWI%sJnkobTN4JnrYzuWiAnzi;0I$m5=e zHjE`hKg_-8(t}p1V*tl|bmO3pqk?(_ z9TIaEgZjDE=Psh+V-a`tPb*`VFrqix-veM16qti{AFJx2SM+xF4b%#Of&H|J#?P(D z68m8QayY<~k~?WPl3&4i*+g!SBNs(y4BKpG?~G$heL~hB5~;2=nVqq*c^q!U{z;_s zYq4QTDV8Zkh9wE=z;;F}9En)tPCEEMD-*GLLl$$MVCF{dZ0jx$6qBe_?h24+*mMlp8oBkUJV^IhLbdsU51mZ(v(hEbjs{WLi@(^^SC zH2~#^YhnWDFhmaD7m7p%JY1x1sicz~9wxG=IE@QLHY2&!a)W)a5j*08J3LZbLWSJf)&#~K0VqoETduCrq%2|NS}<^?yaXd z>7d0Bh|U~ZreT}ACk?Zx!NG<5?s*y6z-IT+dnGZ+9al>F5-;RsnCA@`B3Opx)&xh0 zqgdhG5ga9sq0ISPaEv%kT<{IET zaTcq*;FsVmagM(8{$X~GI8S^nI8R(4?)yu@|EUVZYgl(fnlqTwz0*D>w)l<`Dp=%K L^McTH#MEs-q*g_vwK0bju)oQJRx zLADE+%0k4#2T=?KdBjzy#eXBG~yu2X^# J>Tj*V{Rh1~KIi}d 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 index 2cb77e8e6c0e5ec1e4a1298caa9878155bdae6bf..8feeb790d10a7b8600b0696da880eab070106aed 100644 GIT binary patch delta 2695 zcmb7`d2Ccw6vn^vW~Q@rrt7pFpsh=5Dkvc}BuEKRg3*X=Kxyiln4wHsLTjNN#9H); z8=|6?L0VC)JMLIU5Xw?FL{SvA3C0x^<6owViVI-MPS7I`k2pQz@<;+Dal6ISc6_rlHKjBX zt*V_rCtMeKGrwIDBp^Q{aA#>eymYc zhk8GvSmMWxN?WSTP0BPVbF(sy$}Cgn7ToHGspvLkmMgOj?SiaWS0HPgATYO~J{qYh zsjWPB!ThOy@rsY)`Da$tMZ(cY*@Bvg787H~{5u^VVR3wWpwSQ`J}D(#E~;fpCnsSF zQZSRFgkv_x$8{XnbA&l6I7Hnl)|Q?go0nSP;Jq}rl6gJNUz2%D z&7;x^9K5XNax(9%IY#EyHSZ@g1DXTr1r8=c^DHv+p?L+FX(1Omm>I1}u)x6tX`V)A zo-{WG3tYG34j8cw!5L}lx-QYz72JutD0kVi%7EZ*te`w8qt9CEhKPR{IGL}gQOpO&w*WtCvT{aS9dWtDTmDlPwH%c=~52edpPt8Z;p8Nq{i zi058v%c@v{Chgr}%c_2Y)mnCk`W8_o6~weWJ2WF?rK+dOY+D$p1f2Qt^`QxdIAZ%o z=b3BK%$N)#87-)xL%sn#Ld}73@(O633^BPF0(wqiZWjXK$c$4MSE zNerzdFPdc)o*?L$IZ}$8 zgKlgfrOJ8u8_$!{WEQ@}3#4?JgHF6i3Q8?D<0VptEWt*+Ov;os%;hVjELq1=zDf$o zHZ0_PGe$`VB6y8tj+Sq6G1`b@e{iIi1 zkm<%7{CMO9LOtj`ZLHKwoPOMpVXz9nmi^!a-&|~}GqQ_vTX+xYoovy~!q*Tbc11#Q zygGZOuq%${+axzz zxeM=*JSw-Z|l&>LoIIh%Z#Gjx;PkZ1q6mdrV(iHw!oDA=O>g+nl delta 1205 zcmXBUTWl0n7zgnGH?!NBozAlDZm-r>E=x9QBU!^kX@ayNsa$MgLSGCoh&FA5Af)?0LX`!eERPLg5Ekc2E5fF-(Dh(QqQlLB<#CipT{?Fm%KfnFX*~xd#oSC-S z-%opZ;9g%pfVkKezIGrObWno90K)i2#kVRhGm_bpqZY0@{5h=RnwocA>4u6C6*n2l z`uM~W{A%I0gD3`V{HCs>Hhx#vKWzMI<1ZV3+sR9XHcMh!;yd(juP=4h-|S0OIa7=| zpP=2vA}n^{DJ?;Ri={}oXjHWqRV-8Sl8Po3%_^3wSb>!;Rw=cpSgoQLhrMC9IL|L> zf?)C3=NhV?O;lIa)mKk-#V?i@4W2MBU~y_BxZDs)&C7_etUB=G;fObo88g{~wiS+< zY=tg0*^REPVU0~`_tWf6`!3BEwM!x~lbvce(rj3}hi2c}w`jJnU7Qs&xeDz%nv2oi zMRQHsH?m^>HFz1~g|f>n!7F%`p0B+YuhG5Quj@H>j+*m^_FV0C+6T4QYfG-0^QLx{ z_FLM!wOh6CXm7wq-oG+W&EKT!+qIM0quOoS75U{sQ4f-bs|GNeQ{DNK4Db28Oz&zz zq-8TYIFN0G(205&h#J5a)=WGicd(W6;Ys-kU6db{@*TEOX?Q`7;BCr6gY@7X%0^N= zyh{bpDXr+H92}N~*iNP6xYS|?<>E(~iJeps*IHyc-Xq5dB#QT`5D!TaKAWHmIKlzHG~p;^z>x&{_$Lz+WG;?TK0G01I8OQT3|D%BN<%^% z^ivj}?=769Y_4nwr>FqV@ouLn2gBUxGgLb6^4xt!xsrogoTY*iACF2-R@?d%9>;kq zBsIvz=Trt8S~C zcf-%nxP!#FaH9+N?p^sC1Uz??6iH^@_uTWIx%1q+-u2aMecN371mF}F;_xsYLlhIH zOqz06;$EEnz9|n(;Gt2EOnGdUQxZ?&a51j%)bwYjOe^>bGYS>6s!9X`&Z|aHFH{8* z#pnKtpQ-svbD84u(udX;(UB+x&H3eO*{}OAf@V-}=)Co-YwtwUuPm1Qmy`ZXEg*@6 z?vHHtT*k1AejIjj+NdKKaB&pJTwK9bfu#O!C-s!wsb(?fVixmy#qJfwkE`~3AuL^R z@|}Y`a8#fh2?(6P5G?(!Z665jle`j3|8VlDf9amk<}YC(4T!AnldB@4Kg)D$1X=Fn z;SF-=%=oTZAQgo`*w<)DUMoTrkgV?QoXDb9caxKjPbK8gGW zx+O00QDOtBzcRK{Vvu0wI3w&fcst}CR-*@V+)i*B4s#(rZ-|zmKd#@ZY102x>DCz8 z1i8w%PGupEn<(((2$Ms&L1mLNN!QRDzSnTJXxQWvf=m!%i}Ci_GKPofc3?YW|8Iq{ jj0a~&t{vU&GEL5+&c+r~B~nQ38&M1uj{h=McD^B9MiXyQE2aX=hUj41Bh`2*#`oxfmkry>Zt z&@b^H1o4$p^nIr;ulm03`UpSeUw!^Oz5osEI)oVy;%CChq>(9$X-Ddeky+C)XK3EY zg4r%wEIGK0+bo;9Vr123&1T(Z!|XOK(u%YNTkPmNUx|u8y!!5yQaTfeT8eu4 z2BqKsxREB|h!xFM=2a+4L0S6Ly45%SkS?-AGp)3VALf#F%JERfJ{{tDC3l-nAs-{e z=o0dik{P;%0vu67kB~)%B6@{v>6FnW@!9UoZx=_&l9~T=$?AgO=3nl0Fw`)>p!o8G u84~i~FvhT)@yd*il4o*zDU@uJtBC8Ea~Mg;9eEffA~i?cF?o__q<#VR+eH@u 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 index 3dab225be763910ab435db59d371b265fe1391a5..dc1748702c09841c303f2d8e1cdc2f71054b97f5 100644 GIT binary patch literal 9587 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 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 index 7c23d39d9a2ceaadc2d849628f86eceaf14327bb..1b7d280429631cc1ee39ce56a2fae93d0ec36695 100644 GIT binary patch literal 2149 zcmb7FU2_^$7=8}y!a_(wX_6KbHQHDqB-vD}wIr#gX=+m;iJ``iD>tx)ZGolB(pvw6 zGtPMD4=^{q(3whSbjHz}I^%Efw*SCOYkkh{CP0caI>33~eb4*xoacQH`}^NN{tVze zK8hoSwHOp!k;{4%SL2lL%H^8e+mPCIsl69PA&xlKG!&)Wl*^WeZ4K{Bbtj5a6gLDy zRz)CLxM|!m^qSGw*9&%Ie@P&{({8v{-Q2ZW)?UqAZ8U7xa4oyh637-TTW{Sp_V-Ok zH@Z9eYSSv(6|=VO*iF-M?=g>h$EdYU0i|KoDN;R^O0HvhwIYuXzJC1GmjaPxt6{m9 z1j3o@E@Rf1OklKNHO$R+eb01m7{ns8*kz-(YdDsC4vdOhwFvH9p={UnigBB{_0Jqu zy=yzS^om_KtcG57>Mh;;+|}3X&6<7BGFkEtt@~xuL^tj|)aXc7VHX7>^2-T|5 zs`~9C&;3Dz@r@DjfW4YY6Y86S)NEb!Ms;ngN z0e0o`A-S8ImM2)@>9PsDgR|^nH;+%Xz?f&^O(>b1!W`Or)l(2Si4Z>|kNO1vCWa_a@prmKV@MME?8YQwG?I0$FEB=@6qM@h zLx}IGgzzHQh-VzeH1&k?h^fZ?>7jvP8E_gO3aO#iO=7>;AT8LUKvAGASb;)mD+tI-1s~~xgi#a5Ov?EH zW{em>0uu&CrwmA#@CPQ$_ygkF?X@&g(%ijw&pB)DwI6?)_nKDDZccv!7{Uh!Eyy;) z#0xPKHYOeVmtv;mZd#%liC)>5b>JZD!<_heF$+E{`tVx9H#XkdSSqcALS`ZV<+FyC zrH%ZLd}1?SSWV=>O$L9Tl%`c9S>c!BH$v3Hg&Bh+n%G}MJKvk^hwl> zh)a#bDq{?Wm+{WUGTv*j2fBoRLW34{F^-7ZHueL6E_i5wGDXdh78R!jq~k;yxnjoDi|^9?`k_Wqm8&#V*1o=~`99 z8ls316F?4ec2s9cvl!r+!EX|Sv?dlf%x8=&jxfwV$0*(e=j~-n(@XhQ{5Q;lYV||4 zbE}m9Z*DTdIC(@hcf{k_QJwbO$GfVNd<|qg)do@+L6R5?qx>bA+o75<@)_u1FH($5 a-gCQzSy{ex-|Z^+Ylhih-J^6_cIGc}J4)C9 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 index 3d34da44f6c4d6ddabdc2978c2328004af175977..2a1a4f5c0a6e8786482a535ba4570c0de3888ca9 100644 GIT binary patch literal 3800 zcmb7G>vJ2`75}Zgt6fPeTUO#EB7ug~6hB!gZ#kiayc)0)69?1KLfKdwYZGbLS*`Md z7E&nBGDAOQrk&}>h7aisOsSa(EkpZ(&h#JP4`@Qk|4<&kyLV-+~qgO=XcJY z*S**O`ugf80Pe%y1v&|Fh1-0R{N~IwB!Vq-P2gRm))9Qcbap7zw89zdHT`L z*v*ckK=tevmvZ7u^I_md-!i|v_?v5gd*}MQ@BHWT`wDV(XE{7XI6q~6@#f3dKlsCq zSKhmE={*I5i-BW@&QonC5CCGYzw!I)A78z8^{RrrR32s2t0{Ftw`uLA2}7BlUG!Vl z3A-IS!MRq`I%zMSYWrRy1M6|__xnN14vE*7?T}E9p3n1Vx>lR6vsi{G%LU)#N3;XA zqmvIYN*To$msW0E`cOf3r|Y@lBMJt_#uu3S9@a#`(5&k@hdQm}PH@y_NkuXIMZ39R z2d>!1LN#o-O#GfG*t&h1C9+NgO!llFoU-bE%XU4h5wzNtb1t;z{I)B)vT#_`ddUe7 zGQ#rMc%sa4Lv<=;%{H!4_qss9-d^R0x!u!O?c%CT7J2nU$uetg8O4UN{vbp#N;M~J z`1Ltkq{QknRh7(OAXW`eDNf7_4Z|s5mr6B#GEuB=n+*%uBJ{3`UB?JP%22Lb4%(^w0H1 ziR%{+CBX5VCxKE_oDVtKHG4UlC|({s>kN0%_V$VF$u{hELk=Y;^dOU)J94nLkJ*#Y z22Q)v3^}|}YT9U=)@UN;q0#=p3b8~+V1&Nx9*@qv-w76-{jM1Jq29ROC2kxO_uz*n zZpCdTcHsLa?hxcoLB=tmz!C@c|2P9Ceu~FUJcNf$928s?GbVNlvP+Oh@FNpH!?OxD z_bxmc>0=$YSr-i+?8P|d)_0kB6~7kbHTHgLyC}vk4&>DK)pBq&ZCKqe-i;wbI3J|009t zk$Jz*cqG-BqmyDh&~LmY)tDofVyyNXZ%sAksHPZe{l>SY8gs-`jI;g5J5r4w#cq~W z6s*cM!!cACOXiIMEV-ZYm3H|tUkUF>p4a`AkyO>`f1*%PKf~~4n9~(?1^F(bP}K-2RI?RL zV6vZ~d>O@xR>>wnW>qK1tQr+vfQ%TVSBwOxSj`bstmZ2@0m{dqTqU0X4OR;T4OY!c zL4eE{M6L@`uQ0WNb;tWvneytqeU2wE%MlyFKTzY5&tMdP#v#fEc)k1yhsmipfOj!R zP9x?mJV`E#CQji9IUNBU%#$W7swUxS6+}$lQZ!X#Xd_wP;lM$Wg?TtX!iDgO1)V&FoZnMFX*|G}GWX7^TU}(5F{0^t_N4s;W>_)L3JP zA(1MxszoZ!M`UDFw63aH%|@#1s)|!1tp=-lq~gHDR(hn`mfqeYGR!!y0lb0d@N*`i z;Wa!@F2jaggw0$B_^dQ=oSe!hy@o|{8jkU)sFTYg#Adctv{y9i-^hPMfy!nn3L6AP z`Gzif`-~8bKn~8NF3E0 literal 3052 zcmb7GTW=dx5dPNode`TSl zLgfXXkoW=grAQ#al>i~&p-B9J{um_0H+weD+ALCdnKNhRn>lkkXZO#)fBXf&L0nJc zUaX~H;DV4hg}f!?Z6WU%csI@Uq7X-*>%x_VRD`%fE{S5pKsAkFteNm+y)5L4iJFN` z6Lk{}6I&v?YM^PLr6J~3Gz^z6JJ+0I&8cq`OO5)*f`&xh*>pAJLzM zo13ko`(C?vrqS}+UZcKxn&;{pZhMir=BK7ZIR)7oRI2dD`qaIYEdq}3WIe*|v4O<1 zJ(^tf7`enD=UYNe1L2LAPKTxrdjds;-GFa)wq>PX0OMEuv3+rkUlvr(sd_`z*a!MPL zjQWtlc^Xr=L2)hw4rVP3R3fwN)K5sBjIrvps%q9ac#BNq%-O}I6U>u*vgx)uwKiwc zPePvz5||7{mzx|6ArnY~v)T>SCtiV-MyFYJPkJ)Pxt%FIAh*oIBY4!peYoGk1DLSz zppb`zJd8;V#s4|l7GA|+3v-yaa7efVC|Y=2$Uz}b;7JQ5ENR%cbIDbtM>}4vBCQIQ@^O$;+QnV zU)d9XWn27}o#C1zp3NhDjJqONjjKL$8``%%Y>G7L3v-wzZz%v~Fw31LO(N|#{vNS! z28_odjoH@-hDcB8-!R#*>l8PvPmn*k*TP zQr?-_9}tT!_g;kv$}O#szDk##!Lw0*;=A=Db0L17i}sV)tsj{y@$-DNAAPreWG=;z zjRjH}sJ{9nck4&yTKw?gP=2)cS;H*--JPBJ3VPz!>~Ao>gdV>&`zws4xtT6Ze@iB{ zJV#WchlChHoT`UZN~c%-1+dE`d|{49CdnSi%h)CznJGS8#$Hf3M);BsmkGb3H{a zg)ivsWpZhB`2a1F%iw1|L$8pt=#ekEY6Ay^zh;b8m-%V;;`Sd@!^FkJ7x~g-h?sVMed@=Gj>80g+!n+rH@Kw*}AV{3wmwv+V+HH*F^IeQeJ-Qgn?@@e) pOMb87IWeR8eTvTtzhCh~f-jKo;-0}LEd1t|f=o2L?oZqs{{S`RG0Ok| 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 index 00e170bebc28af0ed89b328c2c2602f574453e51..ee920e0d84f2a471c9cc8d707aba593567f989b3 100644 GIT binary patch delta 587 zcmY+A%}!H69L3Mfo!hxBl@!tfk%)x~LO=KxMERUdo=RfnC|F`DTSmn#_%WDARC`ZtWxiA#w?UL7c z6=8jCmj%1GXw@65mNb?lh+xjcimj_2)@*(2paTN;XBLJ$T*+%k0kFRhV)+Xyr=>VJzd T-Z#yM)>(|BxAhE}Bxe5rp$3tNX{Ryu(T07 z5lagTf56Jd&k%D&PR`6^zI@-zL)TYl>;32X6~HWZUHB-r!NjtLK%(T5%NkbnEYxaM zt2K#=3l~KPRn0XAbR(16{X`Zy`WEK-a?EhKyTBa-BZy*=%H%w+-sHYqV#5duznWPxp8x;= 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 index bfc68efcceac13a68ff9024be706cdc745c30825..2707e2660240738c3b4bbc5b43da6e063e15af66 100644 GIT binary patch delta 953 zcmah`ZEp-w7(I7(cJJNkkZM|O2vRLgymhr+s><%5^}1DBZ>5-Rhh?`~+ePtVgT@D+ z$Rzv$d>5;I4(` z7>PpSyoL)JE^2T!q$EZyu45WJZM~$~WesT!S2SGJg^WbjLM=uV#`Stl!-T@5!gYn5 z!jwW@Yd0irh9qvixIZJ7)F!=rdSYzA&AH=V-pfrDO=FFyUo@C^M>9!xa>z|(Jr2Ph zzb*7_?NRKuu>l)x?9yx#+HJ)2b~8F`bZQvDF+Xm0scGD{F^xNZ!R!>n#iE%ogyDaW zICa~YJS?z+!w76g7Yx5gR^(NIyaQV)&s62+K<>s)%Acz8>Ok%Z^r_>h_@_VB#g*X!YZUf%K!FtwPQN$i?Jd?ACIw*EQ}-`p_eRzEHdaL zlgPoNBLRgcR1T0u@r-zouZ5Rr#v!sAyy3kZCbMybksZ`Y^#lEjC6aSkD$&nJi8(a= zrqTaXl;Xu1&jc@nKVvr9z0%=FM7ih$*?A3=boQ@)%zDb~AFP(baST!o;~|E~3{HCw zC)gZ93(`1AX7bP^PLYLi1|2v}7C|13-0AE($t?Gy%uY&{j2#))7+1>dCM&SSX} zL9Pe6VY!(q-U@O%JRJ!%8stupu^@ND#XUJDX~qoC{HJ8U8LqA- z#mE@H)t0QGl|vXmUE?+mioe(RFh|6VF1$Hf<8fDNFrhYv9blgO75Cd8um!)AFU)mt zT>d6jD6)%)?Nlkri`mI%PKXkEcuS`!M=x(UDXL?NNxDQDi7~oGj(3VZqC6i|?UX2G ziEW$~)$>)WIwQ(dQ8TZ1<3FaY8;f#{j^`RD(n3$-5K*B83_=$D`4H3OnZRbMcu ooR}6W42cptlzU#3qs%@oi0ZVuCN7GsvWNZ8?3KNwpO3iwADjckk}m-L-UXa}a1EQDG@TwThrtS=zR=X4wyG-RaWOsm+yE>X0Ca zgb|0{1^KF1LV<JtwzV!{%8{buwER z9PRIN@=h*W$mYkz3#}ZiN)?>Gp`QrqTR+`L~ZQDej6vyE=qdX zdk#^CIx%b1iT8SlPhr}|6lTO1J;8bxcNi}t5EsemRICw~$Qi2Q1iWPeI#pzhN`bL5#ocdBf(96s hKqaI9i&U&N1n;_>8~vYBntJw%AO4bgnJ!AhmEV=yg|z?x delta 508 zcmXAm%}W(w6o;R8ymRNh;|#&5DF{;1qLtvHu1Zk1EKM!T+lOD}S7m8g*@ss{MS>s_ zB;IY1e?W`kE({mB*M-ocrMqn3-s+r*f#*E@<{ZxZ&U~%^TerOZXY(7-%&U+FhH_Yj z6}J?(6(fpK#aO_2D0M<{M{!q&?x{^G?kgTBru4;hz{8M)Acx3_s#cz%QtTzqchw6{`ZU50P=B9 zM^?w|l&}jrPRVjw7ISz;#aW$$bFwtkhx3vy$Z}DZOR`*+<%%pVvRswERu$KDq~N56 z>+;>EpVt(`|m_zf;SMVuCFZd2mN({P$1YC zsk8NpX>MQ0Us2=rH!oz*xjkZP=QrW%b( zhP@YejV{H*cc1Z6$rnwL?@GK~*g9PWN$Z${A}|LD5Gcf2*ofQrrd7H^GvxI z>*@Y%$vLLH0UIgL(nsgcHRVmFTy4nNDirpj^y73TuNIIUO9eYVJc!d`1BgJ9>HP}yb<7*fJ93aLCFv5eRc;Unv z_(=&O8?#YPN)+>vjtWu|Dw%pY(pBvj;#33%k)ooCk0u6@HjJ+S$K0x^%!sB}%JdxI zMd6wHhaTj9bqtA?%cZL$9wPzY{+~1gNf1D?Lgr^kD>=U!9VX`_tppMOUc<>xY zNe-+=AL>a86KqBU$%zoEag3y*jd=%28XjN?8c8m^MJgRKSq34VAYq7tgFy(v!$XK6 zE+EI@VZkPqWGEw!5tC!Q6ty|W*evJYYSgTbH(P%5Ls;%-^g*;oo6uvmP5v#~=$fq2 z>YeyGJiPYE!uk~b))fD8L^lyL^(59jQB%g4(+_XO+7RzWld&MaUp>ytY{Q8^9Z%LN delta 715 zcmXBQ$xl;J6vy%JZTonyuanjYnwl7aF2ogRBDgS;C^#cH7Uuy}R0J%JXtg+k3ihce zChm1(Oe4f0-8saKi7_#em5GUegB$gnN1FWZC#Uz`cg`)Or{?EA|9w*eYI)*PO*V{6 zzs6~eGa6?#&S{+2xS%m$bJ3Ocl15HXURGVv$ZHI0T-CUyab4qv?z?Go%cY#G!;q{s z3_IL*xZ`kF%Oeh>4)+`i4xYn(tv#@LXfyWm*#}e12gXgYE|fB{gS14cry%k9h2rtSVW@yhE=S@cmuwhe1GxX%xbAuy1Hi# zYsLM(*ZKbBd%f>eME7j)&vr)|V@6xRuowc>#gCCz<9XqvR})L-Hqk17%r>>Ov6KMS zrjpH43sPg|u|*W3nSX2*S#sqcwu#C(&JVVWZ2I`d4w1YHugHkPjPZhYk;??5>=Z?K z#}KnaD7&p+wUQxo7v4VY~879pF_KRkkMWi?&N=iHOurhmReA%ov zsTldm!%k0Uy1Y{Sw?EuuBAM&tu+%NSb3_!7cD`~{&IGCAHC>_*%Xup8=x`YZWh@;o zEBjA~Y(`|{Zjr-t>NqJ1^PUQNM6TT3OT+Y+8JGKI2zuU9o|&W~IcK7f9Jc$U6yVf< DFu8o9 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 index 4ea59cdd2e5482013b13daf66401f6cae360d7c5..533d3d8e22c46e12f6b8bd52f82167df40d819ad 100644 GIT binary patch literal 3703 zcmbVOYi}IY8GdFxvopJ%cpW=&*b=}2LwwB^XbY?pAXj3r6E_ZNNqWh|JFzEO?`&pg z6B6#1me63S5=bCEAoWWfp&)@oovKl*mJd|w@1RZj4~6i&b7t+mjH(F9KJ%XUcHYbL zp0oe@_Ah?}@FOf|aW_gCm~dq|Ez5!|i?Vno&Sd#LD@$2amxQXw;%8CCIiUhsY9bAV zS2uA!i$0VrT#)bcvRt%q$-)aFf6>BA7GAdSiU?jc@tTR(HKe?fhTiEj&UvR$b}9>n zX}_{CsUd%)UJ1P=_n24nPL8b+o)zfim2EG)P|!C99Sc2~U_zvPx@ z1HbA9;YIo}&O7D0t07&lxxp0AvTnY2^*@)d%duw3t%g%2dfa%TGXm@DH?DsD{#8-b zE6x&q^ff8Xg@G3Z+VkJn-uddU%m4oU^39b`McMW$Vc?hQ^Aat$O8(W2D>rW}Gmf2J z#S0(T&^0`AjGp&0UJbcvui_r6FP(COqYl%Rv;29de9Q?v*~d&hT=W=iaeCfgDwLda zjG%BjU~Cus;B2AfFF9VNuox`W3W0mB?$*M>tY7majw5O>1zB*JGY=RZX-X%qdWOPh z<3eRg?`ssOe|RLJL?%@ZMWxx);%%)sIXSGQ97atY-#^@bx|E}L#tj$!(ySv%g>JxP zGc;HWiS$}Xn}$0g5*H?QR7{(jkBCDOjhuwg5>%SiamqZb#pLj*GwysiIdWWs=C^h~ z7O|RsxabBvRXQ^y?YAOMM0Q8a2JmbpXlyf)Pys8eL~659xoQcpFLv6(+%Ok9^JizA zYJ?8XEN6=6&pVaa+SwyhGy9ni>2%=M>gA9?jAAv18i5%@Dvk|9 ztw6RyUlmb9cFwN{^X>spkh-Z2V>@J)Z4~fB8-v(p<9=DTW7x(h#%xSrOv9t!7r{1u zhJ!YKf=6sTCDfxrJ%*x*H*CC#-`JSMP8+*q`8l4m@msv5VaxgjqmtND_sS*dTz^~m z!(M5ZjmvmjmfsP7jzcMv!i3CV29b*oWBxfyA}e2l{8F^E}$Sz8Pbt|4F` z$y7j*cB)mkLgY>)%}djiwiJ#xNsE5t;Qyl^1$1-`MB5Vs>ad^0Hoh}=L&H5VkP=9d zzL(EfH^2Asf2c-gN?_J0cz^;zuTwBW0pZvw7^i>`?G)@lj!eRu>w`SLz^}%yF?t=^ zXCzX1h-*4x=I}6STPg6t{V{i%pq6W^@#jc=+GgCJXiT6d73pDGz#&ow_jMd5mBx!WfLT)f^@}I*Q&JZGz^m&BsSH+dC+0|H zag=d9f?m`5A9_qY`wa$69OIv*eS7qsQt7A_AH%vuhR#-K8p{t& zyG6tGeM%UcVKfvPI(jQBQo9%FCbf0Vc5dv`Y*k*@PY}?AIr3+RY7j0mPkE&d-$37U z*U{g%X%(BLPpcT{+oI@hq3=*M8<8i~_XD-<5&BL==Y-zMWfga|U*FB|-Ql?88cszJ GoBs}v9>+8Q literal 3129 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 literal 2924 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 L3$v-eVd(ik`|1Aa delta 1786 zcmZuxTW}Lq82&b!W>1n$yPl>UlC)49U}}vi)T*tv8YqQUN>fM+4Y#JIwP>kaQoKu0 zQAF^9tKtnstv9R+8x#e>+xVgn`p)>|lZw_So*c*jKkW<=GMU-$a{mA1%YXLd;PNB0 zb3goh>MVdo_|6MA9`WH(>@l#}z+*ln@Hm@$`SAol_8EB62QT&u9AJFPN9NN4&oDmA z&Ow3aSlBF{7kGiiivovOzrsX%`_>lFaz>Z2Tqg2^+@*HnN@)IL_J;*u?s8fjsLI0s{h{GW|>-EpU?Q=LWtoaLWEsKWwK( z(Ei8xzFfAi>>21uBs+UM6Ws&t{Y30mZzP}b#x#4vH)==yQ)L+8QExVJ8eeK?u;adl zpouY@F)@hSOk^-*Vi>pE+sw!i?#3<+-i{q(*|x1i!!Z+Q@s){f7$>(jyEBs+&SqOp z+>hfT9ctl@*Y5zy>B%5qBUbwH#oxfgWRiKWnw4BP1^rkd&->eC3266Rak9T z2SR$1usJYK?{L0ILD23M1JC$^+e9| z(gq@C1ubnPQeSbU8=HvqRm9vFAktPzP8zH8PGwBXC7_`PLaiYsfe<=5pB*`}R*`B%cbJ1kV@;F#XU^r+b5DuCMybf9jd=BCSeg{hlOa~nV0S7AxN*#13^U#i~ z>GEA#0*js!<@8yAAevEuE>zNg#Vk7Z5cVL9Lx|ugs&EF?_<0^?<5$eV1=MI>%+;#t QBD!YYmK=7|W-dJZA8+F$CIA2c 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 index 1fbbece825f74e0118c2e97e3f779a94400cb766..c52574bff442febd05708b22ecd9c6218ed912b2 100644 GIT binary patch literal 2598 zcmbVNU2has7=F&~eC>7$OKl4)phc_nlaW#dwiGQ0Qt3i%p$Z~#*d4nA+nF*u3wmeb zjV2Pk@XF{N5ihvF1WO``(Hl(s9ajE?h|igsrS0xs5R>jX?|HxGeV^w&r+@zY%dY^& zaWRW-OlP3tZMmG3%Z!dO}=7Z;ttvezuu)UsRj%T9GR@Ryw+{DgVbYj(Bn2xK09^W)#2-&_6q26dr-#qk6> zqW!P?Hy?iSrNHKjW0znN7+erg zj`C9sn{hqoRDJ1^6P&SGsqDuu+0_N6k>^CIgcX;iADk)qOIF#w$}X*s0(;51?gv+_ zvcF`zo>d8!YF6OXmf5Cb&G?J1HPpPD~`j z4=YYUuq8nKPllp1Qm>t}k-0%!Y)nqwk*S5fp4h2H-#H)Jr7J~yIbw#R9F3zGCj=_XXmDi$Jhg9jr7#3oLXb8HmyIYB-h{aH6!%nnI?bpemy8T$K7N| z*0H-s-T)KNqt8SSdQEJX%TDwP?EjwwV`37on0OhxO;}PIkkX)B4&!x!t<9J2NZqZL zB@?|H25%stWYWY1e89d(`l4&I4Q@>P-K@-QZn^Uy*ftYN9XD=^1URhwY-Q=|l zV^YxscJX29=5v%rO2PwH&r=8YZT#hHc$Nl2)@s;617U16JQsx%aGG{8nZ;djSBLIF z{6ryz7r1JXQp1as&Da6`c!?(=q2;@Xa!nyq@bS~;ZjgW z|3F7xd4MgqV27zYB*DZAB)x5UODO=F#lr0!}T{;*h$&iJ{+}LW><~(Lm6C$Dcm-dhq@sv7u%D8K zDmgzuNk_oDa*&e22>@|6b>kmw(lPM}y*du@&k&EWEfzEDMI?akC7_CYU}8X-O;F-Q zNF-$=t+yv0B=t!nD$AFRBpLTb6!B%EinA&9FoniMXLA#Wl*x#Q9l41LX)tobx1f)% zpyNZS&lD7C$SaA(kmSUsY(b4o*laFqU9WJs|`Ie2}hk5QEI=eQlV6%jfTURcYGg96X%ULORaaqAL&2Py1r*Axg LMsU6)#V7s)WQ*KT literal 1879 zcmbVNO>Y}j6g|(L8ISD=b=@Yx5TKL*{)jsi0;P5mNZYgx*riIUNU&mJ5B9Y7OgbL7 z;vaxiBo?e#Bf=sJkfz?BqIsOnge>s1}sbX=F}Y69;GB&$`zKwszaPXPF(#ZJFzV@3^h1KyHmbr)zIGJ!i9HFT1W6Sb^iYJ%K{a@yy^$vtj=8s3qCUgcx@tS?NZ*_?AQ0xbrx9vtyEqo*(yu+i2T%^kj+O{uX$R20+ z$2KuEkM^mddym@C8SV6j<*vx`MAWu=?T}jXyvpo1*H-H*EKgk{IsFc=gg#2E&F&=$ zyzq9As&%jLH|(oUG>-#Bo|AXUz%zK(Ko+MAJdINV7yjp147`TCffsSsz^hVwNowcu zy1?|&OM9vBbefW^M}#dJcpo*kHg{&&&>~wd7(T0K9-R+zH7O<>A9WBKAFFbDUWe-8%8;&43OB1&?_oK^oo{KWsLS1*=!bz;7#OcK_iz}F;EzWNVWl9CtIMH*|RMdGbOllgfd=gP_7r9C% zRoT?|!Xee_eqoj6WMLs+QIzHZlc-En$y67V#UT+hnQEIf=$X^s|L)Xms+Vf%7sCFC|@CN2tQ^lM7&9iEX&AdfCaX##6`eoBXzR3vL8e`-e$Uj2r m!(F7a#sCu%AeZb@p{`5)1jPWEqnGvIGs#Cd_%AUWQRQFUXu(fQ6hE^&uic%#7FxOrQlLtotcs#;A5fr3b+^o>)4rcnq7w@m)^bo`Tg6g0;w6J=qAmQTMfJHn)x{6 z;JVO)nYDDc?BK40{I05aJejr&@r-^Rx5m#oi07j1ti&^RK{u^<&MB1QN8x)Kc_Z{m zc+(z!dhOxWYxk~Peem5if#h-1GTljmf&+t#Na+Z26{sU=TE=X-uw*zVbwI_Ew9|Ti zQFlys_L-uaGlAVEf^dvd5jY$1IlE*s4CZ|XgEMQmGpJZ}V6YBJzh(-AvmVS_8^l$h zJD7C?xDjwz(j3sL*D7YXa;oC1%G^W_O+ZQ|9`=@j=BOEvohif3*_k<=)xHX{cEb~|2IkIT{g~_^*q9F2>Qg* zvXOSj22Tql*o`CLi%?hF%^42zW?jWPy9vSkOe1O87%@18%y8(r$Z`Z(V^At1H zLbr3J8l!E&)zd2}z36o-9vZw4h#{?8(<~*BIlYwQ4Ug`hLBw%f9*omwRtfG3NP4YCv6-v+3a*TH~l{LG-)(QLmE9rPiwT3`ZU_j zmVSCxpu~R;^@j7L(L5c|=y`fUqr;4Pk@jnNfw8hsv3v!0ze=z9P7>Gy45^{vpDEB9xgM_JBgatXWlq3O5^(5*%P|^ntWR8GE`!wEGEXMXno^)c(B|zVqfPgM<6qK` zOE}6?VB*c-kO&`RkHF~W@X+@piPwk!Ao&}Tg4c(CCpk4Tv`&h51fkB3U`dFhe^MkS z-l48F(ne$AI)y44;e-U0a6*nrOh>*$(KTv|Nin%jDUwj26iKKtg(<1Nk`hzvl(a+$ zN?IZu3o)gzuM~=fD@x+^mcSHwHr0-}Nk?fK8F$mSbPV&wruR#F9lRh$^a>pZCE~n7 zGoU0&kwI^Ok|_`UH$f@n0M;ZZmA=NKk^&W?t9VXkL51lA;y6GZiuyOTD>V0rdK7vK zf2#0^dN~=|fUFefD2gMpC!H4sBY>Z`a4WHDusj1BG=NmiQ$n;XPruy9yq>~m04z+T z@EKeva8&FZ8y6?MVs7so%b}EN=kOXSqwCammhr<0kqKg=FHu>6xhRs5JP~T^8L2U; zBGMAFCz7ioR2){@TNmj#kHrr@NCkSE77?k0GQ0yS09en_yGSTVdjR+;P$Es@D|Z@{ zg!49f50vbI{{yLy!4LtyAOLU@gvT(fodb-~O;Sanq9Zo4d^NdFt)|(`^_7)I<(hsA z0Zfo1K9;;Dw2VC2m*LQDYCm<0I-;HH)Wu4(PSNNVPNUtsqFXr~VRSdAHKx-8dY!g4 TKd|*5l|w$p0)61M(TD#6H-fil delta 1309 zcma)5OHUI~7(I8U(@x7!(8N|jLEc)#0*Wa3s4qaJ))xx+th_9bwjt=oMYkpfnSSu#4EOix7nGwF%$`CrvmDm^!w8GSl3m&&B=MwMQ9uLjjhP|qs+ zwdZ9;9qKJqpwhx#?6XiMP>uZxUG}0@V-FjZ^?f*LA%bQL-NFu`#lm5MC|WIC!exc9 zo$!Y3C1Z~{gS3SiWb7YCt9}D5w#WM+2WV2B!D!MUzp@DwYVy1mrR20iY~W6mtKw=z z)}TJ-k2Dg!`OR`Pkz39I9Kb>TQ{s=fRs0Fsl8AFCsza`7ev^w@&#O0yD_q6Q!bR*U zit8NXRjz7=$W$8aGBcDb+N^as>txl&UhOzi=-5TACecKiKSOhmD&(9fL?touzNuF@ zijK{7cu!6teY=I^Ql-$bt%d&9@ocw_426PUp%cgRX~g~EL@^EL%K!fkXNFF&oih$z zj&3arIZ1Vqabk%a3l+21{oiuhrrUI?W>G@@@F=#hVrm_1tuCkua=N3nT%)?(h zt`Q9kA&l!}GO&ESg>IA7$#aZ-MQ~^hWjo7Pu_Ll-CrUe;{&nwMM6BRI;U;w&Zv6o+ CYJ2|x diff --git a/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java deleted file mode 100644 index 8df4881c..00000000 --- a/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.daqing.framework.utils.excel; - -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.CellData; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.property.ExcelContentProperty; - -/** - * @Author chen - * @DATE 2020/12/30 15:26 - * @Version 1.0 - * 任务节点转换器 - */ -public class TaskNodeConverter implements Converter { - - @Override - public Class supportJavaTypeKey() { - return Integer.class; - } - - @Override - public CellDataTypeEnum supportExcelTypeKey() { - return CellDataTypeEnum.STRING; - } - - /** - * 这里读的时候会调用 - * - * @param cellData - * NotNull - * @param contentProperty - * Nullable - * @param globalConfiguration - * NotNull - * @return - */ - @Override - public Integer convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, - GlobalConfiguration globalConfiguration) { - return 0; - } - - /** - * 这里是写的时候会调用 - * - * @param value - * NotNull - * @param contentProperty - * Nullable - * @param globalConfiguration - * NotNull - * @return - */ - @Override - public CellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, - GlobalConfiguration globalConfiguration) { - - switch (value){ - case 1: - return new CellData("业务申请"); - case 2: - return new CellData("担保部调查"); - case 3: - return new CellData("资产部调查"); - case 4: - return new CellData("信息部调查"); - case 5: - return new CellData("合规调查"); - case 6: - return new CellData("工作会"); - case 7: - return new CellData("贷审会"); - case 8: - return new CellData("担保函"); - case 9: - return new CellData("回款确认"); - case 10: - return new CellData("放款通知"); - default: - return new CellData(String.valueOf(value)); - } - - } - -} - 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 index c6ed9be0d536755fd8bd43daa38f53df4973febf..d1cb9dcf61a714cdec903ac3ebd0a773519a93ed 100644 GIT binary patch delta 439 zcmYL^yG{Z@6o&s{U3S6MpacX%Of2N$6%`Rz#VZObE?)6ckw{{rCddO=S{kSK0Zb?i zorQ+h#0T&(tn7^Etcb<==A8NF%$#X-*Syx-_wx&Y1Ww)P#DWVQSY#|QmKiHMA5(zm^Mc+DleU;I)*qLvgXWqn#cGRfpOAb zq$g~h)LNPc5SS!=qnT>L*029MVCyN;F5Og3~(KlEa# R`9A;j_jhxo=c#fa{R7XNJ1hVI delta 341 zcmXAjyD~#j6o$Wj%*n}#jlqaZj4s6e5`-P%8h7HFpz#)-L4R7K(V0=0bP6+CUczXV zdSk7V=G*`J_MWx>=g#+z%E#a98<6KZMJuI{7FHCiiZ#W0iVZe3m7CdOTd||qRqQGD z0}cWX1CCxQ&eZQs!YfrQePk?Mq%GZwUeW=_mJ?1bJvy9O&M8#(za|OL5EP Ee~DHv!2kdN 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 index 883edeaa19dbea90b778f880029ffb20317f0832..43dd51cd10d10b35ec55ce56de93e8d79b017211 100644 GIT binary patch delta 402 zcmXAk$u2`-6vuyG@8!F$D={Y|VrWrA)jTUTQ#Gq$ccWFrkhG1kkXU(v`ve|A>?}Nh zg`FiH!4nV%XGs3}ot){lWFPL-vofPH$~!k+ zRHGL$gMpaC5^+WGv3uc$Pu#O~cq5lNI!kMo9adOX414ve%6s?K2OP>-b696XVP=n# zmzqt7EfSh-haGkmbzao0c=$3ulrp@x{Qb&2MXfyJm-G=pQ9~n!7t^2PO*9LG8-lc8 zh+or68zvT)w2R6oMjs(Mgd9*!SUL*GQbZ@s-j(HF3ehFCZkbY!@rBSOQ+k6=Dx delta 341 zcmXAj%PvDv6o$WjdfI(@dJGf;6-ntuX(_5`(boN1)TI~`NfWb9I%yc0%Z`|N2Wip) ziLn^-9K3+WF6)x4e1HD6)~)}uv;5wAeg#sT*>o{$<0s?RpdGd(Ymx9V$Gl|0CP&^P zE-BdfSZwnpi)EV?RxOe?YphE)B%4p=qG&Y5o3IMnD5%HOl}M`>*S!dkIei6j)pS( 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 index 5a3628609b5fcc83d0d1e1ac662abe52c7e4641b..9b813b7a706d9e4f398599429361d309cad727a2 100644 GIT binary patch delta 650 zcmZ9JTW?HJ6vuz(%sKYVv89#i(*$iukRd@ds)=}*OqE`!TUD#oVMdEqnNF1|b*Vdb zIVkZoFWw|%-aPmKzJX_7!4ng#b(j}B+5h!lYp?&>Yp?x2^*uHB<=3arKr^ocmNV!J z*X1X$3@IE}81{evTk7Q$PAHr-SJaqpzws4$%n_mbgqz}mlsW|UotGpqKh!Zp2iF5o&h zK7QTkG~^xXy9=e!iF{A4m>VyY3dPBAiJS383^yxX?oTIq%QDYx!yU_A?pa#7ANG6M z*daQ@vR6nQ;Gp4w;6^oT2 zf8KT6$~UvlX~@cO6E0iDG%MALVO?UTzCCN${R1xw?ZFM-B;KxUZ;OJ4|71+w zJX%`#uylBh)`~?r2DgguEsL7*9kz+iMaQ(>w#H-*Vcw?wUXF+|w7skPI4T*Q+|weR TIW<|I1m)wys!f}LsKl{93p;Le delta 584 zcmXw$Nl#Qk6otQf{hsw+S%{_=XeS02Mw8Y=i3=n#F0esu=Lr>1Kn4dyMMM-q98es< z={YRi$i|%u)2<}(2e@(V(*Iyw08#I4rII>z?x|bnR^9rU`;Z&^`up=2U=wc~%V>>+ z>xdFOClpR9v_*gZ4~^OtIuuS>Iv0*qTe@PpEj^CYoN=7xoTHN7nDd(3=LA|6E+|~I zT#9M#cjV|@@bJ2GSt3)M&Thdmz!jAS6|N={4q2`_*8DTNu538whOQ$DqgwW+V~krL zzppo@GhGqXhdq|trM6(sWbb(HGH$u&xzB{Bjt6O9SjZfrn0^YoS03P?<)P;hMNfeS z&rW5JnKV?Tql>Cmdk(8I#S?>EYKo_xXFT`3Aho>oyyA7KKN=5=DgCl*jdW6c(wby= zX=A~%eU=cFc3{$(=S00pql-{66)oYC!A-U%-S#r36Qr*%^!=~m#bH%oMQ>*iNXrm))sX6x{N$8 ledqJh5t=0Zn{Ub<<(SxoVqPoPF~l5Cw^ihAv#0?re*ux?W;_4@ 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 index a730230f4a68ab56cdd044fad789ed600d0a241e..bd326dbae19a9e9263ea2a9fd9a2924a5e48d063 100644 GIT binary patch delta 77 zcmbQvyp>t>)W2Q(7#J8#7=*bPm>C4v83frGgeHov78LMJEy>7F2}mqT%uOvxEh?V4 duZxjsvL~af2rp0rDKxl83foF1Sg8Fo_M)~k#TYiqbnyP120ek69XRr DDQ^kW 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 index 0c0724ecf66d18c8b0306d1beae2fac2444129d6..c789ee8dfc549b13d729bc09bf3ccfcd2dd10075 100644 GIT binary patch delta 212 zcmeyswSrsc)W2Q(7#J8#7>u|WI2hE~88o;Um>ASK8Q2*#xf!$=w7GyR9d-s?b_TtT zI+=`u0=}sw8TlyziA9OIsU@jJ#hWKHx-xR=^Dr1N81gVkZ+^(c$jHbv`7v{>kQC5l zP9_F1ASD6BObpVKomnhcWf)``m?k%{*a(0Wurh)r85!gl3wvEx)=U}R8aP-0-7 l%)#oarwmlW0~BFkU}N9}v!I$dfkNCs%*3DqlvV|^)Bssm9J>Gj delta 157 zcmW;FyA8rH07cPjC&Ads1mRC0{1QGwNEC<$F$N_C^LPWQv?v_~127DtK$Hk8uR6NT zE5f(Qp1=D8ShF(JNfjf5B-JR!Arq#?X{N{&`7OJMvJeNM=Mf8*5pnsE!p(lYlP8Jo t+1~~Ynh1OKcY&Zq+rIq0?jY#WL)uMnO#1FIas_JWN};nPacxj(_ygNO6o#KKX}#&qO($qem^vMxAR|gG7+~tS{9?c=9jc5=D@D>0+hW>cTA(gi zv{eyN(a#MP5fyP44Q?n^L_tA8ac5BwcSXhD>Ud6~865wZnRD*_?s?yH-goZJrV|gu zd$<0%egGKHZm^jS{k8cQ|ThPjT#VXkM1rW*`P6?mhih?^8}v*MR2{uVvE z)!^&LZAIM99hN9}>hWE=TdwJD!#$Rm9>-YTYq-}^rUT1Z5#l~wR~qiO3}uz32Q)pX z=^?{v%Sav$u}0TNLOdGcu`rMGgr+AAPZ^#LvDQ+_sxZ&+tl}~u*6I3Oi02J2==qD5 z3A|)jA5{x4TgLE;VS`~HQ|uK7%KN2ccvZ}LL~E1Xt(~*$66r*HvOAgX%8UvwGiJ4j zl!2KIc8E9Z3KlwEW2519$0ptouH#KMJGSta$1s1KIogjpGxTk?I=1nS<6X8pcCgVg zi5ZSldC#NV9~+MOwJubVrpxfYV<#VI?L)^$eC+syPaU6enn&DU8yMxUaHAV{vD>5Y zgq~Dak7EyeJ=~nc{6tk-XVv7kR8r}}{9MI+p=lqR#Z(rON_4bTP47;(b+kD4^QDKa znLe$ux_ZJ%mE)9nz#kDA8UD)gHQzYWeCwYbX^MU4_@2FvA9PrOPImmrPyV(@b@(7Z zEAf|{nevE!{OUNQnvYY>nVH3-3%#Jf_^3l=MFCEi$9IOrxe@`+lczF?^9lO>B~y;A zr$NrnkxC?(2iE7o7i7UR1iY`LFOmbpSQ=^Y=a!DC7*y~tQe&PtQ-~KbONeVq=k+FN zk_t?unb~;RU6PArvYxfbE|}f5awY`~;uzYPLm|T{WinGZf{Uf@{$@6llAUTUEhHgJ zvqVy&MWR(AXS7`;bkHfS{Y8V@^BUrL4RImmG{o~7;?f|ep+Ypw&1yLEKN_^h|I%;? zR<5*5jQVHA1{%7VC;kwwPS#&a3^a+G61kE2SvBQMV*x!PyH4s+f`4$l;Znn81)YY= zv%ck0)vtQD$RC4%-!Nol{gw0ztwu!uGpJ6kr$$gnv#Hd|AS2(4vV*jJgy8RtkoHCO RhxOJ6GgZRlD#-z^{tHu~<<$TH delta 1082 zcmZXSS#VTU5Qe`yNjP`ToJmDw3>8EWB2^$E$P`p4wik+3i&UjlBA_HVgy5K%5HO+= zB)G7nR}cXOWydWr8k9{GK?Ot<+z}TPP!OejMa%Ai-~;!ePoMt({{QY<=VW|uuZ9Ev zZr=^WxnSwfEJLFu#4JlcW?PDQJi-$^8R04BXqao5r^NY|FbkBhQ2C3LzgTNe8=lci z5awBySaMjZ<>xe8rr~+Ra!an3b6M74SYgRi!#q~{yrAcchEZv2Pt=I8k9&xaT%_t`5%#|P|l z?B_#|jzLYhUFVWXiA0^_BR+N<;Gp9WpEwS)$1#{Ojsbic+>o6YjCX#g8fpzk9G~&I z0!JOk_`>leUpc;JphrAt3UvvZT-R~m@U2HykNV`4ddGJh_i&TTrj->|Ru>MbOeVBl zI=|OpPH6aneI7Y!O0uk~qOhc{wz8_i@gqNZ*x@Ck3W|z)_bs?Z8-EV^MDrsj9l!9a zqlQyKB3hn%+Hr>Cj^ETQQ=J{Zb2c~;E%MLthc=#K_AMQfS1nhB_T>$nJco>b zxYM&;iy0<&{ffDj+eF#Oy&Cc~bm#B;ow=N!i~px_)HQ}ItIs8cpYB9@4fFuPesYsujdya!nQ?#;Q|U7abZ*#vlu68k;jA!la|U; z!n8#JF^d`E!mNeu76Imjd12u(*_Rt$Psf10E6`N94ZPr+~ zsb<4ae4M^YJ16P011EO9w|{YYbbe-&VnEom*<#>tRB*oa?LMJX=n}exh-w(2=Mz7@V5wD~UeTbLgZ!P48^T>v^1Ir#5yH5%K!iX 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 index 772548cd47e5d99301c78202bb7db22247694487..ee7a00fc76526d101ac82f4aaa07638e6ea32a46 100644 GIT binary patch delta 342 zcmWlUy-osA5QV?p4c>LR8c<_pqJ>~dG`4~$qNphTEB@dLD}o>h3)1O3>}%K<8bhJI z58(^=4#d61d}n4(PA2mkdJDh)3!M3 zsz$_n4@A7Y5luW&lSHX2JV_cfCC@Bqj92Zh9qYK2S}bL|j--W;C~b*LN6?kLQ0{*l haYHlu!;z3SvEqL+s!^ z#2bQ5V{R$N*;a(vF$cQ_dxCw%BpHK)(CACC`TL4dhbBK#98Yl~IhCAA&LtOuOF`)+ zn6{%?3zdJYcwN8VY4-$I!Ixc{aRp^fg{lP_kDB0Gb3@%C7JP(aLCcA!8{BH*G!0ss zHXTiud5ejLJ8% Date: Mon, 4 Jan 2021 11:40:39 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/daqing/framework/utils/excel/TaskNodeConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java index 8df4881c..234c334e 100644 --- a/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java +++ b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java @@ -45,7 +45,7 @@ public class TaskNodeConverter implements Converter { * 这里是写的时候会调用 * * @param value - * NotNull + * NotNull * @param contentProperty * Nullable * @param globalConfiguration From 935b8b1883db9e77fbe9dad4053f9b5a65f433a7 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Tue, 5 Jan 2021 14:13:21 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=95=88=E7=8E=87?= =?UTF-8?q?=E3=80=81=E4=B8=9A=E5=8A=A1=E7=BB=9F=E8=AE=A1=E3=80=81=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E3=80=81=E4=BA=BA=E5=8A=9B=E5=AF=BC=E5=85=A5=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dq-financial-crms/pom.xml | 7 ++ .../model/request/CompanyCustomerRequest.java | 2 +- .../mapper/crms/CompanyCustomerDao.xml | 4 +- .../controller/DgEfficiencyController.java | 1 + .../controller/DgStatisticsController.java | 20 ++-- .../DgStatisticsExcelRefuseResponse.java | 76 +++++++++++++ .../response/DgStatisticsExcelResponse.java | 69 ++++++++++++ .../PersonalEfficiencyListResponse.java | 3 + .../service/impl/DgEfficiencyServiceImpl.java | 10 +- .../service/impl/DgStatisticsServiceImpl.java | 47 ++++++-- .../service/impl/EmployeeServiceImpl.java | 42 +++++++- .../model/response/PromptSuccess.java | 4 +- .../domain/crms/ext/CompanyTemplate.java | 101 +++++++----------- .../domain/crms/ext/CustomerCompanyVO.java | 94 ++++++---------- .../hrms/response/EmployeeExcelResponse.java | 53 +++++++++ 15 files changed, 379 insertions(+), 154 deletions(-) create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelRefuseResponse.java create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelResponse.java create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/EmployeeExcelResponse.java diff --git a/dq-financial-crms/pom.xml b/dq-financial-crms/pom.xml index 54f97d16..4ced7f50 100644 --- a/dq-financial-crms/pom.xml +++ b/dq-financial-crms/pom.xml @@ -24,6 +24,7 @@ 0.0.1-SNAPSHOT compile + com.daqing.financial dq-financial-api @@ -65,6 +66,12 @@ maven-compiler-plugin 3.8.1 + + org.springframework.security + spring-security-core + 5.3.4.RELEASE + compile + diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java index 2b911495..a321465e 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java @@ -68,7 +68,7 @@ public class CompanyCustomerRequest implements Serializable { @ApiModelProperty(value = "联系人") private String linkman; - @ApiModelProperty(value = "联系人的联系电话") + @ApiModelProperty(value = "联系人电话") private String linkPhone; @ApiModelProperty(value = "经营地址") 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 f481e16e..7acd5e86 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml @@ -33,9 +33,7 @@ diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java index b26c3ef9..11fc1836 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java @@ -39,6 +39,7 @@ public class DgEfficiencyController { @PostMapping("/team") @ApiOperation(value = "团队效率", notes = "团队效率") public ResponseResult queryList(@RequestBody DgEfficiencyTeamRequest dgEfficiencyTeamRequest) { + return ResponseResult.SUCCESS(dgEfficiencyService.queryList(dgEfficiencyTeamRequest)); } 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 1218375e..8db0079d 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 @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse; */ @RestController @RequestMapping("/guarantee/statistics") -@Api(value = "担保业务统计",tags = "提供业务统计增删改查的方法") +@Api(value = "担保业务统计", tags = "提供业务统计增删改查的方法") public class DgStatisticsController { @Autowired @@ -33,18 +33,18 @@ public class DgStatisticsController { * 列表 */ @GetMapping("/list") - @ApiOperation(value = "业务统计列表",notes = "业务统计列表",response = DgStatisticsListResponse.class) + @ApiOperation(value = "业务统计列表", notes = "业务统计列表", response = DgStatisticsListResponse.class) public ResponseResult list(@RequestParam("page") Integer page, @RequestParam("size") Integer size, DgStatisticsRequest dgStatisticsRequest) { - return ResponseResult.SUCCESS(iDgStatisticsService.list(page,size,dgStatisticsRequest)); + return ResponseResult.SUCCESS(iDgStatisticsService.list(page, size, dgStatisticsRequest)); } /** * 列表导出 */ - @ApiOperation(value = "统计列表导出",notes = "统计列表导出") + @ApiOperation(value = "统计列表导出", notes = "统计列表导出") @GetMapping("/excelExport") - public ResponseResult excelExport(HttpServletResponse response){ + public ResponseResult excelExport(HttpServletResponse response) { Boolean result = iDgStatisticsService.excelExport(response); @@ -55,18 +55,18 @@ public class DgStatisticsController { * 拒绝列表 */ @GetMapping("/listRefuse") - @ApiOperation(value = "业务统计拒绝列表",notes = "业务统计拒绝列表",response = DgStatisticsListRefuseResponse.class) + @ApiOperation(value = "业务统计拒绝列表", notes = "业务统计拒绝列表", response = DgStatisticsListRefuseResponse.class) public ResponseResult listRefuse(@RequestParam("page") Integer page, - @RequestParam("size") Integer size, DgStatisticsRequest dgStatisticsRequest) { - return ResponseResult.SUCCESS(iDgStatisticsService.listRefuse(page,size,dgStatisticsRequest)); + @RequestParam("size") Integer size, DgStatisticsRequest dgStatisticsRequest) { + return ResponseResult.SUCCESS(iDgStatisticsService.listRefuse(page, size, dgStatisticsRequest)); } /** * 拒绝列表导出 */ - @ApiOperation(value = "统计拒绝列表导出",notes = "统计拒绝列表导出") + @ApiOperation(value = "统计拒绝列表导出", notes = "统计拒绝列表导出") @GetMapping("/excelExportRefuse") - public ResponseResult excelExportRefuse(HttpServletResponse response){ + public ResponseResult excelExportRefuse(HttpServletResponse response) { Boolean result = iDgStatisticsService.excelExportRefuse(response); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelRefuseResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelRefuseResponse.java new file mode 100644 index 00000000..b393322c --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelRefuseResponse.java @@ -0,0 +1,76 @@ +package com.daqing.financial.guarantee.model.response; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.metadata.BaseRowModel; +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; + +/** + * 业务统计拒绝列表导出到excel实体类 + * + * @auther River + * @date 2021/1/4 15:11 + */ +@Data +@ToString +public class DgStatisticsExcelRefuseResponse extends BaseRowModel implements Serializable { + + @ApiModelProperty("业务编号") + @ExcelProperty(value = "业务编号",index = 0) + private String businessCode; + + @ApiModelProperty("客户姓名") + @ExcelProperty(value = "客户姓名",index = 1) + private String name; + + @ApiModelProperty("客户联系方式") + @ExcelProperty(value = "联系电话",index = 2) + private String phone; + + @ApiModelProperty("业务类型") + @ExcelProperty(value = "产品类型",index = 3) + private String businessType; + + @ApiModelProperty("申请额度") + @ExcelProperty(value = "金额",index = 4) + private Double applyAmount; + + @ApiModelProperty("申请期限") + @ExcelProperty(value = "期数",index = 5) + private String applyTime; + + @ApiModelProperty("申请日期") + @ExcelProperty(value = "申请日期",index = 6) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + + @ApiModelProperty("拒绝人") + @ExcelProperty(value = "当前审批人",index = 7) + private String refuseName; + + @ApiModelProperty("拒绝节点id") + @ExcelProperty(value = "任务节点",index = 8) + private Integer processId; + + @ApiModelProperty("拒绝时间") + @ExcelProperty(value = "拒绝时间",index = 9) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date refuseTime; + + @ApiModelProperty("拒绝原因") + @ExcelProperty(value = "拒绝原因",index = 10) + private String refuseOpinion; + + @ApiModelProperty("提单人姓名") + @ExcelProperty(value = "提单人",index = 11) + private String employeeName; + + @ApiModelProperty("部门") + @ExcelProperty(value = "所属部门",index = 12) + private String department; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelResponse.java new file mode 100644 index 00000000..e3852870 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelResponse.java @@ -0,0 +1,69 @@ +package com.daqing.financial.guarantee.model.response; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.metadata.BaseRowModel; +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; + +/** + * 业务统计列表导出到excel实体类 + * + * @auther River + * @date 2021/1/4 14:48 + */ +@Data +@ToString +public class DgStatisticsExcelResponse extends BaseRowModel implements Serializable { + + @ApiModelProperty("业务编号") + @ExcelProperty(value = "业务编号",index = 0) + private String businessCode; + + @ApiModelProperty("客户姓名") + @ExcelProperty(value = "客户姓名",index = 1) + private String name; + + @ApiModelProperty("客户联系方式") + @ExcelProperty(value = "联系电话",index = 2) + private String phone; + + @ApiModelProperty("业务类型") + @ExcelProperty(value = "产品类型",index = 3) + private String businessType; + + @ApiModelProperty("申请额度") + @ExcelProperty(value = "金额",index = 4) + private Double applyAmount; + + @ApiModelProperty("申请期限") + @ExcelProperty(value = "期数",index = 5) + private String applyTime; + + @ApiModelProperty("申请日期") + @ExcelProperty(value = "申请日期",index = 6) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + + @ApiModelProperty("完成任务节点id") + @ExcelProperty(value = "完成任务节点id",index = 7) + private Integer processId; + + @ApiModelProperty("最新操作时间") + @ExcelProperty(value = "任务分配时间",index = 8) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date operationTime; + + @ApiModelProperty("提单人姓名") + @ExcelProperty(value = "提单人",index = 9) + private String employeeName; + + @ApiModelProperty("部门") + @ExcelProperty(value = "所属部门",index = 10) + private String department; + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java index 3e75a3cd..5b3fe186 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java @@ -6,9 +6,12 @@ import com.daqing.framework.utils.excel.ApprovalStatusConverter; import com.daqing.framework.utils.excel.BusinessStatusConverter; import com.daqing.framework.utils.excel.OperatingStatusConverter; import com.daqing.framework.utils.excel.TaskNodeConverter; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @Author chen * @DATE 2020/12/28 16:31 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 index 650df9b9..601ed40b 100644 --- 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 @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; import com.daqing.framework.domain.guarantee.po.DgTeamEfficiencyPO; + import java.text.SimpleDateFormat; import java.util.*; @@ -147,6 +148,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpltimeList = dgAuditProcessMapper.selectTenDays(Integer.parseInt(userId)); + List timeList = dgAuditProcessMapper.selectTenDays(Integer.parseInt(userId)); //近十天审批数目的值的数组 - ListapprovalList = dgAuditProcessMapper.selectApprovalNum(Integer.parseInt(userId)); + List approvalList = dgAuditProcessMapper.selectApprovalNum(Integer.parseInt(userId)); Map map = new HashMap(); - map.put("timeArr",timeList); - map.put("approvalNumArr",approvalList); + map.put("timeArr", timeList); + map.put("approvalNumArr", approvalList); return map; } } \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java index 36549508..0a7b1e04 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.mapper.DgStatisticsMapper; import com.daqing.financial.guarantee.model.request.DgStatisticsRequest; +import com.daqing.financial.guarantee.model.response.DgStatisticsExcelRefuseResponse; +import com.daqing.financial.guarantee.model.response.DgStatisticsExcelResponse; import com.daqing.financial.guarantee.model.response.DgStatisticsListRefuseResponse; import com.daqing.financial.guarantee.model.response.DgStatisticsListResponse; import com.daqing.financial.guarantee.service.IDgStatisticsService; @@ -130,8 +132,25 @@ public class DgStatisticsServiceImpl extends ServiceImpl> empAndDeptList = hrmsFeignService.getEmployeeAndDeptById(ids); if (empAndDeptList.getData() != null) { List listResponse = this.jointStatistics(dgStatisticsPOList, empAndDeptList.getData()); + List excelResponse = new ArrayList<>(); + for (DgStatisticsListResponse dgStatisticsListResponse : listResponse) { + DgStatisticsExcelResponse dgStatisticsExcelResponse = new DgStatisticsExcelResponse(); + StringBuilder stringBuilder = new StringBuilder(); + if (dgStatisticsListResponse.getDepartment() != null && dgStatisticsListResponse.getDepartment().size() != 0) { + for (int i = 0; i < dgStatisticsListResponse.getDepartment().size(); i++) { + if (i == dgStatisticsListResponse.getDepartment().size() - 1) { + stringBuilder.append(dgStatisticsListResponse.getDepartment().get(i)); + } else { + stringBuilder.append(dgStatisticsListResponse.getDepartment().get(i)).append(","); + } + } + } + dgStatisticsExcelResponse.setDepartment(stringBuilder.toString()); + BeanUtils.copyProperties(dgStatisticsListResponse, dgStatisticsExcelResponse); + excelResponse.add(dgStatisticsExcelResponse); + } try { - ExcelUtil.writeExcelWithSheets(response, listResponse, "业务统计信息一览表", "statistics", new DgStatisticsListResponse()) + ExcelUtil.writeExcelWithSheets(response, excelResponse, "业务统计信息一览表", "statistics", new DgStatisticsExcelResponse()) .finish(); } catch (Exception e) { ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT); @@ -255,18 +274,34 @@ public class DgStatisticsServiceImpl extends ServiceImpl listResponse = this.jointRefuseStatistics(statisticsRefusePOList, empAndDeptList.getData()); + List excelResponse = new ArrayList<>(); + for (DgStatisticsListRefuseResponse listRefuseResponse : listResponse) { + DgStatisticsExcelRefuseResponse excelRefuseResponse = new DgStatisticsExcelRefuseResponse(); + StringBuilder stringBuilder = new StringBuilder(); + if (listRefuseResponse.getDepartment() != null && listRefuseResponse.getDepartment().size() != 0) { + for (int i = 0; i < listRefuseResponse.getDepartment().size(); i++) { + if (i == listRefuseResponse.getDepartment().size() - 1) { + stringBuilder.append(listRefuseResponse.getDepartment().get(i)); + } else { + stringBuilder.append(listRefuseResponse.getDepartment().get(i)).append(","); + } + } + } + excelRefuseResponse.setDepartment(stringBuilder.toString()); + BeanUtils.copyProperties(listRefuseResponse, excelRefuseResponse); + excelResponse.add(excelRefuseResponse); + } try { - ExcelUtil.writeExcelWithSheets(response, listResponse, "业务统计拒绝信息一览表", "statisticsRefuse", new DgStatisticsListRefuseResponse()) + ExcelUtil.writeExcelWithSheets(response, excelResponse, "业务统计拒绝信息一览表", "statisticsRefuse", new DgStatisticsExcelRefuseResponse()) .finish(); } catch (Exception e) { ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT); } - return true; - } else { - return false; } + return false; + } else { + return false; } - return false; } private List jointStatistics(List dgStatisticsPOList, List empAndDeptList) { diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java index 28b5354b..1dbe44db 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java @@ -13,6 +13,7 @@ import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse; import com.daqing.framework.domain.hrms.*; import com.daqing.framework.domain.hrms.ext.*; import com.daqing.framework.domain.hrms.request.EmployeeRequest; +import com.daqing.framework.domain.hrms.response.EmployeeExcelResponse; import com.daqing.framework.domain.hrms.response.HrmsCode; import com.daqing.framework.domain.hrms.response.RolePermissionResponse; import com.daqing.framework.exception.ExceptionCast; @@ -402,7 +403,46 @@ public class EmployeeServiceImpl extends ServiceImpl list = this.getBaseMapper().excelList(); - ExcelUtil.writeExcelWithSheets(response, list, "员工信息一览表", "employee", new EmployeeListVO()) + List excelResponse = new ArrayList<>(); + for (EmployeeListVO employee : list) { + EmployeeExcelResponse employeeExcelResponse = new EmployeeExcelResponse(); + if (employee.getDepartmentNameList() != null && employee.getDepartmentNameList().size() != 0) { + StringBuilder stringBuilder = new StringBuilder(); + for (int i = 0; i < employee.getDepartmentNameList().size(); i++) { + if (i == employee.getDepartmentNameList().size() - 1) { + stringBuilder.append(employee.getDepartmentNameList().get(i)); + } else { + stringBuilder.append(employee.getDepartmentNameList().get(i)).append(","); + } + } + employeeExcelResponse.setDepartmentNameList(stringBuilder.toString()); + } + if (employee.getPositionNameList() != null && employee.getPositionNameList().size() != 0) { + StringBuilder stringBuilder = new StringBuilder(); + for (int i = 0; i < employee.getPositionNameList().size(); i++) { + if (i == employee.getPositionNameList().size() - 1) { + stringBuilder.append(employee.getPositionNameList().get(i)); + } else { + stringBuilder.append(employee.getPositionNameList().get(i)).append(","); + } + } + employeeExcelResponse.setPositionNameList(stringBuilder.toString()); + } + if (employee.getRoleNameList() != null && employee.getRoleNameList().size() != 0) { + StringBuilder stringBuilder = new StringBuilder(); + for (int i = 0; i < employee.getRoleNameList().size(); i++) { + if (i == employee.getRoleNameList().size() - 1) { + stringBuilder.append(employee.getRoleNameList().get(i)); + } else { + stringBuilder.append(employee.getRoleNameList().get(i)).append(","); + } + } + employeeExcelResponse.setRoleNameList(stringBuilder.toString()); + } + BeanUtils.copyProperties(employee, employeeExcelResponse); + excelResponse.add(employeeExcelResponse); + } + ExcelUtil.writeExcelWithSheets(response, excelResponse, "员工信息一览表", "employee", new EmployeeExcelResponse()) .finish(); return true; } catch (Exception e) { diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java index 9ab0ce68..824725c6 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java @@ -98,9 +98,9 @@ public class PromptSuccess { public static final String DB_B_NAME = "担保部B角"; // 担保部B角 - public static final String PERSONAL_START_CODE = "DQCZ-0001"; + public static final String PERSONAL_START_CODE = "DQCZ-0000"; - public static final String COMPANY_START_CODE = "DQCQ-0001"; + public static final String COMPANY_START_CODE = "DQCQ-0000"; public static final String PERSONAL_CODE = "DQCZ-"; diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java index 4fefa138..5d31bfbc 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java @@ -6,10 +6,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; import java.io.Serializable; +import java.util.Date; /** * 导出excel模板(企业类型) + * * @auther River * @date 2020/10/9 11:38 */ @@ -19,93 +23,64 @@ public class CompanyTemplate extends BaseRowModel implements Serializable { /** * 客户经理 */ - @ExcelProperty(value = "客户经理(请填写本公司存在的员工姓名)",index = 0) + @ExcelProperty(value = "客户经理(请填写本公司存在的员工姓名)", index = 0) private String manager; /** * 客户名称 */ - @ExcelProperty(value = "姓名",index = 1) + @ExcelProperty(value = "客户名称", index = 1) private String name; - /** - * 联系地址 - */ - @ExcelProperty(value = "地址",index = 2) - private String addr; - /** - * 联系电话 - */ - @ExcelProperty(value = "电话",index = 3) + + @ExcelProperty(value = "社会统一代码", index = 2) + private String socialUnifiedCode; + + @ExcelProperty(value = "联系电话", index = 3) private String phone; - /** - * 注册资金 - */ - @ExcelProperty(value = "注册资金",index = 4) + + @ExcelProperty(value = "注册时间(eg:2020-02-20)", index = 4) + private Date registerTime; + + @ExcelProperty(value = "注册资金", index = 5) private String registeredCapital; - /** - * 所属行业 - */ - @ExcelProperty(value = "所属行业",index = 5) - private String industry; - /** - * 成立年限 - */ - @ExcelProperty(value = "成立年限",index = 6) - private Integer years; - /** - * 所在区域 - */ - @ExcelProperty(value = "所在区域",index = 7) - private String region; - /** - * 股东名称 - */ - @ExcelProperty(value = "股东名称",index = 8) - private String shareholder; - /** - * 关联企业 - */ - @ExcelProperty(value = "关联企业",index = 9) - private String affiliatedCompany; - /** - * 员工个数 - */ - @ExcelProperty(value = "员工个数",index = 10) + + @ExcelProperty(value = "员工人数", index = 6) private String empNum; - /** - * 联系人 - */ - @ExcelProperty(value = "联系人",index = 11) + + @ExcelProperty(value = "注册地址", index = 7) + private String registerAddr; + + @ExcelProperty(value = "联系人", index = 8) private String linkman; - /** - * 业务来源 - */ - @ExcelProperty(value = "业务来源",index = 12) + + @ExcelProperty(value = "联系人的联系电话", index = 9) + private String linkPhone; + + @ExcelProperty(value = "经营地址", index = 10) + private String businessAddr; + + @ExcelProperty(value = "业务来源", index = 11) private String businessSource; - /** - * 经营范围 - */ - @ExcelProperty(value = "经营范围",index = 13) + @ExcelProperty(value = "经营范围", index = 12) private String businessScope; - /** * 法人-姓名 */ - @ExcelProperty(value = "法人-姓名",index = 14) + @ExcelProperty(value = "法人-姓名", index = 13) private String legalName; - @ExcelProperty(value = "法人-性别 1、男，0、女",index = 15) + @ExcelProperty(value = "法人-性别 1、男，0、女", index = 14) private Integer legalGender; - @ExcelProperty(value = "法人-身份证号",index = 16) + @ExcelProperty(value = "法人-身份证号", index = 15) private String legalIdNumber; - @ExcelProperty(value = "法人-户口所在地",index = 17) + @ExcelProperty(value = "法人-户口所在地", index = 16) private String legalHukouAddr; - @ExcelProperty(value = "法人-联系电话",index = 18) + @ExcelProperty(value = "法人-联系电话", index = 17) private String legalPhone; - @ExcelProperty(value = "法人-家庭住址",index = 19) + @ExcelProperty(value = "法人-家庭住址", index = 18) private String legalHomeAddr; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java index be9bec0b..6db6ae44 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java @@ -35,89 +35,55 @@ public class CustomerCompanyVO extends BaseRowModel implements Serializable { */ @ExcelProperty(value = "姓名",index = 2) private String name; - /** - * 联系地址 - */ - @ExcelProperty(value = "地址",index = 3) - private String addr; - /** - * 联系电话 - */ - @ExcelProperty(value = "电话",index = 4) + + @ExcelProperty(value = "社会统一代码", index = 3) + private String socialUnifiedCode; + + @ExcelProperty(value = "联系电话", index = 4) private String phone; - /** - * 注册资金 - */ - @ExcelProperty(value = "注册资金",index = 5) + + @ExcelProperty(value = "注册时间", index = 5) + private Date registerTime; + + @ExcelProperty(value = "注册资金", index = 6) private String registeredCapital; - /** - * 所属行业 - */ - @ExcelProperty(value = "所属行业",index = 6) - private String industry; - /** - * 成立年限 - */ - @ExcelProperty(value = "成立年限",index = 7) - private Integer years; - /** - * 所在区域 - */ - @ExcelProperty(value = "所在区域",index = 8) - private String region; - /** - * 股东名称 - */ - @ExcelProperty(value = "股东名称",index = 9) - private String shareholder; - /** - * 关联企业 - */ - @ExcelProperty(value = "关联企业",index = 10) - private String affiliatedCompany; - /** - * 员工个数 - */ - @ExcelProperty(value = "员工个数",index = 11) + + @ExcelProperty(value = "员工人数", index = 7) private String empNum; - /** - * 联系人 - */ - @ExcelProperty(value = "联系人",index = 12) + + @ExcelProperty(value = "注册地址", index = 8) + private String registerAddr; + + @ExcelProperty(value = "联系人", index = 9) private String linkman; - /** - * 业务来源 - */ - @ExcelProperty(value = "业务来源",index = 13) - private String businessSource; - @ExcelProperty(value = "经营范围",index = 14) - private String businessScope; + @ExcelProperty(value = "联系人的联系电话", index = 10) + private String linkPhone; - @ExcelProperty(value = "经营地址",index = 15) + @ExcelProperty(value = "经营地址", index = 11) private String businessAddr; - @ExcelProperty(value = "注册时间",index = 16) - private Date registerTime; + @ExcelProperty(value = "业务来源", index = 12) + private String businessSource; - @ExcelProperty(value = "注册地址",index = 17) - private String registerAddr; + @ExcelProperty(value = "经营范围", index = 13) + private String businessScope; - @ExcelProperty(value = "法人-身份证号",index = 18) + @ExcelProperty(value = "法人-身份证号",index = 14) private String legalIdNumber; - @ExcelProperty(value = "法人-户口所在地",index = 19) + @ExcelProperty(value = "法人-户口所在地",index = 15) private String legalHukouAddr; - @ExcelProperty(value = "法人-联系电话",index = 20) + @ExcelProperty(value = "法人-联系电话",index = 16) private String legalPhone; - @ExcelProperty(value = "法人-家庭住址",index = 21) + @ExcelProperty(value = "法人-家庭住址",index = 17) private String legalHomeAddr; - @ExcelProperty(value = "法人-性别 1、男，0、女",index = 22) + @ExcelProperty(value = "法人-性别 1、男，0、女",index = 18) private Integer legalGender; - @ExcelProperty(value = "法人-姓名",index = 23) + @ExcelProperty(value = "法人-姓名",index = 19) private String legalName; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/EmployeeExcelResponse.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/EmployeeExcelResponse.java new file mode 100644 index 00000000..5d560827 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/EmployeeExcelResponse.java @@ -0,0 +1,53 @@ +package com.daqing.framework.domain.hrms.response; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.metadata.BaseRowModel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; +import org.springframework.data.annotation.Transient; + +import java.io.Serializable; +import java.util.Date; + +/** + * 员工列表导出到excel实体类 + * + * @auther River + * @date 2021/1/4 15:27 + */ +@Data +@ToString +public class EmployeeExcelResponse extends BaseRowModel implements Serializable { + + @ApiModelProperty("姓名") + @ExcelProperty(value = "姓名",index = 0) + private String name; + + @ExcelProperty(value = "账号",index = 1) + @ApiModelProperty("账号") + private String account; + + @ExcelProperty(value = "工号",index = 2) + @ApiModelProperty("工号") + private String jobNumber; + + @ExcelProperty(value = "部门",index = 3) + @ApiModelProperty("部门") + @Transient + private String departmentNameList; + + @ExcelProperty(value = "职位",index = 4) + @ApiModelProperty("职位") + private String positionNameList; + + @ExcelProperty(value = "角色",index = 5) + @ApiModelProperty("角色") + private String roleNameList; + + @ExcelProperty(value = "创建时间",index = 6) + @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; +} From d0744f7ef31041274dacb13b21edeffb746c0fc4 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Tue, 5 Jan 2021 14:25:06 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DgEfficiencyController.java | 66 ++++++++++------- .../PersonalEfficiencyListRequest.java | 2 +- .../guarantee/model/response/NumResponse.java | 22 ++++++ .../PersonalEfficiencyListResponse.java | 14 +--- .../daqing/financial/guarantee/util/R.java | 71 +++++++++++++++++++ .../financial/guarantee/util/ResultCode.java | 13 ++++ .../utils/excel/TaskNodeConverter.java | 2 +- 7 files changed, 149 insertions(+), 41 deletions(-) create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/NumResponse.java create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/R.java create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/ResultCode.java diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java index ebb70ad4..67136272 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java @@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSONObject; import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest; import com.daqing.financial.guarantee.model.request.PersonalEfficiencyListRequest; +import com.daqing.financial.guarantee.model.response.NumResponse; import com.daqing.financial.guarantee.model.response.PersonalEfficiencyListResponse; import com.daqing.financial.guarantee.service.IDgEfficiencyService; import com.daqing.financial.guarantee.util.DateUtils; +import com.daqing.financial.guarantee.util.R; import com.daqing.financial.guarantee.util.TaskNodeUtil; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.ResponseResult; @@ -62,7 +64,7 @@ public class DgEfficiencyController { @ApiOperation(value = "个人效率记录列表") @PostMapping("/personalEfficiencyList") - public ResponseResult personalEfficiencyList( + public R personalEfficiencyList( @ApiParam(name = "personalEfficiencyListRequest", value = "个人效率列表查询对象") @RequestBody PersonalEfficiencyListRequest personalEfficiencyListRequest){ List responseList = dgEfficiencyService.queryPersonalEfficiencyList(); @@ -87,23 +89,54 @@ public class DgEfficiencyController { } } } + + NumResponse numResponse = new NumResponse(); + //转换任务节点，并统计操作状态个数 + responseList.forEach(personalEfficiencyListResponse -> { + String taskNode = personalEfficiencyListResponse.getTaskNode(); + if (taskNode!=null){ + String converter = TaskNodeUtil.converter(taskNode); + personalEfficiencyListResponse.setTaskNode(converter); + } + if (personalEfficiencyListResponse.getOperatingStatus()!=null){ + switch (personalEfficiencyListResponse.getOperatingStatus()){ + case 0: + numResponse.setInitiateNum(numResponse.getInitiateNum()+1); + break; + case 1: + numResponse.setPendingNum(numResponse.getPendingNum()+1); + break; + case 2: + numResponse.setProcessedNum(numResponse.getProcessedNum()+1); + break; + default: + numResponse.setInitiateNum(0); + numResponse.setPendingNum(0); + numResponse.setProcessedNum(0); + break; + } + } + }); //根据条件筛选数据 + //迭代器进行筛选 if (personalEfficiencyListRequest.getOperatingStatus()!=null){ // 已发起 if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_LAUNCH)){ - responseList = responseList.stream().filter(p -> p.getOperatingStatus().equals(StatusCode.CZ_LAUNCH)).collect(Collectors.toList()); + responseList.removeIf(next -> !next.getOperatingStatus().equals(StatusCode.CZ_LAUNCH)); + // responseList = responseList.stream().filter(p -> !p.getOperatingStatus().equals(StatusCode.CZ_LAUNCH)).collect(Collectors.toList()); // 待处理 }else if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){ - responseList = responseList.stream().filter(p -> p.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)).collect(Collectors.toList()); + responseList.removeIf(next -> !next.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)); + // responseList = responseList.stream().filter(p -> !p.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)).collect(Collectors.toList()); // 已处理 }else if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)){ - responseList = responseList.stream().filter(p -> p.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)).collect(Collectors.toList()); + responseList.removeIf(next -> !next.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)); + // responseList = responseList.stream().filter(p -> !p.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)).collect(Collectors.toList()); } } - // 时间筛选(固定时间) if (personalEfficiencyListRequest.getCreateFixedTime() != null && personalEfficiencyListRequest.getStartTime() == null && personalEfficiencyListRequest.getEndTime() == null) { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); switch (personalEfficiencyListRequest.getCreateFixedTime()) { case 0: personalEfficiencyListRequest.setStartTime(dateFormat.format(DateUtils.getDayBegin())); @@ -144,26 +177,7 @@ public class DgEfficiencyController { } } } - //转换任务节点，并统计操作状态个数 - responseList.forEach(personalEfficiencyListResponse -> { - String taskNode = personalEfficiencyListResponse.getTaskNode(); - if (taskNode!=null){ - String converter = TaskNodeUtil.converter(taskNode); - personalEfficiencyListResponse.setTaskNode(converter); - } - if (personalEfficiencyListResponse.getOperatingStatus()!=null){ - switch (personalEfficiencyListResponse.getOperatingStatus()){ - case 0: - personalEfficiencyListResponse.setInitiateNum(personalEfficiencyListResponse.getInitiateNum()+1); - case 1: - personalEfficiencyListResponse.setPendingNum(personalEfficiencyListResponse.getPendingNum()+1); - case 2: - personalEfficiencyListResponse.setProcessedNum(personalEfficiencyListResponse.getProcessedNum()+1); - } - } - }); - - return ResponseResult.SUCCESS(responseList); + return R.ok().data("responseList",responseList).data("statistics",numResponse); } public static long getLongDate(String stringDate){ diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java index 91571f33..c37fff38 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java @@ -25,6 +25,6 @@ public class PersonalEfficiencyListRequest { @ApiModelProperty("结束时间") private String endTime; - @ApiModelProperty("操作状态") + @ApiModelProperty("操作状态，") private Integer operatingStatus; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/NumResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/NumResponse.java new file mode 100644 index 00000000..69dfd3d3 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/NumResponse.java @@ -0,0 +1,22 @@ +package com.daqing.financial.guarantee.model.response; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author chen + * @DATE 2021/1/5 11:32 + * @Version 1.0 + */ +@Data +public class NumResponse { + + @ApiModelProperty("发起数") + private Integer initiateNum = 0; + + @ApiModelProperty("待处理数") + private Integer pendingNum = 0; + + @ApiModelProperty("已处理数") + private Integer processedNum = 0; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java index 50d80a57..0b03da74 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java @@ -21,18 +21,6 @@ public class PersonalEfficiencyListResponse { @ApiModelProperty(value = "业务id") private Integer businessId; - @ExcelIgnore - @ApiModelProperty("发起数") - private Integer initiateNum = 0; - - @ExcelIgnore - @ApiModelProperty("待处理数") - private Integer pendingNum = 0; - - @ExcelIgnore - @ApiModelProperty("已处理数") - private Integer processedNum = 0; - @ExcelIgnore @ApiModelProperty(value = "提单人") private Integer applicantId; @@ -62,7 +50,7 @@ public class PersonalEfficiencyListResponse { private String taskNode; @ApiModelProperty("审批状态") - @ExcelProperty(value = "审核状态",index = 7,converter = ApprovalStatusConverter.class) + @ExcelProperty(value = "审批状态",index = 7,converter = ApprovalStatusConverter.class) private Integer approveStatus; @ApiModelProperty("业务状态") diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/R.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/R.java new file mode 100644 index 00000000..9e8017b3 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/R.java @@ -0,0 +1,71 @@ +package com.daqing.financial.guarantee.util; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.HashMap; +import java.util.Map; + +/** + * @Author chen + * @DATE 2021/1/5 11:43 + * @Version 1.0 + */ +@Data +public class R { + + @ApiModelProperty(value = "是否成功") + private Boolean success; + + @ApiModelProperty(value = "返回码") + private Integer code; + + @ApiModelProperty(value = "返回消息") + private String message; + + @ApiModelProperty(value = "返回数据") + private Map data = new HashMap(); + + private R(){} + + public static R ok(){ + R r = new R(); + r.setSuccess(true); + r.setCode(ResultCode.SUCCESS); + r.setMessage(ResultCode.SUCCESS_MESSAGE); + return r; + } + + public static R error(){ + R r = new R(); + r.setSuccess(false); + r.setCode(ResultCode.FAILURE); + r.setMessage(ResultCode.FAILURE_MESSAGE); + return r; + } + + public R success(Boolean success){ + this.setSuccess(success); + return this; + } + + public R message(String message){ + this.setMessage(message); + return this; + } + + public R code(Integer code){ + this.setCode(code); + return this; + } + + public R data(String key, Object value){ + this.data.put(key, value); + return this; + } + + public R data(Map map){ + this.setData(map); + return this; + } +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/ResultCode.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/ResultCode.java new file mode 100644 index 00000000..a1c18c85 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/ResultCode.java @@ -0,0 +1,13 @@ +package com.daqing.financial.guarantee.util; + +/** + * @Author chen + * @DATE 2021/1/5 11:43 + * @Version 1.0 + */ +public interface ResultCode { + Integer SUCCESS = 10000;//成功 + Integer FAILURE = 20000;//失败 + String SUCCESS_MESSAGE = "成功"; + String FAILURE_MESSAGE = "失败"; +} diff --git a/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java index 234c334e..8df4881c 100644 --- a/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java +++ b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java @@ -45,7 +45,7 @@ public class TaskNodeConverter implements Converter { * 这里是写的时候会调用 * * @param value - * NotNull + * NotNull * @param contentProperty * Nullable * @param globalConfiguration From 8664c0d350ba569b61f89b7ee3ff443524214c3b Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Tue, 5 Jan 2021 14:59:58 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financial/guarantee/controller/DgEfficiencyController.java | 2 +- .../guarantee/model/request/PersonalEfficiencyListRequest.java | 2 +- .../daqing/financial/guarantee/model/response/NumResponse.java | 2 +- .../model/response/PersonalEfficiencyListResponse.java | 2 +- .../src/main/java/com/daqing/financial/guarantee/util/R.java | 2 +- .../java/com/daqing/financial/guarantee/util/ResultCode.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java index 67136272..1683d026 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java @@ -62,7 +62,7 @@ public class DgEfficiencyController { return ResponseResult.SUCCESS(result); } - @ApiOperation(value = "个人效率记录列表") + @ApiOperation(value = "个人效率记录列表 ") @PostMapping("/personalEfficiencyList") public R personalEfficiencyList( @ApiParam(name = "personalEfficiencyListRequest", value = "个人效率列表查询对象") diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java index c37fff38..91571f33 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java @@ -25,6 +25,6 @@ public class PersonalEfficiencyListRequest { @ApiModelProperty("结束时间") private String endTime; - @ApiModelProperty("操作状态，") + @ApiModelProperty("操作状态") private Integer operatingStatus; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/NumResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/NumResponse.java index 69dfd3d3..f5de0dfd 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/NumResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/NumResponse.java @@ -17,6 +17,6 @@ public class NumResponse { @ApiModelProperty("待处理数") private Integer pendingNum = 0; - @ApiModelProperty("已处理数") + @ApiModelProperty("已处理数 ") private Integer processedNum = 0; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java index 0b03da74..41f0ec5e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java @@ -18,7 +18,7 @@ import lombok.Data; public class PersonalEfficiencyListResponse { @ExcelIgnore - @ApiModelProperty(value = "业务id") + @ApiModelProperty(value = " 业务id") private Integer businessId; @ExcelIgnore diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/R.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/R.java index 9e8017b3..4f8360d4 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/R.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/R.java @@ -14,7 +14,7 @@ import java.util.Map; @Data public class R { - @ApiModelProperty(value = "是否成功") + @ApiModelProperty(value = " 是否成功") private Boolean success; @ApiModelProperty(value = "返回码") diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/ResultCode.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/ResultCode.java index a1c18c85..a8f8edd0 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/ResultCode.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/ResultCode.java @@ -6,7 +6,7 @@ package com.daqing.financial.guarantee.util; * @Version 1.0 */ public interface ResultCode { - Integer SUCCESS = 10000;//成功 + Integer SUCCESS = 10000;// 成功 Integer FAILURE = 20000;//失败 String SUCCESS_MESSAGE = "成功"; String FAILURE_MESSAGE = "失败";