bug

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

@@ -475,7 +475,7 @@ public class TaskController extends BladeController {
                 }
 
                 /*新增的时候去重判断，status=1或2，有且只有一条*/
-                Task taskInfo = jdbcTemplate.query("select status from u_task where task_create_timestamp is not null and status in (1,2) and form_data_id = " + id, new BeanPropertyRowMapper<>(Task.class)).stream().findAny().orElse(null);
+                Task taskInfo = jdbcTemplate.query("select status from u_task where task_create_timestamp is not null and status in (1,2) and form_data_id = '" + id + "'", new BeanPropertyRowMapper<>(Task.class)).stream().findAny().orElse(null);
                 if (ObjectUtil.isNotEmpty(taskInfo)) {
                     throw new ServiceException("文件【" + archive.getFileName() + "】已经上报，请重新选择左侧节点树文件数据进行上报");
                 }
@@ -589,7 +589,7 @@ public class TaskController extends BladeController {
                 ArchiveFile archiveFile = jdbcTemplate.queryForObject("select * from u_archive_file where id = " + archiveId, new BeanPropertyRowMapper<>(ArchiveFile.class));
                 if (archiveFile != null) {
                     /*此处任务会查询出多条，因为存在多次废除任务，那么form_data_id指向同一个id，所以在新增的时候去重判断，status=1或2，有且只有一条*/
-                    Task task = jdbcTemplate.query("select id,status,process_instance_id from u_task where task_create_timestamp is not null and status in (1,2) and form_data_id = " + archiveId, new BeanPropertyRowMapper<>(Task.class)).stream().findAny().orElse(null);
+                    Task task = jdbcTemplate.query("select id,status,process_instance_id from u_task where task_create_timestamp is not null and status in (1,2) and form_data_id = '" + archiveId + "'", new BeanPropertyRowMapper<>(Task.class)).stream().findAny().orElse(null);
                     if (task != null && task.getStatus().equals(1)) {
                         //修改档案文件收集业务数据状态=已废除
                         jdbcTemplate.execute("update u_archive_file set status = 3,is_certification = 0,e_visa_file = null where id = " + archiveId);

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

@@ -165,17 +165,17 @@ public class MeterTreeController extends BladeController {
     @GetMapping("/system/getEngineeringTypeName")
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "系统树节点新增获取工程类型名称", notes = "传入id")
-    public R<Object> getEngineeringTypeName(@RequestParam String id) {
+    public R<Object> getSystemEngineeringTypeName(@RequestParam String id) {
         MeterTreeSystem node = meterTreeSystemService.getById(id);
         if (node != null) {
-            String resultNodeName = getTheParentRecursivelyInReverse(node);
+            String resultNodeName = getSystemTheParentRecursivelyInReverse(node);
             return R.data(ObjectUtil.isNotEmpty(resultNodeName) ? resultNodeName : null);
         }
         return R.data(null);
     }
 
-    /*获取第二层级节点名称*/
-    private String getTheParentRecursivelyInReverse(MeterTreeSystem node) {
+    /*系统获取第二层级节点名称*/
+    private String getSystemTheParentRecursivelyInReverse(MeterTreeSystem node) {
         if (node != null) {
             MeterTreeSystem parentNode = meterTreeSystemService.getOne(Wrappers.<MeterTreeSystem>lambdaQuery()
                     .select(MeterTreeSystem::getNodeName, MeterTreeSystem::getParentId, MeterTreeSystem::getAncestor)
@@ -186,7 +186,7 @@ public class MeterTreeController extends BladeController {
                 if (parentNode.getAncestor().split(",").length == 2) {
                     return parentNode.getNodeName();
                 } else if (parentNode.getAncestor().split(",").length > 2) {
-                    return getTheParentRecursivelyInReverse(parentNode);
+                    return getSystemTheParentRecursivelyInReverse(parentNode);
                 }
             }
         }
@@ -363,6 +363,37 @@ public class MeterTreeController extends BladeController {
         return R.data(meterTreeProjectService.save(obj));
     }
 
+    @GetMapping("/project/getEngineeringTypeName")
+    @ApiOperationSupport(order = 15)
+    @ApiOperation(value = "项目树节点新增获取工程类型名称", notes = "传入id")
+    public R<Object> getProjectEngineeringTypeName(@RequestParam String id) {
+        MeterTreeProject node = meterTreeProjectService.getById(id);
+        if (node != null) {
+            String resultNodeName = getProjectTheParentRecursivelyInReverse(node);
+            return R.data(ObjectUtil.isNotEmpty(resultNodeName) ? resultNodeName : null);
+        }
+        return R.data(null);
+    }
+
+    /*获取项目第二层级节点名称*/
+    private String getProjectTheParentRecursivelyInReverse(MeterTreeProject node) {
+        if (node != null) {
+            MeterTreeProject parentNode = meterTreeProjectService.getOne(Wrappers.<MeterTreeProject>lambdaQuery()
+                    .select(MeterTreeProject::getNodeName, MeterTreeProject::getParentId, MeterTreeProject::getAncestor)
+                    .eq(MeterTreeProject::getId, node.getParentId())
+                    .eq(MeterTreeProject::getStatus, 1)
+            );
+            if (parentNode != null) {
+                if (parentNode.getAncestor().split(",").length == 2) {
+                    return parentNode.getNodeName();
+                } else if (parentNode.getAncestor().split(",").length > 2) {
+                    return getProjectTheParentRecursivelyInReverse(parentNode);
+                }
+            }
+        }
+        return null;
+    }
+
     @PostMapping("/project/update")
     @ApiOperationSupport(order = 16)
     @ApiOperation(value = "项目树节点修改", notes = "传入MeterTreeProject")

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

@@ -255,14 +255,30 @@ public class MidPayItemController extends BladeController {
     @PostMapping("/project/list")
     @ApiOperationSupport(order = 11)
     @ApiOperation(value = "项目中期支付项列表", notes = "传入type=0（未被引用），type=1（已引用），type=空（全部）、projectId")
-    public R<List<MeterMidPayItemProject>> projectList(@RequestParam String type, @RequestParam String projectId) {
+    public R<List<MeterMidPayItemProjectVO>> projectList(@RequestParam String type, @RequestParam String projectId) {
+        Map<String, String> meterPayTypeMap = jdbcTemplate.query("SELECT dict_key,dict_value FROM blade_dict WHERE is_deleted = 0 AND code = 'meter_pay_type'", new BeanPropertyRowMapper<>(Dict.class)).stream().collect(Collectors.toMap(Dict::getDictKey, Dict::getDictValue));
+        Map<String, String> meterPayAppTypeMap = jdbcTemplate.query("SELECT dict_key,dict_value FROM blade_dict WHERE is_deleted = 0 AND code = 'meter_pay_applicable_type'", new BeanPropertyRowMapper<>(Dict.class)).stream().collect(Collectors.toMap(Dict::getDictKey, Dict::getDictValue));
+
         LambdaQueryWrapper<MeterMidPayItemProject> queryWrapper = Wrappers.lambdaQuery();
         if (type != null) {
             queryWrapper.eq(MeterMidPayItemProject::getIsReferenced, type);
         }
         queryWrapper.eq(MeterMidPayItemProject::getProjectId, projectId);
         queryWrapper.orderByAsc(MeterMidPayItemProject::getCreateTime);
-        return R.data(payItemProjectService.getBaseMapper().selectList(queryWrapper));
+
+        List<MeterMidPayItemProject> meterMidPayItemProjects = payItemProjectService.getBaseMapper().selectList(queryWrapper);
+
+        List<MeterMidPayItemProjectVO> VOS = BeanUtil.copyProperties(meterMidPayItemProjects, MeterMidPayItemProjectVO.class);
+        for (MeterMidPayItemProjectVO vo : VOS) {
+            if (ObjectUtil.isNotEmpty(vo.getPayApplicableType())) {
+                vo.setPayApplicableTypeName(meterPayAppTypeMap.getOrDefault(vo.getPayApplicableType().toString(), null));
+            }
+            if (ObjectUtil.isNotEmpty(vo.getPayType())) {
+                vo.setPayTypeName(meterPayTypeMap.getOrDefault(vo.getPayType().toString(), null));
+            }
+        }
+
+        return R.data(VOS);
     }
 
     @GetMapping("/contract/detail")