资料填报节点新增bug

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/EMInvoiceInfo.java

@@ -40,7 +40,7 @@ public class EMInvoiceInfo extends BaseEntity {
     @ApiModelProperty(value = "开票金额")
     private BigDecimal invoiceMoney;
 
-    @ApiModelProperty(value = "开票内容字典类型")
+    @ApiModelProperty(value = "开票内容")
     private String invoiceContent;
 
     @ApiModelProperty(value = "发票pdf")

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

@@ -2980,7 +2980,13 @@ public class InformationWriteQueryController extends BladeController {
             //查询对应数据
             List<WbsTreeContract> allSelectedNodeLists = this.wbsTreeContractClient.queryContractTreeNodeByPKIds(allSelectedList);
             //剔除与当前操作节点相同的ID
-            allSelectedNodeLists.removeIf(wbsTreePrivate -> treeContract.getId().equals(wbsTreePrivate.getId()) || treeContract.getOldId().equals(wbsTreePrivate.getId().toString()));
+            allSelectedNodeLists.removeIf(wbsTreePrivate -> {
+                Long id = wbsTreePrivate.getId();
+                String oldId = wbsTreePrivate.getId().toString();
+                return treeContract.getId() != null && treeContract.getOldId() != null &&
+                        (treeContract.getId().equals(id) || treeContract.getOldId().equals(oldId));
+            });
+            //allSelectedNodeLists.removeIf(wbsTreePrivate -> treeContract.getId().equals(wbsTreePrivate.getId()) || treeContract.getOldId().equals(wbsTreePrivate.getId().toString()));
             //设置到集合中
             selectedNodeList.addAll(allSelectedNodeLists);
         }

blade-service/blade-control/src/main/java/org/springblade/control/controller/ExMaTwoController.java

@@ -205,15 +205,28 @@ public class ExMaTwoController extends BladeController {
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "获取合同段发票信息", notes = "传入项目id")
     public R<ContractInvoiceInfoVO> getContractInvoiceInfo(@RequestParam String projectId) {
-        List<ControlContractInfo> query = jdbcTemplate.query("select * from c_control_contract_info where project_id = " + projectId, new BeanPropertyRowMapper<>(ControlContractInfo.class));
-        if (query.size() == 1) {
-            ControlContractInfo controlContractInfo = query.get(0);
-            if (controlContractInfo != null) {
-                ContractInvoiceInfoVO vo = BeanUtil.copyProperties(controlContractInfo, ContractInvoiceInfoVO.class);
-                return R.data(vo);
+        if (StringUtils.isNotEmpty(projectId)) {
+            List<ControlContractInfo> query = jdbcTemplate.query("select * from c_control_contract_info where project_id = " + projectId, new BeanPropertyRowMapper<>(ControlContractInfo.class));
+            if (query.size() == 1) {
+                ControlContractInfo controlContractInfo = query.get(0);
+                if (controlContractInfo != null) {
+                    ContractInvoiceInfoVO vo = BeanUtil.copyProperties(controlContractInfo, ContractInvoiceInfoVO.class);
+                    return R.data(vo);
+                }
             }
         }
         return R.data(null);
     }
 
+    @GetMapping("/getInvoiceContentList")
+    @ApiOperationSupport(order = 8)
+    @ApiOperation(value = "获取发票内容列表")
+    public R<List<String>> getInvoiceContentList() {
+        List<DictInfo> query = jdbcTemplate.query("select dict_name from c_dict_info where type = 7", new BeanPropertyRowMapper<>(DictInfo.class));
+        if (query.size() > 0) {
+            return R.data(query.stream().map(DictInfo::getDictName).collect(Collectors.toList()));
+        }
+        return R.data(null);
+    }
+
 }