销售订单中增加办结时间，订单查询中增加办结时间

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java

@@ -99,6 +99,9 @@ public class BusSalesOrder extends BaseEntity {
     private String nodeId;
     @ApiModelProperty("流程实例id")
     private String procInstId;
+    @ApiModelProperty("记录最后修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date closingDate;
     @ApiModelProperty("销售订单车辆类型：1现车、2订单、3排产")
     private String type;
     @ApiModelProperty("单台开票金额")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderVo.java

@@ -76,4 +76,6 @@ public class BusSalesOrderVo implements Vo {
     private String depositAll;
     @ApiModelProperty(value = "是否保险")
     private String isInsurance;
+    @ApiModelProperty("办结日期")
+    private String closingDate;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java

@@ -108,6 +108,11 @@ public class AppBusSalesOrderVo implements Vo {
      */
     @ApiModelProperty("创建日期")
     private String createdDate;
+    /**
+     * 办结日期
+     */
+    @ApiModelProperty("办结日期")
+    private String closingDate;
     /**
      * 是否保险
      */

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderQuery.java

@@ -15,6 +15,7 @@ public class OrderQuery implements Query {
 
     private String orgPath;
 
+    private String date;
     private String name;
     @ApiModelProperty("菜单sid")
     private String menuSid;
@@ -54,4 +55,9 @@ public class OrderQuery implements Query {
     private String useOrgName;
     @ApiModelProperty("贴息")
     private String factoryDiscount;
+    @ApiModelProperty("办结开始时间")
+    private String closeStartTime;
+    @ApiModelProperty("办结结束时间")
+    private String closeEndTime;
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -14,6 +14,7 @@
         bp.singleFinalPrice,
         bp.quantity,
         bo.payType,
+        DATE_FORMAT(bo.closingDate, '%Y-%m-%d') as closingDate,
         bd.depositAll,
         case bo.isInsurance
         when 0 then '否'
@@ -51,6 +52,7 @@
         bd.depositAll,
         bo.nodeState as saleOrderState,
         DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createdDate,
+        DATE_FORMAT(bo.closingDate, '%Y-%m-%d') as closingDate,
         case bo.isInsurance
         when 0 then '否'
         when 1 then '是' end as insuranceInfo,
@@ -100,6 +102,7 @@
         bo.payTypeKey AS carPurchaseKey,
         bd.depositAll,
         bo.nodeState AS saleOrderState,
+        DATE_FORMAT(bo.closingDate, '%Y-%m-%d') AS closingDate,
         DATE_FORMAT(bo.createDate, '%Y-%m-%d') AS createdDate,
         CASE bo.isInsurance
         WHEN 0 THEN '否'
@@ -181,7 +184,7 @@
             </if>
             <if test="vinNo != null and vinNo != ''">
                 <if test="orderingNo == null or orderingNo == ''">
-                HAVING vinNo like concat('%',#{vinNo},'%')
+                    HAVING vinNo like concat('%',#{vinNo},'%')
                 </if>
             </if>
             <if test="vinNo == null or vinNo == ''">
@@ -201,7 +204,7 @@
                p.quantity         as number,
                bm.modelSid
         from bus_sales_order_model bm
-                     left join bus_sales_order_price p on bm.salesOrderSid = p.salesOrderSid
+                 left join bus_sales_order_price p on bm.salesOrderSid = p.salesOrderSid
         where bm.salesOrderSid = #{saleOrderSid}
     </select>
     <!--App初始化销售订单单据信息-->
@@ -294,8 +297,8 @@
                bs.distributorUnitTwo   as intermediaryUnit2,
                bs.distributorPriceTwo  as agencyFee2
         from bus_sales_order bo
-                     left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
-                     left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid
+                 left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
+                 left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid
         where bo.sid = #{sid}
     </select>
 
@@ -312,9 +315,9 @@
                bo.staffName                           as sellerName,
                bo.notes                               as addRemarks,
                case bo.type
-                       when 1 then '现车'
-                       when 2 then '采购订单'
-                       when 3 then '排产' end           as orderType,
+                   when 1 then '现车'
+                   when 2 then '采购订单'
+                   when 3 then '排产' end               as orderType,
                bo.orgSid,
                bo.billNo,
                bo.financePlanValue,
@@ -391,7 +394,7 @@
                bo.mobile       as modelName,
                bsov.linkNo     AS vin
         FROM bus_sales_order bo
-                     LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
+                 LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
         WHERE bo.contractNo = #{contractNo}
     </select>
     <select id="getByContractNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo">
@@ -403,7 +406,7 @@
     <select id="getVinsidByConSid" resultType="java.lang.String">
         select linkSid
         from bus_sales_order_vehicle bv
-                     left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+                 left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         where bo.contractNo = #{contractNo}
           and bv.linkNo = #{vinNo}
     </select>
@@ -449,7 +452,7 @@
     <select id="selectTemporaryNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrdeVo">
         select bv.temporaryNo, bo.contractNo
         from bus_sales_order bo
-                     left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
+                 left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
         where bo.nodeState = '已办结'
           and bv.linkSid = #{vehSid}
           and bo.contractNo = #{contractNo}
@@ -478,9 +481,9 @@
                bs.userSid,
                bo.sid                                                     as salesOrderSid
         from bus_sales_order bo
-                     left join bus_sales_order_price bp on bo.sid = bp.salesOrderSid
-                     left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid
-                     left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
+                 left join bus_sales_order_price bp on bo.sid = bp.salesOrderSid
+                 left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid
+                 left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
         where bo.nodeState = '已办结'
           and bv.linkSid = #{vinSid}
         order by bo.createTime desc limit 1
@@ -527,7 +530,7 @@
     <select id="selectByContractNoToVin" resultType="java.lang.String">
         select bv.sid
         from bus_sales_order_vehicle bv
-                     left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+                 left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         where bo.contractNo = #{contractId}
     </select>
 
@@ -540,8 +543,8 @@
     <select id="selNewComSaleByVehSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo">
         SELECT *
         FROM bus_sales_order bso
-                     LEFT JOIN bus_sales_order_vehicle bsov
-                ON bso.`sid` = bsov.`salesOrderSid`
+                 LEFT JOIN bus_sales_order_vehicle bsov
+                           ON bso.`sid` = bsov.`salesOrderSid`
         WHERE bso.`nodeState` = "已办结"
           AND bsov.`linkSid` = #{vehSid}
         ORDER BY bso.`createTime` DESC LIMIT 1
@@ -554,6 +557,9 @@
     </select>
 
     <select id="selectBySid" resultType="java.lang.String">
-        select cc.sid from bus_sales_order bo left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo where bo.sid = #{sid}
+        select cc.sid
+        from bus_sales_order bo
+                 left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo
+        where bo.sid = #{sid}
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1922,6 +1922,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), "");
         for (AppBusSalesOrderVo record : pagging.getRecords()) {
+            if (StringUtils.isBlank(record.getClosingDate())){
+                record.setClosingDate("-");
+            }
             /*************再次发起按钮显示****************/
            /* if (StringUtils.isNotBlank(pq.getParams().getType())) {
                 String type = pq.getParams().getType();
@@ -5257,7 +5260,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     scmPurchaseChannelPush.setNum(busSalesOrderPrice.getQuantity().toString());
                     scmPurchaseChannelFeign.push(scmPurchaseChannelPush);
                 }
-
+                //------------设置办结日期----------------------------------
+                BusSalesOrder entityForCloseDate = fetchBySid(bv.getBusinessSid());
+                entityForCloseDate.setClosingDate(new Date());
+                baseMapper.updateById(entityForCloseDate);
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -6035,6 +6041,22 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (StringUtils.isNotBlank(pagerQuery.getFactoryDiscount())) {
             qw.like("ls.factoryDiscount", pagerQuery.getFactoryDiscount());
         }
+        // APP办结时间查询
+        if (StringUtils.isNotBlank(pagerQuery.getDate())) {
+            String date = pagerQuery.getDate();
+            String[] sArray = date.split("至");
+            String start = sArray[0];
+            String end = sArray[1];
+            qw.apply(StringUtils.isNotEmpty(start), "date_format (bo.closingDate,'%Y-%m-%d') >= date_format('" + start + "','%Y-%m-%d')").
+                    apply(StringUtils.isNotEmpty(end), "date_format (bo.closingDate,'%Y-%m-%d') <= date_format('" + end + "','%Y-%m-%d')"
+                    );
+        }
+        //PC办结时间查询
+        String createStartTime = pagerQuery.getCloseStartTime();
+        String createEndTime = pagerQuery.getCloseEndTime();
+        qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (bo.closingDate,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(createEndTime), "date_format (bo.closingDate,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
         String typeState = "getSaleOrdersByOrgPath";//查询接口的标识
         String urlPrefix = docPdfComponent.getPrefixTemplateUrl();
         String temp = "/template/";

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderQuery.java

@@ -18,9 +18,10 @@ public class BusOrderQuery implements Query {
 
     @ApiModelProperty("客户名称")
     private String name;
-    
+
     @ApiModelProperty("当前组织机构全路径sid")
     private String orgPath;
     @ApiModelProperty("菜单sid")
     private String menuSid;
+    private String date;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java

@@ -70,6 +70,11 @@ public class BusOrderSalesVo implements Vo {
      */
     @ApiModelProperty("创建日期")
     private String createdDate;
+    /**
+     * 创建日期
+     */
+    @ApiModelProperty("办结日期")
+    private String closingDate;
     /**
      * 是否保险
      */

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -629,6 +629,18 @@ public class AppBusSalesOrderService {
         ResultBean<PagerVo<BusOrderSalesVo>> rb = ResultBean.fireFail();
         PagerQuery<OrderQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
         ResultBean<PagerVo<AppBusSalesOrderVo>> resultBean = busSalesOrderFeign.getSaleOrdersByOrgPath(pq);
+        PagerVo<AppBusSalesOrderVo> data = resultBean.getData();
+        if (null != data) {
+            List<AppBusSalesOrderVo> records = data.getRecords();
+            records.removeAll(Collections.singleton(null));
+            if (!records.isEmpty()) {
+                for (AppBusSalesOrderVo record : records) {
+                    if (StringUtils.isBlank(record.getClosingDate())) {
+                        record.setClosingDate("-");
+                    }
+                }
+            }
+        }
         PagerVo<BusOrderSalesVo> vo = CoverUtils.selectPagerVo(resultBean.getData());
         return rb.success().setMsg("当前共查询到" + vo.getTotal() + "条记录").setData(vo);
     }
@@ -694,9 +706,9 @@ public class AppBusSalesOrderService {
     }
 
 
-    public ResultBean<String> rePublishSaleOrder(String saleOrderSid,String customerSid, String customerName, String customerMobile) throws InvocationTargetException, IllegalAccessException {
+    public ResultBean<String> rePublishSaleOrder(String saleOrderSid, String customerSid, String customerName, String customerMobile) throws InvocationTargetException, IllegalAccessException {
         ResultBean rb = ResultBean.fireFail();
-        ResultBean resultBean = busSalesOrderFeign.rePublishSaleOrder(saleOrderSid,customerSid,customerName,customerMobile);
+        ResultBean resultBean = busSalesOrderFeign.rePublishSaleOrder(saleOrderSid, customerSid, customerName, customerMobile);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }