修改审批展示方式

src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java

@@ -1414,6 +1414,114 @@ public class DepositoryRecordController {
         }
     }
 
+    /**
+     * 用于获取出库审批记录
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping("/getApplicationOutRecord")
+    public RestResponse getApplicationOutRecord(@RequestBody Map<String, String> map, HttpServletRequest request) {
+        String token = request.getHeader("user-token");
+        String userKey = request.getHeader("user-key");
+        if (token == null) {
+            token = (String) request.getSession().getAttribute("userToken");
+            userKey = (String) request.getSession().getAttribute("userKey");
+        }
+        if (map.containsKey("id")) {
+            // 如果请求参数存在id将其转为Integer类型
+            Integer id = ObjectFormatUtil.toInteger(map.get("id"));
+            // 获取当前出库单
+            ApplicationOutRecordP recordPById = depositoryRecordService.findApplicationOutRecordPById(id);
+            if (recordPById != null) {
+                // 如果当前单不为空
+
+                //获取所有子单
+                List<ApplicationOutRecordMinP> applicationOutMinByParentId = depositoryRecordService.findApplicationOutMinByParentId(id);
+                // 声明出库处理人
+                List<UserByPort> managerList = new ArrayList<>();
+                for (ApplicationOutRecordMinP recordMinP : applicationOutMinByParentId) {
+                    Integer checkId = recordMinP.getCheckId();
+                    if (checkId == null) {
+                        // 如果当前未完成出库
+
+                        // 构造redis中的key
+                        String minKey = "minRecord:" + recordMinP.getId();
+                        // 获取当前子单的出库人
+                        Object managers = redisPool.getRedisTemplateByDb(15).opsForHash().get(minKey, "manager");
+                        if (managers != null) {
+                            String[] managersSplit = managers.toString().split(",");
+                            for (String manager : managersSplit) {
+                                if (!"".equals(manager)) {
+                                    UserByPort userByPort = PublicConfig.FindUserById(Integer.parseInt(manager), userKey, token);
+                                    if (!managerList.contains(userByPort)) {
+                                        managerList.add(userByPort);
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        // 如果已完成出库
+
+                        UserByPort userByPort = PublicConfig.FindUserById(checkId, userKey, token);
+                        if (!managerList.contains(userByPort)) {
+                            managerList.add(userByPort);
+                        }
+                    }
+
+                }
+                StringBuilder sb = new StringBuilder();
+                for (UserByPort userByPort : managerList) {
+                    sb.append(userByPort.getName()).append(",");
+                }
+                recordPById.setCompleteOutUserName(sb.toString());
+
+                recordPById.setApplicantTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordPById.getApplicantTime())));
+                recordPById.setDepartmentheadTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordPById.getDepartmentheadTime())));
+                recordPById.setDepositoryManagerTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordPById.getDepositoryManagerTime())));
+                // 获取平衡岗人员
+                String balancePoster = recordPById.getBalancePoster();
+                StringBuilder balancePosterName = new StringBuilder();
+                if (balancePoster != null) {
+                    String[] split = balancePoster.split(",");
+                    for (String s : split) {
+                        if (!"".equals(s)) {
+                            UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token);
+                            balancePosterName.append(userByPort.getName()).append(",");
+                        }
+                    }
+                    recordPById.setBalancePosterTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordPById.getBalancePosterTime())));
+                } else {
+                    recordPById.setBalancePosterTime("");
+                    recordPById.setBalancePoster("");
+                }
+                // 仓储中心负责人
+                String manager = recordPById.getDepositoryManager();
+                String depositoryManagerPass = recordPById.getDepositoryManagerPass();
+                if (!"4".equals(depositoryManagerPass)) {
+                    String[] depositoryManagerId = new String[0];
+                    if (manager != null) {
+                        depositoryManagerId = manager.split(",");
+                    }
+                    StringBuilder depositoryManagerNames = new StringBuilder();
+                    for (String s : depositoryManagerId) {
+                        if ("".equals(s)) {
+                            continue;
+                        }
+                        Integer managerid = ObjectFormatUtil.toInteger(s);
+                        UserByPort user = PublicConfig.FindUserById(managerid, userKey, token);
+                        depositoryManagerNames.append(user.getName());
+                    }
+                    recordPById.setDepositoryName(depositoryManagerNames.toString());
+                }
+                recordPById.setBalancePosterName(balancePosterName.toString());
+            }
+            return new RestResponse(recordPById);
+        } else {
+            throw new MyException("所需请求参数缺失！");
+        }
+    }
+
 
     /**
      * 自动生成出入库订单

src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@@ -2393,6 +2393,7 @@ public class PageController {
                 applicationOutRecordPById.setBalancePosterTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationOutRecordPById.getBalancePosterTime())));
             } else {
                 applicationOutRecordPById.setBalancePosterTime("");
+                applicationOutRecordPById.setBalancePoster("");
             }
 
             // 获取出库子单
@@ -2528,7 +2529,6 @@ public class PageController {
             if (manager != null) {
                 depositoryManagerId = manager.split(",");
             }
-            List<UserByPort> depositoryManager = new ArrayList<>();
             StringBuilder depositoryManagerNames = new StringBuilder();
             for (String s : depositoryManagerId) {
                 if ("".equals(s)) {
@@ -2536,7 +2536,6 @@ public class PageController {
                 }
                 Integer managerid = ObjectFormatUtil.toInteger(s);
                 UserByPort user = PublicConfig.FindUserById(managerid, userKey, token);
-                depositoryManager.add(user);
                 depositoryManagerNames.append(user.getName());
             }
 

src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java

@@ -224,6 +224,11 @@ public class ApplicationOutRecordP {
      */
     private Integer outType;
 
+    /**
+     * 要出库的人员
+     */
+    private String completeOutUserName;
+
     /**
      * 出库类别名称
      */
@@ -274,12 +279,12 @@ public class ApplicationOutRecordP {
         this.departmentheadName = aor.getDepartmentheadName();
         this.departmentheadPass = aor.getDepartmentheadPass();
         this.departmentheadTime = aor.getDepartmentheadTime();
-        this.departmentheadMessage = aor.getDepartmentheadMessage();
+        this.departmentheadMessage = aor.getDepartmentheadMessage() == null ? "无" : aor.getDepartmentheadMessage();
         this.depositoryManager = aor.getDepositoryManager();
         this.depositoryManagerName = aor.getDepositoryManagerName();
         this.depositoryManagerPass = aor.getDepositoryManagerPass();
         this.depositoryManagerTime = aor.getDepositoryManagerTime();
-        this.depositoryManagerMessage = aor.getDepositoryManagerMessage();
+        this.depositoryManagerMessage = aor.getDepositoryManagerMessage() == null ? "无" : aor.getDepositoryManagerMessage();
         this.state = aor.getState();
         this.istransfer = aor.getIstransfer();
         this.mcode = aor.getMcode();
@@ -303,7 +308,7 @@ public class ApplicationOutRecordP {
         this.balancePosterName = aor.getBalancePosterName();
         this.balancePosterTime = aor.getBalancePosterTime() == null ? "" : aor.getBalancePosterTime();
         this.balancePosterPass = aor.getBalancePosterPass();
-        this.balancePosterMessage = aor.getBalancePosterMessage();
+        this.balancePosterMessage = aor.getBalancePosterMessage() == null ? "无" : aor.getBalancePosterMessage();
 
     }
 }

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -3,6 +3,7 @@ package com.dreamchaser.depository_manage.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.dreamchaser.depository_manage.config.PublicConfig;
 import com.dreamchaser.depository_manage.config.QyWxConfig;
+import com.dreamchaser.depository_manage.config.QyWx_approval_template.Approval_template_approver;
 import com.dreamchaser.depository_manage.entity.*;
 import com.dreamchaser.depository_manage.entity.MaterialAndPlace;
 import com.dreamchaser.depository_manage.mapper.*;
@@ -925,7 +926,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         // 获取当前出库库存记录
         Inventory inventoryById = materialMapper.findInventoryById(mid);
         if (depositoryId == null || "".equals(depositoryId.toString())) {
-            map.put("depositoryId", inventoryById.getDepositoryId());
+            depositoryId = inventoryById.getDepositoryId();
+            map.put("depositoryId", depositoryId);
         } else {
             // 如果选择了仓库
             Map<String, Object> paramForInventory = new HashMap<>();

src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java

@@ -1909,7 +1909,8 @@ public class QyWxOperationService {
                     otherDepartmentIdList = qyWxLabelUserList;
                 }
             }
-        } else {
+        }
+        else {
             // 如果不是中心仓下的仓库
             if (Integer.compare(2, flagForOpenDepository) == 0) {
                 // 如果该仓库是通过开放仓库获取到的
@@ -1990,7 +1991,8 @@ public class QyWxOperationService {
                     approval_template_approver_list.add(approval_template_approver_depository_manager);
                 }
             }
-        } else {
+        }
+        else {
             for (Integer depositoryId : depositoryIdList
 
             ) {

src/main/resources/templates/pages/application/form-step-look_back.html

@@ -22,7 +22,6 @@
                     <div id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
                         <div style="margin-top: 30px">
                             <button th:style="'display:'+${display}" onclick="downloadExcel()">下载</button>
-
                             <table id="demo" class="layui-table"
                                    style="margin: 0 auto;max-width: 800px;">
                                 <colgroup>
@@ -88,7 +87,7 @@
                                     <td id="state" th:text="${record.getState()}">2016-11-28</td>
                                     <td id="pass" th:text="${record.getPass()}" style="display:none;"></td>
                                 </tr>
-                                <tr>
+                                <!--<tr>
                                     <td>申请人</td>
                                     <td id="applicantName" th:text="${record.getApplicantName()}">2016-11-28</td>
                                 </tr>
@@ -159,11 +158,32 @@
                                         th:text="${record.getDepositoryManagerTime().equals('1970-01-01 08:00:00')?'':record.getDepositoryManagerTime()}">
                                         2016-11-28
                                     </td>
-                                </tr>
+                                </tr>-->
 
 
                                 </tbody>
                             </table>
+                            <!--                            用于展示审批流程-->
+                            <div class="layui-timeline">
+                                <div class="layui-timeline-item" id="applicantNode">
+                                    <i class="layui-icon layui-timeline-axis layui-icon-friends"></i>
+                                    <div class="layui-timeline-content layui-text">
+                                        <h3 class="layui-timeline-title"
+                                            th:text="'申请人：'+ ${record.getApplicantName()}"></h3>
+                                        <p th:text="'申请时间：'+${record.getApplicantTime()}"></p>
+                                        <p th:text="'申请事由：'+${record.getApplyRemark()}"></p>
+                                    </div>
+                                </div>
+                                <div class="layui-timeline-item" id="firstApprovalNode">
+                                    <i id="firstApprovalNodeIcon"
+                                       class="layui-icon layui-timeline-axis layui-icon-friends"></i>
+                                    <div class="layui-timeline-content layui-text">
+                                        <h3 class="layui-timeline-title"
+                                            th:text="'审批人：'+ ${record.getDepartmentheadName()}"></h3>
+                                        <p id="firstApprovalNodeState" th:text="'状态：待审批'"></p>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
 
@@ -199,7 +219,109 @@
             stepItems: []
         });
 
-        // 获取部门负责人节点审批时间
+
+        let id = $("#id").val();
+        // 定义当前查看的出库单
+        let record = {};
+
+
+        $.ajax({
+            url: "/depositoryRecord/getApplicationOutRecord",
+            type: "post",
+            dataType: 'json',
+            data: JSON.stringify({"id": id}),
+            contentType: "application/json;charset=utf-8",
+            success: function (res) {
+                record = res.data;
+
+                // 用于时间线项目
+                let timeLineStartItem = `<div class="layui-timeline-item">
+                                    <i class="layui-icon layui-timeline-axis layui-icon-friends"></i>
+                                    <div class="layui-timeline-content layui-text">`;
+                let timeLineEndItem = `</div></div>`;
+
+                // 获取第一个审批节点
+                let firstApprovalNode = $("#firstApprovalNode");
+                // 获取第一个审批节点状态
+                let firstApprovalNodeState = $("#firstApprovalNodeState");
+                // 获取第一个审批节点图标
+                let firstApprovalNodeIcon = $("#firstApprovalNodeIcon");
+
+
+                // 获取部门负责人节点审批时间（第一个节点）
+                let departmentheadTime = record.departmentheadTime;
+                let departmenthead = record.departmenthead;
+                let departmentheadPass = record.departmentheadPass;
+                let departmentheadMessage = record.departmentheadMessage;
+                // 获取仓储中心负责人节点审批时间（第二个节点）
+                let depositoryManagerNameTime = record.depositoryManagerTime;
+                let depositoryManager = record.depositoryManagerName;
+                // 获取仓储中心负责人节点审批结果
+                let depositoryManagerPass = record.depositoryManagerPass;
+                let depositoryManagerMessage = record.depositoryManagerMessage;
+                // 获取平衡岗人员节点
+                let balancePoster = record.balancePoster;
+                let balancePosterName = record.balancePosterName;
+                // 获取平衡岗人员节点审批时间
+                let balancePosterNameTime = record.balancePosterTime;
+                let balancePosterMessage = record.balancePosterMessage;
+
+
+                if (departmentheadTime != null && departmentheadTime !== "" && departmentheadTime !== "0") {
+
+                    firstApprovalNodeIcon.removeClass("layui-icon-friends");
+                    // 如果部门负责人审批时间不为空
+                    if (departmentheadPass === "1") {
+                        firstApprovalNodeState.text("状态：审批通过");
+                        firstApprovalNodeIcon.addClass("layui-icon-ok");
+                    } else {
+                        firstApprovalNodeState.text("状态：驳回");
+                        firstApprovalNodeIcon.addClass("layui-icon-close");
+                    }
+                    firstApprovalNodeState.before("<p>审批时间：" + departmentheadTime + "</p>");
+                    firstApprovalNodeState.append("<p>审批意见：" + balancePosterMessage + "</p>");
+                }
+
+                if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "" && depositoryManagerPass !== "4") {
+                    // 如果部门负责人已经审批过
+                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + depositoryManager + '</h3>';
+                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + timeLineEndItem;
+                    firstApprovalNode.append(newTimeLineNode);
+                }
+                else if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster !== "") {
+                    // 如果平衡岗已经审批过
+                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + balancePosterName + '</h3>';
+                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + timeLineEndItem;
+                    firstApprovalNode.append(newTimeLineNode);
+                }
+
+                if (balancePosterNameTime != null && balancePosterNameTime !== "0" && balancePosterNameTime !== "") {
+                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + balancePosterName + '</h3>';
+                    let newTimeLineNodeApprovalTime = '<p>审批时间：' + balancePosterNameTime + '</p>';
+                    let newTimeLineNodeApprovalMessage = '<p>审批意见：' + balancePosterNameTime + '</p>';
+
+                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + newTimeLineNodeApprovalTime + newTimeLineNodeApprovalMessage + timeLineEndItem;
+                    firstApprovalNode.append(newTimeLineNode);
+                }
+
+                if (depositoryManagerNameTime != null && depositoryManagerNameTime !== "0" && depositoryManagerNameTime !== "" && depositoryManagerPass !== "4") {
+                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + depositoryManager + '</h3>';
+                    let newTimeLineNodeApprovalTime = '<p>审批时间：' + depositoryManagerNameTime + '</p>';
+                    let newTimeLineNodeApprovalMessage = '<p>审批意见：' + depositoryManagerMessage + '</p>';
+
+                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + newTimeLineNodeApprovalTime + newTimeLineNodeApprovalMessage + timeLineEndItem;
+                    firstApprovalNode.append(newTimeLineNode);
+
+                }
+
+
+
+
+            }
+        });
+
+
+       /* // 获取部门负责人节点审批时间
         let departmentheadTime = $("#departmentheadTime").text();
         // 获取仓储中心负责人节点审批时间
         let depositoryManagerNameTime = $("#depositoryManagerNameTime").text();
@@ -214,6 +336,7 @@
             // 如果部门负责人审批时间不为空
             $("#departmentheadTimeT").show();
             $("#departmentheadMessageT").show();
+
         }
 
         if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "" && depositoryManagerPass !== "4") {
@@ -235,7 +358,7 @@
             $("#depositoryManagerNameTimeT").show();
             $("#depositoryManagerNameMessageT").show();
         }
-
+*/
 
         selectThisMinRecord = function (obj) {
             // console.log(obj)
@@ -254,7 +377,7 @@
         };
 
         downloadExcel = function () {
-            let id = $("#id").val();
+
             window.open("/depositoryRecord/downloadOutRecord?id=" + id, "_self");
         };
         $('body').on('click', '[data-refresh]', function () {

target/classes/application-test.yml

@@ -17,8 +17,8 @@ spring:
 
     ##数据库设置
   datasource:
-    username: depository
+    username: root
-    password: NhE47edekBHxhjYk
+    password: root
     url: jdbc:mysql://localhost:3306/depository?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
@@ -83,9 +83,9 @@ mybatis:
     log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
     log-prefix: mapper.
 
-#mybatis-plus:
+mybatis-plus:
-#  configuration:
+  configuration:
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 file:
   uploadPath: D:/upLoad

target/classes/templates/pages/application/form-step-look_back.html

@@ -22,7 +22,6 @@
                     <div id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
                         <div style="margin-top: 30px">
                             <button th:style="'display:'+${display}" onclick="downloadExcel()">下载</button>
-
                             <table id="demo" class="layui-table"
                                    style="margin: 0 auto;max-width: 800px;">
                                 <colgroup>
@@ -88,7 +87,7 @@
                                     <td id="state" th:text="${record.getState()}">2016-11-28</td>
                                     <td id="pass" th:text="${record.getPass()}" style="display:none;"></td>
                                 </tr>
-                                <tr>
+                                <!--<tr>
                                     <td>申请人</td>
                                     <td id="applicantName" th:text="${record.getApplicantName()}">2016-11-28</td>
                                 </tr>
@@ -159,11 +158,32 @@
                                         th:text="${record.getDepositoryManagerTime().equals('1970-01-01 08:00:00')?'':record.getDepositoryManagerTime()}">
                                         2016-11-28
                                     </td>
-                                </tr>
+                                </tr>-->
 
 
                                 </tbody>
                             </table>
+                            <!--                            用于展示审批流程-->
+                            <div class="layui-timeline">
+                                <div class="layui-timeline-item" id="applicantNode">
+                                    <i class="layui-icon layui-timeline-axis layui-icon-friends"></i>
+                                    <div class="layui-timeline-content layui-text">
+                                        <h3 class="layui-timeline-title"
+                                            th:text="'申请人：'+ ${record.getApplicantName()}"></h3>
+                                        <p th:text="'申请时间：'+${record.getApplicantTime()}"></p>
+                                        <p th:text="'申请事由：'+${record.getApplyRemark()}"></p>
+                                    </div>
+                                </div>
+                                <div class="layui-timeline-item" id="firstApprovalNode">
+                                    <i id="firstApprovalNodeIcon"
+                                       class="layui-icon layui-timeline-axis layui-icon-friends"></i>
+                                    <div class="layui-timeline-content layui-text">
+                                        <h3 class="layui-timeline-title"
+                                            th:text="'审批人：'+ ${record.getDepartmentheadName()}"></h3>
+                                        <p id="firstApprovalNodeState" th:text="'状态：待审批'"></p>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
 
@@ -199,7 +219,109 @@
             stepItems: []
         });
 
-        // 获取部门负责人节点审批时间
+
+        let id = $("#id").val();
+        // 定义当前查看的出库单
+        let record = {};
+
+
+        $.ajax({
+            url: "/depositoryRecord/getApplicationOutRecord",
+            type: "post",
+            dataType: 'json',
+            data: JSON.stringify({"id": id}),
+            contentType: "application/json;charset=utf-8",
+            success: function (res) {
+                record = res.data;
+
+                // 用于时间线项目
+                let timeLineStartItem = `<div class="layui-timeline-item">
+                                    <i class="layui-icon layui-timeline-axis layui-icon-friends"></i>
+                                    <div class="layui-timeline-content layui-text">`;
+                let timeLineEndItem = `</div></div>`;
+
+                // 获取第一个审批节点
+                let firstApprovalNode = $("#firstApprovalNode");
+                // 获取第一个审批节点状态
+                let firstApprovalNodeState = $("#firstApprovalNodeState");
+                // 获取第一个审批节点图标
+                let firstApprovalNodeIcon = $("#firstApprovalNodeIcon");
+
+
+                // 获取部门负责人节点审批时间（第一个节点）
+                let departmentheadTime = record.departmentheadTime;
+                let departmenthead = record.departmenthead;
+                let departmentheadPass = record.departmentheadPass;
+                let departmentheadMessage = record.departmentheadMessage;
+                // 获取仓储中心负责人节点审批时间（第二个节点）
+                let depositoryManagerNameTime = record.depositoryManagerTime;
+                let depositoryManager = record.depositoryManagerName;
+                // 获取仓储中心负责人节点审批结果
+                let depositoryManagerPass = record.depositoryManagerPass;
+                let depositoryManagerMessage = record.depositoryManagerMessage;
+                // 获取平衡岗人员节点
+                let balancePoster = record.balancePoster;
+                let balancePosterName = record.balancePosterName;
+                // 获取平衡岗人员节点审批时间
+                let balancePosterNameTime = record.balancePosterTime;
+                let balancePosterMessage = record.balancePosterMessage;
+
+
+                if (departmentheadTime != null && departmentheadTime !== "" && departmentheadTime !== "0") {
+
+                    firstApprovalNodeIcon.removeClass("layui-icon-friends");
+                    // 如果部门负责人审批时间不为空
+                    if (departmentheadPass === "1") {
+                        firstApprovalNodeState.text("状态：审批通过");
+                        firstApprovalNodeIcon.addClass("layui-icon-ok");
+                    } else {
+                        firstApprovalNodeState.text("状态：驳回");
+                        firstApprovalNodeIcon.addClass("layui-icon-close");
+                    }
+                    firstApprovalNodeState.before("<p>审批时间：" + departmentheadTime + "</p>");
+                    firstApprovalNodeState.append("<p>审批意见：" + balancePosterMessage + "</p>");
+                }
+
+                if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "" && depositoryManagerPass !== "4") {
+                    // 如果部门负责人已经审批过
+                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + depositoryManager + '</h3>';
+                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + timeLineEndItem;
+                    firstApprovalNode.append(newTimeLineNode);
+                }
+                else if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster !== "") {
+                    // 如果平衡岗已经审批过
+                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + balancePosterName + '</h3>';
+                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + timeLineEndItem;
+                    firstApprovalNode.append(newTimeLineNode);
+                }
+
+                if (balancePosterNameTime != null && balancePosterNameTime !== "0" && balancePosterNameTime !== "") {
+                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + balancePosterName + '</h3>';
+                    let newTimeLineNodeApprovalTime = '<p>审批时间：' + balancePosterNameTime + '</p>';
+                    let newTimeLineNodeApprovalMessage = '<p>审批意见：' + balancePosterNameTime + '</p>';
+
+                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + newTimeLineNodeApprovalTime + newTimeLineNodeApprovalMessage + timeLineEndItem;
+                    firstApprovalNode.append(newTimeLineNode);
+                }
+
+                if (depositoryManagerNameTime != null && depositoryManagerNameTime !== "0" && depositoryManagerNameTime !== "" && depositoryManagerPass !== "4") {
+                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + depositoryManager + '</h3>';
+                    let newTimeLineNodeApprovalTime = '<p>审批时间：' + depositoryManagerNameTime + '</p>';
+                    let newTimeLineNodeApprovalMessage = '<p>审批意见：' + depositoryManagerMessage + '</p>';
+
+                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + newTimeLineNodeApprovalTime + newTimeLineNodeApprovalMessage + timeLineEndItem;
+                    firstApprovalNode.append(newTimeLineNode);
+
+                }
+
+
+
+
+            }
+        });
+
+
+       /* // 获取部门负责人节点审批时间
         let departmentheadTime = $("#departmentheadTime").text();
         // 获取仓储中心负责人节点审批时间
         let depositoryManagerNameTime = $("#depositoryManagerNameTime").text();
@@ -214,6 +336,7 @@
             // 如果部门负责人审批时间不为空
             $("#departmentheadTimeT").show();
             $("#departmentheadMessageT").show();
+
         }
 
         if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "" && depositoryManagerPass !== "4") {
@@ -235,7 +358,7 @@
             $("#depositoryManagerNameTimeT").show();
             $("#depositoryManagerNameMessageT").show();
         }
-
+*/
 
         selectThisMinRecord = function (obj) {
             // console.log(obj)
@@ -254,7 +377,7 @@
         };
 
         downloadExcel = function () {
-            let id = $("#id").val();
+
             window.open("/depositoryRecord/downloadOutRecord?id=" + id, "_self");
         };
         $('body').on('click', '[data-refresh]', function () {

target/depository/WEB-INF/classes/META-INF/MANIFEST.MF

@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: com.dreamchaser.depository_manage.DepositoryManageApplicatio
- n
-

target/depository/WEB-INF/classes/META-INF/spring-configuration-metadata.json

@@ -1,17 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "file",
-      "type": "com.dreamchaser.depository_manage.config.FileConfig",
-      "sourceType": "com.dreamchaser.depository_manage.config.FileConfig"
-    }
-  ],
-  "properties": [
-    {
-      "name": "file.upload-path",
-      "type": "java.lang.String",
-      "sourceType": "com.dreamchaser.depository_manage.config.FileConfig"
-    }
-  ],
-  "hints": []
-}

target/depository/WEB-INF/classes/application-test.yml

@@ -1,91 +0,0 @@
-#开启健康检查、审计、统计和监控，即可通过访问/actuator/beans等查看状态
-management:
-  endpoints:
-        web:
-          exposure:
-            include: beans,health
-spring:
-  mobile:
-    sitepreference:
-      enabled:true
-
-  servlet:
-    multipart:
-      enabled: true
-      max-file-size: 100MB       # 单个文件上传的最大上限
-      max-request-size: 100MB    # 一次请求总大小上限
-
-    ##数据库设置
-  datasource:
-    username: depository
-    password: NhE47edekBHxhjYk
-    url: jdbc:mysql://localhost:3306/depository?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    type: com.alibaba.druid.pool.DruidDataSource
-    initialSize: 5
-    minIdle: 5
-    maxActive: 10
-    maxWait: 60000
-    timeBetweenEvictionRunsMillis: 60000
-    minEvictableIdleTimeMillis: 300000
-    validationQuery: SELECT 1 FROM DUAL
-    useGlobalDataSourceStat: true
-    server:
-    port: 9090
-    testWhileIdle: true
-    testOnReturn: false
-    testOnBorrow: false
-    poolPreparedStatements: true
-    maxPoolPreparedStatementPerConnectionSize: 20
-    #配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙
-    filters: stat, wall, log4j
-    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-    #超时回收机制
-    removeAbandoned: true
-    removeAbandonedTimeout: 1800
-    logAbandoned: true
-  banner:
-    location: banner.txt
-  thymeleaf:
-    cache: false
-    mode: HTML
-  mvc:
-    hiddenmethod:
-      filter:
-        enabled: true
-    view:
-      prefix: /templates/
-      suffix: .html
-    static-path-pattern: /static/**
-  redis:
-    port: 6379
-    host: 127.0.0.1
-    database: 5
-    jedis:
-      pool:
-        min-idle: 10
-        max-idle: 20
-        max-wait: -1ms
-        max-active: 200
-    timeout: 2000ms
-
-
-redisPool:
-  port: 6379
-  host: 127.0.0.1
-  dbs: 5,14,15
-  password:
-
-server:
-mybatis:
-  type-aliases-package: com.dreamchaser.depository_manage.entity
-  configuration:
-    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
-    log-prefix: mapper.
-
-#mybatis-plus:
-#  configuration:
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-file:
-  uploadPath: D:/upLoad

target/depository/WEB-INF/classes/application.yml

@@ -1,5 +0,0 @@
-spring:
-  profiles:
-    active: test
-server:
-  port: 11111

target/depository/WEB-INF/classes/banner.txt

@@ -1,14 +0,0 @@
-    ,---,                                            ____            ,---,                                                
-  .'  .' `\                                        ,'  , `.        ,--.' |                                                
-,---.'     \   __  ,-.                          ,-+-,.' _ |        |  |  :                                        __  ,-. 
-|   |  .`\  |,' ,'/ /|                       ,-+-. ;   , ||        :  :  :                  .--.--.             ,' ,'/ /| 
-:   : |  '  |'  | |' | ,---.     ,--.--.    ,--.'|'   |  || ,---.  :  |  |,--.  ,--.--.    /  /    '     ,---.  '  | |' | 
-|   ' '  ;  :|  |   ,'/     \   /       \  |   |  ,', |  |,/     \ |  :  '   | /       \  |  :  /`./    /     \ |  |   ,' 
-'   | ;  .  |'  :  / /    /  | .--.  .-. | |   | /  | |--'/    / ' |  |   /' :.--.  .-. | |  :  ;_     /    /  |'  :  /   
-|   | :  |  '|  | ' .    ' / |  \__\/: . . |   : |  | ,  .    ' /  '  :  | | | \__\/: . .  \  \    `. .    ' / ||  | '    
-'   : | /  ; ;  : | '   ;   /|  ," .--.; | |   : |  |/   '   ; :__ |  |  ' | : ," .--.; |   `----.   \'   ;   /|;  : |    
-|   | '` ,/  |  , ; '   |  / | /  /  ,.  | |   | |`-'    '   | '.'||  :  :_:,'/  /  ,.  |  /  /`--'  /'   |  / ||  , ;    
-;   :  .'     ---'  |   :    |;  :   .'   \|   ;/        |   :    :|  | ,'   ;  :   .'   \'--'.     / |   :    | ---'     
-|   ,.'              \   \  / |  ,     .-./'---'          \   \  / `--''     |  ,     .-./  `--'---'   \   \  /           
-'---'                 `----'   `--`---'                    `----'             `--`---'                  `----'            
-

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/AccesstoAddressMapper.xml

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<!-- depository -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.AccesstoAddressMapper">
-    <!-- This code was generated by TableGo tools, mark 1 begin. -->
-    <!-- 字段映射 -->
-    <resultMap id="accesstoAddress" type="com.dreamchaser.depository_manage.entity.AccesstoAddress">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="name" property="name" jdbcType="VARCHAR" />
-        <result column="url" property="url" jdbcType="VARCHAR" />
-        <result column="type" property="type" jdbcType="INTEGER" />
-        <result column="role_id" property="role_id" jdbcType="INTEGER" />
-        <result column="menuparent" property="menuparent" jdbcType="INTEGER" />
-        <result column="state" property="state" jdbcType="INTEGER" />
-        <result column="icon" property="icon" jdbcType="VARCHAR"/>
-        <result column="target" property="target" jdbcType="VARCHAR"/>
-        <result column="ischild" property="ischild" jdbcType="INTEGER"/>
-    </resultMap>
-    <!-- This code was generated by TableGo tools, mark 1 end. -->
-
-    <!-- This code was generated by TableGo tools, mark 2 begin. -->
-    <!-- 表查询字段 -->
-    <sql id="allColumns">
-        a.id,a.name,a.url ,a.`type` ,a.role_id ,a.menuparent ,a.state,a.icon,a.target,a.ischild
-    </sql>
-
-    <select id="findAllMenus" resultMap="accesstoAddress">
-        select
-        <include refid="allColumns"></include>
-        from accesstoaddress a
-        where a.state != 3
-    </select>
-
-    <select id="findAccessstoAddressByParentAndRole" resultMap="accesstoAddress" parameterType="map">
-        select
-        <include refid="allColumns"/>
-        from accesstoaddress a
-        where 1 = 1
-        <if test="roleId != null and roleId != ''">
-        and a.role_id = #{roleId}
-        </if>
-        <if test="menuparent != null and menuparent != ''">
-            and a.menuparent = #{menuparent}
-        </if>
-        and a.state != 3
-    </select>
-
-
-    <select id="findMenusByRole" resultMap="accesstoAddress" parameterType="map">
-        select
-        <include refid="allColumns"/>
-        from accesstoaddress a
-        where 1 = 1
-        <if test="type != null and type != ''">
-            and type = #{type}
-        </if>
-        <if test="roleId != null and roleId != ''">
-            and a.role_id = #{roleId}
-        </if>
-        <if test="menuparent != null and menuparent != ''">
-            and a.menuparent = #{menuparent}
-        </if>
-        and a.state != 3
-    </select>
-
-    <select id="findMenusByNoParent" resultMap="accesstoAddress">
-        select
-        <include refid="allColumns"></include>
-        from accesstoaddress a
-        where 1 = 1
-        and a.menuparent = 0
-    </select>
-
-
-    <select id="findAccessstoAddressByParent" resultMap="accesstoAddress" parameterType="INTEGER">
-        select
-        <include refid="allColumns"></include>
-        from accesstoaddress a
-        where 1 = 1
-        and a.menuparent = #{id}
-    </select>
-
-
-    <select id="findAccessToAddressByUser" resultMap="accesstoAddress" parameterType="map">
-        select
-        <include refid="allColumns"/>
-        from
-        AccessToAddressByUser a
-        where authority = #{roleId}
-        <if test="userId != '' and userId != null ">
-            and uid = #{userId}
-        </if>
-        <if test="menuparent != null and menuparent != ''">
-            and menuparent = #{menuparent}
-        </if>
-    </select>
-
-    <select id="findAccessToAddressByList" resultMap="accesstoAddress" parameterType="list">
-        select
-        <include refid="allColumns"/>
-        from accesstoaddress a
-        where a.id in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/BusinessTypeMapper.xml

@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dreamchaser.depository_manage.mapper.BusinessTypeMapper">
-    <resultMap id="BusinessTypeMap" type="com.dreamchaser.depository_manage.entity.BusinessType">
-        <id property="id" column="id" jdbcType="BIGINT"/>
-        <result property="typeName" column="typeName" jdbcType="VARCHAR"/>
-        <result property="typeDescription" column="typeDescription" jdbcType="VARCHAR"/>
-        <result property="recordTypeName" column="recordTypeName" jdbcType="VARCHAR"/>
-        <result property="recordTypeDescription" column="recordTypeDescription" jdbcType="VARCHAR"/>
-        <result property="state" column="state" jdbcType="INTEGER"/>
-        <result property="createUid" column="createUid" jdbcType="INTEGER"/>
-        <result property="createTime" column="createTime" jdbcType="BIGINT"/>
-        <result property="updateUid" column="updateUid" jdbcType="INTEGER"/>
-        <result property="updateTime" column="updateTime" jdbcType="INTEGER"/>
-    </resultMap>
-
-    <sql id="allColumns">
-        id,typeName,typeDescription,recordTypeName,recordTypeDescription,state,createUid,createTime,updateUid,updateTime
-    </sql>
-
-    <insert id="addBusinessType" useGeneratedKeys="true" keyProperty="id">
-        insert into businesstype(id, typeName, typeDescription, recordTypeName, recordTypeDescription, state, createUid,
-                                 createTime)
-        values (#{id}, #{typeName}, #{typeDescription}, #{recordTypeName}, #{recordTypeDescription}, #{state},
-                #{createUid}, #{createTime})
-    </insert>
-
-    <update id="updateBusinessType">
-        update businesstype
-        <set>
-            <if test="typeName != null and typeName != ''">
-                typeName = #{typeName},
-            </if>
-            <if test="typeDescription != null and typeDescription != ''">
-                typeDescription = #{typeDescription},
-            </if>
-            <if test="recordTypeName != null and recordTypeName != ''">
-                recordTypeName = #{recordTypeName},
-            </if>
-            <if test="recordTypeDescription != null and recordTypeDescription != ''">
-                recordTypeDescription = #{recordTypeDescription},
-            </if>
-            <if test="state != null and state != ''">
-                state = #{state},
-            </if>
-            <if test="updateUid != null and updateUid != ''">
-                updateUid = #{updateUid},
-            </if>
-            <if test="updateTime != null and updateTime != ''">
-                updateTime = #{updateTime}
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-
-    <update id="updateBusinessTypeStateById" parameterType="map">
-        update businesstype
-        <set>
-            <if test="state != null and state != ''">
-                state = #{state},
-            </if>
-            <if test="updateUid != null and updateUid != ''">
-                updateUid = #{updateUid},
-            </if>
-            <if test="updateTime != null and updateTime != ''">
-                updateTime = #{updateTime}
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <update id="updateBusinessTypeStateByIds" parameterType="map">
-        update businesstype
-        <set>
-            <if test="state != null and state != ''">
-                state = #{state},
-            </if>
-            <if test="updateUid != null and updateUid != ''">
-                updateUid = #{updateUid},
-            </if>
-            <if test="updateTime != null and updateTime != ''">
-                updateTime = #{updateTime}
-            </if>
-        </set>
-        where id in
-        <foreach collection="ids" open="(" close=")"  separator="," item="id" >
-            #{id}
-        </foreach>
-    </update>
-
-    <delete id="deleteBusinessTypeById" parameterType="int">
-        delete
-        from businesstype
-        where id = #{id}
-    </delete>
-
-    <delete id="deleteBusinessTypeByIds" parameterType="list">
-        delete
-        from businesstype
-        where id in
-        <foreach collection="ids" open="(" close=")" separator="," item="id" index="index">
-            #{id}
-        </foreach>
-    </delete>
-
-
-    <select id="findBusinessTypeByCondition" parameterType="map" resultMap="BusinessTypeMap">
-        select
-        <include refid="allColumns"/>
-        from businesstype
-        where  1 = 1
-        <if test="typeName != null and typeName != ''">
-           and typeName like concat('%',#{typeName},'%')
-        </if>
-        <if test="typeDescription != null and typeDescription != ''">
-            and typeDescription like concat('%',#{typeDescription},'%')
-        </if>
-        <if test="recordTypeName != null and recordTypeName != ''">
-            and recordTypeName like concat('%',#{recordTypeName},'%')
-        </if>
-        <if test="recordTypeDescription != null and recordTypeDescription != ''">
-            and recordTypeDescription like concat('%',#{recordTypeDescription},'%')
-        </if>
-        <if test="state != null and state != ''">
-            and  state = #{state}
-        </if>
-    </select>
-
-    <select id="findBusinessTypeCountByCondition" parameterType="map" resultType="int">
-        select
-        COUNT(*)
-        from businesstype
-        where  1 = 1
-        <if test="typeName != null and typeName != ''">
-            and typeName like concat('%',#{typeName},'%')
-        </if>
-        <if test="typeDescription != null and typeDescription != ''">
-            and typeDescription like concat('%',#{typeDescription},'%')
-        </if>
-        <if test="recordTypeName != null and recordTypeName != ''">
-            and recordTypeName like concat('%',#{recordTypeName},'%')
-        </if>
-        <if test="recordTypeDescription != null and recordTypeDescription != ''">
-            and recordTypeDescription like concat('%',#{recordTypeDescription},'%')
-        </if>
-        <if test="state != null and state != ''">
-            and  state = #{state}
-        </if>
-    </select>
-
-    <select id="findBusinessTypeAll" resultMap="BusinessTypeMap">
-        select
-        <include refid="allColumns"/>
-        from businesstype
-        where state = 1
-    </select>
-
-
-    <select id="findBusinessTypeById" parameterType="int" resultMap="BusinessTypeMap">
-        select
-        <include refid="allColumns"/>
-        from businesstype
-        where id = #{id}
-    </select>
-
-    <select id="findBusinessTypeByIds" parameterType="list" resultMap="BusinessTypeMap">
-        select
-        <include refid="allColumns"/>
-        from businesstype
-        where id in
-        <foreach collection="ids" item="id" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </select>
-
-
-
-
-
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/CallBackLogMapper.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<!-- depository -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.CallBackLogMapper">
-    <resultMap id="callBackMap" type="com.dreamchaser.depository_manage.entity.CallBackLog">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="msg_signature" property="msg_signature" jdbcType="VARCHAR" />
-        <result column="timestamp" property="timestamp" jdbcType="INTEGER" />
-        <result column="nonce" property="nonce" jdbcType="VARCHAR" />
-        <result column="echostr" property="echostr" jdbcType="VARCHAR" />
-        <result column="xmlstr" property="xmlstr" jdbcType="VARCHAR" />
-        <result column="jsonstr" property="jsonstr" jdbcType="VARCHAR" />
-        <result column="reqdata" property="reqdata" jdbcType="VARCHAR"/>
-        <result column="addtime" property="addtime" jdbcType="INTEGER"/>
-    </resultMap>
-
-    <insert id="addCallBackLog">
-
-        INSERT INTO callback_log (
-            id, msg_signature, timestamp,nonce,echostr,xmlstr,jsonstr,reqdata,addtime
-        ) VALUES (
-            #{id},
-            #{msg_signature},
-            #{timestamp},
-            #{nonce},
-            #{echostr},
-            #{xmlstr},
-            #{jsonstr},
-            #{reqdata},
-            #{addtime}
-        )
-
-    </insert>
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/CompanyMapper.xml

@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<!-- depository -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.CompanyMapper">
-    <!-- This code was generated by TableGo tools, mark 1 begin. -->
-    <!-- 字段映射 -->
-    <resultMap id="companyMap" type="com.dreamchaser.depository_manage.entity.Company">
-        <id column="cid" property="cid" jdbcType="INTEGER" />
-        <result column="cname" property="cname" jdbcType="VARCHAR" />
-        <result column="state" property="state" jdbcType="INTEGER"/>
-        <result column="parentId" property="parentId" jdbcType="INTEGER"/>
-        <result column="introduce" property="introduce" jdbcType="VARCHAR"/>
-    </resultMap>
-    <!-- This code was generated by TableGo tools, mark 1 end. -->
-
-    <!-- This code was generated by TableGo tools, mark 2 begin. -->
-    <!-- 表查询字段 -->
-    <sql id="allColumns">
-        c.cid, c.cname ,c.state , c.parentId,c.introduce
-    </sql>
-
-    <!-- 查询所有数据 -->
-    <select id="findCompanyAll" resultMap="companyMap">
-        SELECT
-        <include refid="allColumns" />
-        FROM company c
-        Where c.state != 3
-    </select>
-
-    <select id="findcompanyById" resultMap="companyMap" parameterType="int">
-        select  <include refid="allColumns"/>
-        from company c
-        where c.cid = #{id}
-    </select>
-
-<!--    根据条件查询公司-->
-    <select id="findCompanyByCondition" resultMap="companyMap" parameterType="map">
-        select
-        <include refid="allColumns"/>
-        from company c
-        where 1 = 1
-        <if test="id != null and id !=''">
-            and c.cid = #{id}
-        </if>
-        <if test="cname != null and cname != ''">
-            and c.cname LIKE CONCAT('%', #{cname}, '%')
-        </if>
-        <if test="introduce != null and introduce !=''">
-            and c.introduce LIKE CONCAT('%', #{introduce}, '%')
-        </if>
-        <if test="parentId != null">
-            AND c.parentId = #{parentId}
-        </if>
-        <if test="state != null">
-            and c.state = #{state}
-        </if>
-        and c.state != 3
-    </select>
-
-    <!-- 根据条件参数查询数据列表数目 -->
-    <select id="findCountByCondition" resultType="int" parameterType="map">
-    SELECT count(*)
-    from company c
-    where 1 = 1
-    <if test="id != null and id !=''">
-        and c.cid = #{id}
-    </if>
-    <if test="cname != null and cname != ''">
-        and c.cname LIKE CONCAT('%', #{cname}, '%')
-    </if>
-    <if test="introduce != null and introduce !=''">
-        and c.introduce LIKE CONCAT('%', #{introduce}, '%')
-   </if>
-   <if test="parentId != null">
-       AND c.parentId = #{parentId}
-   </if>
-    and c.state != 3
-    </select>
-
-<!--根据父级查询公司信息-->
-    <select id="findCompanyByParentId" resultMap="companyMap" parameterType="int">
-        select
-        <include refid="allColumns"/>
-        from company c
-        where c.state != 3 and c.parentId = #{parentId}
-    </select>
-
-    <!-- 根据主键删除数据 -->
-    <delete id="deleteCompanyById" parameterType="int">
-        DELETE FROM company WHERE cid = #{id}
-    </delete>
-
-    <!-- 根据主键批量删除数据 -->
-    <delete id="deleteCompanyByIds" parameterType="list">
-        DELETE FROM company WHERE cid IN
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <!-- 修改数据 -->
-    <update id="updateCompany" parameterType="map">
-        UPDATE company
-        <set>
-            <if test="cname != null">
-                cname = #{cname},
-            </if>
-            <if test="introduce != null">
-                introduce = #{introduce},
-            </if>
-            <if test="state != null">
-                state = #{state},
-            </if>
-            <if test="parentId != null">
-                parentId = #{parentId}
-            </if>
-        </set>
-        WHERE cid = #{id}
-    </update>
-
-<!--插入数据-->
-    <insert id="insertCompany" parameterType="map">
-        INSERT INTO company (
-            cid, cname, introduce,parentId
-        ) VALUES (
-            #{id},
-            #{cname},
-            #{introduce},
-            #{parentId}
-        )
-    </insert>
-
-    <!-- 根据主键将状态改为删除-->
-    <update id="changeStateToDeletedById" parameterType="int">
-        update company
-        <set>
-            state = 3
-        </set>
-        where cid = #{id}
-    </update>
-
-
-    <!-- 根据主键批量将状态改为删除-->
-    <update id="changeStateToDeletedByIds" parameterType="list">
-        update company
-        <set>
-            state = 3
-        </set>
-        where cid in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-
-
-    <update id="updateStateByParam" parameterType="map">
-        update company
-        <set>
-            state = #{state}
-        </set>
-        where cid = #{cid}
-        <if test="oldState != null">
-            and state = #{oldState}
-        </if>
-        and state != 3
-    </update>
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.dreamchaser.depository_manage.mapper.ConstructionUnitMapper">
-    <resultMap id="constructionUnitMap" type="com.dreamchaser.depository_manage.entity.ConstructionUnit">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="name" property="name" jdbcType="VARCHAR" />
-        <result column="state" property="state" jdbcType="INTEGER" />
-        <result column="introduce" property="introduce" jdbcType="VARCHAR" />
-        <result column="address" property="address" jdbcType="VARCHAR" />
-        <result column="createTime" property="createTime" jdbcType="INTEGER" />
-    </resultMap>
-    <sql id="allColumns">
-        id,`name`,state,introduce,address,createTime
-    </sql>
-
-    <insert id="addConstructionUnit">
-        insert into constructionunit(id,`name`,state,introduce,address,createTime)
-        values (
-        #{id},
-        #{name},
-        #{state},
-        #{introduce},
-        #{address},
-        #{createTime}
-        )
-    </insert>
-
-    <select id="findConstructionUnitAll" resultMap="constructionUnitMap">
-        select
-        <include refid="allColumns"/>
-        from constructionunit
-        where state = 1
-    </select>
-
-    <select id="findConstructionUnitByCondition" parameterType="map" resultMap="constructionUnitMap">
-        select
-        <include refid="allColumns"/>
-        from constructionunit
-        where 1 = 1
-        <if test="name != null and name != ''">
-            and `name` like CONCAT('%',#{name},'%')
-        </if>
-        <if test="state != null and state != ''">
-            and state = #{state}
-        </if>
-        <if test="introduce != null and introduce != ''">
-            and introduce like concat('%',#{introduce},'%')
-        </if>
-        <if test="address != null and address != ''">
-            and address like concat('%',#{address},'%')
-        </if>
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-
-
-    <select id="findConstructionUnitCountByCondition" parameterType="map" resultType="int">
-        select
-        COUNT(*)
-        from constructionunit
-        where 1 = 1
-        <if test="name != null and name != ''">
-            and `name` like CONCAT('%',#{name},'%')
-        </if>
-        <if test="state != null and state != ''">
-            and state = #{state}
-        </if>
-        <if test="introduce != null and introduce != ''">
-            and introduce like concat('%',#{introduce},'%')
-        </if>
-        <if test="address != null and address != ''">
-            and address like concat('%',#{address},'%')
-        </if>
-    </select>
-
-
-    <select id="findConstructionUnitById" resultMap="constructionUnitMap" parameterType="int">
-        select
-        <include refid="allColumns"/>
-        from constructionunit
-        where id = #{id}
-    </select>
-
-    <update id="updateConstructionUnit">
-        update constructionunit
-        <set>
-            <if test="name != null and name != ''">
-                name = #{name},
-            </if>
-            <if test="state != null and state != ''">
-                state = #{state},
-            </if>
-            <if test="introduce != null and introduce != ''">
-                introduce  = #{introduce},
-            </if>
-            <if test="address != null and address != ''">
-                address  = #{address}
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-
-    <update id="updateConstructionUnitState">
-        update constructionunit
-        <set>
-            <if test="state != null and state != ''">
-                state = #{state},
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteConstructionUnitById" parameterType="int">
-        delete from constructionunit where id = #{id}
-    </delete>
-
-    <delete id="deleteConstructionUnitByIds" parameterType="list">
-        delete from constructionunit where id in
-        <foreach collection="list" item="id" index="index" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-
-
-
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/DepositoryMapper.xml

@@ -1,434 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<!-- depository -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.DepositoryMapper">
-    <!-- This code was generated by TableGo tools, mark 1 begin. -->
-    <!-- 字段映射 -->
-    <resultMap id="depositoryMap" type="com.dreamchaser.depository_manage.entity.Depository">
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="dname" property="dname" jdbcType="VARCHAR"/>
-        <result column="address" property="address" jdbcType="VARCHAR"/>
-        <result column="introduce" property="introduce" jdbcType="VARCHAR"/>
-        <result column="parentId" property="parentId" jdbcType="INTEGER"/>
-        <result column="cid" property="cid" jdbcType="INTEGER"/>
-        <result column="code" property="code" jdbcType="VARCHAR"/>
-        <result column="adminorg" property="adminorg" jdbcType="VARCHAR"/>
-        <result column="minNumber" property="minNumber" jdbcType="INTEGER"/>
-        <result column="maxNumber" property="maxNumber" jdbcType="INTEGER"/>
-    </resultMap>
-
-    <resultMap id="inventoryByDname" type="com.dreamchaser.depository_manage.pojo.InventoryByDname">
-        <result column="inventory" property="inventory" jdbcType="INTEGER"/>
-        <result column="dname" property="dname" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <resultMap id="inventoryByDidAndMt" type="com.dreamchaser.depository_manage.pojo.InventoryByMTAndDepository">
-        <result column="mtId" property="mtId" jdbcType="INTEGER"/>
-        <result column="inventory" property="inventory" jdbcType="INTEGER"/>
-        <result column="depository_id" property="depositoryId" jdbcType="INTEGER"/>
-    </resultMap>
-    <!-- This code was generated by TableGo tools, mark 1 end. -->
-
-    <!-- This code was generated by TableGo tools, mark 2 begin. -->
-    <!-- 表查询字段 -->
-    <sql id="allColumns">
-        d.id, d.dname, d.address, d.introduce,d.state,d.parentId,d.cid,d.code,d.adminorg,d.maxNumber,d.minNumber
-    </sql>
-    <!--    视图查询字段-->
-    <sql id="depositoryAndCompany">
-        id,dname,address,introduce,state,parentId,cid,cname,code,adminorg,minNumber,maxNumber
-    </sql>
-    <!-- This code was generated by TableGo tools, mark 2 end. -->
-
-    <!-- 根据id获取仓库名称 -->
-    <select id="findDepositoryNameById" resultType="string" parameterType="int">
-        SELECT
-            d.dname
-        FROM depository d where d.id=#{id}
-    </select>
-
-    <!--  &lt;!&ndash; 查询所有数据 &ndash;&gt;
-      <select id="findDepositoryAll" resultMap="depositoryMap">
-          SELECT
-          <include refid="allColumns" />
-          FROM depository d
-          Where d.state != 3
-      </select>-->
-
-    <!-- 查询所有数据 -->
-    <select id="findDepositoryAll" resultMap="depositoryMap">
-        SELECT
-        <include refid="depositoryAndCompany"/>
-        FROM depositoryandcompany dc
-        Where dc.state != 3
-    </select>
-
-    <select id="findDepositoryByNoParent" resultMap="depositoryMap">
-        SELECT
-        <include refid="depositoryAndCompany"/>
-        FROM depositoryandcompany dc
-        Where dc.state != 3  and parentId = 0
-    </select>
-
-
-    <select id="findDepositoryByParent" resultMap="depositoryMap" parameterType="int">
-        SELECT
-        <include refid="depositoryAndCompany"/>
-        FROM depositoryandcompany dc
-        Where dc.state != 3 and dc.parentId = #{did}
-    </select>
-
-    <select id="findDepositoryByParents" resultMap="depositoryMap" parameterType="list">
-        SELECT
-        <include refid="depositoryAndCompany"/>
-        FROM depositoryandcompany dc
-        Where dc.state != 3 and dc.parentId in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
-
-
-    <!--    获取当前部门仓库以及公共仓库-->
-    <select id="findDepositoryByAdminorg" resultMap="depositoryMap" parameterType="string">
-        SELECT
-        <include refid="allColumns"/>
-        FROM depository d WHERE 1 = 1 and d.state = 1
-        <if test="adminorg != null and adminorg != ''">
-            and d.adminorg = #{adminorg}
-        </if>
-        or d.adminorg = ''
-    </select>
-
-    <!--    根据仓库编码获取仓库-->
-    <select id="findDepositoryByCode" resultMap="depositoryMap" parameterType="string">
-        SELECT
-        <include refid="allColumns"/>
-        FROM depository d WHERE 1 = 1 and d.state != 3
-        <if test="depositoryCode != null and depositoryCode !=''">
-            and d.code = #{depositoryCode}
-        </if>
-    </select>
-
-    <select id="findDepositoryByAdminorgAndParent" resultMap="depositoryMap" parameterType="map">
-        SELECT
-        <include refid="allColumns"/>
-        FROM depository d WHERE 1 = 1
-        <if test="adminorg != null and adminorg != ''">
-            and (d.adminorg = #{adminorg} or d.adminorg = 361)
-        </if>
-        <if test="parentId != null">
-            AND d.parentId = #{parentId}
-        </if>
-        or d.adminorg = '' and d.state != 3
-    </select>
-
-
-    <!--    根据主键查询多个数据-->
-    <select id="selectDepositoryByIds" parameterType="list" resultMap="depositoryMap">
-        select
-        <include refid="allColumns"></include>
-        FROM depository d WHERE d.id IN
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
-    <!--    根据条件查询数据列表 -->
-    <select id="findDepositoryByCondition" resultMap="depositoryMap" parameterType="map">
-        SELECT
-        <include refid="allColumns"/>
-        FROM depository d WHERE 1 = 1
-        <if test="depositoryId != null">
-            AND d.id = #{depositoryId}
-        </if>
-        <if test="dname != null and dname != ''">
-            AND d.dname LIKE CONCAT('%', #{dname}, '%')
-        </if>
-        <if test="address != null and address != ''">
-            AND d.address LIKE CONCAT('%', #{address}, '%')
-        </if>
-        <if test="introduce != null and introduce != ''">
-            AND d.introduce LIKE CONCAT('%', #{introduce}, '%')
-        </if>
-        <if test="state != null and state != '' ">
-            AND d.state = #{state}
-        </if>
-        <if test="parentId != null">
-            AND d.parentId = #{parentId}
-        </if>
-        <if test="cid != null">
-            and d.cid = #{cid}
-        </if>
-        <if test="adminorg != null">
-            and (d.adminorg = #{adminorg} or d.adminorg = '')
-        </if>
-        AND d.state != 3
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-
-
-    <!-- 根据条件参数查询数据列表数目 -->
-    <select id="findCountByCondition" resultType="int" parameterType="map">
-        SELECT count(*)
-        FROM depository d WHERE 1 = 1
-        <if test="dname != null and dname != ''">
-            AND d.dname LIKE CONCAT('%', #{dname}, '%')
-        </if>
-        <if test="address != null and address != ''">
-            AND d.address LIKE CONCAT('%', #{address}, '%')
-        </if>
-        <if test="introduce != null and introduce != ''">
-            AND d.introduce LIKE CONCAT('%', #{introduce}, '%')
-        </if>
-        <if test="state != null and state != '' ">
-            AND d.state = #{state}
-        </if>
-        <if test="parentId != null">
-            AND d.parentId = #{parentId}
-        </if>
-        <if test="cid != null">
-            and d.cid = #{cid}
-        </if>
-        <if test="adminorg != null">
-            and d.adminorg = #{adminorg}
-        </if>
-        AND d.state != 3
-    </select>
-
-
-    <select id="getParentByDepository" resultMap="depositoryMap" parameterType="int">
-        SELECT
-        <include refid="allColumns"/>
-        FROM depository d WHERE d.parentId = #{parentId}
-    </select>
-
-
-    <!--    根据主键查询数据-->
-    <select id="findDepositoryById" resultMap="depositoryMap" parameterType="Integer">
-        SELECT
-        <include refid="allColumns"/>
-        FROM depository d WHERE d.id = #{id}
-    </select>
-
-
-    <select id="findDepositoryByIds" resultMap="depositoryMap" parameterType="list">
-        SELECT
-        <include refid="allColumns"/>
-        FROM depository d WHERE d.id in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
-
-
-    <!-- 插入数据 -->
-    <insert id="insertDepository" parameterType="map">
-        INSERT INTO depository (
-            id, dname, address, introduce,parentId,cid,code,adminorg,maxNumber,minNumber
-        ) VALUES (
-            #{id},
-            #{dname},
-            #{address},
-            #{introduce},
-            #{parentId},
-            #{cid},
-            #{code},
-            #{adminorg},
-            #{maxNumber},
-            #{minNumber}
-        )
-    </insert>
-
-    <!-- 批量插入数据
-         <insert id="insertDepositorys" parameterType="list">
-        INSERT INTO depository (
-            id, dname, address, introduce
-        ) VALUES
-        <foreach collection="list" index="index" item="item" separator=",">
-            (
-                #{item.id},
-                #{item.dname},
-                #{item.address},
-                #{item.introduce}
-            )
-        </foreach>
-    </insert>
-    -->
-
-    <!-- 修改数据 -->
-    <update id="updateDepository" parameterType="map">
-        UPDATE depository
-        <set>
-            <if test="dname != null">
-                dname = #{dname},
-            </if>
-            <if test="address != null">
-                address = #{address},
-            </if>
-            <if test="introduce != null">
-                introduce = #{introduce},
-            </if>
-            <if test="state != null">
-                state = #{state},
-            </if>
-            <if test="parentId != null">
-                parentId = #{parentId},
-            </if>
-            <if test="cid != null">
-                cid = #{cid},
-            </if>
-            <if test="adminorg != null">
-                adminorg = #{adminorg},
-            </if>
-            <if test="code != null">
-                code = #{code},
-            </if>
-            <if test="minNumber != null and minNumber != ''">
-                minNumber = #{minNumber},
-            </if>
-            <if test="maxNumber != null and maxNumber != ''">
-                maxNumber = #{maxNumber}
-            </if>
-        </set>
-        WHERE id = #{id}
-    </update>
-
-
-    <!-- 批量修改数据
-        <update id="updateDepositorys" parameterType="list">
-        <foreach collection="list" index="index" item="item" separator=";">
-            UPDATE depository
-            <set>
-                <if test="item.dname != null">
-                    dname = #{item.dname},
-                </if>
-                <if test="item.address != null">
-                    address = #{item.address},
-                </if>
-                <if test="item.introduce != null">
-                    introduce = #{item.introduce}
-                </if>
-            </set>
-            WHERE id = #{item.id}
-        </foreach>
-    </update>-->
-
-
-    <!-- 根据主键删除数据 -->
-    <delete id="deleteDepositoryRecordById" parameterType="int">
-        DELETE FROM depository WHERE id = #{id}
-    </delete>
-
-
-    <!--     根据主键批量删除数据-->
-    <delete id="deleteDepositoryRecordByIds" parameterType="list">
-        DELETE FROM depository WHERE id IN
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <!--     根据主键将状态改为删除-->
-    <update id="changeStateToDeletedById" parameterType="int">
-        UPDATE depository
-        <set>
-            state = 3
-        </set>
-        WHERE id = #{id}
-    </update>
-
-    <update id="updateStateByParam" parameterType="map">
-        UPDATE depository
-        <set>
-            state = #{state}
-        </set>
-
-        where id = #{id}
-        <if test="oldState != null">
-            and state = #{oldState}
-        </if>
-        and state != 3
-    </update>
-
-    <!-- 根据主键批量将状态改为删除-->
-    <update id="changeStateToDeletedByIds" parameterType="list">
-        update depository
-        <set>
-            state = 3
-        </set>
-        where id in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-
-
-    <!--    获取仓库总数-->
-    <select id="findAllCountByState" resultType="int">
-        select count(*)
-        from depository d
-        where d.state  != 3
-    </select>
-
-    <select id="getToDayInventoryByDName" resultType="int" parameterType="map">
-        select ifnull(sum(quantity),0.0)
-        from depositoryandinventory
-        where 1 = 1
-        <if test="dname != null and dname !=''">
-            and dname = #{dname}
-        </if>
-        <if test="dcode != null and dcode !=''">
-            and dcode = #{dcode}
-        </if>
-    </select>
-
-    <select id="getToDayInventoryByDNameTest" resultMap="inventoryByDname">
-         select ifnull(sum(quantity),0.0) as inventory ,dname
-        from depositoryandinventory
-        where 1 = 1
-		GROUP BY dname
-    </select>
-
-    <select id="getTodayInventoryByDidAndMt" resultMap="inventoryByDidAndMt" parameterType="map">
-        select mtId,depository_id,ifnull(sum(quantity),0.0) as inventory
-        from depositoryandinventory
-        where 1 = 1
-        <if test="depositoryId != null and depositoryId != ''">
-            and depository_id = #{depositoryId}
-        </if>
-        <if test="mtIdList != null">
-           and mtId in
-            <foreach collection="mtIdList" index="index" item="mtId" open="(" separator="," close=")">
-                #{mtId}
-            </foreach>
-        </if>
-    </select>
-
-    <select id="getTodayInventoryByDid" resultMap="inventoryByDidAndMt" parameterType="map">
-        select mtId,depository_id,ifnull(sum(quantity),0.0) as inventory
-        from depositoryandinventory
-        where 1 = 1
-        <if test="depositoryId != null and depositoryId != ''">
-            and depository_id = #{depositoryId}
-        </if>
-        <if test="mtIdList != null">
-            and mtId in
-            <foreach collection="mtIdList" index="index" item="mtId" open="(" separator="," close=")">
-                #{mtId}
-            </foreach>
-        </if>
-    </select>
-
-
-
-    <select id="findUserNameByDepositoryId" resultType="string" parameterType="int">
-        select uname
-        from depositoryanduser
-        where did = #{depositoryId}
-    </select>
-
-
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/GroupMapper.xml

@@ -1,395 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dreamchaser.depository_manage.mapper.GroupMapper">
-
-    <!-- 字段映射 (用于视图)-->
-    <resultMap id="groupInfoMap" type="com.dreamchaser.depository_manage.entity.GroupInfo">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="mid" property="mid" jdbcType="INTEGER"/>
-        <result column="gid" property="gid" jdbcType="INTEGER"/>
-        <result column="quantity" property="quantity" jdbcType="INTEGER"/>
-        <result column="mtid" property="mtid" jdbcType="INTEGER"/>
-        <result column="shelfLife" property="shelfLife" jdbcType="INTEGER"/>
-        <result column="gcode" property="gcode" jdbcType="VARCHAR"/>
-        <result column="mname" property="mname" jdbcType="VARCHAR"/>
-        <result column="tname" property="tname" jdbcType="VARCHAR"/>
-        <result column="mcode" property="mcode" jdbcType="VARCHAR"/>
-        <result column="version" property="version" jdbcType="VARCHAR"/>
-        <result column="munit" property="munit" jdbcType="VARCHAR"/>
-        <result column="unit" property="unit" jdbcType="VARCHAR"/>
-        <result column="texture" property="texture" jdbcType="VARCHAR"/>
-        <result column="productionPlace" property="productionPlace" jdbcType="VARCHAR"/>
-        <result column="brand" property="brand" jdbcType="VARCHAR"/>
-        <result column="mremark" property="mremark" jdbcType="VARCHAR"/>
-        <result column="gremark" property="gremark" jdbcType="VARCHAR"/>
-        <result column="gname" property="gname" jdbcType="VARCHAR"/>
-        <result column="createTime" property="createTime" jdbcType="INTEGER"/>
-        <result column="gstate" property="gstate" jdbcType="INTEGER"/>
-    </resultMap>
-
-<!--    用于组合映射-->
-    <resultMap id="groupMap" type="com.dreamchaser.depository_manage.entity.Group">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="code" property="code" jdbcType="VARCHAR"/>
-        <result column="gname" property="gname" jdbcType="VARCHAR"/>
-        <result column="remark" property="remark" jdbcType="VARCHAR"/>
-        <result column="createTime" property="createTime" jdbcType="INTEGER"/>
-        <result column="state" property="state" jdbcType="INTEGER"/>
-    </resultMap>
-
-<!--    用于组合与物料的映射-->
-    <resultMap id="materialForGroupMap" type="com.dreamchaser.depository_manage.entity.MaterialForGroup">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="mid" property="mid" jdbcType="INTEGER"/>
-        <result column="gid" property="gid" jdbcType="INTEGER"/>
-        <result column="quantity" property="quantity" jdbcType="INTEGER"/>
-        <result column="unit" property="unit" jdbcType="VARCHAR"/>
-
-    </resultMap>
-
-<!--    用于视图-->
-    <sql id="allColumnsForView">
-        id,mid,gid,quantity,mtid,shelfLife,gcode,mname,tname,mcode,version,munit,texture,productionPlace,brand,mremark,createTime,gstate,gname,unit,gremark
-    </sql>
-
-    <!--    用于组合-->
-    <sql id="allColumnsForGroup">
-        id,code,createTime,state,gname,remark
-    </sql>
-
-<!--    用于物料对于组合的映射-->
-    <sql id="allColumnsForMaterialForGroup">
-        id,mid,gid,quantity,unit
-    </sql>
-
-
-
-    <select id="findAllGroup" resultMap="groupInfoMap">
-        select
-        <include refid="allColumnsForView"/>
-        from materialforgroup
-    </select>
-
-    <select id="findGroupOnlyByCondition" resultMap="groupMap" parameterType="map">
-        select
-        <include refid="allColumnsForGroup"/>
-        from `group`
-        where   1 = 1
-        <if test="code != null and code !=''">
-            and code = #{code}
-        </if>
-        <if test="gid != null and gid != ''">
-            and id = #{gid}
-        </if>
-        <if test="createTime != null and createTime != ''">
-            and createTime = #{createTime}
-        </if>
-        <if test="state != null and state != ''">
-            and state = #{state}
-        </if>
-        <if test="gname != null and gname != ''">
-            and gname like concat('%',#{gname},'%')
-        </if>
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-
-
-
-    <select id="findGroupOnlyById" resultMap="groupMap" parameterType="int">
-        select
-        <include refid="allColumnsForGroup"/>
-        from `group`
-        where id = #{id}
-    </select>
-
-    <select id="findAllGroupOnly" resultMap="groupMap" parameterType="string">
-        select
-        <include refid="allColumnsForGroup"/>
-        from `group`
-        where state = 1
-        <if test="gname != null and gname != ''">
-            and gname like concat('%',#{gname},'%')
-        </if>
-    </select>
-
-
-    <select id="findAllGroupOnlyCount" resultType="int" parameterType="map">
-        select
-        Count(*)
-        from `group`
-        where   1 = 1
-        <if test="code != null and code !=''">
-            and code = #{code}
-        </if>
-        <if test="createTime != null and createTime != ''">
-            and createTime = #{createTime}
-        </if>
-        <if test="state != null and state != ''">
-            and state = #{state}
-        </if>
-        <if test="gname != null and gname != ''">
-            and gname like concat('%',#{gname},'%')
-        </if>
-    </select>
-
-
-    <select id="findGroupById" resultMap="groupInfoMap" parameterType="int">
-        select
-        <include refid="allColumnsForView"/>
-        from materialforgroup
-        where id = #{id}
-    </select>
-
-
-
-    <insert id="addGroup" useGeneratedKeys="true" keyProperty="id">
-         INSERT INTO `group` (
-            id, code, createTime, state,gname,remark
-        ) VALUES (
-        #{id},
-        #{code},
-        #{createTime},
-        #{state},
-        #{gname},
-        #{remark}
-        )
-    </insert>
-
-    <insert id="addGroupForMaterial">
-         INSERT INTO groupformaterial (
-            id, mid, gid, quantity,unit
-        ) VALUES (
-        #{id},
-        #{mid},
-        #{gid},
-        #{quantity},
-        #{unit}
-        )
-    </insert>
-
-
-
-    <select id="findGroupByCondition" resultMap="groupInfoMap" parameterType="map">
-        select
-        <include refid="allColumnsForView"/>
-        from materialforgroup
-        where 1 = 1
-        <if test="mid != null and mid != ''">
-            and mid = #{mid}
-        </if>
-        <if test="gid != null and gid != ''">
-            and gid = #{gid}
-        </if>
-        <if test="quantity != null">
-            and quantity = #{quantity}
-        </if>
-        <if test="gcode != null and gcode !=''">
-            and gcode = #{gcode}
-        </if>
-        <if test="mname != null and mname != ''">
-            and mname like CONCAT('%', #{mname}, '%')
-        </if>
-        <if test="mtid != null and mtid != ''">
-            and mtid = #{mtid}
-        </if>
-        <if test="tname != null and tname != ''">
-            and tname like CONCAT('%',#{tname},'%')
-        </if>
-        <if test="mcode != null and mcode != ''">
-            and mcode = #{mcode}
-        </if>
-        <if test="version != null and version != ''">
-            and version like CONCAT('%',#{version},'%')
-        </if>
-        <if test="unit != null and unit != ''">
-            and unit like CONCAT('%',#{unit},'%')
-        </if>
-        <if test="texture != null and texture != ''">
-            and texture like CONCAT('%',#{texture},'%')
-        </if>
-        <if test="shelfLife != null and shelfLife != ''">
-            and shelfLife = #{shelfLife}
-        </if>
-        <if test="productionPlace != null and productionPlace!= ''">
-            and productionPlace like CONCAT('%',#{productionPlace},'%')
-        </if>
-        <if test="brand != null and brand != ''">
-            and brand like CONCAT('%',#{brand},'%')
-        </if>
-        <if test="remark != null and remark != ''">
-            and remark like CONCAT('%',remark,'%')
-        </if>
-        <if test="createTime != null and createTime != ''">
-            and createTime = #{createTime}
-        </if>
-        <if test="gstate != null and gstate != ''">
-            and gstate = #{gstate}
-        </if>
-        <if test="gname != null and gname != ''">
-            and gname = #{gname}
-        </if>
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-
-
-    <select id="findGroupInfoByGid" resultMap="groupInfoMap" parameterType="int">
-        select
-        <include refid="allColumnsForView"/>
-        from materialforgroup
-        where gid = #{gid}
-    </select>
-
-    <select id="findGroupByGids" resultMap="groupMap" parameterType="list">
-        select
-        <include refid="allColumnsForGroup"/>
-        from `group`
-        where id in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
-
-    <select id="findGroupCountByCondition" parameterType="map" resultType="int">
-        select
-        count(*)
-        from materialforgroup
-        where 1 = 1
-        <if test="mid != null and mid != ''">
-            and mid = #{mid}
-        </if>
-        <if test="gid != null and gid != ''">
-            and gid = #{gid}
-        </if>
-        <if test="quantity != null">
-            and quantity = #{quantity}
-        </if>
-        <if test="gcode != null and gcode !=''">
-            and gcode = #{gcode}
-        </if>
-        <if test="mname != null and mname != ''">
-            and mname like CONCAT('%', #{mname}, '%')
-        </if>
-        <if test="mtid != null and mtid != ''">
-            and mtid = #{mtid}
-        </if>
-        <if test="tname != null and tname != ''">
-            and tname like CONCAT('%',#{tname},'%')
-        </if>
-        <if test="mcode != null and mcode != ''">
-            and mcode = #{mcode}
-        </if>
-        <if test="version != null and version != ''">
-            and version like CONCAT('%',#{version},'%')
-        </if>
-        <if test="unit != null and unit != ''">
-            and unit like CONCAT('%',#{unit},'%')
-        </if>
-        <if test="texture != null and texture != ''">
-            and texture like CONCAT('%',#{texture},'%')
-        </if>
-        <if test="shelfLife != null and shelfLife != ''">
-            and shelfLife = #{shelfLife}
-        </if>
-        <if test="productionPlace != null and productionPlace!= ''">
-            and productionPlace like CONCAT('%',#{productionPlace},'%')
-        </if>
-        <if test="brand != null and brand != ''">
-            and brand like CONCAT('%',#{brand},'%')
-        </if>
-        <if test="remark != null and remark != ''">
-            and remark like CONCAT('%',remark,'%')
-        </if>
-        <if test="createTime != null and createTime != ''">
-            and createTime = #{createTime}
-        </if>
-        <if test="gstate != null and gstate != ''">
-            and gstate = #{gstate}
-        </if>
-    </select>
-
-    <update id="updateMaterialForGroup">
-        update
-        groupformaterial
-        <set>
-            <if test="gid != null and gid != ''">
-                gid = #{gid},
-            </if>
-            <if test="mid != null and mid != ''">
-                mid = #{mid},
-            </if>
-            <if test="quantity != null and quantity != ''">
-                quantity = #{quantity},
-            </if>
-            <if test="unit != null">
-                unit = #{unit}
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <select id="findQrCodeByGid" parameterType="int" resultType="String">
-        select code
-        from gidandcode
-        where gid = #{gid}
-    </select>
-
-    <insert id="addQrCodeByGroup">
-        insert into gidandcode(id,gid,code)
-        values (
-        #{id},
-        #{gid},
-        #{code}
-        )
-    </insert>
-
-
-    <update id="updateGroupOnly">
-        update
-        `group`
-        <set>
-            <if test="code != null and code != ''">
-                code = #{code},
-            </if>
-            <if test="createTime != null and createTime != ''">
-                createTime = #{createTime},
-            </if>
-            <if test="state != null and state != ''">
-                state = #{state},
-            </if>
-            <if test="gname != null and gname !=''">
-                gname = #{gname},
-            </if><if test="remark != null and remark !=''">
-                remark = #{remark}
-        </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <delete id="delMaterialForGroupById" parameterType="int">
-        delete from groupformaterial  where id = #{id}
-    </delete>
-
-
-    <delete id="delMaterialForGroupByIds" parameterType="list">
-        delete from groupformaterial  where id in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <delete id="delGroup" parameterType="int">
-        delete from `group`  where id = #{id}
-    </delete>
-
-    <select id="findGroupByCode" parameterType="String" resultMap="groupMap">
-        select
-        <include refid="allColumnsForGroup"/>
-        from `group`
-        where code = #{code}
-    </select>
-
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml

@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<!-- material_type -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.MaterialTypeMapper">
-    <!-- This code was generated by TableGo tools, mark 1 begin. -->
-    <!-- 字段映射 -->
-    <resultMap id="materialTypeMap" type="com.dreamchaser.depository_manage.entity.MaterialType">
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="tname" property="tname" jdbcType="VARCHAR"/>
-        <result column="introduce" property="introduce" jdbcType="VARCHAR"/>
-        <result column="state" property="state" jdbcType="INTEGER"/>
-        <result column="parentId" property="parentId" jdbcType="INTEGER"/>
-        <result column="oldId" property="oldId" jdbcType="INTEGER"/>
-    </resultMap>
-    <!-- 表查询字段 -->
-    <sql id="allColumns">
-        mt.id, mt.tname, mt.introduce, mt.state,mt.parentId,mt.oldId
-    </sql>
-    <!-- This code was generated by TableGo tools, mark 2 end. -->
-
-    <!-- 查询所有数据 -->
-    <select id="findMaterialTypeAll" resultMap="materialTypeMap">
-        SELECT
-        <include refid="allColumns"/>
-        FROM material_type mt
-        where mt.state != 3 and mt.state != 4
-    </select>
-    <!-- 查询所有顶级父类 -->
-    <select id="findMaterialTypeNoParent" resultMap="materialTypeMap">
-        select
-        <include refid="allColumns"/>
-        FROM material_type mt
-        where mt.state = 1 and mt.parentId = 0
-    </select>
-
-    <select id="findMaterialTypeCountByCondition" resultType="int" parameterType="map">
-        select count(*)
-        FROM material_type mt WHERE 1 = 1
-        <if test="tname != null and tname != ''">
-            AND mt.tname LIKE CONCAT('%', #{tname}, '%')
-        </if>
-        <if test="introduce != null and introduce != ''">
-            AND mt.introduce LIKE CONCAT('%', #{introduce}, '%')
-        </if>
-        <if test="state != null and state != ''">
-            and mt.state = #{state}
-        </if>
-        <if test="parentId != null">
-            and mt.parentId = #{parentId}
-        </if>
-        <if test="oldId != null">
-            and mt.oldId = #{oldId}
-        </if>
-        and mt.state != 3 and mt.state != 4
-    </select>
-    <!-- 根据条件参数查询数据列表 -->
-    <select id="findMaterialTypeByCondition" resultMap="materialTypeMap" parameterType="map">
-        SELECT
-        <include refid="allColumns"/>
-        FROM material_type mt WHERE 1 = 1
-        <if test="tname != null and tname != ''">
-            AND mt.tname LIKE CONCAT('%', #{tname}, '%')
-        </if>
-        <if test="introduce != null and introduce != ''">
-            AND mt.introduce LIKE CONCAT('%', #{introduce}, '%')
-        </if>
-        <if test="state != null and state != ''">
-            and mt.state = #{state}
-        </if>
-        <if test="parentId != null">
-            and mt.parentId = #{parentId}
-        </if>
-        <if test="oldId != null">
-            and mt.oldId = #{oldId}
-        </if>
-
-        and mt.state != 3 and mt.state != 4
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-
-    <!-- 根据主键查询数据 -->
-    <select id="findMaterialTypeNameById" resultType="string" parameterType="integer">
-        SELECT
-        mt.tname
-        FROM material_type mt WHERE mt.id = #{id}
-    </select>
-
-    <!-- 根据物料类型id查询数据 -->
-    <select id="findMaterialTypeNameByOldId" resultType="string" parameterType="long">
-        SELECT
-        mt.tname
-        FROM material_type mt WHERE mt.oldId = #{oldId}
-    </select>
-
-    <!-- 根据父类查询数据 -->
-    <select id="findMaterialTypeByParent" resultMap="materialTypeMap" parameterType="long">
-        SELECT
-        <include refid="allColumns"/>
-        FROM material_type mt
-        WHERE mt.parentId = #{parentId}
-    </select>
-
-    <!-- 根据主键批量获取数据 -->
-    <select id="findMaterialTypeByOldIds" resultMap="materialTypeMap" parameterType="list">
-        SELECT
-        <include refid="allColumns"/>
-        FROM material_type mt
-        WHERE mt.oldId in
-        <foreach collection="list" index="index" item="item" open="("
-                 separator="," close=")">
-            #{item}
-        </foreach>
-    </select>
-
-
-    <!-- 根据主键查询数据 -->
-    <select id="findMaterialTypeById" resultMap="materialTypeMap" parameterType="object">
-        SELECT
-        <include refid="allColumns"/>
-        FROM material_type mt WHERE mt.oldId = #{id} and mt.state != 3 and mt.state != 4
-    </select>
-    <select id="findMaterialTypeByName" resultMap="materialTypeMap" parameterType="string">
-        SELECT
-        <include refid="allColumns"/>
-        FROM material_type mt WHERE mt.tname = #{name} and mt.state != 3 and mt.state != 4
-    </select>
-
-    <!-- 根据主键查询数据 -->
-    <select id="findMaterialTypeByOldId" resultMap="materialTypeMap" parameterType="long">
-        SELECT
-        <include refid="allColumns"/>
-        FROM material_type mt WHERE mt.oldId = #{oldId} and mt.state != 3 and mt.state != 4
-    </select>
-    <!-- 根据主键查询数据
-         <select id="findMaterialTypeByIds" resultMap="materialTypeMap" parameterType="list">
-        SELECT
-        <include refid="allColumns" />
-        FROM material_type mt WHERE mt.id IN
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>-->
-
-
-    <!-- 插入数据 -->
-    <insert id="insertMaterialType" parameterType="map">
-        INSERT INTO material_type (
-            id, tname, introduce,parentId,oldId
-        ) VALUES (
-            #{id},
-            #{tname},
-            #{introduce},
-            #{parentId},
-            #{oldId}
-        )
-    </insert>
-
-    <!-- 批量插入数据
-         <insert id="insertMaterialTypes" parameterType="list">
-        INSERT INTO material_type (
-            id, tname, introduce
-        ) VALUES
-        <foreach collection="list" index="index" item="item" separator=",">
-            (
-                #{item.id},
-                #{item.tname},
-                #{item.introduce}
-            )
-        </foreach>
-    </insert>-->
-
-
-    <!-- 修改数据 -->
-    <update id="updateMaterialType" parameterType="map">
-        UPDATE material_type
-        <set>
-            <if test="tname != null">
-                tname = #{tname},
-            </if>
-            <if test="introduce != null">
-                introduce = #{introduce},
-            </if>
-            <if test="state != null">
-                state = #{state},
-            </if>
-            <if test="parentId != null">
-                parentId = #{parentId}
-            </if>
-        </set>
-        WHERE oldId = #{id}
-    </update>
-
-    <!-- 批量修改数据 -->
-    <update id="updateMaterialTypes" parameterType="list">
-        <foreach collection="list" index="index" item="item" separator=";">
-            UPDATE material_type
-            <set>
-                <if test="item.tname != null">
-                    tname = #{item.tname},
-                </if>
-                <if test="item.introduce != null">
-                    introduce = #{item.introduce}
-                </if>
-                <if test="state != null">
-                    state = #{state}
-                </if>
-                <if test="parentId != null">
-                    parentId = #{parentId}
-                </if>
-            </set>
-            WHERE oldId = #{item.id}
-        </foreach>
-    </update>
-
-
-    <!-- 根据主键删除数据 -->
-    <delete id="deleteMaterialTypeById" parameterType="object">
-        DELETE FROM material_type WHERE oldId = #{id}
-    </delete>
-
-    <!--     根据主键批量删除数据-->
-    <delete id="deleteMaterialTypeByIds" parameterType="list">
-        DELETE FROM material_type WHERE oldId IN
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <!-- 根据主键将状态改为删除-->
-    <update id="changeStateToDeletedById" parameterType="int">
-        update material_type
-        <set>
-            state = 3
-        </set>
-        where oldId = #{id}
-    </update>
-
-
-    <!-- 根据主键批量将状态改为删除-->
-    <update id="changeStateToDeletedByIds" parameterType="list">
-        update material_type
-        <set>
-            state = 3
-        </set>
-        where oldId in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-
-    <update id="updateStateByParam" parameterType="map">
-        update material_type
-        <set>
-            state = #{state}
-        </set>
-        where id = #{id}
-        <if test="oldState != null">
-            and state = #{oldState}
-        </if>
-        and state != 3 and state != 4
-    </update>
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/NoticeMapper.xml

@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<!-- notice -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.NoticeMapper">
-    <!-- This code was generated by TableGo tools, mark 1 begin. -->
-    <!-- 字段映射 -->
-    <resultMap id="noticeMap" type="com.dreamchaser.depository_manage.entity.Notice">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="title" property="title" jdbcType="VARCHAR" />
-        <result column="content" property="content" jdbcType="VARCHAR" />
-        <result column="viewRangeId" property="viewRangeId" jdbcType="VARCHAR" />
-        <result column="time" property="time" jdbcType="INTEGER" />
-        <result column="state" property="state" jdbcType="INTEGER" />
-        <result column="userId" property="userId" jdbcType="INTEGER" />
-        <result column="readId" property="readId" jdbcType="INTEGER" />
-    </resultMap>
-
-    <!-- 表查询字段 -->
-    <sql id="allColumns">
-        n.id, n.title, n.content, n.time,n.state,n.userId,n.viewRangeId
-    </sql>
-
-    <sql id="allColumnsForView">
-        id,title,content,time,userId,state,viewRangeId,uid,readState,readTime,readId
-    </sql>
-
-    <!-- 查询所有 -->
-    <select id="findNoticeAll" resultMap="noticeMap">
-        SELECT
-            <include refid="allColumns" />
-        FROM notice n
-    </select>
-
-    <!-- 根据条件参数查询列表 -->
-    <select id="findNoticeByCondition" resultMap="noticeMap" parameterType="map">
-        SELECT
-            <include refid="allColumns" />
-        FROM notice n WHERE 1 = 1
-        <if test="title != null and title != ''">
-            AND n.title LIKE CONCAT('%', #{title}, '%')
-        </if>
-        <if test="content != null and content != ''">
-            AND n.content LIKE CONCAT('%', #{content}, '%')
-        </if>
-        <if test="startDate != null and startDate != ''">
-            AND n.time &gt;= #{startDate}
-        </if>
-        <if test="endDate != null and endDate != ''">
-            AND n.time &lt;= #{endDate}
-        </if>
-        <if test="userId != null and userId != ''">
-            and n.userId = #{userId}
-        </if>
-        <if test="state != null and state != ''">
-            and n.state = #{state}
-        </if>
-        order by n.time DESC
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-
-
-
-    <select id="findNoticeByUser" resultMap="noticeMap" parameterType="map">
-        select
-        <include refid="allColumnsForView"/>
-        from noticeInfo
-        where 1 = 1
-        <if test="title != null and title != ''">
-            AND title LIKE CONCAT('%', #{title}, '%')
-        </if>
-        <if test="content != null and content != ''">
-            AND content LIKE CONCAT('%', #{content}, '%')
-        </if>
-        <if test="startDate != null and startDate != ''">
-            AND time &gt;= #{startDate}
-        </if>
-        <if test="endDate != null and endDate != ''">
-            AND time &lt;= #{endDate}
-        </if>
-        <if test="userId != null and userId != ''">
-            and uid = #{userId}
-        </if>
-        <if test="state != null and state != ''">
-            and state = #{state}
-        </if>
-        <if test="readState != null and readState != ''">
-            and readState = #{readState}
-        </if>
-        order by time DESC
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-
-    <select id="findNoticeById" resultMap="noticeMap" parameterType="int">
-        SELECT
-        <include refid="allColumns" />
-        FROM notice n WHERE n.id = #{id}
-    </select>
-
-    <!-- 根据主键查询信息 -->
-    <select id="findNoticeByIds" resultMap="noticeMap" parameterType="list">
-        SELECT
-            <include refid="allColumns" />
-        FROM notice n WHERE n.id IN
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
-
-    <!-- 新增信息 -->
-    <insert id="addNotice" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO notice (
-             title, content, time,userId,state,viewRangeId
-        ) VALUES (
-            #{title},
-            #{content},
-            #{time},
-            #{userId},
-            #{state},
-            #{viewRangeId}
-        )
-    </insert>
-
-    <insert id="addNoticeRead">
-        INSERT INTO noticeread (
-             id, nid, uid,state,readTime
-        )
-        values
-        <foreach collection="list" index="index" item="item" separator=",">
-        (
-        #{id},
-        #{nid},
-        #{item},
-        #{state},
-        #{readTime}
-        )
-    </foreach>
-    </insert>
-
-
-
-
-
-
-    <!-- 批量新增信息 -->
-    <insert id="addNotices" parameterType="list">
-        INSERT INTO notice (
-            id, title, content, time,userId,state,viewRangeId
-        ) VALUES
-        <foreach collection="list" index="index" item="item" separator=",">
-            (
-                #{item.id},
-                #{item.title},
-                #{item.content},
-                #{item.time},
-                #{item.userId},
-                #{item.state},
-                #{item.viewRangeId}
-            )
-        </foreach>
-    </insert>
-
-
-    <!--    修改信息-->
-    <update id="updateNotice">
-        update notice
-        <set>
-            <if test="title != null and title !=''">
-                title = #{title},
-            </if>
-            <if test="content != null">
-                content = #{content},
-            </if>
-            <if test="time != null and time != ''">
-                time = #{time},
-            </if>
-            <if test="state != null and state != ''">
-                state = #{state},
-            </if>
-            <if test="viewRangeId != null and viewRangeId != ''">
-                viewRangeId = #{viewRangeId}
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-
-    <update id="readNoticeForUser">
-        update noticeread
-        <set>
-            <if test="nid != null and nid != ''">
-                nid = #{nid},
-            </if>
-            <if test="state != '' and state != null">
-                state = #{state},
-            </if>
-            <if test="uid != null and uid != ''">
-                uid = #{uid},
-            </if>
-            <if test="state != null and state != ''">
-                state = #{state},
-            </if>
-            <if test="readTime != null and readTime != ''">
-                readTime = #{readTime}
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <!-- 批量修改信息 -->
-    <update id="updateNotices" parameterType="list">
-        <foreach collection="list" index="index" item="item" separator=";">
-            UPDATE notice
-            <set>
-                <if test="item.title != null">
-                    title = #{item.title},
-                </if>
-                <if test="item.content != null">
-                    content = #{item.content},
-                </if>
-                <if test="item.time != null">
-                    time = #{item.time},
-                </if>
-                <if test="item.state != null and item.state != ''">
-                    state = #{item.state},
-                </if>
-                <if test="item.viewRangeId != null and item.viewRangeId != ''">
-                    viewRangeId = #{item.viewRangeId}
-                </if>
-            </set>
-            WHERE id = #{item.id}
-        </foreach>
-    </update>
-
-    <!-- 根据主键删除 -->
-    <delete id="deleteNoticeById" parameterType="int">
-        DELETE FROM notice WHERE id = #{id}
-    </delete>
-
-    <!-- 根据主键批量删除 -->
-    <delete id="deleteNoticeByIds" parameterType="list">
-        DELETE FROM notice WHERE id IN
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml

@@ -1,513 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<!-- notice -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.PlaceMapper">
-    <!-- This code was generated by TableGo tools, mark 1 begin. -->
-    <!-- 字段映射 -->
-    <resultMap id="placeMap" type="com.dreamchaser.depository_manage.entity.Place">
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="x" property="x" jdbcType="INTEGER"/>
-        <result column="y" property="y" jdbcType="INTEGER"/>
-        <result column="z" property="z" jdbcType="INTEGER"/>
-        <result column="mid" property="mid" jdbcType="INTEGER"/>
-        <result column="did" property="did" jdbcType="INTEGER"/>
-        <result column="code" property="code" jdbcType="VARCHAR"/>
-        <result column="kingdeecode" property="kingdeecode" jdbcType="VARCHAR"/>
-        <result column="min" property="min" jdbcType="INTEGER"/>
-        <result column="max" property="max" jdbcType="INTEGER"/>
-        <result column="state" property="state" jdbcType="INTEGER"/>
-        <result column="quantity" property="quantity" jdbcType="INTEGER"/>
-        <result column="flagForType" property="flagForType" jdbcType="INTEGER"/>
-    </resultMap>
-
-    <resultMap id="materialAndPlaceMap" type="com.dreamchaser.depository_manage.entity.MaterialAndPlace">
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="mid" property="mid" jdbcType="INTEGER"/>
-        <result column="pid" property="pid" jdbcType="INTEGER"/>
-        <result column="did" property="did" jdbcType="INTEGER"/>
-        <result column="quantity" property="quantity" jdbcType="INTEGER"/>
-        <result column="max" property="max" jdbcType="INTEGER"/>
-        <result column="min" property="min" jdbcType="INTEGER"/>
-        <result column="code" property="code" jdbcType="VARCHAR"/>
-        <result column="kingdeecode" property="kingdeecode" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <resultMap id="MaterialAndPlaceForViewMap" type="com.dreamchaser.depository_manage.pojo.MaterialAndPlaceForViewP">
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="mid" property="mid" jdbcType="INTEGER"/>
-        <result column="pid" property="pid" jdbcType="INTEGER"/>
-        <result column="type_id" property="type_id" jdbcType="INTEGER"/>
-        <result column="iid" property="iid" jdbcType="INTEGER"/>
-        <result column="depository_id" property="depository_id" jdbcType="INTEGER"/>
-        <result column="inventory" property="inventory" jdbcType="INTEGER"/>
-        <result column="price" property="price" jdbcType="INTEGER"/>
-        <result column="dcode" property="dcode" jdbcType="VARCHAR"/>
-        <result column="dname" property="dname" jdbcType="VARCHAR"/>
-        <result column="pcode" property="pcode" jdbcType="VARCHAR"/>
-        <result column="texture" property="texture" jdbcType="VARCHAR"/>
-        <result column="unit" property="unit" jdbcType="VARCHAR"/>
-        <result column="version" property="version" jdbcType="VARCHAR"/>
-        <result column="mcode" property="mcode" jdbcType="VARCHAR"/>
-        <result column="tname" property="tname" jdbcType="VARCHAR"/>
-        <result column="mname" property="mname" jdbcType="VARCHAR"/>
-        <result column="adminorg" property="adminorg" jdbcType="VARCHAR"/>
-        <result column="kingdeecode" property="kingdeecode" jdbcType="VARCHAR"/>
-        <result column="mbrand" property="mbrand" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <!-- 表查询字段 -->
-    <sql id="allColumns">
-        p.id,p.x,p.y,p.z,p.code,p.mid,p.did,p.min,p.max,p.state,p.quantity,p.flagForType,p.kingdeecode
-    </sql>
-
-    <sql id="allColumnsByMaterialAndPlace">
-       mp.id,mp.mid,mp.pid,mp.quantity,p.code,p.max,p.min,p.did
-    </sql>
-
-    <sql id="allColumnsForView">
-        depository_id,mname,type_id,tname,mcode,version,price,unit,texture,pcode,dname,adminorg,dcode,iid,inventory,id,pid,mid,kingdeecode,mbrand
-    </sql>
-
-
-    <!-- 查询所有 -->
-    <select id="findPlaceAll" resultMap="placeMap">
-        SELECT
-        <include refid="allColumns"/>
-        FROM place p
-        where p.state != 3
-    </select>
-
-    <select id="findPlaceByMidAndDid" resultMap="placeMap" parameterType="map">
-        SELECT
-        <include refid="allColumns"/>
-        from materialandplace mp left join place p on p.id = mp.pid
-        where 1 = 1
-
-        <if test="mid != null and mid != ''">
-            and mp.mid = #{mid}
-        </if>
-        <if test="did != null and did != ''">
-            and ( p.did = #{did} or p.did = 0)
-        </if>
-        and p.state != 3
-    </select>
-
-    <select id="findPlaceByDidAndCode" resultMap="placeMap" parameterType="map">
-        SELECT
-        <include refid="allColumns"/>
-        FROM place p WHERE 1 = 1
-        <if test="code != '' and code != null">
-            and p.code = #{code}
-        </if>
-        <if test="kingdeecode != '' and kingdeecode != null">
-            and p.kingdeecode = #{kingdeecode}
-        </if>
-        <if test="did != '' and did != null">
-            and p.did = #{did}
-        </if>
-        and p.state != 3
-    </select>
-
-    <select id="findPlaceAndMaterialByDidAndMid" resultMap="MaterialAndPlaceForViewMap" parameterType="map">
-        select
-        <include refid="allColumnsForView"/>
-        FROM materialandplaceinfo WHERE 1 = 1
-        <if test="mid != '' and mid != null">
-            and mid = #{mid}
-        </if>
-        <if test="depositoryId != null and depositoryId != ''">
-            and depository_id = #{depositoryId}
-        </if>
-        and pstate != 3
-    </select>
-
-    <select id="findPlaceAndMaterialByDidsAndMid" resultMap="MaterialAndPlaceForViewMap" parameterType="map">
-        select
-        <include refid="allColumnsForView"/>
-        FROM materialandplaceinfo WHERE 1 = 1
-        <if test="mid != '' and mid != null">
-            and mid = #{mid}
-        </if>
-        and depository_id in
-        <foreach collection="list" index="index" item="did" open="(" separator="," close=")">
-            #{did}
-        </foreach>
-        and pstate != 3
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-
-
-    <select id="findPlaceAndMaterialForViewById" resultMap="MaterialAndPlaceForViewMap" parameterType="int">
-        select
-        <include refid="allColumnsForView"/>
-        FROM materialandplaceinfo WHERE id = #{id}
-    </select>
-
-
-    <select id="findPlaceAndMaterialCountByDidsAndMid" resultType="int" parameterType="map">
-        select
-        COUNT(*)
-        FROM materialandplaceinfo WHERE 1 = 1
-        <if test="mid != '' and mid != null">
-            and mid = #{mid}
-        </if>
-        and depository_id in
-        <foreach collection="list" index="index" item="did" open="(" separator="," close=")">
-            #{did}
-        </foreach>
-        and pstate != 3
-    </select>
-
-    <select id="findPlaceAndMaterialByCondition" parameterType="map" resultMap="MaterialAndPlaceForViewMap">
-        select
-        <include refid="allColumnsForView"/>
-        FROM materialandplaceinfo WHERE 1 = 1
-        <if test="depositoryId != null and depositoryId != ''">
-            and depository_id = #{depositoryId}
-        </if>
-        <if test="placeId != null and placeId != ''">
-            and pid = #{placeId}
-        </if>
-        <if test="mcode != null and mcode != ''">
-            and mcode = #{mcode}
-        </if>
-        <if test="mname != null and mname != ''">
-            and mname like CONCAT('%',#{mname},'%')
-        </if>
-        and pstate != 3
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-
-
-    <select id="findPlaceAndMaterialCountByCondition" parameterType="map" resultType="int">
-        select
-        count(*)
-        FROM materialandplaceinfo WHERE 1 = 1
-        <if test="depositoryId != null and depositoryId != ''">
-            and depository_id = #{depositoryId}
-        </if>
-        <if test="placeId != null and placeId != ''">
-            and pid = #{placeId}
-        </if>
-        <if test="mcode != null and mcode != ''">
-            and mcode = #{mcode}
-        </if>
-        <if test="mname != null and mname != ''">
-            and mname like CONCAT('%',#{mname},'%')
-        </if>
-        and pstate != 3
-    </select>
-
-    <!-- 根据条件参数查询列表 -->
-    <select id="findPlaceByCondition" resultMap="placeMap" parameterType="map">
-        SELECT
-        <include refid="allColumns"/>
-        FROM place p WHERE 1 = 1
-        <if test="id != null and id != ''">
-            and p.id = #{id}
-        </if>
-        <if test="x != null and x != ''">
-            AND p.x = #{x}
-        </if>
-        <if test="y != null and y != ''">
-            AND p.y = #{y}
-        </if>
-        <if test="z != null and z != ''">
-            AND p.z = #{z}
-        </if>
-        <if test="code != null and code != ''">
-            AND p.code LIKE CONCAT('%', #{code}, '%')
-        </if>
-        <if test="kingdeecode != '' and kingdeecode != null">
-            and p.kingdeecode = #{kingdeecode}
-        </if>
-        <if test="mid != null and mid != ''">
-            AND find_in_set(#{mid},p.mid)
-        </if>
-        <if test="did != null and did != ''">
-            AND p.did = #{did}
-        </if>
-        <if test="max != null and max != ''">
-            AND p.max = #{max}
-        </if>
-        <if test="min != null and min != ''">
-            AND p.min = #{min}
-        </if>
-        <if test="state != null and state != ''">
-            and p.state = #{state}
-        </if>
-        and p.state != 3
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-
-    <select id="findTrayByDepositoryId" resultMap="placeMap" parameterType="int">
-        SELECT
-        <include refid="allColumns"/>
-        FROM place p WHERE 1 = 1
-        <if test="did != null and did != ''">
-            AND p.did = #{did}
-        </if>
-        and p.flagForType = 2
-    </select>
-
-    <select id="findPlaceCountByCondition" parameterType="map" resultType="int">
-        SELECT
-        count(*)
-        FROM place p WHERE 1 = 1
-        <if test="id != null and id != ''">
-            and p.id = #{id}
-        </if>
-        <if test="x != null and x != ''">
-            AND p.x = #{x}
-        </if>
-        <if test="y != null and y != ''">
-            AND p.y = #{y}
-        </if>
-        <if test="code != null and code != ''">
-            AND p.code LIKE CONCAT('%', #{code}, '%')
-        </if>
-        <if test="kingdeecode != '' and kingdeecode != null">
-            and p.kingdeecode LIKE CONCAT('%', #{kingdeecode}, '%')
-        </if>
-        <if test="z != null and z != ''">
-            AND p.z = #{z}
-        </if>
-        <if test="mid != null and mid != ''">
-            AND p.mid = #{mid}
-        </if>
-        <if test="did != null and did != ''">
-            AND p.did = #{did}
-        </if>
-        <if test="max != null and max != ''">
-            AND p.max = #{max}
-        </if>
-        <if test="min != null and min != ''">
-            AND p.min = #{min}
-        </if>
-        <if test="state != null and state != ''">
-            and p.state = #{state}
-        </if>
-        and p.state != 3
-    </select>
-
-    <select id="findPlaceByDid" parameterType="int" resultMap="placeMap">
-        SELECT
-        <include refid="allColumns"/>
-        FROM place p WHERE 1 = 1 and p.did = #{did} and p.state != 3
-    </select>
-
-
-    <select id="findPlaceByMid" parameterType="int" resultMap="placeMap">
-        SELECT
-        <include refid="allColumns"/>
-        FROM materialandplace mp left join place p on p.id = mp.pid WHERE 1 = 1 and mp.mid = #{mid} and p.state != 3
-    </select>
-
-    <select id="findQuantityByMidAndPid" parameterType="map" resultType="int">
-        select quantity
-        from materialandplace
-        where pid = #{pid} and mid = #{mid}
-    </select>
-
-    <!-- 根据主键查询信息 -->
-    <select id="findPlaceById" resultMap="placeMap" parameterType="int">
-        SELECT
-        <include refid="allColumns"/>
-        FROM place p WHERE p.id = #{id}
-    </select>
-
-
-    <select id="findPlaceByIdS" resultMap="placeMap" parameterType="list">
-        SELECT
-        <include refid="allColumns"/>
-        FROM place p WHERE p.id in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
-
-
-
-    <select id="findPlaceAndMaterialByPid" resultMap="materialAndPlaceMap" parameterType="int">
-        SELECT
-        <include refid="allColumnsByMaterialAndPlace"/>
-        FROM materialandplace mp left join place p on p.id = mp.pid WHERE 1 = 1 and p.id = #{id} and p.state != 3
-    </select>
-
-
-    <select id="findPlaceAndMaterialByMidAndPid" resultMap="materialAndPlaceMap" parameterType="map">
-        SELECT
-        <include refid="allColumnsByMaterialAndPlace"/>
-        FROM materialandplace mp left join place p on p.id = mp.pid
-        where 1 = 1
-        <if test="mid != null">
-            and mp.mid = #{mid}
-        </if>
-        <if test="pid != null">
-            and mp.pid = #{pid}
-        </if>
-        and p.state != 3
-    </select>
-    <select id="findPlaceAndMaterialById" resultMap="materialAndPlaceMap" parameterType="int">
-        SELECT
-        <include refid="allColumnsByMaterialAndPlace"/>
-        FROM materialandplace mp left join place p on p.id = mp.pid
-        where mp.id = #{id} and p.state != 3
-    </select>
-
-
-    <!-- 新增信息 -->
-    <insert id="InsertPlace">
-        INSERT INTO place (
-             id,x,y,z,code, mid,did,min,max,state,quantity,flagForType,kingdeecode
-        ) VALUES (
-            #{id},
-            #{x},
-            #{y},
-            #{z},
-            #{code},
-            #{mid},
-            #{did},
-            #{min},
-            #{max},
-            #{state},
-            #{quantity},
-            #{flagType},
-            #{kingdeecode}
-        )
-    </insert>
-
-    <insert id="addMaterialOnPlace" parameterType="map" useGeneratedKeys="true" keyProperty="id">
-        insert  into materialandplace(id,mid,pid,quantity)
-        values (
-        #{id},
-        #{mid},
-        #{pid},
-        #{quantity}
-        )
-    </insert>
-
-    <delete id="delMaterialOnPlace" parameterType="int">
-        DELETE FROM materialandplace WHERE id = #{id}
-    </delete>
-
-    <!-- 修改信息 -->
-    <update id="UpdatePlace">
-        UPDATE place
-        <set>
-            <if test="x != null">
-                x = #{x},
-            </if>
-            <if test="y != null">
-                y = #{y},
-            </if>
-            <if test="z != null">
-                z = #{z},
-            </if>
-            <if test="code != null">
-                code = #{code},
-            </if>
-             <if test="kingdeecode != null">
-                 kingdeecode = #{kingdeecode},
-            </if>
-            <if test="mid != null">
-                mid = #{mid},
-            </if>
-            <if test="did != null">
-                did = #{did},
-            </if>
-            <if test="min != null">
-                min = #{min},
-            </if>
-            <if test="max != null">
-                max = #{max},
-            </if>
-            <if test="state != null and state !=''">
-                state = #{state},
-            </if>
-            <if test="quantity != null">
-                quantity = #{quantity}
-            </if>
-        </set>
-        WHERE id = #{id}
-    </update>
-
-    <update id="updateMaterialAndPlace">
-        update materialandplace
-        <set>
-            <if test="mid != null">
-                mid = #{mid},
-            </if>
-            <if test="quantity != null">
-                quantity = #{quantity},
-            </if>
-            <if test="pid != null">
-                pid = #{pid}
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-
-    <!-- 根据主键删除 -->
-    <delete id="DelPlace" parameterType="int">
-        DELETE FROM place WHERE id = #{id}
-    </delete>
-
-
-    <!-- 根据主键批量将状态改为删除-->
-    <update id="changeStateToDeletedByIds" parameterType="list">
-        update place
-        <set>
-            state = 3
-        </set>
-        where id in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-
-    <!--     根据主键将状态改为删除-->
-    <update id="changeStateToDeletedById" parameterType="int">
-        UPDATE place
-        <set>
-            state = 3
-        </set>
-        WHERE id = #{id}
-    </update>
-
-    <!--获取当前仓库下的行-->
-    <select id="findPlaceXByDid" parameterType="int" resultType="int">
-         select  DISTINCT x from place where did = #{did}  and state != 3 and x is not null ORDER BY x desc
-    </select>
-    <!--获取当前仓库下的列-->
-    <select id="findPlaceYByDid" parameterType="map" resultType="int">
-         select  DISTINCT y from place where did = #{did} and x = #{x} and state != 3  ORDER BY y desc
-    </select>
-    <!--获取当前仓库下的ceng-->
-    <select id="findPlaceZByDid" parameterType="map" resultType="int">
-         select  DISTINCT z from place where did = #{did} and x = #{x} and state != 3 ORDER BY z desc
-    </select>
-    <select id="findPlaceCoutnByTypeForFlag" resultType="int" parameterType="map">
-        select
-        count(*)
-        from place
-        where 1 = 1
-        <if test="flag != null and flag != ''">
-            and flagForType = #{flag}
-        </if>
-        <if test="did != null and did != ''">
-            and did = #{did}
-        </if>
-
-    </select>
-
-
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/QrCodeMapper.xml

@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<!-- 产品信息记录（库存）(material) -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.QrCodeMapper">
-    <!-- This code was generated by TableGo tools, mark 1 begin. -->
-
-<!--    条形码与物料对应-->
-    <resultMap id="QrCodeAndLocationMap" type="com.dreamchaser.depository_manage.entity.PidOrDidAndCode">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="code" property="code" jdbcType="VARCHAR"/>
-        <result column="pid" property="pid" jdbcType="INTEGER"/>
-        <result column="flag" property="flag" jdbcType="INTEGER"/>
-        <result column="depositoryId" property="depositoryId" jdbcType="INTEGER"/>
-
-    </resultMap>
-
-
-
-    <!-- 表查询字段 -->
-    <sql id="allColumns">
-        pdac.id,pdac.code,pdac.pid,pdac.flag,pdac.depositoryId
-    </sql>
-
-
-    <select id="findLocationByCondition" resultType="map" resultMap="QrCodeAndLocationMap">
-        select
-        <include refid="allColumns"/>
-        from pidordidandcode pdac
-        where  1 = 1
-        <if test="id != null and id != ''">
-            and id  = #{id}
-        </if>
-        <if test="pid != null">
-            and pid = #{pid}
-        </if>
-        <if test="depositoryId != null and depositoryId != ''">
-            and depositoryId = #{depositoryId}
-        </if>
-        <if  test="flag != null and flag != ''">
-            and flag = #{flag}
-        </if>
-        <if test="qrCode != null and qrCode!=''">
-            and code = #{qrCode}
-        </if>
-
-    </select>
-
-    <insert id="addQrCodeAndMaterial" parameterType="map">
-        insert into qrcodeandmaterial(id,barCode,mcode,flag)
-        values (
-        #{id},
-        #{qrCode},
-        #{mcode},
-        2
-        )
-    </insert>
-
-
-    <insert id="addQrCodeAndMaterialForMoreOne" parameterType="map">
-        insert into qrcodeandmaterial(id,mcode,barCode,flag)
-        values
-        <foreach collection="list" index="index" item="item" separator=",">
-            (#{id},
-            #{code},
-            #{item},
-            2
-            )
-        </foreach>
-    </insert>
-
-    <select id="selectQrCodeByMcode" parameterType="string" resultType="string">
-        select barCode
-        from qrcodeandmaterial
-        where mcode = #{mcode} and flag = 2
-    </select>
-
-
-    <select id="findMaterialCodeByQrCode" parameterType="string" resultType="string">
-        select mcode
-        from qrcodeandmaterial
-        where barCode = #{qrcode} and flag = 2
-    </select>
-
-
-<!--    删除映射-->
-    <delete id="deleteQrCodeAndMaterial" parameterType="map">
-        delete
-        from qrcodeandmaterial
-        where 1 = 1
-        <if test="qrCode != null and qrCode != ''">
-            and qrcode = #{qrCode}
-        </if>
-        <if test="mcode != null and mcode != ''">
-            and mcode = #{mcode}
-        </if>
-        <if test="id != null and id != ''">
-            and id = #{id}
-        </if>
-        <if test="codeFlag != null and codeFlag != ''">
-            and flag = #{codeFlag}
-        </if>
-
-    </delete>
-
-
-    <update id="updateQrCodeType">
-        update qrcodeandmaterial
-        <set>
-            <if test="codeFlag != null and codeFlag != ''">
-                flag = #{codeFlag}
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <select id="selectQrCodeByDepositoryOrPlace" parameterType="map" resultType="string">
-        select code
-        from pidordidandcode
-        where 1 = 1
-        <if test="pid != null">
-            and pid = #{pid}
-        </if>
-        <if test="depositoryId != null and depositoryId != ''">
-            and depositoryId = #{depositoryId}
-        </if>
-        <if test="flag != null and flag != ''">
-            and flag = #{flag}
-        </if>
-    </select>
-
-
-    <insert id="addQrCodeByPidOrDid" parameterType="map">
-        insert into pidordidandcode(id,pid,depositoryId,flag,code)
-        values (
-        #{id},
-        #{pid},
-        #{depositoryId},
-        #{flag},
-        #{qrCode}
-        )
-    </insert>
-
-
-    <insert id="addQrCodeByPidOrDidForMoreOne" parameterType="map">
-        insert into pidordidandcode(id,pid,depositoryId,flag,code)
-        values
-        <foreach collection="list" index="index" item="item" separator=",">
-            ( #{id},
-            #{pid},
-            #{depositoryId},
-            #{flag},
-            #{item})
-        </foreach>
-    </insert>
-
-
-
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/RoleMapper.xml

@@ -1,426 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<!-- user -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.RoleMapper">
-    <!-- 字段映射（权限） -->
-
-    <!--    权限映射-->
-    <resultMap id="postoruserroleMap" type="com.dreamchaser.depository_manage.entity.PostOrUserRole">
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="classes" property="classes" jdbcType="INTEGER"/>
-        <result column="role" property="role" jdbcType="INTEGER"/>
-        <result column="userid" property="userid" jdbcType="INTEGER"/>
-        <result column="did" property="did" jdbcType="INTEGER"/>
-    </resultMap>
-
-    <resultMap id="depositoryAndrole" type="com.dreamchaser.depository_manage.pojo.RoleAndDepository">
-        <result column="prid" property="id" jdbcType="INTEGER"/>
-        <result column="userId" property="userId" jdbcType="INTEGER"/>
-        <result column="depositoryName" property="depositoryName" jdbcType="VARCHAR"/>
-        <result column="depositoryAddress" property="depositoryAddress" jdbcType="VARCHAR"/>
-        <result column="depositoryIntroduce" property="depositoryIntroduce" jdbcType="VARCHAR"/>
-        <result column="depositoryState" property="depositoryState" jdbcType="VARCHAR"/>
-        <result column="did" property="depositoryId" jdbcType="VARCHAR"/>
-        <result column="depositoryCode" property="depositoryCode" jdbcType="VARCHAR"/>
-        <result column="classes" property="classes" jdbcType="INTEGER"/>
-    </resultMap>
-
-    <resultMap id="materialTypeAndRole" type="com.dreamchaser.depository_manage.pojo.RoleAndMaterialType">
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="classes" property="classes" jdbcType="INTEGER"/>
-        <result column="mtid" property="mtid" jdbcType="INTEGER"/>
-        <result column="uid" property="uid" jdbcType="INTEGER"/>
-        <result column="tname" property="tname" jdbcType="VARCHAR"/>
-        <result column="mtstate" property="mtstate" jdbcType="INTEGER"/>
-        <result column="mtintroduce" property="mtintroduce" jdbcType="VARCHAR"/>
-        <result column="mtparentId" property="mtparentId" jdbcType="INTEGER"/>
-    </resultMap>
-
-    <sql id="allColumns">
-        r.id,r.name
-    </sql>
-
-    <sql id="roleNameAnddepositoryName">
-        prid,userid as userId,parentId,dname as depositoryName,address as depositoryAddress,introduce as depositoryIntroduce,state as depositoryState,did,classes,code as depositoryCode
-    </sql>
-
-    <sql id="roleNameAndMaterialTypeName">
-        id,classes,mtid,uid,tname,mtstate,mtintroduce,mtparentId
-    </sql>
-
-
-    <update id="updateUserOrPostRoleAndDepository" parameterType="map">
-        update postoruserrole
-        <set>
-            <if test="authority != null and authority != ''">
-                role = #{authority},
-            </if>
-            <if test="depositoryId != null and depositoryId != ''">
-                did = #{depositoryId}
-            </if>
-        </set>
-        where userid = #{userid}
-    </update>
-
-    <update id="UpdateRoleAndDepositoryById" parameterType="map">
-        update postoruserrole
-        <set>
-            <if test="authority != null and authority != ''">
-                role = #{authority},
-            </if>
-            <if test="depositoryId != null and depositoryId != ''">
-                did = #{depositoryId},
-            </if>
-            <if test="classes != null and classes != ''">
-                classes = #{classes}
-            </if>
-        </set>
-        where id = #{roleId}
-    </update>
-
-
-    <update id="UpdateRoleAndMaterialTypeById" parameterType="map">
-        update mtanduserrole
-        <set>
-            <if test="mtid != null and mtid != ''">
-                mtid = #{mtid},
-            </if>
-            <if test="classes != null and classes != ''">
-                classes = #{classes}
-            </if>
-        </set>
-        where id = #{roleId}
-    </update>
-
-    <insert id="addUserOrPostRoleAndDepository" parameterType="map">
-        INSERT ignore INTO postoruserrole (id, classes, role, userid, did)
-        VALUES (#{id},
-                #{classes},
-                #{authority},
-                #{userid},
-                #{depositoryId})
-    </insert>
-
-    <insert id="addUserOrPostRoleAndDepositorys" parameterType="map">
-        INSERT ignore  INTO postoruserrole (
-        id, classes, role,userid,did
-        )
-        VALUES
-        <foreach collection="depositoryIds" index="index" item="did" separator=",">
-            (#{id},
-            #{classes},
-            #{authority},
-            #{userid},
-            #{did})
-        </foreach>
-
-    </insert>
-
-    <insert id="addUserOrPostRoleAndMaterialType" parameterType="map">
-        INSERT ignore INTO mtanduserrole (id, classes, uid, mtid)
-        VALUES (#{id},
-                #{classes},
-                #{userid},
-                #{mtid})
-    </insert>
-
-    <insert id="addUserOrPostRoleAndMaterialTypes" parameterType="map">
-        INSERT ignore INTO mtanduserrole (
-        id, classes,uid,mtid
-        )
-        VALUES
-        <foreach collection="mtIds" index="index" item="mtid" separator=",">
-            (#{id},
-            #{classes},
-            #{userid},
-            #{mtid})
-        </foreach>
-
-    </insert>
-
-
-    <select id="findDepositoryAndRole" parameterType="int" resultMap="depositoryAndrole">
-        select
-        <include refid="roleNameAnddepositoryName"/>
-        from userroleanddepository
-        where userid = #{userid} and state = 1
-    </select>
-
-    <select id="findRoleByUid" parameterType="int" resultType="int">
-        select role
-        from postoruserrole
-        where userid = #{uid}
-          and classes = 1
-    </select>
-
-
-    <select id="findUserIdByDid" parameterType="int" resultType="int">
-        select userid
-        from postoruserrole
-        where 1 = 1
-          and did = #{did}
-          and classes in (1, 2)
-        group by userid
-    </select>
-
-    <select id="findUserIdByMtId" parameterType="long" resultType="int">
-        select uid
-        from mtanduserrole
-        where 1 = 1
-          and mtid = #{mtId}
-          and classes in (1, 2)
-        group by uid
-    </select>
-
-    <select id="findRoleAndDepositoryByCondition" parameterType="map" resultMap="depositoryAndrole">
-        select
-        <include refid="roleNameAnddepositoryName"/>
-        from userroleanddepository
-        where 1 = 1
-        <if test="depositoryId != null and depositoryId != ''">
-            and did = #{depositoryId}
-        </if>
-        <if test="userId != null and userId != ''">
-            and userId = #{userId}
-        </if>
-        <if test="classes != null and classes != ''">
-            and classes = #{classes}
-        </if>
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-
-
-    <select id="findRoleAndDepositoryCountByCondition" parameterType="map" resultType="int">
-        select
-        COUNT(*)
-        from userroleanddepository
-        where 1 = 1
-        <if test="depositoryId != null and depositoryId != ''">
-            and did = #{depositoryId}
-        </if>
-        <if test="userId != null and userId != ''">
-            and userid = #{userId}
-        </if>
-        <if test="uidList != null">
-            and userid in
-            <foreach collection="uidList" index="index" item="uid" open="(" separator="," close=")">
-                #{uid}
-            </foreach>
-        </if>
-        <if test="depositoryIdList != null and depositoryIdList !=''">
-            and did in
-            <foreach collection="depositoryIdList" index="index" item="did" open="(" separator="," close=")">
-                #{did}
-            </foreach>
-        </if>
-        <if test="classes != null and classes != ''">
-            and classes = #{classes}
-        </if>
-    </select>
-
-    <select id="findRoleAndMaterialTypeByCondition" parameterType="map" resultMap="materialTypeAndRole">
-        select
-        <include refid="roleNameAndMaterialTypeName"/>
-        from materialtypeanduser
-        where 1 = 1
-        <if test="mtid != null and mtid != ''">
-            and mtid = #{mtid}
-        </if>
-        <if test="uid != null and uid != ''">
-            and uid = #{uid}
-        </if>
-        <if test="classes != null and classes != ''">
-            and classes = #{classes}
-        </if>
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-    <select id="findRoleAndMaterialTypeCountByCondition" parameterType="map" resultType="int">
-        select
-        COUNT(*)
-        from materialtypeanduser
-        where 1 = 1
-        <if test="mtid != null and mtid != ''">
-            and mtid = #{mtid}
-        </if>
-        <if test="mtIdList != null and mtIdList !=''">
-            and mtid in
-            <foreach collection="mtIdList" index="index" item="mtid" open="(" separator="," close=")">
-                #{mtid}
-            </foreach>
-        </if>
-        <if test="uid != null and uid != ''">
-            and uid = #{uid}
-        </if>
-        <if test="uidList != null">
-            and uid in
-            <foreach collection="uidList" index="index" item="uid" open="(" separator="," close=")">
-                #{uid}
-            </foreach>
-        </if>
-        <if test="classes != null and classes != ''">
-            and classes = #{classes}
-        </if>
-    </select>
-
-
-    <select id="findRoleAndDepositoryById" parameterType="int" resultMap="depositoryAndrole">
-        select
-        <include refid="roleNameAnddepositoryName"/>
-        from userroleanddepository
-        where prid = #{id}
-    </select>
-
-    <select id="findRoleAndMaterialTypeById" parameterType="int" resultMap="materialTypeAndRole">
-        select
-        <include refid="roleNameAndMaterialTypeName"/>
-        from materialtypeanduser
-        where id = #{id}
-    </select>
-
-    <delete id="deleteRoleAndDepositoryById" parameterType="int">
-        delete
-        from postoruserrole
-        WHERE id = #{id}
-    </delete>
-
-    <delete id="deleteRoleAndMaterialTypeById" parameterType="int">
-        delete
-        from mtanduserrole
-        WHERE id = #{id}
-    </delete>
-
-    <insert id="addWarehouseVisiblePermission">
-        insert into depositoryopenrole (id,did,uid,`type`,`time`,userId)
-        values
-        <foreach collection="depositoryIdList" item="did" index="index" separator=",">
-            (
-            #{id},
-            #{did},
-            #{uid},
-            #{type},
-            #{time},
-            #{userId}
-            )
-        </foreach>
-        ON duplicate KEY UPDATE time=values(time),userId=values(userId)
-    </insert>
-
-    <select id="findWarehouseVisiblePermissionCountByCondition" parameterType="map" resultType="int">
-        select
-        COUNT(*)
-        from depositoryopenrole
-        where 1 = 1
-        <if test="type != null and type != ''">
-            and `type` = #{type}
-        </if>
-        <if test="userId != null and userId != ''">
-            and userId = #{userId}
-        </if>
-        and uid in
-        <foreach collection="uidList" index="index" item="uid" open="(" separator="," close=")">
-            #{uid}
-        </foreach>
-        <if test="depositoryIdList != null and depositoryIdList !=''">
-            and did in
-            <foreach collection="depositoryIdList" index="index" item="did" open="(" separator="," close=")">
-                #{did}
-            </foreach>
-        </if>
-
-    </select>
-
-    <delete id="delWarehouseVisiblePermissionByCondition" parameterType="map">
-        delete
-        from depositoryopenrole
-        where
-        `type` = #{type}
-        <if test="uidList != null and uidList !=''">
-            and uid in
-            <foreach collection="uidList" index="index" item="uid" open="(" separator="," close=")">
-                #{uid}
-            </foreach>
-        </if>
-        <if test="uid != null and uid != ''">
-            and uid = #{uid}
-        </if>
-        <if test="depositoryIdList != null and depositoryIdList != ''">
-            and did in
-            <foreach collection="depositoryIdList" index="index" item="did" open="(" separator="," close=")">
-                #{did}
-            </foreach>
-        </if>
-
-    </delete>
-
-
-    <delete id="deleteRoleAndDepositoryByCondition" parameterType="map">
-        delete from postoruserrole
-        where classes = #{classes}
-        <if test="userIdList != null and userIdList !=''">
-            and userid in
-            <foreach collection="userIdList" index="index" item="userid" open="(" separator="," close=")">
-                #{userid}
-            </foreach>
-        </if>
-        <if test="userId != null and userId != ''">
-            and userid = #{userId}
-        </if>
-        <if test="depositoryIdList != null and depositoryIdList != ''">
-            and did in
-            <foreach collection="depositoryIdList" index="index" item="did" open="(" separator="," close=")">
-                #{did}
-            </foreach>
-        </if>
-    </delete>
-
-
-    <delete id="deleteRoleAndMaterialTypeByCondition" parameterType="map">
-        delete from mtanduserrole
-        where classes = #{classes}
-        <if test="userIdList != null and userIdList !=''">
-            and uid in
-            <foreach collection="userIdList" index="index" item="userid" open="(" separator="," close=")">
-                #{userid}
-            </foreach>
-        </if>
-        <if test="uid != null and uid != ''">
-            and uid = #{uid}
-        </if>
-        <if test="materialTypeIdList != null and materialTypeIdList != ''">
-            and mtid in
-            <foreach collection="materialTypeIdList" index="index" item="mtid" open="(" separator="," close=")">
-                #{mtid}
-            </foreach>
-        </if>
-    </delete>
-
-
-    <select id="findDepositoryIdForWarehouseVisiblePermissionByCondition" parameterType="map" resultType="int">
-        select
-        did
-        from depositoryopenrole
-        where 1 = 1
-        <if test="type != null and type != ''">
-            and `type` = #{type}
-        </if>
-        and uid = #{uid}
-    </select>
-
-    <select id="findDepositoryIDCountForWarehouseVisiblePermissionByCondition" parameterType="map" resultType="int">
-        select
-        COUNT(*)
-        from depositoryopenrole
-        where 1 = 1
-        <if test="type != null and type != ''">
-            and `type` = #{type}
-        </if>
-        and uid = #{uid}
-    </select>
-
-
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/SplitUnitMapper.xml

@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<!-- user -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.SplitUnitMapper">
-    <!-- 字段映射（权限） -->
-
-<!--    权限映射-->
-    <resultMap id="splitInfoMap" type="com.dreamchaser.depository_manage.entity.SplitInfo">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="mid" property="mid" jdbcType="INTEGER" />
-        <result column="quantity" property="quantity" jdbcType="INTEGER" />
-        <result column="parentId" property="parentId" jdbcType="INTEGER" />
-        <result column="state" property="state" jdbcType="INTEGER" />
-        <result column="oldUnit" property="oldUnit" jdbcType="VARCHAR" />
-        <result column="newUnit" property="newUnit" jdbcType="VARCHAR" />
-    </resultMap>
-
-    <resultMap id="splitInventoryMap" type="com.dreamchaser.depository_manage.entity.SplitInventory">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="iid" property="iid" jdbcType="INTEGER"/>
-        <result column="sid" property="sid" jdbcType="INTEGER"/>
-        <result column="outQuantity" property="outQuantity" jdbcType="INTEGER"/>
-        <result column="inQuantity" property="inQuantity" jdbcType="INTEGER"/>
-        <result column="saveQuantity" property="saveQuantity" jdbcType="INTEGER"/>
-    </resultMap>
-
-
-    <resultMap id="splitInfoPMap" type="com.dreamchaser.depository_manage.pojo.SplitInfoP">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="mid" property="mid" jdbcType="INTEGER" />
-        <result column="quantity" property="quantity" jdbcType="INTEGER" />
-        <result column="sparentId" property="sparentId" jdbcType="INTEGER" />
-        <result column="sstate" property="sstate" jdbcType="INTEGER" />
-        <result column="mstate" property="mstate" jdbcType="INTEGER" />
-        <result column="oldUnit" property="oldUnit" jdbcType="VARCHAR" />
-        <result column="newUnit" property="newUnit" jdbcType="VARCHAR" />
-        <result column="version" property="version" jdbcType="VARCHAR" />
-        <result column="texture" property="texture" jdbcType="VARCHAR" />
-        <result column="mcode" property="mcode" jdbcType="VARCHAR" />
-        <result column="mname" property="mname" jdbcType="VARCHAR" />
-        <result column="typeName" property="typeName" jdbcType="VARCHAR" />
-        <result column="shelfLife" property="shelfLife" jdbcType="INTEGER"/>
-        <result column="productionPlace" property="productionPlace" jdbcType="VARCHAR"/>
-        <result column="brand" property="brand" jdbcType="VARCHAR"/>
-        <result column="remark" property="remark" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="splitInfoAllColumns">
-        s.id,s.mid,s.oldUnit,s.newUnit,s.quantity,s.parentId,s.state
-    </sql>
-
-    <sql id="splitInventoryAllColumns">
-        si.id,si.iid,si.sid,si.outQuantity,si.inQuantity,si.saveQuantity
-    </sql>
-
-    <sql id="splitInfoPAllColumns">
-        id,mid,oldUnit,newUnit,quantity,sparentId,sstate,shelfLife,productionPlace,brand,remark,mname,typeName,mcode,mstate,version,texture
-    </sql>
-
-    <select id="findSplitInfoByMidAndUnit" parameterType="map" resultMap="splitInfoMap">
-        select
-        <include refid="splitInfoAllColumns"/>
-        from `split` s
-        where 1 = 1
-        <if test="mid != null and mid != ''">
-            and s.mid = #{mid}
-        </if>
-        <if test="oldUnit != null and oldUnit != ''">
-            and s.oldUnit = #{oldUnit}
-        </if>
-        <if test="newUnit != null and newUnit != ''">
-            and s.newUnit = #{newUnit}
-        </if>
-    </select>
-
-    <select id="findSplitInfoById" parameterType="int" resultMap="splitInfoMap">
-        select
-        <include refid="splitInfoAllColumns"/>
-        from `split` s
-        where s.id = #{id}
-    </select>
-
-
-    <select id="findSplitInfoByMid" parameterType="int" resultMap="splitInfoMap">
-        select
-        <include refid="splitInfoAllColumns"/>
-        from `split` s
-        where s.mid = #{mid} and s.state = 1
-    </select>
-
-
-    <select id="findSplitInventoryByIidAndSid" parameterType="map" resultMap="splitInventoryMap">
-        select
-        <include refid="splitInventoryAllColumns"/>
-        from `split_inventory` si
-        where  1 = 1
-        <if test="iid != null ">
-            and si.iid = #{iid}
-        </if>
-        <if test="sid != null ">
-            and si.sid = #{sid}
-        </if>
-    </select>
-
-    <select id="findSplitInventoryByIidAndSids" parameterType="map" resultMap="splitInventoryMap">
-        select
-        <include refid="splitInventoryAllColumns"/>
-        from `split_inventory` si
-        where  1 = 1
-        <if test="iid != null ">
-            and si.iid = #{iid}
-        </if>
-        and si.sid in
-        <foreach collection="list" index="index" item="sid" open="(" separator="," close=")">
-            #{sid}
-        </foreach>
-    </select>
-
-    <select id="findSplitInventoryBySid" parameterType="int" resultMap="splitInventoryMap">
-        select
-        <include refid="splitInventoryAllColumns"/>
-        from `split_inventory` si
-        where  si.sid = #{sid}
-    </select>
-
-    <select id="findSplitInventoryByIid" parameterType="int" resultMap="splitInventoryMap">
-        select
-        <include refid="splitInventoryAllColumns"/>
-        from `split_inventory` si
-        where  si.iid = #{Iid}
-    </select>
-
-    <update id="updateSplitInfo">
-        update `split`
-        <set>
-            <if test="mid != null and mid != ''">
-                mid = #{mid},
-            </if>
-            <if test="oldUnit != null and oldUnit != ''">
-                oldUnit = #{oldUnit},
-            </if>
-            <if test="newUnit != null and newUnit != ''">
-                newUnit = #{newUnit},
-            </if>
-            <if test="quantity != null and quantity != ''">
-                quantity = #{quantity},
-            </if>
-            <if test="parentId != null and parentId != ''">
-                parentId = #{parentId},
-            </if>
-            <if test="state != null and state != ''">
-                state = #{state}
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <update id="updateSplitInventory">
-        update `split_inventory`
-        <set>
-            <if test="iid != null and iid != ''">
-                iid = #{iid},
-            </if>
-            <if test="sid != null and sid != ''">
-                sid = #{sid},
-            </if>
-            <if test="outQuantity != null">
-                outQuantity = #{outQuantity},
-            </if>
-            <if test="inQuantity != null">
-                inQuantity = #{inQuantity},
-            </if>
-            <if test="saveQuantity != null">
-                saveQuantity = #{saveQuantity},
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <insert id="addSplitInfo" parameterType="map" useGeneratedKeys="true" keyProperty="id">
-         INSERT INTO `split` (
-            id, mid, oldUnit,newUnit,quantity,parentId,state
-        ) VALUES (
-            #{id},
-            #{mid},
-            #{oldUnit},
-            #{newUnit},
-            #{quantity},
-            #{parentId},
-            #{state}
-        )
-    </insert>
-
-    <insert id="addSplitInventory" parameterType="map" useGeneratedKeys="true" keyProperty="id">
-         INSERT INTO `split_inventory` (
-            id, iid, sid,outQuantity,inQuantity,saveQuantity
-        ) VALUES (
-            #{id},
-            #{iid},
-            #{sid},
-            #{outQuantity},
-            #{inQuantity},
-            #{saveQuantity}
-        )
-    </insert>
-
-    <delete id="delSplitInfoById" parameterType="int">
-        delete  from `split`  WHERE id = #{id}
-    </delete>
-
-    <delete id="delSplitInfoByIds" parameterType="int">
-        delete from `split`
-        where id in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <delete id="delSplitInventoryById" parameterType="int">
-        delete  from `split_inventory`  WHERE id = #{id}
-    </delete>
-
-    <delete id="delSplitInventoryByIds" parameterType="int">
-        delete from `split_inventory`
-        where id in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-
-    <select id="findSplitInfoPById" parameterType="int" resultMap="splitInfoPMap">
-        select
-        <include refid="splitInfoPAllColumns"/>
-        from findsplitInfo
-        where id = #{id}
-    </select>
-
-    <select id="findSplitInfoPByCondition" parameterType="map" resultMap="splitInfoPMap">
-        select
-        <include refid="splitInfoPAllColumns"/>
-        from findsplitInfo
-        where 1 = 1
-        <if test="mname != null and mname != ''">
-            and mname like concat('%',#{mname},'%')
-        </if>
-        <if test="oldUnit != null and oldUnit != ''">
-            and oldUnit like concat('%',#{oldUnit},'%')
-        </if>
-        <if test="newUnit != null and newUnit != ''">
-            and newUnit like concat('%',#{newUnit},'%')
-        </if>
-        <if test="parent != null and parent != ''">
-            and sparent = #{parent}
-        </if>
-        <if test="mid != null and mid != ''">
-            and mid = #{mid}
-        </if>
-        <if test="typeName != null and typeName != ''">
-            and typeName like concat('%',#{typeName},'%')
-        </if>
-        <if test="version != null and version != ''">
-            and version = #{version}
-        </if>
-        <if test="texture != null and texture != ''">
-            and texture = #{texture}
-        </if>
-        <if test="mstate != null and mstate != ''">
-            and mstate = #{mstate}
-        </if>
-        <if test="sstate != null and sstate != ''">
-            and sstate = #{sstate}
-        </if>
-        <if test="mcode != null and mcode != ''">
-            and mcode = #{mcode}
-        </if>
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-
-    <select id="findSplitInfoPCountByCondition" parameterType="map" resultType="int">
-        select
-        count(*)
-        from findsplitInfo
-        where 1 = 1
-        <if test="mname != null and mname != ''">
-            and mname like concat('%',#{mname},'%')
-        </if>
-        <if test="oldUnit != null and oldUnit != ''">
-            and oldUnit like concat('%',#{oldUnit},'%')
-        </if>
-        <if test="newUnit != null and newUnit != ''">
-            and newUnit like concat('%',#{newUnit},'%')
-        </if>
-        <if test="parent != null and parent != ''">
-            and sparent = #{parent}
-        </if>
-        <if test="mid != null and mid != ''">
-            and mid = #{mid}
-        </if>
-        <if test="typeName != null and typeName != ''">
-            and typeName like concat('%',#{typeName},'%')
-        </if>
-        <if test="version != null and version != ''">
-            and version = #{version}
-        </if>
-        <if test="texture != null and texture != ''">
-            and texture = #{texture}
-        </if>
-        <if test="mstate != null and mstate != ''">
-            and mstate = #{mstate}
-        </if>
-        <if test="sstate != null and sstate != ''">
-            and sstate = #{sstate}
-        </if>
-        <if test="mcode != null and mcode != ''">
-            and mcode = #{mcode}
-        </if>
-    </select>
-
-    <select id="findSplitInfoByParentId" parameterType="int" resultMap="splitInfoMap">
-        select
-        <include refid="splitInfoAllColumns"/>
-        from `split` s
-        where s.parentId = #{parentId}
-    </select>
-
-
-
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml

@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<!-- notice -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.StockTakingMapper">
-    <!-- This code was generated by TableGo tools, mark 1 begin. -->
-    <!-- 字段映射 -->
-    <resultMap id="StockTakingMap" type="com.dreamchaser.depository_manage.entity.StockTaking">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="code" property="code" jdbcType="VARCHAR" />
-        <result column="depositoryId" property="depositoryId" jdbcType="INTEGER" />
-        <result column="state" property="state" jdbcType="INTEGER" />
-        <result column="departmentManagerState" property="departmentManagerState" jdbcType="INTEGER" />
-        <result column="createTime" property="createTime" jdbcType="INTEGER" />
-        <result column="completeTime" property="completeTime" jdbcType="INTEGER" />
-        <result column="reviewTime" property="reviewTime" jdbcType="INTEGER" />
-        <result column="originator" property="originator" jdbcType="INTEGER" />
-        <result column="departmentManager" property="departmentManager" jdbcType="VARCHAR" />
-        <result column="auditOpinion" property="auditOpinion" jdbcType="VARCHAR" />
-    </resultMap>
-
-    <resultMap id="StockTakingChildMap" type="com.dreamchaser.depository_manage.entity.StockTakingChild">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="mid" property="mid" jdbcType="INTEGER" />
-        <result column="oldInventory" property="oldInventory" jdbcType="INTEGER" />
-        <result column="newInventory" property="newInventory" jdbcType="INTEGER" />
-        <result column="inventory" property="inventory" jdbcType="INTEGER" />
-        <result column="mainId" property="mainId" jdbcType="INTEGER" />
-        <result column="takingResult" property="takingResult" jdbcType="VARCHAR" />
-        <result column="mtexture" property="mtexture" jdbcType="VARCHAR" />
-        <result column="mversion" property="mversion" jdbcType="VARCHAR" />
-        <result column="munit" property="munit" jdbcType="VARCHAR" />
-        <result column="stcUnit" property="unit" jdbcType="VARCHAR" />
-        <result column="tname" property="tname" jdbcType="VARCHAR" />
-        <result column="mcode" property="mcode" jdbcType="VARCHAR" />
-        <result column="mname" property="mname" jdbcType="VARCHAR" />
-        <result column="mtId" property="mtId" jdbcType="INTEGER" />
-        <result column="pid" property="pid" jdbcType="INTEGER" />
-        <result column="producedDate" property="producedDate" jdbcType="INTEGER" />
-
-    </resultMap>
-    
-
-
-    <!-- 表查询字段 -->
-    <sql id="StockTakingAllColumns">
-       st.id,st.code,st.depositoryId,st.departmentManager,st.state,st.createTime,st.originator,st.completeTime,st.reviewTime,st.auditOpinion,st.departmentManagerState
-    </sql>
-
-    <sql id="StockTakingChildPAllColumns">
-       id,mid,oldInventory,newInventory,inventory,mainId,takingResult,mname,mtId,tname,mcode,mversion,munit,mtexture,producedDate,stcUnit,pid
-    </sql>
-
-<!--    插入主表-->
-    <insert id="insertStockTaking"  useGeneratedKeys="true" keyProperty="id">
-         INSERT INTO stocktaking (id,code,depositoryId,departmentManager,state,createTime,originator,departmentManagerState)
-         values (
-         #{id},
-        #{code},
-        #{depositoryId},
-        #{departmentManager},
-        #{state},
-        #{createTime},
-        #{originator},
-        #{departmentManagerState}
-         )
-    </insert>
-
-<!--    插入子表-->
-    <insert id="insertStockTakingChild"  useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO stocktakingchild (id,mid,oldInventory,newInventory,takingResult,inventory,mainId,producedDate,unit,pid)
-        values (
-        #{id},#{mid},#{oldInventory},#{newInventory},#{takingResult},#{inventory},#{mainId},#{producedDate},#{unit},#{placeId}
-        )
-    </insert>
-
-
-    <delete id="deleteStockTakingChild" parameterType="int">
-        delete from stocktakingchild where id = #{id}
-    </delete>
-
-    <delete id="deleteStockTakingChilds" parameterType="list">
-        delete from stocktakingchild
-        where id in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <delete id="deleteStockTaking" parameterType="int">
-        delete from stocktaking where id = #{id}
-    </delete>
-
-    <delete id="deleteStockTakings" parameterType="list">
-        delete from stocktaking
-        where id in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <update id="updateStockTaking">
-        update stocktaking
-        <set>
-            <if test="code != null and code != ''">
-                code = #{code},
-            </if>
-            <if test="depositoryId != null">
-                depositoryId = #{depositoryId},
-            </if>
-            <if test="departmentManager != null and departmentManager != ''">
-                departmentManager = #{departmentManager},
-            </if>
-            <if test="state != null and state != ''">
-                state = #{state},
-            </if>
-            <if test="departmentManagerState != null and departmentManagerState != ''">
-                departmentManagerState = #{departmentManagerState},
-            </if>
-            <if test="createTime != null and createTime != ''">
-                createTime = #{createTime},
-            </if>
-            <if test="originator != null and originator!=''">
-                originator = #{originator},
-            </if>
-            <if test="auditOpinion != null">
-                auditOpinion = #{auditOpinion},
-            </if>
-            <if test="completeTime != null and completeTime != ''">
-                completeTime = #{completeTime},
-            </if>
-            <if test="reviewTime != null and reviewTime != ''">
-                reviewTime = #{reviewTime}
-            </if>
-
-        </set>
-        where id = #{id}
-    </update>
-
-
-    <update id="updateStockTakingChild">
-        update stocktakingchild
-        <set>
-            <if test="mid != null and mid != ''">
-                mid = #{mid},
-            </if>
-            <if test="oldInventory != null">
-                oldInventory = #{oldInventory},
-            </if>
-            <if test="newInventory != null">
-                newInventory = #{newInventory},
-            </if>
-            <if test="takingResult != null and takingResult != ''">
-                takingResult = #{takingResult},
-            </if>
-            <if test="inventory != null">
-                inventory = #{inventory},
-            </if>
-            <if test="mainId != null and mainId != ''">
-                mainId = #{mainId},
-            </if>
-            <if test="producedDate != null and producedDate != ''">
-                producedDate = #{producedDate},
-            </if>
-            <if test="placeId != null">
-                pid = #{placeId},
-            </if>
-            <if test="unit != null and unit != ''">
-                unit = #{unit}
-            </if>
-
-        </set>
-        where id = #{id}
-    </update>
-
-    <select id="selectStockTakingChildByMainId" parameterType="int" resultMap="StockTakingChildMap">
-        select
-        <include refid="StockTakingChildPAllColumns"/>
-        from stocktakingchildinfo
-        where mainId = #{mainId}
-    </select>
-
-
-    <select id="selectStockTakingChildByIds" parameterType="list" resultMap="StockTakingChildMap">
-        select
-        <include refid="StockTakingChildPAllColumns"/>
-        from stocktakingchildinfo
-        where id in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
-
-    <select id="selectStockTakingByCondition" parameterType="map" resultMap="StockTakingMap">
-        select
-        <include refid="StockTakingAllColumns"/>
-        from stocktaking st
-        where 1 = 1
-        <if test="code != null and code != ''">
-           and st.code LIKE CONCAT('%', #{code}, '%')
-        </if>
-        <if test="depositoryId != null and depositoryId != ''">
-            and st.depositoryId = #{depositoryId}
-        </if>
-
-        <if test="departmentManagerState != null and departmentManagerState != ''">
-            and st.departmentManagerState = #{departmentManagerState}
-        </if>
-        <if test="departmentManager != null and departmentManager != ''">
-            and FIND_IN_SET(#{departmentManager},st.departmentManager) != 0
-        </if>
-        <if test="originator != null and originator!=''">
-            and st.originator = #{originator}
-        </if>
-
-    </select>
-
-
-    <select id="selectStockTakingChildPByCondition" parameterType="map" resultMap="StockTakingChildMap">
-        select
-        <include refid="StockTakingChildPAllColumns"/>
-        from stocktakingchildinfo
-        where 1 = 1
-        <if test="mid != null and mid != ''">
-            and mid = #{mid}
-        </if>
-        <if test="oldInventory != null">
-            and oldInventory = #{oldInventory}
-        </if>
-        <if test="newInventory != null">
-            and newInventory = #{newInventory}
-        </if>
-        <if test="placeId != null">
-            and pid = #{placeId}
-        </if>
-        <if test="takingResult != null and takingResult != ''">
-            and takingResult = #{takingResult}
-        </if>
-        <if test="inventory != null">
-            and inventory = #{inventory}
-        </if>
-        <if test="mainId != null and mainId != ''">
-            and mainId = #{mainId}
-        </if>
-        <if test="mname != null and mname != ''">
-            and mname like CONCAT('%',#{mname},'%')
-        </if>
-        <if test="mtId != null">
-            and mtId = #{mtId}
-        </if>
-        <if test="mcode != null and mcode != ''">
-            and mcode = #{mcode}
-        </if>
-        <if test="mversion != null and mversion != ''">
-            and mversion = #{mversion}
-        </if>
-        <if test="munit != null and munit != ''">
-            and munit = #{munit}
-        </if>
-        <if test="mtexture != null and mtexture != ''">
-            and mtexture = #{mtexture}
-        </if>
-        <if test="producedDate != null">
-            and producedDate = #{producedDate}
-        </if>
-        <if test="unit != null and unit !=''">
-            and unit = #{unit}
-        </if>
-    </select>
-
-    <select id="selectStockTakingById" resultMap="StockTakingMap">
-        select
-        <include refid="StockTakingAllColumns"/>
-        from stocktaking st
-        where st.id  = #{id}
-    </select>
-
-    <select id="selectStockTakingChildPById"  resultMap="StockTakingChildMap">
-        select
-        <include refid="StockTakingChildPAllColumns"/>
-        from stocktakingchildinfo
-        where id = #{id}
-    </select>
-
-    <select id="findMyTask" parameterType="map" resultMap="StockTakingMap">
-        select
-        <include refid="StockTakingAllColumns"/>
-        from stocktaking st
-        where 1 = 1
-        <if test='isDone == 0'>
-            and (state = 3  and FIND_IN_SET(#{departmentHead},st.departmentManager) != 0 )
-        </if>
-        <if test='isDone == 1'>
-            and (state != 3  and FIND_IN_SET(#{departmentHead},st.departmentManager) != 0 )
-        </if>
-        ORDER BY st.createTime desc
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-
-    <select id="findMyTaskCount" parameterType="map" resultType="int">
-        SELECT
-        count(*)
-        from stocktaking st
-        where 1 = 1
-        <if test='isDone == 0'>
-            and (state = 3 and departmentManagerState = 3 and FIND_IN_SET(#{departmentHead},st.departmentManager) != 0 )
-
-        </if>
-        <if test='isDone == 1'>
-            and (state != 3 and departmentManagerState != 3 and FIND_IN_SET(#{departmentHead},st.departmentManager) != 0 )
-
-        </if>
-
-    </select>
-
-
-    <select id="findMyApply" parameterType="map" resultMap="StockTakingMap">
-        select
-        <include refid="StockTakingAllColumns"/>
-        from stocktaking st
-        where 1 = 1
-        and originator =  #{userId}
-        ORDER BY st.createTime desc
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-    </select>
-
-    <select id="findMyApplyCount" parameterType="map" resultType="int">
-        SELECT
-        count(*)
-        from stocktaking st
-        where 1 = 1
-        and originator =  #{userId}
-    </select>
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/TransferRecordMapper.xml

@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<!-- transfer_record -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.TransferRecordMapper">
-    <!-- This code was generated by TableGo tools, mark 1 begin. -->
-    <!-- 字段映射 -->
-    <resultMap id="transferRecordMap" type="com.dreamchaser.depository_manage.entity.TransferRecord">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="from_id" property="fromId" jdbcType="INTEGER" />
-        <result column="to_id" property="toId" jdbcType="INTEGER" />
-        <result column="mid" property="mid" jdbcType="INTEGER" />
-        <result column="applicantTime" property="applicantTime" jdbcType="INTEGER" />
-        <result column="applicantId" property="applicantId" jdbcType="INTEGER" />
-        <result column="from_place_id" property="fromPlaceId" jdbcType="INTEGER" />
-        <result column="to_place_id" property="toPlaceId" jdbcType="INTEGER" />
-    </resultMap>
-    <!-- 表查询字段 -->
-    <sql id="allColumns">
-        tr.id, tr.from_id, tr.to_id,tr.mid,tr.applicantTime,tr.applicantId,tr.from_place_id,tr.to_place_id
-    </sql>
-
-    <!-- 查询所有
-         <select id="findTransferRecordAll" resultMap="transferRecordMap">
-        SELECT
-            <include refid="allColumns" />
-        FROM transfer_record tr
-    </select>-->
-
-
-<!--     根据条件参数查询列表-->
-        <select id="findTransferRecordByCondition" resultMap="transferRecordMap" parameterType="map">
-        SELECT
-            <include refid="allColumns" />
-        FROM transfer_record tr WHERE 1 = 1
-        <if test="fromId != null">
-            AND tr.from_id = #{fromId}
-        </if>
-        <if test="toId != null">
-            AND tr.to_id = #{toId}
-        </if>
-        <if test="mid != null">
-            and tr.mid = #{mid}
-        </if>
-        <if test="applicantTime != null">
-            and tr.applicantTime = #{applicantTime}
-        </if>
-        <if test="applicantId != null">
-            and tr.applicantId = #{applicantId}
-        </if>
-        <if test="fromPlaceId != null">
-            and tr.from_place_id = #{fromPlaceId}
-        </if>
-            <if test="toPlaceId != null">
-            and tr.to_place_id = #{toPlaceId}
-        </if>
-    </select>
-
-
-    <!-- 根据主键查询信息
-         <select id="findTransferRecordByIds" resultMap="transferRecordMap" parameterType="list">
-        SELECT
-            <include refid="allColumns" />
-        FROM transfer_record tr WHERE tr.id IN
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>-->
-
-    <select id="findTransferRecordById" resultMap="transferRecordMap" parameterType="int">
-        SELECT
-        <include refid="allColumns" />
-        FROM transfer_record tr WHERE tr.id = #{id}
-    </select>
-    <!-- 新增信息 -->
-    <insert id="addTransferRecord"  parameterType="map" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO transfer_record (
-            id, from_id, to_id,quantity,mid,applicantTime,applicantId,from_place_id,to_place_id
-        ) VALUES (
-            #{id},
-            #{fromId},
-            #{toId},
-            #{quantity},
-            #{mid},
-            #{applicantTime},
-            #{applicantId},
-            #{fromPlaceId},
-            #{toPlaceId}
-        )
-    </insert>
-
-    <!-- 批量新增信息
-         <insert id="addTransferRecords" parameterType="list">
-        INSERT INTO transfer_record (
-            id, from_id, to_id
-        ) VALUES
-        <foreach collection="list" index="index" item="item" separator=",">
-            (
-                #{item.id},
-                #{item.fromId},
-                #{item.toId}
-            )
-        </foreach>
-    </insert>-->
-
-
-    <!-- 修改信息
-         <update id="updateTransferRecord">
-        UPDATE transfer_record
-        <set>
-            <if test="fromId != null">
-                from_id = #{fromId},
-            </if>
-            <if test="toId != null">
-                to_id = #{toId}
-            </if>
-        </set>
-        WHERE id = #{id}
-    </update>-->
-
-
-    <!-- 批量修改信息
-         <update id="updateTransferRecords" parameterType="list">
-        <foreach collection="list" index="index" item="item" separator=";">
-            UPDATE transfer_record
-            <set>
-                <if test="item.fromId != null">
-                    from_id = #{item.fromId},
-                </if>
-                <if test="item.toId != null">
-                    to_id = #{item.toId}
-                </if>
-            </set>
-            WHERE id = #{item.id}
-        </foreach>
-    </update>-->
-
-
-    <!-- 根据主键删除
-      <delete id="deleteTransferRecordById" parameterType="int">
-        DELETE FROM transfer_record WHERE id = #{id}
-    </delete>-->
-
-
-    <!-- 根据主键批量删除
-         <delete id="deleteTransferRecordByIds" parameterType="list">
-        DELETE FROM transfer_record WHERE id IN
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>-->
-
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/UserMapper.xml

@@ -1,381 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<!-- user -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.UserMapper">
-    <!-- 字段映射 -->
-    <resultMap id="userMap" type="com.dreamchaser.depository_manage.entity.User">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="uname" property="uname" jdbcType="VARCHAR" />
-        <result column="authority" property="authority" jdbcType="VARCHAR" />
-        <result column="pwd" property="pwd" jdbcType="VARCHAR" />
-        <result column="sex" property="sex" jdbcType="VARCHAR" />
-        <result column="depository_id" property="depositoryId" jdbcType="INTEGER" />
-        <result column="entry_date" property="entryDate" jdbcType="TIMESTAMP" />
-        <result column="email" property="email" jdbcType="VARCHAR" />
-        <result column="phone" property="phone" jdbcType="VARCHAR" />
-        <result column="state" property="state" javaType="INTEGER"/>
-    </resultMap>
-
-<!--    字段映射（包括角色名）-->
-    <resultMap id="userMapWithRoleName" type="com.dreamchaser.depository_manage.entity.User">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="state" property="state" javaType="INTEGER"/>
-        <result column="uname" property="uname" jdbcType="VARCHAR" />
-        <result column="authority" property="authority" jdbcType="VARCHAR" />
-        <result column="pwd" property="pwd" jdbcType="VARCHAR" />
-        <result column="sex" property="sex" jdbcType="VARCHAR" />
-        <result column="depository_id" property="depositoryId" jdbcType="INTEGER" />
-        <result column="entry_date" property="entryDate" jdbcType="TIMESTAMP" />
-        <result column="email" property="email" jdbcType="VARCHAR" />
-        <result column="phone" property="phone" jdbcType="VARCHAR" />
-        <association property="role" javaType="com.dreamchaser.depository_manage.entity.Role">
-            <id property="id" column="authority"/>
-            <result property="name" column="name"/>
-        </association>
-    </resultMap>
-    <!-- 表查询字段(不敏感信息) -->
-    <sql id="noSensitiveColumns">
-        u.id, u.uname,  u.sex, u.entry_date
-    </sql>
-    <!-- 表查询字段 -->
-    <sql id="allColumns">
-        u.id, u.uname, u.authority, u.pwd, u.sex, u.depository_id, u.entry_date, u.email, 
-        u.phone,u.state
-    </sql>
-
-    <sql id="ColumnsAndRoleName">
-        u.id, u.uname,u.authority, u.pwd, u.sex, u.depository_id, u.entry_date, u.email,
-        u.phone,u.state
-    </sql>
-    <!-- This code was generated by TableGo tools, mark 2 end. -->
-    <!-- 查询该表的行数 -->
-    <select id="findCount" resultType="integer">
-        SELECT
-        count(*)
-        FROM user u
-    </select>
-    <!-- 根据条件查询数据的数量 -->
-    <select id="findCountByCondition" resultType="integer" parameterType="map">
-        SELECT
-        count(*)
-        FROM user u WHERE 1 = 1
-        <if test="uname != null and uname != ''">
-            AND u.uname LIKE CONCAT('%', #{uname}, '%')
-        </if>
-        <if test="authority != null and authority != ''">
-            AND u.authority LIKE CONCAT('%', #{authority}, '%')
-        </if>
-        <if test="pwd != null and pwd != ''">
-            AND u.pwd LIKE CONCAT('%', #{pwd}, '%')
-        </if>
-        <if test="sex != null and sex != ''">
-            AND u.sex LIKE CONCAT('%', #{sex}, '%')
-        </if>
-        <if test="depositoryId != null">
-            AND u.depository_id = #{depositoryId}
-        </if>
-        <if test="entryDate != null">
-            AND u.entry_date = #{entryDate}
-        </if>
-        <if test="email != null and email != ''">
-            AND u.email LIKE CONCAT('%', #{email}, '%')
-        </if>
-        <if test="phone != null and phone != ''">
-            AND u.phone LIKE CONCAT('%', #{phone}, '%')
-        </if>
-        <if test="state != null and state != ''">
-            and u.state = #{state}
-        </if>
-        and u.state != 3
-    </select>
-    <!-- 查询所有数据 -->
-<!--     <select id="findUserAll" resultMap="userMap">
-        SELECT
-        <include refid="allColumns" />
-        FROM user u
-    </select>-->
-
-    <!-- 根据id查询数据列表 -->
-    <select id="findUserNameById" resultType="string" parameterType="int">
-        SELECT
-        u.uname
-        FROM user u WHERE  u.id=#{id}
-    </select>
-
-
-    <!-- 根据email查询数据列表 -->
-    <select id="findUserByEmail" resultMap="userMap" parameterType="string">
-        SELECT
-        <include refid="allColumns" />
-        FROM user u WHERE  u.email LIKE CONCAT('%', #{email}, '%')
-    </select>
-
-    <!-- 根据条件参数查询数据列表 -->
-    <select id="findUsersByCondition" resultMap="userMapWithRoleName" parameterType="map">
-        SELECT
-        <include refid="ColumnsAndRoleName" />
-        FROM user u WHERE 1 = 1
-        <if test="uname != null and uname != ''">
-            AND u.uname LIKE CONCAT('%', #{uname}, '%')
-        </if>
-        <if test="authority != null and authority != ''">
-            AND u.authority = #{authority}
-        </if>
-        <if test="pwd != null and pwd != ''">
-            AND u.pwd LIKE CONCAT('%', #{pwd}, '%')
-        </if>
-        <if test="sex != null and sex != ''">
-            AND u.sex LIKE CONCAT('%', #{sex}, '%')
-        </if>
-        <if test="depositoryId != null">
-            AND u.depository_id = #{depositoryId} or u.depository_id = 0
-        </if>
-        <if test="entryDate != null">
-            AND u.entry_date = #{entryDate}
-        </if>
-        <if test="email != null and email != ''">
-            AND u.email LIKE CONCAT('%', #{email}, '%')
-        </if>
-        <if test="phone != null and phone != ''">
-            AND u.phone LIKE CONCAT('%', #{phone}, '%')
-        </if>
-        <if test="state != null and state != ''">
-            And u.state = #{state}
-        </if>
-        and u.state != 3
-        <if test="begin != null and size != null">
-            LIMIT #{begin},#{size}
-        </if>
-
-    </select>
-    
-    <!-- 根据条件参数查询数据列表 -->
-    <select id="findUserByCondition" resultMap="userMap" parameterType="map">
-        SELECT
-        <include refid="allColumns" />
-        FROM user u WHERE 1 = 1
-        <if test="uname != null and uname != ''">
-            AND u.uname LIKE CONCAT('%', #{uname}, '%')
-        </if>
-        <if test="authority != null and authority != ''">
-            AND u.authority LIKE CONCAT('%', #{authority}, '%')
-        </if>
-        <if test="pwd != null and pwd != ''">
-            AND u.pwd LIKE CONCAT('%', #{pwd}, '%')
-        </if>
-        <if test="sex != null and sex != ''">
-            AND u.sex LIKE CONCAT('%', #{sex}, '%')
-        </if>
-        <if test="depositoryId != null">
-            AND u.depository_id = #{depositoryId}
-        </if>
-        <if test="entryDate != null">
-            AND u.entry_date = #{entryDate}
-        </if>
-        <if test="email != null and email != ''">
-            AND u.email LIKE CONCAT('%', #{email}, '%')
-        </if>
-        <if test="phone != null and phone != ''">
-            AND u.phone LIKE CONCAT('%', #{phone}, '%')
-        </if>
-        <if test="state != null and state != ''">
-            and u.state = #{state}
-        </if>
-        and u.state != 3
-    </select>
-
-    <!-- 根据主键查询数据 -->
-    <select id="findUserById" resultMap="userMap" parameterType="integer">
-        SELECT
-        <include refid="allColumns" />
-        FROM user u WHERE u.id = #{id}
-    </select>
-    
-    <!-- 根据主键查询数据
-        <select id="findUserByIds" resultMap="userMap" parameterType="list">
-        SELECT
-        <include refid="allColumns" />
-        FROM user u WHERE u.id IN
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>-->
-
-    
-    <!-- 插入数据 -->
-    <insert id="insertUser" parameterType="map">
-        INSERT INTO user (
-            id, uname, authority, pwd, sex, depository_id, entry_date, email, 
-            phone
-        ) VALUES (
-            #{id},
-            #{uname},
-            #{authority},
-            #{pwd},
-            #{sex},
-            #{depositoryId},
-            #{entryDate},
-            #{email},
-            #{phone}
-        )
-    </insert>
-    
-    <!-- 批量插入数据
-     <insert id="insertUsers" parameterType="list">
-        INSERT INTO user (
-            id, uname, authority, pwd, sex, depository_id, entry_date, email,
-            phone
-        ) VALUES
-        <foreach collection="list" index="index" item="item" separator=",">
-            (
-                #{item.id},
-                #{item.uname},
-                #{item.authority},
-                #{item.pwd},
-                #{item.sex},
-                #{item.depositoryId},
-                #{item.entryDate},
-                #{item.email},
-                #{item.phone}
-            )
-        </foreach>
-    </insert>-->
-
-    <!-- 修改不敏感数据（这里由于并未对手机号进行验证所以这个也是非敏感信息可以给用户自己修改） -->
-    <update id="updateUserNoSensitive" parameterType="map">
-        UPDATE user
-        <set>
-            <if test='uname != null and uname!=""'>
-                uname = #{uname},
-            </if>
-            <if test='sex != null and sex!=""'>
-                sex = #{sex},
-            </if>
-            <if test="entryDate != null and entryDate!=''">
-                entry_date = #{entryDate},
-            </if>
-            <if test="phone != null and phone !=''">
-                phone = #{phone}
-            </if>
-        </set>
-        WHERE id = #{id}
-    </update>
-    <!-- 修改数据 -->
-    <update id="updateUser" parameterType="map">
-        UPDATE user
-        <set>
-            <if test='uname != null and uname!=""'>
-                uname = #{uname},
-            </if>
-            <if test='authority != null and authority!=""'>
-                authority = #{authority},
-            </if>
-            <if test="pwd != null and pwd!=''">
-                pwd = #{pwd},
-            </if>
-            <if test='sex != null and sex!=""'>
-                sex = #{sex},
-            </if>
-            <if test="depositoryId != null and depository!=''">
-                depository_id = #{depositoryId},
-            </if>
-            <if test="entryDate != null and entryDate!=''">
-                entry_date = #{entryDate},
-            </if>
-            <if test="email != null and email != ''">
-                email = #{email},
-            </if>
-            <if test="phone != null and phone !=''">
-                phone = #{phone},
-            </if>
-            <if test="state != null and state != ''">
-                state = #{state}
-            </if>
-        </set>
-        WHERE id = #{id}
-    </update>
-    
-    <!-- 批量修改数据
-      <update id="updateUsers" parameterType="list">
-        <foreach collection="list" index="index" item="item" separator=";">
-            UPDATE user
-            <set>
-                <if test="item.uname != null">
-                    uname = #{item.uname},
-                </if>
-                <if test="item.authority != null">
-                    authority = #{item.authority},
-                </if>
-                <if test="item.pwd != null">
-                    pwd = #{item.pwd},
-                </if>
-                <if test="item.sex != null">
-                    sex = #{item.sex},
-                </if>
-                <if test="item.depositoryId != null">
-                    depository_id = #{item.depositoryId},
-                </if>
-                <if test="item.entryDate != null">
-                    entry_date = #{item.entryDate},
-                </if>
-                <if test="item.email != null">
-                    email = #{item.email},
-                </if>
-                <if test="item.phone != null">
-                    phone = #{item.phone}
-                </if>
-            </set>
-            WHERE id = #{item.id}
-        </foreach>
-    </update>-->
-
-    
-    <!-- 根据主键删除数据 -->
-    <delete id="deleteUserById" parameterType="integer">
-        DELETE FROM user WHERE id = #{id}
-    </delete>
-    
-    <!-- 根据主键批量删除数据 -->
-    <delete id="deleteUserByIds" parameterType="list">
-        DELETE FROM user WHERE id IN
-        <!-- 单参数时，List对象只能为list，数组对象只能为array，多参数用map时，collection参数才为KeyName -->
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-<!--根据主键将状态修改为删除-->
-    <update id="changeUserStateToDeleteById" parameterType="integer">
-        update user
-        <set>
-            state = 3
-        </set>
-        where id = #{id}
-    </update>
-    <!--根据主键批量将状态修改为删除-->
-    <update id="changeUserStateToDeleteByIds" parameterType="list">
-        update user
-        <set>
-            state = 3
-        </set>
-        where id in
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-
-
-    <update id="updateUserPasswordById" parameterType="map">
-        update user
-        <set>
-            pwd = #{new_password}
-        </set>
-        where id = #{id}
-    </update>
-
-
-    <select id="FindDepositoryByUserId" parameterType="int" resultType="string">
-        select dname from depositoryanduserbyport where uid = #{id}
-    </select>
-</mapper>

target/depository/WEB-INF/classes/com/dreamchaser/depository_manage/mapper/standingBookMapper.xml

@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<!-- standing_book -->
-<mapper namespace="mysql.standingBook">
-    <!-- This code was generated by TableGo tools, mark 1 begin. -->
-    <!-- 字段映射 -->
-    <resultMap id="standingBookMap" type="StandingBook">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="type" property="type" jdbcType="INTEGER" />
-        <result column="quantity" property="quantity" jdbcType="INTEGER" />
-        <result column="price" property="price" jdbcType="INTEGER" />
-        <result column="material_name" property="materialName" jdbcType="VARCHAR" />
-    </resultMap>
-    <!-- This code was generated by TableGo tools, mark 1 end. -->
-    
-    <!-- This code was generated by TableGo tools, mark 2 begin. -->
-    <!-- 表查询字段 -->
-    <sql id="allColumns">
-        sb.id, sb.type, sb.quantity, sb.price, sb.material_name
-    </sql>
-    <!-- This code was generated by TableGo tools, mark 2 end. -->
-    
-    <!-- 查询所有数据 -->
-    <select id="findStandingBookAll" resultMap="standingBookMap">
-        SELECT
-        <include refid="allColumns" />
-        FROM standing_book sb
-    </select>
-    
-    <!-- 根据条件参数查询数据列表 -->
-    <select id="findStandingBookByCondition" resultMap="standingBookMap" parameterType="map">
-        SELECT
-        <include refid="allColumns" />
-        FROM standing_book sb WHERE 1 = 1
-        <if test="type != null">
-            AND sb.type = #{type}
-        </if>
-        <if test="quantity != null">
-            AND sb.quantity = #{quantity}
-        </if>
-        <if test="price != null">
-            AND sb.price = #{price}
-        </if>
-        <if test="materialName != null and materialName != ''">
-            AND sb.material_name LIKE CONCAT('%', #{materialName}, '%')
-        </if>
-    </select>
-    
-    <!-- 根据主键查询数据 -->
-    <select id="findStandingBookByIds" resultMap="standingBookMap" parameterType="list">
-        SELECT
-        <include refid="allColumns" />
-        FROM standing_book sb WHERE sb.id IN
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
-    
-    <!-- 插入数据 -->
-    <insert id="insertStandingBook" parameterType="map">
-        INSERT INTO standing_book (
-            id, type, quantity, price, material_name
-        ) VALUES (
-            #{id},
-            #{type},
-            #{quantity},
-            #{price},
-            #{materialName}
-        )
-    </insert>
-    
-    <!-- 批量插入数据 -->
-    <insert id="insertStandingBooks" parameterType="list">
-        INSERT INTO standing_book (
-            id, type, quantity, price, material_name
-        ) VALUES
-        <foreach collection="list" index="index" item="item" separator=",">
-            (
-                #{item.id},
-                #{item.type},
-                #{item.quantity},
-                #{item.price},
-                #{item.materialName}
-            )
-        </foreach>
-    </insert>
-    
-    <!-- 修改数据 -->
-    <update id="updateStandingBook" parameterType="map">
-        UPDATE standing_book
-        <set>
-            <if test="type != null">
-                type = #{type},
-            </if>
-            <if test="quantity != null">
-                quantity = #{quantity},
-            </if>
-            <if test="price != null">
-                price = #{price},
-            </if>
-            <if test="materialName != null">
-                material_name = #{materialName}
-            </if>
-        </set>
-        WHERE id = #{id}
-    </update>
-    
-    <!-- 批量修改数据 -->
-    <update id="updateStandingBooks" parameterType="list">
-        <foreach collection="list" index="index" item="item" separator=";">
-            UPDATE standing_book
-            <set>
-                <if test="item.type != null">
-                    type = #{item.type},
-                </if>
-                <if test="item.quantity != null">
-                    quantity = #{item.quantity},
-                </if>
-                <if test="item.price != null">
-                    price = #{item.price},
-                </if>
-                <if test="item.materialName != null">
-                    material_name = #{item.materialName}
-                </if>
-            </set>
-            WHERE id = #{item.id}
-        </foreach>
-    </update>
-    
-    <!-- 根据主键删除数据 -->
-    <delete id="deleteStandingBookById" parameterType="int">
-        DELETE FROM standing_book WHERE id = #{id}
-    </delete>
-    
-    <!-- 根据主键批量删除数据 -->
-    <delete id="deleteStandingBookByIds" parameterType="list">
-        DELETE FROM standing_book WHERE id IN
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

target/depository/WEB-INF/classes/logback-spring.xml

@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-    <!-- 应用名称-->
-    <property name="appName" value="Dreamchser"/>
-    <!-- 日志的存放目录-->
-    <!-- debug-->
-    <property name="DEBUG_LOG_FILE_NAME_PATTERN" value="logs/${appName}-debug.%d{yyyy-MM-dd}.%i.log"/>
-    <property name="INFO_LOG_FILE_NAME_PATTERN" value="logs/${appName}-info.%d{yyyy-MM-dd}.%i.log"/>
-    <property name="WARN_LOG_FILE_NAME_PATTERN" value="errlogs/${appName}-warn.%d{yyyy-MM-dd}.%i.log"/>
-    <property name="ERROR_LOG_FILE_NAME_PATTERN" value="errlogs/${appName}-error.%d{yyyy-MM-dd}.%i.log"/>
-    <!-- 日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%c){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
-    <property name="FILE_LOG_PATTERN"
-              value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %c : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
-    <!--输出到控制台-->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-        </encoder>
-
-    </appender>
-
-    <!--输出到DEBUG文件-->
-    <appender name="debug_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${DEBUG_LOG_FILE_NAME_PATTERN}</fileNamePattern>
-            <!-- 日志保留天数 -->
-            <maxHistory>30</maxHistory>
-            <!-- 日志文件上限大小，达到指定大小后删除旧的日志文件 -->
-            <totalSizeCap>1GB</totalSizeCap>
-            <!-- 每个日志文件的最大值 -->
-            <timeBasedFileNamingAndTriggeringPolicy
-                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>50MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${FILE_LOG_PATTERN}</pattern>
-        </encoder>
-        <!-- 此日志文件只记录debug级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>debug</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!--输出到INFO文件-->
-    <appender name="info_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${INFO_LOG_FILE_NAME_PATTERN}</fileNamePattern>
-            <!-- 日志保留天数 -->
-            <maxHistory>7</maxHistory>
-            <!-- 日志文件上限大小，达到指定大小后删除旧的日志文件 -->
-            <totalSizeCap>1GB</totalSizeCap>
-            <!-- 每个日志文件的最大值 -->
-            <timeBasedFileNamingAndTriggeringPolicy
-                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>50MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${FILE_LOG_PATTERN}</pattern>
-        </encoder>
-        <!-- 此日志文件只记录info级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>info</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!--输出到WARN文件-->
-    <appender name="warn_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${WARN_LOG_FILE_NAME_PATTERN}</fileNamePattern>
-            <!-- 日志保留天数 -->
-            <maxHistory>30</maxHistory>
-            <!-- 日志文件上限大小，达到指定大小后删除旧的日志文件 -->
-            <totalSizeCap>1GB</totalSizeCap>
-            <!-- 每个日志文件的最大值 -->
-            <timeBasedFileNamingAndTriggeringPolicy
-                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>10MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${FILE_LOG_PATTERN}</pattern>
-        </encoder>
-        <!-- 此日志文件只记录warn级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>warn</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!--输出到ERROR文件-->
-    <appender name="error_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${ERROR_LOG_FILE_NAME_PATTERN}</fileNamePattern>
-            <!-- 日志保留天数 -->
-            <maxHistory>30</maxHistory>
-            <!-- 日志文件上限大小，达到指定大小后删除旧的日志文件 -->
-            <totalSizeCap>1GB</totalSizeCap>
-            <!-- 每个日志文件的最大值 -->
-            <timeBasedFileNamingAndTriggeringPolicy
-                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>10MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${FILE_LOG_PATTERN}</pattern>
-        </encoder>
-        <!-- 此日志文件只记录error级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>error</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-    <!-- region 根据不同的环境设置不同的日志输出级别 -->
-    <springProfile name="default,local,dev">
-        <root level="info">
-            <appender-ref ref="console"/>
-        </root>
-<!--        <logger name="com.dreamchaser" level="debug"/>-->
-
-    </springProfile>
-
-
-    <springProfile name="prod,pre,test">
-        <root level="info">
-            <appender-ref ref="console"/>
-            <appender-ref ref="debug_file"/>
-            <appender-ref ref="info_file"/>
-            <appender-ref ref="warn_file"/>
-            <appender-ref ref="error_file"/>
-        </root>
-        <logger name="com.ibatis" level="DEBUG" />
-        <logger name="com.ibatis.common.jdbc.SimpleDataSource" level="DEBUG" />
-        <logger name="com.ibatis.common.jdbc.ScriptRunner" level="DEBUG" />
-        <logger name="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate" level="DEBUG" />
-        <logger name="java.sql.Connection" level="DEBUG" />
-        <logger name="java.sql.Statement" level="DEBUG" />
-        <logger name="java.sql.PreparedStatement" level="DEBUG" />
-        <logger name="java.sql.ResultSet" level="DEBUG" />
-        <logger name="com.dreamchaser.dream.depository_manage.mapper" level="DEBUG" />
-    </springProfile>
-    <!-- endregion -->
-
-</configuration>

target/depository/WEB-INF/classes/redisson-config.yml

@@ -1,26 +0,0 @@
-#Redisson配置
-singleServerConfig:
-  address: "redis://127.0.0.1:6379"
-  clientName: null
-  database: 15 #选择使用哪个数据库0~15
-  idleConnectionTimeout: 10000
-  pingTimeout: 1000
-  connectTimeout: 10000
-  timeout: 3000
-  retryAttempts: 3
-  retryInterval: 1500
-  reconnectionTimeout: 3000
-  failedAttempts: 3
-  subscriptionsPerConnection: 5
-  subscriptionConnectionMinimumIdleSize: 1
-  subscriptionConnectionPoolSize: 50
-  connectionMinimumIdleSize: 32
-  connectionPoolSize: 64
-  dnsMonitoringInterval: 5000
-  #dnsMonitoring: false
-
-threads: 16
-nettyThreads: 32
-codec:
-  class: "org.redisson.client.codec.StringCodec"
-transportMode: "NIO"

target/depository/WEB-INF/classes/static/api/clear.json

@@ -1,4 +0,0 @@
-{
-  "code": 1,
-  "msg": "服务端清理缓存成功"
-}

target/depository/WEB-INF/classes/static/api/init.json

@@ -1,226 +0,0 @@
-{
-  "homeInfo": {
-    "title": "首页",
-    "href": "/welcome"
-  },
-  "logoInfo": {
-    "title": "Repository",
-    "image": "static/images/logo.png",
-    "href": ""
-  },
-  "menuInfo": [
-    {
-      "title": "仓库信息概览",
-      "href": "/welcome",
-      "icon": "fa fa-tachometer",
-      "target": "_self",
-      "child": [
-        {
-          "title": "首页",
-          "href": "/welcome",
-          "icon": "fa fa-home",
-          "target": "_self"
-        }
-      ]
-    },
-    {
-      "title": "仓库管理",
-      "icon": "fa fa-lemon-o",
-      "href": "",
-      "target": "_self",
-      "child": [
-        {
-          "title": "申请提交",
-          "icon": "fa fa-book",
-          "target": "_self",
-          "child": [
-            {
-              "title": "入库申请",
-              "href": "/application_in",
-              "icon": "layui-icon layui-icon-file-b",
-              "target": "_self"
-            },
-            {
-              "title": "出库申请",
-              "href": "/application_out",
-              "icon": "fa fa-file-text",
-              "target": "_self"
-            },
-            {
-              "title": "库存转移申请",
-              "href": "/application_transfer",
-              "icon": "fa fa-exchange",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "入库管理",
-          "icon": "fa fa-mail-forward",
-          "target": "_self",
-          "child": [
-            {
-              "title": "入库查询",
-              "href": "/table_in",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            },
-            {
-              "title": "入库可视化",
-              "href": "/chart_in",
-              "icon": "fa fa-bar-chart",
-              "target": "_self"
-            },
-            {
-              "title": "入库可视化（测试）",
-              "href": "/chart_in_back",
-              "icon": "fa fa-bar-chart",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "出库管理",
-          "icon": "fa fa-mail-reply",
-          "target": "_self",
-          "child": [
-            {
-              "title": "出库查询",
-              "href": "/table_out",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            },
-            {
-              "title": "出库可视化",
-              "href": "/chart_out",
-              "icon": "fa fa-pie-chart",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "库存管理",
-          "icon": "fa fa-server",
-          "target": "_self",
-          "child": [
-            {
-              "title": "库存查询",
-              "href": "/table_stock",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            },
-            {
-              "title": "库存可视化",
-              "href": "/chart_stock",
-              "icon": "fa fa-area-chart",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "仓库管理",
-          "icon": "fa fa-wrench",
-          "target": "_self",
-          "child": [
-            {
-              "title": "创建仓库",
-              "href": "/depository_add",
-              "icon": "layui-icon layui-icon-template-1",
-              "target": "_self"
-            },
-            {
-              "title": "仓库查询",
-              "href": "/depository-out",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "物料种类管理",
-          "icon": "fa fa-wrench",
-          "target": "_self",
-          "child": [
-            {
-              "title": "物料种类添加",
-              "href": "/materialType_add",
-              "icon": "layui-icon layui-icon-list",
-              "target": "_self"
-            },
-            {
-              "title": "物料种类查询",
-              "href": "/materialType_view",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "物料管理",
-          "icon": "fa fa-wrench",
-          "target": "_self",
-          "child": [
-            {
-              "title": "创建物料",
-              "href": "/material_add",
-              "icon": "layui-icon layui-icon-template-1",
-              "target": "_self"
-            },
-            {
-              "title": "物料查询",
-              "href": "/material_out",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "我的任务",
-          "icon": "fa fa-tasks",
-          "target": "_self",
-          "href": "/my_task"
-        },
-        {
-          "title": "我的申请",
-          "href": "/my_apply",
-          "icon": "fa fa-paper-plane",
-          "target": "_self"
-        }
-      ]
-    },
-    {
-      "title": "辅助管理",
-      "icon": "fa fa-slideshare",
-      "href": "",
-      "target": "_self",
-      "child": [
-        {
-          "title": "人员管理",
-          "href": "/table_user",
-          "icon": "fa fa-group",
-          "target": ""
-        },
-        {
-          "title": "公告发布",
-          "href": "/notice_edit",
-          "icon": "fa fa-superpowers",
-          "target": "_self"
-        }
-      ]
-    },
-    {
-      "title": "个人中心",
-      "href": "pages/error.html",
-      "icon": "fa fa-superpowers",
-      "target": "_self",
-      "child": [
-        {
-          "title": "个人信息",
-          "href": "/account_look",
-          "icon": "layui-icon layui-icon-friends",
-          "target": ""
-        }
-      ]
-    }
-  ]
-}

target/depository/WEB-INF/classes/static/api/init_checker.json

@@ -1,220 +0,0 @@
-{
-  "homeInfo": {
-    "title": "首页",
-    "href": "/welcome"
-  },
-  "logoInfo": {
-    "title": "Repository",
-    "image": "static/images/logo.png",
-    "href": ""
-  },
-  "menuInfo": [
-    {
-      "title": "仓库信息概览",
-      "href": "/welcome",
-      "icon": "fa fa-tachometer",
-      "target": "_self",
-      "child": [
-        {
-          "title": "首页",
-          "href": "/welcome",
-          "icon": "fa fa-home",
-          "target": "_self"
-        }
-      ]
-    },
-    {
-      "title": "仓库管理",
-      "icon": "fa fa-lemon-o",
-      "href": "",
-      "target": "_self",
-      "child": [
-        {
-          "title": "申请提交",
-          "icon": "fa fa-book",
-          "target": "_self",
-          "child": [
-            {
-              "title": "入库申请",
-              "href": "/application_in",
-              "icon": "layui-icon layui-icon-file-b",
-              "target": "_self"
-            },
-            {
-              "title": "出库申请",
-              "href": "/application_out",
-              "icon": "fa fa-file-text",
-              "target": "_self"
-            },
-            {
-              "title": "库存转移申请",
-              "href": "application_transfer",
-              "icon": "fa fa-exchange",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "入库管理",
-          "icon": "fa fa-mail-forward",
-          "target": "_self",
-          "child": [
-            {
-              "title": "入库查询",
-              "href": "/table_in",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            },
-            {
-              "title": "入库可视化",
-              "href": "/chart_in",
-              "icon": "fa fa-bar-chart",
-              "target": "_self"
-            },
-            {
-              "title": "入库可视化（测试）",
-              "href": "/chart_in_back",
-              "icon": "fa fa-bar-chart",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "出库管理",
-          "icon": "fa fa-mail-reply",
-          "target": "_self",
-          "child": [
-            {
-              "title": "出库查询",
-              "href": "/table_out",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            },
-            {
-              "title": "出库可视化",
-              "href": "/chart_out",
-              "icon": "fa fa-pie-chart",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "库存管理",
-          "icon": "fa fa-server",
-          "target": "_self",
-          "child": [
-            {
-              "title": "库存查询",
-              "href": "/table_stock",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            },
-            {
-              "title": "库存可视化",
-              "href": "/chart_stock",
-              "icon": "fa fa-area-chart",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "仓库管理",
-          "icon": "fa fa-wrench",
-          "target": "_self",
-          "child": [
-            {
-              "title": "创建仓库",
-              "href": "/depository_add",
-              "icon": "layui-icon layui-icon-template-1",
-              "target": "_self"
-            },
-            {
-              "title": "仓库查询",
-              "href": "/depository-out",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "物料种类管理",
-          "icon": "fa fa-wrench",
-          "target": "_self",
-          "child": [
-            {
-              "title": "物料种类添加",
-              "href": "/materialType_add",
-              "icon": "layui-icon layui-icon-list",
-              "target": "_self"
-            },
-            {
-              "title": "物料种类查询",
-              "href": "/materialType_view",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "物料管理",
-          "icon": "fa fa-wrench",
-          "target": "_self",
-          "child": [
-            {
-              "title": "创建物料",
-              "href": "/material_add",
-              "icon": "layui-icon layui-icon-template-1",
-              "target": "_self"
-            },
-            {
-              "title": "物料查询",
-              "href": "/material_out",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "我的任务",
-          "icon": "fa fa-tasks",
-          "target": "_self",
-          "href": "/my_task"
-        },
-        {
-          "title": "我的申请",
-          "href": "/my_apply",
-          "icon": "fa fa-paper-plane",
-          "target": "_self"
-        }
-      ]
-    },
-    {
-      "title": "辅助管理",
-      "icon": "fa fa-slideshare",
-      "href": "",
-      "target": "_self",
-      "child": [
-        {
-          "title": "公告发布",
-          "href": "/notice_edit",
-          "icon": "fa fa-superpowers",
-          "target": "_self"
-        }
-      ]
-    },
-    {
-      "title": "个人中心",
-      "href": "pages/error.html",
-      "icon": "fa fa-superpowers",
-      "target": "_self",
-      "child": [
-        {
-          "title": "个人信息",
-          "href": "/account_look",
-          "icon": "layui-icon layui-icon-friends",
-          "target": ""
-        }
-      ]
-    }
-  ]
-}

target/depository/WEB-INF/classes/static/api/init_reviewer.json

@@ -1,226 +0,0 @@
-{
-  "homeInfo": {
-    "title": "首页",
-    "href": "/welcome"
-  },
-  "logoInfo": {
-    "title": "Repository",
-    "image": "static/images/logo.png",
-    "href": ""
-  },
-  "menuInfo": [
-    {
-      "title": "仓库信息概览",
-      "href": "/welcome",
-      "icon": "fa fa-tachometer",
-      "target": "_self",
-      "child": [
-        {
-          "title": "首页",
-          "href": "/welcome",
-          "icon": "fa fa-home",
-          "target": "_self"
-        }
-      ]
-    },
-    {
-      "title": "仓库管理",
-      "icon": "fa fa-lemon-o",
-      "href": "",
-      "target": "_self",
-      "child": [
-        {
-          "title": "申请提交",
-          "icon": "fa fa-book",
-          "target": "_self",
-          "child": [
-            {
-              "title": "入库申请",
-              "href": "/application_in",
-              "icon": "layui-icon layui-icon-file-b",
-              "target": "_self"
-            },
-            {
-              "title": "出库申请",
-              "href": "/application_out",
-              "icon": "fa fa-file-text",
-              "target": "_self"
-            },
-            {
-              "title": "库存转移申请",
-              "href": "application_transfer",
-              "icon": "fa fa-exchange",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "入库管理",
-          "icon": "fa fa-mail-forward",
-          "target": "_self",
-          "child": [
-            {
-              "title": "入库查询",
-              "href": "/table_in",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            },
-            {
-              "title": "入库可视化",
-              "href": "/chart_in",
-              "icon": "fa fa-bar-chart",
-              "target": "_self"
-            },
-            {
-              "title": "入库可视化（测试）",
-              "href": "/chart_in_back",
-              "icon": "fa fa-bar-chart",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "出库管理",
-          "icon": "fa fa-mail-reply",
-          "target": "_self",
-          "child": [
-            {
-              "title": "出库查询",
-              "href": "/table_out",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            },
-            {
-              "title": "出库可视化",
-              "href": "/chart_out",
-              "icon": "fa fa-pie-chart",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "库存管理",
-          "icon": "fa fa-server",
-          "target": "_self",
-          "child": [
-            {
-              "title": "库存查询",
-              "href": "/table_stock",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            },
-            {
-              "title": "库存可视化",
-              "href": "/chart_stock",
-              "icon": "fa fa-area-chart",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "仓库管理",
-          "icon": "fa fa-wrench",
-          "target": "_self",
-          "child": [
-            {
-              "title": "创建仓库",
-              "href": "/depository_add",
-              "icon": "layui-icon layui-icon-template-1",
-              "target": "_self"
-            },
-            {
-              "title": "仓库查询",
-              "href": "/depository-out",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "物料种类管理",
-          "icon": "fa fa-wrench",
-          "target": "_self",
-          "child": [
-            {
-              "title": "物料种类添加",
-              "href": "/materialType_add",
-              "icon": "layui-icon layui-icon-list",
-              "target": "_self"
-            },
-            {
-              "title": "物料种类查询",
-              "href": "/materialType_view",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "物料管理",
-          "icon": "fa fa-wrench",
-          "target": "_self",
-          "child": [
-            {
-              "title": "创建物料",
-              "href": "/material_add",
-              "icon": "layui-icon layui-icon-template-1",
-              "target": "_self"
-            },
-            {
-              "title": "物料查询",
-              "href": "/material_out",
-              "icon": "fa fa-th-list",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "我的任务",
-          "icon": "fa fa-tasks",
-          "target": "_self",
-          "href": "/my_task"
-        },
-        {
-          "title": "我的申请",
-          "href": "/my_apply",
-          "icon": "fa fa-paper-plane",
-          "target": "_self"
-        }
-      ]
-    },
-    {
-      "title": "辅助管理",
-      "icon": "fa fa-slideshare",
-      "href": "",
-      "target": "_self",
-      "child": [
-        {
-          "title": "人员管理",
-          "href": "/table_user",
-          "icon": "fa fa-group",
-          "target": ""
-        },
-        {
-          "title": "公告发布",
-          "href": "/notice_edit",
-          "icon": "fa fa-superpowers",
-          "target": "_self"
-        }
-      ]
-    },
-    {
-      "title": "个人中心",
-      "href": "pages/error.html",
-      "icon": "fa fa-superpowers",
-      "target": "_self",
-      "child": [
-        {
-          "title": "个人信息",
-          "href": "/account_look",
-          "icon": "layui-icon layui-icon-friends",
-          "target": ""
-        }
-      ]
-    }
-  ]
-}

target/depository/WEB-INF/classes/static/api/init_user.json

@@ -1,100 +0,0 @@
-{
-  "homeInfo": {
-    "title": "首页",
-    "href": "/welcome"
-  },
-  "logoInfo": {
-    "title": "Repository",
-    "image": "static/images/logo.png",
-    "href": ""
-  },
-  "menuInfo": [
-    {
-      "title": "仓库信息概览",
-      "href": "/welcome",
-      "icon": "fa fa-tachometer",
-      "target": "_self",
-      "child": [
-        {
-          "title": "首页",
-          "href": "/welcome",
-          "icon": "fa fa-home",
-          "target": "_self"
-        }
-      ]
-    },
-    {
-      "title": "仓库管理",
-      "icon": "fa fa-lemon-o",
-      "href": "",
-      "target": "_self",
-      "child": [
-        {
-          "title": "申请提交",
-          "icon": "fa fa-book",
-          "target": "_self",
-          "child": [
-            {
-              "title": "入库申请",
-              "href": "/application_in",
-              "icon": "layui-icon layui-icon-file-b",
-              "target": "_self"
-            },
-            {
-              "title": "出库申请",
-              "href": "/application_out",
-              "icon": "fa fa-file-text",
-              "target": "_self"
-            },
-            {
-              "title": "库存转移申请",
-              "href": "application_transfer",
-              "icon": "fa fa-exchange",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "title": "我的任务",
-          "icon": "fa fa-tasks",
-          "target": "_self",
-          "href": "/my_task"
-        },
-        {
-          "title": "我的申请",
-          "href": "/my_apply",
-          "icon": "fa fa-paper-plane",
-          "target": "_self"
-        }
-      ]
-    },
-    {
-      "title": "辅助管理",
-      "icon": "fa fa-slideshare",
-      "href": "",
-      "target": "_self",
-      "child": [
-        {
-          "title": "公告发布",
-          "href": "/notice_edit",
-          "icon": "fa fa-superpowers",
-          "target": "_self"
-        }
-      ]
-    },
-    {
-      "title": "个人中心",
-      "href": "pages/error.html",
-      "icon": "fa fa-superpowers",
-      "target": "_self",
-      "child": [
-        {
-          "title": "个人信息",
-          "href": "/account_look",
-          "icon": "layui-icon layui-icon-friends",
-          "target": ""
-        }
-      ]
-    }
-  ]
-}

target/depository/WEB-INF/classes/static/api/menus.json

@@ -1,254 +0,0 @@
-{
-  "code": 0,
-  "msg": "",
-  "count": 19,
-  "data": [
-    {
-      "authorityId": 1,
-      "authorityName": "系统管理",
-      "orderNumber": 1,
-      "menuUrl": null,
-      "menuIcon": "layui-icon-set",
-      "createTime": "2018/06/29 11:05:41",
-      "authority": null,
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 0,
-      "parentId": -1
-    },
-    {
-      "authorityId": 2,
-      "authorityName": "用户管理",
-      "orderNumber": 2,
-      "menuUrl": "system/user",
-      "menuIcon": null,
-      "createTime": "2018/06/29 11:05:41",
-      "authority": null,
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 0,
-      "parentId": 1
-    },
-    {
-      "authorityId": 3,
-      "authorityName": "查询用户",
-      "orderNumber": 3,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/07/21 13:54:16",
-      "authority": "user:view",
-      "checked": 0,
-      "updateTime": "2018/07/21 13:54:16",
-      "isMenu": 1,
-      "parentId": 2
-    },
-    {
-      "authorityId": 4,
-      "authorityName": "添加用户",
-      "orderNumber": 4,
-      "menuUrl": null,
-      "menuIcon": null,
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "user:add",
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 1,
-      "parentId": 2
-    },
-    {
-      "authorityId": 5,
-      "authorityName": "修改用户",
-      "orderNumber": 5,
-      "menuUrl": null,
-      "menuIcon": null,
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "user:edit",
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 1,
-      "parentId": 2
-    },
-    {
-      "authorityId": 6,
-      "authorityName": "删除用户",
-      "orderNumber": 6,
-      "menuUrl": null,
-      "menuIcon": null,
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "user:delete",
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 1,
-      "parentId": 2
-    },
-    {
-      "authorityId": 7,
-      "authorityName": "角色管理",
-      "orderNumber": 7,
-      "menuUrl": "system/role",
-      "menuIcon": null,
-      "createTime": "2018/06/29 11:05:41",
-      "authority": null,
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 0,
-      "parentId": 1
-    },
-    {
-      "authorityId": 8,
-      "authorityName": "查询角色",
-      "orderNumber": 8,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/07/21 13:54:59",
-      "authority": "role:view",
-      "checked": 0,
-      "updateTime": "2018/07/21 13:54:58",
-      "isMenu": 1,
-      "parentId": 7
-    },
-    {
-      "authorityId": 9,
-      "authorityName": "添加角色",
-      "orderNumber": 9,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "role:add",
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 1,
-      "parentId": 7
-    },
-    {
-      "authorityId": 10,
-      "authorityName": "修改角色",
-      "orderNumber": 10,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "role:edit",
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 1,
-      "parentId": 7
-    },
-    {
-      "authorityId": 11,
-      "authorityName": "删除角色",
-      "orderNumber": 11,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "role:delete",
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 1,
-      "parentId": 7
-    },
-    {
-      "authorityId": 12,
-      "authorityName": "角色权限管理",
-      "orderNumber": 12,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "role:auth",
-      "checked": 0,
-      "updateTime": "2018/07/13 15:27:18",
-      "isMenu": 1,
-      "parentId": 7
-    },
-    {
-      "authorityId": 13,
-      "authorityName": "权限管理",
-      "orderNumber": 13,
-      "menuUrl": "system/authorities",
-      "menuIcon": null,
-      "createTime": "2018/06/29 11:05:41",
-      "authority": null,
-      "checked": 0,
-      "updateTime": "2018/07/13 15:45:13",
-      "isMenu": 0,
-      "parentId": 1
-    },
-    {
-      "authorityId": 14,
-      "authorityName": "查询权限",
-      "orderNumber": 14,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/07/21 13:55:57",
-      "authority": "authorities:view",
-      "checked": 0,
-      "updateTime": "2018/07/21 13:55:56",
-      "isMenu": 1,
-      "parentId": 13
-    },
-    {
-      "authorityId": 15,
-      "authorityName": "添加权限",
-      "orderNumber": 15,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "authorities:add",
-      "checked": 0,
-      "updateTime": "2018/06/29 11:05:41",
-      "isMenu": 1,
-      "parentId": 13
-    },
-    {
-      "authorityId": 16,
-      "authorityName": "修改权限",
-      "orderNumber": 16,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/07/13 09:13:42",
-      "authority": "authorities:edit",
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 1,
-      "parentId": 13
-    },
-    {
-      "authorityId": 17,
-      "authorityName": "删除权限",
-      "orderNumber": 17,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "authorities:delete",
-      "checked": 0,
-      "updateTime": "2018/06/29 11:05:41",
-      "isMenu": 1,
-      "parentId": 13
-    },
-    {
-      "authorityId": 18,
-      "authorityName": "登录日志",
-      "orderNumber": 18,
-      "menuUrl": "system/loginRecord",
-      "menuIcon": null,
-      "createTime": "2018/06/29 11:05:41",
-      "authority": null,
-      "checked": 0,
-      "updateTime": "2018/06/29 11:05:41",
-      "isMenu": 0,
-      "parentId": 1
-    },
-    {
-      "authorityId": 19,
-      "authorityName": "查询登录日志",
-      "orderNumber": 19,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/07/21 13:56:43",
-      "authority": "loginRecord:view",
-      "checked": 0,
-      "updateTime": "2018/07/21 13:56:43",
-      "isMenu": 1,
-      "parentId": 18
-    }
-  ]
-}

target/depository/WEB-INF/classes/static/api/table-in.json

@@ -1,139 +0,0 @@
-{
-  "code": 0,
-  "msg": "",
-  "count": 1000,
-  "data": [
-    {
-      "id": 10000,
-      "applicationId": 2001,
-      "materialName": "骁龙888芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "购入",
-      "state": "待审核",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2020-10-06 10:05",
-      "reviewTime": "无",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    },
-    {
-      "id": 10001,
-      "applicationId": 3301,
-      "materialName": "麒麟980芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "购入",
-      "state": "已入库",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2021-10-06 10:05",
-      "reviewRemarks": "审核批准！",
-      "reviewTime": "2021-10-07 11:12",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准",
-      "checkerName": "李四",
-      "checkRemarks": "验收无误，入库！",
-      "checkTime": "2021-10-8 15:23"
-    },
-    {
-      "id": 10002,
-      "applicationId": 409,
-      "materialName": "骁龙888芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "购入",
-      "state": "待审核",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2020-10-06 10:05",
-      "reviewTime": "2020-10-07 11:12",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    },
-    {
-      "id": 10000,
-      "applicationId": 123,
-      "materialName": "骁龙888芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "转入",
-      "state": "待审核",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2020-10-06 10:05",
-      "reviewTime": "2020-10-07 11:12",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    },
-    {
-      "id": 10000,
-      "applicationId": 321,
-      "materialName": "骁龙888芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "转入",
-      "state": "待审核",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2020-10-06 10:05",
-      "reviewTime": "2020-10-07 11:12",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    },
-    {
-      "id": 10000,
-      "applicationId": 456,
-      "materialName": "骁龙888芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "转入",
-      "state": "待审核",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2020-10-06 10:05",
-      "reviewTime": "2020-10-07 11:12",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    },
-    {
-      "id": 10000,
-      "applicationId": 456,
-      "materialName": "骁龙888芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "购入",
-      "state": "待审核",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2020-10-06 10:05",
-      "reviewTime": "2020-10-07 11:12",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    },
-    {
-      "id": 10000,
-      "applicationId": 123,
-      "materialName": "骁龙888芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "转入",
-      "state": "待审核",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2020-10-06 10:05",
-      "reviewTime": "2020-10-07 11:12",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    }
-  ]
-}

target/depository/WEB-INF/classes/static/api/table-out.json

@@ -1,136 +0,0 @@
-{
-  "code": 0,
-  "msg": "",
-  "count": 1000,
-  "data": [
-    {
-      "id": 10000,
-      "applicationId": 2001,
-      "materialName": "骁龙888芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "购入",
-      "state": "待审核",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2020-10-06 10:05",
-      "reviewTime": "无",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    },
-    {
-      "id": 10001,
-      "applicationId": 3301,
-      "materialName": "麒麟980芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "购入",
-      "state": "已入库",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2021-10-06 10:05",
-      "reviewRemarks": "审核批准！",
-      "reviewTime": "2021-10-07 11:12",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    },
-    {
-      "id": 10002,
-      "applicationId": 409,
-      "materialName": "骁龙888芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "购入",
-      "state": "待审核",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2020-10-06 10:05",
-      "reviewTime": "2020-10-07 11:12",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    },
-    {
-      "id": 10000,
-      "applicationId": 123,
-      "materialName": "骁龙888芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "转入",
-      "state": "待审核",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2020-10-06 10:05",
-      "reviewTime": "2020-10-07 11:12",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    },
-    {
-      "id": 10000,
-      "applicationId": 321,
-      "materialName": "骁龙888芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "转入",
-      "state": "待审核",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2020-10-06 10:05",
-      "reviewTime": "2020-10-07 11:12",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    },
-    {
-      "id": 10000,
-      "applicationId": 456,
-      "materialName": "骁龙888芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "转入",
-      "state": "待审核",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2020-10-06 10:05",
-      "reviewTime": "2020-10-07 11:12",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    },
-    {
-      "id": 10000,
-      "applicationId": 456,
-      "materialName": "骁龙888芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "购入",
-      "state": "待审核",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2020-10-06 10:05",
-      "reviewTime": "2020-10-07 11:12",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    },
-    {
-      "id": 10000,
-      "applicationId": 123,
-      "materialName": "骁龙888芯片",
-      "depositoryName": "外芯仓库",
-      "quantity": "409",
-      "price": "205004109",
-      "type": "转入",
-      "state": "待审核",
-      "applicantName": "张三",
-      "reviewerName": "King",
-      "applyTime": "2020-10-06 10:05",
-      "reviewTime": "2020-10-07 11:12",
-      "depositoryId": 57,
-      "applyRemarks": "老板要求今天这批货得进库，请尽快批准"
-    }
-  ]
-}

target/depository/WEB-INF/classes/static/api/table-user.json

@@ -1,95 +0,0 @@
-{
-  "code": 0,
-  "msg": "",
-  "count": 1000,
-  "data": [
-    {
-      "id": 10000,
-      "uname": "张三",
-      "sex": "男",
-      "authority": "仓管员",
-      "phone": "4561348",
-      "email": "12345689@qq.com",
-      "depositoryName": "外芯仓库",
-      "entryDate": "2012-10-06",
-      "depositoryId": 1
-    },
-    {
-      "id": 10000,
-      "uname": "李四",
-      "sex": "男",
-      "authority": "仓管员",
-      "phone": "4561348",
-      "email": "12345689@qq.com",
-      "depositoryName": "义乌仓库a",
-      "entryDate": "2012-10-06",
-      "depositoryId": 1
-    },
-    {
-      "id": 10000,
-      "uname": "King",
-      "sex": "男",
-      "authority": "仓管员",
-      "phone": "4561348",
-      "email": "12345689@qq.com",
-      "depositoryName": "义乌仓库b",
-      "entryDate": "2012-10-06",
-      "depositoryId": 1
-    },
-    {
-      "id": 10000,
-      "uname": "张三",
-      "sex": "男",
-      "authority": "仓管员",
-      "phone": "4561348",
-      "email": "12345689@qq.com",
-      "depositoryName": "宁波仓库",
-      "entryDate": "2012-10-06",
-      "depositoryId": 1
-    },
-    {
-      "id": 10000,
-      "uname": "张三",
-      "sex": "男",
-      "authority": "仓管员",
-      "phone": "4561348",
-      "email": "12345689@qq.com",
-      "depositoryName": "宁波仓库",
-      "entryDate": "2012-10-06",
-      "depositoryId": 1
-    },
-    {
-      "id": 10000,
-      "uname": "boss",
-      "sex": "男",
-      "authority": "系统管理员",
-      "phone": "4561348",
-      "email": "12345689@qq.com",
-      "depositoryName": "all",
-      "entryDate": "2012-10-06",
-      "depositoryId": 1
-    },
-    {
-      "id": 10000,
-      "uname": "张三",
-      "sex": "男",
-      "authority": "仓管员",
-      "phone": "4561348",
-      "email": "12345689@qq.com",
-      "depositoryName": "外芯仓库",
-      "entryDate": "2012-10-06",
-      "depositoryId": 1
-    },
-    {
-      "id": 10000,
-      "uname": "张三",
-      "sex": "男",
-      "authority": "仓管员",
-      "phone": "4561348",
-      "email": "12345689@qq.com",
-      "depositoryName": "外芯仓库",
-      "entryDate": "2012-10-06",
-      "depositoryId": 1
-    }
-  ]
-}

target/depository/WEB-INF/classes/static/api/tableSelect.json

@@ -1,87 +0,0 @@
-{
-  "code": 0,
-  "msg": "",
-  "count": 16,
-  "data": [
-    {
-      "id": "001",
-      "username": "张玉林",
-      "sex": "女"
-    },
-    {
-      "id": "002",
-      "username": "刘晓军",
-      "sex": "男"
-    },
-    {
-      "id": "003",
-      "username": "张恒",
-      "sex": "男"
-    },
-    {
-      "id": "004",
-      "username": "朱一",
-      "sex": "男"
-    },
-    {
-      "id": "005",
-      "username": "刘佳能",
-      "sex": "女"
-    },
-    {
-      "id": "006",
-      "username": "晓梅",
-      "sex": "女"
-    },
-    {
-      "id": "007",
-      "username": "马冬梅",
-      "sex": "女"
-    },
-    {
-      "id": "008",
-      "username": "刘晓庆",
-      "sex": "女"
-    },
-    {
-      "id": "009",
-      "username": "刘晓庆",
-      "sex": "女"
-    },
-    {
-      "id": "010",
-      "username": "刘晓庆",
-      "sex": "女"
-    },
-    {
-      "id": "011",
-      "username": "刘晓庆",
-      "sex": "女"
-    },
-    {
-      "id": "012",
-      "username": "刘晓庆",
-      "sex": "女"
-    },
-    {
-      "id": "013",
-      "username": "刘晓庆",
-      "sex": "女"
-    },
-    {
-      "id": "014",
-      "username": "刘晓庆",
-      "sex": "女"
-    },
-    {
-      "id": "015",
-      "username": "刘晓庆",
-      "sex": "女"
-    },
-    {
-      "id": "016",
-      "username": "刘晓庆",
-      "sex": "女"
-    }
-  ]
-}

target/depository/WEB-INF/classes/static/api/test.json

@@ -1,225 +0,0 @@
-{
-  "homeInfo": {
-    "title": "首页",
-    "href": "/welcome"
-  },
-  "logoInfo": {
-    "title": "Repository",
-    "image": "static/images/logo.png",
-    "href": ""
-  },
-  "menuInfo": [
-    {
-      "icon": "fa fa-home",
-      "href": "/welcome",
-      "title": "仓库信息概览",
-      "target": "_self",
-      "child": [
-        {
-          "icon": "fa fa-home",
-          "href": "/welcome",
-          "title": "首页",
-          "target": "_self",
-          "child": []
-        }
-      ]
-    },
-    {
-      "icon": "layui-icon layui-icon-template-1",
-      "href": "/account_look",
-      "title": "个人中心",
-      "target": "_self",
-      "child": []
-    },
-    {
-      "icon": "fa fa-lemon-o",
-      "href": "",
-      "title": "仓库管理",
-      "target": "_self",
-      "child": [
-        {
-          "icon": "layui-icon layui-icon-template-1",
-          "href": "/my_task",
-          "title": "我的任务",
-          "target": "_self",
-          "child": []
-        },
-        {
-          "icon": "layui-icon layui-icon-template-1",
-          "href": "/my_apply",
-          "title": "我的申请",
-          "target": "_self",
-          "child": []
-        },
-        {
-          "icon": "fa fa-mail-forward",
-          "href": "",
-          "title": "申请提交",
-          "target": "_self",
-          "child": [
-            {
-              "icon": "layui-icon layui-icon-file-b",
-              "href": "/application_in",
-              "title": "入库申请",
-              "target": "_self"
-            },
-            {
-              "icon": "fa fa-file-text",
-              "href": "/application_out",
-              "title": "出库申请",
-              "target": "_self"
-            },
-            {
-              "icon": "fa fa-exchange",
-              "href": "/application_transfer",
-              "title": "库存转移申请",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "icon": "fa fa-mail-forward",
-          "href": "",
-          "title": "入库管理",
-          "target": "_self",
-          "child": [
-            {
-              "icon": "fa fa-th-list",
-              "href": "/table_in",
-              "title": "入库查询",
-              "target": "_self"
-            },
-            {
-              "icon": "fa fa-bar-chart",
-              "href": "/chart_in",
-              "title": "入库可视化",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "icon": "fa fa-mail-forward",
-          "href": "",
-          "title": "出库管理",
-          "target": "_self",
-          "child": [
-            {
-              "icon": "fa fa-th-list",
-              "href": "/table_out",
-              "title": "出库查询",
-              "target": "_self"
-            },
-            {
-              "icon": "fa fa-pie-chart",
-              "href": "/chart_out",
-              "title": "出库可视化",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "icon": "fa fa-mail-forward",
-          "href": "",
-          "title": "库存管理",
-          "target": "_self",
-          "child": [
-            {
-              "icon": "fa fa-th-list",
-              "href": "/table_stock",
-              "title": "库存查询",
-              "target": "_self"
-            },
-            {
-              "icon": "fa fa-area-chart",
-              "href": "/chart_stock",
-              "title": "库存可视化",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "icon": "fa fa-mail-forward",
-          "href": "",
-          "title": "仓库管理",
-          "target": "_self",
-          "child": [
-            {
-              "icon": "layui-icon layui-icon-template-1",
-              "href": "/depository_add",
-              "title": "创建仓库",
-              "target": "_self"
-            },
-            {
-              "icon": "fa fa-th-list",
-              "href": "/depository-out",
-              "title": "仓库查询",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "icon": "fa fa-mail-forward",
-          "href": "",
-          "title": "物料种类管理",
-          "target": "_self",
-          "child": [
-            {
-              "icon": "fa fa-th-list",
-              "href": "/materialType_add",
-              "title": "物料种类添加",
-              "target": "_self"
-            },
-            {
-              "icon": "layui-icon layui-icon-template-1",
-              "href": "/materialType_view",
-              "title": "物料种类查询",
-              "target": "_self"
-            }
-          ]
-        },
-        {
-          "icon": "fa fa-mail-forward",
-          "href": "",
-          "title": "物料管理",
-          "target": "_self",
-          "child": [
-            {
-              "icon": "layui-icon layui-icon-template-1",
-              "href": "/material_add",
-              "title": "创建物料",
-              "target": "_self"
-            },
-            {
-              "icon": "layui-icon layui-icon-template-1",
-              "href": "/material_out",
-              "title": "物料查询",
-              "target": "_self"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "icon": "fa fa-slideshare",
-      "href": "",
-      "title": "辅助管理",
-      "target": "_self",
-      "child": [
-        {
-          "icon": "layui-icon layui-icon-template-1",
-          "href": "/table_user",
-          "title": "人员管理",
-          "target": "_self",
-          "child": []
-        },
-        {
-          "icon": "layui-icon layui-icon-template-1",
-          "href": "/notice_edit",
-          "title": "公告发布",
-          "target": "_self",
-          "child": []
-        }
-      ]
-    }
-  ]
-}

target/depository/WEB-INF/classes/static/api/upload.json

@@ -1,10 +0,0 @@
-{
-  "code": 1,
-  "msg": "上传成功",
-  "data": {
-    "url": [
-      "../images/logo.png",
-      "../images/captcha.jpg"
-    ]
-  }
-}

target/depository/WEB-INF/classes/static/css/JcPrinter/style.css

@@ -1,217 +0,0 @@
-body {
-    margin: 0;
-    padding: 0;
-    width: 100%;
-    height: 100%;
-    background-color: #fff;
-}
-
-.container {
-    width: 900px;
-    height: auto;
-    margin: 0 auto;
-}
-
-.header {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    height: 100px;
-    margin: 10px 0;
-    border: 1px solid gray;
-}
-.printer {
-    display: flex;
-    align-items: center;
-    margin-left: 10px;
-}
-.printer span {
-    display: block;
-    width: 120px;
-}
-.printer select {
-    width: 520px;
-    height: 26px;
-}
-.printer .reset {
-    width: 120px;
-    height: 24px;
-    margin-left: 10px;
-    line-height: 24px;
-    text-align: center;
-    border: 1px solid #a9a9a9;
-}
-
-.main {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    width: 100%;
-}
-
-.main-left {
-    width: 60%;
-}
-.send1{
-    
-    width: 90%;
-    height: 30px;
-    margin: 10px ;
-    line-height: 30px;
-    text-align: center;
-    font-size: 16px;
-    /* border: 1px solid gray; */
-    /* border-radius: 5px; */
-    /* margin: 10px 10px; */
-   
-}
-
-.flex-rows {
-    padding: 10px 0 10px 10px;
-    margin-bottom: 20px;
-    border: 1px solid gray;
-}
-
-.flex-rows p {
-    font-size: 16px;
-}
-.flex-rows .ex2 {
-    display: flex;
-    align-items: center;
-    height: 40px;
-}
-
-.function .ex2 span,
-.upgrade .ex2 span {
-    display: block;
-    width: 120px;
-    font-size: 14px;
-}
-.parameter .ex2 span {
-    display: block;
-    width: 160px;
-    font-size: 14px;
-}
-
-.ex2 .right {
-    width: 500px;
-}
-.ex2  .diy-span-class{
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-}
-
-.ex2  .diy-span-class span {
-    display: block;
-    width: 30px ;
-    margin-left: 6px;
-    font-size: 14px;
-}
-.ex2  .diy-span-class span:nth-child(1) {
-    margin-left: 0;
-}
-
-.headselect{
-    width: 500px;
-}
-
-.ex2 .right input[type='text'] {
-    width: 200px;
-    height: 24px;
-}
-
-.ex2 .right input[type='button'],
-.ex2 .right input[type='number'],
-.ex2 .right input[type='reset'],
-.ex2 .right select {
-    width: 120px;
-    height: 24px;
-}
-
-.ex2 .diy-span-class input[type='number'] {
-    width: 60px;
-    height: 24px;
-}
-
-
-.ex2 .right input[type='number'] {
-    height: 22px;
-}
-
-.ex2 .right select,
-.ex2 .right input[type='button'] {
-    height: 28px;
-}
-
-.ex2 .crc input[type='text'] {
-    width: 120px;
-    height: 24px;
-}
-.file-input {
-    display: flex;
-    align-items: center;
-}
-.select-file {
-    position: relative;
-    width: 120px;
-    height: 28px;
-    margin-left: 6px;
-    border: 1px solid #a9a9a9;
-}
-
-.select-file span {
-    width: 100%;
-    height: 100%;
-    line-height: 28px;
-    text-align: center;
-    background-color: #fff;
-}
-.select-file input {
-    opacity: 0;
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    top: 0;
-    left: 0;
-    overflow: hidden;
-}
-
-.main-right {
-    width: 36%;
-    height: 860px;
-    margin-top: -20px;
-    border: 1px solid gray;
-}
-.main-right p {
-    padding-left: 5%;
-}
-
-.overflowTest {
-    width: 90%;
-    height: 320px;
-    margin: 0 auto;
-    padding: 4px;
-    border: 1px solid gray;
-    background-color: #fff;
-	overflow: scroll;
-}
-#overflowTest1 {
-    width: 90%;
-    height: 320px;
-    margin: 0 auto;
-    padding: 4px;
-    border: 1px solid gray;
-    background-color: #fff;
-	overflow: scroll;
-}
-.clear-all {
-    width: 90%;
-    height: 30px;
-    margin: 10px auto 0;
-    line-height: 30px;
-    text-align: center;
-    font-size: 16px;
-    border: 1px solid gray;
-    border-radius: 5px;
-}

target/depository/WEB-INF/classes/static/css/inputTag.css

@@ -1,86 +0,0 @@
-@keyframes fariy-fadein {
-  0% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
-}
-.fairy-tag-container {
-  width: 100%;
-  height: 38px;
-  border: 1px solid #e6e6e6;
-  background-color: #ffffff;
-}
-.fairy-tag-container:hover {
-  border-color: #d2d2d2;
-}
-.fairy-tag-container span.fairy-tag {
-  float: left;
-  font-size: 13px;
-  padding: 5px 8px;
-  margin-right: 5px;
-  margin-bottom: 5px;
-  border-radius: 2px;
-  line-height: 16px;
-}
-.fairy-tag-container span.fairy-tag a {
-  font-size: 11px;
-  font-weight: bolder;
-  color: #ffffff;
-  text-decoration: none;
-  margin-left: 6px;
-}
-.fairy-tag-container span.fairy-tag a:hover {
-  cursor: pointer;
-}
-.fairy-tag-container span.fairy-bg-red {
-  background-color: #FF5722;
-}
-.fairy-tag-container span.fairy-bg-orange {
-  background-color: #FFB800;
-}
-.fairy-tag-container span.fairy-bg-green {
-  background-color: #009688;
-}
-.fairy-tag-container span.fairy-bg-cyan {
-  background-color: #2F4056;
-}
-.fairy-tag-container span.fairy-bg-blue {
-  background-color: #1E9FFF;
-}
-.fairy-tag-container span.fairy-bg-black {
-  background-color: #393D49;
-}
-.fairy-tag-container span.fairy-bg-red,
-.fairy-tag-container span.fairy-bg-orange,
-.fairy-tag-container span.fairy-bg-green,
-.fairy-tag-container span.fairy-bg-cyan,
-.fairy-tag-container span.fairy-bg-blue,
-.fairy-tag-container span.fairy-bg-black {
-  color: #ffffff;
-}
-.fairy-tag-container .fairy-anim-fadein {
-  animation: fariy-fadein 0.3s both;
-}
-.fairy-tag-container .fairy-tag-input[type='text'] {
-  width: 80px;
-  font-size: 13px;
-  padding: 6px;
-  background: transparent;
-  border: 0 none;
-  outline: 0;
-}
-.fairy-tag-container .fairy-tag-input[type='text']:focus::-webkit-input-placeholder {
-  color: transparent;
-}
-.fairy-tag-container .fairy-tag-input[type='text']:focus:-moz-placeholder {
-  color: transparent;
-}
-.fairy-tag-container .fairy-tag-input[type='text']:focus:-moz-placeholder {
-  color: transparent;
-}
-.fairy-tag-container .fairy-tag-input[type='text']:focus:-ms-input-placeholder {
-  color: transparent;
-}
-/*# sourceMappingURL=inputTag.css.map */

target/depository/WEB-INF/classes/static/css/inputTag.less

@@ -1,104 +0,0 @@
-@keyframes fariy-fadein {
-  0% {
-    opacity: 0
-  }
-
-  100% {
-    opacity: 1
-  }
-}
-
-.fairy-tag-container {
-  width: auto;
-  min-height: 100px;
-  padding: 5px;
-  border: 1px solid #e6e6e6;
-  background-color: #ffffff;
-
-  &:hover {
-    border-color: #d2d2d2;
-  }
-
-  span {
-    &.fairy-tag {
-      float: left;
-      font-size: 13px;
-      padding: 5px 8px;
-      margin-right: 5px;
-      margin-bottom: 5px;
-      border-radius: 2px;
-      line-height: 16px;
-
-      a {
-        font-size: 11px;
-        font-weight: bolder;
-        color: #ffffff;
-        text-decoration: none;
-        margin-left: 6px;
-
-        &:hover {
-          cursor: pointer;
-        }
-      }
-    }
-
-    &.fairy-bg-red {
-      background-color: #FF5722;
-    }
-
-    &.fairy-bg-orange {
-      background-color: #FFB800;
-    }
-
-    &.fairy-bg-green {
-      background-color: #009688;
-    }
-
-    &.fairy-bg-cyan {
-      background-color: #2F4056;
-    }
-
-    &.fairy-bg-blue {
-      background-color: #1E9FFF;
-    }
-
-    &.fairy-bg-black {
-      background-color: #393D49;
-    }
-
-    &.fairy-bg-red, &.fairy-bg-orange, &.fairy-bg-green, &.fairy-bg-cyan, &.fairy-bg-blue, &.fairy-bg-black {
-      color: #ffffff;
-    }
-  }
-
-  .fairy-anim-fadein {
-    animation: fariy-fadein .3s both;
-  }
-
-  .fairy-tag-input[type='text'] {
-    width: 80px;
-    font-size: 13px;
-    padding: 6px;
-    background: transparent;
-    border: 0 none;
-    outline: 0;
-
-    &:focus {
-      &::-webkit-input-placeholder {
-        color: transparent;
-      }
-
-      &:-moz-placeholder {
-        color: transparent;
-      }
-
-      &:-moz-placeholder {
-        color: transparent;
-      }
-
-      &:-ms-input-placeholder {
-        color: transparent;
-      }
-    }
-  }
-}

target/depository/WEB-INF/classes/static/css/layuimini.css

@@ -1,993 +0,0 @@
-/**
-配色方案（如有需要，请自行配置）
- */
-/**头部-配色*/
-.layui-layout-admin .layui-header {
-    background-color: #1aa094 !important;
-}
-
-.layui-header > ul > .layui-nav-item.layui-this, .layuimini-tool i:hover {
-    background-color: #197971 !important;
-}
-
-.layui-header .layuimini-header-content > ul > .layui-nav-item.layui-this, .layuimini-tool i:hover {
-    background-color: #197971 !important;
-}
-
-/**logo-配色*/
-.layui-layout-admin .layuimini-logo {
-    background-color: #243346 !important;
-}
-
-/**左侧-配色*/
-.layui-side.layui-bg-black, .layui-side.layui-bg-black > .layuimini-menu-left > ul {
-    background-color: #2f4056 !important;
-}
-
-.layuimini-menu-left .layui-nav .layui-nav-child a:hover:not(.layui-this) {
-    background-color: #3b3f4b;
-}
-
-/**左侧菜单选中-配色*/
-.layui-layout-admin .layui-nav-tree .layui-this, .layui-layout-admin .layui-nav-tree .layui-this > a, .layui-layout-admin .layui-nav-tree .layui-nav-child dd.layui-this, .layui-layout-admin .layui-nav-tree .layui-nav-child dd.layui-this a {
-    background-color: #1aa094 !important;
-}
-
-
-/**头部样式 */
-.layui-layout-admin .header {
-    position: fixed;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-}
-
-.layuimini-header-menu, .layui-header {
-    height: 60px !important;
-}
-
-.layuimini-header-menu > .layui-nav-item {
-    color: #1b1d21;
-    height: 60px !important;
-    line-height: 60px !important;
-}
-
-.layui-header > .layui-layout-right > .layui-nav-item {
-    height: 60px !important;
-    line-height: 60px !important;
-}
-
-.layui-layout-left {
-    left: 295px !important;
-}
-
-.layui-nav.layui-layout-left.layuimini-header-menu.layuimini-pc-show {
-    font-weight: bold;
-    transition: all .2s;
-}
-
-
-/**logo演示（通用） */
-.layui-layout-admin .layuimini-logo {
-    font-weight: bold;
-    color: #ffffff !important;
-    height: 60px !important;
-    line-height: 60px !important;
-    overflow: hidden;
-    line-height: 64px;
-    transition: all .2s !important;
-}
-
-.layui-layout-admin .layuimini-logo img {
-    display: inline-block;
-    height: 40px;
-    vertical-align: middle;
-}
-
-.layui-layout-admin .layuimini-logo h1 {
-    display: inline-block;
-    margin: 0 0 0 12px;
-    color: #ffffff;
-    font-weight: 600;
-    font-size: 20px;
-    font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
-    vertical-align: middle;
-}
-
-/**缩放工具（通用） */
-.layuimini-tool {
-    position: absolute !important;
-    top: 0;
-    left: 235px;
-    width: 60px;
-    height: 100%;
-    line-height: 60px;
-    text-align: center;
-    color: #ffffff !important;
-    transition: all .2s;
-}
-
-/**缩放工具（缩放） */
-.layuimini-tool i {
-    display: block;
-    color: #bbe3df;
-    width: 32px;
-    height: 32px;
-    line-height: 32px;
-    border-radius: 3px;
-    text-align: center;
-    margin-top: 15px;
-    cursor: pointer;
-}
-
-
-
-
-/**tab选项卡 */
-.layuimini-tab {
-    margin: 0px;
-    overflow: hidden;
-    height: 100% !important;
-}
-
-.layuimini-tab .layui-tab-content {
-    height: calc(100% - 37px) !important;
-}
-
-.layuimini-tab .layui-tab-content .layui-tab-item {
-    height: 100%;
-}
-
-.layuimini-tab .layui-tab-content {
-    padding: 0px;
-}
-
-.layuimini-tab .layui-tab-title {
-    border: none;
-    border: 1px solid whitesmoke;
-    background-color: white;
-}
-
-.layuimini-tab .layui-tab-title li {
-    border-right: 1px solid whitesmoke;
-    color: dimgray;
-}
-
-.layuimini-tab .layui-tab-title .layui-tab-bar {
-    display: none;
-}
-
-.layuimini-tab .layui-tab-title .layui-this:after {
-    display: none;
-}
-
-.layuimini-tab .layui-tab-title .layuimini-tab-active {
-    display: inline-block;
-    background-color: lightgray;
-    width: 9px;
-    height: 9px;
-    border-radius: 30px;
-    margin-right: 5px;
-}
-
-.layuimini-tab .layui-tab-title .layui-this .layuimini-tab-active {
-    background-color: #1aa094;
-}
-
-.layuimini-tab > .layui-tab-title, .layuimini-tab > .close-box {
-    height: 35px !important;
-}
-
-.layuimini-tab > .layui-tab-title li, .layuimini-tab > .close-box li {
-    line-height: 35px !important;
-}
-
-.layuimini-tab .layui-tab-title span {
-    color: #acafb1;
-}
-
-.layuimini-tab .layui-tab-title .layui-this span {
-    color: dimgray;
-}
-
-.layuimini-tab .layui-tab-title .layui-tab-close {
-    font-size: 12px !important;
-    width: 14px !important;
-    height: 14px !important;
-    line-height: 16px !important;
-}
-
-.layuimini-tab .layui-tab-title .layui-tab-close:hover {
-    border-radius: 4em;
-    background: #ff5722;
-}
-
-.layuimini-tab .layui-tab-title .disable-close + .layui-tab-close {
-    display: none;
-}
-
-.layuimini-tab .layui-tab-title .able-close + .layui-tab-close {
-    display: inline-block;
-}
-
-.layuimini-tab .layui-tab-control > li {
-    position: absolute;
-    top: 0px;
-    height: 35px;
-    line-height: 35px;
-    width: 35px;
-    text-align: center;
-    background-color: white;
-    border-top: whitesmoke 1px solid;
-    border-bottom: whitesmoke 1px solid;
-}
-
-.layuimini-tab .layuimini-tab-roll-left {
-    left: 0px;
-    border-right: whitesmoke 1px solid;
-    border-left: whitesmoke 1px solid;
-}
-
-.layuimini-tab .layuimini-tab-roll-right {
-    right: 35px;
-    border-left: 1px solid whitesmoke;
-}
-
-.layuimini-tab .layui-tab-tool {
-    right: 0px;
-    border-left: 1px solid whitesmoke;
-}
-
-.layuimini-tab .layui-tab-control .layui-tab-tool,
-.layuimini-tab .layui-tab-control .layuimini-tab-roll-left,
-.layuimini-tab .layui-tab-control .layuimini-tab-roll-right {
-    display: none;
-}
-
-.layuimini-tab.layui-tab-roll .layui-tab-control .layuimini-tab-roll-left,
-.layuimini-tab.layui-tab-roll .layui-tab-control .layuimini-tab-roll-right {
-    display: block;
-}
-
-.layuimini-tab.layui-tab-roll .layui-tab-control .layuimini-tab-roll-right {
-    right: 0px;
-    border-right: 1px solid whitesmoke;
-}
-
-.layuimini-tab.layui-tab-roll .layui-tab-title {
-    padding-left: 35px;
-    padding-right: 35px;
-}
-
-
-.layuimini-tab.layui-tab-tool .layui-tab-control .layui-tab-tool {
-    display: block;
-}
-
-.layuimini-tab.layui-tab-tool .layui-tab-title {
-    padding-left: 0px;
-    padding-right: 35px;
-}
-
-
-.layuimini-tab.layui-tab-rollTool .layui-tab-title {
-    padding-left: 35px;
-    padding-right: 80px;
-}
-
-.layuimini-tab.layui-tab-rollTool .layui-tab-control .layuimini-tab-roll-left,
-.layuimini-tab.layui-tab-rollTool .layui-tab-control .layuimini-tab-roll-right,
-.layuimini-tab.layui-tab-rollTool .layui-tab-control .layui-tab-tool {
-    display: block;
-}
-
-.layuimini-tab .layui-tab-tool .layui-nav {
-    position: absolute;
-    height: 43px !important;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    padding: 0;
-    background: 0 0;
-}
-
-.layuimini-tab .layui-tab-tool .layui-nav-item {
-    height: 35px;
-}
-
-.layuimini-tab .layui-tab-tool .layui-nav-bar {
-    display: none;
-}
-
-.layuimini-tab .layui-tab-tool .layui-nav-child {
-    left: auto;
-    top: 45px;
-    right: 3px;
-    width: 120px;
-    border: 1px solid whitesmoke;
-}
-
-.layuimini-tab .layui-tab-tool .layui-this a {
-    background-color: #009688;
-}
-
-.layuimini-tab-loading {
-    position: absolute;
-    display: none;
-    width: 100%;
-    height: calc(100% - 37px);
-    top: 37px;
-    z-index: 19;
-    background-color: #fff
-}
-
-.layuimini-tab-loading.close {
-    animation: close 1s;
-    -webkit-animation: close 1s;
-    animation-fill-mode: forwards;
-}
-
-/**左侧菜单栏 (通用) */
-.layui-side.layui-bg-black {
-    transition: all .2s;
-}
-
-.layui-side.layui-bg-black > .layuimini-menu-left > ul {
-    transition: all .2s;
-}
-
-.layui-side.layui-bg-black > .layuimini-menu-left > ul > .layui-nav-item:first-child {
-    border-top: 1px solid #4b5461;
-}
-
-.layuimini-menu-left .layui-nav .layui-nav-item a {
-    height: 40px;
-    line-height: 40px;
-    padding-right: 30px;
-}
-
-.layuimini-menu-left .layui-nav .layui-nav-item > a {
-    padding-top: 5px;
-    padding-bottom: 5px;
-}
-
-.layuimini-menu-left .layui-nav .layui-nav-child .layui-nav-child {
-    background: 0 0 !important
-}
-
-.layuimini-menu-left .layui-nav .layui-nav-more {
-    right: 15px;
-}
-
-.layuimini-menu-left .layui-nav .layui-nav-item a:hover {
-    background-color: transparent !important;
-}
-
-.layuimini-menu-left .layui-nav {
-    background-color: transparent !important;
-}
-
-
-
-
-/**左侧菜单栏 (正常) */
-.layui-layout-body .layui-nav-itemed .layui-nav-child a, .layui-layout-body .layuimini-menu-left .layui-nav .layui-nav-child a {
-    padding-left: 35px;
-}
-
-.layui-layout-body .layuimini-menu-left .layui-nav .layui-nav-child .layui-nav-child a {
-    padding-left: 45px;
-}
-
-.layui-layout-body .layuimini-menu-left .layui-nav .layui-nav-child .layui-nav-child .layui-nav-child a {
-    padding-left: 55px;
-}
-
-.layui-layout-body .layuimini-menu-left .layui-nav .layui-nav-child .layui-nav-child .layui-nav-child .layui-nav-child a {
-    padding-left: 65px;
-}
-
-.layui-layout-body .layuimini-menu-left .layui-nav .layui-nav-itemed > .layui-nav-child {
-    padding: 5px 0;
-}
-
-.left_menu_one{
-    width: 25px;
-    height: 25px;
-}
-
-
-/**内容主体（通用） */
-.layui-layout-admin .layui-body {
-    overflow: hidden;
-    bottom: 0px !important;
-    top: 60px !important;
-    transition: all .2s;
-}
-
-/**选择配色方案 */
-.layuimini-color .color-title {
-    padding: 10px 0 10px 20px;
-    border-bottom: 1px solid #d9dada;
-    margin-bottom: 8px;
-}
-
-.layuimini-color .color-content {
-    padding: 10px 5px 0 5px;
-}
-
-.layuimini-color .color-content ul {
-    list-style: none;
-    text-align: center;
-}
-
-.layuimini-color .color-content ul li {
-    position: relative;
-    display: inline-block;
-    vertical-align: top;
-    width: 80px;
-    height: 50px;
-    margin: 0 15px 15px 0;
-    padding: 2px 2px 4px 2px;
-    background-color: #f2f2f2;
-    cursor: pointer;
-    font-size: 12px;
-    color: #666;
-}
-
-.layuimini-color .color-content li.layui-this:after, .layuimini-color .color-content li:hover:after {
-    width: 100%;
-    height: 100%;
-    padding: 4px;
-    top: -5px;
-    left: -5px;
-    border-color: #d8d8d8;
-    opacity: 1;
-}
-
-.layuimini-color .color-content li:after {
-    content: '';
-    position: absolute;
-    z-index: 20;
-    top: 50%;
-    left: 50%;
-    width: 1px;
-    height: 0;
-    border: 1px solid #f2f2f2;
-    transition: all .3s;
-    -webkit-transition: all .3s;
-    opacity: 0;
-}
-
-
-/**其它 */
-.layui-tab-item {
-    width: 100% !important;
-    height: 100% !important;
-}
-
-.layui-nav-item.layui-this {
-    background-color: #1b1d21;
-}
-
-.layui-width-height {
-    width: 100%;
-    height: 95%;
-}
-
-.layui-tab {
-    margin: 0 0 0 0;
-    z-index: 99999;
-}
-
-.text-center {
-    height: 30px !important;
-    line-height: 30px !important;
-    text-align: center !important;
-}
-
-.layui-nav {
-    padding: 0 !important;
-}
-
-.layui-nav .layui-this:after, .layui-nav-bar, .layui-nav-tree .layui-nav-itemed:after {
-    width: 0 !important;
-    height: 0 !important;
-}
-
-.layui-layout-admin .layui-side {
-    top: 60px !important;
-}
-
-.layui-tab-card {
-    box-shadow: 0px 0px 0px #888888;
-    border-bottom: 0;
-}
-
-
-/**自定义滚动条样式 */
-::-webkit-scrollbar {
-    display: none
-}
-
-
-/*移动端遮罩层*/
-.layuimini-make {
-    position: fixed;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    top: 0;
-    z-index: 1000;
-    background: rgba(0, 0, 0, .5);
-    display: none;
-}
-
-.layuimini-mini .layui-header {
-    z-index: 1001;
-}
-
-/**初始化加载层*/
-.layuimini-loader {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-color: #ffffff;
-    z-index: 999999;
-}
-
-.layuimini-loader .layuimini-loader-inner {
-    display: block;
-    position: relative;
-    left: 50%;
-    top: 50%;
-    width: 150px;
-    height: 150px;
-    margin: -75px 0 0 -75px;
-    border-radius: 50%;
-    border: 3px solid transparent;
-    border-top-color: #1E9FFF;
-    animation: spin 2s linear infinite;
-}
-
-.layuimini-loader .layuimini-loader-inner:before {
-    content: "";
-    position: absolute;
-    top: 5px;
-    left: 5px;
-    right: 5px;
-    bottom: 5px;
-    border-radius: 50%;
-    border: 3px solid transparent;
-    border-top-color: #1E9FFF;
-    animation: spin 3s linear infinite;
-}
-
-.layuimini-loader .layuimini-loader-inner:after {
-    content: "";
-    position: absolute;
-    top: 15px;
-    left: 15px;
-    right: 15px;
-    bottom: 15px;
-    border-radius: 50%;
-    border: 3px solid transparent;
-    border-top-color: #1E9FFF;
-    animation: spin 1.5s linear infinite;
-}
-
-@keyframes spin {
-    0% {
-        transform: rotate(0deg);
-    }
-    to {
-        transform: rotate(1turn);
-    }
-}
-
-/*系统设置*/
-
-.layuimini-color .layui-word-aux {
-    position: absolute;
-    left: 60px;
-    top: 12px;
-    font-size: 12px;
-}
-
-.layuimini-color .layui-input-block {
-    margin-left: 15px;
-    min-height: 36px;
-}
-
-.layuimini-color .more-menu-list {
-    width: 100%;
-    margin-top: 30px;
-}
-
-
-.layuimini-color .more-menu-item:first-child {
-    border-top: 1px solid #e8e8e8;
-}
-
-.layuimini-color .more-menu-item .layui-icon {
-    font-size: 18px;
-    padding-right: 10px;
-}
-
-.layuimini-color .more-menu-item {
-    color: #595959;
-    height: 50px;
-    line-height: 50px;
-    font-size: 16px;
-    padding: 0 25px;
-    border-bottom: 1px solid #e8e8e8;
-    font-style: normal;
-    display: block;
-}
-
-.layuimini-color .more-menu-item:hover {
-    background-color: whitesmoke;
-}
-
-.layuimini-color .more-menu-item:after {
-    color: #8c8c8c;
-    right: 16px;
-    content: "\e602";
-    position: absolute;
-    font-family: layui-icon !important;
-}
-
-/**
-鼠标右键
- */
-.layuimini-tab-mousedown {
-    display: none;
-    width: 80px;
-    position: absolute;
-    top: 0px !important;
-    left: 0px !important;
-}
-
-.layuimini-tab-mousedown dd a {
-    padding: 0 15px;
-    color: #484545;
-}
-
-.layuimini-tab-make {
-    position: absolute;
-    top: 36px;
-    bottom: 0px;
-    width: 100%;
-    background: rgb(255, 255, 255, 0);
-    padding: 0px;
-    overflow: hidden;
-}
-
-/**
-菜单缩放
- */
-.popup-tips .layui-layer-TipsG {
-    display: none;
-}
-
-.popup-tips.layui-layer-tips .layui-layer-content {
-    padding: 0;
-}
-
-.popup-tips .layui-nav-tree {
-    width: 150px;
-    border-radius: 10px;
-}
-
-/**左侧菜单字体间距*/
-.layuimini-menu-left .layui-nav-item a span {
-    letter-spacing: 1px;
-}
-
-/**头部菜单字体间距*/
-.layui-layout-admin .layui-header .layuimini-header-menu.layuimini-pc-show, .layui-layout-admin .layui-header .layuimini-header-menu.layuimini-mobile-show {
-    letter-spacing: 1px;
-}
-
-
-/**左侧菜单更多下拉样式*/
-.layuimini-menu-left .layui-nav-more, .layuimini-menu-left-zoom .layui-nav-more {
-    font-family: layui-icon !important;
-    font-size: 12px;
-    font-style: normal;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-    overflow: hidden;
-    width: auto;
-    height: auto;
-    line-height: normal;
-    border: none;
-    display: inline-block;
-    margin-top: -6px !important;
-}
-
-.layuimini-menu-left .layui-nav-child .layui-nav-more {
-    margin-top: -6px !important;
-}
-
-.layuimini-menu-left .layui-nav .layui-nav-mored, .layuimini-menu-left .layui-nav-itemed > a .layui-nav-more {
-    margin-top: -9px !important;
-}
-
-.layuimini-menu-left-zoom.layui-nav .layui-nav-mored, .layuimini-menu-left-zoom.layui-nav-itemed > a .layui-nav-more {
-    margin-top: -9px !important;
-}
-
-.layuimini-menu-left .layui-nav-more:before, .layuimini-menu-left-zoom .layui-nav-more:before {
-    content: "\e61a";
-}
-
-.layuimini-menu-left .layui-nav-itemed > a > .layui-nav-more, .layuimini-menu-left-zoom .layui-nav-itemed > a > .layui-nav-more {
-    transform: rotate(180deg);
-    -ms-transform: rotate(180deg);
-    -moz-transform: rotate(180deg);
-    -webkit-transform: rotate(180deg);
-    -o-transform: rotate(180deg);
-    width: 12px;
-    text-align: center;
-    border-style: none;
-}
-
-.layuimini-menu-left .layui-nav-itemed > a > .layui-nav-more:before, .layuimini-menu-left-zoom .layui-nav-itemed > a > .layui-nav-more:before {
-    content: '\e61a';
-    background-color: transparent;
-    display: inline-block;
-    vertical-align: middle;
-}
-
-/**修复左侧菜单字体不对齐的问题*/
-.layuimini-menu-left .layui-nav-item a .fa, .layuimini-menu-left .layui-nav-item a .layui-icon {
-    width: 20px;
-}
-
-
-/**
- PC版样式
- */
-@media screen and (min-width: 1025px) {
-    /**头部样式（缩放） */
-    .layuimini-mini .layui-layout-left.layuimini-header-menu.layuimini-pc-show {
-        left: 155px !important;
-    }
-
-    /**logo演示（缩放） */
-    .layuimini-mini .layui-layout-admin .layuimini-logo {
-        width: 60px !important;
-    }
-
-    .layuimini-mini .layui-layout-admin .layuimini-logo h1 {
-        display: none;
-    }
-
-    /**左侧菜单栏（缩放） */
-    .layuimini-mini .layuimini-menu-left {
-        width: 80px !important;
-    }
-
-    .layuimini-mini .layui-side.layui-bg-black, .layuimini-mini .layuimini-menu-left > ul, .layuimini-mini .layuimini-menu-left > ul li i {
-        width: 60px !important;
-    }
-
-    .layuimini-mini .layuimini-menu-left > ul li span:first-child {
-        display: none;
-    }
-
-    .layuimini-mini .layuimini-menu-left > ul li span:last-child {
-        float: right;
-        right: 7px;
-    }
-
-    .layuimini-mini .layuimini-menu-left .layui-nav .layui-nav-item a {
-        height: 40px;
-        line-height: 40px;
-        padding-right: 0px !important;
-    }
-
-    /**内容主体（缩放） */
-    .layuimini-mini .layui-layout-admin .layui-body {
-        left: 60px !important;
-    }
-
-    .layuimini-mini .layuimini-tool {
-        left: 95px !important;
-    }
-
-    .layuimini-pc-show {
-        display: block;
-    }
-
-    .layuimini-mobile-show {
-        display: none;
-    }
-
-    /**菜单缩放*/
-    .layuimini-mini .layuimini-menu-left .layui-nav-more, .layuimini-mini .layuimini-menu-left .layui-nav-child {
-        display: none;
-    !important;
-    }
-}
-
-/**
- 手机自适应样式
-*/
-@media screen and (max-width: 1024px) {
-
-    /**
-    todo 修复低版本IOS不能滑动问题, 但还是有问题, 低版本IOS部分情况下子页面无法自适应
-     */
-    .layuimini-tab .layui-tab-content .layui-tab-item {
-        -webkit-overflow-scrolling: touch;
-        overflow: scroll;
-        width: 100%;
-        height: 100%;
-    }
-
-    .layuimini-tab .layui-tab-content .layui-tab-item iframe {
-        height: 100%;
-        width: 100%;
-    }
-
-    .layuimini-pc-show {
-        display: none;
-    }
-
-    .layuimini-mobile-show {
-        display: block;
-    }
-
-    .layuimini-header-content {
-        left: 0;
-    }
-
-    .layuimini-footer-content {
-        left: 0;
-    }
-
-
-    .layui-layout-admin .layui-body .layui-tab-item.layui-show {
-        border-top: 1px solid #e2e2e2;
-    }
-
-    .layuimini-all .layui-layout-left.layuimini-header-menu {
-        left: 15px !important
-    }
-
-    .layuimini-mini .layui-layout-left.layuimini-header-menu {
-        left: 205px !important
-    }
-
-    .layui-layout-admin .layui-nav.layui-layout-right > li:not(.layuimini-setting) {
-        width: 40px !important;
-    }
-
-    .layui-layout-admin .layui-nav.layui-layout-right > li:not(.layuimini-setting) a {
-        padding: 0 15px;
-    }
-
-    .layuimini-all .layui-layout-admin .layui-body {
-        left: 0px !important;
-    }
-
-    .layuimini-mini .layui-layout-admin .layuimini-menu-left, .layuimini-mini .layui-header .layuimini-logo {
-        left: 0;
-        transition: left .2s;
-        z-index: 1001 !important;
-    }
-
-    .layuimini-all .layui-layout-admin .layuimini-menu-left, .layuimini-all .layui-header .layuimini-logo {
-        left: -200px;
-        transition: left .2s;
-        top: 0;
-        z-index: 1002;
-    }
-
-    .layuimini-mini .layui-layout-admin .layui-body {
-        left: 0 !important;
-        transition: left .2s;
-        top: 0;
-        z-index: 998;
-    }
-
-    .layuimini-mini .layuimini-make {
-        display: block;
-    }
-
-    .layuimini-multi-module .layuimini-header-content .layuimini-tool {
-        display: none;
-    }
-
-    .layuimini-single-module .layuimini-header-content .layuimini-tool {
-        left: 15px;
-    }
-
-    .layuimini-mini .layuimini-site-mobile {
-        display: none !important;
-    }
-
-    .layuimini-site-mobile {
-        display: block !important;
-        position: fixed;
-        z-index: 100000;
-        bottom: 15px;
-        left: 15px;
-        width: 40px;
-        height: 40px;
-        line-height: 40px;
-        border-radius: 2px;
-        text-align: center;
-        background-color: rgba(0, 0, 0, .7);
-        color: #fff;
-    }
-
-    .layuimini-header-content {
-        z-index: 997;
-    }
-
-    .layuimini-footer-content {
-        z-index: 997;
-        text-align: center;
-        width: 100%;
-        border-top: 1px solid #ebebeb;
-        background-color: #ffffff;
-        position: fixed;
-        bottom: 0;
-        left: 50%;
-        transform: translateX(-50%);
-        display: flex;
-        align-items: center;
-        justify-content: space-around;
-    }
-
-    .layuimini-footer-content-right {
-        width: 35%;
-        display: inline-block;
-        text-align: center;
-    }
-
-    .layuimini-footer-content-center {
-        width: 25%;
-        display: inline-block;
-        text-align: center;
-    }
-
-    .layuimini-footer-content-left {
-        width: 35%;
-        display: inline-block;
-        text-align: center;
-    }
-
-    .layuimini-footer-content-item {
-        width: 1%;
-        position: relative;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        display: table-cell;
-    }
-
-
-
-    /*修复UC之类的浏览器点击无效*/
-    .layuimini-make {
-        cursor: pointer;
-    }
-
-    .layuimini-site-mobile {
-        cursor: pointer;
-    }
-}
-
-@media screen and (max-width: 550px) {
-
-    /**头部右侧数据*/
-    .layuimini-multi-module.layuimini-mini .layuimini-header-content .layui-layout-right {
-        display: none;
-    }
-}

target/depository/WEB-INF/classes/static/css/public.css

@@ -1,313 +0,0 @@
-body {
-    background: #f2f2f2;
-}
-
-.layuimini-container {
-    border: 1px solid #f2f2f2;
-    border-radius: 5px;
-    background-color: #ffffff
-}
-
-.layuimini-main {
-    margin: 10px 10px 10px 10px;
-}
-
-/**必填红点 */
-.layuimini-form > .layui-form-item > .required:after {
-    content: '*';
-    color: red;
-    position: absolute;
-    margin-left: 4px;
-    font-weight: bold;
-    line-height: 1.8em;
-    top: 6px;
-    right: 5px;
-}
-
-.layuimini-form > .layui-form-item > .layui-form-label {
-    width: 120px;
-}
-
-.layuimini-form > .layui-form-item > .layui-input-block {
-    margin-left: 150px !important;
-}
-
-.layuimini-form > .layui-form-item > .layui-input-block > tip {
-    display: inline-block;
-    margin-top: 10px;
-    line-height: 10px;
-    font-size: 10px;
-    color: #a29c9c;
-}
-
-/**搜索框*/
-.layuimini-container .table-search-fieldset {
-    margin: 0;
-    border: 1px solid #e6e6e6;
-    padding: 10px 20px 5px 20px;
-    color: #6b6b6b;
-    /*position: sticky;*/
-    /*top: 0;*/
-    /*z-index: 999;*/
-    background: #ffffff;
-}
-
-/**自定义滚动条样式 */
-::-webkit-scrollbar {
-    width: 6px;
-    height: 6px
-}
-
-::-webkit-scrollbar-track {
-    background-color: transparent;
-    -webkit-border-radius: 2em;
-    -moz-border-radius: 2em;
-    border-radius: 2em;
-}
-
-::-webkit-scrollbar-thumb {
-    background-color: #9c9da0;
-    -webkit-border-radius: 2em;
-    -moz-border-radius: 2em;
-    border-radius: 2em
-}
-
-.my-shadow:hover {
-    box-shadow: 2px 0 4px rgba(0, 21, 41, .35);
-}
-
-.my-card {
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-}
-
-.my-card-context {
-    margin-left: 15px;
-    font-size: 18px;
-    margin-top: 5px;
-    font-weight: normal;
-}
-
-.my-time {
-    margin-top: 40px;
-    margin-bottom: 20px;
-}
-
-.my-info {
-    margin-top: 10px;
-    margin-bottom: 20px;
-}
-
-body {
-    font-family: 华文楷体;
-    font-weight: bold;
-}
-
-
-.waterfall-demo {
-    position: relative;
-    opacity: 0;
-    transition: .2s ease;
-    margin-bottom: 60px;
-}
-
-.waterfall-grid {
-    position: relative;
-    /* fluffy */
-    margin: 0 auto;
-    width: 98%;
-    /* end fluffy */
-}
-
-.waterfall-grid-item {
-    position: absolute;
-    top: 0;
-    left: 0;
-    /* fluffy */
-    width: 45%;
-    /*height: 120px;*/
-    border-radius: 3px;
-    background-color: #EDEDED;
-    /* end fluffy */
-    -webkit-transition: .3s ease-in-out;
-    -o-transition: .3s ease-in-out;
-    transition: .3s ease-in-out;
-    border: 1px solid #ADADAD;
-}
-
-/* mq */
-
-@media (max-width: 600px) {
-    .grid-item {
-        width: 120px;
-        height: 80px;
-    }
-}
-
-
-.layui-return-top {
-    position: fixed;
-    z-index: 100000;
-    bottom: 15px;
-    right: 15px;
-    width: 40px;
-    height: 40px;
-    line-height: 40px;
-    border-radius: 2px;
-    text-align: center;
-    background-color: rgba(0, 0, 0, .7);
-    color: #fff;
-    cursor: pointer;
-}
-
-
-.layuimini-qiuck-module a i {
-    display: inline-block;
-    width: 100%;
-    height: 60px;
-    line-height: 60px;
-    text-align: center;
-    border-radius: 2px;
-    font-size: 30px;
-    background-color: #F8F8F8;
-    color: #333;
-    transition: all .3s;
-    -webkit-transition: all .3s;
-}
-
-.layuimini-qiuck-module a cite {
-    position: relative;
-    top: 2px;
-    display: block;
-    color: #666;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    font-size: 14px;
-}
-
-
-.layuimini-notice:hover, .layuimini-myTask:hover,.layuimini-myApply:hover {
-    background: #f6f6f6;
-}
-
-.layuimini-notice, .layuimini-myTask,.layuimini-myApply {
-    padding: 7px 16px;
-    clear: both;
-    font-size: 12px !important;
-    cursor: pointer;
-    position: relative;
-    transition: background 0.2s ease-in-out;
-}
-
-.layuimini-notice-title, .layuimini-notice-label, .layuimini-myTask-type,.layuimini-myApply-type {
-    padding-right: 70px !important;
-    text-overflow: ellipsis !important;
-    overflow: hidden !important;
-    white-space: nowrap !important;
-}
-
-.layuimini-notice-title, .layuimini-myTask-type,.layuimini-myApply-type {
-    line-height: 28px;
-    font-size: 14px;
-}
-
-.layuimini-notice-extra, .layuimini-myTask-extra ,layuimini-myApply-extra{
-    position: absolute;
-    top: 50%;
-    margin-top: -8px;
-    right: 16px;
-    display: inline-block;
-    height: 16px;
-    color: #999;
-}
-
-.userInfo_icon {
-    height: 200px;
-    width: 200px;
-    border-radius: 50%;
-}
-
-.layuimini-authority {
-    margin-top: 20px;
-}
-
-.layuimini-authority-content {
-    margin-top: 10px;
-}
-
-.layuimini-authority-content-item {
-
-    width: 21%;
-    float: left;
-    margin: 2%;
-}
-
-.layuimini-authority-content:before, .layuimini-authority-content:after {
-    content: "";
-    display: block;
-    clear: both;
-}
-
-
-.layuimini-authority-content-item a i {
-    display: inline-block;
-    width: 100%;
-    height: 50px;
-    line-height: 50px;
-    text-align: center;
-    border-radius: 2px;
-    font-size: 30px;
-    transition: all .3s;
-    -webkit-transition: all .3s;
-    background-color:#ffffff;
-}
-
-.layuimini-authority-content-item a cite {
-    position: relative;
-    top: 2px;
-    left: 5px;
-    display: block;
-    color: #666;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    font-size: 14px;
-}
-
-.layuimini-authority-title{
-    font-weight: bolder;
-    font-size: larger;
-}
-
-#refresh{
-    position: fixed;
-    right: 5px;
-    top: 15px;
-    z-index: 999;
-}
-
-.authorityMenuImg{
-    width: 35px;
-    height: 35px;
-    display: inline-block;
-    position: relative;
-    left: 15px;
-}
-
-.userItem{
-    margin: 20px 10px ;
-}
-
-.userItemLabel{
-
-}
-
-.userItemBtn{
-    display: inline-block;
-}
-
-
-

target/depository/WEB-INF/classes/static/css/themes/default.css

@@ -1,95 +0,0 @@
-/*头部右侧背景色 headerRightBg */
-.layui-layout-admin .layui-header {
-    background-color: #ffffff !important;
-}
-
-/*头部右侧选中背景色 headerRightBgThis */
-.layui-layout-admin .layui-header .layuimini-header-content > ul > .layui-nav-item.layui-this, .layuimini-tool i:hover {
-    background-color: #e4e4e4 !important;
-}
-
-/*头部右侧字体颜色 headerRightColor */
-.layui-layout-admin .layui-header .layui-nav .layui-nav-item a {
-    color: rgba(107, 107, 107, 0.7);
-}
-
-/**头部右侧下拉字体颜色 headerRightChildColor */
-.layui-layout-admin .layui-header .layui-nav .layui-nav-item .layui-nav-child a {
-    color: rgba(107, 107, 107, 0.7) !important;
-}
-
-/*头部右侧鼠标选中 headerRightColorThis */
-.layui-header .layuimini-menu-header-pc.layui-nav .layui-nav-item a:hover, .layui-header .layuimini-header-menu.layuimini-pc-show.layui-nav .layui-this a {
-    color: #565656 !important;
-}
-
-/*头部右侧更多下拉颜色 headerRightNavMore */
-.layui-header .layui-nav .layui-nav-more {
-    border-top-color: rgba(160, 160, 160, 0.7) !important;
-}
-
-/*头部右侧更多下拉颜色 headerRightNavMore */
-.layui-header .layui-nav .layui-nav-mored, .layui-header .layui-nav-itemed > a .layui-nav-more {
-    border-color: transparent transparent rgba(160, 160, 160, 0.7) !important;
-}
-
-/**头部右侧更多下拉配置色 headerRightNavMoreBg headerRightNavMoreColor */
-.layui-header .layui-nav .layui-nav-child dd.layui-this a, .layui-header .layui-nav-child dd.layui-this, .layui-layout-admin .layui-header .layui-nav .layui-nav-item .layui-nav-child .layui-this a {
-    background-color: #1E9FFF !important;
-    color: #ffffff !important;
-}
-
-/*头部缩放按钮样式 headerRightToolColor */
-.layui-layout-admin .layui-header .layuimini-tool i {
-    color: #565656;
-}
-
-/*logo背景颜色 headerLogoBg */
-.layui-layout-admin .layuimini-logo {
-    background-color: #192027 !important;
-}
-
-/*logo字体颜色 headerLogoColor */
-.layui-layout-admin .layuimini-logo h1 {
-    color: rgb(191, 187, 187);
-}
-
-/*左侧菜单更多下拉样式 leftMenuNavMore */
-.layuimini-menu-left .layui-nav .layui-nav-more, .layuimini-menu-left-zoom.layui-nav .layui-nav-more {
-    border-top-color: rgb(191, 187, 187);
-}
-
-/*左侧菜单更多下拉样式 leftMenuNavMore */
-.layuimini-menu-left .layui-nav .layui-nav-mored, .layuimini-menu-left .layui-nav-itemed > a .layui-nav-more, .layuimini-menu-left-zoom.layui-nav .layui-nav-mored, .layuimini-menu-left-zoom.layui-nav-itemed > a .layui-nav-more {
-    border-color: transparent transparent rgb(191, 187, 187) !important;
-}
-
-/*左侧菜单背景 leftMenuBg */
-.layui-side.layui-bg-black, .layui-side.layui-bg-black > .layuimini-menu-left > ul, .layuimini-menu-left-zoom > ul {
-    background-color: #28333E !important;
-}
-
-/*左侧菜单选中背景 leftMenuBgThis */
-.layuimini-menu-left .layui-nav-tree .layui-this, .layuimini-menu-left .layui-nav-tree .layui-this > a, .layuimini-menu-left .layui-nav-tree .layui-nav-child dd.layui-this, .layuimini-menu-left .layui-nav-tree .layui-nav-child dd.layui-this a, .layuimini-menu-left-zoom.layui-nav-tree .layui-this, .layuimini-menu-left-zoom.layui-nav-tree .layui-this > a, .layuimini-menu-left-zoom.layui-nav-tree .layui-nav-child dd.layui-this, .layuimini-menu-left-zoom.layui-nav-tree .layui-nav-child dd.layui-this a {
-    background-color: #1E9FFF !important
-}
-
-/*左侧菜单子菜单背景 leftMenuChildBg */
-.layuimini-menu-left .layui-nav-itemed > .layui-nav-child {
-    background-color: #0c0f13 !important;
-}
-
-/*左侧菜单字体颜色 leftMenuColor */
-.layuimini-menu-left .layui-nav .layui-nav-item a, .layuimini-menu-left-zoom.layui-nav .layui-nav-item a {
-    color: rgb(191, 187, 187) !important;
-}
-
-/*左侧菜单选中字体颜色 leftMenuColorThis */
-.layuimini-menu-left .layui-nav .layui-nav-item a:hover, .layuimini-menu-left .layui-nav .layui-this a, .layuimini-menu-left-zoom.layui-nav .layui-nav-item a:hover, .layuimini-menu-left-zoom.layui-nav .layui-this a {
-    color: #ffffff !important;
-}
-
-/**tab选项卡选中颜色 tabActiveColor */
-.layuimini-tab .layui-tab-title .layui-this .layuimini-tab-active {
-    background-color: #1e9fff;
-}