Merge branch 'feature/addRentHouseOfPC' into dev

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);

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 ) <= CURDATE()
             </if>
         </if>
+        order by i.CREATED_TIME desc
     </select>
 </mapper>