排序相关修改

src/main/java/com/glxp/api/controller/inv/InvPreProductController.java

@@ -95,6 +95,9 @@ public class InvPreProductController extends BaseController {
      */
     @GetMapping("/spms/inv/pre/product/filterDetail")
     public BaseResponse filterInvPreProductDetail(FilterInvPreProductDetailRequest detailRequest) {
+        if (!"".equals(detailRequest.getOrderBy())) {
+            detailRequest.setOrderBy("updateTime");
+        }
         List<InvPreProductDetailEntity> invPreProductDetailEntities = invPreProductDetailService.filterPreProductDetailList(detailRequest);
         PageInfo<InvPreProductDetailEntity> pageInfo = new PageInfo<>(invPreProductDetailEntities);
 

src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java

@@ -86,6 +86,11 @@ public class InvPreinProductController extends BaseController {
      */
     @GetMapping("/spms/inv/pre/in/product/filterDetail")
     public BaseResponse filterInvPreProductDetail(FilterInvPreProductDetailRequest detailRequest) {
+
+        if(!"".equals(detailRequest.getOrderBy())){
+            detailRequest.setOrderBy("updateTime");
+        }
+
         List<InvPreInProductDetailEntity> invPreProductDetailEntities = invPreinProductDetailService.filterPreProductDetailList(detailRequest);
         PageInfo<InvPreInProductDetailEntity> pageInfo = new PageInfo<>(invPreProductDetailEntities);
 

src/main/java/com/glxp/api/controller/inv/InvProductController.java

@@ -128,6 +128,9 @@ public class InvProductController extends BaseController {
      */
     @GetMapping("/spms/inv/product/filterDetail")
     public BaseResponse filterInvProductDetail(FilterInvProductDetailRequest filterInvProductDetailRequest) {
+        if (!"".equals(filterInvProductDetailRequest.getOrderBy())) {
+            filterInvProductDetailRequest.setOrderBy("updateTime");
+        }
         List<InvProductDetailEntity> invProductDetailEntities = invProductDetailService.filterInvProductDetailList(filterInvProductDetailRequest);
         PageInfo<InvProductDetailEntity> pageInfo = new PageInfo<>(invProductDetailEntities);
 

src/main/java/com/glxp/api/req/inv/FilterInvPreProductDetailRequest.java

@@ -76,4 +76,7 @@ public class FilterInvPreProductDetailRequest extends ListPageRequest {
      */
     private String updateTime;
 
+
+
+
 }

src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java

@@ -147,7 +147,8 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
 
         //设置单据类型名称
         BasicBussinessTypeEntity busType = bussinessTypeDao.selectOne(new QueryWrapper<BasicBussinessTypeEntity>().select("name").eq("action", response.getAction()));
-        response.setActionName(busType.getName());
+        if (busType != null)
+            response.setActionName(busType.getName());
         //设置单据日期
         IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
         if (order != null)

src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java

@@ -161,7 +161,8 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
 
         //设置单据类型名称
         BasicBussinessTypeEntity busType = bussinessTypeDao.selectOne(new QueryWrapper<BasicBussinessTypeEntity>().select("name").eq("action", response.getAction()));
-        response.setActionName(busType.getName());
+        if (busType != null)
+            response.setActionName(busType.getName());
         //设置单据日期
         IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
         if (order != null)

src/main/java/com/glxp/api/util/page/ListPageRequest.java

@@ -19,5 +19,6 @@ public class ListPageRequest {
     @Min(value = 1, message = "分页参数不能小于1")
     @Max(value = 500, message = "分页参数不能大于500")
     private Integer limit;
-
+    private String orderBy;
+    private String sort;
 }

src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml

@@ -51,6 +51,15 @@
                 AND updateTime <![CDATA[ <= ]]> #{updateTime}
             </if>
         </where>
+
+        <choose>
+            <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
+                order by ${orderBy} ${sort}
+            </when>
+            <otherwise>
+                ORDER BY updateTime DESC
+            </otherwise>
+        </choose>
     </select>
 
     <select id="findGroupBySpace" resultType="com.glxp.api.res.inv.InvPreinProductResponse">
@@ -284,7 +293,7 @@
                sp.name                        invSpaceName,
                ifnull(sum(pd.inCount), 0)  as inCount,
                ifnull(sum(pd.outCount), 0) as outCount,
-        pd.inCount - pd.outCount  as reCount
+               pd.inCount - pd.outCount    as reCount
         from inv_prein_product_detail pd
                      left join basic_udirel bu on pd.relId = bu.id
                      left join basic_products bp on bp.uuid = bu.uuid

src/main/resources/mybatis/mapper/inv/InvUserProductDao.xml

@@ -131,6 +131,16 @@
                 AND updateTime <![CDATA[ <= ]]> #{updateTime}
             </if>
         </where>
+
+
+        <choose>
+            <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
+                order by ${orderBy} ${sort}
+            </when>
+            <otherwise>
+                ORDER BY updateTime DESC
+            </otherwise>
+        </choose>
     </select>
 
     <delete id="deleteInvPreProductDetail">

src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml

@@ -25,7 +25,7 @@
                ipp.deptCode,
                ipp.invCode,
                ipp.invSpaceCode,
-               ipp.code as code
+               ipp.code                     as code
         from inv_product_detail ipp
                      inner join basic_udirel on ipp.relId = basic_udirel.id
                      inner join basic_products bp on basic_udirel.uuid = bp.uuid
@@ -142,6 +142,16 @@
                 AND updateTime <![CDATA[ <= ]]> #{updateTime}
             </if>
         </where>
+
+
+        <choose>
+            <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
+                order by ${orderBy} ${sort}
+            </when>
+            <otherwise>
+                ORDER BY updateTime DESC
+            </otherwise>
+        </choose>
     </select>
 
     <delete id="deleteInvProductDetail">