diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java
index 809fabf2..08cf26ac 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java
@@ -178,7 +178,7 @@ public class SysCustomerController extends BaseController
sysCustomerOper.setOper("新建");
sysCustomerOper.setOperPeople(operPeople);
sysCustomerOper.setOperStatus(sysCustomer.getAuditStatus());
- sysCustomerOper.setCreateTime(DateUtils.getNowDate());
+ sysCustomerOper.setCreateTime(new Date());
//根据是否有流程实例,判断是否新增成功
ProcessInstance processInstance = sysCustomerService.submitApply(sysCustomer);
if(processInstance != null){
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java
index df54e458..6ea10287 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java
@@ -730,6 +730,7 @@ public class SysCustomer extends BaseEntity
.append("useStatus",getUseStatus())
.append("customerId",getCustomerId())
.append("customerName",getCustomerName())
+ .append("createTime", getCreateTime())
.toString();
}
}
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
index 766c18b8..13c523ed 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
select id,enterprise_code,enterprise_name,english_name,customer_abbreviation ,customer_purser ,
@@ -68,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
customer_contact_id,customer_contact,customer_office,contact_number,customer_email,customer_fax,
delivery_address_id,delivery_customer_person,delivery_customer_phone,
delivery_address,delivery_customer_postal,delivery_customer_fax,business_members,
- identifying_people,first_add_time,update_info_time,audit_status,use_status,update_by,
+ identifying_people,first_add_time,update_info_time, create_time ,audit_status,use_status,update_by,
apply_user,apply_time from sys_customer
@@ -80,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
customer_contact_id,customer_contact,customer_office,contact_number,customer_email,customer_fax,
delivery_address_id,delivery_customer_person,delivery_customer_phone,
delivery_address,delivery_customer_postal,delivery_customer_fax,business_members,
- identifying_people,first_add_time,update_info_time,audit_status,use_status from
+ identifying_people,first_add_time,update_info_time,audit_status,use_status, create_time from
sys_customer
and use_status = '1' and use_status = '1'
@@ -95,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
s.customer_fax,s.delivery_address_id,s.delivery_customer_person,s.delivery_customer_phone,s.delivery_address,
s.delivery_customer_postal,s.delivery_customer_fax,s.business_members,s.identifying_people,s.first_add_time,
s.update_info_time,s.audit_status,s.use_status,s.update_by,s.instance_id, s.instance_type,p.dict_value as instance_type_name,
- s.submit_instance_id, s.cancel_instance_id, s.restore_instance_id, s.apply_title, s.apply_user, s.apply_time
+ s.submit_instance_id, s.cancel_instance_id, s.restore_instance_id, s.apply_title, s.apply_user, s.apply_time ,s.create_time
from sys_customer as s
left join(
select dict_value,dict_label from sys_dict_data where dict_type = 'processType'
@@ -114,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and s.first_add_time between #{params.beginCreateTime} and #{params.endCreateTime}
and s.customer_sign = #{customerSign}
- order by s.first_add_time desc
+ order by s.create_time desc