1.控制台结算调整2.0

src/main/java/com/ydtech/modules/admin/model/report/profitAnalysis/ProfitAnalysisDto.java

@@ -44,6 +44,9 @@ public class ProfitAnalysisDto {
     @ApiModelProperty("变动成本")
     private BigDecimal variableCost;
 
+    @ApiModelProperty("应付")
+    private BigDecimal meet;
+
 
     @ApiModelProperty("经营利润")
     @TableField(value="operating_profit")

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

@@ -460,7 +460,7 @@ public class UserReportServiceImpl implements UserReportService {
                 userList0.add(esmUserReferrer.getId());
                 userPolicyList0 = esmUserReferrerMapper.queryOrderCount(userList0, null, null);
                 //汇总数据加工
-                EsmTeamPolicyVO esmTeamPolicyVO0 = esmUserReferrerMapper.queryOrderCountHz(userList0, null, null);
+                EsmTeamPolicyVO esmTeamPolicyVO0 = esmUserReferrerMapper.queryOrderCountHzNew(userList0, null, null);
                 EsmTeamPolicyVO esmTeamPolicyVO1 = new EsmTeamPolicyVO();
                 EsmTeamPolicyVO esmTeamPolicyVO2 = new EsmTeamPolicyVO();
                 EsmTeamPolicyVO esmTeamPolicyVO3 = new EsmTeamPolicyVO();
@@ -481,7 +481,7 @@ public class UserReportServiceImpl implements UserReportService {
                 esmTeamPolicyVO1.setTeamlevel("一级团队");
                 if (userList1 != null && userList1.size() > 0) {
                     userPolicyList1 = esmUserReferrerMapper.queryOrderCount(userList1, null, null);
-                    EsmTeamPolicyVO esmTeamPolicyVO1_t = esmUserReferrerMapper.queryOrderCountHz(userList1, null,
+                    EsmTeamPolicyVO esmTeamPolicyVO1_t = esmUserReferrerMapper.queryOrderCountHzNew(userList1, null,
                             null);
                     if (esmTeamPolicyVO1_t != null) {
                         esmTeamPolicyVO1.setSumpremium(esmTeamPolicyVO1_t.getSumpremium());
@@ -494,7 +494,7 @@ public class UserReportServiceImpl implements UserReportService {
                     esmTeamPolicyVO2.setTeamlevel("二级团队");
                     if (userList2 != null && userList2.size() > 0) {
                         userPolicyList2 = esmUserReferrerMapper.queryOrderCount(userList2, null, null);
-                        EsmTeamPolicyVO esmTeamPolicyVO2_t = esmUserReferrerMapper.queryOrderCountHz(userList2, null,
+                        EsmTeamPolicyVO esmTeamPolicyVO2_t = esmUserReferrerMapper.queryOrderCountHzNew(userList2, null,
                                 null);
                         if (esmTeamPolicyVO2_t != null) {
                             esmTeamPolicyVO2.setSumpremium(esmTeamPolicyVO2_t.getSumpremium());
@@ -505,7 +505,7 @@ public class UserReportServiceImpl implements UserReportService {
                         userList3 = esmUserReferrerMapper.getIdDown_3(esmUserReferrer.getId());
                         if(userList3!=null && userList3.size()>0){
                             userPolicyList3=esmUserReferrerMapper.queryOrderCount(userList3,null, null);
-                            EsmTeamPolicyVO esmTeamPolicyVO3_t=esmUserReferrerMapper.queryOrderCountHz(userList3,null, null);
+                            EsmTeamPolicyVO esmTeamPolicyVO3_t=esmUserReferrerMapper.queryOrderCountHzNew(userList3,null, null);
                             esmTeamPolicyVO3.setTeamlevel("三级团队");
                             esmTeamPolicyVO3.setTeamnum(userList3.size());
                             if (esmTeamPolicyVO2_t != null) {
@@ -533,7 +533,7 @@ public class UserReportServiceImpl implements UserReportService {
                 userList.addAll(registList);
                 userPolicyList = esmUserReferrerMapper.queryOrderCount(userList, null, null);
                 EsmTeamPolicyVO esmTeamPolicyVO = new EsmTeamPolicyVO();
-                EsmTeamPolicyVO esmTeamPolicyVO_t = esmUserReferrerMapper.queryOrderCountHz(userList, null, null);
+                EsmTeamPolicyVO esmTeamPolicyVO_t = esmUserReferrerMapper.queryOrderCountHzNew(userList, null, null);
                 if (esmTeamPolicyVO_t != null) {
                     esmTeamPolicyVO.setSumpremium(esmTeamPolicyVO_t.getSumpremium());
                     esmTeamPolicyVO.setUsernum(userPolicyList.size());
@@ -590,9 +590,8 @@ public class UserReportServiceImpl implements UserReportService {
             pageVo.setPageNum(qxFrontlineAgentVo.getPageNum());
             pageVo.setPageSize(qxFrontlineAgentVo.getPageSize());
             HashMap<String, List<String>> humanResourcesIdList = new HashMap<>();
-
             IPage<QxFrontlineAgentDto> userResultPage = new Page<>();
-//关系表
+            //关系表
             List<EsmUserReferrerDTO> employeeIncreaseReportDtos = esmUserReferrerMapper.getbyUserNextLevel(null);
             Map<String, EsmUserReferrerDTO> collect = employeeIncreaseReportDtos.stream().collect(Collectors.toMap(EsmUserReferrerDTO::getId, Function.identity()));
             Set<String> visited = new HashSet<>();

src/main/java/com/ydtech/modules/esm/dao/EsmUserReferrerMapper.java

@@ -237,4 +237,5 @@ public interface EsmUserReferrerMapper extends BaseMapper<EsmUserReferrer> {
      */
     List<EsmUserReferrerDTO> getUserLevel(@Param("vo") QxFrontlineAgentVo qxFrontlineAgentVo);
 
+    EsmTeamPolicyVO queryOrderCountHzNew(List<String> userList, String startDate, String endDate);
 }

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

@@ -200,7 +200,7 @@ public interface InsPlyIncomeMapper extends BaseMapper<InsPlyIncome> {
 
     List<InsuranceHandlingSettlementMonthDto> getInvociAmount(@Param("vo") InsuranceHandlingSettlementMonthVo insuranceHandlingSettlementMonthVo);
 
-    Collection<? extends FinancialReceivablesVo> queryDateByTypePt(FinancialReceivablesQueryVo financialReceivablesQueryVo);
+    Collection<? extends FinancialReceivablesVo> queryDateByTypePt( @Param("vo") FinancialReceivablesQueryVo financialReceivablesQueryVo);
 
     List<FinancialReceivablesMonthVo> getPatherId( @Param("vo")  FinancialReceivablesQueryMonthVo financialReceivablesQueryVo);
 

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

@@ -3383,7 +3383,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         BigDecimal sySumAmount =  baseMapper.queryDateByTypeSumAmount(financialReceivablesQueryVo);
 
 
-        return new FinancialReceivablesAllVo(ptSumAmount.toString(),sySumAmount.toString(),year+"",list);
+        return new FinancialReceivablesAllVo(ptSumAmount !=null? ptSumAmount.toString(): "0",sySumAmount !=null  ? sySumAmount.toString() : "0",year+"",list);
     }
     /**
      *  @version

src/main/resources/mapper/modules/esm/EsmUserReferrerMapper.xml

@@ -102,6 +102,24 @@
                   #{item}
               </foreach>
     </select>
+    <select id="queryOrderCountHzNew" resultType="com.ydtech.modules.esm.model.vo.EsmTeamPolicyVO">
+        SELECT
+            sum(iac.sumpremium) sumpremium
+        FROM
+            ins_orders io
+                LEFT JOIN ins_area_company iac ON io.orderno = iac.orderno
+                LEFT JOIN sys_user su ON io.userid = su.id
+        WHERE
+            iac.orderstatus = 3
+          AND io.orderstatus = 3
+          <if test="startDate !=null  and startDate !=''  and endDate!=null  and  endDate!='' ">
+              AND io.createtime BETWEEN #{startDate} AND #{endDate}
+          </if>
+          AND io.userid in
+              <foreach item="item" index="index" collection="userList" open="(" separator="," close=")">
+                  #{item}
+              </foreach>
+    </select>
 
     <select id="getUserPage" resultMap="SysUserMap">
         SELECT

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

@@ -2454,8 +2454,8 @@
             <if test="vo.isNotCar !=null  and  vo.isNotCar  !=''">
                 and a.is_not_car =#{vo.isNotCar}
             </if>
-            <if test="vo.beginDate  != null  and  vo.beginDate!=''  and vo.endDate  != null  and  vo.endDate!=''">
-                AND  a.create_time  BETWEEN #{vo.beginDate} AND #{vo.endDate}
+            <if test="vo.year !=null  and  vo.year !=''">
+                and  DATE_FORMAT( a.signdate, '%Y' ) =#{vo.year}
             </if>
         </where>
     </select>
@@ -2477,8 +2477,12 @@
                 FROM
                     ins_ply_income a
                         LEFT JOIN ptl_agreement pa ON pa.id = a.agreement_id
-                WHERE
+                <where>
                     pa.agreement_type = '2'
+                    <if test="vo.year !=null  and  vo.year !=''">
+                        and  DATE_FORMAT( a.signdate, '%Y' ) =#{vo.year}
+                    </if>
+                </where>
                 GROUP BY
                     DATE_FORMAT( a.signdate, '%Y-%m' )
             ) a
@@ -2490,6 +2494,11 @@
                     sum(a.total_amount) as "invoicComm"
                 FROM
                     sys_insurance_handling_settlement_month a
+                <where>
+                    <if test="vo.year !=null  and  vo.year !=''">
+                          DATE_FORMAT( a.signing_time, '%Y' ) =#{vo.year}
+                    </if>
+                </where>
                 GROUP BY
                     DATE_FORMAT( a.signing_time, '%Y-%m' )
             ) b ON a.subSigndate = b.subSigndate
@@ -2497,8 +2506,13 @@
                 select DATE_FORMAT( a.signing_time, '%Y-%m' ) as "subSigndate" ,  sum(settlement_amount) as "otherInvoic", sum(invoiced_settled_amount) as "settAmountOther", sum(Invoiced_not_settled_amount) as "invoicNotOther"
                 from
                     settlement_documentary_fees  a
-                where a.settlement_status='1'
-                  and handling_fees_status ='1'
+                <where>
+                    a.settlement_status='1'
+                    and handling_fees_status ='1'
+                    <if test="vo.year !=null  and  vo.year !=''">
+                     and    DATE_FORMAT( a.signing_time, '%Y' ) =#{vo.year}
+                    </if>
+                </where>
                 GROUP BY 	DATE_FORMAT( a.signing_time, '%Y-%m' )
             )  c  on c.subSigndate=a.subSigndate
     </select>
@@ -2847,23 +2861,23 @@
     </select>
     <select id="getProfitAnalysisQueryList" resultType="com.ydtech.modules.admin.model.report.profitAnalysis.ProfitAnalysisDto">
         SELECT
-            a.signingTime as "signingTime",
-            a.sumpremium as "sumpremium",
-            b.allAmount as "sumcount",
-            d.settlement as "meet",
-            c.ActualPayment as "paid",
-            ifnull(d.settlement,0) - IFNULL(c.ActualPayment,0)  as "unpaid",
-            IFNULL( b.allAmount,0)- IFNULL (d.settlement,0)  as "grossProfit",
-            e.applyAmount  as "laborCost",
-            f.applyAmount  as "fixedCost",
-            j.applyAmount  as "variableCost",
+            a.signingTime as "yearAndMonth",
+            IFNULL(a.sumpremium,0) as "sumpremium",
+            IFNULL(b.allAmount,0) as "sumcount",
+            IFNULL(d.settlement,0) as "meet",
+            IFNULL(c.actualPayment,0) as "paid",
+            ifnull(d.settlement,0) - IFNULL(c.actualPayment,0)  as "unpaid",
+            IFNULL(b.allAmount,0)- IFNULL (d.settlement,0)  as "grossProfit",
+            IFNULL(e.applyAmount,0)  as "laborCost",
+            IFNULL(f.applyAmount,0)  as "fixedCost",
+            IFNULL(j.applyAmount,0)  as "variableCost",
             (IFNULL (b.allAmount,0) - IFNULL(d.settlement,0) ) -( IFNULL(e.applyAmount,0) + IFNULL(f.applyAmount,0) + IFNULL(j.applyAmount,0) ) as "operatingProfit",
-            g.applyAmount  as "税费",
+            IFNULL(g.applyAmount,0)  as "taxation",
             (IFNULL(b.allAmount,0)- IFNULL(d.settlement,0) ) -( IFNULL(e.applyAmount,0) + IFNULL(f.applyAmount,0) + IFNULL(j.applyAmount,0) ) - IFNULL(g.applyAmount,0) as "netProfit"
         FROM
             (
                 SELECT
-                    sum( iac.sumpremium ) as "sumpremium",
+                    IFNULL(sum( iac.jqpremium ),0) +IFNULL(sum( iac.sypremium ),0) + IFNULL(sum(iac.jypremium),0) as "sumpremium",
                     DATE_FORMAT( iac.signing_time, '%Y-%m' ) AS "signingTime"
                 FROM
                     `ins_fee_audit` ifa
@@ -2876,7 +2890,7 @@
             ) a
                 LEFT JOIN (
                 SELECT
-                    sum( ipi.commission_feevalue +ipi.other_feevalue ) as "allAmount",
+                    sum( ipi.commission_feevalue) + sum(ipi.other_feevalue ) as "allAmount",
                     DATE_FORMAT( ipi.signdate, '%Y-%m' ) AS "signingTime"
                 FROM
                     ins_ply_income ipi
@@ -2885,7 +2899,7 @@
             ) b ON a.signingTime = b.signingTime
                 left  join (
                 select
-                    sum(a.amount) as "ActualPayment",DATE_FORMAT( a.auditing_time, '%Y-%m' )  as "auditingTime"
+                    sum(a.amount) as "actualPayment",DATE_FORMAT( a.auditing_time, '%Y-%m' )  as "auditingTime"
                 from sys_amount_auditing a
                          left join sys_user_account_history b on a.id = b.auditiing_id
                          left join sys_user su on su.id =a.user_id
@@ -2910,7 +2924,7 @@
             ) d  on  d.signingTime =a.signingTime
         left join  (
                 SELECT
-                    sum(apply_amount) as "applyAmount",
+                    sum( CAST(a.apply_amount AS DECIMAL(10, 2))) as "applyAmount",
                     DATE_FORMAT( a.create_time, '%Y-%m' ) as "createTime",
                     b.expenditureDetails
                 FROM
@@ -2938,7 +2952,7 @@
             ) e on  e.createTime =a.signingTime
         left  join (
                 SELECT
-                    sum(apply_amount) as "applyAmount",
+                    sum( CAST(a.apply_amount AS DECIMAL(10, 2))) as "applyAmount",
                     DATE_FORMAT( a.create_time, '%Y-%m' ) as "createTime",
                     b.expenditureDetails
                 FROM
@@ -2966,7 +2980,7 @@
             ) f on  f.createTime =a.signingTime
             left join  (
                 SELECT
-                    sum(apply_amount) as "applyAmount",
+                    sum( CAST(a.apply_amount AS DECIMAL(10, 2))) as "applyAmount",
                     DATE_FORMAT( a.create_time, '%Y-%m' ) as "createTime",
                     b.expenditureDetails
                 FROM
@@ -2994,7 +3008,7 @@
             ) j on  j.createTime =a.signingTime
          left  join (
                 SELECT
-                    sum(apply_amount) as "applyAmount",
+                    sum( CAST(a.apply_amount AS DECIMAL(10, 2))) as "applyAmount",
                     DATE_FORMAT( a.create_time, '%Y-%m' ) as "createTime",
                     b.expenditureDetails
                 FROM
@@ -3064,21 +3078,37 @@
                      DATE_FORMAT(a.signdate, '%Y-%m')                   as "signingTime"
               FROM ins_ply_income a
                        LEFT JOIN ptl_agreement pa ON pa.id = a.agreement_id
-              WHERE pa.agreement_type = '1'
+                  <where>
+                      pa.agreement_type = '1'
+                      <if test="vo.year !=null  and  vo.year !=''">
+                       and   DATE_FORMAT( a.signdate, '%Y' ) =#{vo.year}
+                      </if>
+                  </where>
               GROUP BY DATE_FORMAT(a.signdate, '%Y-%m')) a
                  left join (SELECT sum(a.commission_feevalue) + sum(a.other_feevalue) AS "notInvoicAmount",
                                    DATE_FORMAT(a.signdate, '%Y-%m')                   as "signingTime"
                             FROM ins_ply_income a
                                      LEFT JOIN ptl_agreement pa ON pa.id = a.agreement_id
-                            WHERE pa.agreement_type = '1'
-                              and a.handling_fees_status = '0'
+                            <where>
+                                pa.agreement_type = '1'
+                                and a.handling_fees_status = '0'
+                                <if test="vo.year !=null  and  vo.year !=''">
+                                    and   DATE_FORMAT( a.signdate, '%Y' ) =#{vo.year}
+                                </if>
+                            </where>
                             GROUP BY DATE_FORMAT(a.signdate, '%Y-%m')) b on a.signingTime = b.signingTime
                  left join (SELECT sum(a.commission_feevalue) + sum(a.other_feevalue) AS "settAmount",
                                    DATE_FORMAT(a.signdate, '%Y-%m')                   as "signingTime"
                             FROM ins_ply_income a
                                      LEFT JOIN ptl_agreement pa ON pa.id = a.agreement_id
-                            WHERE pa.agreement_type = '1'
-                              and a.handling_fees_status = '1'
+                            <where>
+                                pa.agreement_type = '1'
+                                and a.handling_fees_status = '1'
+                                <if test="vo.year !=null  and  vo.year !=''">
+                                    and   DATE_FORMAT( a.signdate, '%Y' ) =#{vo.year}
+                                </if>
+                            </where>
+
                             GROUP BY DATE_FORMAT(a.signdate, '%Y-%m')) c on c.signingTime = a.signingTime
     </select>
     <select id="getPatherId" resultType="com.ydtech.modules.admin.model.report.financialReceivables.FinancialReceivablesMonthVo">

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -874,7 +874,7 @@
                 agree.partner_companies_id = #{vo.parterCompanyId}
             </if>
             <if test="vo.beginDate  != null  and  vo.beginDate!=''  and vo.endDate  != null  and  vo.endDate!=''">
-                AND  iac.createtime  BETWEEN #{vo.beginDate} AND #{vo.endDate}
+                AND  iac.signing_time  BETWEEN #{vo.beginDate} AND #{vo.endDate}
             </if>
             <if test="vo.managementSource  != null  and  vo.managementSource!=''">
                 AND  sd.management_source  =#{vo.managementSource}