ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -2,6 +2,7 @@ import java.io.*; import java.math.BigDecimal; import java.sql.Struct; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -1788,9 +1789,10 @@ @GetMapping("/getxmjgz") @ApiOperation(value = "医生检查处获取项目规则值") public AjaxResult getxmjgz(@RequestParam String proId) { public AjaxResult getxmjgz(@RequestParam String proId,@RequestParam(required = false) String xmgz) { LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>(); wq.eq(TjRules::getProId, proId); if(StringUtil.isNotBlank(xmgz))wq.like(TjRules::getRuleStr,xmgz); List<TjRules> list = tjRulesService.list(wq); if(null !=list && !list.isEmpty()){ for (TjRules tjRules : list) { ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -235,9 +235,9 @@ qw.eq(TjCustomer::getCusIdcard, cusIdcard); TjCustomer tjCustomer1 = tjCustomerService.getOne(qw); if (tjCustomer1 != null) { if (null != tjReservation.getCompanyId()) tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId())); if (null != tjReservation.getCompany()) tjCustomer1.setCompName(tjReservation.getCompany()); tjCustomerService.updateById(tjCustomer1); // if (null != tjReservation.getCompanyId()) tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId())); // if (null != tjReservation.getCompany()) tjCustomer1.setCompName(tjReservation.getCompany()); // tjCustomerService.updateById(tjCustomer1); tjCustomer1.setTjType(tjReservation.getTjType()); tjCustomer1.setCusName(tjReservation.getName()); tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex())); @@ -260,8 +260,8 @@ tjCustomer1.setDiscount(tjReservation.getDiscount()); tjCustomer1.setGroupingId(tjReservation.getGroupingId()); if(null !=tjReservation.getCompanyId())tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId())); if(null !=tjReservation.getCompany())tjCustomer1.setCompName(tjReservation.getCompany()); // if(null !=tjReservation.getCompanyId())tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId())); // if(null !=tjReservation.getCompany())tjCustomer1.setCompName(tjReservation.getCompany()); // tjCustomerService.updateById(tjCustomer1); @@ -291,8 +291,8 @@ tjCustomer.setCusPassword(substring); tjCustomer.setTjType(tjReservation.getTjType()); tjCustomer.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),"")); if(null !=tjReservation.getCompanyId())tjCustomer.setDictCompId(Long.valueOf(tjReservation.getCompanyId())); if(null !=tjReservation.getCompany())tjCustomer.setCompName(tjReservation.getCompany()); // if(null !=tjReservation.getCompanyId())tjCustomer.setDictCompId(Long.valueOf(tjReservation.getCompanyId())); // if(null !=tjReservation.getCompany())tjCustomer.setCompName(tjReservation.getCompany()); if (null != key && key.equals("Y")) { AjaxResult result = controller.Outpincreateapply(tjCustomer); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -498,13 +498,9 @@ order.setIdType(tjCustomer.getIdType()); order.setAgeUnit(tjCustomer.getAgeUnit()); order.setTjCount(String.valueOf(tjCustomer.getCusNumber())); if (null != tjCustomer.getCompName()) { order.setDictCompName(tjCustomer.getCompName()); } else { String firmId = order.getFirmId(); if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) { order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName()); } String firmName = order.getFirmName(); if (StringUtil.isNotBlank(firmName)) { order.setDictCompName(firmName); } if (null != order.getPacId()) { if (null != tjPackageService.getById(order.getPacId())) { @@ -1039,16 +1035,9 @@ tjOrder.setTjType("2"); } } if (null != tjCustomer.getCompName()) { tjOrder.setFirmName(tjCustomer.getCompName()); } if (null != tjCustomer.getDictCompId()) { tjOrder.setFirmId(String.valueOf(tjCustomer.getDictCompId())); } else { if(StringUtil.isBlank(tjOrder.getFirmId())){ tjOrder.setFirmId("0"); } if (null != tjOrder.getPhoto()) { File file = new File(tjOrder.getPhoto()); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -103,7 +103,8 @@ @ApiOperation(value = "导出excel表模板") public void importTemplate(HttpServletResponse response) { //原来的下载模板调用接口 String base64String = PDFBinaryUtil.getPDFBinary(configService.selectConfigByKey("default_excelTemplate")); try { String base64String = PDFBinaryUtil.getPDFBinary(value + File.separator + "西安路泰机电科技有限公司.xls"); if (null != base64String) { PDFBinaryUtil.base64StringToPDF(base64String, FileUtil.mkdir(value).getPath() + File.separator + "团体预约Excel模版.xls"); String filePath = value + File.separator + "团体预约Excel模版.xls"; @@ -154,6 +155,10 @@ } } } } catch (Exception e) { ExcelUtils.exportTemplate(response,"团体预约Excel模版",TjReservation.class); throw new RuntimeException(e); } }
@@ -20,6 +20,7 @@ import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.poi.ss.usermodel.IndexedColors; /** * 体检预约对象 tj_reservation @@ -190,12 +191,12 @@ private String company; /** * 单位名字 * 套餐分类 */ @ExcelExport(value = "部门",sort =99) @ExcelImport("部门") @Excel(name = "部门",sort = 99,cellType = Excel.ColumnType.STRING) @ApiModelProperty("部门") @ExcelExport(value = "套餐分类",sort =99) @ExcelImport("套餐分类") @Excel(name = "套餐分类",sort = 99,cellType = Excel.ColumnType.STRING) @ApiModelProperty("套餐分类") @TableField(exist = false) private String dwxm; @@ -215,10 +216,10 @@ /** * 部门 */ // @ExcelExport(value = "部门",sort =-2) // @ExcelImport("部门") // @Excel(name = "部门",sort = 2,cellType = Excel.ColumnType.STRING) @ApiModelProperty("部门") @ExcelExport(value = "单位部门",sort =-2) @ExcelImport("单位部门") @Excel(name = "单位部门",sort = 2,cellType = Excel.ColumnType.STRING,color = IndexedColors.RED) @ApiModelProperty("单位部门") private String department; /**
