diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java
index b9866430..2af1a5b7 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java
@@ -113,9 +113,6 @@ public class BmProject extends BaseEntity
@ApiModelProperty(value = "工程性质")
private String proNature;
- @ApiModelProperty(value = "i8工程id")
- private String i8proId;
-
@ApiModelProperty(value = "所属项目中心")
private String proCenter;
}
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmProjectMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmProjectMapper.java
index 40750fa5..3e421383 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmProjectMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmProjectMapper.java
@@ -51,14 +51,6 @@ public interface BmProjectMapper
*/
public int deleteBmProjectByProId(Long proId);
- /**
- * 批量删除标段工程管理
- *
- * @param proIds 需要删除的数据主键集合
- * @return 结果
- */
- public int deleteBmProjectByProIds(Long[] proIds);
-
/**
* 根据工程名称查询工程信息
* @param bmProject
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmProjectService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmProjectService.java
index 01870b76..edbe27cb 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmProjectService.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmProjectService.java
@@ -45,14 +45,6 @@ public interface IBmProjectService
*/
public AjaxResult updateBmProject(BmProject bmProject);
- /**
- * 批量删除标段工程管理
- *
- * @param proIds 需要删除的标段工程管理主键集合
- * @return 结果
- */
- public AjaxResult deleteBmProjectByProIds(Long[] proIds);
-
/**
* 删除标段工程管理信息
*
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectServiceImpl.java
index 0d06d2d9..4139b487 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectServiceImpl.java
@@ -113,7 +113,7 @@ public class BmProjectServiceImpl implements IBmProjectService
item.setProStatus("未知工程状态");
}
}
- item.setIsMatchI8(StringUtils.isNotEmpty(item.getI8proId()) ? "匹配" : "不匹配");
+ item.setIsMatchI8(StringUtils.isNotEmpty(item.getExternalId()) ? "匹配" : "不匹配");
}
/**
@@ -203,22 +203,6 @@ public class BmProjectServiceImpl implements IBmProjectService
return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg());
}
- /**
- * 批量删除标段工程管理
- *
- * @param proIds 需要删除的标段工程管理主键
- * @return 结果
- */
- @Override
- public AjaxResult deleteBmProjectByProIds(Long[] proIds)
- {
- int result = bmProjectMapper.deleteBmProjectByProIds(proIds);
- if (result > 0) {
- return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result);
- }
- return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg());
- }
-
/**
* 删除标段工程管理信息
*
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml
index d9d5ee37..c2ada98b 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml
@@ -27,7 +27,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
@@ -56,7 +55,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sd.dept_name as impUnit,
bp.pro_nature,
bp.pro_status,
- bp.i8pro_id,
bp.contract_part,
bp.pro_center
from bm_project bp
@@ -134,7 +132,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
imp_unit,
pro_nature,
pro_status,
- i8pro_id,
contract_part,
pro_center
@@ -162,7 +159,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{impUnit},
#{proNature},
#{proStatus},
- #{i8proId},
#{contractPart},
#{proCenter}
@@ -190,7 +186,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
imp_unit = #{impUnit},
pro_nature = #{proNature},
pro_status = #{proStatus},
- i8pro_id = #{i8proId},
contract_part = #{contractPart},
pro_center = #{proCenter}
@@ -201,10 +196,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update bm_project set del_flag = 2 where pro_id = #{proId}
-
- update bm_project set del_flag = 2 where pro_id in
-
- #{proId}
-
-
\ No newline at end of file