|
|
@@ -100,8 +100,9 @@
|
|
|
work_task_record AS record,
|
|
|
user,
|
|
|
work_node AS node
|
|
|
- WHERE state = 'PENDING'
|
|
|
- # (state = 'PENDING' OR( state = 'FINISHED' AND node.`code` = 'BUSINESS_ARCHIVING' ))
|
|
|
+ WHERE
|
|
|
+ # state = 'PENDING'
|
|
|
+ (state = 'PENDING' OR ( state = 'FINISHED' AND node.`code` = 'BUSINESS_ARCHIVING' ))
|
|
|
AND nodeInstance.node_id = node.id
|
|
|
AND record.handler_id = user.id
|
|
|
AND nodeInstance.deleted = 0
|
|
|
@@ -160,7 +161,7 @@
|
|
|
AND (department.userId = assets.principal_id OR department.userId = assets.client_manager_id OR department.userId = nodeInfo.handlerId)
|
|
|
</if>
|
|
|
WHERE assets.deleted = 0
|
|
|
- AND nodeInfo.state = 'PENDING'
|
|
|
+ AND (nodeInfo.state = 'PENDING' OR ( nodeInfo.state = 'FINISHED' AND nodeInfo.currentNodeCode = 'BUSINESS_ARCHIVING' ))
|
|
|
<if test="assetsSelectDTO != null and assetsSelectDTO.assetsBusinessGener != null and assetsSelectDTO.assetsBusinessGener != '' ">
|
|
|
# 评估业务类别(业务类型)查询
|
|
|
AND assets.assets_business_gener = #{assetsSelectDTO.assetsBusinessGener}
|
|
|
@@ -708,11 +709,13 @@
|
|
|
#查询终端客户名称
|
|
|
(SELECT customer_company.name FROM customer_company WHERE customer_company.id = assets.terminal_clientele_id) AS
|
|
|
terminalClienteleName,
|
|
|
- assets.clientele_sub_id
|
|
|
+ assets.clientele_sub_id,
|
|
|
+ subCustomer.name AS customerSubName
|
|
|
FROM assets
|
|
|
LEFT JOIN user ON user.id = assets.principal_id
|
|
|
LEFT JOIN department ON department.id = assets.department_id
|
|
|
LEFT JOIN customer_company AS customer ON customer.id = assets.clientele_id
|
|
|
+ LEFT JOIN customer_company AS subCustomer ON subCustomer.id = assets.clientele_sub_id
|
|
|
LEFT JOIN customer_linkman AS linkman ON linkman.id = assets.clientele_contact_id
|
|
|
LEFT JOIN (SELECT tLinkman.id, tLinkman.name, tLinkman.mobile FROM customer_linkman AS tLinkman) AS tLinkman ON
|
|
|
tLinkman.id = assets.terminal_clientele_contact_id
|
