增加销售明细导出按钮

src/main/java/org/rcisoft/bus/storegoodslog/controller/StoreGoodsLogController.java

@@ -121,6 +121,7 @@ public class StoreGoodsLogController extends CyPaginationController<StoreGoodsLo
         return getGridModelResponse();
     }
 
+    //@PreAuthorize("@cyPerm.hasPerm('sys:goodsLog:export')")
     @CyOpeLogAnno(title = "system-商品记录表管理-查询商品记录表", businessType = CyLogTypeEnum.EXPORT)
     @ApiOperation(value = "导出商品记录表信息", notes = "导出商品记录表信息")
     @GetMapping(value = "/export")

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

@@ -37,11 +37,19 @@
     </update>
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->
     <select id="queryWmsGoodsLogs" 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'
+        and sgl.io_type = '1'
+        and sgl.is_return = '0'
         <if test="entity.flag !=null and entity.flag != '' ">
-            and flag = #{entity.flag}
+            and sgl.flag = #{entity.flag}
+        </if>
+        <if test="entity.storeId !=null and entity.storeId != '' ">
+            and store_id = #{entity.storeId}
         </if>
         <if test="entity.ioType !=null and entity.ioType != '' ">
             and io_type = #{entity.ioType}
@@ -55,10 +63,16 @@
         <if test="entity.goodsCode !=null and entity.goodsCode != '' ">
             and goods_code like concat('%',#{entity.goodsCode},'%')
         </if>
-        <if test="entity.applyId !=null and entity.applyId != '' ">
-            and apply_id = #{entity.applyId}
+        <if test="entity.appCode !=null and entity.appCode != '' ">
+            and app_code like concat('%',#{entity.appCode},'%')
+        </if>
+        <if test="entity.startTime !=null and entity.startTime != '' ">
+            and sgl.update_date &gt;=  #{entity.startTime}
         </if>
-        ORDER BY business_id DESC
+        <if test="entity.finishTime !=null and entity.finishTime != '' ">
+            and sgl.update_date &lt;=  DATE_ADD(#{entity.finishTime}, INTERVAL 1 DAY)
+        </if>
+        ORDER BY sgl.business_id DESC
     </select>
 
     <select id="queryWmsGoodsLogsPaged" resultMap="BaseResultMap">