fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -3326,34 +3326,34 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             }else{
                 List<SysTenantBadBillConfigBo> configList = JSONArray.parseArray(badBillJson, SysTenantBadBillConfigBo.class);
                 for(SysTenantBadBillConfigBo configBo : configList){
-                    if(Validator.isNotEmpty(vo.getBuyTime())){
+                    if(Validator.isNotEmpty(vo.getCheckTime())){
                         if(configBo.getYearType()==1){
-                            if(vo.getBuyTime()<year1){
+                            if(vo.getCheckTime()<year1){
                                 vo.setBadBill(true);
                             }
                         }
                         if(configBo.getYearType()==2){
-                            if(vo.getBuyTime()<year1&&vo.getBuyTime()>year2){
+                            if(vo.getCheckTime()<year1&&vo.getCheckTime()>year2){
                                 vo.setBadBill(true);
                             }
                         }
                         if(configBo.getYearType()==3){
-                            if(vo.getBuyTime()<year2&&vo.getBuyTime()>year3){
+                            if(vo.getCheckTime()<year2&&vo.getCheckTime()>year3){
                                 vo.setBadBill(true);
                             }
                         }
                         if(configBo.getYearType()==4){
-                            if(vo.getBuyTime()<year3&&vo.getBuyTime()>year4){
+                            if(vo.getCheckTime()<year3&&vo.getCheckTime()>year4){
                                 vo.setBadBill(true);
                             }
                         }
                         if(configBo.getYearType()==5){
-                            if(vo.getBuyTime()<year4&&vo.getBuyTime()>year5){
+                            if(vo.getCheckTime()<year4&&vo.getCheckTime()>year5){
                                 vo.setBadBill(true);
                             }
                         }
                         if(configBo.getYearType()==6){
-                            if(vo.getBuyTime()<year5){
+                            if(vo.getCheckTime()<year5){
                                 vo.setBadBill(true);
                             }
                         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderVo.java

@@ -262,6 +262,10 @@ public class TopOldOrderVo {
 
 	@ApiModelProperty("税率")
 	private String pretaxStr;
+	/** 审核时间 */
+	private Long checkTime;
+	/** 账款结清时间 */
+	private Long creditTime;
 
 
 	@ApiModelProperty("是否坏账")

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -282,13 +282,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="badBill != null and badBill == 1 and badBillList != null and badBillList.size()!=0 ">
             AND
             <foreach collection="badBillList" item="item" index="index" open="(" close=")" separator="or">
-               (too.buy_time BETWEEN #{item.startTime} and #{item.endTime})
+               (too.check_time BETWEEN #{item.startTime} and #{item.endTime})
             </foreach>
         </if>
         <if test="badBill != null and badBill == 2 and badBillList != null and badBillList.size()!=0 ">
             AND
             <foreach collection="badBillList" item="item" index="index" open="(" close=")" separator="or">
-                (too.buy_time NOT BETWEEN #{item.startTime} and #{item.endTime})
+                (too.check_time NOT BETWEEN #{item.startTime} and #{item.endTime})
             </foreach>
         </if>
         ORDER BY too.buy_time DESC