浙江设备平台接口开发

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1955,7 +1955,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             try {
                 if (e.get("weExpiry") != null) {
                     int year = Integer.parseInt(e.get("weExpiry").toString());
-                    Date productDate = DateUtils.dateParse(e.get("product").toString().substring(0,9), DateUtils.DATE_PATTERN);
+                    Date productDate = DateUtils.dateParse(e.get("product").toString().substring(0,10), DateUtils.DATE_PATTERN);
                     Calendar calendar = Calendar.getInstance();
                     calendar.setTime(productDate);
                     calendar.add(Calendar.YEAR, year);

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -82,7 +82,7 @@
 			<if test="beginDate != null and endDate != null and beginDate != '' and endDate != '' ">
 				AND a.begin_time <![CDATA[>=]]> #{beginDate} AND a.end_time <![CDATA[<=]]> #{endDate}
 			</if>
-			<if test="(beginDate == null or beginDate == '') and endDate != null and endDate != ''">
+			<if test="endDate != null and endDate != '' and (beginDate == null or beginDate == '')">
 				AND a.end_time <![CDATA[<=]]> #{endDate}
 			</if>
 			<if test="beginDate != null and beginDate != '' and (endDate == null or endDate == '')">