1.期间问题

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BankinformationServiceImpl.java

@@ -16,6 +16,7 @@ import com.usoftchina.saas.document.mapper.BanksubledgerMapper;
 import com.usoftchina.saas.document.service.BankinformationService;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -61,6 +62,8 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             }
             bankinformation.setBk_thisamount(bankinformation.getBk_beginamount());
             bankinformationMapper.insertSelective(bankinformation);
+            Banksubledger banksubledger = this.changBanksubledger(bankinformation);
+            banksubledgerMapper.insertSelective(banksubledger);
         }else {
             bankinformation.setUpdaterId(BaseContextHolder.getUserId());
             bankinformation.setUpdaterName(BaseContextHolder.getUserName());
@@ -93,37 +96,7 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             }else {
                 bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
             }
-        }
-
-
-        //中间表
-        Banksubledger banksubledger = new Banksubledger();
-        Date date = bankinformation.getBk_date();
-        String dateString = date2String(date, "yyyyMMdd");
-        int ym = Integer.parseInt(dateString);
-
-        String date1 = date2String(date, "yyyyMM");
-        date1 = date1 + "01 00:00:00";
-        Date d = null;
-        try {
-            d = string2Date(date1, "yyyy-MM-dd hh:mm:ss");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        banksubledger.setCompanyId(BaseContextHolder.getCompanyId());
-        banksubledger.setBl_ym(ym);
-        banksubledger.setBl_bankid(Math.toIntExact(bankinformation.getId()));
-        banksubledger.setBl_bankcode(bankinformation.getBk_bankcode());
-        banksubledger.setBl_bankname(bankinformation.getBk_bankname());
-        banksubledger.setBl_code("期初余额");
-        banksubledger.setBl_kind("期初余额");
-        banksubledger.setBl_date(d);
-        banksubledger.setBl_orderamount(bankinformation.getBk_beginamount());
-
-        if(bankinformation.getId() == 0){
-            banksubledgerMapper.insertSelective(banksubledger);
-        }else{
+            Banksubledger banksubledger = this.changBanksubledger(bankinformation);
             banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);
         }
         return true;
@@ -191,6 +164,30 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
         return getMapper().getCombo(BaseContextHolder.getCompanyId());
     }
 
+    //插入中间表
+    public Banksubledger changBanksubledger(Bankinformation bankinformation){
+        Banksubledger banksubledger = new Banksubledger();
+        Date date = bankinformation.getBk_date();
+        banksubledger.setCompanyId(BaseContextHolder.getCompanyId());
+        banksubledger.setBl_ym(DateUtils.getYm(date));
+        banksubledger.setBl_bankid(Math.toIntExact(bankinformation.getId()));
+        banksubledger.setBl_bankcode(bankinformation.getBk_bankcode());
+        banksubledger.setBl_bankname(bankinformation.getBk_bankname());
+        banksubledger.setBl_code("期初余额");
+        banksubledger.setBl_kind("期初余额");
+
+        String date1 = date2String(date, "yyyy-MM");
+        date1 = date1 + "-01 00:00:00";
+        Date d = null;
+        try {
+            d = string2Date(date1, "yyyy-MM-dd hh:mm:ss");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        banksubledger.setBl_date(d);
+        banksubledger.setBl_orderamount(bankinformation.getBk_beginamount());
+        return banksubledger;
+    }
 
     /**
      * String转Date类型

applications/document/document-server/src/main/resources/mapper/BankinformationMapper.xml

@@ -209,6 +209,9 @@
         #{creatorName,jdbcType=VARCHAR},
       </if>
     </trim>
+    <selectKey resultType="Long" keyProperty="id" order="AFTER">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
     update bankinformation

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/VerificationController.java

@@ -69,7 +69,7 @@ public class VerificationController {
      * @param id
      * @return
      */
-    @RequestMapping("/delete/{id}")
+    @PostMapping("/delete/{id}")
     public Result delete(@PathVariable("id") Long id) {
         verificationService.delete(id);
         return Result.success();
@@ -80,7 +80,7 @@ public class VerificationController {
      * @param id
      * @return
      */
-    @RequestMapping("/deleteDetail1/{id}")
+    @PostMapping("/deleteDetail1/{id}")
     public Result deleteDetail1(@PathVariable("id") Long id) {
         verificationService.deleteDetail1(id);
         return Result.success();
@@ -91,7 +91,7 @@ public class VerificationController {
      * @param id
      * @return
      */
-    @RequestMapping("/deleteDetail2/{id}")
+    @PostMapping("/deleteDetail2/{id}")
     public Result deleteDetail2(@PathVariable("id") Long id) {
         verificationService.deleteDetail2(id);
         return Result.success();
@@ -121,7 +121,7 @@ public class VerificationController {
         return Result.success();
     }
 
-    @RequestMapping("/batchDelete")
+    @PostMapping("/batchDelete")
     public Result batchDelete(@RequestBody BatchDealBaseDTO body) {
         verificationService.batchDelete(body);
         return Result.success();

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

@@ -21,6 +21,7 @@ import com.usoftchina.saas.money.po.*;
 import com.usoftchina.saas.money.service.VerificationService;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.utils.BeanMapper;
+import com.usoftchina.saas.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -286,6 +287,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         Double amount1 = verification.getVc_amount1()==null?new Double(0):verification.getVc_amount1();
         Double amount2 = verification.getVc_amount2()==null?new Double(0):verification.getVc_amount2();
         subledger.setSl_date(verification.getVc_date());
+        subledger.setSl_ym(DateUtils.getYm(verification.getVc_date()));
         subledger.setSl_amount(-amount2);
         subledger.setSl_orderamount(new Double(0));
         subledger.setSl_yamount(new Double(0));

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

@@ -69,6 +69,9 @@
       <if test="bk_bankcode != null" >
         bk_bankcode,
       </if>
+      <if test="bk_bankid != null" >
+        bk_bankid,
+      </if>
       <if test="bk_bankname != null" >
         bk_bankname,
       </if>
@@ -131,6 +134,9 @@
       <if test="bk_bankcode != null" >
         #{bk_bankcode,jdbcType=VARCHAR},
       </if>
+      <if test="bk_bankid != null" >
+        #{bk_bankid,jdbcType=VARCHAR},
+      </if>
       <if test="bk_bankname != null" >
         #{bk_bankname,jdbcType=VARCHAR},
       </if>