ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
New file @@ -0,0 +1,14 @@ package com.ruoyi.web.controller.api; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Api(tags = "数据统计") @RestController @RequestMapping("/t-crm-branch-area") public class DataStatisticsController { } ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSupplierController.java
@@ -1,24 +1,35 @@ package com.ruoyi.web.controller.api; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.WebUtils; import com.ruoyi.system.dto.TCrmSupplierDTO; import com.ruoyi.system.export.TCrmBranchExport; import com.ruoyi.system.export.TCrmSupplierExport; import com.ruoyi.system.model.*; import com.ruoyi.system.query.TCrmBranchQuery; import com.ruoyi.system.query.TCrmSupplierQuery; import com.ruoyi.system.service.*; import com.ruoyi.system.vo.TCrmSupplierVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URLEncoder; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -158,5 +169,35 @@ return R.ok(); } @Log(title = "crm供应商管理信息-供应商管理导出", businessType = BusinessType.EXPORT) @ApiOperation(value = "供应商管理导出") @PostMapping("/exportList") public void exportList(@RequestBody TCrmSupplierQuery query){ List<TCrmSupplierExport> crmSupplierExports = crmSupplierService.exportList(query); Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TCrmSupplierExport.class, crmSupplierExports); HttpServletResponse response = WebUtils.response(); assert response != null; response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf-8"); ServletOutputStream outputStream = null; try { String fileName = URLEncoder.encode("供应商管理信息.xls", "utf-8"); response.setHeader("Content-Disposition", "attachment;filename=" + fileName); response.setContentType("application/vnd.ms-excel;charset=UTF-8"); response.setHeader("Pragma", "no-cache"); response.setHeader("Cache-Control", "no-cache"); outputStream = response.getOutputStream(); workbook.write(outputStream); } catch (IOException e) { e.printStackTrace(); } finally { try { outputStream.close(); } catch (IOException e) { e.printStackTrace(); } } } } ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
@@ -182,22 +182,22 @@ return R.ok( erpProcurementService.detailProcurement(clinicSupplierId, user, id)); } @ApiOperation(value = "采购详情--仓库角色专用") @GetMapping(value = "/detailProcurementWarehouse/{id}") public R<DetailProcurementVO> detailProcurementWarehouse(@PathVariable String id) { SysUser user = tokenService.getLoginUser().getUser(); Integer roleType = user.getRoleType(); String clinicSupplierId=null; if(roleType == 5){ // 诊所 TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class) .eq(TCrmClinic::getUserId, user.getUserId()) .last("LIMIT 1")); clinicSupplierId = crmClinic.getId(); } return R.ok( erpProcurementService.detailProcurementWarehouse(clinicSupplierId, user, id)); } // @ApiOperation(value = "采购详情--仓库角色专用") // @GetMapping(value = "/detailProcurementWarehouse/{id}") // public R<DetailProcurementVO> detailProcurementWarehouse(@PathVariable String id) { // SysUser user = tokenService.getLoginUser().getUser(); // Integer roleType = user.getRoleType(); // String clinicSupplierId=null; // if(roleType == 5){ // // 诊所 // TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class) // .eq(TCrmClinic::getUserId, user.getUserId()) // .last("LIMIT 1")); // clinicSupplierId = crmClinic.getId(); // } // // return R.ok( erpProcurementService.detailProcurementWarehouse(clinicSupplierId, user, id)); // } ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java
@@ -310,11 +310,13 @@ List<TSysAppUserExport> sysAppUserExports = sysAppUserService.exportListAppUser(query); for (TSysAppUserExport sysAppUserExport : sysAppUserExports) { String lastInspectionTime = sysAppUserExport.getLastInspectionTime(); lastInspectionTime = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(lastInspectionTime); sysAppUserExport.setLastInspectionTime(lastInspectionTime); if(StringUtils.isNotEmpty(lastInspectionTime)){ lastInspectionTime = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(lastInspectionTime); sysAppUserExport.setLastInspectionTime(lastInspectionTime); } sysAppUserExport.setCreateTimeStr(sysAppUserExport.getCreateTime().toLocalDate().toString()); } Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TSysAppUserClinicExport.class, sysAppUserExports); Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TSysAppUserExport.class, sysAppUserExports); HttpServletResponse response = WebUtils.response(); assert response != null; response.setContentType("application/vnd.ms-excel"); ruoyi-system/src/main/java/com/ruoyi/system/export/TCrmSupplierExport.java
New file @@ -0,0 +1,29 @@ package com.ruoyi.system.export; import cn.afterturn.easypoi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; @Data @ApiModel(value = "crm供应商管理导出TCrmSupplierExport") public class TCrmSupplierExport implements Serializable { @Excel(name = "供应商名称", width = 20) private String supplierName; @Excel(name = "联系人", width = 20) private String supplierContact; @Excel(name = "联系电话", width = 20) private String phone; @Excel(name = "备注", width = 20) private String remarks; @Excel(name = "状态", width = 20, replace = {"使用中_1","已冻结_2"}) private Integer status; } ruoyi-system/src/main/java/com/ruoyi/system/mapper/TCrmSupplierMapper.java
@@ -2,7 +2,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.export.TCrmSupplierExport; import com.ruoyi.system.model.TCrmSupplier; import com.ruoyi.system.query.TCrmBranchQuery; import com.ruoyi.system.query.TCrmSupplierQuery; import com.ruoyi.system.vo.TCrmSupplierVO; import org.apache.ibatis.annotations.Param; @@ -27,4 +29,10 @@ */ List<TCrmSupplierVO> pageList(@Param("query") TCrmSupplierQuery query, @Param("pageInfo")PageInfo<TCrmSupplierVO> pageInfo); /** * 导出 * @param query * @return */ List<TCrmSupplierExport> exportList(@Param("query")TCrmSupplierQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/service/TCrmSupplierService.java
@@ -4,9 +4,13 @@ import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.R; import com.ruoyi.system.dto.TCrmSupplierDTO; import com.ruoyi.system.export.TCrmSupplierExport; import com.ruoyi.system.model.TCrmSupplier; import com.ruoyi.system.query.TCrmBranchQuery; import com.ruoyi.system.query.TCrmSupplierQuery; import com.ruoyi.system.vo.TCrmSupplierVO; import java.util.List; /** * <p> @@ -38,4 +42,11 @@ * @return */ R<Boolean> updateSupplier(TCrmSupplierDTO dto); /** * 供应商导出 * @param query * @return */ List<TCrmSupplierExport> exportList(TCrmSupplierQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSupplierServiceImpl.java
@@ -8,9 +8,11 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.dto.TCrmSupplierDTO; import com.ruoyi.system.export.TCrmSupplierExport; import com.ruoyi.system.mapper.TCrmSupplierMapper; import com.ruoyi.system.model.TCrmSupplier; import com.ruoyi.system.model.TCrmSupplierToWarehouse; import com.ruoyi.system.query.TCrmBranchQuery; import com.ruoyi.system.query.TCrmSupplierQuery; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.TCrmSupplierService; @@ -132,4 +134,10 @@ } return R.ok(); } @Override public List<TCrmSupplierExport> exportList(TCrmSupplierQuery query) { List<TCrmSupplierExport> list = this.baseMapper.exportList(query); return list; } } ruoyi-system/src/main/resources/mapper/system/TCrmSupplierMapper.xml
@@ -48,5 +48,26 @@ </where> ORDER BY create_time DESC </select> <select id="exportList" resultType="com.ruoyi.system.export.TCrmSupplierExport"> select <include refid="Base_Column_List"/> from t_crm_supplier <where> <if test="query.supplierName != null and query.supplierName != ''"> and supplier_name like concat('%',#{query.supplierName},'%') </if> <if test="query.supplierContact != null and query.supplierContact != ''"> and supplier_contact like concat('%',#{query.supplierContact},'%') </if> <if test="query.phone != null and query.phone != ''"> and phone like concat('%',#{query.phone},'%') </if> <if test="query.status != null"> and status = #{query.status} </if> AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} </where> ORDER BY create_time DESC </select> </mapper>