admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
Administrator 2023-04-15 18:41:47 +08:00
parent 8fd79fc354
commit 8943c61fe1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/stuff/mapper/xml/StuffDetailMapper.xml
View File

@ -10,6 +10,12 @@
stuff_detail sd stuff_detail sd
LEFT JOIN stuff_warehouse_stuff_detail swsd ON swsd.stuff_detail_id = sd.id LEFT JOIN stuff_warehouse_stuff_detail swsd ON swsd.stuff_detail_id = sd.id
LEFT JOIN `stuff_warehouse` sw ON swsd.stuff_warehouse_id = sw.id LEFT JOIN `stuff_warehouse` sw ON swsd.stuff_warehouse_id = sw.id
LEFT JOIN `stuff_type` st ON st.id = sd.stuff_type_id
<where>
<if test="stuffDetail.stuffTypeId != null">
AND (sd.stuff_type_id = #{stuffDetail.stuffTypeId} OR sd.stuff_type_id IN ( SELECT t.id FROM stuff_type t WHERE find_in_set(#{stuffDetail.stuffTypeId}, ancestors) ))
</if>
</where>
${ew.customSqlSegment} ${ew.customSqlSegment}
GROUP BY sd.id GROUP BY sd.id
</select> </select>

2
src/main/java/com/zhgd/xmgl/modules/stuff/service/impl/StuffDetailServiceImpl.java
View File

@ -34,7 +34,7 @@ public class StuffDetailServiceImpl extends ServiceImpl<StuffDetailMapper, Stuff
String warehouseAlias = "sw."; String warehouseAlias = "sw.";
queryWrapper queryWrapper
.eq(StringUtils.isNotBlank(stuffDetail.getProjectSn()), stuffDetailAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getProjectSn), stuffDetail.getProjectSn()) .eq(StringUtils.isNotBlank(stuffDetail.getProjectSn()), stuffDetailAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getProjectSn), stuffDetail.getProjectSn())
.eq(stuffDetail.getStuffTypeId() != null, stuffDetailAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getStuffTypeId), stuffDetail.getStuffTypeId()) //.eq(stuffDetail.getStuffTypeId() != null, stuffDetailAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getStuffTypeId), stuffDetail.getStuffTypeId())
.eq(stuffDetail.getStuffWarehouseId() != null, warehouseAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getStuffWarehouseId), stuffDetail.getStuffWarehouseId()) .eq(stuffDetail.getStuffWarehouseId() != null, warehouseAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getStuffWarehouseId), stuffDetail.getStuffWarehouseId())
.le(stuffDetail.getEndTime() != null, stuffDetailAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getUpdateTime), stuffDetail.getEndTime()) .le(stuffDetail.getEndTime() != null, stuffDetailAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getUpdateTime), stuffDetail.getEndTime())
.ge(stuffDetail.getStartTime() != null, stuffDetailAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getUpdateTime), stuffDetail.getStartTime()) .ge(stuffDetail.getStartTime() != null, stuffDetailAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getUpdateTime), stuffDetail.getStartTime())