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

src/main/java/com/ydtech/modules/admin/service/impl/SysDeptServiceImpl.java

@@ -397,6 +397,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
         {
             String area = deptId.substring(2,8);
             SysArea sysArea = sysAreaMapper.selectOne(new LambdaQueryWrapper<SysArea>().eq(SysArea::getAreaCode, area));
+            if(sysArea == null){
+                return "";
+            }
             List<SysArea> sysAreas = sysAreaService.queryAllParent(sysArea);
             result.append(sysAreas.get(2).getAreaCname());
             result.append(sysAreas.get(1).getAreaCname());

src/main/java/com/ydtech/modules/inv/controller/invAccountExcelController.java

@@ -3,15 +3,14 @@ package com.ydtech.modules.inv.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.ydtech.constants.enums.inv.InvPayMethodEnum;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.core.page.PageResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.inv.dao.InvAccountExcelMapper;
+import com.ydtech.modules.inv.dao.InvAccountOperateMapper;
 import com.ydtech.modules.inv.model.InvAccountExcel;
+import com.ydtech.modules.inv.model.InvAccountOperate;
 import com.ydtech.modules.inv.model.excel.InvDisburseExcel;
-import com.ydtech.modules.inv.model.po.InvSettlementSource;
-import com.ydtech.modules.inv.model.vo.InvAccountExcelVo;
-import com.ydtech.modules.inv.model.vo.InvSettlementSourceQueryVo;
+import com.ydtech.modules.inv.model.vo.InvAccountOperateVo;
 import com.ydtech.modules.inv.service.InvAccountExcelService;
 import com.ydtech.modules.inv.utils.EasyExcelUtils;
 import io.swagger.annotations.Api;
@@ -44,6 +43,9 @@ public class invAccountExcelController {
     @Resource
     private InvAccountExcelMapper invAccountExcelMapper;
 
+    @Resource
+    private InvAccountOperateMapper invAccountOperateMapper;
+
     @Value("${upload.file.path}")
     private String uploadPath;
 
@@ -59,7 +61,7 @@ public class invAccountExcelController {
     @PostMapping("deriveReport")
     @ApiOperation("导出支出报表")
     public HttpResult deriveReport(@RequestBody List<String> idList) throws IOException {
-        List<InvAccountExcel> insAccountExcels = invAccountExcelMapper.selectBatchIds(idList);
+        List<InvAccountOperate> insAccountExcels = invAccountOperateMapper.selectBatchIds(idList);
         String uploadPath = this.uploadPath + "/excel/";
         Path path = Paths.get(uploadPath);
         if (!Files.exists(path)) {
@@ -151,8 +153,8 @@ public class invAccountExcelController {
 
     @ApiOperation("支出报表查看")
     @PostMapping("getDisburse")
-    public HttpResult getDisburse(@RequestBody InvAccountExcelVo invAccountExcelVo) {
-        return invAccountExcelService.selectDisburse(invAccountExcelVo);
+    public HttpResult getDisburse(@RequestBody InvAccountOperateVo invAccountOperateVo) {
+        return invAccountExcelService.selectDisburse(invAccountOperateVo);
     }
 
 

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.inv.model.InvAccountExcel;
-import com.ydtech.modules.inv.model.vo.InvAccountExcelVo;
+import com.ydtech.modules.inv.model.vo.InvAccountOperateVo;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -17,7 +17,7 @@ import org.apache.ibatis.annotations.Param;
 public interface InvAccountExcelMapper extends BaseMapper<InvAccountExcel> {
     IPage<InvAccountExcel> selectExcelAccount(Page page, @Param("insAccountExcel") InvAccountExcel insAccountExcel);
 
-    IPage<InvAccountExcelVo> selectDisburse(Page page, @Param("insAccountExcel") InvAccountExcelVo insAccountExcelVo);
+    IPage<InvAccountOperateVo> selectDisburse(Page page, @Param("inAccountOperateVo") InvAccountOperateVo invAccountOperateVo);
 }
 
 

src/main/java/com/ydtech/modules/inv/model/InvAccountOperate.java

@@ -60,7 +60,7 @@ public class InvAccountOperate implements Serializable {
 
 
     @ApiModelProperty("无需传递")
-    @ExcelProperty("板块")
+//    @ExcelProperty("板块")
     @TableField(exist = false)
     private String plate;
 
@@ -81,7 +81,7 @@ public class InvAccountOperate implements Serializable {
      * 资金流向
      */
     @ApiModelProperty(value = "资金流向")
-    @ExcelProperty("资金流向")
+//    @ExcelProperty("资金流向")
     private String fundFlow;
 
     /**
@@ -102,7 +102,7 @@ public class InvAccountOperate implements Serializable {
     private String fundUse;
 
     @ApiModelProperty("资金用途分项")
-    @ExcelProperty("分项")
+//    @ExcelProperty("分项")
     private String fundFen;
 
     /**

src/main/java/com/ydtech/modules/inv/model/excel/InvDisburseExcel.java

@@ -10,10 +10,10 @@ import java.util.Date;
 
 @Data
 public class InvDisburseExcel implements Serializable {
-    @ExcelProperty("日期")
-    @ApiModelProperty(value = "申请时间")
+    @ExcelProperty("转账日期")
+    @ApiModelProperty(value = "转账日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date applyTime;
+    private String createTime;
 
     @ExcelProperty("费用类型")
     @ApiModelProperty(value = "资金用途")

src/main/java/com/ydtech/modules/inv/model/vo/InvAccountExcelVo.java → src/main/java/com/ydtech/modules/inv/model/vo/InvAccountOperateVo.java

@@ -6,21 +6,18 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
 @Data
-public class InvAccountExcelVo implements Serializable {
+public class InvAccountOperateVo implements Serializable {
+    @ApiModelProperty(value = "转账记录id")
+    private String accountOperateId;
 
-    @ApiModelProperty(value = "资金申请表id")
-    private String excelAccountOperateId;
-
-    @ExcelProperty("日期")
-    @ApiModelProperty(value = "申请时间")
+    @ExcelProperty("转账日期")
+    @ApiModelProperty(value = "转账时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @NotBlank
-    private Date applyTime;
+    private Date createTime;
 
     @ExcelProperty("费用类型")
     @ApiModelProperty(value = "资金用途")
@@ -49,18 +46,19 @@ public class InvAccountExcelVo implements Serializable {
     @ApiModelProperty(value = "收款单位信息")
     private String collectionMessage;
 
+    /**
+     * 转账时间开始
+     */
     @ApiModelProperty(value = "申请时间起")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(exist = false)
-    private Date applyTimeStart;
+    private String createTimeStart;
 
     /**
-     * 申请时间止
+     * 转账时间结束
      */
     @ApiModelProperty(value = "申请时间止")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(exist = false)
-    private Date applyTimeEnd;
+    private String createTimeEnd;
 
     private int pageNum;
 

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

@@ -4,7 +4,7 @@ package com.ydtech.modules.inv.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.inv.model.InvAccountExcel;
-import com.ydtech.modules.inv.model.vo.InvAccountExcelVo;
+import com.ydtech.modules.inv.model.vo.InvAccountOperateVo;
 
 import java.util.List;
 
@@ -18,7 +18,7 @@ public interface InvAccountExcelService extends IService<InvAccountExcel> {
 
     HttpResult selectAccountExcel(InvAccountExcel invAccountExcel);
 
-    HttpResult selectDisburse(InvAccountExcelVo InvAccountExcelVo);
+    HttpResult selectDisburse(InvAccountOperateVo invAccountOperateVo);
 
     HttpResult updateTransferFlag(String excelAccountOperateId);
 

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

@@ -1,7 +1,6 @@
 package com.ydtech.modules.inv.service.impl;
 
 
-import com.alibaba.excel.util.WorkBookUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,16 +9,11 @@ import com.ydtech.constants.enums.inv.InvPayMethodEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.inv.dao.InvAccountExcelMapper;
 import com.ydtech.modules.inv.model.*;
-import com.ydtech.modules.inv.model.vo.InvAccountExcelVo;
+import com.ydtech.modules.inv.model.vo.InvAccountOperateVo;
 import com.ydtech.modules.inv.service.*;
 import com.ydtech.modules.inv.utils.EasyExcelUtils;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -107,10 +101,9 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
     }
 
     //支出报表查看
-    @Override
-    public HttpResult selectDisburse(InvAccountExcelVo invAccountExcelVo){
-        Page<InvAccountExcelVo> page = new Page<>(invAccountExcelVo.getPageNum(), invAccountExcelVo.getPageSize());
-        IPage<InvAccountExcelVo> invAccountExcelIPage = insAccountExcelMapper.selectDisburse(page, invAccountExcelVo);
+    public HttpResult selectDisburse(InvAccountOperateVo invAccountOperateVo){
+        Page<InvAccountOperateVo> page = new Page<>(invAccountOperateVo.getPageNum(), invAccountOperateVo.getPageSize());
+        IPage<InvAccountOperateVo> invAccountExcelIPage = insAccountExcelMapper.selectDisburse(page, invAccountOperateVo);
         return HttpResult.ok("", invAccountExcelIPage);
     }
 

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -767,7 +767,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
         List<InsFeeOrderNew> insFeeOrderNews = new ArrayList<>();
         if(!companyIds.isEmpty()) {
-            insFeeOrderNewService.getInsFeeOrderNewListByCompanyId(companyIds);
+            insFeeOrderNews = insFeeOrderNewService.getInsFeeOrderNewListByCompanyId(companyIds);
         }
 
         //计算费用

src/main/java/com/ydtech/modules/order/service/impl/ZijinOrderApiServiceImpl.java

@@ -593,7 +593,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             insAreaCompanyAccidentalDriving.setRideRiskName(insAreaCompanyAccidentalDriving.getRideRiskName());
             insAreaCompanyAccidentalDrivings.add(insAreaCompanyAccidentalDriving);
         });
-        insAreaCompany.setIsDjq(calculatePremiumResponse.getBasePart().getIsDjq());
+        insAreaCompany.setIsDjq(calculatePremiumResponse.getBasePart().getIsDjq().equals("")?"0":calculatePremiumResponse.getBasePart().getIsDjq());
         insAreaCompanyService.insertCompanyAndOrders(insAreaCompany,insAreaCompanyAccidentalDrivings);
         quoteRespVo.setCompanyId(orderNo);
         //添加调用费用匹配功能

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -580,13 +580,15 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         EsmInsCompany esmInsCompany;
 
         // 获取保险公司
-        if (AgreementType.AT2.getCode().equals(agreementSaveDto.getAgreementType())) {
-            String message = String.format("协议为 %s 保险公司必须传入", AgreementType.AT2.getDesc());
-            AssertionUtils.isStringEmpty(agreementSaveDto.getAssociationCompaniesId(), message);
-            esmInsCompany = esmInsCompanyService.isExists(agreementSaveDto.getAssociationCompaniesId());
-        } else {
-            esmInsCompany = esmInsCompanyService.getBySubsidiary(agreementSaveDto.getPartnerCompaniesId());
-        }
+//        if (AgreementType.AT2.getCode().equals(agreementSaveDto.getAgreementType())) {
+//            String message = String.format("协议为 %s 保险公司必须传入", AgreementType.AT2.getDesc());
+//            AssertionUtils.isStringEmpty(agreementSaveDto.getAssociationCompaniesId(), message);
+//            esmInsCompany = esmInsCompanyService.isExists(agreementSaveDto.getAssociationCompaniesId());
+//        } else {
+//            esmInsCompany = esmInsCompanyService.getBySubsidiary(agreementSaveDto.getPartnerCompaniesId());
+//        }
+
+        esmInsCompany = esmInsCompanyService.getBySubsidiary(agreementSaveDto.getPartnerCompaniesId());
 
         // 验证用户名密码 python api 对接需要验证用户名
         if (!ObjectUtils.isEmpty(attribution.getApiType()) && PtlApiType.PTL_API_2.getCode() == attribution.getApiType()) {

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

@@ -120,44 +120,57 @@
         desc
     </select>
 
+    <resultMap id="InvAccountOperateVoResultMap" type="com.ydtech.modules.inv.model.vo.InvAccountOperateVo">
+        <id property="accountOperateId" column="account_operate_id" jdbcType="VARCHAR"/>
+        <result property="company" column="company" jdbcType="VARCHAR"/>
+        <result property="applySector" column="apply_sector" jdbcType="VARCHAR"/>
+        <result property="collectionMessage" column="collection_message" jdbcType="VARCHAR"/>
+        <result property="fundUse" column="fund_use" jdbcType="VARCHAR"/>
+        <result property="applyAmount" column="apply_amount" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="remark" column="remark" jdbcType="VARCHAR"/>
+    </resultMap>
+
 
-    <select id="selectDisburse" resultMap="BaseResultMap">
+    <select id="selectDisburse" resultMap="InvAccountOperateVoResultMap">
         SELECT DISTINCT
-            a.excel_account_operate_id,
-            a.apply_time,
+            a.account_operate_id,
+            DATE_FORMAT(a.create_time, '%Y-%m-%d') as create_date,
             a.fund_use,
             a.remark,
             a.apply_amount,
             a.apply_sector,
             a.company,
-            a.collection_message
-        from inv_account_excel a
+            a.collection_message,
+            a.create_time
+        from inv_account_operate a
             LEFT JOIN inv_account_expenses b ON a.fund_fen = b.category
         WHERE
             a.fund_use != '往来款'
 	    AND collection_message LIKE '外部用户%'
+        and a.revenue_outlay = '1'
         AND a.del_flag = '0'
-        <if test="insAccountExcel.applyTimeStart!= null">
-            and apply_time &gt;= #{insAccountExcel.applyTimeStart}
+        <if test="inAccountOperateVo.createTimeStart!= null">
+            and a.create_time &gt;= #{inAccountOperateVo.createTimeStart}
         </if>
-        <if test="insAccountExcel.applyTimeEnd!= null">
-            and apply_time &lt;= #{insAccountExcel.applyTimeEnd}
+        <if test="inAccountOperateVo.createTimeEnd!= null">
+            and a.create_time &lt;= #{inAccountOperateVo.createTimeEnd}
         </if>
-        <if test="insAccountExcel.applySector!= null and insAccountExcel.applySector!= ''">
-            and apply_sector = #{insAccountExcel.applySector}
+        <if test="inAccountOperateVo.applySector!= null and inAccountOperateVo.applySector!= ''">
+            and a.apply_sector = #{inAccountOperateVo.applySector}
         </if>
-        <if test="insAccountExcel.collectionMessage!= null and insAccountExcel.collectionMessage!= ''">
-            and collection_message like concat('%',#{insAccountExcel.collectionMessage},'%')
+        <if test="inAccountOperateVo.collectionMessage!= null and inAccountOperateVo.collectionMessage!= ''">
+            and a.collection_message like concat('%',#{inAccountOperateVo.collectionMessage},'%')
         </if>
-        <if test="insAccountExcel.company!= null and insAccountExcel.company!= ''">
-            and company like concat('%',#{insAccountExcel.company},'%')
+        <if test="inAccountOperateVo.company!= null and inAccountOperateVo.company!= ''">
+            and a.company like concat('%',#{inAccountOperateVo.company},'%')
         </if>
-        <if test="insAccountExcel.fundUse!= null and insAccountExcel.fundUse!= ''">
-            and fund_use = #{insAccountExcel.fundUse}
+        <if test="inAccountOperateVo.fundUse!= null and inAccountOperateVo.fundUse!= ''">
+            and a.fund_use = #{inAccountOperateVo.fundUse}
         </if>
-        <if test="insAccountExcel.applyAmount!= null and insAccountExcel.applyAmount!= ''">
-            and apply_amount = #{insAccountExcel.applyAmount}
+        <if test="inAccountOperateVo.applyAmount!= null and inAccountOperateVo.applyAmount!= ''">
+            and a.apply_amount = #{inAccountOperateVo.applyAmount}
         </if>
-        order by apply_time desc
+        order by a.create_time desc
     </select>
 </mapper>