Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusPrintTemplateController.java

@@ -26,6 +26,7 @@ import org.jeecg.modules.business.entity.BusPrintTemplate;
 import org.jeecg.modules.business.entity.BusRoomPayType;
 import org.jeecg.modules.business.entity.BusWaiter;
 import org.jeecg.modules.business.service.IBusPrintTemplateService;
+import org.jeecg.modules.system.entity.SysPermission;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -74,6 +75,7 @@ public class BusPrintTemplateController extends JeecgController<BusPrintTemplate
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<BusPrintTemplate> queryWrapper = QueryGenerator.initQueryWrapper(busPrintTemplate, req.getParameterMap());
+//		queryWrapper.orderByAsc("id");
 		Page<BusPrintTemplate> page = new Page<BusPrintTemplate>(pageNo, pageSize);
 		IPage<BusPrintTemplate> pageList = busPrintTemplateService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -133,6 +135,13 @@ public class BusPrintTemplateController extends JeecgController<BusPrintTemplate
 		editModel.setPrintSum(busPrintTemplate.getPrintSum());
 		editModel.setPrintContentOffset(busPrintTemplate.getPrintContentOffset());
 		editModel.setPrintPaperOffset(busPrintTemplate.getPrintPaperOffset());
+
+		//增加需求
+		editModel.setIsShowIdcard(busPrintTemplate.getIsShowIdcard());
+		editModel.setIsShowBreakfast(busPrintTemplate.getIsShowBreakfast());
+		editModel.setIsShowAddress(busPrintTemplate.getIsShowAddress());
+		editModel.setIsShowPhone(busPrintTemplate.getIsShowPhone());
+
 		busPrintTemplateService.updateById(editModel);
 //		busPrintTemplateService.updateById(busPrintTemplate);
 		return Result.OK("编辑成功!");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusPrintTemplate.java

@@ -109,4 +109,21 @@ public class BusPrintTemplate implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
+
+    /**是否显示证件信息(0-是；1-否)*/
+    @Excel(name = "是否显示证件信息(0-是；1-否)", width = 15)
+    @ApiModelProperty(value = "是否显示证件信息(0-是；1-否)")
+    private java.lang.Integer isShowIdcard;
+    /**是否显示早餐(0-是；1-否)*/
+    @Excel(name = "是否显示早餐(0-是；1-否)", width = 15)
+    @ApiModelProperty(value = "是否显示早餐(0-是；1-否)")
+    private java.lang.Integer isShowBreakfast;
+    /**是否显示客人地址(0-是；1-否)*/
+    @Excel(name = "是否显示客人地址(0-是；1-否)", width = 15)
+    @ApiModelProperty(value = "是否显示客人地址(0-是；1-否)")
+    private java.lang.Integer isShowAddress;
+    /**是否显示客人电话(0-是；1-否)*/
+    @Excel(name = "是否显示客人电话(0-是；1-否)", width = 15)
+    @ApiModelProperty(value = "是否显示客人电话(0-是；1-否)")
+    private java.lang.Integer isShowPhone;
 }