luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:载体维修修改

Browse Source
pg_adapter
wangxy 8 months ago
parent d7016d863f
commit c3909964c3
7 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/DestoryCarrierController.java
Unescape View File

@ -40,7 +40,7 @@ public class DestoryCarrierController extends BaseController {
@ResponseBody
public TableDataInfo list(TdCarrier tdCarrier) {
startPage();
List<TdCarrier> carriers = carrierManager.selectTdCarrierList(tdCarrier);
List<TdCarrier> carriers = carrierManager.selectTdCarrierUpdateList(tdCarrier);
return getDataTable(carriers);
}

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/MaintainCarrierController.java
Unescape View File

@ -40,7 +40,7 @@ public class MaintainCarrierController extends BaseController {
@ResponseBody
public TableDataInfo list(TdCarrier tdCarrier) {
startPage();
List<TdCarrier> carriers = carrierManager.selectTdCarrierList(tdCarrier);
List<TdCarrier> carriers = carrierManager.selectTdCarrierUpdateList(tdCarrier);
return getDataTable(carriers);
}

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierManager.java
Unescape View File

@ -32,6 +32,10 @@ public class CarrierManager {
return carrierService.selectTdCarrierList(tdCarrier);
}
public List<TdCarrier> selectTdCarrierUpdateList(TdCarrier tdCarrier) {
return carrierService.selectTdCarrierUpdateList(tdCarrier);
}
public boolean saveOrUpdate(TdCarrier tdCarrier) {
if (CharSequenceUtil.isNotBlank(tdCarrier.getId())) {

3
ruoyi-system/src/main/java/com/ruoyi/system/mapper/carrier/TdCarrierMapper.java
Unescape View File

@ -16,6 +16,9 @@ public interface TdCarrierMapper extends BaseMapper<TdCarrier> {
public List<TdCarrier> selectTdCarrierList(TdCarrier tdCarrier);
public List<TdCarrier> selectTdCarrierUpdateList(TdCarrier tdCarrier);
}

3
ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/TdCarrierService.java
Unescape View File

@ -15,4 +15,7 @@ public interface TdCarrierService extends IService<TdCarrier> {
public List<TdCarrier> selectTdCarrierList(TdCarrier tdCarrier);
public List<TdCarrier> selectTdCarrierUpdateList(TdCarrier tdCarrier);
}

5
ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierServiceImpl.java
Unescape View File

@ -26,6 +26,11 @@ public class TdCarrierServiceImpl extends ServiceImpl<TdCarrierMapper, TdCarrier
public List<TdCarrier> selectTdCarrierList(TdCarrier tdCarrier) {
return carrierMapper.selectTdCarrierList(tdCarrier);
}
@Override
public List<TdCarrier> selectTdCarrierUpdateList(TdCarrier tdCarrier) {
return carrierMapper.selectTdCarrierUpdateList(tdCarrier);
}
}

30
ruoyi-system/src/main/resources/mapper/system/TdCarrierMapper.xml
Unescape View File

@ -88,6 +88,36 @@
</if>
</trim>
ORDER BY create_time DESC
</select>
<select id="selectTdCarrierUpdateList" resultType="com.ruoyi.system.domain.carrier.TdCarrier">
select <include refid="Base_Column_List"/> from td_carrier
<trim prefix="where" prefixOverrides="and|or">
<if test="carrierName!=null and carrierName!=''">
AND carrier_name LIKE concat('%',#{carrierName},'%')
</if>
<if test="carrierLevel!=null and carrierLevel!=''">
AND carrier_level = #{carrierLevel}
</if>
<if test="carrierExtent!=null and carrierExtent!=''">
AND carrier_extent = #{carrierExtent}
</if>
<if test="carrierSecret!=null and carrierSecret!=''">
AND carrier_secret = #{carrierSecret}
</if>
<if test="carrierNumber!=null and carrierNumber!=''">
AND carrier_number = #{carrierNumber}
</if>
<if test="areaCity!=null and areaCity!=''">
AND area_city = #{areaCity}
</if>
<if test="areaDistrict!=null and areaDistrict!=''">
AND area_district = #{areaDistrict}
</if>
<if test="status!=null and status!=''">
AND status !='7'
</if>
</trim>
ORDER BY create_time DESC
</select>
</mapper>

Write Preview
Loading…
Cancel
Save