Merge branch 'master_after0423' into master_after0506

# Conflicts:
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/order/PurchaseOrderInfoServiceImpl.java
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/order/PurchaseOrderInfoService.java

@@ -1374,7 +1374,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
             if ("DEALER".equals(query.get(0).getEnterpriseType())) {
             if ("DEALER".equals(query.get(0).getEnterpriseType())) {
                 dataMap.put("remarks", "");
                 dataMap.put("remarks", "");
             } else if ("TERMINAL".equals(query.get(0).getEnterpriseType())) {
             } else if ("TERMINAL".equals(query.get(0).getEnterpriseType())) {
-                dataMap.put("remarks", "10、□贵司在我司的所有订货限于生产使用.");
+                dataMap.put("remarks", "10、贵司在我司的所有订货限于生产使用.");
             } else {
             } else {
                 dataMap.put("remarks", "");
                 dataMap.put("remarks", "");
             }
             }

@@ -20,6 +20,7 @@ import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.entity.*;
 import com.lframework.starter.web.inner.entity.*;
 import com.lframework.starter.web.inner.service.system.*;
 import com.lframework.starter.web.inner.service.system.*;
 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderInfoBo;
 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderInfoBo;
+import com.lframework.xingyun.sc.dto.ReviewerDto;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
@@ -476,6 +477,11 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
                     dataMap.put("priceListNo", data.getPriceListNo());
                     dataMap.put("priceListNo", data.getPriceListNo());
                     // 生产工艺
                     // 生产工艺
                     dataMap.put("productionProcess", data.getProductionProcess());
                     dataMap.put("productionProcess", data.getProductionProcess());
+                    ReviewerDto reviewer = purchaseOrderInfoService.getReviewerById(id);
+                    // 办事处内勤
+                    dataMap.put("officeClerk", reviewer.getOfficeClerk());
+                    // 办事处主管
+                    dataMap.put("officeSupervisor", reviewer.getOfficeSupervisor());
 
 
                     processTemplate(workbook, dataMap);
                     processTemplate(workbook, dataMap);
 
 

+package com.lframework.xingyun.sc.dto;
+
+import com.lframework.starter.web.core.dto.BaseDto;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class ReviewerDto implements BaseDto, Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * ID
+   */
+  private String id;
+
+  /**
+   * 办事处内勤
+   */
+  private String officeClerk;
+
+  /**
+   * 办事处主管
+   */
+  private String officeSupervisor;
+}

@@ -9,9 +9,11 @@ import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.xingyun.sc.bo.ledger.receipt.ReceiptLedgerReportDetail;
 import com.lframework.xingyun.sc.bo.ledger.receipt.ReceiptLedgerReportDetail;
+import com.lframework.xingyun.sc.dto.ReviewerDto;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.excel.ledger.LedgerReportExportModel;
 import com.lframework.xingyun.sc.excel.ledger.LedgerReportExportModel;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.utils.ExcelUtil;
 import com.lframework.xingyun.sc.utils.ExcelUtil;
 import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
 import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
@@ -47,6 +49,8 @@ public class BusinessDataExportHandler implements ExportHandler {
 
 
     @Resource
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
     private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
 
 
 
 
     @Override
     @Override
@@ -266,6 +270,11 @@ public class BusinessDataExportHandler implements ExportHandler {
                     dataMap.put("stockUpCompanyName", orderInfo.getStockUpCompanyName() == null ? "" : orderInfo.getStockUpCompanyName());
                     dataMap.put("stockUpCompanyName", orderInfo.getStockUpCompanyName() == null ? "" : orderInfo.getStockUpCompanyName());
                     dataMap.put("priceListNo", orderInfo.getPriceListNo());
                     dataMap.put("priceListNo", orderInfo.getPriceListNo());
                     dataMap.put("productionProcess", orderInfo.getProductionProcess());
                     dataMap.put("productionProcess", orderInfo.getProductionProcess());
+                    ReviewerDto reviewer = purchaseOrderInfoService.getReviewerById(orderInfo.getId());
+                    // 办事处内勤
+                    dataMap.put("officeClerk", reviewer.getOfficeClerk());
+                    // 办事处主管
+                    dataMap.put("officeSupervisor", reviewer.getOfficeSupervisor());
                     ExcelUtil.processTemplate(workbook, dataMap);
                     ExcelUtil.processTemplate(workbook, dataMap);
 
 
                     String createTime = orderInfo.getCreateTime().format(dateTimeFormatter);
                     String createTime = orderInfo.getCreateTime().format(dateTimeFormatter);

@@ -1282,6 +1282,7 @@ public class ContractDistributorStandardServiceImpl extends
             contractDistributorLine.setUnitPrice(lineVo.getUnitPrice());
             contractDistributorLine.setUnitPrice(lineVo.getUnitPrice());
             contractDistributorLine.setAmountExcludingTax(lineVo.getAmountExcludingTax());
             contractDistributorLine.setAmountExcludingTax(lineVo.getAmountExcludingTax());
             contractDistributorLine.setTotalAmount(lineVo.getTotalAmount());
             contractDistributorLine.setTotalAmount(lineVo.getTotalAmount());
+            contractDistributorLine.setDeliveryDate(lineVo.getDeliveryDate());
             contractDistributorLineService.getBaseMapper().insert(contractDistributorLine);
             contractDistributorLineService.getBaseMapper().insert(contractDistributorLine);
         }
         }
 
 

@@ -28,6 +28,7 @@ import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
+import com.lframework.xingyun.sc.dto.ReviewerDto;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
@@ -925,6 +926,15 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (CollectionUtils.isNotEmpty(proProcessList)) {
         if (CollectionUtils.isNotEmpty(proProcessList)) {
             orderInfo.setProductionProcess(String.join("\n\n", proProcessList));
             orderInfo.setProductionProcess(String.join("\n\n", proProcessList));
         }
         }
+        return String.join("\n", proProcessList);
+    }
+
+    @Override
+    public ReviewerDto getReviewerById(String id) {
+        if (StringUtils.isBlank(id)) {
+            return new ReviewerDto();
+        }
+        return getBaseMapper().getReviewerById(id);
 
 
         return orderInfo;
         return orderInfo;
     }
     }

@@ -4,6 +4,7 @@ import com.lframework.starter.web.core.annotations.permission.DataPermission;
 import com.lframework.starter.web.core.annotations.permission.DataPermissions;
 import com.lframework.starter.web.core.annotations.permission.DataPermissions;
 import com.lframework.starter.web.core.mapper.BaseMapper;
 import com.lframework.starter.web.core.mapper.BaseMapper;
 import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType;
 import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType;
+import com.lframework.xingyun.sc.dto.ReviewerDto;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
@@ -53,4 +54,9 @@ public interface PurchaseOrderInfoMapper extends BaseMapper<PurchaseOrderInfo> {
      * @return          List<String>
      * @return          List<String>
      */
      */
     String queryHisProProcess(@Param("params") Map<String, Object> params);
     String queryHisProProcess(@Param("params") Map<String, Object> params);
+
+    /**
+     * 获取审核人
+     */
+    ReviewerDto getReviewerById(@Param("id") String id);
 }
 }

@@ -2,13 +2,16 @@ package com.lframework.xingyun.sc.service.order;
 
 
 import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.dto.ReviewerDto;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
+import org.apache.ibatis.annotations.Param;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * 订货单表 Service
  * 订货单表 Service
@@ -170,4 +173,9 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * @return          String
      * @return          String
      */
      */
     PurchaseOrderInfo getHistoryProductionProcess(String orderId);
     PurchaseOrderInfo getHistoryProductionProcess(String orderId);
+
+    /**
+     * 获取审核人
+     */
+     ReviewerDto getReviewerById(@Param("id") String id);
 }
 }

@@ -373,4 +373,13 @@
         order by ol.update_time desc
         order by ol.update_time desc
         limit 1
         limit 1
     </select>
     </select>
+
+    <select id="getReviewerById" resultType="com.lframework.xingyun.sc.dto.ReviewerDto">
+        SELECT business_id,
+               JSON_UNQUOTE(JSON_EXTRACT(def_json, '$.nodeList[1].extMap.handleInfos[0].createBy')) AS officeClerk,
+               JSON_UNQUOTE(JSON_EXTRACT(def_json, '$.nodeList[2].extMap.handleInfos[0].createBy')) AS officeSupervisor
+        FROM flow_instance
+        WHERE business_id = #{id}
+        ORDER BY create_time DESC LIMIT 1
+    </select>
 </mapper>
 </mapper>