修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractGoodsInfo.java

@@ -97,6 +97,10 @@ public class ContractGoodsInfo extends BaseModel<ContractGoodsInfo> {
      * 产地市
      */
     private String outputCity;
+    /**
+     * 产地区
+     */
+    private String outputArea;
 
     /**
      * 重量（吨）

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranSettlementReportMapper.xml

@@ -18,7 +18,7 @@
             </if>
         </if>
         <if test="tranTypeKey != null and tranTypeKey != ''">
-            tran_type_key = #{tranTypeKey}
+            AND tran_type_key = #{tranTypeKey}
         </if>
         <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
@@ -86,7 +86,7 @@
             </if>
         </if>
         <if test="tranTypeKey != null and tranTypeKey != ''">
-            tran_type_key = #{tranTypeKey}
+            AND tran_type_key = #{tranTypeKey}
         </if>
         <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}