增加分页,增加根据用户选择再用钢瓶

src/main/java/com/sooka/sponest/data/housingconstruction/controller/CenterdataTHousingconstructionRealnameuserController.java

@@ -91,7 +91,8 @@ public class CenterdataTHousingconstructionRealnameuserController extends BaseCo
 
     @GetMapping("/getRealNameUserListAllByType")
     public AjaxResult getRealNameUserListAllByType(CenterdataTHousingconstructionRealnameuser vo) {
+        startPage();
         List<CenterdataTHousingconstructionRealnameuser> list = centerdataTHousingconstructionRealnameuserService.selectCenterdataTHousingconstructionRealnameuserList(vo);
-        return AjaxResult.success(list);
+        return AjaxResult.success(getDataTable(list).getRows());
     }
 }

src/main/java/com/sooka/sponest/data/housingconstruction/controller/CenterdataTHousingconstructionSteelcylinderController.java

@@ -7,6 +7,7 @@ import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionSteelcylinder;
+import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionSteelcylinderLog;
 import com.sooka.sponest.data.housingconstruction.service.ICenterdataTHousingconstructionSteelcylinderService;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 钢瓶基础数据Controller
@@ -105,4 +107,13 @@ public class CenterdataTHousingconstructionSteelcylinderController extends BaseC
         List<CenterdataTHousingconstructionSteelcylinder> list = centerdataTHousingconstructionSteelcylinderService.selectCenterdataTHousingconstructionSteelcylinderList(centerdataTHousingconstructionSteelcylinder);
         return AjaxResult.success(list);
     }
+
+
+    @RequiresPermissions("data:steelcylinder:list")
+    @GetMapping("/listByUserId")
+    public TableDataInfo listByUserId(CenterdataTHousingconstructionSteelcylinderLog centerdataTHousingconstructionSteelcylinder) {
+        startPage();
+        List<Map<String, Object>> list = centerdataTHousingconstructionSteelcylinderService.listByUserId(centerdataTHousingconstructionSteelcylinder);
+        return getDataTable(list);
+    }
 }

src/main/java/com/sooka/sponest/data/housingconstruction/mapper/CenterdataTHousingconstructionSteelcylinderMapper.java

@@ -2,8 +2,10 @@ package com.sooka.sponest.data.housingconstruction.mapper;
 
 import com.sooka.sponest.data.housingconstruction.domain.BO.SteelcylinderBO;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionSteelcylinder;
+import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionSteelcylinderLog;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 钢瓶基础数据Mapper接口
@@ -61,4 +63,6 @@ public interface CenterdataTHousingconstructionSteelcylinderMapper {
     public int deleteCenterdataTHousingconstructionSteelcylinderByIds(String[] ids);
 
     List<SteelcylinderBO> selectTaskList(CenterdataTHousingconstructionSteelcylinder centerdataTHousingconstructionSteelcylinder);
+
+    List<Map<String, Object>> listByUserId(CenterdataTHousingconstructionSteelcylinderLog linderLog);
 }

src/main/java/com/sooka/sponest/data/housingconstruction/service/ICenterdataTHousingconstructionSteelcylinderService.java

@@ -2,8 +2,10 @@ package com.sooka.sponest.data.housingconstruction.service;
 
 import com.sooka.sponest.data.housingconstruction.domain.BO.SteelcylinderBO;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionSteelcylinder;
+import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionSteelcylinderLog;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 钢瓶基础数据Service接口
@@ -61,4 +63,6 @@ public interface ICenterdataTHousingconstructionSteelcylinderService {
     public int deleteCenterdataTHousingconstructionSteelcylinderById(String id);
 
     List<SteelcylinderBO> selectTaskList(CenterdataTHousingconstructionSteelcylinder centerdataTHousingconstructionSteelcylinder);
+
+    List<Map<String, Object>> listByUserId(CenterdataTHousingconstructionSteelcylinderLog linderLog);
 }

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionSteelcylinderServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 钢瓶基础数据Service业务层处理
@@ -136,4 +137,11 @@ public class CenterdataTHousingconstructionSteelcylinderServiceImpl extends Base
     public List<SteelcylinderBO> selectTaskList(CenterdataTHousingconstructionSteelcylinder centerdataTHousingconstructionSteelcylinder) {
         return centerdataTHousingconstructionSteelcylinderMapper.selectTaskList(centerdataTHousingconstructionSteelcylinder);
     }
+
+    @DataScopeMutiDept(deptAlias = "d")
+    @Override
+    public List<Map<String, Object>> listByUserId(CenterdataTHousingconstructionSteelcylinderLog linderLog) {
+        setSookaDataBase(linderLog);
+        return centerdataTHousingconstructionSteelcylinderMapper.listByUserId(linderLog);
+    }
 }

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionRealnameuserMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
         <where>
             <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
             <if test="deptName != null  and deptName != ''"> and a.dept_name like concat('%', #{deptName}, '%')</if>
             <if test="enterpriseUserType != null  and enterpriseUserType != ''"> and enterprise_user_type = #{enterpriseUserType}</if>
             ${params.dataScope}

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionSteelcylinderMapper.xml

@@ -203,4 +203,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE a.state = 'state_4'
         AND DATE_ADD(b.sign_time, INTERVAL a.threshold DAY) < NOW();
     </select>
+
+
+    <select id="listByUserId" parameterType="CenterdataTHousingconstructionSteelcylinderLog" resultType="map">
+        select steelcylinder_id steelcylinderId, steelcylinder_name steelcylinderName,
+               join_warehouse_time joinWarehouseTime, filling_time fillingTime,
+               operator_id operatorId, operator_name operatorName, car_id carId, car_number carNumber,
+               delivery_time deliveryTime, delivery_id deliveryId,
+               delivery_name deliveryName, sign_time signTime,
+               join_house_id joinHouseId, join_house_name joinHouseName,
+               recycling_name recyclingName, recycling_time recyclingTime, update_time updateTime
+        from centerdata_t_housingconstruction_steelcylinder_log
+        <where>
+            <if test="steelcylinderName != null and steelcylinderName !=''">
+                and steelcylinder_name like concat('%', #{steelcylinderName}, '%')
+            </if>
+            <if test="joinHouseId != null and joinHouseId !=''">
+                and join_house_id = #{joinHouseId}
+            </if>
+            and recycling_name is null
+        </where>
+    </select>
 </mapper>