添加审核人条件 添加审核时间条件 人保添加赔付优化申请字段 新增获取财务人员接口

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -534,6 +534,12 @@ public class SysUserController extends BaseController {
         return HttpResult.ok(sysUserService.findBackUserList(sysUserDto));
     }
 
+    @ApiOperation(value = "获取财务人员")
+    @PostMapping(value = "/getFinanceUser")
+    public HttpResult getFinanceUser() {
+        return HttpResult.ok(sysUserService.getFinanceUser());
+    }
+
     @ApiOperation(value = "后线用户查询不分页（编辑时查询领导人）")
     @PostMapping(value = "/findBackUserList1")
     public HttpResult findBackUserList1(@RequestBody SysUserDto sysUserDto) {

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -39,6 +39,9 @@ public interface SysUserService extends BaseIService<SysUser> {
 //    Set<String> findPermissions(String userName);
     Set<String> findPermissions(SysUser sysUser);
 
+    List<SysUser> getFinanceUser();
+
+
     /**
      * 查找用户的角色集合
      *

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

@@ -566,6 +566,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         return perms;
     }
+
+    @Override
+    public List<SysUser> getFinanceUser() {
+        String financeDeptId = "9914D17";
+        List<SysUser> sysUsers = baseMapper.selectList(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getDeptId, financeDeptId)
+                .eq(SysUser::getStatus, 1));
+        return sysUsers;
+    }
 //    @Override
 //    public Set<String> findPermissions(SysUser sysUser) {
 //        Set<String> perms = new HashSet<>();

src/main/java/com/ydtech/modules/order/entity/crawler/request/CrawlerQuoteRequest.java

@@ -76,4 +76,9 @@ public class CrawlerQuoteRequest extends BaseQuoteInfoVo {
      */
     private String carChecker;
 
+    /**
+     * 人保赔付优化申请
+     */
+    private String preDiscount;
+
 }

src/main/java/com/ydtech/modules/order/entity/vo/BaseQuoteVo.java

@@ -185,4 +185,7 @@ public class BaseQuoteVo<T> {
     @ApiModelProperty("永安车损验车事项")
     private String carChecker;
 
+    @ApiModelProperty("人保赔付优化申请")
+    private String preDiscount;
+
 }

src/main/java/com/ydtech/modules/order/entity/vo/OrderQueryVo.java

@@ -199,6 +199,12 @@ public class OrderQueryVo {
     @ApiModelProperty("费用类型 0.现金 1.权益包")
     private String type;
 
+    @ApiModelProperty("审核时间开始时间")
+    private String auditTimeStart;
+
+    @ApiModelProperty("审核时间结束时间")
+    private String auditTimeEnd;
+
 
 
     public LocalDate getEndDatePlusOneDay() {

src/main/java/com/ydtech/modules/order/service/impl/InsCrawlerOrderServiceImpl.java

@@ -143,6 +143,8 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         BeanUtils.copyProperties(quoteInfoVo, crawlerQuoteRequest);
         crawlerQuoteRequest.setMaxQuoteNum(maxQuoteNum);
         crawlerQuoteRequest.setUsername(ptlAgreementAttribution.getUsername());
+        // 人保赔付优化申请
+        crawlerQuoteRequest.setPreDiscount(t.getPreDiscount());
         // 永安验车事项
         crawlerQuoteRequest.setCarChecker(t.getCarChecker());
         // 前端传入的驾意险信息

src/main/java/com/ydtech/modules/protocols/entity/vo/AgreementProductQueryVo.java

@@ -78,6 +78,9 @@ public class AgreementProductQueryVo extends PageRequest {
     @ApiModelProperty("现询费用id")
     private String nowCostsId;
 
+    @ApiModelProperty("审核人id")
+    private String auditPerson;
+
 
 
 }

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

@@ -916,7 +916,7 @@
         LEFT JOIN sys_role t4 ON t3.role_id = t4.id
         AND sd.del_flag = '0'
         WHERE
-        su.status != 0 AND su.id LIKE '%M%' and su.id!='admin'
+        (su.status != 0 and su.status != 9) AND su.id LIKE '%M%' and su.id!='admin'
         <if test='user !=null  '>
             <if test='user.name !=null and user.name!="" '>
                 and su.name like concat('%', #{user.name}, '%')

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

@@ -328,6 +328,10 @@
                 #{key}
             </foreach>
         </if>
+        <if test="params.auditTimeStart != null and params.auditTimeStart != '' and params.auditTimeEnd != null and params.auditTimeEnd != ''">
+            and DATE_FORMAT(ifa.audittime, '%Y-%m-%d') between #{params.auditTimeStart} AND
+            #{params.auditTimeEnd}
+        </if>
         order by iac.createtime desc
     </select>
 

src/main/resources/mapper/modules/protocols/PtlAgreementProductCostsNewMapper.xml

@@ -55,6 +55,9 @@
         <if test="params.costsEndDate != null and params.costsEndDate != ''">
             and papcn.costs_end_date &lt;= #{params.costsEndDate}
         </if>
+        <if test="params.auditPerson != null and params.auditPerson!= ''">
+            AND papcn.audit_person = #{params.auditPerson}
+        </if>
 
     </select>