1103

src/main/java/com/palmnest/application/core/util/DateHelper.java

@@ -118,7 +118,14 @@ public class DateHelper {
 	}
 
 	public static void main(String[] args) {
-		System.out.println(DateHelper.getNextDay("2022-06-06",DateHelper.CURRENT_DATE));
+		//System.out.println(DateHelper.getNextDay("2022-06-06",DateHelper.CURRENT_DATE));
+
+
+		Date startTime = DateHelper.parseToDate("2022-08-10 18:20:58","yyyy-MM-dd HH:mm");
+		Date endTime = DateHelper.parseToDate("2022-08-10 18:30:01","yyyy-MM-dd HH:mm");
+		int hours = DateHelper.getMinutesBetween(startTime, endTime);
+		System.out.println("分钟："+endTime.toLocaleString());
+
 	}
 
 
@@ -510,6 +517,8 @@ public class DateHelper {
 		return Minutes.minutesBetween(new DateTime(startDate),new DateTime(endDate)).getMinutes();
 	}
 
+
+
 //	public static void main(String[] args) {
 ////		Date startTime = DateHelper.parseToDate("2020-08-2818:20","yyyy-MM-ddHH:mm");
 //////		int hours = DateHelper.getMinutesBetween(startTime, new Date());

src/main/java/com/palmnest/dao/repair/impl/RepairBillDaoImpl.java

@@ -276,13 +276,13 @@ public class RepairBillDaoImpl extends GenericDaoHibernate<RepairBill, Long> imp
 
         String sql = "UPDATE tb_repair_bills t SET t.STATUS=" + bill.getStatus() +
                 " , t.service_user= '" + bill.getServiceUser() + "', t.version=" + bill.getVersion() +
-                ", t.modify_time= '" + DateHelper.formatDate(bill.getModifyTime(), DateHelper.DATE_TIME_STRING) ;
+                ", t.modify_time= '" + DateHelper.formatDate(bill.getModifyTime(), DateHelper.DATE_TIME_STRING) + "' " ;
 
                 if(null != bill.getSingleTime()){
-                    sql = sql +  ", t.single_time= '" + DateHelper.formatDate(bill.getSingleTime(), DateHelper.DATE_TIME_STRING) ;
+                    sql = sql +  ", t.single_time= '" + DateHelper.formatDate(bill.getSingleTime(), DateHelper.DATE_TIME_STRING) +"' " ;
                 }
 
-                sql = sql +  "' where t.id=" + bill.getId() + " and t.version=" + version;
+                sql = sql +  " where t.id=" + bill.getId() + " and t.version=" + version;
 
         log.info(sql);
         return getSession().createSQLQuery(sql).executeUpdate();
@@ -299,7 +299,7 @@ public class RepairBillDaoImpl extends GenericDaoHibernate<RepairBill, Long> imp
     @Override
     public List<RepairBill> getTotalByRepairTypeId(Long repairTypeDetailId, Date dateFrom, Date dateTo, String orgIds) {
         StringBuilder sql = new StringBuilder("SELECT DISTINCT * FROM tb_repair_bills " +
-                " WHERE 1=1 and repair_type_detail =? and create_time >=?  and create_time <? ");
+                " WHERE 1=1 and repair_type_detail =? and create_time >= ?  and create_time <= ? ");
 
         if (StringUtils.isNotEmpty(orgIds)) {
             sql.append(" and orgId in (" + orgIds + ")");
@@ -311,6 +311,9 @@ public class RepairBillDaoImpl extends GenericDaoHibernate<RepairBill, Long> imp
                 .setString(1, DateHelper.formatDate(dateFrom, DateHelper.DATE_TIME_STRING))
                 .setString(2, DateHelper.formatDate(dateTo, DateHelper.DATE_TIME_STRING))
                 .list();
+                //.setString(1, DateHelper.formatDate(dateFrom, DateHelper.DATE_TIME_STRING))
+                //.setString(2, DateHelper.formatDate(dateTo, DateHelper.DATE_TIME_STRING))
+
 
         log.info("getTotalByRepairTypeId:  sql:\n" + sql);
         return list;

src/main/java/com/palmnest/service/estateserve/impl/VisitorInFoManagerImpl.java

@@ -1162,6 +1162,7 @@ public class VisitorInFoManagerImpl extends GenericManagerImpl<Object, Integer>
 			if(null!=orgId){
 				String visitorQrCode = createVisitorQrCode(orgId, visitorOrder);
 				map.put("visitorQrCode", visitorQrCode);//令令二维码
+				map.put("orgId", orgId);//令令二维码
 			}			
 		}else{
 			map.put("visitorQrCode", visitorOrder.getVisitorQrCode());//令令二维码

src/main/java/com/palmnest/service/repair/impl/RepairBillManagerImpl.java

@@ -625,8 +625,8 @@ public class RepairBillManagerImpl extends GenericManagerImpl<RepairBill, Long>
      * @return
      */
     private List<RepairBill> getBillTotalAsDay(Long repairTypeDetailId, String date, String endDate, String orgIds) {
-        Date dateFrom = DateHelper.parseToDate(date);
-        Date dateTo = DateHelper.parseToDate(endDate);
+        Date dateFrom = DateHelper.parseToDate(date  + " 00:00:00");
+        Date dateTo = DateHelper.parseToDate(endDate + " 23:59:59");
 
         return repairBillDao.getTotalByRepairTypeId(repairTypeDetailId, dateFrom, dateTo, orgIds);
     }

src/main/java/com/palmnest/service/repair/impl/RepairBillStatisticsManagerImpl.java

@@ -82,6 +82,8 @@ public class RepairBillStatisticsManagerImpl implements RepairBillStatisticsMana
             for (Element element :
                     elementList) {
 
+                LOG.info("===>小类名字：" + element.getItemname());
+
                 ElementGroup elementGroup = elementGroupManager.getElementGroupId(element.getElementGroup().getId());
                 Element element1 = elementGroupManager.getByItemCode(elementGroup.getGroupcode());//查询大类
 
@@ -203,6 +205,9 @@ public class RepairBillStatisticsManagerImpl implements RepairBillStatisticsMana
             BigDecimal todayCreate=BigDecimal.ZERO;
 
             for (RepairBill repairBill : repairBills) {
+
+                LOG.info("===>code:{}"+ repairBill.getCode());
+
                 int status = repairBill.getStatus().intValue();
 
                 if (status != CodeConstants.CANCEL &&
@@ -247,19 +252,34 @@ public class RepairBillStatisticsManagerImpl implements RepairBillStatisticsMana
                     dto.setBillStatus5Total(dto.getBillStatus5Total() + 1);
                 }
 
+                Date minutes_startTime = DateHelper.parseToDate(DateHelper.toDateTimeString(repairBill.getCreateTime()),"yyyy-MM-dd HH:mm"); //格式化到分
+                LOG.info("===>minutes_startTime:{}"+ DateHelper.toDateTimeString(minutes_startTime));
+                Date minutes_endTime = null;
+                if(null != repairBill.getEndTime()){
+                    minutes_endTime = DateHelper.parseToDate(DateHelper.toDateTimeString(repairBill.getEndTime()),"yyyy-MM-dd HH:mm"); //格式化到分
+                    LOG.info("===>minutes_endTime:{}"+ DateHelper.toDateTimeString(minutes_endTime));
+                }
+
+                Date minutes_singleTime = null;
+                if(null != repairBill.getSingleTime()){
+                    minutes_singleTime = DateHelper.parseToDate(DateHelper.toDateTimeString(repairBill.getSingleTime()),"yyyy-MM-dd HH:mm"); //格式化到分
+                    LOG.info("===>minutes_singleTime:{}"+ DateHelper.toDateTimeString(minutes_singleTime));
+                }
+
+
                 if (status == CodeConstants.COMPLETED) {
                     //已完成
                     dto.setBillStatus8Total(dto.getBillStatus8Total() + 1);
                     //已完成的总耗时
                     hours += DateHelper.getHoursBetween(repairBill.getCreateTime(), repairBill.getEndTime());
-                    completedMinutes += DateHelper.getMinutesBetween(repairBill.getCreateTime(), repairBill.getEndTime());
+                    completedMinutes += DateHelper.getMinutesBetween(minutes_startTime, minutes_endTime);
 
                 }
 
                 //已抢单-数量
                 if(null != repairBill.getSingleTime()){
                     dto.setBillSingleTotal(dto.getBillSingleTotal() + 1);
-                    singleMinutes += DateHelper.getMinutesBetween(repairBill.getCreateTime(), repairBill.getSingleTime());
+                    singleMinutes += DateHelper.getMinutesBetween(minutes_startTime, minutes_singleTime);
                 }
 
                 if (status == CodeConstants.UNAUDIT || status == CodeConstants.CANCEL) {

src/main/java/com/palmnest/webapp/controller/api/ApiRepairBillController.java

@@ -789,6 +789,9 @@ public class ApiRepairBillController extends BaseFormController {
             bill.setConfirmStatus(1); //待确认
             bill.setStatus(CodeConstants.IN_PROGRESS);//派单成功设置状态为进行中
             bill.setServiceUser(receiverId);
+            if(null == bill.getSingleTime()){
+                bill.setSingleTime(new Date()); //抢单时间
+            }
             repairBillManager.updateModel(bill);
 
             User user1 = userManager.getUserByUsername2(userName);

src/main/java/com/palmnest/webapp/controller/backstage/RepairBillController.java

@@ -481,6 +481,9 @@ public class RepairBillController extends BaseFormController {
             bill.setStatus(CodeConstants.IN_PROGRESS);//派单成功设置状态为进行中
             bill.setConfirmStatus(1);
             bill.setServiceUser(receiverId);
+            if(null == bill.getSingleTime()){
+                bill.setSingleTime(new Date());
+            }
             repairBillManager.updateModel(bill);
             for (int i = 0; i < users.length; i++) {
                 User user = userManager.get(Long.parseLong(users[i]));

src/main/java/com/palmnest/webapp/controller/wechat/VisitorUserInfoController.java

@@ -761,6 +761,11 @@ public class VisitorUserInfoController extends BaseFormController {
 				passList = (List<VisitorPassRecordVo>)map.get("passList");
 			}
 			model.addAttribute("passList", passList);
+
+			if(null != map && map.containsKey("orgId")){
+				model.addAttribute("orgId", map.get("orgId"));
+			}
+
 			return new ModelAndView("wechat/visitordetails", model.asMap());
 		} catch (Exception e) {
 			log.error("redirectFacePlusInfo:" + e.getMessage());