资金模块-解决收款单/付款单生成中间表问题

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalanceMapper.java

@@ -43,4 +43,6 @@ public interface PaybalanceMapper extends CommonBaseMapper<Paybalance> {
     Double selectThisamount(Integer id);
 
     void updateBankAmount(@Param("bk_thisamount") Double bk_thisamount, @Param("id") Integer id);
+
+    int checkStatus(@Param("id") Long id);
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/RecbalanceMapper.java

@@ -50,4 +50,6 @@ public interface RecbalanceMapper extends CommonBaseMapper<Recbalance> {
     Customer selectCustomerByPrimaryKey(Integer bkId);
 
     int updateCustomerByPrimaryKeySelective(Customer record);
+
+    int checkStatus(@Param("id") Long id);
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -202,12 +202,8 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         paybalance.setPb_auditman(BaseContextHolder.getUserName());
         paybalance.setPb_auditdate(new Date());
         pay.setMain(paybalance);
-        Subledger subledger = this.changSubledgerUntil(paybalance);
-        if (subledger.getSl_code() == null){
-            subledgerMapper.insertSelective(subledger);
-        }else {
-            subledgerMapper.updateByPrimaryKeySelective(subledger);
-        }
+        this.changSubledgerUntil(paybalance);
+
         this.changBankUntil(pay);
         DocBaseDTO docBaseDTO = this.insert(pay);
         Long id = docBaseDTO.getId();
@@ -508,7 +504,7 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
 
 
     //插入中间表
-    public Subledger changSubledgerUntil(Paybalance paybalance){
+    public void changSubledgerUntil(Paybalance paybalance){
         Subledger subledger = new Subledger();
         subledger.setCompanyId(BaseContextHolder.getCompanyId());
         subledger.setSl_code(paybalance.getPb_code());
@@ -544,7 +540,7 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         subledger.setSl_remark(subledger.getSl_remark());
         subledger.setSl_preamount(subledger.getSl_preamount());
 
-        return subledger;
+        subledgerMapper.insertSelective(subledger);
     }
 
     //插入bank中间表

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java

@@ -238,12 +238,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         recbalance.setRb_auditman(BaseContextHolder.getUserName());
         recbalance.setRb_auditdate(new Date());
         rec.setMain(recbalance);
-        Subledger subledger = this.changSubledgerUntil(recbalance);
-        if (subledger.getSl_code() == null){
-            subledgerMapper.insertSelective(subledger);
-        }else {
-            subledgerMapper.updateByPrimaryKeySelective(subledger);
-        }
+        this.changSubledgerUntil(recbalance);
         this.changBankUntil(rec);
         DocBaseDTO docBaseDTO = this.insert(rec);
         Long id = docBaseDTO.getId();
@@ -512,7 +507,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
     }
 
     //插入中间表
-    public Subledger changSubledgerUntil(Recbalance recbalance){
+    public void changSubledgerUntil(Recbalance recbalance){
         Subledger subledger = new Subledger();
         subledger.setCompanyId(BaseContextHolder.getCompanyId());
         subledger.setSl_code(recbalance.getRb_code());
@@ -548,7 +543,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         subledger.setSl_remark(subledger.getSl_remark());
         subledger.setSl_preamount(subledger.getSl_preamount());
 
-        return subledger;
+        subledgerMapper.insertSelective(subledger);
     }
 
     //插入bank中间表

applications/money/money-server/src/main/resources/mapper/FundtransferMapper.xml

@@ -297,4 +297,8 @@
     from fundtransfer
     where ft_id = #{id,jdbcType=INTEGER}
   </select>
+
+  <select id="checkStatus" resultType="int">
+    select count(1) from fundtransfer where ifnull(ft_statuscode,'')='AUDITED' and ft_id= #{id,jdbcType=INTEGER}
+  </select>
 </mapper>

applications/money/money-server/src/main/resources/mapper/OthreceiptsMapper.xml

@@ -375,4 +375,8 @@
     from othreceipts
     where or_id = #{id,jdbcType=INTEGER}
   </select>
+
+  <select id="checkStatus" resultType="int">
+    select count(1) from othreceipts where ifnull(or_statuscode,'')='AUDITED' and or_id= #{id,jdbcType=INTEGER}
+  </select>
 </mapper>

applications/money/money-server/src/main/resources/mapper/OthspendingsMapper.xml

@@ -373,4 +373,7 @@
     from othspendings
     where os_id = #{id,jdbcType=INTEGER}
   </select>
+  <select id="checkStatus" resultType="int">
+    select count(1) from othspendings where ifnull(os_statuscode,'')='AUDITED' and os_id= #{id,jdbcType=INTEGER}
+  </select>
 </mapper>

applications/money/money-server/src/main/resources/mapper/PaybalanceMapper.xml

@@ -767,4 +767,7 @@
     </set>
     where ve_id = #{id}
   </update>
+  <select id="checkStatus" resultType="int">
+    select count(1) from paybalance where ifnull(pb_statuscode,'')='AUDITED' and pb_id= #{id,jdbcType=INTEGER}
+  </select>
 </mapper>

applications/money/money-server/src/main/resources/mapper/RecbalanceMapper.xml

@@ -893,4 +893,8 @@
     </set>
     where cu_id = #{id}
   </update>
+
+  <select id="checkStatus" resultType="int">
+    select count(1) from recbalance where ifnull(rb_statuscode,0)='AUDITED' and rb_id= #{id,jdbcType=INTEGER}
+  </select>
 </mapper>

applications/money/money-server/src/main/resources/mapper/VerificationMapper.xml

@@ -648,4 +648,7 @@
   <select id="validateSetAcount" parameterType="long" resultType="java.lang.String">
     select count(1) from periodsdetail where pd_detno = #{detno} and IFNULL(pd_status,0)=0
   </select>
+  <select id="checkStatus" resultType="int">
+    select count(1) from Verification where ifnull(vc_statuscode,'')='AUDITED' and vc_id= #{id,jdbcType=INTEGER}
+  </select>
 </mapper>