|
|
|
@ -12,6 +12,7 @@ import com.dxhy.auth.client.annotation.IgnoreClientToken; |
|
|
|
|
import com.dxhy.auth.client.annotation.IgnoreUserToken; |
|
|
|
|
import com.dxhy.common.vo.TaxOrgCode; |
|
|
|
|
import com.dxhy.extend.entity.PullRecordReq; |
|
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
|
import org.springframework.http.ResponseEntity; |
|
|
|
|
import org.springframework.web.bind.annotation.RequestBody; |
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping; |
|
|
|
@ -275,10 +276,12 @@ public class ExtInvoicePoolController extends AbstractController { |
|
|
|
|
} |
|
|
|
|
if(pullRecordReq.getAccountPeriod()!=null && pullRecordReq.getAccountPeriod()!=""){ |
|
|
|
|
String accountPeriod = pullRecordReq.getAccountPeriod(); |
|
|
|
|
String[] split = accountPeriod.split("-"); |
|
|
|
|
if(split[1].startsWith("0")){ |
|
|
|
|
String replace = split[1].replace("0", ""); |
|
|
|
|
pullRecordReq.setAccountPeriod(split[0]+"-"+replace); |
|
|
|
|
if(accountPeriod != null && StringUtils.isNoneBlank(accountPeriod) && accountPeriod.contains("-")) { |
|
|
|
|
String[] split = accountPeriod.split("-"); |
|
|
|
|
if (split[1].startsWith("0")) { |
|
|
|
|
String replace = split[1].replace("0", ""); |
|
|
|
|
pullRecordReq.setAccountPeriod(split[0] + "-" + replace); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return ResponseEntity.ok(R.ok().put("data",extInvoicePoolService.selectPullRecord(pullRecordReq))); |
|
|
|
|