成品仓库,帮助文档 2022年4月15日 sxm

src/main/java/com/gaotao/modules/oss/dao/SysOssDao.java

@@ -3,11 +3,16 @@
 package com.gaotao.modules.oss.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gaotao.modules.oss.entity.SysOssEntity;
+import com.gaotao.modules.oss.vo.OssVo;
 import com.gaotao.modules.oss.vo.SysOssEntityData;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 文件上传
@@ -28,4 +33,13 @@ public interface SysOssDao extends BaseMapper<SysOssEntity> {
      * @date 2021/11/2 15:20
       */
     List<SysOssEntityData> getSysOssEntityList(SysOssEntityData sysOssEntityData);
+
+    /**
+     * @Author sxm
+     * @Description 分页获取数据
+     * @Date 2022/4/14 17:50
+     * @Param
+     * @return
+     **/
+    IPage<OssVo> queryPage(Page<OssVo> sysOssEntityPage, @Param("query") Map<String, Object> params);
 }

src/main/java/com/gaotao/modules/oss/entity/SysOssEntity.java

@@ -42,4 +42,10 @@ public class SysOssEntity implements Serializable {
 
 	private String orderRef3;
 
+	private String fileSuffix;
+
+	private Integer fileTypeCode;
+
+
+
 }

src/main/java/com/gaotao/modules/oss/service/impl/SysOssServiceImpl.java

@@ -1,20 +1,16 @@
- 
-
 package com.gaotao.modules.oss.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gaotao.common.utils.PageUtils;
-import com.gaotao.common.utils.Query;
 import com.gaotao.modules.oss.dao.SysOssDao;
 import com.gaotao.modules.oss.entity.SysOssEntity;
 import com.gaotao.modules.oss.service.SysOssService;
+import com.gaotao.modules.oss.vo.OssVo;
 import com.gaotao.modules.oss.vo.SysOssEntityData;
-import com.gaotao.modules.sys.entity.SysUserEntity;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
-
 import java.util.List;
 import java.util.Map;
 
@@ -29,15 +25,10 @@ public class SysOssServiceImpl extends ServiceImpl<SysOssDao, SysOssEntity> impl
 		String orderRef1 = (String)params.get("orderRef1");
 		String orderRef2 = (String)params.get("orderRef2");
 		String orderRef3 = (String)params.get("orderRef3");
-		IPage<SysOssEntity> page = this.page(
-			new Query<SysOssEntity>().getPage(params),
-				new QueryWrapper<SysOssEntity>()
-						.eq(StringUtils.isNotBlank(fileType),"file_type",fileType)
-						.eq(StringUtils.isNotBlank(orderRef1),"order_ref1",orderRef1)
-						.eq(StringUtils.isNotBlank(orderRef2),"order_ref2",orderRef2)
-						.eq(StringUtils.isNotBlank(orderRef3),"order_ref3",orderRef3)
-						.like(StringUtils.isNotBlank(fileName),"file_name", fileName));
-		return new PageUtils(page);
+		long page = Long.valueOf(params.get("page").toString());
+		long limit = Long.valueOf(params.get("limit").toString());
+		IPage<OssVo> pageData = this.baseMapper.queryPage( new Page<OssVo>(page, limit),params);
+		return new PageUtils(pageData);
 	}
 
 	@Override
@@ -53,6 +44,8 @@ public class SysOssServiceImpl extends ServiceImpl<SysOssDao, SysOssEntity> impl
 				.set(StringUtils.isNotEmpty(sysOssEntity.getOrderRef1()),SysOssEntity::getOrderRef1,sysOssEntity.getOrderRef1())
 				.set(StringUtils.isNotEmpty(sysOssEntity.getOrderRef2()),SysOssEntity::getOrderRef2,sysOssEntity.getOrderRef2())
 				.set(StringUtils.isNotEmpty(sysOssEntity.getOrderRef3()),SysOssEntity::getOrderRef3,sysOssEntity.getOrderRef3())
+				.set(StringUtils.isNotEmpty(sysOssEntity.getFileSuffix()),SysOssEntity::getFileSuffix,sysOssEntity.getFileSuffix())
+				.set(sysOssEntity.getFileTypeCode()!=null,SysOssEntity::getFileTypeCode,sysOssEntity.getFileTypeCode())
 				.eq(SysOssEntity::getId,sysOssEntity.getId())
 				.update();
 	}

src/main/java/com/gaotao/modules/oss/vo/OssVo.java

@@ -0,0 +1,16 @@
+package com.gaotao.modules.oss.vo;
+
+import com.gaotao.modules.oss.entity.SysOssEntity;
+import lombok.Data;
+
+/**
+ * @CLASSNAME OssVo
+ * @AUTHOR sxm
+ * @DESCRIPTION
+ * @DATE 2022/4/14 18:10
+ * @VERSION 1.0
+ **/
+@Data
+public class OssVo extends SysOssEntity {
+    private String  orderInfo;
+}

src/main/resources/mapper/finishedProduct/CRollinfoDao.xml

@@ -166,7 +166,7 @@
         p.ExpireDateControlFlag as expireDateControlFlag,
         r.ExpiredDate,
         p.toexpiredays,
-        datediff( DAY, ExpiredDate,GETDATE()) overdue_days
+        ( CASE WHEN ExpiredDate IS NULL THEN - 9999 ELSE datediff( DAY, ExpiredDate, GETDATE( ) ) END ) overdue_days
         FROM C_RollInfo AS r
         LEFT JOIN Part AS p ON ( r.PartNo = p.PartNo AND r.Site = p.Site )
         <where>

src/main/resources/mapper/oss/SysOssDao.xml

@@ -4,7 +4,8 @@
 <mapper namespace="com.gaotao.modules.oss.dao.SysOssDao">
 
 
-    <select id="getSysOssEntityList" resultType="com.gaotao.modules.oss.vo.SysOssEntityData" parameterType="com.gaotao.modules.oss.vo.SysOssEntityData">
+    <select id="getSysOssEntityList" resultType="com.gaotao.modules.oss.vo.SysOssEntityData"
+            parameterType="com.gaotao.modules.oss.vo.SysOssEntityData">
         select A.id,A.url,A.create_date,A.file_name,A.new_file_name,A.created_by
         from sys_oss A
         left join file_associate B on A.id = B.sys_oss_id
@@ -26,4 +27,41 @@
             </if>
         </where>
     </select>
+    <select id="queryPage" resultType="com.gaotao.modules.oss.vo.OssVo">
+        SELECT
+        id,
+        url,
+        create_date,
+        file_name,
+        new_file_name,
+        created_by,
+        order_ref1,
+        order_ref2,
+        order_ref3,
+        file_type,
+        file_suffix,
+        file_type_code,
+        dbo.file_type_resource ( ISNULL( file_type_code, - 1 ), order_ref1, order_ref2, order_ref3 ) as order_info
+        FROM
+        sys_oss
+        <where>
+            <if test="query.fileTypeCode != '' and query.fileTypeCode !=null ">
+                file_type_code = #{query.fileTypeCode}
+            </if>
+            <if test="query.fileName != '' and query.fileName !=null ">
+              and  file_name like #{query.fileName}
+            </if>
+            <if test="query.orderRef1 != '' and query.orderRef1 !=null ">
+                and order_ref1 = #{query.orderRef1}
+            </if>
+            <if test="query.orderRef2 != '' and query.orderRef2 !=null ">
+                and  order_ref2 = #{query.orderRef2}
+            </if>
+            <if test="query.orderRef3 != '' and query.orderRef3 !=null ">
+                and order_ref3 = #{query.orderRef3}
+            </if>
+        </where>
+
+
+    </select>
 </mapper>