1.平台结算bug修改2.0

src/main/java/com/ydtech/modules/fnc/dao/InsPlyIncomeMapper.java

@@ -111,4 +111,6 @@ public interface InsPlyIncomeMapper extends BaseMapper<InsPlyIncome> {
      * @return
      */
     List<HashMap<String,Object>> groupByInvoic(@Param("idArr") String[] idArr);
+
+
 }

src/main/java/com/ydtech/modules/fnc/dao/SettlementDocumentaryFeesMapper.java

@@ -23,4 +23,5 @@ public interface SettlementDocumentaryFeesMapper  extends BaseMapper<SettlementD
      */
     List<HashMap<String, Object>> getOtherSettldetail(@Param("invoiceIds") String[] invoiceIds);
 
+    void batchByInvoice( HashMap<String,Object> ids);
 }

src/main/java/com/ydtech/modules/fnc/entity/SettlementDocumentaryFeesEntity.java

@@ -53,9 +53,9 @@ public class SettlementDocumentaryFeesEntity implements Serializable {
     private LocalDate createTime;
 
 
-    @ApiModelProperty("开始时间")
-    @TableField("start_time")
-    private LocalDate startTime;
+    @ApiModelProperty("结算日期")
+    @TableField("settlement_time")
+    private LocalDate settlementTime;
 
     @ApiModelProperty("结束时间")
     @TableField("end_time")

src/main/java/com/ydtech/modules/fnc/service/SettlementDocumentaryFeesService.java

@@ -20,4 +20,6 @@ public interface SettlementDocumentaryFeesService extends IService<SettlementDoc
     HttpResult documentarySettle(SettlementDocumentaryFeesVo settlementDocumentaryFeesVo);
 
     List<HashMap<String, Object>> getOtherSettldetail(@Param("incomeIds") String incomeIds);
+
+    void batchByInvoice(String ids);
 }

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -503,19 +503,19 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
             params.put("riskcode",insPlyIncomeVo.getRiskcode());
         }
         if(StringUtils.isNotEmpty(insPlyIncomeVo.getPolicyno())){
-            params.put("policyno",insPlyIncomeVo.getPolicyno().split(","));
+            params.put("policyno",insPlyIncomeVo.getPolicyno());
         }
         if(StringUtils.isNotEmpty(insPlyIncomeVo.getSyPolicyno())){
-            params.put("syPolicyno",insPlyIncomeVo.getSyPolicyno().split(","));
+            params.put("syPolicyno",insPlyIncomeVo.getSyPolicyno());
         }
         if(StringUtils.isNotEmpty(insPlyIncomeVo.getNoPolicyno())){
-            params.put("noPolicyno",insPlyIncomeVo.getNoPolicyno().split(","));
+            params.put("noPolicyno",insPlyIncomeVo.getNoPolicyno());
         }
         if(insPlyIncomeVo.getCreateTime()!=null){
-            params.put("createTime",insPlyIncomeVo.getCreateTime());
+            params.put("createTime",insPlyIncomeVo.getCreateTime().toString());
         }
         if(insPlyIncomeVo.getSettlementTime()!=null){
-            params.put("settlementTime",insPlyIncomeVo.getSettlementTime());
+            params.put("settlementTime",insPlyIncomeVo.getSettlementTime().toString());
         }
         if(StringUtils.isNotEmpty(insPlyIncomeVo.getHandlingFeesStatus())){
             params.put("handlingFeesStatus",insPlyIncomeVo.getHandlingFeesStatus());
@@ -544,6 +544,9 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         if(StringUtils.isNotEmpty(insPlyIncomeVo.getInsuredName())){
             params.put("insuredName",insPlyIncomeVo.getInsuredName());
         }
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getPartnerCompaniesName())){
+            params.put("partnerCompaniesName",insPlyIncomeVo.getPartnerCompaniesName());
+        }
         return params;
     }
 
@@ -1087,36 +1090,20 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         return  HttpResult.ok(new BasePageResult<>(insPlyIncomeVo.getPageNum(), insPlyIncomeVo.getPageSize(), pageHelper.getTotal(), pageHelper.getPages(), list));
     }
 
+    /**
+     *
+     * @param insPlyIncomeVo  ids   ins_ply_income  这个表的ids        incomeIds     settlement_documentary_fees  这个表的ids
+     * @return
+     */
 
     @Override
     @Transactional
     public HttpResult batchBalance(InsPlyIncomeVo insPlyIncomeVo) {
 //  通过ids 查出跟单非结算单
-        String ids = insPlyIncomeVo.getIds();
-        if(StringUtils.isNotEmpty(ids)){
-            String[] split = ids.split(",");
-            for (int i =0; i <split.length ; i++) {
-                String id = split[i];
-                InsPlyIncome insPlyIncome = baseMapper.selectById(id);
-                insPlyIncome.setDocumentaryFeesStatus("1"); //1  为跟单费已经结算
-                insPlyIncome.setSettlementTime(LocalDate.now());
-                baseMapper.updateById(insPlyIncome);
-            }
-        }
-        SettlementDocumentaryFeesVo settlementDocumentaryFeesVo = new SettlementDocumentaryFeesVo();  // 生成跟单费结算表
-        if(StringUtils.isNotEmpty(insPlyIncomeVo.getYear())){
-            settlementDocumentaryFeesVo.setTimeFrame(insPlyIncomeVo.getYear());//年度
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getIds())){
+           settlementDocumentaryFeesService.batchByInvoice(insPlyIncomeVo.getIds());
         }
-
-        settlementDocumentaryFeesVo.setCompanyId(insPlyIncomeVo.getCompanyId());// 保险公司id
-        settlementDocumentaryFeesVo.setTotalAmount(insPlyIncomeVo.getOtherFeevalue());  //其他费用金额
-        settlementDocumentaryFeesVo.setUnsettledAmount(insPlyIncomeVo.getOtherFeevalue().subtract(insPlyIncomeVo.getInvoicCommissionFeevalue())); //未开票金额
-        settlementDocumentaryFeesVo.setSettlementAmount(insPlyIncomeVo.getInvoicCommissionFeevalue());//已开票金额
-        settlementDocumentaryFeesVo.setSettlementStatus("2");
-        settlementDocumentaryFeesVo.setIsNotCar(insPlyIncomeVo.getIsNotCar());
-        settlementDocumentaryFeesVo.setCreateTime(LocalDate.now());
-        settlementDocumentaryFeesVo.setIds(insPlyIncomeVo.getIncomeIds());
-        return  settlementDocumentaryFeesService.inertSettle(settlementDocumentaryFeesVo);
+        return  HttpResult.ok();
     }
 
 

src/main/java/com/ydtech/modules/fnc/service/impl/SettlementDocumentaryFeesServiceImpl.java

@@ -119,6 +119,13 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
         return baseMapper.getOtherSettldetail(invoiceIds);
     }
 
+    @Override
+    public void batchByInvoice(String ids) {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("ids",ids.split(","));
+        baseMapper.batchByInvoice(params);
+    }
+
     private int compareAmount(BigDecimal settlementAmount, BigDecimal settlementAmount1) {
 
         return settlementAmount.compareTo(settlementAmount1);

src/main/java/com/ydtech/modules/fnc/vo/InsPlyIncomeVo.java

@@ -258,6 +258,9 @@ public class InsPlyIncomeVo implements Serializable {
     @ApiModelProperty("被保人名称")
     private String insuredName;
 
+    @ApiModelProperty("保司机构")
+    private String partnerCompaniesName;
+
     @ApiModelProperty("选择ids")
     private List<String> selectIds;
 

src/main/java/com/ydtech/modules/ins/model/vo/res/SettlementFeesExcel.java

@@ -3,13 +3,17 @@ package com.ydtech.modules.ins.model.vo.res;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.converters.localdatetime.LocalDateTimeStringConverter;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
 import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ydtech.modules.inv.utils.LocalDateTimeUtils;
+import com.ydtech.modules.inv.utils.excel.DateConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import javafx.util.converter.LocalDateStringConverter;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -143,14 +147,13 @@ public class SettlementFeesExcel implements Serializable {
     @ExcelProperty( "应收金额")
     private BigDecimal receivableAmount;
 
-    @ExcelProperty( "创建日期")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @ExcelProperty( value = "创建日期", converter = DateConverter.class)
     @ApiModelProperty(value = "创建日期")
     private LocalDate createTime;
 
 
-    @ExcelProperty( "结算日期")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @ExcelProperty(value = "结算日期",converter = DateConverter.class)
+
     @ApiModelProperty(value = "结算日期")
     private LocalDate settlementTime;
 

src/main/java/com/ydtech/modules/inv/utils/excel/DateConverter.java

@@ -0,0 +1,65 @@
+package com.ydtech.modules.inv.utils.excel;
+ 
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.converters.WriteConverterContext;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+ 
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+import static com.ydtech.modules.order.utils.InsuranceTimeProcessing.formatter;
+
+/**
+ * LocalDate转换类
+ * @author
+ * @create
+ */
+public class DateConverter implements Converter<LocalDate> {
+    private static  final String PATTERN_YYYY_MM_DD = "yyyy-MM-dd";
+ 
+ 
+    @Override
+    public Class<LocalDate> supportJavaTypeKey() {
+        return LocalDate.class;
+    }
+ 
+    /**
+     * easyExcel导出数据类型转换
+     * @param cellData
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public LocalDate convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        String value = cellData.getStringValue();
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(PATTERN_YYYY_MM_DD);
+        LocalDate localDate = LocalDate.parse(value, formatter);
+        return localDate;
+    }
+ 
+    /**
+     * easyExcel导入Date数据类型转换
+     * @param context
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public WriteCellData<String> convertToExcelData(WriteConverterContext<LocalDate> context) throws Exception {
+        LocalDate date = context.getValue();
+        if (date == null) {
+            return null;
+        }
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(PATTERN_YYYY_MM_DD);
+        String dateString = date.format(dateTimeFormatter);
+        return new WriteCellData<>(dateString);
+    }
+ 
+}

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -184,39 +184,29 @@
                 <if test="licenseno != null and licenseno != ''">
                     and a.licenseno  =#{licenseno}
                 </if>
-
-                <if test="policyno != null and policyno != ''  and policyno.length > 0">
-                    and a.policyno in
-                    <foreach collection="policyno" item="item" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
+                <if test="syPolicyno != null and syPolicyno != ''">
+                    and a.sy_policyno  =#{syPolicyno}
                 </if>
 
-                <if test="syPolicyno != null and syPolicyno != ''  and syPolicyno.length > 0">
-                    and a.sy_policyno in
-                    <foreach collection="syPolicyno" item="item" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
-                </if>
-
-                <if test="noPolicyno != null and noPolicyno != ''  and noPolicyno.length > 0">
-                    and a.no_policyno in
-                    <foreach collection="syPolicyno" item="item" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
+                <if test="noPolicyno != null and noPolicyno != ''">
+                    and a.no_policyno =#{noPolicyno}
                 </if>
                 <if test="signdate !=null  and  signdate  !=''">
-                    a.signdate =#{signdate}
+                    AND  a.signdate =#{signdate}
                 </if>
                 <if test="partnerCompaniesId !=null  and  partnerCompaniesId  !=''">
-                    a.partner_companies_id =#{partnerCompaniesId}
+                    AND a.partner_companies_id =#{partnerCompaniesId}
+                </if>
+
+                <if test="partnerCompaniesName !=null  and  partnerCompaniesName  !=''">
+                  AND   a.partner_companies_name =#{partnerCompaniesName}
                 </if>
 
                 <if test="createTime !=null  and  createTime  !=''">
-                    a.create_time =#{createTime}
+                    AND  a.create_time =#{createTime}
                 </if>
                 <if test="settlementTime !=null  and  settlementTime  !=''">
-                    a.settlement_time =#{settlementTime}
+                    AND a.settlement_time =#{settlementTime}
                 </if>
 
                 <if test="userId !=null  and  userId  !=''">
@@ -238,7 +228,7 @@
                     AND day(a.signdate) =#{day}
                 </if>
                 <if test="insuredName !=null  and  insuredName !=''">
-                    a.insured_name =#{insuredName}
+                  AND  a.insured_name =#{insuredName}
                 </if>
             </where>
     </select>
@@ -446,25 +436,16 @@
                     </foreach>
                 </if>
 
-                <if test="policyno != null and policyno != ''  and policyno.length > 0">
-                    and a.policyno in
-                    <foreach collection="policyno" item="item" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
+                <if test="policyno != null and policyno != '' ">
+                    and a.policyno =#{policyno}
                 </if>
 
-                <if test="syPolicyno != null and syPolicyno != ''  and syPolicyno.length > 0">
-                    and a.sy_policyno in
-                    <foreach collection="syPolicyno" item="item" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
+                <if test="syPolicyno != null and syPolicyno != '' ">
+                    and a.sy_policyno =#{syPolicyno}
                 </if>
 
-                <if test="noPolicyno != null and noPolicyno != ''  and noPolicyno.length > 0">
-                    and a.no_policyno in
-                    <foreach collection="syPolicyno" item="item" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
+                <if test="noPolicyno != null and noPolicyno != ''">
+                    and a.no_policyno  =#{noPolicyno}
                 </if>
                 <if test="signdate !=null  and  signdate  !=''">
                     a.signdate =#{signdate}
@@ -552,38 +533,29 @@
                     and a.licenseno  =#{licenseno}
                 </if>
 
-                <if test="policyno != null and policyno != ''  and policyno.length > 0">
-                    and a.policyno in
-                    <foreach collection="policyno" item="item" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
+                <if test="syPolicyno != null and syPolicyno != ''  ">
+                    and a.sy_policyno =#{syPolicyno}
                 </if>
 
-                <if test="syPolicyno != null and syPolicyno != ''  and syPolicyno.length > 0">
-                    and a.sy_policyno in
-                    <foreach collection="syPolicyno" item="item" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
-                </if>
-
-                <if test="noPolicyno != null and noPolicyno != ''  and noPolicyno.length > 0">
-                    and a.no_policyno in
-                    <foreach collection="syPolicyno" item="item" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
+                <if test="noPolicyno != null and noPolicyno != ''">
+                    and a.no_policyno =#{noPolicyno}
                 </if>
                 <if test="signdate !=null  and  signdate  !=''">
-                    a.signdate =#{signdate}
+                   AND a.signdate =#{signdate}
                 </if>
                 <if test="partnerCompaniesId !=null  and  partnerCompaniesId  !=''">
-                    a.partner_companies_id =#{partnerCompaniesId}
+                   AND  a.partner_companies_id =#{partnerCompaniesId}
                 </if>
 
                 <if test="createTime !=null  and  createTime  !=''">
-                    a.create_time =#{createTime}
+                   AND a.create_time =#{createTime}
                 </if>
                 <if test="settlementTime !=null  and  settlementTime  !=''">
-                    a.settlement_time =#{settlementTime}
+                   AND a.settlement_time =#{settlementTime}
+                </if>
+
+                <if test="partnerCompaniesName !=null  and  partnerCompaniesName  !=''">
+                    AND   a.partner_companies_name =#{partnerCompaniesName}
                 </if>
 
                 <if test="userId !=null  and  userId  !=''">
@@ -604,6 +576,9 @@
                 <if test="day !=null  and  day !=''">
                     AND day(a.signdate) =#{day}
                 </if>
+                <if test="insuredName !=null  and  insuredName !=''">
+                    AND  a.insured_name =#{insuredName}
+                </if>
             </where>
     </select>
 
@@ -681,32 +656,18 @@
             <if test="isOther !=null  and  isOther  !=''">
                 and a.is_not_documentary   =#{isOther}
             </if>
-            <if test="licenseno != null and licenseno != ''  and licenseno.length > 0">
-                and a.licenseno in
-                <foreach collection="licenseno" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
+            <if test="licenseno != null and licenseno != ''">
+                and a.licenseno =#{licenseno}
             </if>
 
-            <if test="policyno != null and policyno != ''  and policyno.length > 0">
-                and a.policyno in
-                <foreach collection="policyno" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
 
-            <if test="syPolicyno != null and syPolicyno != ''  and syPolicyno.length > 0">
-                and a.sy_policyno in
-                <foreach collection="syPolicyno" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
+            <if test="syPolicyno != null and syPolicyno != ''">
+                and a.sy_policyno =#{syPolicyno}
             </if>
 
-            <if test="noPolicyno != null and noPolicyno != ''  and noPolicyno.length > 0">
-                and a.no_policyno in
-                <foreach collection="syPolicyno" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
+            <if test="noPolicyno != null and noPolicyno != ''">
+                and a.no_policyno =#{noPolicyno}
+
             </if>
             <if test="signdate !=null  and  signdate  !=''">
                 a.signdate =#{signdate}
@@ -786,22 +747,22 @@
 
     <select id="allOtherAmount" resultType="com.ydtech.modules.fnc.entity.InsPlyIncome">
         SELECT
-            a.company_id AS "companyId",
-            MAX( a.company_name ) AS "companyName",
-            MAX( a.partner_companies_name) as "partnerCompaniesName",
-            IF(MAX( c.unsettledAmount ) IS NULL , sum( a.other_feevalue ),  MAX( c.unsettledAmount ) ) AS "noInvoicCommissionFeevalue",
-            MAX(c.invoicIds) as  "incomeIds",
-            MAX(COALESCE(c.settleMentAmount, 0) - COALESCE(f.settleMentAmount, 0)) AS "invoicCommissionFeevalue",
-            MAX(f.settleMentAmount) as "settleMentAmount",
-            GROUP_CONCAT(a.id) as "ids",
-            IF(MAX( f.unSettledAmount ) is null ,MAX( c.settleMentAmount ) ,MAX( f.unSettledAmount )) AS "unSettledAmount",
-            sum( a.other_feevalue ) AS "otherFeevalue"
+        a.company_id AS "companyId",
+        MAX( a.company_name ) AS "companyName",
+        MAX( a.partner_companies_name ) AS "partnerCompaniesName",
+        MAX( c.invoicIds ) AS "incomeIds",
+        GROUP_CONCAT( a.id ) AS "ids",
+        max(c.settleMentAmount) as  "invoicCommissionFeevalue",
+        sum( a.other_feevalue )-max(c.settleMentAmount)  as "noInvoicCommissionFeevalue",
+        max(f.settleMentAmount) as  "settleMentAmount",
+        MAX(COALESCE(c.settleMentAmount, 0) - COALESCE(f.settleMentAmount, 0)) AS "unSettledAmount",
+        sum( a.other_feevalue ) AS "otherFeevalue"
         FROM
             ins_ply_income a
         LEFT JOIN ptl_agreement pa ON a.agreement_id = pa.id
         LEFT JOIN ( SELECT a.company_id AS "companyId", MIN( a.unsettled_amount ) AS "unsettledAmount" ,sum(
         settlement_amount ) AS "settleMentAmount", GROUP_CONCAT(a.id) as "invoicIds" FROM settlement_documentary_fees a
-        WHERE a.settlement_status = '1'
+        WHERE ( a.settlement_status = '1' or a.settlement_status = '2')
         <if test="isNotCar !=null  and  isNotCar  !=''">
             and a.is_not_car =#{isNotCar}
         </if>

src/main/resources/mapper/modules/fnc/SettlementDocumentaryFeesMapper.xml

@@ -9,7 +9,7 @@
         <result column="time_frame" property="timeFrame"/>
         <result column="total_amount" property="totalAmount"/>
         <result column="create_time" property="createTime"/>
-        <result column="start_time" property="startTime"/>
+        <result column="settlement_time" property="settlementTime"/>
         <result column="end_time" property="endTime"/>
         <result column="settlement_amount" property="settlementAmount"/>
         <result column="unsettled_amount" property="unsettledAmount"/>
@@ -46,7 +46,6 @@
         max(invoice_id) as "invoicId",
         GROUP_CONCAT(a.id) as "ids"
         from settlement_documentary_fees a
-
         <where>
             a.settlement_status = '1'
             <if test="invoiceIds !=null and  invoiceIds !=''  and invoiceIds.length>0">
@@ -59,9 +58,24 @@
         </where>
 
         GROUP BY a.invoice_id
-
     </select>
 
+    <update id="batchByInvoice" parameterType="java.util.HashMap">
+        update settlement_documentary_fees
+        <set>
+            settlement_status = '2',
+            settlement_time = NOW()
+        </set>
+        <where>
+            <if test="ids !=null  and  ids!=''  and  ids.length>0">
+                id in
+                <foreach collection="ids" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </update>
+