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

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

@@ -142,6 +142,11 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
                         }
                     }
                 }
+                taskStatisticsVo.setUserId(record.getUserId());
+                String sumEntryStatus = this.insAreaCompanyMapper.getSumEntryStatus(taskStatisticsVo);
+                if(StringUtils.isNotEmpty(sumEntryStatus)){
+                    record.setSumEntryStatus(sumEntryStatus);
+                }
             }
         }
         Long  total  = this.insAreaCompanyMapper.queryPageTaskStatisticsTotal(taskStatisticsVo);

src/main/java/com/ydtech/modules/order/dao/InsAreaCompanyMapper.java

@@ -414,6 +414,12 @@ public interface InsAreaCompanyMapper extends BaseMapper<InsAreaCompany> {
      */
     TaskStatisticsDto getUserNumber(@Param("vo") TaskStatisticsVo taskStatisticsVo);
 
+    /**
+     *
+     * @param userId
+     * @return  代课录单数
+     */
+    String getSumEntryStatus(@Param("taskStatisticsVo") TaskStatisticsVo taskStatisticsVo);
 }
 
 

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

@@ -1125,21 +1125,6 @@
                 </foreach>
             </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>
-            </if>
         </where>
         GROUP BY
         io.userid,
@@ -3720,4 +3705,24 @@
         </where>
         order by  iac.createtime
     </select>
+
+    <select id="getSumEntryStatus" resultType="java.lang.String">
+            select count(0)
+            from ins_area_company   iac
+            left join  ins_orders io  on  iac.orderno  =io.orderno
+            <where>
+                iac.entry_status ='2'
+                <if test="taskStatisticsVo.userId !=null  and  taskStatisticsVo.userId != ''">
+                   and io.userid =#{taskStatisticsVo.userId}
+                </if>
+                <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  DATE_FORMAT( #{taskStatisticsVo.beginDate}, '%Y-%m-%d') AND  DATE_FORMAT( #{taskStatisticsVo.endDate}, '%Y-%m-%d')
+                </if>
+
+            </where>
+
+    </select>
 </mapper>