项目预警开发

jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java

@@ -52,11 +52,12 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                                                @Param("pageNum") int pageNum,
                                                @Param("pageSize") int pageSize);
 
-    List<GzjbDto> list(@Param("uerId") String id,
+    List<GzjbDto> list(@Param("userId") String uerId,
                        @Param("userType") String userType,
                        @Param("startDate") Date startDate,
                        @Param("endDate") Date endDate,
                        @Param("adcd") String adcd,
+                       @Param("orderBy") String orderBy,
                        @Param("pageNum") int pageNum,
                        @Param("pageSize") int pageSize);
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java

@@ -61,6 +61,7 @@ public class BsSgcJsjdBuiGzjbService extends BaseService<BsSgcJsjdBuiGzjbMapper,
                 data.getStartDate(),
                 data.getEndDate(),
                 sysXzqhService.getSubString(adcd),
+                "create_time",
                 sp.getPageNum(), sp.getPageSize());
 
 

jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml

@@ -275,17 +275,21 @@
                     AND user_id=#{userId})
                 </if>
 
-                <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
+                <if test="adcd!=null and adcd !=''">
+                    and adcd like concat(#{adcd},'%')
+                </if>
             </where>
             order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};
         </if>
         <if test="userType==00">
             <where>
-                <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
+                <if test="adcd!=null and adcd !=''">
+                    and adcd like concat(#{adcd},'%')
+                </if>
             </where>
-            order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};
+
         </if>
-        GROUP BY t.PRO_CODE
+        GROUP BY t.PRO_CODE LIMIT #{pageNum},#{pageSize};
 
     </select>
 </mapper>