From 9c88819121838f98a8a2c0c8b6f3ac574cf63855 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 29 Jul 2022 10:23:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=AE=A1=E6=A0=B8PC=E7=AB=AF?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rent/service/impl/RentContractInfoServiceImpl.java     | 7 ++++++-
 .../src/main/resources/mapper/rent/RentContractInfoDao.xml | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
index d7ad636..47f3588 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
@@ -192,9 +192,14 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void savePc(RentContractInfoDTO dto) {
+        // PC 端新增，默认审核通过(0：待审核；1:通过；2：不通过)
+        dto.setState("1");
+        // 是否是 PC 录入（0：否，1：是）
+        dto.setIsPcInput("1");
+
         RentContractInfoEntity entity = ConvertUtils.sourceToTarget(dto, RentContractInfoEntity.class);
         entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
-        entity.setIsPcInput("1");
+
         insert(entity);
         // 处理租客信息和合同信息
         updateTenantAndFile(entity.getId(), dto);
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml
index 97592b0..37eca07 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml
@@ -117,5 +117,6 @@
                 AND DATE( i.END_DATE ) &lt;= CURDATE()
             </if>
         </if>
+        order by i.CREATED_TIME desc
     </select>
 </mapper>