Commit 5b2cd766 authored by zhangsen's avatar zhangsen

电梯注销业务开发bug修改

parent cf559217
...@@ -100,4 +100,10 @@ public class JgScrapCancelDto extends BaseDto { ...@@ -100,4 +100,10 @@ public class JgScrapCancelDto extends BaseDto {
*/ */
private String useUnitName; private String useUnitName;
/**
* 设备ID
*/
private String record;
} }
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
select ur.sequence_nbr as sequenceNbr, select ur.sequence_nbr as sequenceNbr,
ur.instance_id as instanceId, ur.instance_id as instanceId,
ur.audit_status as auditStatus, ur.audit_status as auditStatus,
ur.rec_date as recDate, DATE_FORMAT(ur.rec_date,'%Y-%m-%d') as recDate,
ur.create_date as createDate, DATE_FORMAT(ur.create_date,'%Y-%m-%d') as createDate,
ur.receive_org_code as receiveOrgCode, ur.receive_org_code as receiveOrgCode,
ur.receive_org_name as receiveOrgName, ur.receive_org_name as receiveOrgName,
ur.receive_company_code as receiveCompanyCode, ur.receive_company_code as receiveCompanyCode,
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
ur.instance_status as instanceStatus, ur.instance_status as instanceStatus,
ur.promoter, ur.promoter,
ifnull(ur.next_execute_ids,'') as nextExecuteIds, ifnull(ur.next_execute_ids,'') as nextExecuteIds,
audit_pass_date as auditPassDate, DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
use.USE_UNIT_CREDIT_CODE as useUnitCreditCode, use.USE_UNIT_CREDIT_CODE as useUnitCreditCode,
ur.use_unit_name as useUnitName, ur.use_unit_name as useUnitName,
ur.use_unit_code as useUnitCode, ur.use_unit_code as useUnitCode,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment