Browse Source

优化代码

java110 3 years ago
parent
commit
8dc23624dd

+ 2 - 2
java110-db/src/main/resources/mapper/common/CarInoutDetailV1ServiceDaoImplMapper.xml

@@ -54,7 +54,7 @@
             and t.detail_id= #{detailId}
         </if>
         <if test="carNum !=null and carNum != ''">
-            and t.car_num= #{carNum}
+            and t.car_num like concat('%',#{carNum},'%')
         </if>
         <if test="carType !=null and carType != ''">
             and t.car_type= #{carType}
@@ -157,7 +157,7 @@
             and t.detail_id= #{detailId}
         </if>
         <if test="carNum !=null and carNum != ''">
-            and t.car_num= #{carNum}
+            and t.car_num like concat('%',#{carNum},'%')
         </if>
         <if test="carType !=null and carType != ''">
             and t.car_type= #{carType}

+ 2 - 2
java110-db/src/main/resources/mapper/common/CarInoutV1ServiceDaoImplMapper.xml

@@ -42,7 +42,7 @@
             </foreach>
         </if>
         <if test="carNum !=null and carNum != ''">
-            and t.car_num= #{carNum}
+            and t.car_num like concat('%',#{carNum},'%')
         </if>
         <if test="carType !=null and carType != ''">
             and cid.car_type= #{carType}
@@ -131,7 +131,7 @@
             </foreach>
         </if>
         <if test="carNum !=null and carNum != ''">
-            and t.car_num= #{carNum}
+            and t.car_num like concat('%',#{carNum},'%')
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}

+ 2 - 2
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java

@@ -218,8 +218,8 @@ public class ImportMeterWaterFeeSMOImpl extends DefaultAbstractComponentSMO impl
 
             String startTime = excelDoubleToDate(os[4].toString());
             String endTime = excelDoubleToDate(os[6].toString());
-            Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误 请填写YYYY-MM-DD 文本格式");
-            Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");
+            Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行上期度数时间格式错误 请填写YYYY-MM-DD 文本格式");
+            Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行本期度数时间格式错误 请填写YYYY-MM-DD 文本格式");
 
 
             importRoomFee = new ImportExportMeterWaterDto();