问题处理

hx-oa/src/main/java/com/fjhx/oa/controller/epiboly/EpibolyBillController.java

@@ -49,7 +49,7 @@ public class EpibolyBillController {
      */
     @PostMapping("/add")
     public void add(@RequestBody EpibolyBillDto epibolyBillDto) {
-        epibolyBillService.add(epibolyBillDto);
+        epibolyBillService.addOrEdit(epibolyBillDto);
     }
 
     /**
@@ -57,7 +57,7 @@ public class EpibolyBillController {
      */
     @PostMapping("/edit")
     public void edit(@RequestBody EpibolyBillDto epibolyBillDto) {
-        epibolyBillService.edit(epibolyBillDto);
+        epibolyBillService.addOrEdit(epibolyBillDto);
     }
 
     /**

hx-oa/src/main/java/com/fjhx/oa/entity/invoice/po/InvoiceApply.java

@@ -114,11 +114,6 @@ public class InvoiceApply extends BasePo {
     private String sellerCompanyId;
 
     /**
-     * 买方公司名称
-     */
-    private String buyerCompanyName;
-
-    /**
      * 卖方纳税人识别号
      */
     private String sellerTaxpayerCode;

hx-oa/src/main/java/com/fjhx/oa/entity/invoice/vo/InvoiceApplyVo.java

@@ -22,4 +22,7 @@ public class InvoiceApplyVo extends InvoiceApply {
     private String deptName;
     private String companyName;
 
+    private String buyerCompanyName;
+    private String sellerCompanyName;
+
 }

hx-oa/src/main/java/com/fjhx/oa/mapper/invoice/InvoiceApplyMapper.java

@@ -23,4 +23,5 @@ public interface InvoiceApplyMapper extends BaseMapper<InvoiceApply> {
      */
     Page<InvoiceApplyVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<InvoiceApply> wrapper);
 
+    InvoiceApplyVo detail(@Param("ew") IWrapper wrapper);
 }

hx-oa/src/main/java/com/fjhx/oa/service/epiboly/EpibolyBillService.java

@@ -31,12 +31,7 @@ public interface EpibolyBillService extends BaseService<EpibolyBill> {
     /**
      * 外包加工账单新增
      */
-    void add(EpibolyBillDto epibolyBillDto);
-
-    /**
-     * 外包加工账单编辑
-     */
-    void edit(EpibolyBillDto epibolyBillDto);
+    void addOrEdit(EpibolyBillDto epibolyBillDto);
 
     /**
      * 外包加工账单删除

hx-oa/src/main/java/com/fjhx/oa/service/epiboly/impl/EpibolyBillServiceImpl.java

@@ -87,16 +87,11 @@ public class EpibolyBillServiceImpl extends ServiceImpl<EpibolyBillMapper, Epibo
 
     @DSTransactional
     @Override
-    public void add(EpibolyBillDto dto) {
+    public void addOrEdit(EpibolyBillDto dto) {
         dto.setStatus(FlowStatusEnum1.PASS.getKey());
         dto.setCode(codingRuleService.createCode(CodingRuleEnum.EPIBOLY_BILL.getKey(), null));
-        this.save(dto);
-        ObsFileUtil.saveFile(dto.getFileList(), dto.getId());
-    }
-
-    @Override
-    public void edit(EpibolyBillDto epibolyBillDto) {
-        this.updateById(epibolyBillDto);
+        this.saveOrUpdate(dto);
+        ObsFileUtil.editFile(dto.getFileList(), dto.getId());
     }
 
     @Override

hx-oa/src/main/java/com/fjhx/oa/service/invoice/impl/InvoiceApplyServiceImpl.java

@@ -1,6 +1,5 @@
 package com.fjhx.oa.service.invoice.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -76,8 +75,7 @@ public class InvoiceApplyServiceImpl extends ServiceImpl<InvoiceApplyMapper, Inv
 
     @Override
     public InvoiceApplyVo detail(Long id) {
-        InvoiceApply InvoiceApply = this.getById(id);
-        InvoiceApplyVo result = BeanUtil.toBean(InvoiceApply, InvoiceApplyVo.class);
+        InvoiceApplyVo result = baseMapper.detail(IWrapper.getWrapper().eq("ia", InvoiceApply::getId, id));
 
         setInfo(Arrays.asList(result));
 

hx-oa/src/main/resources/mapper/invoice/InvoiceApplyMapper.xml

@@ -1,45 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.oa.mapper.invoice.InvoiceApplyMapper">
-    <select id="getPage" resultType="com.fjhx.oa.entity.invoice.vo.InvoiceApplyVo">
-        select ia.id,
-               ia.status,
-               ia.flow_id,
-               ia.apply_time,
-               ia.code,
-               ia.dept_id,
-               ia.company_id,
-               ia.apply_scenario,
-               ia.ordering_channels,
-               ia.ask_remark,
-               ia.jst_order_code,
-               ia.is_cash_noted,
-               ia.is_match_order,
-               ia.payment_situation,
-               ia.tax_point_settle,
-               ia.tax_point_settle_amount,
-               ia.customer_id,
-               ia.billing_type,
-               ia.seller_company_id,
-               ia.buyer_company_name,
-               ia.seller_taxpayer_code,
-               ia.buyer_taxpayer_code,
-               ia.seller_address,
-               ia.seller_tel,
-               ia.buyer_address,
-               ia.buyer_tel,
-               ia.seller_account_bank,
-               ia.seller_account_number,
-               ia.buyer_account_bank,
-               ia.buyer_account_number,
-               ia.amount_including_tax,
-               ia.ticket_remark,
-               ia.create_user,
-               ia.create_time,
-               ia.update_user,
-               ia.update_time
-        from invoice_apply ia
-            ${ew.customSqlSegment}
-    </select>
+       <sql id="list">
+              SELECT ia.id,
+                     ia.`status`,
+                     ia.flow_id,
+                     ia.apply_time,
+                     ia.`code`,
+                     ia.dept_id,
+                     ia.company_id,
+                     ia.apply_scenario,
+                     ia.ordering_channels,
+                     ia.ask_remark,
+                     ia.jst_order_code,
+                     ia.is_cash_noted,
+                     ia.is_match_order,
+                     ia.payment_situation,
+                     ia.tax_point_settle,
+                     ia.tax_point_settle_amount,
+                     ia.customer_id,
+                     ia.billing_type,
+                     ia.seller_company_id,
+                     ia.seller_taxpayer_code,
+                     ia.buyer_taxpayer_code,
+                     ia.seller_address,
+                     ia.seller_tel,
+                     ia.buyer_address,
+                     ia.buyer_tel,
+                     ia.seller_account_bank,
+                     ia.seller_account_number,
+                     ia.buyer_account_bank,
+                     ia.buyer_account_number,
+                     ia.amount_including_tax,
+                     ia.ticket_remark,
+                     ia.create_user,
+                     ia.create_time,
+                     ia.update_user,
+                     ia.update_time,
+                     cu.`name` as buyerCompanyName,
+                     am.`name` as sellerCompanyName
+              FROM invoice_apply ia
+                          left join customer cu on ia.customer_id = cu.id
+                          left join account_management am on ia.seller_company_id = am.id
+       </sql>
+
+       <select id="getPage" resultType="com.fjhx.oa.entity.invoice.vo.InvoiceApplyVo">
+              <include refid="list"/>
+              ${ew.customSqlSegment}
+       </select>
+       <select id="detail" resultType="com.fjhx.oa.entity.invoice.vo.InvoiceApplyVo">
+              <include refid="list"/>
+              ${ew.customSqlSegment}
+       </select>
 
 </mapper>