开发完成 供应商表

java110-bean/src/main/java/com/java110/dto/supplier/SupplierDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.supplier;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,14 +16,15 @@ import java.util.Date;
 public class SupplierDto extends PageDto implements Serializable {
 
     private String supplierName;
-private String personName;
-private String supplierId;
-private String stId;
-private String beanName;
-private String startTime;
-private String remark;
-private String endTime;
-private String personTel;
+    private String personName;
+    private String supplierId;
+    private String stId;
+    private String beanName;
+    private String startTime;
+    private String remark;
+    private String endTime;
+    private String personTel;
+    private String typeName;
 
 
     private Date createTime;
@@ -33,55 +35,72 @@ private String personTel;
     public String getSupplierName() {
         return supplierName;
     }
-public void setSupplierName(String supplierName) {
+
+    public void setSupplierName(String supplierName) {
         this.supplierName = supplierName;
     }
-public String getPersonName() {
+
+    public String getPersonName() {
         return personName;
     }
-public void setPersonName(String personName) {
+
+    public void setPersonName(String personName) {
         this.personName = personName;
     }
-public String getSupplierId() {
+
+    public String getSupplierId() {
         return supplierId;
     }
-public void setSupplierId(String supplierId) {
+
+    public void setSupplierId(String supplierId) {
         this.supplierId = supplierId;
     }
-public String getStId() {
+
+    public String getStId() {
         return stId;
     }
-public void setStId(String stId) {
+
+    public void setStId(String stId) {
         this.stId = stId;
     }
-public String getBeanName() {
+
+    public String getBeanName() {
         return beanName;
     }
-public void setBeanName(String beanName) {
+
+    public void setBeanName(String beanName) {
         this.beanName = beanName;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getEndTime() {
+
+    public String getEndTime() {
         return endTime;
     }
-public void setEndTime(String endTime) {
+
+    public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
-public String getPersonTel() {
+
+    public String getPersonTel() {
         return personTel;
     }
-public void setPersonTel(String personTel) {
+
+    public void setPersonTel(String personTel) {
         this.personTel = personTel;
     }
 
@@ -101,4 +120,12 @@ public void setPersonTel(String personTel) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
 }

java110-db/src/main/resources/mapper/scm/SupplierV1ServiceDaoImplMapper.xml

@@ -5,138 +5,137 @@
 <mapper namespace="supplierV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存供应商信息 add by wuxw 2018-07-03 -->
     <insert id="saveSupplierInfo" parameterType="Map">
         insert into supplier(
-supplier_name,person_name,supplier_id,st_id,bean_name,start_time,remark,end_time,person_tel
-) values (
-#{supplierName},#{personName},#{supplierId},#{stId},#{beanName},#{startTime},#{remark},#{endTime},#{personTel}
-)
+        supplier_name,person_name,supplier_id,st_id,bean_name,start_time,remark,end_time,person_tel
+        ) values (
+        #{supplierName},#{personName},#{supplierId},#{stId},#{beanName},#{startTime},#{remark},#{endTime},#{personTel}
+        )
     </insert>
 
 
-
     <!-- 查询供应商信息 add by wuxw 2018-07-03 -->
     <select id="getSupplierInfo" parameterType="Map" resultType="Map">
-        select  t.supplier_name,t.supplier_name supplierName,t.person_name,t.person_name personName,t.supplier_id,t.supplier_id supplierId,t.st_id,t.st_id stId,t.bean_name,t.bean_name beanName,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.remark,t.end_time,t.end_time endTime,t.person_tel,t.person_tel personTel 
-from supplier t 
-where 1 =1 
-<if test="supplierName !=null and supplierName != ''">
-   and t.supplier_name= #{supplierName}
-</if> 
-<if test="personName !=null and personName != ''">
-   and t.person_name= #{personName}
-</if> 
-<if test="supplierId !=null and supplierId != ''">
-   and t.supplier_id= #{supplierId}
-</if> 
-<if test="stId !=null and stId != ''">
-   and t.st_id= #{stId}
-</if> 
-<if test="beanName !=null and beanName != ''">
-   and t.bean_name= #{beanName}
-</if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="endTime !=null and endTime != ''">
-   and t.end_time= #{endTime}
-</if> 
-<if test="personTel !=null and personTel != ''">
-   and t.person_tel= #{personTel}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.supplier_name,t.supplier_name supplierName,t.person_name,t.person_name
+        personName,t.supplier_id,t.supplier_id supplierId,t.st_id,t.st_id stId,t.bean_name,t.bean_name
+        beanName,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.remark,t.end_time,t.end_time
+        endTime,t.person_tel,t.person_tel personTel,st.type_name typeName,t.create_time createTime
+        from supplier t
+        left join supplier_type st on t.st_id = st.st_id and st.status_cd = '0'
+        where 1 =1
+        <if test="supplierName !=null and supplierName != ''">
+            and t.supplier_name= #{supplierName}
+        </if>
+        <if test="personName !=null and personName != ''">
+            and t.person_name= #{personName}
+        </if>
+        <if test="supplierId !=null and supplierId != ''">
+            and t.supplier_id= #{supplierId}
+        </if>
+        <if test="stId !=null and stId != ''">
+            and t.st_id= #{stId}
+        </if>
+        <if test="beanName !=null and beanName != ''">
+            and t.bean_name= #{beanName}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="personTel !=null and personTel != ''">
+            and t.person_tel= #{personTel}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改供应商信息 add by wuxw 2018-07-03 -->
     <update id="updateSupplierInfo" parameterType="Map">
-        update  supplier t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="supplierName !=null and supplierName != ''">
-, t.supplier_name= #{supplierName}
-</if> 
-<if test="personName !=null and personName != ''">
-, t.person_name= #{personName}
-</if> 
-<if test="stId !=null and stId != ''">
-, t.st_id= #{stId}
-</if> 
-<if test="beanName !=null and beanName != ''">
-, t.bean_name= #{beanName}
-</if> 
-<if test="startTime !=null and startTime != ''">
-, t.start_time= #{startTime}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="endTime !=null and endTime != ''">
-, t.end_time= #{endTime}
-</if> 
-<if test="personTel !=null and personTel != ''">
-, t.person_tel= #{personTel}
-</if> 
- where 1=1 <if test="supplierId !=null and supplierId != ''">
-and t.supplier_id= #{supplierId}
-</if> 
+        update supplier t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="supplierName !=null and supplierName != ''">
+            , t.supplier_name= #{supplierName}
+        </if>
+        <if test="personName !=null and personName != ''">
+            , t.person_name= #{personName}
+        </if>
+        <if test="stId !=null and stId != ''">
+            , t.st_id= #{stId}
+        </if>
+        <if test="beanName !=null and beanName != ''">
+            , t.bean_name= #{beanName}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            , t.start_time= #{startTime}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            , t.end_time= #{endTime}
+        </if>
+        <if test="personTel !=null and personTel != ''">
+            , t.person_tel= #{personTel}
+        </if>
+        where 1=1
+        <if test="supplierId !=null and supplierId != ''">
+            and t.supplier_id= #{supplierId}
+        </if>
 
     </update>
 
     <!-- 查询供应商数量 add by wuxw 2018-07-03 -->
-     <select id="querySuppliersCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from supplier t 
-where 1 =1 
-<if test="supplierName !=null and supplierName != ''">
-   and t.supplier_name= #{supplierName}
-</if> 
-<if test="personName !=null and personName != ''">
-   and t.person_name= #{personName}
-</if> 
-<if test="supplierId !=null and supplierId != ''">
-   and t.supplier_id= #{supplierId}
-</if> 
-<if test="stId !=null and stId != ''">
-   and t.st_id= #{stId}
-</if> 
-<if test="beanName !=null and beanName != ''">
-   and t.bean_name= #{beanName}
-</if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="endTime !=null and endTime != ''">
-   and t.end_time= #{endTime}
-</if> 
-<if test="personTel !=null and personTel != ''">
-   and t.person_tel= #{personTel}
-</if> 
+    <select id="querySuppliersCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from supplier t
+        where 1 =1
+        <if test="supplierName !=null and supplierName != ''">
+            and t.supplier_name= #{supplierName}
+        </if>
+        <if test="personName !=null and personName != ''">
+            and t.person_name= #{personName}
+        </if>
+        <if test="supplierId !=null and supplierId != ''">
+            and t.supplier_id= #{supplierId}
+        </if>
+        <if test="stId !=null and stId != ''">
+            and t.st_id= #{stId}
+        </if>
+        <if test="beanName !=null and beanName != ''">
+            and t.bean_name= #{beanName}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="personTel !=null and personTel != ''">
+            and t.person_tel= #{personTel}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>