Merge branch 'master_chujiang_0731' into master_quotation

@@ -492,6 +492,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
                     dataMap.put("officeClerk", reviewer.getOfficeClerk());
                     // 办事处主管
                     dataMap.put("officeSupervisor", reviewer.getOfficeSupervisor());
+                    // 合同类型
+                    dataMap.put("contractType", handleContractType(data.getContractType()));
 
                     processTemplate(workbook, dataMap);
 
@@ -550,6 +552,20 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
         }
     }
 
+    private String handleContractType(String contractType) {
+        String result = "";
+        if ("DISTRIB_STD".equals(contractType) || "DIST_STOCK_CONTRACT".equals(contractType)
+                || "DRAFT_DIST_AGMT".equals(contractType)) {
+            result = "经销";
+        } else if ("INTL_STD_CONTRACT".equals(contractType) || "INTL_INVENTORY_AGMT".equals(contractType)
+                || "INTL_OPEN_SPEC_AGMT".equals(contractType)) {
+            result = "外贸";
+        } else if ("PROCESS_STD_AGMT".equals(contractType)) {
+            result = "加工";
+        }
+        return result;
+    }
+
     @ApiOperation("订货单批量打印")
     @PostMapping("/batchPrintPurchaseOrder")
     public InvokeResult<Void> batchPrintPurchaseOrder(@RequestBody QueryPurchaseOrderInfoVo vo) {

@@ -175,4 +175,10 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
     @ApiModelProperty("操作时间")
     private String createTimeStart;
     private String createTimeEnd;
+
+    /**
+     * 合同类型
+     */
+    @ApiModelProperty("合同类型")
+    private String contractType;
 }

@@ -214,6 +214,9 @@
                   AND tb.create_time < DATE_ADD(#{vo.createTimeEnd}, INTERVAL 1 DAY)
                 ]]>
             </if>
+            <if test="vo.contractType != null and vo.contractType != ''">
+                AND cds.type = #{vo.contractType}
+            </if>
         </where>
         ORDER BY tb.create_time DESC
     </select>