Explorar el Código

修改订单中间表

anderx hace 1 año
padre
commit
3b36a98cb7

+ 2 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -748,7 +748,7 @@
            b.remarks,b.eaaid ,eap.name ,eap.bank ,eap.accounts ,b.status,b.process_status,
            c.id sonId,c.total_amount sonTotalAmount,c.settlement_amount sonSettlementAmount,c.amount sonAmount, c.`type` sonType,c.type_other sonTypeOther,
            c.user_names ,c.release_start ,c.release_end , c.district_name districtName,c.user_names userNames,c.secondary_type ,c.secondary_type_other,c.attachment_url,
-           c.duration,pr.plan,c.real_amount sonRealAmount,o.order_no,o.contract_no,pr.type publicReleaseType,
+           c.duration,pr.plan,c.real_amount sonRealAmount,o.order_no,o.contract_no,pr.type publicReleaseType,tm.bid_type bidType,
            c.debit_id debitId, debit.real_amount DebitRealAmount ,debit.settlement_amount DebitSettlementAmount,debit.liquidation_status DebitliquidationStatus,
            d.id detId,d.`type` detType,d.amount detAmount,d.real_amount detRealAmount ,d.start_district ,d.end_district,d.vehicle,d.vehicle_other,
            d.pay_type ,d.invoice_type ,d.invoice_no,d.payer_name ,d.open_bank ,d.bank_accounts ,d.open_bank_address,d.type_other detTypeOther,
@@ -826,6 +826,7 @@
     <result column="buyer_name" jdbcType="VARCHAR" property="buyerName" />
     <result column="buyer_id" jdbcType="VARCHAR" property="buyerId" />
     <result column="publicReleaseType" jdbcType="INTEGER" property="publicReleaseType" />
+    <result column="bidType" jdbcType="INTEGER" property="bidType" />
     <association property="detList" resultMap="ExpenseAccountDetailsMap"/>
   </resultMap>
 

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -2211,7 +2211,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </select>
     <select id="selectExpenseCount" parameterType="com.goafanti.expenseAccount.bo.ExpenseCountsInput" resultType="com.goafanti.expenseAccount.bo.ExpenseCountsBo">
       select a.order_no orderNo,a.contract_no contractNo,b.buyer_name buyerName,toc.max_duration maxDuration ,toc.actual_duration actualDuration ,
-             toc.exceed_duration exceedDuration, a.total_amount totalAmount,a.settlement_amount settlementAmount,
+             toc.exceed_duration exceedDuration, a.total_amount totalAmount,a.settlement_amount settlementAmount,b.bid_type bidType,
       c.expenseCount,c.peopleCount,c.notExamine,c.rejectCount,d.paymentAmount,c.days,c.amount expenseAmount
       from t_order_new a left join t_order_mid b on a.order_no =b.order_no
       left join t_order_public_release_count toc on a.order_no =toc.order_no

+ 8 - 0
src/main/java/com/goafanti/expenseAccount/bo/ExpenseCountsBo.java

@@ -23,7 +23,15 @@ public class ExpenseCountsBo {
 
     private Integer notExamine;
     private Integer days;
+    private Integer bidType;
 
+    public Integer getBidType() {
+        return bidType;
+    }
+
+    public void setBidType(Integer bidType) {
+        this.bidType = bidType;
+    }
 
     public Double getMaxDuration() {
         return maxDuration;

+ 8 - 8
src/main/java/com/goafanti/expenseAccount/bo/SonExpenseAccount.java

@@ -26,7 +26,6 @@ public class SonExpenseAccount {
     private String plan;
     private String contractNo;
     private String orderNo;
-    private Integer projectType;
     private String buyerName;
     private String buyerId;
     private Integer debitId;
@@ -34,9 +33,17 @@ public class SonExpenseAccount {
     private BigDecimal debitRealAmount;
     private BigDecimal debitSettlementAmount;
     private Integer debitLiquidationStatus;
+    private Integer bidType;
     private String  countStr;
     private List<SonExpenseAccountDetails> detList;
 
+    public Integer getBidType() {
+        return bidType;
+    }
+
+    public void setBidType(Integer bidType) {
+        this.bidType = bidType;
+    }
 
     public String getCountStr() {
         return countStr;
@@ -46,13 +53,6 @@ public class SonExpenseAccount {
         this.countStr = countStr;
     }
 
-    public Integer getProjectType() {
-        return projectType;
-    }
-
-    public void setProjectType(Integer projectType) {
-        this.projectType = projectType;
-    }
 
     public String getBuyerId() {
         return buyerId;

+ 0 - 7
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -24,7 +24,6 @@ import com.goafanti.expenseAccount.Enums.EATypes;
 import com.goafanti.expenseAccount.Enums.EAsecondaryTypes;
 import com.goafanti.expenseAccount.bo.*;
 import com.goafanti.expenseAccount.service.ExpenseAccountService;
-import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.organization.bo.OrganizationListOut;
 import com.itextpdf.text.Document;
 import com.itextpdf.text.DocumentException;
@@ -1413,12 +1412,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 
             }
             if (e.getOrderNo()!=null){
-                List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTask(e.getOrderNo(), null);
-                tOrderTaskBos.forEach(e1->{
-                    if(e1.getType()==8){
-                        e.setProjectType(8);
-                    }
-                });
                 TOrderPublicReleaseCount out = tOrderPublicReleaseCountMapper.selectByOrderNo(e.getOrderNo());
                 List<ExpenseAccount> expenseAccounts = expenseAccountMapper.selectByOrderNo(e.getOrderNo());
                 BigDecimal reduce = expenseAccounts.stream().map(ExpenseAccount::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);