1

src/main/java/org/rcisoft/bus/bpnsypn/entity/BPnSypn.java

@@ -3,16 +3,7 @@ package org.rcisoft.bus.bpnsypn.entity;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import org.rcisoft.core.entity.CyIdEntity;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 import org.rcisoft.core.entity.CyIdIncreEntity;
 
 /**
@@ -40,6 +31,17 @@ public class BPnSypn  extends CyIdIncreEntity<BPnSypn> {
      @Excel(name = "sypn", orderNum = "1", width = 20)
      private String sypn;
 
+
+
+     @Excel(name = "jlpm", orderNum = "2", width = 20)
+     private String jlpm;
+     @Excel(name = "sizes", orderNum = "3", width = 20)
+     private String sizes;
+     @Excel(name = "product", orderNum = "4", width = 20)
+     private String product;
+     @Excel(name = "pn2", orderNum = "5", width = 20)
+     private String pn2;
+
      /**
       * 月度信息pn查询
       * **/

src/main/resources/application-common.yml

@@ -160,9 +160,9 @@ spring:
 
     #---------SQL SERVER-------------
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://${cy_db.ip}:${cy_db.port};DatabaseName=${cy_db.db};encrypt=false
-    username: ${cy_db.username}
-    password: ${cy_db.password}
+    url: jdbc:sqlserver://106.3.99.36:20002;DatabaseName=dbo;encrypt=false
+    username: sa
+    password: zdwd519@zdw
     type: com.zaxxer.hikari.HikariDataSource
     hikari:
       minimum-idle: 50

src/main/resources/mapper/bus/bpnsypn/mapper/BPnSypnMapper.xml

@@ -12,6 +12,11 @@
         <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
         <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
         <result column="del_flag" jdbcType="NCHAR" property="delFlag"/>
+        <result column="jlpm" jdbcType="VARCHAR" property="jlpm"/>
+        <result column="sizes" jdbcType="VARCHAR" property="sizes"/>
+        <result column="product" jdbcType="VARCHAR" property="product"/>
+        <result column="pn2" jdbcType="VARCHAR" property="pn2"/>
+
     </resultMap>
 
     <select id="queryBPnSypns" resultMap="BaseResultMap">
@@ -32,6 +37,19 @@
         <if test="entity.sypn !=null and entity.sypn != '' ">
             and sypn like concat('%',#{entity.sypn},'%')
         </if>
+        <if test="entity.jlpm !=null and entity.jlpm != '' ">
+            and jlpm like concat('%',#{entity.jlpm},'%')
+        </if>
+        <if test="entity.sizes !=null and entity.sizes != '' ">
+            and sizes like concat('%',#{entity.sizes},'%')
+        </if>
+        <if test="entity.product !=null and entity.product != '' ">
+            and product like concat('%',#{entity.product},'%')
+        </if>
+        <if test="entity.pn2 !=null and entity.pn2 != '' ">
+            and pn2 like concat('%',#{entity.pn2},'%')
+        </if>
+
     </select>
 
     <select id="queryBPnSypnsPaged" resultMap="BaseResultMap">
@@ -47,6 +65,19 @@
         <if test="entity.sypn !=null and entity.sypn != '' ">
             and sypn like concat('%',#{entity.sypn},'%')
         </if>
+        <if test="entity.jlpm !=null and entity.jlpm != '' ">
+            and jlpm like concat('%',#{entity.jlpm},'%')
+        </if>
+        <if test="entity.sizes !=null and entity.sizes != '' ">
+            and sizes like concat('%',#{entity.sizes},'%')
+        </if>
+        <if test="entity.product !=null and entity.product != '' ">
+            and product like concat('%',#{entity.product},'%')
+        </if>
+        <if test="entity.pn2 !=null and entity.pn2 != '' ">
+            and pn2 like concat('%',#{entity.pn2},'%')
+        </if>
+
     </select>
     <select id="querySomePn" resultType="java.lang.Integer">
         SELECT