Skip to content

A
amos-boot-biz
Commit 807e6d5c authored by zhangsen's avatar zhangsen
Browse files
Options

bug tongbu

parent ba85255a
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 7 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/WarehouseStructureServiceImpl.java
View file @ 807e6d5c
...@@ -76,7 +76,10 @@ public class WarehouseStructureServiceImpl extends ServiceImpl<WarehouseStructur ...@@ -76,7 +76,10 @@ public class WarehouseStructureServiceImpl extends ServiceImpl<WarehouseStructur
public List<WarehouseStructure> gettree(Long warehouseId, String bizOrgCode, String buildingId) { public List<WarehouseStructure> gettree(Long warehouseId, String bizOrgCode, String buildingId) {
List<WarehouseStructure> list = new ArrayList<>(); List<WarehouseStructure> list = new ArrayList<>();
if (!StringUtils.isEmpty(buildingId)){ //buildId如果不为空，则为巡检点业务所调用入口 if (!StringUtils.isEmpty(buildingId)){ //buildId如果不为空，则为巡检点业务所调用入口
Map<String, String> map = formInstanceMapper.getChildListdate(Long.parseLong(buildingId)); Map<String, String> map = new HashMap<>();
List<String> list1 = formInstanceMapper.selectChildListdate(Long.parseLong(buildingId));
String join = String.join(",", list1);
map.put("ids", join);
List<String> strings = new ArrayList<>(); List<String> strings = new ArrayList<>();
if(map.get("ids")!=null && !map.get("ids").equals("")){ if(map.get("ids")!=null && !map.get("ids").equals("")){
String ids = map.get("ids"); String ids = map.get("ids");
......
amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml
View file @ 807e6d5c
...@@ -22,15 +22,15 @@ ...@@ -22,15 +22,15 @@
<!-- OR--> <!-- OR-->
<!-- (<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[<=]]> #{beginDate} AND a.end_Time <![CDATA[>=]]> #{endDate}</if>)--> <!-- (<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[<=]]> #{beginDate} AND a.end_Time <![CDATA[>=]]> #{endDate}</if>)-->
<!-- )--> <!-- )-->
<if test="beginDate!=null and endDate!=null"> <if test="beginDate!=null and endDate!=null and endDate != '' and endDate == null">
and a.begin_Time <![CDATA[>=]]> #{beginDate} AND a.end_Time <![CDATA[<=]]> #{endDate} and a.begin_Time <![CDATA[>=]]> #{beginDate} AND a.end_Time <![CDATA[<=]]> #{endDate}
</if> </if>
<if test="beginDate==null and endDate != null"> <if test="beginDate==null and endDate != null and endDate != ''">
AND a.end_Time <![CDATA[<=]]> #{endDate} AND a.end_Time <![CDATA[<=]]> #{endDate}
</if> </if>
<if test="beginDate!=null and endDate == null"> <if test="beginDate!=null and beginDate != '' and endDate == null">
and a.begin_Time <![CDATA[>=]]> #{beginDate} and a.begin_Time <![CDATA[>=]]> #{beginDate}
</if> </if>
...@@ -104,15 +104,15 @@ ...@@ -104,15 +104,15 @@
<!-- (<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[<=]]> #{beginDate} AND a.end_Time <![CDATA[>=]]> #{endDate}</if>)--> <!-- (<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[<=]]> #{beginDate} AND a.end_Time <![CDATA[>=]]> #{endDate}</if>)-->
<!-- )--> <!-- )-->
<if test="beginDate!=null and endDate!=null"> <if test="beginDate!=null and endDate!=null and endDate != '' and endDate == null">
and a.begin_Time <![CDATA[>=]]> #{beginDate} AND a.end_Time <![CDATA[<=]]> #{endDate} and a.begin_Time <![CDATA[>=]]> #{beginDate} AND a.end_Time <![CDATA[<=]]> #{endDate}
</if> </if>
<if test="beginDate==null and endDate != null"> <if test="beginDate==null and endDate != null and endDate != ''">
AND a.end_Time <![CDATA[<=]]> #{endDate} AND a.end_Time <![CDATA[<=]]> #{endDate}
</if> </if>
<if test="beginDate!=null and endDate == null"> <if test="beginDate!=null and beginDate != '' and endDate == null">
and a.begin_Time <![CDATA[>=]]> #{beginDate} and a.begin_Time <![CDATA[>=]]> #{beginDate}
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment