运输记录少个司机名称

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/internal/dao/TransportRecordDaoImpl.java

@@ -84,7 +84,7 @@ public class TransportRecordDaoImpl extends AbstractBaseDao implements Transport
         }
 
         if(driverUserName!=null){
-            detachedCriteria.add(Restrictions.like("driverUser.title",driverUserName,MatchMode.ANYWHERE));
+            detachedCriteria.add(Restrictions.or(Restrictions.like("driverUser.title",driverUserName,MatchMode.ANYWHERE),Restrictions.like("driverUser.username",driverUserName,MatchMode.ANYWHERE)));
         }
         if(vehicleId!=null){
             detachedCriteria.add(Restrictions.eq("transportVehicle.id",vehicleId));
@@ -155,7 +155,7 @@ public class TransportRecordDaoImpl extends AbstractBaseDao implements Transport
         detachedCriteria.setProjection(Projections.projectionList()
                 .add(Projections.alias(Projections.sum("salesRecord."+SalesRecordConstant.DEALAMOUNT),"sumCount"))
                 .add(Projections.alias(Projections.sum("salesRecord."+SalesRecordConstant.AMOUNT),"sumAmount"))
-                .add(Projections.alias(Projections.max("regionalCompany.name"),"name"))
+                .add(Projections.alias(Projections.max(SalesRecordConstant.DINASTYPE+".dinasTypeName"),"name"))
                 .add(Projections.alias(Projections.groupProperty(SalesRecordConstant.DINASTYPE+".id"),SalesRecordConstant.DINASTYPE)));
         detachedCriteria.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
         return (List<Map<String, Object>>)template.findByCriteria(detachedCriteria);

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/internal/service/TransportRecordServiceImpl.java

@@ -76,6 +76,7 @@ public class TransportRecordServiceImpl implements TransportRecordService {
         KObject saleRecord = data.get("saleRecord");
         KObject transportVehicle = data.get("transportVehicle");
         KObject code = data.get("billCode");
+        KObject driverUser = data.get("driverUser");
         String projectName = saleRecord.get(SalesRecordConstant.PROJECT).getString("projectName");
         String dinasTypeName = saleRecord.get(SalesRecordConstant.DINASTYPE).getString("dinasTypeName");
         BigDecimal dealAmount = saleRecord.getBigDecimal(SalesRecordConstant.DEALAMOUNT);
@@ -114,6 +115,7 @@ public class TransportRecordServiceImpl implements TransportRecordService {
         stringObjectHashMap.put("contactNumber",data.getString("contactNumber"));
         stringObjectHashMap.put("confirmTime",data.getString("confirmTime"));
         stringObjectHashMap.put("confirmStatus",data.getInt("confirmStatus"));
+        stringObjectHashMap.put("driverUser",driverUser.getString("title")+"("+driverUser.getString("username")+")");
     }
 
 }