feat(oa): 添加项目客户关联字段并优化数据库配置
- 修改开发环境数据库端口从3306到13306 - 更新开发环境数据库密码为Root@12345 - 修改生产环境主从库地址统一指向新服务器- 更新生产环境数据库密码为Root@12345- 在SysOaProject实体类中添加customerId字段 - 在SysOaProjectBo业务对象中添加customerId和customerName字段 - 在SysOaProjectMapper.xml中关联查询客户信息- 优化项目查询SQL语句,明确指定表别名 - 在项目详情查询中添加客户信息关联查询 - 在SysOaProjectVo视图对象中添加客户相关字段
This commit is contained in:
@@ -306,9 +306,11 @@
|
||||
p.signing_company,
|
||||
p.postpone_count,
|
||||
p.original_finish_time,
|
||||
TIMESTAMPDIFF(DAY, NOW(), p.postpone_time) AS remainTime
|
||||
TIMESTAMPDIFF(DAY, NOW(), p.postpone_time) AS remainTime,
|
||||
p.customer_id AS customerId,
|
||||
c.name AS customerName
|
||||
FROM sys_oa_project p
|
||||
|
||||
LEFT JOIN oa_customer c ON p.customer_id = c.customer_id
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
@@ -557,28 +559,28 @@
|
||||
</select>
|
||||
<select id="selectVoByIdPlus" resultMap="SysOaProjectVoResult">
|
||||
select sop.project_id,
|
||||
project_name,
|
||||
project_num,
|
||||
project_type,
|
||||
address,
|
||||
funds,
|
||||
functionary,
|
||||
begin_time,
|
||||
finish_time,
|
||||
delivery,
|
||||
guarantee,
|
||||
introduction,
|
||||
project_grade,
|
||||
project_status,
|
||||
contract_id,
|
||||
invoice_name,
|
||||
invoice_number,
|
||||
invoice_address,
|
||||
invoice_bank,
|
||||
bail,
|
||||
closure_files,
|
||||
remark,
|
||||
accessory,
|
||||
sop.project_name,
|
||||
sop.project_num,
|
||||
sop.project_type,
|
||||
sop.address,
|
||||
sop.funds,
|
||||
sop.functionary,
|
||||
sop.begin_time,
|
||||
sop.finish_time,
|
||||
sop.delivery,
|
||||
sop.guarantee,
|
||||
sop.introduction,
|
||||
sop.project_grade,
|
||||
sop.project_status,
|
||||
sop.contract_id,
|
||||
sop.invoice_name,
|
||||
sop.invoice_number,
|
||||
sop.invoice_address,
|
||||
sop.invoice_bank,
|
||||
sop.bail,
|
||||
sop.closure_files,
|
||||
sop.remark,
|
||||
sop.accessory,
|
||||
sop.create_by,
|
||||
sop.create_time,
|
||||
sop.update_by,
|
||||
@@ -587,14 +589,17 @@
|
||||
sop.signing_company,
|
||||
sop.original_finish_time,
|
||||
sop.postpone_count,
|
||||
is_postpone,
|
||||
postpone_reason,
|
||||
postpone_time,
|
||||
color,
|
||||
trade_type,
|
||||
pre_pay,
|
||||
sop.is_postpone,
|
||||
sop.postpone_reason,
|
||||
sop.postpone_time,
|
||||
sop.color,
|
||||
sop.trade_type,
|
||||
sop.pre_pay,
|
||||
sop.customer_id AS customerId,
|
||||
c.name AS customerName,
|
||||
TIMESTAMPDIFF(DAY, NOW(), sop.postpone_time) AS remainTime
|
||||
from sys_oa_project sop
|
||||
left join oa_customer c on c.customer_id = sop.customer_id
|
||||
where sop.project_id = #{projectId}
|
||||
</select>
|
||||
<!-- 本月合同总额 -->
|
||||
|
||||
Reference in New Issue
Block a user