|
|
@@ -480,8 +480,11 @@ public class cashbill extends Controller {
|
|
|
if (whereObject.containsKey("remarks") && !"".equals(whereObject.getString("remarks"))) {
|
|
|
where = where + " and t1.remarks like'%" + whereObject.getString("remarks") + "%' ";
|
|
|
}
|
|
|
- if (whereObject.containsKey("period") && !"".equals(whereObject.getString("period"))) {
|
|
|
- where = where + " and t1.period like'%" + whereObject.getString("period") + "%' ";
|
|
|
+ if (whereObject.containsKey("beginperiod") && !"".equals(whereObject.getString("beginperiod"))) {
|
|
|
+ where = where + " and t1.period >='" + whereObject.getString("beginperiod") + "' ";
|
|
|
+ }
|
|
|
+ if (whereObject.containsKey("endperiod") && !"".equals(whereObject.getString("endperiod"))) {
|
|
|
+ where = where + " and t1.period <='" + whereObject.getString("endperiod") + "' ";
|
|
|
}
|
|
|
if (whereObject.containsKey("agentinfo") && !"".equals(whereObject.getString("agentinfo"))) {
|
|
|
where = where + " and(t2.enterprisename like'%" + whereObject.getString("agentinfo") + "%'"
|
