fix:载体下发销毁接口提交

ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/issued/SaveIssuedController.java

@@ -42,7 +42,7 @@ public class SaveIssuedController extends BaseController {
     @ResponseBody
     public TableDataInfo list(TdCarrierIssued tdCarrierIssued) {
         startPage();
-        List<TdCarrierIssued> carriers = carrierIssuedManager.selectTdCarrierList(tdCarrierIssued);
+        List<TdCarrierIssued> carriers = carrierIssuedManager.selectTdCarrierSaveList(tdCarrierIssued);
         return getDataTable(carriers);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierIssuedManager.java

@@ -41,6 +41,10 @@ public class CarrierIssuedManager {
         return carrierIssuedService.selectTdCarrierUserList(tdCarrierIssued);
     }
 
+    public List<TdCarrierIssued> selectTdCarrierSaveList(TdCarrierIssued tdCarrierIssued) {
+        return carrierIssuedService.selectTdCarrierSaveList(tdCarrierIssued);
+    }
+
     public boolean saveOrUpdate(TdCarrierIssued tdCarrierIssued) {
         if (CharSequenceUtil.isNotBlank(tdCarrierIssued.getId())) {
             tdCarrierIssued.setUpdateBy(ShiroUtils.getSysUser().getLoginName());

ruoyi-system/src/main/java/com/ruoyi/system/mapper/carrier/TdCarrierIssuedMapper.java

@@ -23,6 +23,8 @@ public interface TdCarrierIssuedMapper extends BaseMapper<TdCarrierIssued> {
 
     public List<TdCarrierIssued> selectTdCarrierUserList(TdCarrierIssued tdCarrierIssued);
 
+    public List<TdCarrierIssued> selectTdCarrierSaveList(TdCarrierIssued tdCarrierIssued);
+
 }
 
 

ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/TdCarrierIssuedService.java

@@ -23,4 +23,7 @@ public interface TdCarrierIssuedService extends IService<TdCarrierIssued> {
 
     public List<TdCarrierIssued> selectTdCarrierUserList(TdCarrierIssued tdCarrierIssued);
 
+
+    public List<TdCarrierIssued> selectTdCarrierSaveList(TdCarrierIssued tdCarrierIssued);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierIssuedServiceImpl.java

@@ -35,6 +35,11 @@ public class TdCarrierIssuedServiceImpl extends ServiceImpl<TdCarrierIssuedMappe
     public List<TdCarrierIssued> selectTdCarrierUserList(TdCarrierIssued tdCarrierIssued) {
         return tdCarrierIssuedMapper.selectTdCarrierUserList(tdCarrierIssued);
     }
+
+    @Override
+    public List<TdCarrierIssued> selectTdCarrierSaveList(TdCarrierIssued tdCarrierIssued) {
+        return tdCarrierIssuedMapper.selectTdCarrierSaveList(tdCarrierIssued);
+    }
 }
 
 

ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml

@@ -112,9 +112,7 @@
             <if test="areaDistrict!=null and areaDistrict!=''">
                 AND area_district = #{areaDistrict}
             </if>
-            <if test="status!=null and status!=''">
                 AND status in (1,2)
-            </if>
         </trim>
         ORDER BY create_time DESC
     </select>
@@ -146,10 +144,37 @@
             <if test="areaDistrict!=null and areaDistrict!=''">
                 AND area_district = #{areaDistrict}
             </if>
-            <if test="status!=null and status!=''">
                 AND status !='6'
+        </trim>
+        ORDER BY create_time DESC
+    </select>
+    <select id="selectTdCarrierSaveList" resultType="com.ruoyi.system.domain.carrier.TdCarrierIssued">
+        select  <include refid="Base_Column_List"/> from  td_carrier_issued
+        <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>
+                AND status in (3,4)
         </trim>
         ORDER BY create_time DESC
+
     </select>
 </mapper>