pdf查看有引号,甬台温计量可审批查询报错

blade-service/blade-manager/src/main/java/com/mixsmart/utils/FormulaUtils.java

@@ -1068,6 +1068,9 @@ public class FormulaUtils {
         if(t!=null&&Pattern.matches(RANGE_DATE_REG,t)){
             t=t.replaceAll("^\\[|]$","").split(",")[1].trim();
         }
+        if(StringUtils.isNotEmpty(t)){
+            t=t.replace("\"", "");
+        }
         return t;
     }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IFormulaService.java

@@ -101,5 +101,5 @@ public interface IFormulaService extends BaseService<Formula> {
     R<Object> syncWorkDate(@NotNull(message = "节点ID不能为空") Long nodeId);
 
     /** 万盛计量专用统计数据*/
-    List<ReportResult> (Long reportId,Long contractId, Long periodId, Integer type,Long projectId) throws FileNotFoundException, IllegalAccessException;
+    List<ReportResult> execute4 (Long reportId,Long contractId, Long periodId, Integer type,Long projectId) throws FileNotFoundException, IllegalAccessException;
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -5716,7 +5716,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             if (ObjectUtil.isEmpty(wbsTreeContract1)) {
                 return R.fail("表单不存在");
             }
-            if (wbsTreeContract1.getIsCopeTab() == Integer.valueOf(2)) {
+            if (wbsTreeContract1.getIsCopeTab() .equals(Integer.valueOf(2))) {
                 return R.fail("该表不能评定汇总");
             }
             try {
@@ -5764,7 +5764,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             if (childrenNodes.size() > 0) {
                 for (WbsTreeContract childrenNode : childrenNodes) {
                     if (ObjectUtil.isNotEmpty(childrenNode.getIsClassifition())) {
-                        if (childrenNode.getIsClassifition() == Integer.valueOf(1)) {
+                        if (childrenNode.getIsClassifition().equals(Integer.valueOf(1))) {
                             Integer status;
                             //判断状态是否是已审批
                             String infomationSql = "SELECT status FROM u_information_query where wbs_id=" + childrenNode.getPKeyId();
@@ -5773,7 +5773,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                             } catch (Exception e) {
                                 continue;
                             }
-                            if (status == Integer.valueOf(2)) {
+                            if (status.equals(Integer.valueOf(2))) {
                                 list.add(childrenNode);
                             }
                         }
@@ -5789,7 +5789,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                 String unitName = findUnitName(treeContract.getUnitName());
                 //如果包含单元名称就在原来的数量上加1,同时判断如果是自定义的节点就加自定义节点的单元数量
                 if (maps.containsKey(unitName)) {
-                    if (treeContract.getNodeClass() == Integer.valueOf(2)) {
+                    if (treeContract.getNodeClass()==2) {
                         if (ObjectUtil.isNotEmpty(treeContract.getUnitNum())) {
                             maps.put(unitName, maps.get(unitName) + treeContract.getUnitNum());
                         }
@@ -5799,7 +5799,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     }
                 } else {
                     //不包含就放进map 同时判断是否是自定义的节点
-                    if (treeContract.getNodeClass() == Integer.valueOf(2)) {
+                    if (treeContract.getNodeClass() == 2) {
                         if (ObjectUtil.isNotEmpty(treeContract.getUnitNum())) {
                             maps.put(unitName, treeContract.getUnitNum());
                         }
@@ -5812,11 +5812,11 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             //筛选出自定义数字化节点包含单元评定的节点
             List<WbsTreeContract> list1 = new ArrayList<>();
             for (WbsTreeContract childrenNode : list) {
-                if (childrenNode.getStatus() == Integer.valueOf(1)) {
+                if (childrenNode.getStatus() == 1) {
                     if (ObjectUtil.isNotEmpty(childrenNode.getNodeClass())) {
-                        if (childrenNode.getNodeClass() == Integer.valueOf(2)) {
+                        if (childrenNode.getNodeClass() == 2) {
                             if (ObjectUtil.isNotEmpty(childrenNode.getIsClassifition())) {
-                                if (childrenNode.getIsClassifition() == Integer.valueOf(1)) {
+                                if (childrenNode.getIsClassifition() == 1) {
                                     list1.add(childrenNode);
                                 }
                             }
@@ -5839,7 +5839,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             //水利工程 拿到除了自定义数字化上传节点以外的其他所有节点的表单
             List<WbsTreeContract> list2 = new ArrayList<>();
             for (WbsTreeContract childrenNode : list) {
-                if (childrenNode.getNodeClass() != Integer.valueOf(2)) {
+                if (childrenNode.getNodeClass() != 2) {
                             String sql="SELECT * from m_wbs_tree_contract where parent_id="+childrenNode.getId()+" and is_deleted=0 and project_id="+childrenNode.getProjectId()+" and contract_id="+childrenNode.getContractId();
                             List<WbsTreeContract> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(WbsTreeContract.class));
                             if(query.size()>0){

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -1037,7 +1037,6 @@ public class TaskController extends BladeController {
         if (ObjectUtil.isEmpty(dto.getProjectId()) || ObjectUtil.isEmpty(dto.getContractId())) {
             throw new ServiceException("未获取到当前项目或合同段信息");
         }
-
         /*封装入参SQL*/
         int current = dto.getCurrent();
         int size = dto.getSize();
@@ -1094,7 +1093,8 @@ public class TaskController extends BladeController {
                 if (ObjectUtil.isNotEmpty(dto.getStatusValue()) && (dto.getStatusValue().equals(1) || dto.getStatusValue().equals(4))) {
                     sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status = ? AND u_task_parallel.task_user = ?)");
                     params.add(1);
-                    params.add(SecureUtil.getUserId());
+                  params.add(SecureUtil.getUserId());
+                    //params.add(1793090918650503170L);
 
                     /*如果是待办页面，且 任务状态下拉框 选择的不是 待审批状态 的任务，那么直接返回null*/
                 } else if (ObjectUtil.isNotEmpty(dto.getStatusValue()) && !dto.getStatusValue().equals(1)) {
@@ -1105,6 +1105,7 @@ public class TaskController extends BladeController {
                     sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status = ? AND u_task_parallel.task_user = ?)");
                     params.add(1);
                     params.add(SecureUtil.getUserId());
+                    //params.add(1793090918650503170L);
                     sqlString.append(" AND status = 1");
                 }
 
@@ -1112,10 +1113,12 @@ public class TaskController extends BladeController {
                 sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status in(2,3) AND u_task_parallel.task_user = ?)");
                 /*当前自己的任务必须是已审批、已废除 status = 2,3 ，才视为已办*/
                 params.add(SecureUtil.getUserId());
+                //params.add(1793090918650503170L);
 
             } else if (dto.getSelectedType().equals(3)) { //我发起页面
                 sqlString.append("report_user = ?");
                 params.add(SecureUtil.getUserId());
+                //params.add(1793090918650503170L);
             }
             sqlString.append(")");
         }
@@ -1268,7 +1271,7 @@ public class TaskController extends BladeController {
                 .filter(t -> t.getTaskUser().equals(userId.toString()))
                 .sorted(Comparator.comparing(TaskParallel::getSort))
                 .map(TaskParallel::getSort).collect(Collectors.toList());
-        Integer dqSort = sortDq.get();
+        Integer dqSort = sortDq.orElse(null);
         if(ObjectUtil.isNotEmpty(dqSort)){
             List<Integer> list1 = userSort.stream().filter(a -> dqSort.compareTo(a) <= 0).collect(Collectors.toList());
             if(ObjectUtil.isEmpty(list1)){