Jelajahi Sumber

修改不干胶工艺价格

zhuyiyi 3 bulan lalu
induk
melakukan
12a237bf53

+ 2 - 0
src/main/java/lingtao/net/bean/StandardMemo.java

@@ -31,4 +31,6 @@ public class StandardMemo {
      * 描述
      */
     private String memo;
+
+    private Integer type;
 }

+ 6 - 1
src/main/java/lingtao/net/service/ProductService.java

@@ -5614,8 +5614,13 @@ public class ProductService {
                     stickersList = new PVCYaMoStickersPrice().getPrice(count, area);
                     break;
                 case "5":
-                    if (StringUtils.isEmpty(dto.getAotu())) {
+                    if (StringUtils.isEmpty(dto.getAotu()) || (width < 30 && length < 30)) {
                         stickersList = new YaJinStickersPrice().getPriceNoAoTu(length, width, count);
+                        if (("加凹凸".equals(dto.getAotu())) && (width < 30 && length < 30)) {
+                            for (Product product : stickersList) {
+                                product.setPrice(product.getPrice() + Math.ceil(product.getPrice() * 0.3));
+                            }
+                        }
                         break;
                     }
                     return stickersList;

+ 3 - 2
src/main/resources/mapper/InformationMapper.xml

@@ -9,11 +9,12 @@
 		FROM
 		tbl_information
 		<where>
+			1=1
 			<if test="content != null and content != ''">
-				content like '%${content}%'
+				AND content like '%${content}%'
 			</if>
 			<if test="type != null and type != ''">
-				type = '${type}'
+				AND type = '${type}'
 			</if>
 		</where>
 		order by id 

+ 7 - 3
src/main/resources/mapper/StandardMemoMapper.xml

@@ -8,8 +8,12 @@
         FROM
         tbl_standard_memo
         <where>
+            1=1
             <if test="content != null and content != ''">
-                title like '%${content}%' or content like '%${content}%'
+                and title like '%${content}%' or content like '%${content}%'
+            </if>
+            <if test="type != null and type != ''">
+                and  `type` = #{type}
             </if>
         </where>
         order by id desc
@@ -17,8 +21,8 @@
 
     <insert id="addStandardMemo" parameterType="lingtao.net.bean.StandardMemo">
         insert into tbl_standard_memo
-            (content, createBy, createDate, title, memo)
-        values (#{content}, #{createBy}, now(), #{title}, #{memo})
+            (content, createBy, createDate, title, memo, type)
+        values (#{content}, #{createBy}, now(), #{title}, #{memo}, #{type})
     </insert>
 
     <update id="updateStandardMemoById" parameterType="lingtao.net.bean.StandardMemo">

+ 3 - 10
src/main/webapp/views/system/customerTrain/skill/showCustomerSkillContent.jsp

@@ -29,19 +29,12 @@
 </head>
 
 <script type="text/html" id="toolbarDemo">
-    <div class="layui-btn-container demoTable">
-        <button class="layui-btn layui-btn-sm" lay-event="add">
-            <i class="layui-icon layui-icon-add-circle-fine" style="font-size:20px;font-weight:bold"></i> 新增内容
-        </button>
-    </div>
+
 </script>
 <script type="text/html" id="barDemo">
     <a class="layui-btn layui-btn-xs" lay-event="view">
         <i class="layui-icon layui-icon-view" style="color:white;font-size:20px"></i>复制
     </a>
-    <a class="layui-btn layui-btn-xs" lay-event="edit">
-        <i class="layui-icon layui-icon-edit" style="color:white;font-size:20px"></i>修改
-    </a>
 </script>
 <body>
 <br>
@@ -88,7 +81,7 @@
                 'limitName' : 'pageSize' // 分页每页条数默认字段改为pageSize
             },*/
             where: {
-                content: ''
+                content: '', type: 1
             },
             cellMinWidth: 80, // 全局定义常规单元格的最小宽度,layui 2.2.1 新增
             cols: [[{
@@ -167,7 +160,7 @@
                         layui.form.render();
                     }
                 });
-            } else  if (obj.event === 'view') {
+            } else if (obj.event === 'view') {
                 // 在此处输入 layer 的任意代码
                 navigator.clipboard.writeText(data.content);
                 layer.msg('复制成功!', {icon: 6, offset: 'auto', time: 1000});

+ 182 - 0
src/main/webapp/views/system/customerTrain/skill/showSkillContent.jsp

@@ -0,0 +1,182 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8" %>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>产品知识列表</title>
+    <%@include file="/views/common.jsp" %>
+    <style type="text/css">
+        .layui-table-cell {
+            height: 32px;
+            line-height: 32px;
+        }
+
+        .layui-table td, .layui-table th, .layui-table-header, .layui-table-page, .layui-table-tool, .layui-table-total, .layui-table-view {
+            border-color: #6666;
+            font-size: 16px;
+        }
+
+        .ztree * {
+            font-size: 20px;
+        }
+
+        .edge .layui-edge {
+            right: 35px;
+        }
+    </style>
+</head>
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container demoTable">
+        <button class="layui-btn layui-btn-sm" lay-event="add">
+            <i class="layui-icon layui-icon-add-circle-fine" style="font-size:20px;font-weight:bold"></i> 新增内容
+        </button>
+    </div>
+</script>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-xs" lay-event="view">
+        <i class="layui-icon layui-icon-view" style="color:white;font-size:20px"></i>复制
+    </a>
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit" style="color:white;font-size:20px"></i>修改
+    </a>
+</script>
+<body>
+<br>
+<form class="layui-form" action="">
+    <div class="layui-inline">
+        <label class="layui-form-label">内容</label>
+        <div class="layui-input-inline">
+            <input type="text" id="content" name="content" placeholder="请输入内容" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <button class="layui-btn" id="searchBtn" lay-submit lay-filter="formDemo" style="margin-left: 15px">
+                <i class="layui-icon layui-icon-search"></i> 查询
+            </button>
+            <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+        </div>
+    </div>
+</form>
+<table class="layui-hide" id="informationTable" lay-filter="informationTable"></table>
+<script type="text/javascript">
+
+    layui.use(['element', 'table', 'laydate', 'form'], function () {
+        var $ = layui.jquery;
+        var table = layui.table;
+        var laydate = layui.laydate;
+        var element = layui.element;
+        var form = layui.form;
+
+        // 生成表格
+        table.render({
+            elem: '#informationTable',
+            url: '../../../../getStandard',
+            toolbar: '#toolbarDemo',
+            title: '用户表',// 导出文件名
+            id: 'informationTableAll',
+            // 开启分页
+            // page	: true,
+            page: {
+                layout: ['count', 'prev', 'page', 'next', 'skip', 'limit']
+            },
+            limits: [10, 30, 50, 80, 100, 999],
+            /*request : {
+                'limitName' : 'pageSize' // 分页每页条数默认字段改为pageSize
+            },*/
+            where: {
+                content: '', type: 1
+            },
+            cellMinWidth: 80, // 全局定义常规单元格的最小宽度,layui 2.2.1 新增
+            cols: [[{
+                field: 'title',
+                title: '产品',
+            }, {
+                field: 'content',
+                title: '内容',
+            }, {
+                field: 'memo',
+                title: '备注',
+            }, {
+                fixed: 'right',
+                title: '操作',
+                align: 'center',
+                width: 150,
+                toolbar: '#barDemo'
+            }]],
+            parseData: function (res) { //将原始数据解析成 table 组件所规定的数据
+                return {
+                    "code": 0, //解析接口状态
+                    "msg": "", //解析提示文本
+                    "count": res.data.list.total,//解析数据长度
+                    "data": res.data.list.list//解析数据列表
+                };
+            }
+        });
+
+        //点击查询按钮,重载表格
+        $('#searchBtn').on('click', function () {
+            table.reload('informationTableAll', {
+                method: 'get',
+                where: {
+                    content: $("#content").val()
+                },
+                page: {
+                    curr: 1
+                }
+            });
+            return false;
+        });
+
+
+        table.on('toolbar(informationTable)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    layer.open({
+                        type: 2,
+                        title: "添加文件名",
+                        fix: false, //不固定
+                        maxmin: true,
+                        skin: 'layui-layer-molv',
+                        area: ['45%', '70%'],
+                        content: './addMemo.jsp',
+                    });
+                    break;
+            }
+            ;
+        });
+        table.on('tool(informationTable)', function (obj) {
+            let data1 = obj.data;
+            if (obj.event === 'edit') {
+                layer.open({
+                    type: 2,
+                    title: "修改文件名",
+                    area: ['45%', '70%'],
+                    skin: 'layui-layer-molv',
+                    content: './addMemo.jsp',
+                    success: function (layero, index) {
+                        var body = layer.getChildFrame('body', index);
+                        body.find('#id').val(data1.id);
+                        body.find('input[name="title"]').val(data1.title);
+                        body.find('input[name="memo"]').val(data1.memo);
+                        body.find('textarea[name="content"]').val(data1.content);
+
+                        layui.form.render();
+                    }
+                });
+            } else if (obj.event === 'view') {
+                // 在此处输入 layer 的任意代码
+                navigator.clipboard.writeText(data.content);
+                layer.msg('复制成功!', {icon: 6, offset: 'auto', time: 1000});
+            }
+        })
+
+    });
+
+</script>
+
+</body>
+</html>