Merge remote-tracking branch 'origin/自动要货-按公司层级和C类产品2547' into uat

suishenbang-admin/src/main/resources/templates/system/upvoteLog/upvoteLog.html

@@ -178,7 +178,7 @@
                     title : '销售部'
                 },
                 {
-                    field : 'updateTime',
+                    field : 'updateTimeStr',
                     title : '操作时间'
                 },
                 {

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/HanaOrderComponent.java

@@ -113,6 +113,7 @@ public class HanaOrderComponent {
                 "               T.NTGEW_MARA,\n"+
                 "               T.PSTYV,\n"+
                 "               T.UEPOS, \n"+
+                "               T.MAABC, \n"+
                 "\t replace(replace(T.BSTKD_E,CHAR(10),''),CHAR(13),'') BSTKD_E \n" +
                 "FROM (\n" +
                 "\n" +
@@ -169,6 +170,7 @@ public class HanaOrderComponent {
                 "               A.NTGEW_MARA,"+
                 "               A.PSTYV,"+
                 "               A.UEPOS,"+
+                "               A.MAABC,"+
                 "                A.BSTKD_E "+
                 "FROM \"_SYS_BIC\".\"com.sd/CAL_SALES\"" +
                 "('PLACEHOLDER' = ('$$IP_ENDDATE$$',\n" +
@@ -508,6 +510,7 @@ public class HanaOrderComponent {
                                 +"$$"+ result.getString("NTGEW_MARA")
                                 +"$$"+ result.getString("PSTYV")
                                 +"$$"+ result.getString("UEPOS")
+                                +"$$"+ result.getString("MAABC")
                                 +"$$"+ result.getString("BSTKD_E")
                                 + "\r\n");
 

suishenbang-system/src/main/java/com/dgtly/system/domain/AlertUpvoteLog.java

@@ -1,5 +1,6 @@
 package com.dgtly.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -63,6 +64,8 @@ public class AlertUpvoteLog extends BaseEntity
     /** 销售部 */
     @Excel(name = "销售部")
     private String subOfficeName;
+    @Excel(name = "操作时间")
+    private String updateTimeStr;
     /** 级别 */
     private String salesLevel;
 

suishenbang-system/src/main/resources/mapper/system/AlertUpvoteLogMapper.xml

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select alert_upvote_id as alertUpvoteId,
                alert_id as alertId,
                create_time as createTime,
-               update_time as updateTime,
+               DATE_FORMAT(update_time, '%Y-%m-%d %H:%i:%s') as updateTimeStr,
                user_id as userId,
                status as status,
                login_name as loginName,