合同添加甲方主体

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@@ -25,11 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.fincompanyinvoicing;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -85,4 +85,11 @@ public interface FinCompanyInvoicingFeign {
     @GetMapping("/getDetailsByUseOrgAndSystem")
     @ResponseBody
     public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsByUseOrgAndSystem(@RequestParam("useOrgSid")String useOrgSid,@RequestParam("systemSid")String systemSid);
+
+    @ApiOperation("根据分公司查询开票信息")
+    @GetMapping("/selectInvoingList")
+    @ResponseBody
+    ResultBean<List<InvoicingVo>> selectInvoingList(@RequestParam("busSid")String busSid);
+
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java

@@ -79,4 +79,9 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
 	public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<InvoicingVo>> selectInvoingList(String busSid) {
+		return null;
+	}
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/InvoicingVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.fin.api.fincompanyinvoicing;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @description: 开票信息
+ * @author: dimengzhe
+ * @date: 2023/5/19
+ **/
+public class InvoicingVo implements Vo {
+    private static final long serialVersionUID = 1044076091993510821L;
+
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("开票信息sid")
+    private String sid;
+
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.InvoicingVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -68,4 +69,6 @@ public interface FinCompanyInvoicingMapper extends BaseMapper<FinCompanyInvoicin
 	FinCompanyInvoicingDetailsVo fetchByUseOrgSid(String useOrgSid);
 
     FinCompanyInvoicingDetailsVo getDetailsByUseOrgAndSystem(@Param("useOrgSid") String useOrgSid, @Param("systemSid") String systemSid);
+
+	List<InvoicingVo> selectInvoingList(String useOrgSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -17,4 +17,8 @@
             resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo">
 		select * from fin_company_invoicing where useOrgSid = #{useOrgSid} and purchaseSystemSid = #{systemSid} limit 1
     </select>
+
+	<select id="selectInvoingList" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.InvoicingVo">
+		select name,sid from fin_company_invoicing where useOrgSid = #{useOrgSid}
+	</select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.fincompanyinvoicing;
 
+import com.yxt.anrui.fin.api.fincompanyinvoicing.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicing;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingQuery;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDto;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
 
 /**
  * Project: anrui-fin(公司开票信息管理) <br/>
@@ -107,4 +102,9 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
 	public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) {
 		return finCompanyInvoicingService.getDetailsByUseOrgAndSystem(useOrgSid,systemSid);
 	}
+
+	@Override
+	public ResultBean<List<InvoicingVo>> selectInvoingList(String busSid) {
+		return finCompanyInvoicingService.selectInvoingList(busSid);
+	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.fincompanyinvoicing;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.*;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -37,9 +39,12 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Project: anrui-fin(公司开票信息管理) <br/>
@@ -59,6 +64,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
 
     @Resource
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
 
     private QueryWrapper<FinCompanyInvoicing> createQueryWrapper(FinCompanyInvoicingQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -140,4 +147,16 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         FinCompanyInvoicingDetailsVo vo = baseMapper.getDetailsByUseOrgAndSystem(useOrgSid,systemSid);
         return rb.success().setData(vo);
     }
+
+    public ResultBean<List<InvoicingVo>> selectInvoingList(String busSid) {
+        ResultBean<List<InvoicingVo>> rb = ResultBean.fireFail();
+        List<InvoicingVo> list = new ArrayList<>();
+        //查询销售订单的信息
+        ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderFeign.getSaleOrderDetails(busSid);
+        if(resultBean.getData() != null){
+            AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
+            list = baseMapper.selectInvoingList(appOrderDetailsVo.getUseOrgSid());
+        }
+        return rb.success().setData(list);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceDto.java

@@ -26,4 +26,7 @@ public class InsuranceDto implements Dto {
 
     @ApiModelProperty("合同sid")
     private String contractSid;
+
+    @ApiModelProperty("甲方主体")
+    private String createOrgName;
 }