Sfoglia il codice sorgente

1.结算bug调整6.0

wuhp 2 anni fa
parent
commit
e8eb6cbab6

+ 3 - 0
src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -700,6 +700,9 @@ handlingProportion,
         if (!CollectionUtils.isEmpty(insPlyIncomeVo.getPartnerCompaniesIdList())) {
             params.put("partnerCompaniesIdList", insPlyIncomeVo.getPartnerCompaniesIdList());
         }
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getCreateTimeQuery())){
+            params.put("createTimeQuery", insPlyIncomeVo.getCreateTimeQuery());
+        }
 
         return params;
     }

+ 4 - 0
src/main/java/com/ydtech/modules/fnc/vo/InsPlyIncomeVo.java

@@ -384,6 +384,10 @@ public class InsPlyIncomeVo implements Serializable {
     private BigDecimal noReceivableProportion;
 
 
+    @ApiModelProperty("创建时间查询")
+    private String createTimeQuery;
+
+
 
 
 

+ 32 - 0
src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -213,6 +213,10 @@
                 and pa.dept_id  LIKE CONCAT(#{cityId}, '%')
             </if>
 
+            <if test="createTimeQuery != null and createTimeQuery != ''">
+                and DATE_FORMAT( a.create_time, '%Y-%m-%d')   =#{createTimeQuery}
+            </if>
+
             <if test="countyId != null and countyId != ''">
                 and pa.dept_id   LIKE CONCAT(#{countyId}, '%')
             </if>
@@ -506,6 +510,9 @@
             <if test="jqSuperviseCostsPremiums !=null  and  jqSuperviseCostsPremiums  !=''">
                 and a.jq_supervise_costs_premiums =#{jqSuperviseCostsPremiums}
             </if>
+            <if test="createTimeQuery != null and createTimeQuery != ''">
+                and DATE_FORMAT( a.create_time, '%Y-%m-%d')   =#{createTimeQuery}
+            </if>
             <if test="jqSuperviseCostsProportion !=null  and  jqSuperviseCostsProportion  !=''">
                 and a.jq_supervise_costs_proportion =#{jqSuperviseCostsProportion}
             </if>
@@ -575,6 +582,9 @@
                 <if test="documentaryFeesStatus !=null  and  documentaryFeesStatus  !=''">
                     and a.documentary_fees_status =#{documentaryFeesStatus}
                 </if>
+                <if test="createTimeQuery != null and createTimeQuery != ''">
+                    and DATE_FORMAT( a.create_time, '%Y-%m-%d')   =#{createTimeQuery}
+                </if>
 
                 <if test="selectIds != null and selectIds != '' and selectIds.size() > 0">
                     and a.id in
@@ -684,6 +694,9 @@
                 <if test="documentaryFeesStatus !=null  and  documentaryFeesStatus  !=''">
                     and a.documentary_fees_status =#{documentaryFeesStatus}
                 </if>
+                <if test="createTimeQuery != null and createTimeQuery != ''">
+                    and DATE_FORMAT( a.create_time, '%Y-%m-%d')   =#{createTimeQuery}
+                </if>
 
                 <if test="isNotCar !=null  and  isNotCar  !=''">
                     and a.is_not_car =#{isNotCar}
@@ -820,6 +833,9 @@
                 <if test="documentaryFeesStatus !=null  and  documentaryFeesStatus  !=''">
                     and a.documentary_fees_status =#{documentaryFeesStatus}
                 </if>
+                <if test="createTimeQuery != null and createTimeQuery != ''">
+                    and DATE_FORMAT( a.create_time, '%Y-%m-%d')   =#{createTimeQuery}
+                </if>
 
                 <if test="isNotCar !=null  and  isNotCar  !=''">
                     and a.is_not_car =#{isNotCar}
@@ -1020,6 +1036,11 @@
             <if test="createTime !=null  and  createTime  !=''">
                 and a.create_time =#{createTime}
             </if>
+
+            <if test="createTimeQuery != null and createTimeQuery != ''">
+                and DATE_FORMAT( a.create_time, '%Y-%m-%d')   =#{createTimeQuery}
+            </if>
+
             <if test="settlementTime !=null  and  settlementTime  !=''">
                 and  a.settlement_time =#{settlementTime}
             </if>
@@ -1112,6 +1133,10 @@
                 and a.documentary_fees_status =#{documentaryFeesStatus}
             </if>
 
+            <if test="createTimeQuery != null and createTimeQuery != ''">
+                and DATE_FORMAT( a.create_time, '%Y-%m-%d')   =#{createTimeQuery}
+            </if>
+
             <if test="isNotCar !=null  and  isNotCar  !=''">
                 and a.is_not_car =#{isNotCar}
             </if>
@@ -1369,6 +1394,9 @@
             <if test="settlementTime !=null  and  settlementTime  !=''">
                 AND a.settlement_time =#{settlementTime}
             </if>
+            <if test="createTimeQuery != null and createTimeQuery != ''">
+                and DATE_FORMAT( a.create_time, '%Y-%m-%d')   =#{createTimeQuery}
+            </if>
 
             <if test="userId !=null  and  userId  !=''">
                 and a.userId   =#{userId}
@@ -1589,6 +1617,10 @@
                        </foreach>
                    </if>
 
+                   <if test="createTimeQuery != null and createTimeQuery != ''">
+                       and DATE_FORMAT( a.create_time, '%Y-%m-%d')   =#{createTimeQuery}
+                   </if>
+
                    <if test="partnerCompaniesIdList != null and partnerCompaniesIdList != '' and partnerCompaniesIdList.size() > 0">
                        and a.partner_companies_id in
                        <foreach collection="partnerCompaniesIdList" item="item" open="(" separator="," close=")">