Переглянути джерело

1.控制台财务人员审核页面

wuhp 1 рік тому
батько
коміт
1ca7c4e8a7

+ 3 - 0
src/main/java/com/ydtech/modules/admin/model/dto/TaskStatisticsDto.java

@@ -184,6 +184,9 @@ public class TaskStatisticsDto {
     @ApiModelProperty(value = "外部录单")
     private String outStatus;
 
+    @ApiModelProperty(value = "审核人电话")
+    private String mobile;
+
 
 
 }

+ 6 - 0
src/main/java/com/ydtech/modules/admin/model/vo/TaskStatisticsVo.java

@@ -166,4 +166,10 @@ public class TaskStatisticsVo implements Serializable {
 
     @ApiModelProperty(value = "时间类型")
     private String timeType;
+
+    @ApiModelProperty(value = "审核人员")
+    private String audituserName;
+
+    @ApiModelProperty(value = "弹窗传参类型")
+    private String reviewType;
 }

+ 1 - 1
src/main/java/com/ydtech/modules/order/dao/InsAreaCompanyMapper.java

@@ -437,7 +437,7 @@ public interface InsAreaCompanyMapper extends BaseMapper<InsAreaCompany> {
      * @description:   财务中心 - 费用校验 - 人员查询
      * @author: whp
      **/
-    IPage<TaskStatisticsDto> costReviewer(@Param("page") Page page,@Param("vo") TaskStatisticsVo taskStatisticsVo);
+    IPage<TaskStatisticsDto> costReviewer(@Param("page") Page page,@Param("taskStatisticsVo") TaskStatisticsVo taskStatisticsVo);
 
 }
 

+ 8 - 2
src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -1994,7 +1994,7 @@
             1=1
             and iac.id = ifa.ins_order_no
             AND iac.orderstatus = 3
-            AND ifa.audituser != '自动审核'
+
             AND (ifa.auditstatus ='1' or ifa.auditstatus ='0')
             <if test="taskStatisticsVo.reviewer !=null  and  taskStatisticsVo.reviewer !=''">
                 and su.name =#{taskStatisticsVo.reviewer}
@@ -2003,7 +2003,9 @@
             <if test="taskStatisticsVo.audituser !=null  and  taskStatisticsVo.audituser !=''">
                 and ifa.audituser =#{taskStatisticsVo.audituser}
             </if>
-
+            <if test="taskStatisticsVo.reviewType ==null">
+                AND ifa.audituser != '自动审核'
+            </if>
             <if test="taskStatisticsVo.companyId !=null  and  taskStatisticsVo.companyId !=''">
                 and iac.company_id =#{taskStatisticsVo.companyId}
             </if>
@@ -3888,6 +3890,7 @@
         SELECT
         ifa.audituser as "audituser",
         su.name as  "audituserName",
+        su.mobile as "mobile",
         COUNT( CASE WHEN ifa.auditstatus = 1 THEN 1 END ) AS "auditstatusOrders",
         COUNT( CASE WHEN ifa.auditstatus = 0 THEN 1 END ) AS "auditOrder",
         COUNT( CASE WHEN ifa.auditstatus = 1 and   ifa.audituser != '自动审核' THEN 1 END ) AS "persionAudit",
@@ -3911,6 +3914,9 @@
             <if test="taskStatisticsVo.audittime !=null  and  taskStatisticsVo.audittime !=''">
                 and ifa.audittime =#{taskStatisticsVo.audittime}
             </if>
+            <if test="taskStatisticsVo.audituserName !=null  and  taskStatisticsVo.audituserName !=''">
+                AND   su.name  like concat('%',#{taskStatisticsVo.audituserName},'%')
+            </if>
 
             <if test="taskStatisticsVo.companyId !=null  and  taskStatisticsVo.companyId !=''">
                 and iac.company_id =#{taskStatisticsVo.companyId}