Merge remote-tracking branch 'origin/master'

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java

@@ -472,7 +472,7 @@ public class OperationTicketServiceImpl implements OperationTicketService {
                 Map<String, Object> map = PdfUtils.objectToMap(measure);
                 map.put("index", index.get());
                 map.put("status", TicketConstants.MATTER_FINISH_STATUS.equals(measure.getStatus()) ? "√" : "");
-                map.put("operationTime", measure.getOperationTime());
+                // map.put("operationTime", measure.getOperationTime());
                 map.put("hello", "");
                 map.put("hello1", "");
                 index.getAndIncrement();

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.hnac.hzims.common.logs.utils.StringUtils;
 import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity;
 import com.hnac.hzims.ticket.allTicket.service.TicketInfoEvaluateService;
@@ -19,6 +20,7 @@ import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountResponseVo;
 import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountVo;
 import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity;
 import com.hnac.hzims.ticket.workTicket.service.IWorkTicketInfoService;
+import jodd.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -326,10 +328,8 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
             ticketCount.setTenantId(user.getTenantId());
             ticketCount.setCreateDept(Long.valueOf(user.getDeptId()));
             ticketCount.setCreateUser(user.getUserId());
-            if (entry.getKey() == null) {
+            log.info("getStandardTicketCountList  entry.getKey() ================================================> " + entry.getKey());
-                continue;
+            if (ObjectUtils.isNotEmpty(entry.getKey())) {
-            }
-            if (entry.getKey() != null) {
                 //根据id获取部门名称
                 R<String> deptName = systemClient.getDeptName(entry.getKey());
                 if (deptName.isSuccess()) {
@@ -396,7 +396,8 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
             TicketCount ticketCount = new TicketCount();
             ticketCount.setDeptId(entry.getKey());
             ticketCount.setDateTime(dateTime);
-            if (entry.getKey() != null) {
+            log.info("getTicketCountList entry.getKey() ================================================> " + entry.getKey());
+            if (ObjectUtils.isNotEmpty(entry.getKey())) {
                 //根据id获取部门名称
                 R<String> deptName = systemClient.getDeptName(entry.getKey());
                 if (deptName.isSuccess()) {