From 9410735eef3a4a07a12a4bc17fc94997616aefb8 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Tue, 19 Apr 2022 13:49:38 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=88=91=E7=9A=84=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BDbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=202=E3=80=81=E7=88=AC=E8=99=AB=E4=B8=AD?=
 =?UTF-8?q?=E5=85=B3=E6=9D=91=E6=95=B0=E6=8D=AE=E6=8E=92=E5=BA=8F=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/business/workflow/workflow/leave.js   |  8 ----
 .../workflow/workflow/leave/index.vue         | 40 +++++++++++--------
 .../java/com/xjs/zol/pojo/ZolNotebook.java    |  6 +++
 .../main/java/com/xjs/zol/pojo/ZolPhone.java  |  6 +++
 .../service/impl/ZolNotebookServiceImpl.java  |  2 +
 .../zol/service/impl/ZolPhoneServiceImpl.java |  3 ++
 .../com/xjs/zol/webmagic/ZolProcessor.java    |  9 ++++-
 .../controller/WorkflowLeaveController.java   |  5 ++-
 .../workflow/leave/domain/WorkflowLeave.java  |  6 +--
 9 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/ruoyi-ui/src/api/business/workflow/workflow/leave.js b/ruoyi-ui/src/api/business/workflow/workflow/leave.js
index 0c2a4aed..05b3bf6f 100644
--- a/ruoyi-ui/src/api/business/workflow/workflow/leave.js
+++ b/ruoyi-ui/src/api/business/workflow/workflow/leave.js
@@ -52,11 +52,3 @@ export function delLeave(id) {
   })
 }
 
-// 导出请假
-export function exportLeave(query) {
-  return request({
-    url: '/workflow/workflow/leave/export',
-    method: 'get',
-    params: query
-  })
-}
diff --git a/ruoyi-ui/src/views/business/workflow/workflow/leave/index.vue b/ruoyi-ui/src/views/business/workflow/workflow/leave/index.vue
index bac01c1e..add1a4ae 100644
--- a/ruoyi-ui/src/views/business/workflow/workflow/leave/index.vue
+++ b/ruoyi-ui/src/views/business/workflow/workflow/leave/index.vue
@@ -1,6 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item label="请假类型" prop="type">
         <el-select style="width: 150px" v-model="queryParams.type" placeholder="请选择请假类型" clearable size="small"
                    @change="handleQuery">
@@ -12,15 +22,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="标题" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入标题"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
 
       <el-form-item label="状态" prop="state">
         <el-select style="width: 150px" v-model="queryParams.state" placeholder="请选择状态" clearable size="small"
@@ -171,10 +172,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="标题" prop="title" style="width: 460px">
-          <el-input v-model="form.title"/>
+          <el-input disabled v-model="form.title"/>
         </el-form-item>
         <el-form-item label="原因" prop="reason">
-          <el-input v-model="form.reason" type="textarea" style="width: 380px" placeholder="请输入原因"/>
+          <el-input v-model="form.reason" :rows="4" type="textarea" style="width: 380px" placeholder="请输入原因"/>
         </el-form-item>
 
         <el-form-item label="选择时间" prop="betDateTime">
@@ -190,8 +191,10 @@
 
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <at-button-group :gap="5">
+          <at-button hollow type="success" @click="submitForm">确 定</at-button>
+          <at-button hollow @click="cancel">取 消</at-button>
+        </at-button-group>
       </div>
     </el-dialog>
   </div>
@@ -399,17 +402,20 @@ export default {
 
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams
+      let _that =this
       this.$confirm('是否确认导出所有请假数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function () {
-        return exportLeave(queryParams)
-      }).then(response => {
-        this.download(response.msg)
+
+        _that.download('workflow/workflow/leave/export', {
+          ..._that.queryParams
+        }, `leave_${new Date().getTime()}.xlsx`)
+
       })
     },
+
     chooseMedicine() {
       this.form.title = this.createName + "的" + this.form.type + "申请";
     }
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/pojo/ZolNotebook.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/pojo/ZolNotebook.java
index 7d9f954d..675faf81 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/pojo/ZolNotebook.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/pojo/ZolNotebook.java
@@ -67,6 +67,12 @@ public class ZolNotebook extends BaseEntity implements Serializable {
     @Excel(name = "价格")
     private String price;
 
+    /**
+     * 排序
+     */
+    @Excel(name = "排序")
+    private Integer sort;
+
     @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/pojo/ZolPhone.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/pojo/ZolPhone.java
index 5696147f..68a8cb03 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/pojo/ZolPhone.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/pojo/ZolPhone.java
@@ -52,6 +52,12 @@ public class ZolPhone extends BaseEntity {
     @Excel(name = "价格")
     private BigDecimal price;
 
+    /**
+     * 排序
+     */
+    @Excel(name = "排序")
+    private Integer sort;
+
     @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/service/impl/ZolNotebookServiceImpl.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/service/impl/ZolNotebookServiceImpl.java
index f84aaab8..e5f9ae9e 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/service/impl/ZolNotebookServiceImpl.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/service/impl/ZolNotebookServiceImpl.java
@@ -33,6 +33,8 @@ public class ZolNotebookServiceImpl extends ServiceImpl<ZolNotebookMapper, ZolNo
                     .or()
                     .like(ZolNotebook::getDescription, condition);
         });
+        //排序规则
+        wr.orderByAsc(ZolNotebook::getSort).orderByDesc(ZolNotebook::getId);
         return this.page(startPageMP, wr);
     }
 }
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/service/impl/ZolPhoneServiceImpl.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/service/impl/ZolPhoneServiceImpl.java
index 93fb2aa4..8270b5e2 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/service/impl/ZolPhoneServiceImpl.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/service/impl/ZolPhoneServiceImpl.java
@@ -38,6 +38,9 @@ public class ZolPhoneServiceImpl extends ServiceImpl<ZolPhoneMapper, ZolPhone> i
                     .like(ZolPhone::getDescription, condition);
         });
 
+        //排序规则
+        wr.orderByAsc(ZolPhone::getSort).orderByDesc(ZolPhone::getId);
+
         return this.page(startPageMP,wr);
     }
 }
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/webmagic/ZolProcessor.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/webmagic/ZolProcessor.java
index 606621a7..c18c2175 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/webmagic/ZolProcessor.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/zol/webmagic/ZolProcessor.java
@@ -49,7 +49,7 @@ public class ZolProcessor implements PageProcessor {
             List<Selectable> nodes = page.getHtml().css("#J_CategoryItems > .item > h3 > a").nodes();
             for (Selectable node : nodes) {
 
-                if ("手机".equals(node.css("a", "text").get())) {
+                if ("智能手机".equals(node.css("a", "text").get())) {
                     String href = node.css("a", "href").get();
                     page.addTargetRequests(Collections.singletonList(href));
                 }
@@ -70,6 +70,9 @@ public class ZolProcessor implements PageProcessor {
 
             //获取当前页面是手机还是电脑
             String title = page.getHtml().css(".wrapper > .breadcrumb-filter-selected > .breadcrumb > span", "text").get();
+            if (StringUtils.isEmpty(title)) {
+                title = page.getHtml().css("#J_FilterSelected > a").get();
+            }
 
             //拿到每个li 标签
             List<Selectable> lis = page.getHtml().css("#J_PicMode > li").nodes();
@@ -79,6 +82,8 @@ public class ZolProcessor implements PageProcessor {
 
                 for (Selectable li : lis) {
                     ZolPhone zolPhone = new ZolPhone();
+                    //设置排序
+                    zolPhone.setSort(count);
 
                     //排除无用数据
                     if ("display:none;".equals(li.css("li", "style").get())) {
@@ -145,6 +150,8 @@ public class ZolProcessor implements PageProcessor {
 
                 for (Selectable li : lis) {
                     ZolNotebook zolNotebook = new ZolNotebook();
+                    //设置排序
+                    zolNotebook.setSort(count);
 
                     //排除无用数据
                     if ("display:none;".equals(li.css("li", "style").get())) {
diff --git a/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/controller/WorkflowLeaveController.java b/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/controller/WorkflowLeaveController.java
index ddccf1a4..56222e66 100644
--- a/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/controller/WorkflowLeaveController.java
+++ b/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/controller/WorkflowLeaveController.java
@@ -61,11 +61,12 @@ public class WorkflowLeaveController extends BaseController {
      * 导出请假列表
      */
     @Log(title = "请假", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
+    @PostMapping("/export")
     @RequiresPermissions("workflow:leave:export")
     @ApiOperation("导出请假列表")
     public void export(HttpServletResponse response, WorkflowLeave workflowLeave) {
-        List<WorkflowLeave> list = workflowLeaveService.selectWorkflowLeaveList(workflowLeave);
+        workflowLeave.setCreateBy(SecurityUtils.getUsername());
+        List<WorkflowLeave> list = workflowLeaveService.selectWorkflowLeaveAndTaskNameList(workflowLeave);
         ExcelUtil<WorkflowLeave> util = new ExcelUtil<>(WorkflowLeave.class);
         util.exportExcel(response, list, "leave");
     }
diff --git a/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/domain/WorkflowLeave.java b/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/domain/WorkflowLeave.java
index d509f2a8..2e056f04 100644
--- a/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/domain/WorkflowLeave.java
+++ b/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/domain/WorkflowLeave.java
@@ -42,13 +42,13 @@ public class WorkflowLeave extends BaseEntity {
     /**
      * 开始时间
      */
-    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date leaveStartTime;
 
     /**
      * 结束时间
      */
-    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date leaveEndTime;
 
 
@@ -58,7 +58,7 @@ public class WorkflowLeave extends BaseEntity {
     /**
      * 状态
      */
-    @Excel(name = "状态")
+    @Excel(name = "状态",readConverterExp = "0=进行中,1=成功,2=失败")
     private String state;
 
     /**