Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAuditProcessController.java

@@ -2,9 +2,11 @@ package com.daqing.financial.guarantee.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.daqing.financial.guarantee.feign.HrmsFeignService;
 import com.daqing.financial.guarantee.service.IDgAuditProcessService;
 import com.daqing.framework.domain.guarantee.DgAuditProcess;
 import com.daqing.framework.domain.guarantee.po.ProcessPO;
+import com.daqing.framework.domain.hrms.RoleEntity;
 import com.daqing.framework.model.response.ResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,6 +36,9 @@ public class DgAuditProcessController {
     @Autowired
     private IDgAuditProcessService auditProcessService;
 
+    @Autowired
+    private HrmsFeignService hrmsFeignService;
+
     @ApiOperation(value = "审核流程进程列表")
     @GetMapping("/auditProcessList")
     public ResponseResult processList(
@@ -42,6 +47,16 @@ public class DgAuditProcessController {
             @ApiParam(name = "processId", value = "流程id", required = false)
             @RequestParam(required = false) String processId){
         List<DgAuditProcess> processList = auditProcessService.queryProcessList(businessId,processId);
+        ResponseResult responseResult = hrmsFeignService.roleList();
+        //获取角色名称信息
+        List<RoleEntity> list = (List<RoleEntity>) responseResult.getData();
+        for (DgAuditProcess process:processList){
+            for (RoleEntity roleEntity:list){
+                if (process.getRoleId().equals(roleEntity.getId())){
+                    process.setDeptName(roleEntity.getName());
+                }
+            }
+        }
         return ResponseResult.SUCCESS(processList);
     }
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java

@@ -90,4 +90,7 @@ public interface HrmsFeignService {
 
     @GetMapping("/hrms/permission/info")
     ResponseResult info(@RequestParam("id") Long id);*/
+
+    @GetMapping("/hrms/role/roleList")
+    ResponseResult roleList();
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java

@@ -248,40 +248,6 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                 roleList.add(Integer.parseInt(id));
             }
         }
-        //查询用户处理过的业务
-        QueryWrapper<DgAuditProcess> wrapper = new QueryWrapper<>();
-        wrapper.eq("user_id", currentUser).groupBy("business_id").select("business_id");
-        List<DgAuditProcess> auditProcessList = dgAuditProcessMapper.selectList(wrapper);
-        if (auditProcessList != null && auditProcessList.size() != 0) {
-            List<Integer> 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<String, Object> 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<Integer, Object> hashMap = Maps.newHashMap();
         //角色不为空
@@ -290,7 +256,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             //业务申请列表查询
             IPage<BusinessApplicationListResponse> positionVO = applyAmountListMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId());
             List<BusinessApplicationListResponse> records = positionVO.getRecords();
-                if (records != null && records.size() != 0) {
+            if (records!=null && records.size()!=0){
                 records.forEach(businessApplicationListResponse -> {
                     StatusPO statusPO = new StatusPO();
                     Integer businessId = businessApplicationListResponse.getBusinessId();
@@ -312,7 +278,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             // 担保部调查列表
             IPage<GuaranteeListResponse> positionVO = guaranteeAssignUserMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null);
             List<GuaranteeListResponse> records = positionVO.getRecords();
-                if (records != null && records.size() != 0) {
+            if (records!=null && records.size()!=0) {
                 records.forEach(guaranteeListResponse -> {
                     StatusPO statusPO = new StatusPO();
                     Integer businessId = guaranteeListResponse.getBusinessId();
@@ -334,7 +300,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             // 资产部调查列表
             IPage<AssetsInvestigationListResponse> positionVO = assetsInvestigationMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null);
             List<AssetsInvestigationListResponse> records = positionVO.getRecords();
-                if (records != null && records.size() != 0) {
+            if (records!=null && records.size()!=0) {
                 records.forEach(assetsInvestigationListResponse -> {
                     StatusPO statusPO = new StatusPO();
                     Integer businessId = assetsInvestigationListResponse.getBusinessId();
@@ -356,7 +322,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             // 信息部调查列表
             IPage<MessageInvestigationListResponse> positionVO = messageInvestigationMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null);
             List<MessageInvestigationListResponse> records = positionVO.getRecords();
-                if (records != null && records.size() != 0) {
+            if (records!=null && records.size()!=0) {
                 records.forEach(messageInvestigationListResponse -> {
                     StatusPO statusPO = new StatusPO();
                     Integer businessId = messageInvestigationListResponse.getBusinessId();
@@ -374,12 +340,12 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             }
         }
         //担保部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))) {
+        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<DgComplianceInvestigationResponse> list = complianceInvestigationMapper.list(new Page(1, size), dgComplianceInvestigationRequest, roleList, currentUser);
             List<DgComplianceInvestigationResponse> records = list.getRecords();
-                if (records != null && records.size() != 0) {
+            if (records!=null && records.size()!=0) {
                 records.forEach(dgComplianceInvestigationResponse -> {
                     StatusPO statusPO = new StatusPO();
                     Integer businessId = dgComplianceInvestigationResponse.getBusinessId();
@@ -400,7 +366,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         if (roleIdList.contains(String.valueOf(PromptSuccess.GZU_ID))) {
             IPage<DgWorkConferencePO> list = workConferenceConsiderMapper.list(new Page(1, size), "", roleList, currentUser);
             List<DgWorkConferencePO> records = list.getRecords();
-                if (records != null && records.size() != 0) {
+            if (records!=null && records.size()!=0) {
                 records.forEach(dgWorkConferencePO -> {
                     StatusPO statusPO = new StatusPO();
                     Integer businessId = dgWorkConferencePO.getBusinessId();
@@ -418,10 +384,10 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             }
         }
         //担保部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))) {
+        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<DgLoanCommitteeConsiderResponse> list = loanCommitteeConsiderMapper.list(new Page(1, size), "", roleList, currentUser);
             List<DgLoanCommitteeConsiderResponse> records = list.getRecords();
-                if (records != null && records.size() != 0) {
+            if (records!=null && records.size()!=0) {
                 records.forEach(dgLoanCommitteeConsiderResponse -> {
                     StatusPO statusPO = new StatusPO();
                     Integer businessId = dgLoanCommitteeConsiderResponse.getBusinessId();
@@ -439,11 +405,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             }
         }
         //法规经理、担保部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))) {
+        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<GuaranteeLetterListResponse> iPage = guaranteeLetterAssignUserMapper.pageByCondition(new Page(1, size), currentUser, roleIdList, null, null);
             List<GuaranteeLetterListResponse> records = iPage.getRecords();
-                if (records != null && records.size() != 0) {
+            if (records!=null && records.size()!=0) {
                 records.forEach(guaranteeLetterListResponse -> {
                     StatusPO statusPO = new StatusPO();
                     String name = guaranteeLetterListResponse.getName();
@@ -461,11 +427,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             }
         }
         //财务部、法规经理
-            if (roleIdList.contains(String.valueOf(PromptSuccess.CWB_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))) {
+        if (roleIdList.contains(String.valueOf(PromptSuccess.CWB_ID))|roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))) {
             //回款确认
             IPage<PaymentConfirmationListResponse> iPage = paymentConfirmationConsiderMapper.pageByCondition(new Page(1, size), roleIdList, currentUser, null, null);
             List<PaymentConfirmationListResponse> records = iPage.getRecords();
-                if (records != null && records.size() != 0) {
+            if (records!=null && records.size()!=0) {
                 records.forEach(paymentConfirmationListResponse -> {
                     StatusPO statusPO = new StatusPO();
                     String name = paymentConfirmationListResponse.getName();
@@ -487,7 +453,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             //放款通知
             IPage<LoanNoticeListResponse> iPage = loanNoticeMapper.pageByCondition(new Page(1, size), roleIdList, currentUser, null, null);
             List<LoanNoticeListResponse> records = iPage.getRecords();
-                if (records != null && records.size() != 0) {
+            if (records!=null && records.size()!=0) {
                 records.forEach(loanNoticeListResponse -> {
                     StatusPO statusPO = new StatusPO();
                     String name = loanNoticeListResponse.getName();
@@ -504,31 +470,45 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                 });
             }
         }
-            //再次循环，拼接数据
+        //遍历map，key值为业务id
-            efficiencyList.forEach(personalEfficiencyListResponse -> {
+        for (Integer key : hashMap.keySet()) {
-                Integer businessId = personalEfficiencyListResponse.getBusinessId();
+            PersonalEfficiencyListResponse efficiencyListResponse = new PersonalEfficiencyListResponse();
-                Object o = hashMap.get(businessId);
+            efficiencyListResponse.setBusinessId(key);
-                //有数据
+            StatusPO po = (StatusPO)hashMap.get(key);
-                if (ObjectUtil.isNotNull(o)) {
+            Integer businessStatus = po.getBusinessStatus();
-                    //强制转换
+            Integer operatingStatus = po.getOperatingStatus();
-                    if (o instanceof StatusPO) {
+            Integer processId = po.getProcessId();
-                        StatusPO statusPO = (StatusPO) o;
+            Integer status = po.getStatus();
-                        String name = statusPO.getName();
+            String name = po.getName();
-                        Integer operatingStatus = statusPO.getOperatingStatus();
+            //根据业务id查询业务
-                        Integer processId = statusPO.getProcessId();
+            DgApplyAmountInfo dgApplyAmountInfo = applyAmountInfoMapper.selectById(key);
-                        Integer status = statusPO.getStatus();
+            //业务申请日期
-                        Integer businessStatus = statusPO.getBusinessStatus();
+            Date createTime = dgApplyAmountInfo.getCreateTime();
-                        personalEfficiencyListResponse.setTaskNode(String.valueOf(processId));
+            //客户公司id
-                        personalEfficiencyListResponse.setBusinessStatus(businessStatus);
+            Integer companyId = dgApplyAmountInfo.getCompanyId();
-                        personalEfficiencyListResponse.setOperatingStatus(operatingStatus);
+            //提单人id
-                        personalEfficiencyListResponse.setApproveStatus(status);
+            Integer presenterId = dgApplyAmountInfo.getPresenterId();
-                        personalEfficiencyListResponse.setClientName(name);
+            efficiencyListResponse.setOperatingStatus(operatingStatus);
-                    }
+            efficiencyListResponse.setApproveStatus(status);
-                }
+            efficiencyListResponse.setBusinessStatus(businessStatus);
-                String timeConsuming = personalEfficiencyListResponse.getTimeConsuming();
+            efficiencyListResponse.setTaskNode(String.valueOf(processId));
-                String totalTimeConsuming = countTime(timeConsuming);
+            efficiencyListResponse.setClientName(name);
-                personalEfficiencyListResponse.setTimeConsuming(totalTimeConsuming);
+            efficiencyListResponse.setApplicantId(presenterId);
-            });
+            efficiencyListResponse.setApplicationDate(new SimpleDateFormat("yyyy-MM-dd").format(createTime));
+            efficiencyListResponse.setClientName(String.valueOf(companyId));
+            //用户处理过业务,统计耗时
+            QueryWrapper<DgAuditProcess> wrapper = new QueryWrapper<>();
+            wrapper.eq("user_id", currentUser).eq("business_id",key);
+            List<DgAuditProcess> auditProcessList = dgAuditProcessMapper.selectList(wrapper);
+            if (auditProcessList != null && auditProcessList.size() != 0) {
+                //获取累计耗时，完成时间
+                HashMap<String, Object> hashMapTime = getTime(key, currentUser);
+                Object countTime = hashMapTime.get("countTime");
+                Object endTime = hashMapTime.get("endTime");
+                efficiencyListResponse.setTimeConsuming(countTime(String.valueOf(countTime)));
+                efficiencyListResponse.setCompleteTime(String.valueOf(endTime));
+            }
+            efficiencyList.add(efficiencyListResponse);
         }
         return efficiencyList;
     }
@@ -541,7 +521,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         wrapper.eq("business_id", businessId).orderByAsc("create_time");
         List<DgAuditProcess> auditProcessList = dgAuditProcessMapper.selectList(wrapper);
         long countTime = 0L;
-        if (auditProcessList.size() > 1) {
+        if (auditProcessList.size()>1){
             //遍历业务流程数据，统计该用户的耗时
             for (int i = 1; i <= auditProcessList.size() - 1; i++) {
                 //从第二条数据开始，获取该数据
@@ -571,11 +551,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
 
     public static String countTime(String totalTime) {
         long time = Long.parseLong(totalTime);
-        long days = time / (1000 * 60 * 60 * 24);
+        long days = time/ (1000 * 60 * 60 * 24);
-        long hours = (time % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60);
+        long hours = (time% (1000 * 60 * 60 * 24)) / (1000 * 60 * 60);
-        long minutes = (time % (1000 * 60 * 60)) / (1000 * 60);
+        long minutes = (time% (1000 * 60 * 60)) / (1000 * 60);
-        long seconds = (time % (1000 * 60)) / 1000;
+        long seconds = (time% (1000 * 60)) / 1000;
-        return days + "天" + hours + "小时" + minutes + "分钟";
+        return days + "天" + hours + "小时"+ minutes +"分钟";
     }
 
     /**

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAuditProcessMapper.xml

@@ -7,17 +7,17 @@
         <id column="id" property="id" />
         <result column="business_id" property="businessId" />
         <result column="approver" property="approver" />
-        <result column="dept_name" property="deptName"/>
         <result column="create_time" property="createTime" />
         <result column="status" property="status" />
         <result column="audit_opinion" property="auditOpinion" />
         <result column="reason" property="reason" />
         <result column="loan_money" property="loanMoney" />
         <result column="loan_tern" property="loanTern" />
+        <result column="role_id" property="roleId" />
     </resultMap>
 
     <select id="selectAuditProcessList" resultMap="BaseResultMap">
-        select dap.id,dap.business_id,dap.approver,dap.dept_name,dap.create_time,dap.audit_opinion,
+        select dap.id,dap.business_id,dap.approver,dap.create_time,dap.audit_opinion,dap.role_id,
         dbps.business_status as status,dap.reason,dap.loan_money,dap.loan_tern
         from dg_audit_process dap
         left join dg_business_process_status dbps on dbps.business_id = dap.business_id

dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/RoleController.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 
@@ -35,6 +36,13 @@ public class RoleController {
         return ResponseResult.SUCCESS();
     }
 
+    //查询角色名称
+    @GetMapping("/roleList")
+    public ResponseResult roleList() {
+        List<RoleEntity> list = roleService.list();
+        return ResponseResult.SUCCESS(list);
+    }
+
 
     /**
      * 信息

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java

@@ -38,6 +38,9 @@ public class DgAuditProcess implements Serializable {
     @ApiModelProperty(value = "用户id")
     private Integer userId;
 
+    @ApiModelProperty(value = "部门名称(实为角色名称)")
+    private String deptName;
+
     @ApiModelProperty(value = "部门ids")
     private String departmentId;