bug

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

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

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/ContractInvoiceInfoVO.java

@@ -0,0 +1,35 @@
+package org.springblade.control.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ContractInvoiceInfoVO implements Serializable {
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "发票抬头")
+    private String invoiceHead;
+
+    @ApiModelProperty(value = "纳税人识别号")
+    private String taxpayerNumber;
+
+    @ApiModelProperty(value = "开户银行")
+    private String openAccountBank;
+
+    @ApiModelProperty(value = "银行账户")
+    private String bankAccount;
+
+    @ApiModelProperty(value = "收件人")
+    private String addresseeUserName;
+
+    @ApiModelProperty(value = "联系电话")
+    private String addresseePhone;
+
+    @ApiModelProperty(value = "邮寄地址")
+    private String mailingAddress;
+
+}

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java

@@ -162,6 +162,6 @@ public class User extends TenantEntity {
      * 职位
      */
     @ApiModelProperty(value = "日单价")
-    private double oneMoney;
+    private Double oneMoney;
 
 }

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

@@ -2848,9 +2848,16 @@ public class InformationWriteQueryController extends BladeController {
         List<WbsTreeContract> selectedNodeList = jdbcTemplate.query("select * from m_wbs_tree_contract where status = 1 and is_deleted = 0 and p_key_id in(" + StringUtils.join(halfSelectedList, ",") + ")", new BeanPropertyRowMapper<>(WbsTreeContract.class));
 
         //剔除与当前操作节点相同的ID，（如果saveType=1，表示当前及子级节点，那么就要剔除自己本身，否则视为仅当前节点操作，会存在自己本身）
-        if (("1").equals(saveType)) {
-            selectedNodeList.removeIf(wbsTreePrivate -> treeContract.getId().equals(wbsTreePrivate.getId()) || treeContract.getOldId().equals(wbsTreePrivate.getId().toString()));
+        if ("1".equals(saveType)){
+            //selectedNodeList.removeIf(wbsTreePrivate -> treeContract.getId().equals(wbsTreePrivate.getId()) || treeContract.getOldId().equals(wbsTreePrivate.getId().toString()));
+            selectedNodeList.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));
+            });
         }
+
         return selectedNodeList;
     }
 

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

@@ -19,6 +19,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -200,5 +201,19 @@ public class ExMaTwoController extends BladeController {
         return R.data(result);
     }
 
+    @GetMapping("/getContractInvoiceInfo")
+    @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);
+            }
+        }
+        return R.data(null);
+    }
 
 }

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMInvoiceServiceImpl.java

@@ -60,9 +60,6 @@ public class EMInvoiceServiceImpl extends BaseServiceImpl<ExMInvoiceMapper, EMIn
                     break;
                 }
             }
-
-            vo.setInvoiceContentType(null); //发票内容字典type TODO
-
             for (ControlProjectInfo projectInfo : controlProjectInfos) {
                 if (projectInfo.getId().equals(vo.getProjectId())) {
                     vo.setProjectName(projectInfo.getName());