修改bug

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/notice/domain/NoticeDemand.java

@@ -58,8 +58,6 @@ public class NoticeDemand extends BaseEntity
     /** 联系人 */
     private String contactsEn;
 
-    /** 联系电话 */
-    private String contactNumberEn;
 
     /** 发布时间 */
     private Date releaseTimeEn;
@@ -194,13 +192,7 @@ public class NoticeDemand extends BaseEntity
         this.contactsEn = contactsEn;
     }
 
-    public String getContactNumberEn() {
-        return contactNumberEn;
-    }
 
-    public void setContactNumberEn(String contactNumberEn) {
-        this.contactNumberEn = contactNumberEn;
-    }
 
     public Date getReleaseTimeEn() {
         return releaseTimeEn;

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/notice/domain/NoticeSupply.java

@@ -68,9 +68,6 @@ public class NoticeSupply extends BaseEntity
     @Excel(name = "联系电话")
     private String telephone;
 
-    /** 联系电话 */
-    @Excel(name = "联系电话")
-    private String telephoneEn;
 
     /** 发布时间 */
     @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -249,13 +246,6 @@ public class NoticeSupply extends BaseEntity
         this.contactsEn = contactsEn;
     }
 
-    public String getTelephoneEn() {
-        return telephoneEn;
-    }
-
-    public void setTelephoneEn(String telephoneEn) {
-        this.telephoneEn = telephoneEn;
-    }
 
     public Date getReleaseTimeEn() {
         return releaseTimeEn;

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/notice/mapper/NoticeDemandMapper.java

@@ -22,14 +22,12 @@ public interface NoticeDemandMapper
             "purchase_title",
             "summary_of_needs",
             "demand_details",
-            "contacts",
-            "contact_number"
+            "contacts"
     },newfiles = {
             "purchase_title_en purchase_title",
             "summary_of_needs_en summary_of_needs",
             "demand_details_en demand_details",
-            "contacts_en contacts",
-            "contact_number_en contact_number"
+            "contacts_en contacts"
     })
     public NoticeDemand selectNoticeDemandById(Long id);
 
@@ -43,14 +41,12 @@ public interface NoticeDemandMapper
             "purchase_title",
             "summary_of_needs",
             "demand_details",
-            "contacts",
-            "contact_number"
+            "contacts"
     },newfiles = {
             "purchase_title_en purchase_title",
             "summary_of_needs_en summary_of_needs",
             "demand_details_en demand_details",
-            "contacts_en contacts",
-            "contact_number_en contact_number"
+            "contacts_en contacts"
     })
     public List<NoticeDemand> selectNoticeDemandList(NoticeDemand noticeDemand);
 

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/notice/mapper/NoticeSupplyMapper.java

@@ -23,14 +23,12 @@ public interface NoticeSupplyMapper
             "n.supply_details",
             "n.manufacturer",
             "n.contacts",
-            "n.telephone",
             "n.picture"
     },newfiles = {
             "n.supply_title_en supply_title",
             "n.supply_details_en supply_details",
             "n.manufacturer_en manufacturer",
             "n.contacts_en contacts",
-            "n.telephone_en telephone",
             "n.picture_en picture"
     })
     public NoticeSupply selectNoticeSupplyById(Long id);
@@ -46,14 +44,12 @@ public interface NoticeSupplyMapper
             "n.supply_details",
             "n.manufacturer",
             "n.contacts",
-            "n.telephone",
             "n.picture"
     },newfiles = {
             "n.supply_title_en supply_title",
             "n.supply_details_en supply_details",
             "n.manufacturer_en manufacturer",
             "n.contacts_en contacts",
-            "n.telephone_en telephone",
             "n.picture_en picture"
     })
     public List<NoticeSupply> selectNoticeSupplyList(NoticeSupply noticeSupply);
@@ -117,7 +113,6 @@ public interface NoticeSupplyMapper
             "n.manufacturer",
             "n.contacts",
             "t.name",
-            "n.telephone",
             "n.picture"
     },newfiles = {
             "n.supply_title_en supply_title",
@@ -125,7 +120,6 @@ public interface NoticeSupplyMapper
             "n.manufacturer_en manufacturer",
             "n.contacts_en contacts",
             "t.name_en name",
-            "n.telephone_en telephone",
             "n.picture_en picture"
     })
     public List<NoticeSupply> getSupplyInfoAllList(NoticeSupply noticeSupply);

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/notice/service/impl/NoticeDemandServiceImpl.java

@@ -76,11 +76,7 @@ public class NoticeDemandServiceImpl implements INoticeDemandService
         if (StringUtils.isNotEmpty(contacts)){
             noticeDemand.setContactsEn(TranslateUtil.getEnTranslateInfo(contacts));
         }
-        //联系电话
-        String contactNumber = noticeDemand.getContactNumber();
-        if (StringUtils.isNotEmpty(contactNumber)){
-            noticeDemand.setContactNumberEn(TranslateUtil.getEnTranslateInfo(contactNumber));
-        }
+
         //发布时间
         noticeDemand.setReleaseTimeEn(DateUtils.getNowDate());
         noticeDemand.setReleaseTime(DateUtils.getNowDate());
@@ -117,11 +113,7 @@ public class NoticeDemandServiceImpl implements INoticeDemandService
         if (StringUtils.isNotEmpty(contacts)){
             noticeDemand.setContactsEn(TranslateUtil.getEnTranslateInfo(contacts));
         }
-        //联系电话
-        String contactNumber = noticeDemand.getContactNumber();
-        if (StringUtils.isNotEmpty(contactNumber)){
-            noticeDemand.setContactNumberEn(TranslateUtil.getEnTranslateInfo(contactNumber));
-        }
+
         noticeDemand.setUpdateTime(DateUtils.getNowDate());
         return noticeDemandMapper.updateNoticeDemand(noticeDemand);
     }

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/notice/service/impl/NoticeSupplyServiceImpl.java

@@ -79,11 +79,6 @@ public class NoticeSupplyServiceImpl implements INoticeSupplyService
         if (StringUtils.isNotEmpty(contacts)){
             noticeSupply.setContactsEn(TranslateUtil.getEnTranslateInfo(contacts));
         }
-        //联系电话
-        String telephone = noticeSupply.getTelephone();
-        if (StringUtils.isNotEmpty(telephone)){
-            noticeSupply.setTelephoneEn(TranslateUtil.getEnTranslateInfo(telephone));
-        }
         //图片
 
             noticeSupply.setPictureEn(noticeSupply.getPicture());
@@ -124,11 +119,6 @@ public class NoticeSupplyServiceImpl implements INoticeSupplyService
         if (StringUtils.isNotEmpty(contacts)){
             noticeSupply.setContactsEn(TranslateUtil.getEnTranslateInfo(contacts));
         }
-        //联系电话
-        String telephone = noticeSupply.getTelephone();
-        if (StringUtils.isNotEmpty(telephone)){
-            noticeSupply.setTelephoneEn(TranslateUtil.getEnTranslateInfo(telephone));
-        }
         //图片
 
             noticeSupply.setPictureEn(noticeSupply.getPicture());

dgtly-member/dgtly-member-common/src/main/resources/mapper/notice/NoticeDemandMapper.xml

@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectNoticeDemandVo">
-        select id, member_id, purchase_title,purchase_title_en, summary_of_needs,summary_of_needs_en, demand_details,demand_details_en, contacts,contacts_en, contact_number,contact_number_en, release_time,release_time_en, status, create_by, create_time, update_by, update_time, del_flag, remark from notice_demand
+        select id, member_id, purchase_title,purchase_title_en, summary_of_needs,summary_of_needs_en, demand_details,demand_details_en, contacts,contacts_en, contact_number, release_time,release_time_en, status, create_by, create_time, update_by, update_time, del_flag, remark from notice_demand
     </sql>
 
     <select id="selectNoticeDemandList" parameterType="NoticeDemand" resultMap="NoticeDemandResult">
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="summaryOfNeeds != null  and summaryOfNeeds != ''"> and (summary_of_needs like concat('%', #{summaryOfNeeds}, '%') or summary_of_needs_en like concat('%', #{summaryOfNeeds}, '%'))</if>
             <if test="demandDetails != null  and demandDetails != ''"> and (demand_details = #{demandDetails} or demand_details_en = #{demandDetails})</if>
             <if test="contacts != null  and contacts != ''"> and (contacts like concat('%', #{contacts}, '%') or contacts_en like concat('%', #{contacts}, '%'))</if>
-            <if test="contactNumber != null  and contactNumber != ''"> and (contact_number like concat('%', #{contactNumber}, '%') or contact_number_en like concat('%', #{contactNumber}, '%'))</if>
+            <if test="contactNumber != null  and contactNumber != ''"> and (contact_number like concat('%', #{contactNumber}, '%'))</if>
             <if test="params.beginReleaseTime != null and params.beginReleaseTime != ''"><!-- 发布开始时间检索 -->
                 AND date_format(release_time,'%y%m%d') &gt;= date_format(#{params.beginReleaseTime},'%y%m%d')
             </if>
@@ -63,7 +63,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contacts != null  and contacts != ''">contacts,</if>
             <if test="contactsEn != null  and contactsEn != ''">contacts_en,</if>
             <if test="contactNumber != null  and contactNumber != ''">contact_number,</if>
-            <if test="contactNumberEn != null  and contactNumberEn != ''">contact_number_en,</if>
             <if test="releaseTime != null ">release_time,</if>
             <if test="releaseTimeEn != null ">release_time_en,</if>
             <if test="status != null  and status != ''">status,</if>
@@ -85,7 +84,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contacts != null  and contacts != ''">#{contacts},</if>
             <if test="contactsEn != null  and contactsEn != ''">#{contactsEn},</if>
             <if test="contactNumber != null  and contactNumber != ''">#{contactNumber},</if>
-            <if test="contactNumberEn != null  and contactNumberEn != ''">#{contactNumberEn},</if>
             <if test="releaseTime != null ">#{releaseTime},</if>
             <if test="releaseTimeEn != null ">#{releaseTimeEn},</if>
             <if test="status != null  and status != ''">#{status},</if>
@@ -111,7 +109,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contacts != null  and contacts != ''">contacts = #{contacts},</if>
             <if test="contactsEn != null  and contactsEn != ''">contacts_en = #{contactsEn},</if>
             <if test="contactNumber != null  and contactNumber != ''">contact_number = #{contactNumber},</if>
-            <if test="contactNumberEn != null  and contactNumberEn != ''">contact_number_en = #{contactNumberEn},</if>
             <if test="releaseTime != null ">release_time = #{releaseTime},</if>
             <if test="releaseTimeEn != null ">release_time_en = #{releaseTimeEn},</if>
             <if test="status != null  and status != ''">status = #{status},</if>

dgtly-member/dgtly-member-common/src/main/resources/mapper/notice/NoticeSupplyMapper.xml

@@ -42,7 +42,6 @@ SELECT
   n.contacts,
   n.contacts_en,
   n.telephone,
-  n.telephone_en,
   n.release_time,
   n.release_time_en,
   n.picture,
@@ -69,7 +68,7 @@ FROM
             <if test="supplyTitle != null  and supplyTitle != ''"> and (n.supply_title like concat('%', #{supplyTitle}, '%') or n.supply_title_en like concat('%', #{supplyTitle}, '%'))</if>
             <if test="manufacturer != null  and manufacturer != ''"> and (n.manufacturer like concat('%', #{manufacturer}, '%') or n.manufacturer_en like concat('%', #{manufacturer}, '%'))</if>
             <if test="contacts != null  and contacts != ''"> and (n.contacts like concat('%', #{contacts}, '%') or n.contacts_en like concat('%', #{contacts}, '%'))</if>
-            <if test="telephone != null  and telephone != ''"> and (n.telephone like concat('%', #{telephone}, '%') or n.telephone_en like concat('%', #{telephone}, '%'))</if>
+            <if test="telephone != null  and telephone != ''"> and (n.telephone like concat('%', #{telephone}, '%'))</if>
             <if test="status != null  and status != ''"> and n.status = #{status}</if>
             <if test="params.beginReleaseTime != null and params.beginReleaseTime != ''"><!-- 发布开始时间检索 -->
                 AND date_format(n.release_time,'%y%m%d') &gt;= date_format(#{params.beginReleaseTime},'%y%m%d')
@@ -101,7 +100,6 @@ FROM
             <if test="contacts != null  and contacts != ''">contacts,</if>
             <if test="contactsEn != null  and contactsEn != ''">contacts_en,</if>
             <if test="telephone != null  and telephone != ''">telephone,</if>
-            <if test="telephoneEn != null  and telephoneEn != ''">telephone_en,</if>
             <if test="releaseTime != null ">release_time,</if>
             <if test="releaseTimeEn != null ">release_time_en,</if>
             <if test="picture != null  and picture != ''">picture,</if>
@@ -125,7 +123,6 @@ FROM
             <if test="contacts != null  and contacts != ''">#{contacts},</if>
             <if test="contactsEn != null  and contactsEn != ''">#{contactsEn},</if>
             <if test="telephone != null  and telephone != ''">#{telephone},</if>
-            <if test="telephoneEn != null  and telephoneEn != ''">#{telephoneEn},</if>
             <if test="releaseTime != null ">#{releaseTime},</if>
             <if test="releaseTimeEn != null ">#{releaseTimeEn},</if>
             <if test="picture != null  and picture != ''">#{picture},</if>
@@ -153,7 +150,6 @@ FROM
             <if test="contacts != null  and contacts != ''">contacts = #{contacts},</if>
             <if test="contactsEn != null  and contactsEn != ''">contacts_en = #{contactsEn},</if>
             <if test="telephone != null  and telephone != ''">telephone = #{telephone},</if>
-            <if test="telephoneEn != null  and telephoneEn != ''">telephone_en = #{telephoneEn},</if>
             <if test="releaseTime != null ">release_time = #{releaseTime},</if>
             <if test="releaseTimeEn != null ">release_time_en = #{releaseTimeEn},</if>
             <if test="picture != null  and picture != ''">picture = #{picture},</if>
@@ -208,7 +204,6 @@ FROM
           n.contacts,
           n.contacts_en,
           n.telephone,
-          n.telephone_en,
           n.release_time,
           n.release_time_en,
           n.picture,
@@ -225,7 +220,7 @@ FROM
             <if test="supplyTitle != null  and supplyTitle != ''"> and n.supply_title = #{supplyTitle} or n.supply_title_en = #{supplyTitle}</if>
             <if test="manufacturer != null  and manufacturer != ''"> and n.manufacturer = #{manufacturer} or n.manufacturer_en = #{manufacturer}</if>
             <if test="contacts != null  and contacts != ''"> and n.contacts = #{contacts} or n.contacts_en = #{contacts}</if>
-            <if test="telephone != null  and telephone != ''"> and n.telephone = #{telephone} or n.telephone_en = #{telephone}</if>
+            <if test="telephone != null  and telephone != ''"> and n.telephone = #{telephone}</if>
             <if test="status != null  and status != ''"> and n.status = #{status}</if>
         </where>
         order by  n.create_time desc