anderx 1 год назад
Родитель
Сommit
a119168e5e

+ 2 - 0
src/main/java/com/goafanti/common/dao/ExpenseAccountMapper.java

@@ -72,4 +72,6 @@ public interface ExpenseAccountMapper {
     Integer selectDeleteIdBySonId(Integer integer);
 
     void updateSonTypeOther(@Param("id") Integer id, @Param("types") String types);
+
+    void updateRemoveOrderNo(ExpenseAccount ea);
 }

+ 5 - 0
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -1061,4 +1061,9 @@
     set a.type_other = #{types}
     where a.id in (select id from expense_relationship where ea_id = #{id} )
   </update>
+    <update id="updateRemoveOrderNo">
+      update expense_account a
+      set a.order_no = null
+      where a.id in #{id}
+    </update>
 </mapper>

+ 13 - 6
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -405,13 +405,20 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     public Object updateTypeOther(Integer id, String typeOther,String remarks,String orderNo) {
         ExpenseAccount ea = new ExpenseAccount();
         ea.setId(id);
-        if (StringUtils.isNotEmpty(typeOther))ea.setTypeOther(typeOther);
-        if (StringUtils.isNotEmpty(remarks))ea.setRemarks(remarks);
-        if (StringUtils.isNotEmpty(orderNo)){
-            ea.setOrderNo(orderNo);
-            ea.setTargetType(1);
+        if (StringUtils.isNotEmpty(typeOther)){
+            ea.setTypeOther(typeOther);
+            expenseAccountMapper.updateByPrimaryKeySelective(ea);
+        }
+        if (StringUtils.isNotEmpty(remarks)){
+            ea.setRemarks(remarks);
+            expenseAccountMapper.updateByPrimaryKeySelective(ea);
+        }
+        if (StringUtils.isBlank(orderNo)){
+            ea.setTargetType(0);
+            expenseAccountMapper.updateRemoveOrderNo(ea);
+        }else {
+
         }
-        expenseAccountMapper.updateByPrimaryKeySelective(ea);
         if (StringUtils.isNotEmpty(typeOther)){
             MainExpenseAccount mainExpenseAccount = expenseAccountMapper.selectbySonId(id);
             StringBuffer types=new StringBuffer();