问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionVo.java

@@ -72,4 +72,7 @@ public class BaseManufactorSubscriptionVo implements Vo {
 
     @ApiModelProperty("厂家采购类型value")
     private String applyType;
+
+    @ApiModelProperty(value = "排产申请sid")
+    private String vehApplySid;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.xml

@@ -5,8 +5,10 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo"
             resultType="com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionVo">
-        SELECT *
-        FROM base_manufactor_subscription
+        SELECT bms.*,bva.sid as vehApplySid
+        FROM base_manufactor_subscription bms
+        LEFT JOIN bus_vehicle_apply bva
+        ON bms.proSchAppNo = bva.`applicationCode`
         <where>
             ${ew.sqlSegment}
         </where>
@@ -22,9 +24,9 @@
     </select>
 
     <update id="adopt">
-        update base_manufactor_subscription set subscriptionPeo  = #{subscriptionPeo}
-                                              , subscriptionDate = #{subscriptionDate}
-                                              , state            = 1
+        update base_manufactor_subscription set subscriptionPeo = #{subscriptionPeo}
+        , subscriptionDate = #{subscriptionDate}
+        , state = 1
         <if test="remarks != null and remarks != ''">
             , remarks=#{remarks}
         </if>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@@ -110,25 +110,25 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
         QueryWrapper<BaseManufactorSubscription> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotBlank(query.getState())) {
-            qw.eq("state", query.getState());
+            qw.eq("bms.state", query.getState());
             if ("1".equals(query.getState())) {
                 //若为认款，则按照认款日期倒序排序
-                qw.orderByDesc("subscriptionDate");
+                qw.orderByDesc("bms.subscriptionDate");
             }
         }
         if (StringUtils.isNotBlank(query.getPaymentState())) {
-            qw.eq("paymentState", query.getPaymentState());
+            qw.eq("bms.paymentState", query.getPaymentState());
         }
         if (StringUtils.isNotBlank(query.getProSchAppNo())) {
-            qw.like("proSchAppNo", query.getProSchAppNo());
+            qw.like("bms.proSchAppNo", query.getProSchAppNo());
         }
         String subscriptionStartDate = query.getSubscriptionStartDate();
         String subscriptionEndDate = query.getSubscriptionEndDate();
-        qw.apply(StringUtils.isNotEmpty(subscriptionStartDate), "date_format (subscriptionDate,'%Y-%m-%d') >= date_format('" + subscriptionStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(subscriptionEndDate), "date_format (subscriptionDate,'%Y-%m-%d') <= date_format('" + subscriptionEndDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(subscriptionStartDate), "date_format (bms.subscriptionDate,'%Y-%m-%d') >= date_format('" + subscriptionStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(subscriptionEndDate), "date_format (bms.subscriptionDate,'%Y-%m-%d') <= date_format('" + subscriptionEndDate + "','%Y-%m-%d')"
                 );
-        qw.eq("createOrgSid", query.getCreateOrgSid());
-        qw.orderByDesc("proSchAppNo");
+        qw.eq("bms.createOrgSid", query.getCreateOrgSid());
+        qw.orderByDesc("bms.proSchAppNo");
         return qw;
     }