|
|
|
@@ -11,6 +11,7 @@ import com.iformall.domain.po.WxFinancePrintTemplate; |
|
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
|
import com.iformall.enums.EnumBillAllType; |
|
|
|
import com.iformall.enums.EnumFinancePrintDataType; |
|
|
|
import com.iformall.enums.EnumYesOrNo; |
|
|
|
import com.iformall.service.WxFinancePrintService; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
|
|
|
|
@@ -51,16 +52,14 @@ public class WxFinancePrintController extends BaseController { |
|
|
|
@GetMapping("types") |
|
|
|
public ResultData types() { |
|
|
|
List<Map> list = new ArrayList<Map>(); |
|
|
|
Map m = new HashMap(); |
|
|
|
m.put("id", EnumFinancePrintDataType.FINANCE_RECEIVE.getCode()); |
|
|
|
m.put("name", EnumFinancePrintDataType.FINANCE_RECEIVE.getMessage()); |
|
|
|
list.add(m); |
|
|
|
// for (EnumFinancePrintDataType t : EnumFinancePrintDataType.values()) { |
|
|
|
// Map m = new HashMap(); |
|
|
|
// m.put("id", t.getCode()); |
|
|
|
// m.put("name", t.getMessage()); |
|
|
|
// list.add(m); |
|
|
|
// } |
|
|
|
for (EnumFinancePrintDataType t : EnumFinancePrintDataType.values()) { |
|
|
|
if (t != EnumFinancePrintDataType.BILL) { |
|
|
|
Map m = new HashMap(); |
|
|
|
m.put("id", t.getCode()); |
|
|
|
m.put("name", t.getMessage()); |
|
|
|
list.add(m); |
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultData(list); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -69,6 +68,7 @@ public class WxFinancePrintController extends BaseController { |
|
|
|
@TenantIgnore |
|
|
|
public ResultData printDatas(@ModelAttribute WxFinancePrintData record) { |
|
|
|
record.setSortColumns("sort asc"); |
|
|
|
record.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
return new ResultData(wxFinancePrintService.printDataList(record)); |
|
|
|
} |
|
|
|
|
|
|
|
|