消费明细查询

src/main/java/org/rcisoft/bus/custinfo/controller/CustInfoController.java

@@ -122,7 +122,7 @@ public class CustInfoController extends CyPaginationController<CustInfo> {
         custInfoServiceImpl.findAllByPagination(getPaginationUtility(), custInfo);
         return getGridModelResponse();
     }
-
+    //@PreAuthorize("@cyPerm.hasPerm('sys:customer:export')")
     @CyOpeLogAnno(title = "system-客户信息表管理-查询客户信息表", businessType = CyLogTypeEnum.EXPORT)
     @ApiOperation(value = "导出客户信息表信息", notes = "导出客户信息表信息")
     @GetMapping(value = "/export")

src/main/java/org/rcisoft/bus/storegoodslog/entity/StoreGoodsLog.java

 package org.rcisoft.bus.storegoodslog.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import org.rcisoft.core.entity.CyIdIncreEntity;
@@ -21,6 +22,12 @@ public class StoreGoodsLog extends CyIdIncreEntity<StoreGoodsLog> {
      private Integer updateCounts;
      private Integer goodsId;
 
+     @TableField(exist = false)
+     private String appCode;
+
+     @TableField(exist = false)
+     private String storeName;
+
      /**
       * @desc 原价
       * @column original_price

src/main/resources/mapper/bus/storeGoodsLog/StoreGoodsLogMapper.xml

@@ -62,11 +62,14 @@
     </select>
 
     <select id="queryWmsGoodsLogsPaged" resultMap="BaseResultMap">
-        select * from store_goods_log
+        select *,dept_tb.dept_name as store_name,sga.app_code as app_code
+        from store_goods_log sgl
+        left join store_goods_apply sga on sgl.apply_id = sga.business_id
+        left join sys_dept as dept_tb on sga.store_id = dept_tb.business_id
         where 1=1
-            and del_flag = '0'
+            and sgl.del_flag = '0'
             <if test="entity.flag !=null and entity.flag != '' ">
-                and flag = #{entity.flag}
+                and sgl.flag = #{entity.flag}
             </if>
             <if test="entity.ioType !=null and entity.ioType != '' ">
                 and io_type = #{entity.ioType}
@@ -80,6 +83,6 @@
             <if test="entity.goodsCode !=null and entity.goodsCode != '' ">
                 and goods_code like concat('%',#{entity.goodsCode},'%')
             </if>
-        ORDER BY business_id DESC
+        ORDER BY sgl.business_id DESC
     </select>
 </mapper>