From 1162ba7e417002dbb6f240d72ca9b0c220b2d028 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Thu, 20 Apr 2023 17:43:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E5=92=8C=E4=B8=8A=E8=B4=A7=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MessageCenterController.java   | 10 +++-
 .../mapper/MessageCenterMapper.java           |  6 +++
 .../service/MessageCenterService.java         |  6 +++
 .../impl/MessageCenterServiceImpl.java        |  5 ++
 .../messageCenter/MessageCenterMapper.xml     | 50 +++++++++++++++++++
 .../model/flowlaunch/FlowLaunchListVO.java    |  3 ++
 .../service/impl/FlowTaskServiceImpl.java     | 12 ++++-
 .../src/views/workFlow/flowLaunch/index.vue   |  1 +
 8 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/controller/MessageCenterController.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/controller/MessageCenterController.java
index e4de5aab..55767249 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/controller/MessageCenterController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/controller/MessageCenterController.java
@@ -99,7 +99,15 @@ public class MessageCenterController {
         return ActionResult.success(saleQuantityData);
     }
 
-
+    /**
+     *获取今天的上货量
+     */
+    @GetMapping(value = "/getTadayPoundist1")
+    @ApiOperation("获取今天的上货量")
+    public ActionResult getTadayPoundist1(){
+        Map saleQuantityData = messageCenterService.getTadayPoundist1();
+        return ActionResult.success(saleQuantityData);
+    }
 
     /**
      * 列表
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java
index 112e05ef..35d36872 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java
@@ -61,6 +61,12 @@ public interface MessageCenterMapper extends BaseMapper<MessageCenterEntity> {
      */
    List<Map> getTadayPoundist();
 
+    /**'
+     * 获取今天的上货量
+     * @return
+     */
+    List<Map> getTadayPoundist1();
+
     /**
      * 获取最近一年的结算量
      * @return
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java
index ec838a69..701e2383 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java
@@ -60,6 +60,12 @@ public interface MessageCenterService extends IService<MessageCenterEntity> {
      */
     Map getTadayPoundist();
 
+    /**
+     * 获取今天的上货量
+     * @return
+     */
+    Map getTadayPoundist1();
+
     /**
      * 获取一年的统计数据
      * @return
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java
index 3ecaf459..834814e0 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java
@@ -436,6 +436,11 @@ public class MessageCenterServiceImpl extends ServiceImpl<MessageCenterMapper, M
         return messageCenterMapper.getTadayPoundist().get(0);
     }
 
+    @Override
+    public Map getTadayPoundist1() {
+        return messageCenterMapper.getTadayPoundist1().get(0);
+    }
+
     @Override
     public Map getOneYearData() {
         SimpleDateFormat dateFormat = new SimpleDateFormat("MM月");
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml
index e2a8e2b8..5221d584 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml
@@ -486,6 +486,56 @@
             ) aaa
     </select>
 
+
+    <resultMap id="getTadayPoundistMap1" type="map">
+        <!--榜单张数-->
+        <result property="poundNum" column="poundNum"/>
+        <!--总扣重-->
+        <result property="buckleWeightSum" column="buckleWeightSum"/>
+        <!--总结算重量-->
+        <result property="settlementSum" column="settlementSum"/>
+        <!--采购总额-->
+        <result property="purchaseAmountSum" column="purchaseAmountSum"/>
+        <!--销售总额-->
+        <result property="salesAmountSum" column="salesAmountSum"/>
+    </resultMap>
+    <select id="getTadayPoundist1" resultMap="getTadayPoundistMap1">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    count(*) poundNum,
+                    IFNULL(
+                            ROUND( SUM( CASE a.unit WHEN '0' THEN a.net_weight WHEN '1' THEN a.net_weight / 1000 END ), 6 ),
+                            0
+                        ) buckleWeightSum,
+                    IFNULL(
+                            ROUND(
+                                    SUM(
+                                            CASE
+                                                a.unit
+                                                WHEN '0' THEN
+                                                    ( CASE a.is_Invoicing WHEN '1' THEN a.settlement ELSE 0 END )
+                                                WHEN '1' THEN
+                                                    ( CASE a.is_Invoicing WHEN '1' THEN a.settlement ELSE 0 END ) / 1000
+                                                END
+                                        ),
+                                    6
+                                ),
+                            0
+                        ) settlementSum,
+                    IFNULL( ROUND( SUM( a.settlement * a.purchase_price ), 6 ), 0 ) purchaseAmountSum,
+                    IFNULL( ROUND( SUM( a.settlement * a.sales_price ), 6 ), 0 ) salesAmountSum
+                FROM
+                    jg_poundlist a
+                WHERE
+                    a.delete_mark = '0'
+                  AND TO_DAYS(
+                              NOW()) - TO_DAYS( a.pound_date ) = 0
+            ) aaa
+    </select>
+
     <resultMap id="getSettAmountOneYearDataMap" type="map">
         <result property="settlementAmount0" column="settlementAmount0"/>
         <result property="settlementAmount1" column="settlementAmount1"/>
diff --git a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowlaunch/FlowLaunchListVO.java b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowlaunch/FlowLaunchListVO.java
index 7c354162..06bfee46 100644
--- a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowlaunch/FlowLaunchListVO.java
+++ b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowlaunch/FlowLaunchListVO.java
@@ -47,4 +47,7 @@ public class FlowLaunchListVO {
     private Integer formType;
     @ApiModelProperty(value = "表单数据")
     private String formData;
+
+    @ApiModelProperty(value = "付款申请描述")
+    private String paymentDescription;
 }
diff --git a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java
index 05c00f9c..578f2a9d 100644
--- a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java
+++ b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java
@@ -143,8 +143,10 @@ public class FlowTaskServiceImpl extends ServiceImpl<FlowTaskMapper, FlowTaskEnt
             queryWrapper.lambda().and(
                     t -> t.like(FlowTaskEntity::getEnCode, keyWord)
                             .or().like(FlowTaskEntity::getFullName, keyWord)
+//                            .or().like(FlowTaskEntity::getDescription, keyWord)
             );
         }
+
         //日期范围（近7天、近1月、近3月、自定义）
         String startTime = paginationFlowTask.getStartTime() != null ? paginationFlowTask.getStartTime() : null;
         String endTime = paginationFlowTask.getEndTime() != null ? paginationFlowTask.getEndTime() : null;
@@ -153,6 +155,11 @@ public class FlowTaskServiceImpl extends ServiceImpl<FlowTaskMapper, FlowTaskEnt
             Date endTimes = DateUtil.stringToDate(DateUtil.daFormatYmd(Long.parseLong(endTime)) + " 23:59:59");
             queryWrapper.lambda().ge(FlowTaskEntity::getCreatorTime, startTimes).le(FlowTaskEntity::getCreatorTime, endTimes);
         }
+//        //流程描述
+//        String Description = paginationFlowTask.getFlowId() != null ? paginationFlowTask.getFlowId() : null;
+//        if (!StringUtils.isEmpty(Description)) {
+//            queryWrapper.lambda().eq(FlowTaskEntity::getFlowId, Description);
+//        }
         //所属流程
         String flowName = paginationFlowTask.getFlowId() != null ? paginationFlowTask.getFlowId() : null;
         if (!StringUtils.isEmpty(flowName)) {
@@ -304,7 +311,7 @@ public class FlowTaskServiceImpl extends ServiceImpl<FlowTaskMapper, FlowTaskEnt
         //关键字（流程名称、流程编码）
         String keyWord = paginationFlowTask.getKeyword() != null ? paginationFlowTask.getKeyword() : null;
         if (!StringUtils.isEmpty(keyWord)) {
-            dbSql.append(" AND (t.F_EnCode like '%" + keyWord + "%' or t.F_FullName like '%" + keyWord + "%') ");
+            dbSql.append(" AND (t.F_EnCode like '%" + keyWord + "%' or t.F_FullName like '%" + keyWord + "%' or t.F_Description like '%" + keyWord + "%') ");
         }
         //日期范围（近7天、近1月、近3月、自定义）
         String startTime = paginationFlowTask.getStartTime() != null ? paginationFlowTask.getStartTime() : null;
@@ -458,7 +465,8 @@ public class FlowTaskServiceImpl extends ServiceImpl<FlowTaskMapper, FlowTaskEnt
         //关键字（流程名称、流程编码）
         String keyWord = paginationFlowTask.getKeyword() != null ? paginationFlowTask.getKeyword() : null;
         if (!StringUtils.isEmpty(keyWord)) {
-            dbSql.append(" AND (t.F_EnCode like " + " '%" + keyWord + "%' " + " or t.F_FullName like" + " '%" + keyWord + "%') ");
+              dbSql.append(" AND (t.F_EnCode like '%" + keyWord + "%' or t.F_FullName like '%" + keyWord + "%' or t.F_Description like '%" + keyWord + "%') ");
+//            dbSql.append(" AND (t.F_EnCode like " + " '%" + keyWord + "%' " + " or t.F_FullName like" + " '%" + keyWord + "%') ");
         }
         //日期范围（近7天、近1月、近3月、自定义）
         String startTime = paginationFlowTask.getStartTime() != null ? paginationFlowTask.getStartTime() : null;
diff --git a/SC-web/src/views/workFlow/flowLaunch/index.vue b/SC-web/src/views/workFlow/flowLaunch/index.vue
index 00e1ee93..906ada4b 100644
--- a/SC-web/src/views/workFlow/flowLaunch/index.vue
+++ b/SC-web/src/views/workFlow/flowLaunch/index.vue
@@ -75,6 +75,7 @@
         </div>
         <JNPF-table v-loading="listLoading" :data="list">
           <el-table-column prop="fullName" label="流程标题" show-overflow-tooltip min-width="150" />
+          <el-table-column prop="description" label="流程描述" min-width="200" />
           <el-table-column prop="flowName" label="所属流程" width="130" />
           <el-table-column prop="startTime" label="发起时间" width="130"
             :formatter="jnpf.tableDateFormat" />