ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
@@ -52,6 +52,8 @@ private IServiceTransportService serviceTransport; @Autowired private IGiLinkService linkService; @Autowired private ISysUserService userService; /** @@ -60,6 +62,11 @@ @ApiOperation("查询捐献上报基础列表") @PostMapping("/list") public Map<String, Object> list(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) { Long userId= getUserId(); SysUser user = userService.selectUserById(userId); if(user!=null&&user.getUserType()!=null&&!user.getUserType().equals("00")){ serviceDonatebaseinfoReport.setNotAdminId(user.getUserName()); } Page<ServiceDonatebaseinfoReport> serviceDonatebaseinfoReportPage = serviceDonatebaseinfoReportService.queryList(serviceDonatebaseinfoReport); return getDataTable(serviceDonatebaseinfoReportPage.getRecords(), (int) serviceDonatebaseinfoReportPage.getTotal()); } @@ -70,6 +77,12 @@ @ApiOperation("获取各类型的总数") @PostMapping("/getTotal") public Map<String, Object> getTotal(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) { Long userId= getUserId(); SysUser user = userService.selectUserById(userId); if(user!=null&&user.getUserType()!=null&&!user.getUserType().equals("00")){ serviceDonatebaseinfoReport.setNotAdminId(user.getUserName()); } //去配置文件中，获取上报类型 SysConfig config = new SysConfig(); config.setConfigKey("sys.report.type"); ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java
@@ -5,12 +5,14 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.project.domain.ServiceTransport; import com.ruoyi.project.domain.ServiceTransportFile; import com.ruoyi.project.service.IServiceTransportService; import com.ruoyi.project.service.impl.ServiceTransportFileServiceImpl; import com.ruoyi.system.service.ISysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +38,9 @@ @Autowired private ServiceTransportFileServiceImpl serviceTransportFileService; @Autowired private ISysUserService userService; /** * 查询供者转运登记列表 */ @@ -43,8 +48,29 @@ // @PreAuthorize("@ss.hasPermi('system:transport:list')") @PostMapping("/list") public Map<String, Object> list(@RequestBody ServiceTransport serviceTransport) { Long userId= getUserId(); SysUser user = userService.selectUserById(userId); if(user!=null&&user.getUserType()!=null&&!user.getUserType().equals("00")){ serviceTransport.setNotAdminId(user.getUserName()); } Page<ServiceTransport> serviceTransportPage = serviceTransportService.queryList(serviceTransport); return getDataTable(serviceTransportPage.getRecords(), (int) serviceTransportPage.getTotal()); } /** * 查询供者转运登记列表 */ @ApiOperation("转运登记状态统计") // @PreAuthorize("@ss.hasPermi('system:transport:list')") @PostMapping("/totalServiceTransportState") public List<Map<String,Object>> totalState(@RequestBody ServiceTransport serviceTransport) { Long userId= getUserId(); SysUser user = userService.selectUserById(userId); if(user!=null&&user.getUserType()!=null&&!user.getUserType().equals("00")){ serviceTransport.setNotAdminId(user.getUserName()); } return serviceTransportService.totalState(serviceTransport); } /** @@ -55,6 +81,11 @@ @Log(title = "供者转运登记", businessType = BusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(ServiceTransport serviceTransport) { Long userId= getUserId(); SysUser user = userService.selectUserById(userId); if(user!=null&&user.getUserType()!=null&&!user.getUserType().equals("00")){ serviceTransport.setNotAdminId(user.getUserId()+""); } List<ServiceTransport> list = serviceTransportService.queryList(serviceTransport).getRecords(); ExcelUtil<ServiceTransport> util = new ExcelUtil<ServiceTransport>(ServiceTransport.class); return util.exportExcel(list, "供者转运登记数据"); ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -57,6 +57,12 @@ private String nickName; /** * 用户类型（00管理员） */ @Excel(name = "用户类型（00管理员）") private String userType; /** * 用户邮箱 */ @Excel(name = "用户邮箱") @@ -278,6 +284,16 @@ this.userName = userName; } public String getUserType() { return userType; } public void setUserType(String userType) { this.userType = userType; } @Email(message = "邮箱格式不正确") @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") public String getEmail() { ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
@@ -456,5 +456,12 @@ @Excel(name = "ICU评估医生手机号") private String icuDoctorPhone; /** * 非管理员ID */ @TableField(exist = false) @ApiModelProperty("非管理员ID") private String notAdminId; }
@@ -191,5 +191,12 @@ @TableField(exist = false) @ApiModelProperty("附件文件地址集合") private List<ServiceTransportFile> annexfilesList; /** * 非管理员ID */ @TableField(exist = false) @ApiModelProperty("非管理员ID") private String notAdminId; }
@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; import java.util.Map; /** * 供者转运登记Mapper接口 @@ -23,4 +24,12 @@ * @return 供者转运登记集合 */ public List<ServiceTransport> selectServiceTransportList(ServiceTransport serviceTransport); /** * 查询供者转运登记列表 * * @param serviceTransport 供者转运登记 * @return 供者转运登记集合 */ public List<Map<String,Object>> totalState(ServiceTransport serviceTransport); } ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceTransportService.java
@@ -5,6 +5,7 @@ import com.ruoyi.project.domain.ServiceTransport; import java.util.List; import java.util.Map; /** * 供者转运登记Service接口 @@ -29,5 +30,13 @@ * @param serviceTransport 供者转运登记 * @return 供者转运登记集合 */ public List<Map<String,Object>> totalState(ServiceTransport serviceTransport); /** * 查询供者转运登记列表 * * @param serviceTransport 供者转运登记 * @return 供者转运登记集合 */ public List<ServiceTransport> queryListData(ServiceTransport serviceTransport); } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
@@ -50,6 +50,7 @@ @Override public Page<ServiceDonatebaseinfoReport> queryList(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) { LambdaQueryWrapper<ServiceDonatebaseinfoReport> wrappers = getWrapper(serviceDonatebaseinfoReport); // 添加create_time不为空的条件 wrappers.isNotNull(ServiceDonatebaseinfoReport::getCreateTime); // 然后进行倒序排序 @@ -157,6 +158,7 @@ private LambdaQueryWrapper<ServiceDonatebaseinfoReport> getWrapper(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) { LambdaQueryWrapper<ServiceDonatebaseinfoReport> wrappers = Wrappers.lambdaQuery(); wrappers.eq(ServiceDonatebaseinfoReport::getDelFlag, "0"); if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getCaseNo())) { wrappers.eq(ServiceDonatebaseinfoReport::getCaseNo, serviceDonatebaseinfoReport.getCaseNo()); } @@ -308,6 +310,9 @@ wrappers.eq(ServiceDonatebaseinfoReport::getCoordinatorNo, serviceDonatebaseinfoReport.getCoordinatorNo()); } if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getNotAdminId())) { wrappers.eq(ServiceDonatebaseinfoReport::getCreateBy, serviceDonatebaseinfoReport.getNotAdminId()); } return wrappers; }
@@ -65,6 +65,16 @@ page.setRecords(list); return page; } /** * 查询供者转运登记列表 * * @param serviceTransport 供者转运登记 * @return 供者转运登记 */ @Override public List<Map<String,Object>> totalState(ServiceTransport serviceTransport) { return ServiceTransportMapper.totalState(serviceTransport); } @Override public List<ServiceTransport> queryListData(ServiceTransport serviceTransport) { @@ -154,6 +164,9 @@ if (StringUtils.isNotBlank(serviceTransport.getIcuDoctorPhone())) { wrappers.eq(ServiceTransport::getIcuDoctorPhone, serviceTransport.getIcuDoctorPhone()); } if (StringUtils.isNotBlank(serviceTransport.getNotAdminId())) { wrappers.eq(ServiceTransport::getCreateBy, serviceTransport.getNotAdminId()); } return wrappers; }
@@ -101,4 +101,12 @@ </where> </select> <select id="totalState" parameterType="com.ruoyi.project.domain.ServiceTransport" resultType="map"> SELECT transit_status,COUNT(transit_status) as count FROM service_Transport <where> <if test="notAdminId != null and notAdminId != ''">and create_by = #{notAdminId}</if> </where> GROUP BY transit_status </select> </mapper> ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -10,6 +10,7 @@ <result property="deptId" column="dept_id"/> <result property="userName" column="user_name"/> <result property="nickName" column="nick_name"/> <result property="userType" column="user_type"/> <result property="email" column="email"/> <result property="phonenumber" column="phonenumber"/> <result property="sex" column="sex"/> @@ -61,6 +62,7 @@ u.ding_user_id, u.error_nums, u.error_times, u.user_type, u.user_name, u.nick_name, u.email,
