|
@@ -43,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
|
|
|
|
import static java.util.stream.Collectors.toList;
|
|
@@ -288,6 +289,26 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
|
|
|
@Override
|
|
|
public AjaxResult projectEndQueryPendingVal(AuditItems auditItems) {
|
|
|
List<Map<String, Object>> mapList = auditItemsMapper.selectWarehouseApprover(auditItems);
|
|
|
+ //判断特定字段是否为空,为空设置为空字符串,或设置为当前时间
|
|
|
+ for (int i = 0; i < mapList.size(); i++) {
|
|
|
+ Map<String, Object> objectMap = mapList.get(i);
|
|
|
+ if (objectMap.get("auditItem")==null){
|
|
|
+ objectMap.put("auditItem","");
|
|
|
+ }
|
|
|
+ if (objectMap.get("auditMsg")==null){
|
|
|
+ objectMap.put("auditMsg","");
|
|
|
+ }
|
|
|
+ if (objectMap.get("billTime")==null){
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
|
+ String time = now.toString();
|
|
|
+ objectMap.put("billTime",time);
|
|
|
+ }
|
|
|
+ if (objectMap.get("auditOpTime")==null){
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
|
+ String time = now.toString();
|
|
|
+ objectMap.put("auditItem",time);
|
|
|
+ }
|
|
|
+ }
|
|
|
return AjaxResult.success(mapList);
|
|
|
}
|
|
|
|