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

张天森

2022-10-18 63eb003821e7b1e9eec62fbef9ab4770245b070f

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

 flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java

@@ -129,19 +129,19 @@
        {
            //        好评率=评价为满意的导办工单数量/已办结状态工单数量
            String goodReputationEfficiency=weekDf.format((float)(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,"1",null)
                    /bj));
                    /(float)bj));
            entity.setGoodReputationEfficiency(goodReputationEfficiency);

            //      解决率=已解决状态的导办工单数量/已办结状态工单数量
            String resolveEfficiency=weekDf.format((float)(iGuideRepairOrderService.countStatisticsNum("7",null,null,null,null,null)
                    /bj));
                    /(float)bj));
            entity.setResolveEfficiency(resolveEfficiency);

            if(allNum!=0)
            {
//              办结率=待评价+已办结状态的导办工单数量/总工单数量
                String workEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",null,null,null,null,null)
                        +bj)/allNum));
                        +bj)/(float)allNum));
                entity.setWorkEfficiency(workEfficiency);
            }
        }
@@ -152,7 +152,7 @@
            //        超时办结率=超时状态下的待评价+已办结状态的导办工单数量/超时状态的导办工单数量
            String timeoutEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",null,null,"2",null,null)
                    +iGuideRepairOrderService.countStatisticsNum("3",null,null,null,null,null))
                    /cs));
                    /(float)cs));
            entity.setTimeoutEfficiency(timeoutEfficiency);

        }
@@ -161,7 +161,7 @@
        {
            //        回复率=最新进展里0条回复的导办工单数量/总工单数量
            //状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复   10转派    11手动分配）
            String reversionRate=weekDf.format((float)(iGuideEvolveService.countStatisticsNum("9",null)/allNum));
            String reversionRate=weekDf.format((float)(iGuideEvolveService.countStatisticsNum("9",null)/(float)allNum));
            entity.setReversionRate(reversionRate);
        }


 flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java

@@ -247,6 +247,15 @@
    private String commonProblemName;


    @ApiModelProperty("办理区域")
    private String transactionArea;

    @ApiModelProperty("办理区域url")
    private String transactionAreaUrl;

    @ApiModelProperty("办理区域文件名称")
    private String transactionAreaName;


    @TableField(exist = false)
    @ApiModelProperty(name = "sumTransactionNum", value = "导办服务数量")

 flower_city/src/main/resources/mapper/TransactionEventMapper.xml

@@ -44,6 +44,9 @@
        <id     property="commonProblemName"      column="common_problem_name"      />
        <id     property="operationalGuidelineVideoName"      column="operational_guideline_video_name"      />
        <id     property="operationalGuidelineName"      column="operational_guideline_name"      />
        <id     property="transactionArea"      column="transaction_area"      />
        <id     property="transactionAreaUrl"      column="transaction_area_url"      />
        <id     property="transactionAreaName"      column="transaction_area_name"      />

    </resultMap>

@@ -88,6 +91,9 @@
            operational_guideline_video_url,
            operational_guideline_video_name,
            operational_guideline_name,
            transaction_area,
            transaction_area_url,
            transaction_area_name,
            (IF((select classify_grade from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)='2',
                (select classify_name from automessage_classify_administration where automessage_classify_administration.id=(select parent_id from
                automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)),
@@ -193,6 +199,9 @@
        <if test="commonProblemName != null and commonProblemName != '' ">common_problem_name,</if>
        <if test="operationalGuidelineVideoName != null and operationalGuidelineVideoName != '' ">operational_guideline_video_name,</if>
        <if test="operationalGuidelineName != null and operationalGuidelineName != '' ">operational_guideline_name,</if>
        <if test="transactionArea != null ">transaction_area,</if>
        <if test="transactionAreaUrl != null ">transaction_area_url,</if>
        <if test="transactionAreaName != null ">transaction_area_name,</if>
        update_time,
        create_time
        )values(
@@ -231,6 +240,9 @@
        <if test="commonProblemName != null and commonProblemName != '' ">#{commonProblemName},</if>
        <if test="operationalGuidelineVideoName != null and operationalGuidelineVideoName != '' ">#{operationalGuidelineVideoName},</if>
        <if test="operationalGuidelineName != null and operationalGuidelineName != '' ">#{operationalGuidelineName},</if>
        <if test="transactionArea != null ">#{transactionArea},</if>
        <if test="transactionAreaUrl != null ">#{transactionAreaUrl},</if>
        <if test="transactionAreaName != null ">#{transactionAreaName},</if>
        sysdate(),
        sysdate()
        )
@@ -274,6 +286,9 @@
            <if test="operationalGuidelineVideoUrl != null ">operational_guideline_video_url=#{operationalGuidelineVideoUrl},</if>
            <if test="operationalGuidelineVideoName != null and operationalGuidelineVideoName != '' ">operational_guideline_video_name=#{operationalGuidelineVideoName},</if>
            <if test="operationalGuidelineName != null and operationalGuidelineName != '' ">operational_guideline_name=#{operationalGuidelineName},</if>
            <if test="transactionArea != null ">transaction_area=#{transactionArea},</if>
            <if test="transactionAreaUrl != null ">transaction_area_url=#{transactionAreaUrl},</if>
            <if test="transactionAreaName != null ">transaction_area_name=#{transactionAreaName},</if>
            update_time=sysdate()
        </set>
        where  id= #{id}