From e0f3f269eb9b43b2499d40cdaf221eb1e0037242 Mon Sep 17 00:00:00 2001 From: nbch <1587737444@qq.com> Date: Tue, 12 Oct 2021 20:59:27 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E9=99=88=E6=B5=A9=20=E4=B8=A4=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProductController.java | 11 +++ .../java/com/jk/customer/dao/ProductDao.java | 5 + .../com/jk/customer/entity/ProductEntity.java | 5 + .../jk/customer/service/ProductService.java | 2 + .../service/impl/ProductServiceImpl.java | 35 ++++--- src/main/resources/mapper/ProductMapper.xml | 28 ++++++ src/main/resources/templates/findProduct.html | 91 ++++++++++++++++++- 7 files changed, 160 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/jk/customer/controller/ProductController.java b/src/main/java/com/jk/customer/controller/ProductController.java index 13ae058..4b21f97 100644 --- a/src/main/java/com/jk/customer/controller/ProductController.java +++ b/src/main/java/com/jk/customer/controller/ProductController.java @@ -26,4 +26,15 @@ public class ProductController { public List findProduct(ProductEntity product){ return productService.findProduct(product); } + + /** + * 取消询价单 + * @param productId + * 陈浩 + */ + @RequestMapping("cancelEnquiry") + @ResponseBody + public void cancelEnquiry(Integer productId){ + productService.cancelEnquiry(productId); + } } diff --git a/src/main/java/com/jk/customer/dao/ProductDao.java b/src/main/java/com/jk/customer/dao/ProductDao.java index 8f8d5cb..32ef615 100644 --- a/src/main/java/com/jk/customer/dao/ProductDao.java +++ b/src/main/java/com/jk/customer/dao/ProductDao.java @@ -2,6 +2,7 @@ package com.jk.customer.dao; import com.jk.customer.entity.ProductEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,4 +13,8 @@ public interface ProductDao { */ List findProduct(ProductEntity product); + + void updateStatus(@Param("a") int a, @Param("id") String id); + + void cancelEnquiry(Integer productId); } diff --git a/src/main/java/com/jk/customer/entity/ProductEntity.java b/src/main/java/com/jk/customer/entity/ProductEntity.java index acabc13..b75ddd5 100644 --- a/src/main/java/com/jk/customer/entity/ProductEntity.java +++ b/src/main/java/com/jk/customer/entity/ProductEntity.java @@ -25,6 +25,10 @@ public class ProductEntity extends PriceEntity implements Serializable { private String accessory;//附件 private Integer requirementType;//需求类型(1 产品询价，2 询设计方案) + /** + * 业务字段 ch + */ + private Integer queryPriceStatus; /** * 业务字段 wzy @@ -52,6 +56,7 @@ public class ProductEntity extends PriceEntity implements Serializable { ", remarks='" + remarks + '\'' + ", accessory='" + accessory + '\'' + ", requirementType=" + requirementType + + ", queryPriceStatus=" + queryPriceStatus + ", statusName='" + statusName + '\'' + ", starDate='" + starDate + '\'' + ", endDate='" + endDate + '\'' + diff --git a/src/main/java/com/jk/customer/service/ProductService.java b/src/main/java/com/jk/customer/service/ProductService.java index 37faa51..ae86f8d 100644 --- a/src/main/java/com/jk/customer/service/ProductService.java +++ b/src/main/java/com/jk/customer/service/ProductService.java @@ -11,4 +11,6 @@ public interface ProductService { * @return */ List findProduct(ProductEntity product); + + void cancelEnquiry(Integer productId); } \ No newline at end of file diff --git a/src/main/java/com/jk/customer/service/impl/ProductServiceImpl.java b/src/main/java/com/jk/customer/service/impl/ProductServiceImpl.java index 13e812c..a3a1f65 100644 --- a/src/main/java/com/jk/customer/service/impl/ProductServiceImpl.java +++ b/src/main/java/com/jk/customer/service/impl/ProductServiceImpl.java @@ -43,6 +43,7 @@ public class ProductServiceImpl implements ProductService { for (int i = 0; i < list.size(); i++) { String startDate = list.get(i).getQueryPriceStartDate(); System.err.println(startDate); + int a= -1; try { Date parse = sdf.parse(startDate); long dateTime = time-parse.getTime(); @@ -54,26 +55,32 @@ public class ProductServiceImpl implements ProductService { Long endDateTime = time - endTime.getTime(); System.err.println(endDateTime); - if (dayTime < 0 && endDateTime > 0){ - list.get(i).setQueryPriceStatus(1); + + if (dayTime < 0 ){ + a=1; + list.get(i).setQueryPriceStatus(a); }else if (dayTime == 0){ - list.get(i).setQueryPriceStatus(2); + a=2; + list.get(i).setQueryPriceStatus(a); }else if (dayTime > 0 && endDateTime < 0){ - list.get(i).setQueryPriceStatus(3); + a=3; + list.get(i).setQueryPriceStatus(a); }else if (endDateTime > 0){ - list.get(i).setQueryPriceStatus(4); + a=4; + list.get(i).setQueryPriceStatus(a); } - - /*if (list.get(i).getQueryPriceStatus() == 3){ - if (endDateTime <= 0 ){ - list.get(i).setQueryPriceStatus(4); - } - }*/ - } catch (ParseException e) { - e.printStackTrace(); } - + catch (ParseException e) { + e.printStackTrace(); + } + String id = list.get(i).getProductId(); + productDao.updateStatus(a,id); } return list; } + + @Override + public void cancelEnquiry(Integer productId) { + productDao.cancelEnquiry(productId); + } } diff --git a/src/main/resources/mapper/ProductMapper.xml b/src/main/resources/mapper/ProductMapper.xml index 5cba14a..5e43394 100644 --- a/src/main/resources/mapper/ProductMapper.xml +++ b/src/main/resources/mapper/ProductMapper.xml @@ -40,7 +40,35 @@ + + + 1=1 + + and product_name = #{productName} + + + + and query_price_status = #{queryPriceStatus} + + + and query_price_start_date <= DATE(#{queryPriceStartDate}) + + + and query_price_end_date >= DATE(#{queryPriceEndDate}) + + + + + + + update query_price set query_price_status = #{a} where query_price_requirement_type = #{id} + + + + update product_common set query_price_status = 5 where product_id= #{productId} + \ No newline at end of file diff --git a/src/main/resources/templates/findProduct.html b/src/main/resources/templates/findProduct.html index a7ca8e1..6efbed8 100644 --- a/src/main/resources/templates/findProduct.html +++ b/src/main/resources/templates/findProduct.html @@ -33,6 +33,44 @@ +
+ +
+   +
+ + +
+           + +
+ + +
+           +
+ + --- +
+
+ +
+           + + +
+
+ +
\ No newline at end of file -- Gitee From 011b73c4c3366510043927a8481f7e105cd49a7f Mon Sep 17 00:00:00 2001 From: caiyuntong <2650206769@qq.com> Date: Wed, 13 Oct 2021 08:41:17 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=B1=BB--=E8=94=A1?= =?UTF-8?q?=E8=BF=90=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 83517de..5608b67 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,7 +4,7 @@ server.servlet.context-path=/ spring.thymeleaf.cache=false #数据库四要素 spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.url=jdbc:mysql://192.168.153.41:3306/2104-custom?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull +spring.datasource.url=jdbc:mysql://WZ-15535785677:3306/2104-custom?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull spring.datasource.password=12345 spring.datasource.username=root @@ -38,5 +38,4 @@ spring.web.resources.static-locations=classpath:/templates/ spring.rabbitmq.host=192.168.2.203 spring.rabbitmq.port=5672 spring.rabbitmq.username=guest -spring.rabbitmq.password=guest - +spring.rabbitmq.password=guest \ No newline at end of file -- Gitee From 50b4ce9b8551340df061bc363cb1af47d66bab84 Mon Sep 17 00:00:00 2001 From: ptc <3143208857@qq.com> Date: Wed, 13 Oct 2021 09:50:42 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=9D=90=E6=96=99=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customer/controller/SellerController.java | 26 ++++ .../java/com/jk/customer/dao/SellerDao.java | 4 + .../jk/customer/entity/MaterialsEntity.java | 4 + .../jk/customer/entity/OfferFormEntity.java | 2 +- .../jk/customer/service/SellerService.java | 4 + .../service/impl/SellerServiceImpl.java | 10 ++ src/main/resources/mapper/SellerMapper.xml | 46 +++++- src/main/resources/templates/queryOffer.html | 135 ++++++++++++++++++ .../resources/templates/showMaterials.html | 4 +- 9 files changed, 230 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/templates/queryOffer.html diff --git a/src/main/java/com/jk/customer/controller/SellerController.java b/src/main/java/com/jk/customer/controller/SellerController.java index 464ab94..fc183f3 100644 --- a/src/main/java/com/jk/customer/controller/SellerController.java +++ b/src/main/java/com/jk/customer/controller/SellerController.java @@ -66,5 +66,31 @@ public class SellerController { public void addOffer(OfferFormEntity offer){ sellerService.addOffer(offer); } + /** + * 方法实现说明 (查看报价) + * @author 潘天赐 + * @return + * @exception + * @date 2021/10/12 19:40 + */ + @RequestMapping("queryMaterialsOffer") + @ResponseBody + public List queryMaterialsOffer(Integer id){ + List list = sellerService.queryMaterialsOffer(id); + return list; + } + /** + * 方法实现说明 (回显报价单) + * @author 潘天赐 + * @return + * @exception + * @date 2021/10/12 20:56 + */ + @RequestMapping("findByOffer") + @ResponseBody + public OfferFormEntity findByOffer(Integer oid){ + OfferFormEntity offer = sellerService.findByOffer(oid); + return offer; + } } diff --git a/src/main/java/com/jk/customer/dao/SellerDao.java b/src/main/java/com/jk/customer/dao/SellerDao.java index ce69406..8373089 100644 --- a/src/main/java/com/jk/customer/dao/SellerDao.java +++ b/src/main/java/com/jk/customer/dao/SellerDao.java @@ -19,4 +19,8 @@ public interface SellerDao { List queryMaterials(Integer id); void addOffer(OfferFormEntity offer); + + List queryMaterialsOffer(Integer id); + + OfferFormEntity findByOffer(Integer oid); } diff --git a/src/main/java/com/jk/customer/entity/MaterialsEntity.java b/src/main/java/com/jk/customer/entity/MaterialsEntity.java index fa17a4e..212d8b1 100644 --- a/src/main/java/com/jk/customer/entity/MaterialsEntity.java +++ b/src/main/java/com/jk/customer/entity/MaterialsEntity.java @@ -13,4 +13,8 @@ public class MaterialsEntity implements Serializable { private Integer materialsId; //int 材料编码 private Integer materialsCount; //int 材料数量 private Integer queryPriceId; //询价表id + + //业务字段 + private String brand; //varchar 品牌 + private Double price; //double 单价 } diff --git a/src/main/java/com/jk/customer/entity/OfferFormEntity.java b/src/main/java/com/jk/customer/entity/OfferFormEntity.java index b0f1c7f..480feae 100644 --- a/src/main/java/com/jk/customer/entity/OfferFormEntity.java +++ b/src/main/java/com/jk/customer/entity/OfferFormEntity.java @@ -19,5 +19,5 @@ public class OfferFormEntity implements Serializable { private Integer deliveryCycle; //int 供货周期 private String offerFormValidTime; //date 报价有效时间 private Double totalPrices; //double 项目总价 - + private Integer materialsInventoryId; //对应材料表id } diff --git a/src/main/java/com/jk/customer/service/SellerService.java b/src/main/java/com/jk/customer/service/SellerService.java index cb3111b..34b6d24 100644 --- a/src/main/java/com/jk/customer/service/SellerService.java +++ b/src/main/java/com/jk/customer/service/SellerService.java @@ -17,4 +17,8 @@ public interface SellerService { List queryMaterials(Integer id); void addOffer(OfferFormEntity offer); + + List queryMaterialsOffer(Integer id); + + OfferFormEntity findByOffer(Integer oid); } diff --git a/src/main/java/com/jk/customer/service/impl/SellerServiceImpl.java b/src/main/java/com/jk/customer/service/impl/SellerServiceImpl.java index 757ac75..d5d4931 100644 --- a/src/main/java/com/jk/customer/service/impl/SellerServiceImpl.java +++ b/src/main/java/com/jk/customer/service/impl/SellerServiceImpl.java @@ -38,4 +38,14 @@ public class SellerServiceImpl implements SellerService { offer.setOfferFormId(s1); sellerDao.addOffer(offer); } + + @Override + public List queryMaterialsOffer(Integer id) { + return sellerDao.queryMaterialsOffer(id); + } + + @Override + public OfferFormEntity findByOffer(Integer oid) { + return sellerDao.findByOffer(oid); + } } diff --git a/src/main/resources/mapper/SellerMapper.xml b/src/main/resources/mapper/SellerMapper.xml index 3d0c61b..2a7a000 100644 --- a/src/main/resources/mapper/SellerMapper.xml +++ b/src/main/resources/mapper/SellerMapper.xml @@ -9,16 +9,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + insert into offer_form values - (#{offerFormId},#{brand},#{price},#{freight},#{assemblingCharge},#{otherBusiness},#{businessPrice},#{offerFormRemark},#{offerFormAccessory},#{deliveryCycle},#{offerFormValidTime},#{totalPrices}) + (#{offerFormId},#{brand},#{price},#{freight},#{assemblingCharge},#{otherBusiness},#{businessPrice},#{offerFormRemark},#{offerFormAccessory},#{deliveryCycle},#{offerFormValidTime},#{totalPrices},#{materialsInventoryId}) - + + + + + diff --git a/src/main/resources/templates/queryOffer.html b/src/main/resources/templates/queryOffer.html new file mode 100644 index 0000000..43846ca --- /dev/null +++ b/src/main/resources/templates/queryOffer.html @@ -0,0 +1,135 @@ + + + + + + Title + + + + + + + + + + + + + + + + + + + + + + +
+ +

服务项报价

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
服务名称价格(元)
运费
组装费
+ 备注： +
+ 附件： + +
+ 供货周期(天)： +
+ 报价有效时间(天)： + + 项目总价： +
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/showMaterials.html b/src/main/resources/templates/showMaterials.html index a027450..30ec364 100644 --- a/src/main/resources/templates/showMaterials.html +++ b/src/main/resources/templates/showMaterials.html @@ -1,5 +1,6 @@ + Title @@ -111,7 +112,8 @@ {field:'materialsId',title:'材料编码'}, {field:'materialsCount',title:'材料数量', formatter: function(value,row,index){ - return ''+value + return ''+ + ''+value } }, {field:'',title:'品牌',width:120, -- Gitee From 06fe965a8993b6a44363a719c867fcd98f3202cc Mon Sep 17 00:00:00 2001 From: ptc <3143208857@qq.com> Date: Wed, 13 Oct 2021 14:18:01 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=9D=90=E6=96=99=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customer/controller/SellerController.java | 13 +- .../java/com/jk/customer/dao/SellerDao.java | 2 + .../jk/customer/service/SellerService.java | 2 + .../service/impl/SellerServiceImpl.java | 5 + src/main/resources/mapper/SellerMapper.xml | 6 + src/main/resources/templates/queryOffer.html | 2 +- src/main/resources/templates/updateOffer.html | 215 ++++++++++++++++++ 7 files changed, 243 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/templates/updateOffer.html diff --git a/src/main/java/com/jk/customer/controller/SellerController.java b/src/main/java/com/jk/customer/controller/SellerController.java index fc183f3..d77d3b8 100644 --- a/src/main/java/com/jk/customer/controller/SellerController.java +++ b/src/main/java/com/jk/customer/controller/SellerController.java @@ -92,5 +92,16 @@ public class SellerController { OfferFormEntity offer = sellerService.findByOffer(oid); return offer; } - + /** + * 方法实现说明 (修改报价) + * @author 潘天赐 + * @return + * @exception + * @date 2021/10/13 10:46 + */ + @RequestMapping("updateOffer") + @ResponseBody + public void updateOffer(OfferFormEntity offer){ + sellerService.updateOffer(offer); + } } diff --git a/src/main/java/com/jk/customer/dao/SellerDao.java b/src/main/java/com/jk/customer/dao/SellerDao.java index 8373089..dfa7fea 100644 --- a/src/main/java/com/jk/customer/dao/SellerDao.java +++ b/src/main/java/com/jk/customer/dao/SellerDao.java @@ -23,4 +23,6 @@ public interface SellerDao { List queryMaterialsOffer(Integer id); OfferFormEntity findByOffer(Integer oid); + + void updateOffer(OfferFormEntity offer); } diff --git a/src/main/java/com/jk/customer/service/SellerService.java b/src/main/java/com/jk/customer/service/SellerService.java index 34b6d24..4791f86 100644 --- a/src/main/java/com/jk/customer/service/SellerService.java +++ b/src/main/java/com/jk/customer/service/SellerService.java @@ -21,4 +21,6 @@ public interface SellerService { List queryMaterialsOffer(Integer id); OfferFormEntity findByOffer(Integer oid); + + void updateOffer(OfferFormEntity offer); } diff --git a/src/main/java/com/jk/customer/service/impl/SellerServiceImpl.java b/src/main/java/com/jk/customer/service/impl/SellerServiceImpl.java index d5d4931..65669d5 100644 --- a/src/main/java/com/jk/customer/service/impl/SellerServiceImpl.java +++ b/src/main/java/com/jk/customer/service/impl/SellerServiceImpl.java @@ -48,4 +48,9 @@ public class SellerServiceImpl implements SellerService { public OfferFormEntity findByOffer(Integer oid) { return sellerDao.findByOffer(oid); } + + @Override + public void updateOffer(OfferFormEntity offer) { + sellerDao.updateOffer(offer); + } } diff --git a/src/main/resources/mapper/SellerMapper.xml b/src/main/resources/mapper/SellerMapper.xml index 2a7a000..3399bb0 100644 --- a/src/main/resources/mapper/SellerMapper.xml +++ b/src/main/resources/mapper/SellerMapper.xml @@ -60,5 +60,11 @@ where m.materials_inventory_id=o.materials_inventory_id and m.materials_inventory_id = #{oid} + + + update offer_form set brand=#{brand},price=#{price},freight=#{freight},assembling_charge=#{assemblingCharge},other_business=#{otherBusiness}, + business_price=#{businessPrice},offer_form_remark=#{offerFormRemark},offer_form_accessory=#{offerFormAccessory},delivery_cycle=#{deliveryCycle},offer_form_valid_time=#{offerFormValidTime}, + total_prices=#{totalPrices} where materials_inventory_id = #{materialsInventoryId} + diff --git a/src/main/resources/templates/queryOffer.html b/src/main/resources/templates/queryOffer.html index 43846ca..4019ae9 100644 --- a/src/main/resources/templates/queryOffer.html +++ b/src/main/resources/templates/queryOffer.html @@ -66,7 +66,7 @@ 附件： - + diff --git a/src/main/resources/templates/updateOffer.html b/src/main/resources/templates/updateOffer.html new file mode 100644 index 0000000..84dfb26 --- /dev/null +++ b/src/main/resources/templates/updateOffer.html @@ -0,0 +1,215 @@ + + + + + + Title + + + + + + + + + + + + + + + + + + + + + + +
+

第一步 填写报价单

+
+ +

第二步 填写服务项报价

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
服务名称价格(元)操作
运费
组装费
其他
+ 备注： +
+ 附件： + +
+ + +
+
+ 供货周期(天)： +
+ 报价有效时间(天)： + + 项目总价： +
+ +
+
+ + + + + + \ No newline at end of file -- Gitee From 48f084a9c3fcf4dfdca9720a5893134e9d82cfcd Mon Sep 17 00:00:00 2001 From: caiyuntong <2650206769@qq.com> Date: Wed, 13 Oct 2021 14:40:41 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB--cyt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jk/customer/entity/ProductEntity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jk/customer/entity/ProductEntity.java b/src/main/java/com/jk/customer/entity/ProductEntity.java index b75ddd5..74adb0d 100644 --- a/src/main/java/com/jk/customer/entity/ProductEntity.java +++ b/src/main/java/com/jk/customer/entity/ProductEntity.java @@ -12,10 +12,10 @@ public class ProductEntity extends PriceEntity implements Serializable { private String productName;//产品名称 private Integer productCount;//采购数量 private Integer productCategory;//产品类型 - private Integer inletPressureMax;//进口压力最大 - private Integer inletPressureMin;//进口压力最小 - private Integer outletPressureMax;//出口压力最大 - private Integer outletPressureMin;//出口压力最小 + private String inletPressureMax;//进口压力最大 + private String inletPressureMin;//进口压力最小 + private String outletPressureMax;//出口压力最大 + private String outletPressureMin;//出口压力最小 private Double flowmeterLength;//流量计长度 private Integer pressureRegulatorType;//调压器（1国产，2进口） private String productBrand;//品牌 -- Gitee From 9a1147408bf67233ad1676cddb6f44a76388d5a0 Mon Sep 17 00:00:00 2001 From: caiyuntong <2650206769@qq.com> Date: Wed, 13 Oct 2021 14:49:29 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB--cyt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jk/customer/entity/ProductEntity.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/jk/customer/entity/ProductEntity.java b/src/main/java/com/jk/customer/entity/ProductEntity.java index 74adb0d..69559c3 100644 --- a/src/main/java/com/jk/customer/entity/ProductEntity.java +++ b/src/main/java/com/jk/customer/entity/ProductEntity.java @@ -11,7 +11,7 @@ public class ProductEntity extends PriceEntity implements Serializable { private String productId;//产品编号 private String productName;//产品名称 private Integer productCount;//采购数量 - private Integer productCategory;//产品类型 + private String productCategory;//产品类型 private String inletPressureMax;//进口压力最大 private String inletPressureMin;//进口压力最小 private String outletPressureMax;//出口压力最大 @@ -43,11 +43,11 @@ public class ProductEntity extends PriceEntity implements Serializable { "productId='" + productId + '\'' + ", productName='" + productName + '\'' + ", productCount=" + productCount + - ", productCategory=" + productCategory + - ", inletPressureMax=" + inletPressureMax + - ", inletPressureMin=" + inletPressureMin + - ", outletPressureMax=" + outletPressureMax + - ", outletPressureMin=" + outletPressureMin + + ", productCategory='" + productCategory + '\'' + + ", inletPressureMax='" + inletPressureMax + '\'' + + ", inletPressureMin='" + inletPressureMin + '\'' + + ", outletPressureMax='" + outletPressureMax + '\'' + + ", outletPressureMin='" + outletPressureMin + '\'' + ", flowmeterLength=" + flowmeterLength + ", pressureRegulatorType=" + pressureRegulatorType + ", productBrand='" + productBrand + '\'' + -- Gitee From dc35a743d46cbf65f20e4ddc344ef34482abd312 Mon Sep 17 00:00:00 2001 From: caiyuntong <2650206769@qq.com> Date: Wed, 13 Oct 2021 20:24:42 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=BB=E8=A1=A8--cyt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PurchaseController.java | 27 +++ .../java/com/jk/customer/dao/PurchaseDao.java | 3 + .../com/jk/customer/entity/ProductEntity.java | 164 ++++++++++++++++++ .../jk/customer/service/PurchaseService.java | 3 + .../service/impl/PurchaseServiceImpl.java | 17 ++ src/main/resources/mapper/PurchaseMapper.xml | 22 +++ src/main/resources/static/js/loader.css | 131 ++++++++++++++ src/main/resources/templates/addPicture.html | 159 +++++++++++++++++ .../resources/templates/findCustomized.html | 77 ++++---- src/main/resources/templates/ok.html | 63 +++++++ 10 files changed, 633 insertions(+), 33 deletions(-) create mode 100644 src/main/resources/static/js/loader.css create mode 100644 src/main/resources/templates/addPicture.html create mode 100644 src/main/resources/templates/ok.html diff --git a/src/main/java/com/jk/customer/controller/PurchaseController.java b/src/main/java/com/jk/customer/controller/PurchaseController.java index d39bb4f..7b734a7 100644 --- a/src/main/java/com/jk/customer/controller/PurchaseController.java +++ b/src/main/java/com/jk/customer/controller/PurchaseController.java @@ -3,13 +3,16 @@ package com.jk.customer.controller; import com.jk.customer.entity.PictureEntity; import com.jk.customer.entity.ProductEntity; import com.jk.customer.service.PurchaseService; +import com.jk.customer.utils.OSSUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import java.text.ParseException; +import java.util.HashMap; import java.util.List; @Controller @@ -33,4 +36,28 @@ public class PurchaseController { return list; } + @RequestMapping("upload_cyt") + @ResponseBody + public Object upload(MultipartFile accessory) throws Exception { + + HashMap hashMap = new HashMap<>(); + String oss = OSSUtil.upload2oss(accessory); + + hashMap.put("oss",oss); + + return hashMap; + } + + /** + * 新增主表方法 + * @param picture + * 蔡运通 + */ + @RequestMapping("addPicture_cyt") + @ResponseBody + public void addPicture_cyt(ProductEntity product){ + + purchaseService.addPicture_cyt(product); + } + } \ No newline at end of file diff --git a/src/main/java/com/jk/customer/dao/PurchaseDao.java b/src/main/java/com/jk/customer/dao/PurchaseDao.java index e2d776d..dd90f7a 100644 --- a/src/main/java/com/jk/customer/dao/PurchaseDao.java +++ b/src/main/java/com/jk/customer/dao/PurchaseDao.java @@ -1,6 +1,7 @@ package com.jk.customer.dao; import com.jk.customer.entity.PictureEntity; +import com.jk.customer.entity.ProductEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -8,4 +9,6 @@ import java.util.List; @Mapper public interface PurchaseDao { List getPicture(PictureEntity picture); + + void addPicture_cyt(ProductEntity product); } diff --git a/src/main/java/com/jk/customer/entity/ProductEntity.java b/src/main/java/com/jk/customer/entity/ProductEntity.java index 69559c3..37ef02c 100644 --- a/src/main/java/com/jk/customer/entity/ProductEntity.java +++ b/src/main/java/com/jk/customer/entity/ProductEntity.java @@ -62,4 +62,168 @@ public class ProductEntity extends PriceEntity implements Serializable { ", endDate='" + endDate + '\'' + '}'; } + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getProductId() { + return productId; + } + + public void setProductId(String productId) { + this.productId = productId; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public Integer getProductCount() { + return productCount; + } + + public void setProductCount(Integer productCount) { + this.productCount = productCount; + } + + public String getProductCategory() { + return productCategory; + } + + public void setProductCategory(String productCategory) { + this.productCategory = productCategory; + } + + public String getInletPressureMax() { + return inletPressureMax; + } + + public void setInletPressureMax(String inletPressureMax) { + this.inletPressureMax = inletPressureMax; + } + + public String getInletPressureMin() { + return inletPressureMin; + } + + public void setInletPressureMin(String inletPressureMin) { + this.inletPressureMin = inletPressureMin; + } + + public String getOutletPressureMax() { + return outletPressureMax; + } + + public void setOutletPressureMax(String outletPressureMax) { + this.outletPressureMax = outletPressureMax; + } + + public String getOutletPressureMin() { + return outletPressureMin; + } + + public void setOutletPressureMin(String outletPressureMin) { + this.outletPressureMin = outletPressureMin; + } + + public Double getFlowmeterLength() { + return flowmeterLength; + } + + public void setFlowmeterLength(Double flowmeterLength) { + this.flowmeterLength = flowmeterLength; + } + + public Integer getPressureRegulatorType() { + return pressureRegulatorType; + } + + public void setPressureRegulatorType(Integer pressureRegulatorType) { + this.pressureRegulatorType = pressureRegulatorType; + } + + public String getProductBrand() { + return productBrand; + } + + public void setProductBrand(String productBrand) { + this.productBrand = productBrand; + } + + public Integer getOuterBox() { + return outerBox; + } + + public void setOuterBox(Integer outerBox) { + this.outerBox = outerBox; + } + + public Integer getOuterBoxMaterial() { + return outerBoxMaterial; + } + + public void setOuterBoxMaterial(Integer outerBoxMaterial) { + this.outerBoxMaterial = outerBoxMaterial; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getAccessory() { + return accessory; + } + + public void setAccessory(String accessory) { + this.accessory = accessory; + } + + public Integer getRequirementType() { + return requirementType; + } + + public void setRequirementType(Integer requirementType) { + this.requirementType = requirementType; + } + + public Integer getQueryPriceStatus() { + return queryPriceStatus; + } + + public void setQueryPriceStatus(Integer queryPriceStatus) { + this.queryPriceStatus = queryPriceStatus; + } + + public String getStatusName() { + return statusName; + } + + public void setStatusName(String statusName) { + this.statusName = statusName; + } + + public String getStarDate() { + return starDate; + } + + public void setStarDate(String starDate) { + this.starDate = starDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } } diff --git a/src/main/java/com/jk/customer/service/PurchaseService.java b/src/main/java/com/jk/customer/service/PurchaseService.java index 361362d..d3d2c3a 100644 --- a/src/main/java/com/jk/customer/service/PurchaseService.java +++ b/src/main/java/com/jk/customer/service/PurchaseService.java @@ -1,6 +1,7 @@ package com.jk.customer.service; import com.jk.customer.entity.PictureEntity; +import com.jk.customer.entity.ProductEntity; import java.text.ParseException; import java.util.List; @@ -8,4 +9,6 @@ import java.util.List; public interface PurchaseService { List getPicture(PictureEntity picture) throws ParseException; + + void addPicture_cyt(ProductEntity product); } diff --git a/src/main/java/com/jk/customer/service/impl/PurchaseServiceImpl.java b/src/main/java/com/jk/customer/service/impl/PurchaseServiceImpl.java index 9d2a333..d13cd80 100644 --- a/src/main/java/com/jk/customer/service/impl/PurchaseServiceImpl.java +++ b/src/main/java/com/jk/customer/service/impl/PurchaseServiceImpl.java @@ -2,6 +2,7 @@ package com.jk.customer.service.impl; import com.jk.customer.dao.PurchaseDao; import com.jk.customer.entity.PictureEntity; +import com.jk.customer.entity.ProductEntity; import com.jk.customer.service.PurchaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,6 +11,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import java.util.UUID; @Service @@ -60,4 +62,19 @@ public class PurchaseServiceImpl implements PurchaseService { return list; } + + /** + * 新增方法 + * @param picture + * 蔡运通 + */ + @Override + public void addPicture_cyt(ProductEntity product) { + + UUID uuid = UUID.randomUUID(); + + product.setProductId(uuid.toString().replaceAll("-","")); + System.out.println(uuid.toString().replaceAll("-","")); + purchaseDao.addPicture_cyt(product); + } } diff --git a/src/main/resources/mapper/PurchaseMapper.xml b/src/main/resources/mapper/PurchaseMapper.xml index 5b38d9b..f3cbf64 100644 --- a/src/main/resources/mapper/PurchaseMapper.xml +++ b/src/main/resources/mapper/PurchaseMapper.xml @@ -35,6 +35,28 @@ + + + insert into product_common + values + (#{productId}, + #{productName}, + #{productCount}, + #{productCategory}, + #{inletPressureMax}, + #{inletPressureMin}, + #{outletPressureMax}, + #{outletPressureMin}, + #{flowmeterLength}, + #{pressureRegulatorType}, + #{productBrand}, + #{outerBox}, + #{outerBoxMaterial}, + #{remarks}, + #{accessory}, + #{requirementType} + ) + 立即开始 + + 自定义开始时间： + + + + + + + 截止日期： + +
+
+ 结束公布日期： + + + + + + *采购商信息 + + + + +
+ 联系人： +
+
+
+ 邮箱： + + +
+ 联系电话： +
+ + + + + *备注信息 + + + + +
+ +
+ + + + + 附件 + + + + + + + + + +

+
+ + + +
+ + +
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/templates/findCustomized.html b/src/main/resources/templates/findCustomized.html index 951036f..a32e16f 100644 --- a/src/main/resources/templates/findCustomized.html +++ b/src/main/resources/templates/findCustomized.html @@ -33,11 +33,10 @@ -

填写定制产品信息 -
+ @@ -48,16 +47,16 @@ @@ -76,26 +75,26 @@ @@ -105,12 +104,12 @@ @@ -119,11 +118,11 @@ @@ -133,7 +132,7 @@ *流量计长度： @@ -141,11 +140,11 @@ *调压器： @@ -171,7 +170,7 @@ @@ -200,8 +199,8 @@
- - + +
- - 个 + +   个


- +
进口压力 - 最小值： + 最小值： Kpa Mpa

- 最大值： + 最大值： Kpa Mpa 		出口压力 最小值： - Kpa + Kpa Mpa

- 最大值： + 最大值： Kpa Mpa 		-    Nm3/h +    Nm3/h
- 国产 - + 国产 + - 进口 - + 进口 + 其他 @@ -157,10 +156,10 @@
- @@ -189,7 +188,7 @@
- +
- - + +
@@ -210,16 +209,16 @@
*需求类型：


- - + +



@@ -227,10 +226,22 @@ + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
正在加载LoveFeel站点
V1.0
+
+ +
+ + + + +
+ 提交成功 +
+
+ + + + + + \ No newline at end of file -- Gitee From e9ea7ada8c59e192320d83b8ce5dc33995e06872 Mon Sep 17 00:00:00 2001 From: nbch <1587737444@qq.com> Date: Wed, 13 Oct 2021 20:49:12 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=99=88=E6=B5=A9=20=E4=B8=A4=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProductController.java | 23 +++++++ .../java/com/jk/customer/dao/ProductDao.java | 4 ++ .../jk/customer/service/ProductService.java | 4 ++ .../service/impl/ProductServiceImpl.java | 44 ++++++++----- src/main/resources/mapper/ProductMapper.xml | 11 +++- .../resources/templates/findCustomized.html | 6 +- src/main/resources/templates/findProduct.html | 64 +++++++++++++++++-- 7 files changed, 134 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/jk/customer/controller/ProductController.java b/src/main/java/com/jk/customer/controller/ProductController.java index 4b21f97..017c8a1 100644 --- a/src/main/java/com/jk/customer/controller/ProductController.java +++ b/src/main/java/com/jk/customer/controller/ProductController.java @@ -37,4 +37,27 @@ public class ProductController { public void cancelEnquiry(Integer productId){ productService.cancelEnquiry(productId); } + + /** + * 重新发起 + * @param productId + * 陈浩 + */ + @RequestMapping("resend") + @ResponseBody + public void resend(Integer productId){ + productService.resend(productId); + } + + /** + * 延期回显 + * @param productId + * @return + * 陈浩 + */ + @RequestMapping("postpone") + @ResponseBody + public ProductEntity postpone(Integer productId){ + return productService.postpone(productId); + } } diff --git a/src/main/java/com/jk/customer/dao/ProductDao.java b/src/main/java/com/jk/customer/dao/ProductDao.java index 32ef615..e5f2fc9 100644 --- a/src/main/java/com/jk/customer/dao/ProductDao.java +++ b/src/main/java/com/jk/customer/dao/ProductDao.java @@ -17,4 +17,8 @@ public interface ProductDao { void updateStatus(@Param("a") int a, @Param("id") String id); void cancelEnquiry(Integer productId); + + void resend(Integer productId); + + ProductEntity postpone(Integer productId); } diff --git a/src/main/java/com/jk/customer/service/ProductService.java b/src/main/java/com/jk/customer/service/ProductService.java index ae86f8d..342373e 100644 --- a/src/main/java/com/jk/customer/service/ProductService.java +++ b/src/main/java/com/jk/customer/service/ProductService.java @@ -13,4 +13,8 @@ public interface ProductService { List findProduct(ProductEntity product); void cancelEnquiry(Integer productId); + + void resend(Integer productId); + + ProductEntity postpone(Integer productId); } \ No newline at end of file diff --git a/src/main/java/com/jk/customer/service/impl/ProductServiceImpl.java b/src/main/java/com/jk/customer/service/impl/ProductServiceImpl.java index a3a1f65..15b86f2 100644 --- a/src/main/java/com/jk/customer/service/impl/ProductServiceImpl.java +++ b/src/main/java/com/jk/customer/service/impl/ProductServiceImpl.java @@ -55,26 +55,30 @@ public class ProductServiceImpl implements ProductService { Long endDateTime = time - endTime.getTime(); System.err.println(endDateTime); - - if (dayTime < 0 ){ - a=1; - list.get(i).setQueryPriceStatus(a); - }else if (dayTime == 0){ - a=2; - list.get(i).setQueryPriceStatus(a); - }else if (dayTime > 0 && endDateTime < 0){ - a=3; - list.get(i).setQueryPriceStatus(a); - }else if (endDateTime > 0){ - a=4; - list.get(i).setQueryPriceStatus(a); + if (list.get(i).getQueryPriceStatus() != 5 && list.get(i).getQueryPriceStatus() != 6 && list.get(i).getQueryPriceStatus() != 7){ + if (dayTime < 0 ){ + a=1; + list.get(i).setQueryPriceStatus(a); + }else if (dayTime == 0){ + a=2; + list.get(i).setQueryPriceStatus(a); + }else if (dayTime > 0 && endDateTime < 0){ + a=3; + list.get(i).setQueryPriceStatus(a); + }else if (endDateTime > 0){ + a=4; + list.get(i).setQueryPriceStatus(a); + } } } catch (ParseException e) { e.printStackTrace(); } - String id = list.get(i).getProductId(); - productDao.updateStatus(a,id); + if (list.get(i).getQueryPriceStatus() != 5 && list.get(i).getQueryPriceStatus() != 6 && list.get(i).getQueryPriceStatus() != 7){ + String id = list.get(i).getProductId(); + productDao.updateStatus(a,id); + } + } return list; } @@ -83,4 +87,14 @@ public class ProductServiceImpl implements ProductService { public void cancelEnquiry(Integer productId) { productDao.cancelEnquiry(productId); } + + @Override + public void resend(Integer productId) { + productDao.resend(productId); + } + + @Override + public ProductEntity postpone(Integer productId) { + return productDao.postpone(productId); + } } diff --git a/src/main/resources/mapper/ProductMapper.xml b/src/main/resources/mapper/ProductMapper.xml index 5e43394..c1b0541 100644 --- a/src/main/resources/mapper/ProductMapper.xml +++ b/src/main/resources/mapper/ProductMapper.xml @@ -46,7 +46,6 @@ and product_name = #{productName} - and query_price_status = #{queryPriceStatus} @@ -69,6 +68,14 @@ - update product_common set query_price_status = 5 where product_id= #{productId} + update query_price set query_price_status=5 where query_price_requirement_type= #{productId} + + + + update query_price set query_price_status=1 where query_price_requirement_type= #{productId} + + \ No newline at end of file diff --git a/src/main/resources/templates/findCustomized.html b/src/main/resources/templates/findCustomized.html index a32e16f..0fc82fd 100644 --- a/src/main/resources/templates/findCustomized.html +++ b/src/main/resources/templates/findCustomized.html @@ -218,7 +218,7 @@

- +



@@ -226,6 +226,10 @@ \ No newline at end of file -- Gitee From a811ef849dd4332eaf0a6ffdbc31ed1edc4f26b7 Mon Sep 17 00:00:00 2001 From: ptc <3143208857@qq.com> Date: Wed, 13 Oct 2021 20:50:31 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=9D=90=E6=96=99=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customer/controller/SellerController.java | 27 +++- .../java/com/jk/customer/dao/SellerDao.java | 3 + .../jk/customer/service/SellerService.java | 3 + .../service/impl/SellerServiceImpl.java | 6 + src/main/resources/mapper/SellerMapper.xml | 19 ++- .../resources/templates/materialBill.html | 100 +++++++++++++++ .../templates/queryMaterialsShow.html | 115 ++++++++++++++++++ 7 files changed, 271 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/templates/materialBill.html create mode 100644 src/main/resources/templates/queryMaterialsShow.html diff --git a/src/main/java/com/jk/customer/controller/SellerController.java b/src/main/java/com/jk/customer/controller/SellerController.java index d77d3b8..13ed1e9 100644 --- a/src/main/java/com/jk/customer/controller/SellerController.java +++ b/src/main/java/com/jk/customer/controller/SellerController.java @@ -2,6 +2,7 @@ package com.jk.customer.controller; import com.jk.customer.entity.MaterialsEntity; import com.jk.customer.entity.OfferFormEntity; +import com.jk.customer.entity.ProductEntity; import com.jk.customer.service.SellerService; import com.jk.customer.utils.OSSUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpSession; import java.util.HashMap; import java.util.List; @@ -26,7 +28,7 @@ public class SellerController { @Autowired private SellerService sellerService; /** - * 方法实现说明 (查询材料单) + * 方法实现说明 (查询对应材料单) * @author 潘天赐 * @return * @exception @@ -104,4 +106,27 @@ public class SellerController { public void updateOffer(OfferFormEntity offer){ sellerService.updateOffer(offer); } + /** + * 方法实现说明 (查询全部材料) + * @author 潘天赐 + * @return + * @exception + * @date 2021/10/13 15:26 + */ + @RequestMapping("queryMaterialsAll") + @ResponseBody + public List queryMaterialsAll(ProductEntity product){ + List list = sellerService.queryMaterialsAll(product); + return list; + } + + @RequestMapping("queryMaterialsShow") + public String queryMaterialsShow(Integer id,String name, HttpSession session){ + session.setAttribute("queryPriceId",id); + session.setAttribute("name",name); + return "queryMaterialsShow"; + } + + + } diff --git a/src/main/java/com/jk/customer/dao/SellerDao.java b/src/main/java/com/jk/customer/dao/SellerDao.java index dfa7fea..670e414 100644 --- a/src/main/java/com/jk/customer/dao/SellerDao.java +++ b/src/main/java/com/jk/customer/dao/SellerDao.java @@ -2,6 +2,7 @@ package com.jk.customer.dao; import com.jk.customer.entity.MaterialsEntity; import com.jk.customer.entity.OfferFormEntity; +import com.jk.customer.entity.ProductEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -25,4 +26,6 @@ public interface SellerDao { OfferFormEntity findByOffer(Integer oid); void updateOffer(OfferFormEntity offer); + + List queryMaterialsAll(ProductEntity product); } diff --git a/src/main/java/com/jk/customer/service/SellerService.java b/src/main/java/com/jk/customer/service/SellerService.java index 4791f86..ac5d40c 100644 --- a/src/main/java/com/jk/customer/service/SellerService.java +++ b/src/main/java/com/jk/customer/service/SellerService.java @@ -2,6 +2,7 @@ package com.jk.customer.service; import com.jk.customer.entity.MaterialsEntity; import com.jk.customer.entity.OfferFormEntity; +import com.jk.customer.entity.ProductEntity; import java.util.List; @@ -23,4 +24,6 @@ public interface SellerService { OfferFormEntity findByOffer(Integer oid); void updateOffer(OfferFormEntity offer); + + List queryMaterialsAll(ProductEntity product); } diff --git a/src/main/java/com/jk/customer/service/impl/SellerServiceImpl.java b/src/main/java/com/jk/customer/service/impl/SellerServiceImpl.java index 65669d5..c8233ce 100644 --- a/src/main/java/com/jk/customer/service/impl/SellerServiceImpl.java +++ b/src/main/java/com/jk/customer/service/impl/SellerServiceImpl.java @@ -3,6 +3,7 @@ package com.jk.customer.service.impl; import com.jk.customer.dao.SellerDao; import com.jk.customer.entity.MaterialsEntity; import com.jk.customer.entity.OfferFormEntity; +import com.jk.customer.entity.ProductEntity; import com.jk.customer.service.SellerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,4 +54,9 @@ public class SellerServiceImpl implements SellerService { public void updateOffer(OfferFormEntity offer) { sellerDao.updateOffer(offer); } + + @Override + public List queryMaterialsAll(ProductEntity product) { + return sellerDao.queryMaterialsAll(product); + } } diff --git a/src/main/resources/mapper/SellerMapper.xml b/src/main/resources/mapper/SellerMapper.xml index 3399bb0..232ed07 100644 --- a/src/main/resources/mapper/SellerMapper.xml +++ b/src/main/resources/mapper/SellerMapper.xml @@ -35,8 +35,15 @@ + + + + + + - + + @@ -66,5 +73,15 @@ business_price=#{businessPrice},offer_form_remark=#{offerFormRemark},offer_form_accessory=#{offerFormAccessory},delivery_cycle=#{deliveryCycle},offer_form_valid_time=#{offerFormValidTime}, total_prices=#{totalPrices} where materials_inventory_id = #{materialsInventoryId} + + + + + and product_name like '%${productName}%' + + diff --git a/src/main/resources/templates/materialBill.html b/src/main/resources/templates/materialBill.html new file mode 100644 index 0000000..9f8baed --- /dev/null +++ b/src/main/resources/templates/materialBill.html @@ -0,0 +1,100 @@ + + + + + + Title + + + + + + + + + + + + + + + + + + + + + +
+
+
+

条件查询

+
+
+
+
+ 名称： +
+
+ +
+
+ +
+
+
+
+
+
+ +
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/queryMaterialsShow.html b/src/main/resources/templates/queryMaterialsShow.html new file mode 100644 index 0000000..d3a4ac5 --- /dev/null +++ b/src/main/resources/templates/queryMaterialsShow.html @@ -0,0 +1,115 @@ + + + + + + Title + + + + + + + + + + + + + + + + + + + + + + +

材料单名称： [[${session.name}]]


+

材料单的各部件详细配置：

+
+ +

+

服务项:

+ + + + + + + + + + + + + + + + + + + + + + + + + +
服务名称价格(元)
运费
组装费
其他
+ + + \ No newline at end of file -- Gitee