From 9b3891d48df6a1f952f1e3bb4b078ac414981760 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Mon, 28 Dec 2020 18:27:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E6=95=88=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DgEfficiencyController.java | 21 ++++ .../guarantee/mapper/DgEfficiencyMapper.java | 14 ++- .../request/DgEfficiencyTeamRequest.java | 19 ++- .../model/request/DgStatisticsRequest.java | 2 - .../response/DgStatisticsListResponse.java | 10 +- .../service/IDgEfficiencyService.java | 5 + .../service/impl/DgEfficiencyServiceImpl.java | 111 ++++++++++++++++++ .../service/impl/DgStatisticsServiceImpl.java | 13 +- .../financial/guarantee/util/DateUtils.java | 55 ++++++++- .../mapper/guarantee/DgEfficiencyMapper.xml | 97 ++++++--------- .../mapper/guarantee/DgStatisticsMapper.xml | 23 ++-- .../guarantee/po/DgEfficiencyPersonPO.java | 57 --------- .../guarantee/po/DgEfficiencyTeamPO.java | 57 --------- .../domain/guarantee/po/DgStatisticsPO.java | 11 +- .../guarantee/po/DgStatisticsRefusePO.java | 16 +-- .../guarantee/po/DgTeamEfficiencyPO.java | 38 ++++++ 16 files changed, 311 insertions(+), 238 deletions(-) delete mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyPersonPO.java delete mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyTeamPO.java create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgTeamEfficiencyPO.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 7ca8f764..d87be3c8 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,5 +1,13 @@ package com.daqing.financial.guarantee.controller; +import com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest; +import com.daqing.financial.guarantee.service.IDgEfficiencyService; +import com.daqing.framework.model.response.ResponseResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -11,5 +19,18 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("/guarantee/efficiency") +@Api(value = "流程效率", tags = "流程效率") public class DgEfficiencyController { + + @Autowired + private IDgEfficiencyService dgEfficiencyService; + + /** + * 团队效率 + */ + @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/mapper/DgEfficiencyMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgEfficiencyMapper.java index eac03286..7c7cd8c3 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 @@ -1,18 +1,22 @@ package com.daqing.financial.guarantee.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.daqing.financial.guarantee.model.request.DgEfficiencyPersonRequest; +import com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; -import com.daqing.framework.domain.guarantee.po.DgEfficiencyPersonPO; +import com.daqing.framework.domain.guarantee.po.DgTeamEfficiencyPO; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @auther River * @date 2020/11/10 11:30 */ +@Mapper public interface DgEfficiencyMapper extends BaseMapper { - IPage personList(Page page, @Param("pr")DgEfficiencyPersonRequest dgEfficiencyPersonRequest); + List queryList(@Param("et") DgEfficiencyTeamRequest dgEfficiencyTeamRequest); + + List queryBusinessId(@Param("et") DgEfficiencyTeamRequest dgEfficiencyTeamRequest); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgEfficiencyTeamRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgEfficiencyTeamRequest.java index 8ac26f5e..def08c66 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgEfficiencyTeamRequest.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgEfficiencyTeamRequest.java @@ -22,22 +22,17 @@ public class DgEfficiencyTeamRequest implements Serializable { @ApiModelProperty("申请时间,固定类型,0:今天,1:昨天,2:本周,3:本月,4:本年") private Integer createFixedTime; - @ApiModelProperty("申请时间,自定义时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date createCustomTime; - - @ApiModelProperty("流程状态,1->审核中,2->已审核,3->拒绝,4->驳回,5->撤销") + @ApiModelProperty("业务状态,0->已完成,1->已否决,3->进行中,4->已撤销") private Integer flowStatus; - @ApiModelProperty("提单人或者客户名称") - private String empOrName; - - @ApiModelProperty("该团队(部门)下所有提单人(员工)") - private List empIds; + @ApiModelProperty("部门id") + private Integer departmentId; - @ApiModelProperty("辅助字段,不用管,起始时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("起始时间") private String startTime; - @ApiModelProperty("辅助字段,不用管,结束时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("结束时间") private String endTime; } 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 e4ab59e3..85e1c8d6 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 @@ -43,6 +43,4 @@ public class DgStatisticsRequest implements Serializable { @ApiModelProperty("辅助字段,不用管,结束时间") private String endTime; - @ApiModelProperty("辅助字段,不用管,流程状态") - private String status; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsListResponse.java index 14e0f4c0..13461c23 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsListResponse.java @@ -50,13 +50,9 @@ public class DgStatisticsListResponse extends BaseRowModel implements Serializab @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; - @ApiModelProperty("当前审批人") - @ExcelProperty(value = "当前审批人",index = 7) - private String empNames; - - @ApiModelProperty("任务节点") - @ExcelProperty(value = "任务节点",index = 8) - private String taskNode; + @ApiModelProperty("完成任务节点id") + @ExcelProperty(value = "完成任务节点id",index = 8) + private Integer processId; @ApiModelProperty("最新操作时间") @ExcelProperty(value = "任务分配时间",index = 9) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java index b52c529a..bdcc58d2 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java @@ -1,7 +1,11 @@ package com.daqing.financial.guarantee.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; +import org.springframework.stereotype.Service; + +import java.util.HashMap; /** * @auther River @@ -9,4 +13,5 @@ import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; */ public interface IDgEfficiencyService extends IService { + HashMap> queryList(DgEfficiencyTeamRequest dgEfficiencyTeamRequest); } 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 d9594880..ccf33467 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 @@ -2,13 +2,124 @@ package com.daqing.financial.guarantee.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.mapper.DgEfficiencyMapper; +import com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest; import com.daqing.financial.guarantee.service.IDgEfficiencyService; +import com.daqing.financial.guarantee.util.DateUtils; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; +import com.daqing.framework.domain.guarantee.po.DgTeamEfficiencyPO; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; /** * @auther River * @date 2020/11/10 11:34 */ +@Service public class DgEfficiencyServiceImpl extends ServiceImpl implements IDgEfficiencyService { + /** + * 团队效率 + */ + @Override + public HashMap> queryList(DgEfficiencyTeamRequest dgEfficiencyTeamRequest) { + + // 时间筛选(固定时间) + if (dgEfficiencyTeamRequest.getCreateFixedTime() != null && dgEfficiencyTeamRequest.getStartTime() == null && + dgEfficiencyTeamRequest.getEndTime() == null) { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + switch (dgEfficiencyTeamRequest.getCreateFixedTime()) { + case 0: + dgEfficiencyTeamRequest.setStartTime(dateFormat.format(DateUtils.getDayBegin())); + dgEfficiencyTeamRequest.setEndTime(dateFormat.format(DateUtils.getDayEnd()));// 今天 + break; + case 1: + dgEfficiencyTeamRequest.setStartTime(dateFormat.format(DateUtils.getBeginDayOfYesterday())); + dgEfficiencyTeamRequest.setEndTime(dateFormat.format(DateUtils.getEndDayOfYesterDay()));// 昨天 + break; + case 2: + dgEfficiencyTeamRequest.setStartTime(dateFormat.format(DateUtils.getBeginDayOfWeek())); + dgEfficiencyTeamRequest.setEndTime(dateFormat.format(DateUtils.getEndDayOfWeek()));// 本周 + break; + case 3: + dgEfficiencyTeamRequest.setStartTime(dateFormat.format(DateUtils.getBeginDayOfMonth())); + dgEfficiencyTeamRequest.setEndTime(dateFormat.format(DateUtils.getEndDayOfMonth()));// 本月 + break; + case 4: + dgEfficiencyTeamRequest.setStartTime(dateFormat.format(DateUtils.getBeginDayOfYear())); + dgEfficiencyTeamRequest.setEndTime(dateFormat.format(DateUtils.getEndDayOfYear()));// 本年 + break; + default: + dgEfficiencyTeamRequest.setStartTime(null); + dgEfficiencyTeamRequest.setEndTime(null); + } + } + // 查询出所有的数据 + List teamEfficiencyList = this.getBaseMapper().queryList(dgEfficiencyTeamRequest); + List> list = new ArrayList<>(); + // 查询出所有的业务id + List businessIdList = this.getBaseMapper().queryBusinessId(dgEfficiencyTeamRequest); + // 按业务id封装为双层list形式 + for (Integer businessId : businessIdList) { + List efficiencyList = new ArrayList<>(); + for (DgTeamEfficiencyPO teamEfficiency : teamEfficiencyList) { + if (businessId.equals(teamEfficiency.getBusinessId())) { + efficiencyList.add(teamEfficiency); + } + } + list.add(efficiencyList); + } + // 返回数据格式 + HashMap> hashMap = new HashMap<>(); + String time; // 时间差 + Integer processId; // 业务节点id + String departmentIdList; // 部门id集合 + // 将数据归类 + for (List dgTeamEfficiencyList : list) { + if (dgTeamEfficiencyList.size() < 2) { + continue; + } + for (int i = dgTeamEfficiencyList.size() - 1; i > 0; i--) { + HashMap map = new HashMap<>(); + // 计算时间差 + time = DateUtils.dateDiff(dgTeamEfficiencyList.get(i - 1).getCreateTime(), dgTeamEfficiencyList.get(i).getCreateTime()) + ""; + processId = dgTeamEfficiencyList.get(i).getProcessId(); + departmentIdList = dgTeamEfficiencyList.get(i).getDepartmentId(); + map.put(processId, time + "(1)"); + String[] departmentIds = departmentIdList.split(","); + for (String departmentId : departmentIds) { + // 没有当前部门的数据,直接新建一个 + if (hashMap.get(Integer.parseInt(departmentId)) == null) { + hashMap.put(Integer.parseInt(departmentId), map); + } else { + // 有当前部门数据,则再判断是否有当前节点数据 + HashMap existMap = hashMap.get(Integer.parseInt(departmentId)); + if (existMap.get(processId) == null) { + existMap.put(processId, time + "(1)"); + } else { + // 计算当前部门在当前节点的操作次数 + int count = Integer.parseInt(existMap.get(processId).substring(existMap.get(processId).indexOf("(") + 1, + existMap.get(processId).indexOf(")"))) + 1; + // 计算当前部门在当前节点的累计时间 + String existTime = existMap.get(processId).substring(0, existMap.get(processId).indexOf("(")); + // 累计时间加上本次时间 + existMap.put(processId, (Integer.parseInt(existTime) + Integer.parseInt(time)) + "(" + count + ")"); + } + hashMap.put(Integer.parseInt(departmentId), existMap); + } + } + } + } + // 部门筛选 + if (dgEfficiencyTeamRequest.getDepartmentId() != null) { + HashMap> deptMap = new HashMap<>(); + deptMap.put(dgEfficiencyTeamRequest.getDepartmentId(), hashMap.get(dgEfficiencyTeamRequest.getDepartmentId())); + return deptMap; + } else { + return hashMap; + } + } } \ 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 844ea0a3..a9e52f76 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 @@ -226,7 +226,6 @@ public class DgStatisticsServiceImpl extends ServiceImpl iPage = this.getBaseMapper().listRefuse(new Page(page, size), dgStatisticsRequest); List dgStatisticsRefusePOList = iPage.getRecords(); if (dgStatisticsRefusePOList == null) { @@ -292,10 +291,8 @@ public class DgStatisticsServiceImpl extends ServiceImpl listRefuse = this.getBaseMapper().listRefuse(new Page(), dgStatisticsRequest); + IPage listRefuse = this.getBaseMapper().listRefuse(new Page(), new DgStatisticsRequest()); List statisticsRefusePOList = listRefuse.getRecords(); if (statisticsRefusePOList == null) { return false; @@ -353,16 +350,12 @@ public class DgStatisticsServiceImpl extends ServiceImpl - - - - - - - - - - - - - - - + SELECT p.business_id AS business_id,p.process_id AS process_id,p.department_id AS department_id,p.create_time AS create_time + FROM dg_audit_process AS p + LEFT JOIN dg_apply_amount_info AS a + ON p.business_id = a.id + LEFT JOIN dg_business_process_status AS s + ON p.business_id = s.business_id + WHERE 1 = 1 + + AND s.business_status = #{et.flowStatus} + + + AND a.create_time >= #{et.startTime} + + + AND a.create_time <= #{et.endTime} + + ORDER BY p.create_time ASC - - + SELECT p.business_id AS business_id + FROM dg_audit_process AS p + LEFT JOIN dg_apply_amount_info AS a + ON p.business_id = a.id + LEFT JOIN dg_business_process_status AS s + ON p.business_id = s.business_id + WHERE 1 = 1 + + AND s.business_status = #{et.flowStatus} + + + AND a.create_time >= #{et.startTime} + + + AND a.create_time <= #{et.endTime} + + GROUP BY business_id + 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 177bf97d..7830e8f1 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml @@ -19,10 +19,10 @@ SELECT c.name AS name,c.phone AS phone,a.presenter_id AS presenter_id,a.apply_amount AS apply_amount,a.apply_time AS apply_time, - a.business_type AS business_type,a.create_time AS create_time,a.business_code AS business_code,p.emp_name AS emp_name, - p.status AS status,p.date_time AS date_time,p.remark AS remark + a.business_type AS business_type,a.create_time AS create_time,a.business_code AS business_code,p.process_id AS process_id, + p.approver AS refuse_name,p.create_time AS refuse_time,p.audit_opinion AS refuse_opinion FROM dg_apply_amount_info AS a - LEFT JOIN dg_audit_process AS p - ON a.id = p.apply_amount_info_id + LEFT JOIN (SELECT business_id,process_id,create_time,approver,audit_opinion FROM dg_audit_process WHERE (business_id,create_time) IN + (SELECT business_id,MAX(create_time) FROM dg_audit_process GROUP BY business_id)) AS p + ON a.id = p.business_id + LEFT JOIN dg_business_process_status AS ps + ON a.id = ps.business_id + LEFT JOIN crms_company_customer AS cc + ON cc.id = a.company_id LEFT JOIN crms_customer AS c - ON a.company_id = c.id + ON cc.customer_id = c.id WHERE c.del_or_not = 0 - AND p.status LIKE CONCAT('%',#{sr.status},'%') + AND ps.business_status = 3 AND (a.business_code LIKE CONCAT('%',#{sr.codeOrName},'%') OR c.name LIKE CONCAT('%',#{sr.codeOrName},'%')) diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyPersonPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyPersonPO.java deleted file mode 100644 index 46f2c68e..00000000 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyPersonPO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.daqing.framework.domain.guarantee.po; - -import lombok.Data; -import lombok.ToString; - -import java.io.Serializable; -import java.util.Date; - -/** - * 业务效率个人 - * - * @auther River - * @date 2020/11/11 10:41 - */ -@Data -@ToString -public class DgEfficiencyPersonPO implements Serializable { - /** - * id - */ - private Integer id; - - /** - * 提单人id - */ - private Integer presenterId; - - /** - * 客户名称 - */ - private String name; - - /** - * 申请日期 - */ - private Date createTime; - - /** - * 当前审批人 - */ - private String empName; - - /** - * 任务节点 - */ - private String status; - - /** - * 完成时间 - */ - private Date finishTime; - - /** - * 流程状态 - */ - private Integer flowStatus; -} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyTeamPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyTeamPO.java deleted file mode 100644 index 48db9ed4..00000000 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyTeamPO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.daqing.framework.domain.guarantee.po; - -import lombok.Data; -import lombok.ToString; - -import java.io.Serializable; -import java.util.Date; - -/** - * 业务效率团队 - * - * @auther River - * @date 2020/11/10 11:50 - */ -@Data -@ToString -public class DgEfficiencyTeamPO implements Serializable { - /** - * id - */ - private Integer id; - - /** - * 提单人id - */ - private Integer presenterId; - - /** - * 客户名称 - */ - private String name; - - /** - * 申请日期 - */ - private Date createTime; - - /** - * 当前审批人 - */ - private String empName; - - /** - * 任务节点 - */ - private String status; - - /** - * 完成时间 - */ - private Date finishTime; - - /** - * 流程状态 - */ - private Integer flowStatus; -} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsPO.java index 02ad86bd..5cedfd30 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsPO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsPO.java @@ -39,11 +39,6 @@ public class DgStatisticsPO { */ private String applyTime; - /** - * 业务id - */ - private Integer businessId; - /** * 业务类型 */ @@ -60,12 +55,12 @@ public class DgStatisticsPO { private Date createTime; /** - * 审批角色id + * 完成任务节点id */ - private Integer roleId; + private Integer processId; /** - * 最新操作时间 + * 完成操作时间 */ private Date operationTime; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsRefusePO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsRefusePO.java index d3707bbe..90b169e8 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsRefusePO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsRefusePO.java @@ -50,27 +50,27 @@ public class DgStatisticsRefusePO implements Serializable { private String businessCode; /** - * 创建时间 + * 申请时间 */ private Date createTime; /** - * 拒绝人 + * 任务节点id */ - private String empName; + private Integer processId; /** - * 节点状态 + * 拒绝人 */ - private String status; + private String refuseName; /** - * 达到时间 + * 拒绝时间 */ - private Date dateTime; + private Date refuseTime; /** * 拒绝原因 */ - private String remark; + private String refuseOpinion; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgTeamEfficiencyPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgTeamEfficiencyPO.java new file mode 100644 index 00000000..de031ead --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgTeamEfficiencyPO.java @@ -0,0 +1,38 @@ +package com.daqing.framework.domain.guarantee.po; + +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; +import java.util.Date; + +/** + * 团队效率数据接收类 + * + * @auther River + * @date 2020/12/28 10:26 + */ +@Data +@ToString +public class DgTeamEfficiencyPO implements Serializable { + + /** + * 业务id + */ + private Integer businessId; + + /** + * 进程id + */ + private Integer processId; + + /** + * 部门ids + */ + private String departmentId; + + /** + * 创建时间 + */ + private Date createTime; +}