1.控制台条件调整

src/main/java/com/ydtech/modules/admin/model/vo/QxFrontlineAgentVo.java

@@ -71,4 +71,6 @@ public class QxFrontlineAgentVo implements Serializable {
 
 
 
+
+
 }

src/main/java/com/ydtech/modules/admin/model/vo/TaskStatisticsVo.java

@@ -66,6 +66,12 @@ public class TaskStatisticsVo implements Serializable {
     @ApiModelProperty(value = "保费排序")
     private String userNumberSort;
 
+    @ApiModelProperty(value = "时间筛选开始")
+    private String beginDate;
+
+    @ApiModelProperty(value = "时间筛选结束")
+    private String endDate;
+
 
 
 

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

@@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 

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

@@ -750,6 +750,7 @@ public class UserReportServiceImpl implements UserReportService {
             if (!sysUsers.isEmpty()) {
                 for (SysUser  itemUser  :sysUsers){
                     QxFrontlineAgentDto qxFrontlineAgentDto = new QxFrontlineAgentDto();
+                    qxFrontlineAgentDto.setIds(new ArrayList<>());
                     qxFrontlineAgentDto.setCreatetimeEnd(qxFrontlineAgentVo.getCreatetimeEnd());
                     qxFrontlineAgentDto.setCreatetimeStart(qxFrontlineAgentVo.getCreatetimeStart());
                     qxFrontlineAgentDto.getIds().add(itemUser.getId());
@@ -761,6 +762,7 @@ public class UserReportServiceImpl implements UserReportService {
         QxFrontlineAgentDto qxFrontlineAgentDto = new QxFrontlineAgentDto();
         qxFrontlineAgentDto.setCreatetimeEnd(qxFrontlineAgentVo.getCreatetimeEnd());
         qxFrontlineAgentDto.setCreatetimeStart(qxFrontlineAgentVo.getCreatetimeStart());
+        qxFrontlineAgentDto.setIds(new ArrayList<>());
         qxFrontlineAgentDto.getIds().add(userId);
         QxFrontlineAgentDto taskStatisticsDto = insAreaCompanyMapper.getOrderManpowerNew(qxFrontlineAgentDto);
         resultList.add(taskStatisticsDto);

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

@@ -3407,7 +3407,9 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         financialReceivablesQueryVo.setEndDate(SliceUpDateUtil.getYearEndDateStr(year)+" 23:59:59");
 //      私有应收
         BigDecimal syAmount = baseMapper.queryDateByTypeSumAmount(financialReceivablesQueryVo);
-        resultVo.setSySumAmount(syAmount.toString());
+        if(syAmount!=null){
+            resultVo.setSySumAmount(syAmount.toString());
+        }
         resultVo.setYear(year+"");
 
         List<FinancialReceivablesVo> result=  baseMapper.queryPrivateCar(financialReceivablesQueryVo);

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -1364,6 +1364,7 @@
             <if test="vo.phoneNumber != null and vo.phoneNumber != ''">
                 and su.mobile   =#{vo.phoneNumber}
             </if>
+
         </where>
     </select>
 

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

@@ -2412,13 +2412,16 @@
                     ins_area_company
                 <where>
                     <if test="vo.beginDate  != null  and  vo.beginDate!=''  and vo.endDate  != null  and  vo.endDate!=''">
-                        AND  createtime  BETWEEN #{vo.beginDate} AND #{vo.endDate}
+                        AND  signing_time  BETWEEN #{vo.beginDate} AND #{vo.endDate}
+                    </if>
+                    <if test="vo.days !=null  and vo.days !='' ">
+                        and signing_time >= DATE_SUB(NOW(), INTERVAL #{vo.days} DAY)
                     </if>
                 </where>
                 GROUP BY
-                    DATE_FORMAT( createtime, '%Y-%m' )
+                    DATE_FORMAT( signing_time, '%Y-%m' )
                 ORDER BY
-                    DATE_FORMAT( createtime, '%Y-%m' )
+                    DATE_FORMAT( signing_time, '%Y-%m' )
             ) c
                 LEFT JOIN (
                 SELECT
@@ -2430,11 +2433,14 @@
                     ins_ply_income
                 <where>
                     <if test="vo.beginDate  != null  and  vo.beginDate!=''  and vo.endDate  != null  and  vo.endDate!=''">
-                        AND  create_time  BETWEEN #{vo.beginDate} AND #{vo.endDate}
+                        AND  signdate  BETWEEN #{vo.beginDate} AND #{vo.endDate}
+                    </if>
+                    <if test="vo.days !=null  and vo.days !='' ">
+                        and signdate >= DATE_SUB(NOW(), INTERVAL #{vo.days} DAY)
                     </if>
                 </where>
                 GROUP BY
-                    DATE_FORMAT( create_time, '%Y-%m' )
+                    DATE_FORMAT( signdate, '%Y-%m' )
             ) a ON c.years = a.years
                 LEFT JOIN ins_labor_cost b ON a.years = b.year_and_month
 

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

@@ -876,9 +876,6 @@
             <if test="vo.managementSource  != null  and  vo.managementSource!=''">
                 AND  sd.management_source  =#{vo.managementSource}
             </if>
-            <if test="vo.days !=null  and vo.days !='' ">
-                and iac.signing_time >= DATE_SUB(NOW(), INTERVAL #{vo.days} DAY)
-            </if>
         GROUP BY
             agree.insurance_company_id,
             agree.insurance_company,
@@ -955,6 +952,12 @@
             <if test="taskStatisticsVo.createtimeStart !=null and taskStatisticsVo.createtimeStart != '' and taskStatisticsVo.createtimeEnd !=null and taskStatisticsVo.createtimeEnd != ''">
                 AND   DATE_FORMAT( io.createtime, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.createtimeStart} AND #{taskStatisticsVo.createtimeEnd}
             </if>
+            <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">
+                AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.beginDate} AND #{taskStatisticsVo.endDate}
+            </if>
+            <if test="taskStatisticsVo.days !=null  and taskStatisticsVo.days !='' ">
+                and iac.signing_time >= DATE_SUB(NOW(), INTERVAL #{taskStatisticsVo.days} DAY)
+            </if>
 
             <if test="taskStatisticsVo.days !=null  and taskStatisticsVo.days !='' ">
                 <choose>
@@ -1031,7 +1034,7 @@
     <select id="insuranceCompanyQueryPage"  resultType="com.ydtech.modules.admin.model.dto.TaskStatisticsDto">
         SELECT
         a.*,
-        ( SELECT eic.namesimple FROM esm_ins_company eic WHERE eic.id = a.partner_companies_id ) AS "namesimple"
+        ( SELECT eic.namesimple FROM esm_ins_company eic WHERE eic.id = a.partner_companies_id ) AS "partnerCompaniesName"
         FROM
         (
         SELECT
@@ -1068,21 +1071,12 @@
             <if test="taskStatisticsVo.createtimeStart !=null and taskStatisticsVo.createtimeStart != '' and taskStatisticsVo.createtimeEnd !=null and taskStatisticsVo.createtimeEnd != ''">
                 AND   DATE_FORMAT( io.createtime, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.createtimeStart} AND #{taskStatisticsVo.createtimeEnd}
             </if>
+            <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">
+                AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.beginDate} AND #{taskStatisticsVo.endDate}
+            </if>
 
             <if test="taskStatisticsVo.days !=null  and taskStatisticsVo.days !='' ">
-                <choose>
-                    <when test="taskStatisticsVo.days =='1'">
-                        and io.createtime >= DATE_SUB(NOW(), INTERVAL 1 DAY)
-                    </when>
-
-                    <when test="taskStatisticsVo.days =='7'">
-                        and io.createtime >= DATE_SUB(NOW(), INTERVAL 7 DAY)
-                    </when>
-
-                    <when test="taskStatisticsVo.days =='30'">
-                        and io.createtime >= DATE_SUB(NOW(), INTERVAL 30 DAY)
-                    </when>
-                </choose>
+                and iac.signing_time >= DATE_SUB(NOW(), INTERVAL #{taskStatisticsVo.days} DAY)
             </if>
         </where>
         GROUP BY
@@ -1121,21 +1115,12 @@
             <if test="taskStatisticsVo.createtimeStart !=null and taskStatisticsVo.createtimeStart != '' and taskStatisticsVo.createtimeEnd !=null and taskStatisticsVo.createtimeEnd != ''">
                 AND   DATE_FORMAT( io.createtime, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.createtimeStart} AND #{taskStatisticsVo.createtimeEnd}
             </if>
+            <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">
+                AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.beginDate} AND #{taskStatisticsVo.endDate}
+            </if>
 
             <if test="taskStatisticsVo.days !=null  and taskStatisticsVo.days !='' ">
-                <choose>
-                    <when test="taskStatisticsVo.days =='1'">
-                        and io.createtime >= DATE_SUB(NOW(), INTERVAL 1 DAY)
-                    </when>
-
-                    <when test="taskStatisticsVo.days =='7'">
-                        and io.createtime >= DATE_SUB(NOW(), INTERVAL 7 DAY)
-                    </when>
-
-                    <when test="taskStatisticsVo.days =='30'">
-                        and io.createtime >= DATE_SUB(NOW(), INTERVAL 30 DAY)
-                    </when>
-                </choose>
+                and iac.signing_time >= DATE_SUB(NOW(), INTERVAL #{taskStatisticsVo.days} DAY)
             </if>
         </where>
         GROUP BY
@@ -1183,6 +1168,14 @@
                 AND   DATE_FORMAT( io.createtime, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.createtimeStart} AND #{taskStatisticsVo.createtimeEnd}
             </if>
 
+            <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">
+                AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.beginDate} AND #{taskStatisticsVo.endDate}
+            </if>
+
+            <if test="taskStatisticsVo.days !=null  and taskStatisticsVo.days !='' ">
+                and iac.signing_time >= DATE_SUB(NOW(), INTERVAL #{taskStatisticsVo.days} DAY)
+            </if>
+
             <if test="taskStatisticsVo.days !=null  and taskStatisticsVo.days !='' ">
                 <choose>
                     <when test="taskStatisticsVo.days =='1'">
@@ -1221,26 +1214,21 @@
                 AND   DATE_FORMAT( ifa.audittime, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.createtimeStart} AND #{taskStatisticsVo.createtimeEnd}
             </if>
 
-            <if test="taskStatisticsVo.days !=null  and taskStatisticsVo.days !='' ">
-                <choose>
-                    <when test="taskStatisticsVo.days =='1'">
-                        and ifa.audittime >= DATE_SUB(NOW(), INTERVAL 1 DAY)
-                    </when>
-
-                    <when test="taskStatisticsVo.days =='7'">
-                        and ifa.audittime >= DATE_SUB(NOW(), INTERVAL 7 DAY)
-                    </when>
-
-                    <when test="taskStatisticsVo.days =='30'">
-                        and ifa.audittime >= DATE_SUB(NOW(), INTERVAL 30 DAY)
-                    </when>
-                </choose>
+            <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">
+                AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.beginDate} AND #{taskStatisticsVo.endDate}
             </if>
 
-            <if test="taskStatisticsVo.riskCode != null and taskStatisticsVo.riskCode != ''">
-                and iac.product = #{taskStatisticsVo.riskCode}
+            <if test="taskStatisticsVo.days !=null  and taskStatisticsVo.days !='' ">
+                and iac.signing_time >= DATE_SUB(NOW(), INTERVAL #{taskStatisticsVo.days} DAY)
             </if>
 
+            <choose>
+                <when test="taskStatisticsVo.riskCode != null and taskStatisticsVo.riskCode != '' and  taskStatisticsVo.riskCode != 'all' ">
+                    and iac.product = #{taskStatisticsVo.riskCode}
+                </when>
+            </choose>
+
+
         </where>
         GROUP BY
             iac.company_id,