Commit 951cb88d authored by 高宇's avatar 高宇

1 客户管理和条码管理

parent 493dc432
......@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiOperation;
import org.rcisoft.core.anno.CyOpeLogAnno;
import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
import org.rcisoft.core.util.CyEpExcelUtil;
import org.rcisoft.util.ExportToExcelUtil;
import org.springframework.validation.BindingResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -127,7 +128,7 @@ public class BCustomerController extends CyPaginationController<BCustomer> {
@CyOpeLogAnno(title = "system-BCustomer管理-查询BCustomer", businessType = CyLogTypeEnum.EXPORT)
@ApiOperation(value = "导出BCustomer信息", notes = "导出BCustomer信息")
@GetMapping(value = "/export")
public CyResult outBCustomer(HttpServletResponse response,BCustomer bCustomer,@PathVariable @RequestParam(defaultValue = "0") String excelId) {
public void outBCustomer(HttpServletResponse response,BCustomer bCustomer,@PathVariable @RequestParam(defaultValue = "0") String excelId) {
String excelName="";
switch(excelId){
case "0": excelName="BCustomer信息.xls";break;
......@@ -135,10 +136,6 @@ public class BCustomerController extends CyPaginationController<BCustomer> {
case "2": excelName="BCustomer信息.csv";break;
}
List<BCustomer> bCustomerList = bCustomerServiceImpl.export(bCustomer);
CyEpExcelUtil.exportExcel(bCustomerList, "BCustomer信息", "BCustomer信息", BCustomer.class, excelName, response);
return CyResultGenUtil.builder(new CyPersistModel(1),
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
bCustomerList);
ExportToExcelUtil.exportExcel(bCustomerList, "BCustomer信息", "BCustomer信息", BCustomer.class, excelName, response);
}
}
......@@ -128,7 +128,7 @@ public class BPnSypnController extends CyPaginationController<BPnSypn> {
@CyOpeLogAnno(title = "system-BPnSypn管理-查询BPnSypn", businessType = CyLogTypeEnum.EXPORT)
@ApiOperation(value = "导出BPnSypn信息", notes = "导出BPnSypn信息")
@GetMapping(value = "/export")
public CyResult outBPnSypn(HttpServletResponse response,BPnSypn bPnSypn,@PathVariable @RequestParam(defaultValue = "0") String excelId) {
public void outBPnSypn(HttpServletResponse response,BPnSypn bPnSypn,@PathVariable @RequestParam(defaultValue = "0") String excelId) {
String excelName="";
switch(excelId){
case "0": excelName="BPnSypn信息.xls";break;
......@@ -137,9 +137,5 @@ public class BPnSypnController extends CyPaginationController<BPnSypn> {
}
List<BPnSypn> bPnSypnList = bPnSypnServiceImpl.export(bPnSypn);
ExportToExcelUtil.exportExcel(bPnSypnList, "BPnSypn信息", "BPnSypn信息", BPnSypn.class, excelName, response);
return CyResultGenUtil.builder(new CyPersistModel(1),
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
bPnSypnList);
}
}
......@@ -39,9 +39,7 @@
<select id="queryBCustomers" resultMap="BaseResultMap">
select * from b_customer
where 1=1
<if test="entity.delFlag !=null and entity.delFlag != '' ">
and del_flag = #{entity.delFlag}
</if>
and del_flag = '0'
<if test="entity.flag !=null and entity.flag != '' ">
and flag = #{entity.flag}
</if>
......@@ -50,9 +48,7 @@
<select id="queryBCustomersPaged" resultMap="BaseResultMap">
select * from b_customer
where 1=1
<if test="entity.delFlag !=null and entity.delFlag != '' ">
and del_flag = #{entity.delFlag}
</if>
and del_flag = '0'
<if test="entity.flag !=null and entity.flag != '' ">
and flag = #{entity.flag}
</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment