修改详情及移动端待办发起时间

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -5140,7 +5140,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //是否排产
 //        variables.put("isLoan1", "3".equals(busSalesOrder.getType()));//废弃
         //部门名称<客户>系列-全款/贷款销售订单
-        String orgName = busSalesOrder.getOrgName();
         String customerName = busSalesOrder.getCustomerName();
         String typeValue = "";
         if("1".equals(busSalesOrder.getPayTypeKey())){
@@ -5148,7 +5147,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }else{
             typeValue = "贷款销售订单";
         }
-        String orderNames = orgName+"<"+customerName+">系列-"+typeValue;
+        String xilie = "";
+        BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
+        ResultBean<BaseVehicleModel> vehicleModelResultBean = baseVehicleModelFeign.selectDetails(busSalesOrderModel.getModelSid());
+        if(vehicleModelResultBean.getData() != null){
+            xilie = vehicleModelResultBean.getData().getProductLineValue();
+        }
+        ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid());
+        String orgName = "";
+        if(organizationResultBean.getData() != null){
+            orgName = organizationResultBean.getData().getName();
+        }
+        String orderNames = orgName+"<"+customerName+">"+xilie+"-"+typeValue;
         variables.put("orderNames",orderNames);
         return variables;
     }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -75,6 +75,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -1978,14 +1982,17 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 .orderByTaskCreateTime().desc();
         // 查询筛选条件
         if (paramMap.get("startDate") != null && StringUtils.isNotBlank(paramMap.get("startDate").toString())) {
-            taskQuery.taskCreatedAfter(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd"));
+            LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd").getTime()), ZoneId.systemDefault());
+            LocalDateTime startOfDay = localDateTime.with(LocalTime.MIN);
+            taskQuery.taskCreatedAfter(Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant()));
+//            taskQuery.taskCreatedAfter(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd"));
         }
         if (paramMap.get("endDate") != null && StringUtils.isNotBlank(paramMap.get("endDate").toString())) {
-            taskQuery.taskCreatedBefore(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd"));
+            LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd").getTime()), ZoneId.systemDefault());;
+            LocalDateTime endOfDay = localDateTime.with(LocalTime.MAX);
+            taskQuery.taskCreatedBefore(Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant()));
+//            taskQuery.taskCreatedBefore(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd"));
         }
-        /*if (paramMap.get("proDefName") != null && StringUtils.isNotBlank(paramMap.get("proDefName").toString())) {
-            taskQuery.processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
-        }*/
         page.setTotal(taskQuery.count());
         int p = (pageNum - 1) * pageSize;
         List<Task> taskList = taskQuery.listPage(p, pageSize);