From e7f3835c7ffb0de6747c7c496c590f7f42e455fc Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 24 一月 2024 15:05:33 +0800
Subject: [PATCH] 111

---
 server/service/src/main/java/com/doumee/dao/business/dto/EntrustInvoicingDTO.java            |    2 
 server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java          |  239 ++++++++++++++++++++++++++
 server/company/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java        |    4 
 server/service/src/main/java/com/doumee/dao/business/dto/DirectInvoicingDetailDTO.java       |   28 +++
 server/company/src/main/java/com/doumee/api/business/SolutionsController.java                |   14 
 server/service/src/main/java/com/doumee/service/business/TaxesService.java                   |   15 +
 server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java                  |   15 +
 server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java |    3 
 server/service/src/main/java/com/doumee/dao/business/model/Taxes.java                        |   20 ++
 server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java               |   18 +
 server/company/src/main/java/com/doumee/api/business/TaxesController.java                    |   29 +++
 server/service/src/main/java/com/doumee/dao/business/dto/DirectInvoicingDTO.java             |   34 +++
 server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java         |    5 
 server/service/src/main/java/com/doumee/dao/business/vo/TaxesInvoicingVO.java                |   60 ++++++
 14 files changed, 473 insertions(+), 13 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java b/server/company/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java
index 015e23f..951ea62 100644
--- a/server/company/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java
+++ b/server/company/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java
@@ -72,14 +72,14 @@
     @PostMapping("/page")
     @RequiresPermissions("business:applychagnedetail:query")
     public ApiResponse<PageData<ApplyChagneDetail>> findPage (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap) {
-        return ApiResponse.success(applyChagneDetailService.findPage(pageWrap));
+        return ApiResponse.success(applyChagneDetailService.findPageForCompany(pageWrap));
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:applychagnedetail:exportExcel")
     public void exportExcel (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(ApplyChagneDetail.class).export(applyChagneDetailService.findPage(pageWrap).getRecords(), "鍔犲噺淇濇崲鍘傜敵璇锋槑缁嗕俊鎭〃", response);
+        ExcelExporter.build(ApplyChagneDetail.class).export(applyChagneDetailService.findPageForCompany(pageWrap).getRecords(), "鍔犲噺淇濇崲鍘傜敵璇锋槑缁嗕俊鎭〃", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
diff --git a/server/company/src/main/java/com/doumee/api/business/SolutionsController.java b/server/company/src/main/java/com/doumee/api/business/SolutionsController.java
index 26228ba..3f29c37 100644
--- a/server/company/src/main/java/com/doumee/api/business/SolutionsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/SolutionsController.java
@@ -77,16 +77,16 @@
     @ApiOperation("鍒楄〃鏌ヨ")
     @PostMapping("/list")
     @RequiresPermissions("business:solutions:query")
-    public ApiResponse<List<Solutions>> findList (@RequestBody Solutions pageWrap) {
-        return ApiResponse.success(solutionsService.findList(pageWrap));
-    }
-
-    @ApiOperation("鍒楄〃鏌ヨ")
-    @PostMapping("/page")
-    public ApiResponse<List<Solutions>> findPage (@RequestBody Solutions solutions) {
+    public ApiResponse<List<Solutions>> findList (@RequestBody Solutions solutions) {
         return ApiResponse.success(solutionsService.findList(solutions));
     }
 
+//    @ApiOperation("鍒楄〃鏌ヨ")
+//    @PostMapping("/page")
+//    public ApiResponse<List<Solutions>> findPage (@RequestBody Solutions solutions) {
+//        return ApiResponse.success(solutionsService.findList(solutions));
+//    }
+
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:solutions:exportExcel")
diff --git a/server/company/src/main/java/com/doumee/api/business/TaxesController.java b/server/company/src/main/java/com/doumee/api/business/TaxesController.java
index 8ac43c2..e491053 100644
--- a/server/company/src/main/java/com/doumee/api/business/TaxesController.java
+++ b/server/company/src/main/java/com/doumee/api/business/TaxesController.java
@@ -10,8 +10,10 @@
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.model.PageData;
 import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.dto.DirectInvoicingDTO;
 import com.doumee.dao.business.dto.EntrustInvoicingDTO;
 import com.doumee.dao.business.model.Taxes;
+import com.doumee.dao.business.vo.TaxesInvoicingVO;
 import com.doumee.service.business.TaxesService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -101,8 +103,35 @@
     @ApiOperation("鎻愪氦濮旀墭鎶曟姤寮�绁�")
     @PostMapping("/entrustInvoicing")
     public ApiResponse entrustInvoicing(@RequestBody EntrustInvoicingDTO entrustInvoicingDTOs) {
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(!loginUserInfo.getType().equals(Constants.ONE)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+        }
         taxesService.entrustInvoicing(entrustInvoicingDTOs);
         return ApiResponse.success(null);
     }
 
+    @ApiOperation("鎻愪氦鐩存墭鎶曟姤寮�绁�")
+    @PostMapping("/directInvoicing")
+    public ApiResponse directInvoicing(@RequestBody DirectInvoicingDTO directInvoicingDTO) {
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(!loginUserInfo.getType().equals(Constants.ONE)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+        }
+        taxesService.directInvoicing(directInvoicingDTO);
+        return ApiResponse.success(null);
+    }
+
+
+    @ApiOperation(value = "鑾峰彇鐩翠繚鏁版嵁淇℃伅",notes = "")
+    @GetMapping("/getDirectTaxes")
+    @RequiresPermissions("business:taxes:query")
+    public ApiResponse getDirectTaxes(@RequestParam Integer id) {
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(!loginUserInfo.getType().equals(Constants.ONE)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+        }
+        return ApiResponse.success(taxesService.getDirectTaxes(id));
+    }
+
 }
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/DirectInvoicingDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/DirectInvoicingDTO.java
new file mode 100644
index 0000000..b481964
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/DirectInvoicingDTO.java
@@ -0,0 +1,34 @@
+package com.doumee.dao.business.dto;
+
+import com.doumee.dao.business.model.TaxDetial;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/1/24 11:35
+ */
+@Data
+public class DirectInvoicingDTO {
+
+    @ApiModelProperty(value = "淇濆崟涓婚敭")
+    private Integer id;
+
+    @ApiModelProperty(value = "寮�绁ㄩ噾棰�")
+    private BigDecimal invoicingMoney;
+
+    @ApiModelProperty(value = "鎺ユ敹鏂瑰紡 0鐢靛瓙鍙戠エ 1绾歌川鍙戠エ")
+    private Integer type;
+
+    @ApiModelProperty(value = "鍙戠エ鎺ユ敹鍦板潃")
+    private String address;
+
+    @ApiModelProperty(value = "鍐茬孩鍗曟暟鎹�")
+    private List<Integer> invoicingDetailDTOList;
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/DirectInvoicingDetailDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/DirectInvoicingDetailDTO.java
new file mode 100644
index 0000000..77d4b13
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/DirectInvoicingDetailDTO.java
@@ -0,0 +1,28 @@
+package com.doumee.dao.business.dto;
+
+import com.doumee.dao.business.model.TaxDetial;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/1/24 11:35
+ */
+@Data
+public class DirectInvoicingDetailDTO {
+
+    @ApiModelProperty(value = "涓婚敭")
+    private Integer id;
+
+    @ApiModelProperty(value = "鍗曞彿")
+    private String code;
+
+    @ApiModelProperty(value = "閲戦")
+    private BigDecimal fee;
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/EntrustInvoicingDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/EntrustInvoicingDTO.java
index 64df936..163e400 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/EntrustInvoicingDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/EntrustInvoicingDTO.java
@@ -25,7 +25,7 @@
     @ApiModelProperty(value = "鍙戠エ鎺ユ敹鍦板潃")
     private String address;
 
-    @ApiModelProperty(value = "鎶曚繚涓婚敭鍒楄〃" ,notes = "insuranceApplyId 銆� fee  銆乤pplyCode  ")
+    @ApiModelProperty(value = "鎶曚繚涓婚敭鍒楄〃" ,notes = "insuranceApplyId  銆� fee  銆乤pplyCode  ")
     private List<TaxDetial> taxDetialList;
 
 
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
index 32aa81d..0e3c827 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
@@ -53,7 +53,10 @@
     @ApiModelProperty(value = "绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
     private Integer type;
 
-    @ApiModelProperty(value = "涓婚敭鍒楄〃")
+    @ApiModelProperty(value = "涓婚敭鍒楄〃",notes = "濮旀墭鎶曚繚寮�绁ㄤ娇鐢�")
     private List<Integer> ids;
 
+    @ApiModelProperty(value = "鍗冲皢澶辨晥璁㈠崟锛�0=鍚︼紱1=鏄�")
+    private Integer loseEfficacy;
+
 }
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
index 366c2c1..b788cdb 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.vo.TaxesInvoicingVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -176,4 +178,17 @@
     private Date endTime;
 
 
+
+    public TaxesInvoicingVO getTaxesInvoicingVO(){
+        TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
+        taxesInvoicingVO.setId(this.getId());
+        taxesInvoicingVO.setSolutionsName(this.getSolutionsName());
+        taxesInvoicingVO.setValidCode(this.getValidCode());
+        taxesInvoicingVO.setAddNum(this.getAddNum());
+        taxesInvoicingVO.setDelNum(this.getDelNum());
+        taxesInvoicingVO.setAmount(this.getFee());
+        taxesInvoicingVO.setType(Constants.ONE);
+        return taxesInvoicingVO;
+    }
+
 }
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index 8dc48f3..fa76347 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
 import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.vo.TaxesInvoicingVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -86,7 +87,6 @@
 
     @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
     @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
-
     private Date startTime;
 
     @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
@@ -144,6 +144,9 @@
     @TableField(exist = false)
     private Date taxesLast;
 
+    @ApiModelProperty(value = "澶辨晥鍓╀綑澶╂暟")
+    @TableField(exist = false)
+    private Integer loseEfficacyDays;
 
     @ApiModelProperty(value = "鏈嶅姟澶╂暟")
     @TableField(exist = false)
@@ -164,4 +167,17 @@
     @ApiModelProperty(value = "澶勭悊浼佷笟鐢宠鐘舵��  0鍚屾剰 1椹冲洖")
     @TableField(exist = false)
     private int dealBackApply;
+
+
+    public TaxesInvoicingVO getTaxesInvoicingVO(){
+        TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
+        taxesInvoicingVO.setId(this.getId());
+        taxesInvoicingVO.setSolutionsName(this.getSolutionsName());
+        taxesInvoicingVO.setInsuranceCode(this.getCode());
+        taxesInvoicingVO.setInsuranceNum(this.getInsureNum());
+        taxesInvoicingVO.setStartTime(this.getStartTime());
+        taxesInvoicingVO.setAmount(this.getFee());
+        taxesInvoicingVO.setType(Constants.ZERO);
+        return taxesInvoicingVO;
+    }
 }
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java b/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java
index fe5f9fe..a676f7c 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.vo.TaxesInvoicingVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -67,6 +69,7 @@
     @ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany锛�", example = "1")
     @ExcelColumn(name="浼佷笟缂栫爜锛堝叧鑱攃ompany锛�")
     private Integer companyId;
+
     @ApiModelProperty(value = "鏂规缂栫爜锛堝叧鑱攕olutions锛�", example = "1")
     @ExcelColumn(name="鏂规缂栫爜锛坰olutions锛�")
     private Integer solutionId;
@@ -156,6 +159,9 @@
     @TableField(exist = false)
     private String imgurlFull;
 
+    @ApiModelProperty(value = "淇濆崟鍙�")
+    @TableField(exist = false)
+    private String insuranceCode;
     @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂�")
     @TableField(exist = false)
     private Date startDate;
@@ -169,4 +175,18 @@
     @ApiModelProperty(value = "鍐茬孩鍗曞垪琛�")
     @TableField(exist = false)
     List<TaxDetial> delTaxList ;//
+
+
+
+    public TaxesInvoicingVO getTaxesInvoicingVO(){
+        TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
+        taxesInvoicingVO.setId(this.getId());
+        taxesInvoicingVO.setSolutionsName(this.getSolutionName());
+        taxesInvoicingVO.setInsuranceCode(this.getInsuranceCode());
+        taxesInvoicingVO.setAmount(this.getPrice());
+        taxesInvoicingVO.setType(Constants.TWO);
+        return taxesInvoicingVO;
+    }
+
+
 }
diff --git a/server/service/src/main/java/com/doumee/dao/business/vo/TaxesInvoicingVO.java b/server/service/src/main/java/com/doumee/dao/business/vo/TaxesInvoicingVO.java
new file mode 100644
index 0000000..5b0ff41
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/vo/TaxesInvoicingVO.java
@@ -0,0 +1,60 @@
+package com.doumee.dao.business.vo;
+
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.InsuranceApply;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.poi.ss.formula.functions.T;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 鐩翠繚寮�绁ㄧ被
+ * @author RenKang
+ */
+@Data
+public class TaxesInvoicingVO {
+
+    @ApiModelProperty(value = "涓婚敭")
+    private Integer id;
+
+    @ApiModelProperty(value = "绫诲瀷 0淇濆崟鐢宠 1鍔犲噺淇濈敵璇� 2鍐茬孩鍗�")
+    private Integer type;
+
+    @ApiModelProperty(value = "鏂规鍚嶇О")
+    private String solutionsName;
+
+    @ApiModelProperty(value = "淇濆崟鍙�")
+    private String insuranceCode;
+
+    @ApiModelProperty(value = "鎵瑰崟鍙�")
+    private String validCode;
+
+    @ApiModelProperty(value = "鎶曚繚浜烘暟")
+    private Integer insuranceNum;
+
+    @ApiModelProperty(value = "鍔犱繚浜烘暟")
+    private Integer addNum;
+
+    @ApiModelProperty(value = "鍑忎繚浜烘暟")
+    private Integer delNum;
+
+    @ApiModelProperty(value = "淇濆崟鐢熸晥璧锋湡")
+    private Date startTime;
+
+    @ApiModelProperty(value = "淇濆崟鐢熸晥姝㈡湡")
+    private Date endTime;
+
+    @ApiModelProperty(value = "閲戦")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "鍙戠エ鍙�")
+    private String downCode;
+
+
+
+
+
+
+}
diff --git a/server/service/src/main/java/com/doumee/service/business/TaxesService.java b/server/service/src/main/java/com/doumee/service/business/TaxesService.java
index 4ecd699..c40fbef 100644
--- a/server/service/src/main/java/com/doumee/service/business/TaxesService.java
+++ b/server/service/src/main/java/com/doumee/service/business/TaxesService.java
@@ -2,8 +2,11 @@
 
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dto.DirectInvoicingDTO;
 import com.doumee.dao.business.dto.EntrustInvoicingDTO;
 import com.doumee.dao.business.model.Taxes;
+import com.doumee.dao.business.vo.TaxesInvoicingVO;
+
 import java.util.List;
 
 /**
@@ -108,4 +111,16 @@
      */
     void entrustInvoicing(EntrustInvoicingDTO entrustInvoicingDTO);
 
+    /**
+     * 鐩存墭鎶曚繚鏁版嵁鎻愪氦
+     * @param directInvoicingDTO
+     */
+    void directInvoicing(DirectInvoicingDTO directInvoicingDTO);
+
+    /**
+     * 鏌ヨ鐩翠繚鏁版嵁
+     * @param id
+     * @return
+     */
+    List<TaxesInvoicingVO> getDirectTaxes(Integer id);
 }
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index 0c18a3c..a3e4e19 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -551,6 +551,8 @@
         queryWrapper.selectAll(InsuranceApply.class);
         queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName);
         queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName);
+        queryWrapper.select(" DATEDIFF( t.END_TIME ,now()  ) AS loseEfficacyDays ");
+        queryWrapper.select(" ( select count(1) from apply_detail ad  where ad.apply_id = t.id ) as insureNum");
         queryWrapper.select(" ( select sum(td.fee) from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id  where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ) as taxesMoney");
         queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id  where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast ");
         queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
@@ -836,4 +838,5 @@
 
 
 
+
 }
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
index 27ae00a..e560f5e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
@@ -9,27 +9,33 @@
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.CompanyMapper;
+import com.doumee.dao.business.SolutionsMapper;
 import com.doumee.dao.business.TaxDetialMapper;
 import com.doumee.dao.business.TaxesMapper;
+import com.doumee.dao.business.dto.DirectInvoicingDTO;
+import com.doumee.dao.business.dto.DirectInvoicingDetailDTO;
 import com.doumee.dao.business.dto.EntrustInvoicingDTO;
+import com.doumee.dao.business.join.ApplyChangeJoinMapper;
 import com.doumee.dao.business.join.InsuranceApplyJoinMapper;
 import com.doumee.dao.business.join.TaxDetailJoinMapper;
 import com.doumee.dao.business.join.TaxesJoinMapper;
 import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.vo.TaxesInvoicingVO;
 import com.doumee.dao.system.model.SystemUser;
 import com.doumee.service.business.TaxesService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -57,6 +63,10 @@
     private CompanyMapper companyMapper;
     @Autowired
     private InsuranceApplyJoinMapper insuranceApplyJoinMapper;
+    @Autowired
+    private ApplyChangeJoinMapper applyChangeJoinMapper;
+    @Autowired
+    private SolutionsMapper solutionsMapper;
 
     @Override
     public Integer create(Taxes taxes) {
@@ -420,4 +430,231 @@
 
 
 
+
+    @Override
+    public List<TaxesInvoicingVO> getDirectTaxes(Integer id){
+        InsuranceApply queryInsuranceApply = insuranceApplyJoinMapper.selectById(id);
+        if(Objects.isNull(queryInsuranceApply)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        Solutions solutions = solutionsMapper.selectById(queryInsuranceApply.getSolutionId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
+        }
+        if(!solutions.getType().equals(Constants.ZERO)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炵洿淇濇柟妗堜繚鍗曪紝鏃犳硶杩涜璇ユ搷浣�");
+        }
+        List<TaxesInvoicingVO>  taxesInvoicingVOList = new ArrayList<>();
+        this.dealTaxesData(id,taxesInvoicingVOList);
+        List<Taxes> taxesList = taxesJoinMapper.selectJoinList(Taxes.class,new MPJLambdaWrapper<Taxes>()
+                .selectAll(Taxes.class)
+                .selectAs(Solutions::getName,Taxes::getSolutionName)
+                .selectAs(InsuranceApply::getCode,Taxes::getInsuranceCode)
+                .leftJoin(Solutions.class,Solutions::getId,Taxes::getSolutionId)
+                .leftJoin(InsuranceApply.class,InsuranceApply::getId,Taxes::getInsuranceApplyId)
+                .eq(Taxes::getStatus,Constants.ONE)
+                .eq(Taxes::getInsuranceApplyId,id)
+        );
+        if(CollectionUtils.isNotEmpty(taxesList)){
+            for (Taxes taxes:taxesList) {
+                TaxesInvoicingVO taxesInvoicingVO = taxes.getTaxesInvoicingVO();
+                taxesInvoicingVOList.add(taxesInvoicingVO);
+            }
+        }
+        return taxesInvoicingVOList;
+
+    }
+
+
+    public void dealTaxesData(Integer id,List<TaxesInvoicingVO>  taxesInvoicingVOList){
+        InsuranceApply insuranceApply =  insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
+                new MPJLambdaWrapper<InsuranceApply>()
+                        .selectAll(InsuranceApply.class)
+                        .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                        .select(" ( select count(1) from apply_detail ad  where ad.apply_id = t.id ) as insureNum")
+                        .notExists(" select 1 from taxes t1 inner join tax_detial t2 on t1.id  = t2.tax_id where t2.type = 0 and t1.status != 2 and t.id = t2.INSURANCE_APPLY_ID  ")
+                        .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+                        .eq(InsuranceApply::getId,id)
+        );
+
+
+        List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,new MPJLambdaWrapper<ApplyChange>()
+                .selectAll(ApplyChange.class)
+                .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
+                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0  ) as addNum ")
+                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1  ) as delNum ")
+                .select("( select ifnull(sum(ad.FEE),0) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID  ) as changeMoney" )
+                .notExists(" select 1 from taxes t1 inner join tax_detial t2 on t1.id  = t2.tax_id where t2.type = 1 and t1.status != 2 and t.id = t2.APPLY_CHANGE_ID  ")
+                .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+                .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.APPROVE.getKey())
+                .eq(ApplyChange::getType,Constants.ZERO)
+                .eq(InsuranceApply::getId,id)
+        );
+
+        if(CollectionUtils.isNotEmpty(applyChangeList)){
+            for (ApplyChange applyChange:applyChangeList) {
+                insuranceApply.setFee(insuranceApply.getFee().subtract(applyChange.getFee()));
+                TaxesInvoicingVO taxesInvoicingVO = applyChange.getTaxesInvoicingVO();
+                if(!Objects.isNull(insuranceApply)){
+                    taxesInvoicingVO.setAmount(BigDecimal.ZERO);
+                }
+                taxesInvoicingVOList.add(taxesInvoicingVO);
+            }
+        }
+        if(!Objects.isNull(insuranceApply)){
+            TaxesInvoicingVO taxesInvoicingVO = insuranceApply.getTaxesInvoicingVO();
+            taxesInvoicingVOList.add(taxesInvoicingVO);
+        }
+    }
+
+
+    /**
+     * 鐩翠繚鏁版嵁鎻愪氦
+     * @param directInvoicingDTO
+     */
+    @Override
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+    public void directInvoicing(DirectInvoicingDTO directInvoicingDTO){
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(Objects.isNull(directInvoicingDTO)
+                || Objects.isNull(directInvoicingDTO.getInvoicingMoney())
+                || Objects.isNull(directInvoicingDTO.getType())
+                || Objects.isNull(directInvoicingDTO.getInvoicingDetailDTOList())
+                || StringUtils.isNotBlank(directInvoicingDTO.getAddress())
+        ){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        if(!user.getType().equals(Constants.ONE)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱敤鎴锋棤娉曡繘琛岃涓氬姟鏌ヨ");
+        }
+        Company company = companyMapper.selectById(user.getCompanyId());
+        if(Objects.isNull(company)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼佷笟淇℃伅");
+        }
+        InsuranceApply queryInsuranceApply = insuranceApplyJoinMapper.selectById(directInvoicingDTO.getId());
+        if(Objects.isNull(queryInsuranceApply)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        Solutions solutions = solutionsMapper.selectById(queryInsuranceApply.getSolutionId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
+        }
+        if(!solutions.getType().equals(Constants.ZERO)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炵洿淇濇柟妗堜繚鍗曪紝鏃犳硶杩涜璇ユ搷浣�");
+        }
+
+        Taxes taxes = new Taxes();
+        taxes.setCreator(user.getId());
+        taxes.setCreateDate(new Date());
+        taxes.setIsdeleted(Constants.ZERO);
+        taxes.setStatus(Constants.ZERO);
+        taxes.setCompanyId(company.getId());
+        taxes.setPrice(directInvoicingDTO.getInvoicingMoney());
+        taxes.setType(directInvoicingDTO.getType());
+        taxes.setTaxCode(company.getTaxCode());
+        taxes.setTaxAccount(company.getTaxAccount());
+        taxes.setTaxAddr(company.getTaxAddr());
+        taxes.setAddr(directInvoicingDTO.getAddress());
+        taxes.setCompanyName(company.getName());
+        taxes.setApplyType(Constants.ONE);
+        taxes.setSolutionId(solutions.getId());
+        taxes.setInsuranceApplyId(queryInsuranceApply.getId());
+        taxesMapper.insert(taxes);
+
+        List<TaxesInvoicingVO>  taxesInvoicingVOList = new ArrayList<>();
+        this.dealTaxesData(queryInsuranceApply.getId(),taxesInvoicingVOList);
+        List<TaxDetial> taxDetailList = new ArrayList<>();
+        for (TaxesInvoicingVO taxesInvoicingVO:taxesInvoicingVOList) {
+            if(Objects.isNull(taxesInvoicingVO)
+                    || Objects.isNull(taxesInvoicingVO.getAmount())
+                    || Objects.isNull(taxesInvoicingVO.getId())
+                    || Objects.isNull(taxesInvoicingVO.getType())
+            ){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST);
+            }
+            TaxDetial taxDetial = new TaxDetial();
+            taxDetial.setCreator(user.getId());
+            taxDetial.setCreateDate(new Date());
+            taxDetial.setIsdeleted(Constants.ZERO);
+            taxDetial.setTaxId(taxes.getId());
+            taxDetial.setTotalFee(taxesInvoicingVO.getAmount());
+            taxDetial.setFee(taxesInvoicingVO.getAmount());
+            if(taxesInvoicingVO.getType().equals(Constants.ZERO)){
+                taxDetial.setInsuranceApplyId(taxesInvoicingVO.getId());
+                taxDetial.setType(taxesInvoicingVO.getType());
+            }else if(taxesInvoicingVO.getType().equals(Constants.ONE)){
+                taxDetial.setApplyChangeId(taxesInvoicingVO.getId());
+                taxDetial.setType(taxesInvoicingVO.getType());
+            }
+            taxDetailList.add(taxDetial);
+        }
+        List<Integer> chIdList = directInvoicingDTO.getInvoicingDetailDTOList();
+        if(CollectionUtils.isNotEmpty(chIdList)){
+            for (Integer id:chIdList) {
+                Taxes chTaxes = taxesMapper.selectById(id);
+                if(Objects.isNull(chTaxes)){
+                    throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌閫夋嫨鍐茬孩鏁版嵁");
+                }
+                if(!(chTaxes.getStatus().equals(Constants.ZERO)||chTaxes.getStatus().equals(Constants.ONE))){
+                    throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鍐茬孩鏁版嵁鐘舵�侀敊璇�");
+                }
+                TaxDetial taxDetial = new TaxDetial();
+                taxDetial.setCreator(user.getId());
+                taxDetial.setCreateDate(new Date());
+                taxDetial.setIsdeleted(Constants.ZERO);
+                taxDetial.setTaxId(taxes.getId());
+                taxDetial.setTotalFee(chTaxes.getPrice());
+                taxDetial.setFee(chTaxes.getPrice());
+                taxDetial.setDelTaxId(chTaxes.getId());
+                taxDetial.setType(Constants.TWO);
+                taxDetailList.add(taxDetial);
+            }
+        }
+        if(CollectionUtils.isNotEmpty(taxDetailList)){
+            taxDetailJoinMapper.insertBatchSomeColumn(taxDetailList);
+        }else{
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犲彲寮�绁ㄦ暟鎹紝鎿嶄綔澶辫触");
+        }
+
+
+//        List<DirectInvoicingDetailDTO> directInvoicingDetailDTOList = directInvoicingDTO.getDirectInvoicingDetailDTOList();
+//        for (DirectInvoicingDetailDTO directInvoicingDetailDTO:directInvoicingDetailDTOList) {
+//            if(Objects.isNull(directInvoicingDetailDTO)
+//                    || Objects.isNull(directInvoicingDetailDTO.getId())
+//                    || Objects.isNull(directInvoicingDetailDTO.getType())
+//                    || Objects.isNull(directInvoicingDetailDTO.getFee())
+//            ){
+//                throw new BusinessException(ResponseStatus.BAD_REQUEST);
+//            }
+//
+//            if(directInvoicingDetailDTO.getType().equals(Constants.ZERO)){
+//                //淇濆崟
+//                InsuranceApply insuranceApply =  insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
+//                        new MPJLambdaWrapper<InsuranceApply>()
+//                                .selectAll(InsuranceApply.class)
+//                                .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+//                                .select(" ( select count(1) from apply_detail ad  where ad.apply_id = t.id ) as insureNum")
+//                                .notExists(" select 1 from taxes t1 inner join tax_detial t2 on t1.id  = t2.tax_id where t2.type = 0 and t1.status != 2 and t.id = t2.INSURANCE_APPLY_ID  ")
+//                                .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+//                                .eq(InsuranceApply::getId,directInvoicingDetailDTO.getId())
+//                );
+//                if(Objects.isNull(insuranceApply)){
+//                    throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"淇濆崟鍙枫��"+insuranceApply.getCode()+"銆戞湭鏌ヨ鍒颁繚鍗曚俊鎭�");
+//                }
+//
+//
+//
+//            }else if(directInvoicingDetailDTO.getType().equals(Constants.ZERO)){
+//                //鍔犲噺淇�
+//            }else{
+//                //鍐茬孩鍗�
+//            }
+//
+//
+//        }
+//        taxDetailJoinMapper.insertBatchSomeColumn(taxDetialList);
+    }
+
+
 }

--
Gitblit v1.9.3