Merge remote-tracking branch 'origin/master'

dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml

@@ -97,8 +97,8 @@
         FROM
             dg_audit_process
         WHERE
-            ( reason != NULL OR reason != '' )
+            /*( reason != NULL OR reason != '' )*/
-            AND business_id = #{businessId}
+             business_id = #{businessId}
         ORDER BY
             create_time DESC
             LIMIT 1

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

@@ -200,7 +200,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                             // 计算当前部门在当前节点的累计时间
                             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);
+                            existMap.put(processId, (Math.abs(Long.parseLong(existTime) + Long.parseLong(time))) + "," + count);
                         }
                         hashMap.put(Integer.parseInt(departmentId), existMap);
                     }

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

@@ -188,16 +188,23 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
 //        }
 
 
-        //查询担保部经理审核的金额和期限
+/*        DgGuaranteeAssignUser assignUser1=null;
-        DgGuaranteeAssignUser assignUser1 = this.baseMapper.selectOne(new QueryWrapper<DgGuaranteeAssignUser>()
+        if(guaranteeAssignUser.getType().equals(3)){//查询担保部经理审核的金额和期限
-                .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 3));
+            assignUser1 = this.baseMapper.selectOne(new QueryWrapper<DgGuaranteeAssignUser>()
+                    .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 3));
+
+        }else{//查询担保部领导审核的金额和期限
+            assignUser1 = this.baseMapper.selectOne(new QueryWrapper<DgGuaranteeAssignUser>()
+                    .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 4));
+        }
+
         guaranteeAssignUser.setAmount(assignUser1.getAmount());
-        guaranteeAssignUser.setTerm(assignUser1.getTerm());
+        guaranteeAssignUser.setTerm(assignUser1.getTerm());*/
         DgGuaranteeAssignUserResponse assignUser = new DgGuaranteeAssignUserResponse();
         BeanUtils.copyProperties(guaranteeAssignUser,assignUser);
-        assignUser.setRemarks(assignUser1.getRemark());
+        //assignUser.setRemarks(assignUser1.getRemark());
 
-        String remarks = assignUser1.getRemark();
+        String remarks = guaranteeAssignUser.getRemark();
         if(remarks != null){
             if (remarks.length() > 0) {
                 String a = remarks.substring(1, remarks.length() - 1);