소스 검색

修改添加管理人筛选

hxl13994548489 2 년 전
부모
커밋
bd750f57ce

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

@@ -160,7 +160,7 @@ public class OrderQueryVo {
     private Integer leaderId;
 
     @ApiModelProperty("领导人名称")
-    private Integer leaderName;
+    private String leaderName;
 
     public LocalDate getEndDatePlusOneDay() {
         if(ObjectUtils.isEmpty(endDate)){

+ 1 - 1
src/main/resources/mapper/modules/ins/InsFeeOrderNewMapper.xml

@@ -940,7 +940,7 @@
         <if test="vo.companyId!=null and  vo.companyId!= ''">
             AND iac.company_id =  #{vo.companyId}
         </if>
-
+         order by  iff.audittime  desc
     </sql>
     <select id="findMyInsuranceTGByUserId"
             resultType="com.ydtech.modules.admin.model.dto.ExportExpenditureTypeDetalsTGDto">

+ 4 - 4
src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -1018,10 +1018,10 @@
             </if>
 
             <if test="orderQueryVo.leaderId != null and orderQueryVo.leaderId != ''">
-                and u.leader_id = #{leaderId}
+                and u.leader_id = #{orderQueryVo.leaderId}
             </if>
             <if test="orderQueryVo.leaderName != null and orderQueryVo.leaderName != ''">
-                and u.leader_name = #{leaderName}
+                and u.leader_name = #{orderQueryVo.leaderName}
             </if>
 
             <if test="orderQueryVo.attachStartDateStr != null and orderQueryVo.attachEndDateStr != ''">
@@ -1156,10 +1156,10 @@
             </if>
 
             <if test="orderQueryVo.leaderId != null and orderQueryVo.leaderId != ''">
-                and u.leader_id = #{leaderId}
+                and u.leader_id = #{orderQueryVo.leaderId}
             </if>
             <if test="orderQueryVo.leaderName != null and orderQueryVo.leaderName != ''">
-                and u.leader_name = #{leaderName}
+                and u.leader_name = #{orderQueryVo.leaderName}
             </if>
 
             <if test="orderQueryVo.attachStartDateStr != null and orderQueryVo.attachEndDateStr != ''">