diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectInfo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectInfo.java index 88afc6c5..deebe427 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectInfo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectInfo.java @@ -58,6 +58,11 @@ public class ErpProjectInfo extends TenantEntity { */ private String spareFlag; + /** + * 单合同标识（1是 0否） + */ + private String singleContractFlag; + /** * 项目类型ID */ @@ -118,6 +123,11 @@ public class ErpProjectInfo extends TenantEntity { */ private Long contractId; + /** + * 合同跟进人 + */ + private Long contractUserId; + /** * 备注 */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectInfoBo.java index f5d8f098..38364c54 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectInfoBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectInfoBo.java @@ -64,6 +64,11 @@ public class ErpProjectInfoBo extends BaseEntity { */ private String spareFlag; + /** + * 单合同标识（1是 0否） + */ + private String singleContractFlag; + /** * 项目类型ID */ @@ -124,6 +129,11 @@ public class ErpProjectInfoBo extends BaseEntity { */ private Long contractId; + /** + * 合同跟进人 + */ + private Long contractUserId; + /** * 合同编号 */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectInfoVo.java index 837b3679..3fedf824 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectInfoVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectInfoVo.java @@ -75,6 +75,13 @@ public class ErpProjectInfoVo implements Serializable { @ExcelDictFormat(dictType = "spare_flag") private String spareFlag; + /** + * 单合同标识（1是 0否） + */ + @ExcelProperty(value = "单合同标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String singleContractFlag; + /** * 项目类型ID */ @@ -148,6 +155,12 @@ public class ErpProjectInfoVo implements Serializable { @ExcelProperty(value = "合同ID(预留)") private Long contractId; + /** + * 合同跟进人 + */ + @ExcelProperty(value = "合同跟进人") + private Long contractUserId; + /** * 备注 */ @@ -209,4 +222,10 @@ public class ErpProjectInfoVo implements Serializable { @ExcelProperty(value = "合同名称") private String contractName; + /** + * 合同跟进人名称 + */ + @ExcelProperty(value = "合同跟进人名称") + private String contractUserName; + } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java index 2dfe7ca0..1be6b36a 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java @@ -109,6 +109,7 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService { .eq(StringUtils.isNotBlank(bo.getBusinessDirection()), ErpProjectInfo::getBusinessDirection, bo.getBusinessDirection()) .eq(StringUtils.isNotBlank(bo.getProjectCategory()), ErpProjectInfo::getProjectCategory, bo.getProjectCategory()) .eq(StringUtils.isNotBlank(bo.getSpareFlag()), ErpProjectInfo::getSpareFlag, bo.getSpareFlag()) + .eq(StringUtils.isNotBlank(bo.getSingleContractFlag()), ErpProjectInfo::getSingleContractFlag, bo.getSingleContractFlag()) .eq(bo.getProjectTypeId() != null, ErpProjectInfo::getProjectTypeId, bo.getProjectTypeId()) .eq(StringUtils.isNotBlank(bo.getPaymentMethod()), ErpProjectInfo::getPaymentMethod, bo.getPaymentMethod()) .eq(bo.getDeptId() != null, ErpProjectInfo::getDeptId, bo.getDeptId()) @@ -121,6 +122,7 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService { .eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpProjectInfo::getFlowStatus, bo.getFlowStatus()) .eq(bo.getSortOrder() != null, ErpProjectInfo::getSortOrder, bo.getSortOrder()) .eq(bo.getContractId() != null, ErpProjectInfo::getContractId, bo.getContractId()) + .eq(bo.getContractUserId() != null, ErpProjectInfo::getContractUserId, bo.getContractUserId()) .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpProjectInfo::getActiveFlag, bo.getActiveFlag()) .ne(ErpProjectInfo::getProjectCategory, ProjectCategoryConstant.CONTRACT_ORDER) .eq("t.del_flag", "0") diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectInfoMapper.xml index a9f0b048..5f4557fc 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectInfoMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectInfoMapper.xml @@ -15,6 +15,7 @@ t.business_direction, t.project_category, t.spare_flag, + t.single_contract_flag, t.project_type_id, t.payment_method, t.dept_id, @@ -27,6 +28,7 @@ t.flow_status, t.sort_order, t.contract_id, + t.contract_user_id, t.remark, t.active_flag, t.oss_id, @@ -41,6 +43,7 @@ u1.nick_name managerName, u2.nick_name chargeName, u3.nick_name deputyName, + u4.nick_name contractUserName, c.contract_code contractCode, c.contract_name contractName from erp_project_info t @@ -50,6 +53,7 @@ left join sys_user u1 on u1.user_id = t.manager_id left join sys_user u2 on u2.user_id = t.charge_id left join sys_user u3 on u3.user_id = t.deputy_id + left join sys_user u4 on u4.user_id = t.contract_user_id left join erp_contract_info c on t.contract_id = c.contract_id ${ew.getCustomSqlSegment}