Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/inv/dao/InvAccountOperateMapper.java

@@ -21,6 +21,12 @@ public interface InvAccountOperateMapper extends BaseMapper<InvAccountOperate> {
 
     List<InvAccountOperate> selectOperateList(List<String> cardNumList);
 
+    /**
+     * 删除方法
+     * @param invAccountIncoiceId
+     * @return
+     */
+    int updateOperateByIncoiceId(InvAccountOperate invAccountIncoiceId);
 }
 
 

src/main/java/com/ydtech/modules/inv/service/InvAccountOperateService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.inv.model.InvAccountOperate;
+import org.apache.ibatis.annotations.Param;
 
 /**
 * @author Administrator
@@ -16,7 +17,12 @@ public interface InvAccountOperateService extends IService<InvAccountOperate> {
 
     HttpResult insert(InvAccountOperate invAccountOperate);
 
-
+    /**
+     * 删除方法
+     * @param invAccountIncoiceId
+     * @return
+     */
+    int updateOperateByIncoiceId(InvAccountOperate invAccountIncoiceId);
 
 
     HttpResult excelAccount(InvAccountOperate accountOperate);

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountIncoiceServiceImpl.java

@@ -288,7 +288,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
             invAccountIncoiceMapper.updateById(invAccountIncoice);
             invAccountCardService.updateBatchById(invAccount);
 
-            invAccountOperateService.updateById(invAccountOperate);
+            invAccountOperateService.updateOperateByIncoiceId(invAccountOperate);
 
             invAccountOpService.remove(lambdaQueryWrapper);
         } catch (Exception e) {

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountOperateServiceImpl.java

@@ -40,7 +40,7 @@ public class InvAccountOperateServiceImpl extends ServiceImpl<InvAccountOperateM
         implements InvAccountOperateService {
 
     @Autowired
-    private InvAccountOperateMapper insAccountOperateMapper;
+    private InvAccountOperateMapper invAccountOperateMapper;
 
     @Autowired
     private InvAccountOpService invAccountOpService;
@@ -73,7 +73,7 @@ public class InvAccountOperateServiceImpl extends ServiceImpl<InvAccountOperateM
         pageRequest.setPageNum(accountOperate.getPageNo());
         pageRequest.setPageSize(accountOperate.getPageSize());
         Page page = PageRequest.buildPageRequest(pageRequest);
-        IPage<InvAccountOperate> invAccountOperateIPage = insAccountOperateMapper.selectInsAccountOperate(page, accountOperate);
+        IPage<InvAccountOperate> invAccountOperateIPage = invAccountOperateMapper.selectInsAccountOperate(page, accountOperate);
         List<InvAccountOperate> records = invAccountOperateIPage.getRecords();
         for (InvAccountOperate record : records) {
             StringBuilder a = new StringBuilder();
@@ -132,7 +132,7 @@ public class InvAccountOperateServiceImpl extends ServiceImpl<InvAccountOperateM
         invAccountOperate.setEnterCardNum(entAccountCard.getBankCardNum());
         invAccountOperate.setCreateBy(baseController.getUserName());
         invAccountOperate.setCreateId(baseController.getUserId());
-        insAccountOperateMapper.insert(invAccountOperate);
+        invAccountOperateMapper.insert(invAccountOperate);
 
         List<InvAccountOp> list = invAccountEntOpList(entProfit, entAccount, entAccountCard, applyAmount,invAccountOperate.getAccountOperateId());
         list.forEach(invAccountOp -> {
@@ -143,9 +143,14 @@ public class InvAccountOperateServiceImpl extends ServiceImpl<InvAccountOperateM
         return HttpResult.ok("新增收入成功");
     }
 
+    @Override
+    public int updateOperateByIncoiceId(InvAccountOperate invAccountIncoiceId) {
+        return invAccountOperateMapper.updateOperateByIncoiceId(invAccountIncoiceId);
+    }
+
     @Override
     public HttpResult excelAccount(InvAccountOperate accountOperate) {
-        List<InvAccountOperate> invAccountOperates = insAccountOperateMapper.selectInsAccountOperateList(accountOperate);
+        List<InvAccountOperate> invAccountOperates = invAccountOperateMapper.selectInsAccountOperateList(accountOperate);
         List<InvAccountProfit> list = invAccountProfitService.list();
 
         for (InvAccountOperate record : invAccountOperates) {
@@ -186,7 +191,7 @@ public class InvAccountOperateServiceImpl extends ServiceImpl<InvAccountOperateM
 
     @Override
     public HttpResult deleteById(String accountOperateId) {
-        InvAccountOperate invAccountOperate = insAccountOperateMapper.selectById(accountOperateId);
+        InvAccountOperate invAccountOperate = invAccountOperateMapper.selectById(accountOperateId);
         if (invAccountOperate == null) {
             throw new SystemException("操作为空无法删除");
         }
@@ -194,7 +199,7 @@ public class InvAccountOperateServiceImpl extends ServiceImpl<InvAccountOperateM
         if (invAccountOperate.getDel() != null) {
             LambdaQueryWrapper<InvAccountOperate> queryWrapper = new LambdaQueryWrapper<InvAccountOperate>();
             queryWrapper.eq(InvAccountOperate::getDel, invAccountOperate.getDel());
-            invAccountOperates = insAccountOperateMapper.selectList(queryWrapper);
+            invAccountOperates = invAccountOperateMapper.selectList(queryWrapper);
         }
         if (invAccountOperates.isEmpty()){
             invAccountOperates.add(invAccountOperate);

src/main/resources/mapper/modules/inv/InvAccountOperateMapper.xml

@@ -36,6 +36,15 @@
         remark,company,big_apply_amount,
         revenue_outlay,invoice_id,out_profit,ent_profit,fund_fen,create_time,enter_card_num,out_card_num
     </sql>
+    <update id="updateOperateByIncoiceId">
+        UPDATE inv_account_operate
+        SET del_flag = #{delFlag}
+        ,update_time = #{updateTime}
+        ,update_by = #{updateBy}
+        ,update_id = #{updateId}
+        WHERE invoice_id = #{invoiceId};
+    </update>
+
     <select id="selectInsAccountOperate" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>