inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -40,9 +41,12 @@ //获取检验下单数据 @ApiOperation(value = "查看所属单位检验单") @GetMapping("/selectInsOrderParameter") @PreAuthorize("@ss.hasPermi('business:order:queryAll')") public Result selectInsOrderParameter(Page page, SampleOrderDto sampleOrderDto) { return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto)); } //用于检验下单区别查看所有订单和只查看同一个委托单位的订单 @ApiOperation(value = "判断当前客户紧急额度是否用完") @@ -52,11 +56,11 @@ } //用于检验下单区别查看所有订单和只查看同一个委托单位的订单 @ApiOperation(value = "查看所有检验单") @PostMapping("/selectAllInsOrderParameter") public Result selectAllInsOrderParameter() { return Result.success(); } // @ApiOperation(value = "查看所有检验单") // @PostMapping("/selectAllInsOrderParameter") // public Result selectAllInsOrderParameter() { // return Result.success(); // } @ApiOperation(value = "分配按钮") @@ -78,14 +82,14 @@ } @ApiOperation(value = "查询订单最长预计时间") @PostMapping("/selectOrderManDay") @GetMapping("/selectOrderManDay") public Result<?> selectOrderManDay(Integer id) { int day = insProductService.selectOrderManDay(id); return Result.success("成功", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); } @ApiOperation(value = "查询检验下单内容详情") @PostMapping("/getInsOrder") @GetMapping("/getInsOrder") public Result<?> getInsOrder(Integer orderId) { return Result.success(insOrderService.getInsOrder(orderId)); } @@ -119,13 +123,13 @@ } @ApiOperation(value = "通过检验单模板id获取检验单模板内容") @PostMapping("/selectInsOrderTemplateById") @GetMapping("/selectInsOrderTemplateById") public Result<?> selectInsOrderTemplateById(Integer id) { return Result.success( insOrderTemplateService.selectInsOrderTemplateById(id),"成功"); } @ApiOperation(value = "通过检验单查询检验数据（数据查看）") @PostMapping("/selectSampleAndProductByOrderId") @GetMapping("/selectSampleAndProductByOrderId") public Result<?> selectSampleAndProductByOrderId(@RequestBody Map<String, Object> data) throws Exception { SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class); return Result.success(insOrderService.selectSampleAndProductByOrderId(sampleProductDto)); @@ -143,7 +147,7 @@ } @ApiOperation(value = "费用统计获取总价") @PostMapping("/costStatistics2") @GetMapping("/costStatistics2") public Result<?> costStatistics2(@RequestBody Map<String, Object> data) throws Exception { CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class); return Result.success(insOrderService.costStatistics2(costStatisticsDto)); @@ -157,7 +161,7 @@ } //待检的撤销的查询待检项目 @PostMapping("/selectNoProducts") @GetMapping("/selectNoProducts") public Result<?> selectNoProducts(@RequestBody Map<String, Object> data,Integer orderId ,String ids) throws Exception { Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); InsProduct insProduct = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsProduct.class); @@ -289,13 +293,13 @@ } @ApiOperation(value = "标签打印按钮") @PostMapping("/labelPrinting") @GetMapping("/labelPrinting") public Result<?> labelPrinting(String ids) { return Result.success(insOrderService.labelPrinting(ids)); } @ApiOperation(value = "查看费用统计列表") @PostMapping("/costStatistics") @GetMapping("/costStatistics") public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception { Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class); @@ -303,7 +307,7 @@ } @ApiOperation(value = "查看结果按钮(温度循环)") @PostMapping("/getInsOrderTemList") @GetMapping("/getInsOrderTemList") public Result getInsOrderTemList(@RequestBody Map<String, Object> data) { return Result.success(insOrderService.getInsOrderTemList(data)); } inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
@@ -38,7 +38,7 @@ List<Map<String,Object>> getTabHeader(@Param("sonLaboratory") String sonLaboratory,@Param("sample") String sample); //获取检验下单数据 IPage<SampleOrderDto> selectInsOrderPage(IPage<InsOrder> page, QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory, IPage<SampleOrderDto> selectInsOrderPage(IPage<InsOrder> page, @Param("ew") QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("eqState") String eqState, inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
@@ -20,7 +20,7 @@ public interface InsOrderService extends IService<InsOrder> { //获取单位检验下单数据 Map<String, Object> selectInsOrderParameter(Page<InsOrder> page, SampleOrderDto sampleOrderDto); IPage<SampleOrderDto> selectInsOrderParameter(Page<InsOrder> page, SampleOrderDto sampleOrderDto); //修改检验下单数据 int upInsOrder(UpInsOrderDTO upInsOrderDTO); inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -49,6 +49,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; @@ -114,7 +115,7 @@ //获取检验下单数据 @Override public Map<String, Object> selectInsOrderParameter(Page<InsOrder> page, SampleOrderDto sampleOrderDto) { public IPage<SampleOrderDto> selectInsOrderParameter(Page<InsOrder> page, SampleOrderDto sampleOrderDto) { page.setOptimizeCountSql(false); List<String> startAndEndTime = sampleOrderDto.getStartAndEndTime(); String startTime = ""; @@ -123,25 +124,23 @@ startTime = startAndEndTime.get(0) + " 00:00:00"; endTime = startAndEndTime.get(1) + " 23:59:59"; } Map<String, Object> map = new HashMap<>(); //// map.put("head", PrintChina.printChina(SampleOrderDto.class)); // //判断全部,个人,组织的权限 // Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter"); // User user = userMapper.selectById(map1.get("userId"));//当前登录的人 // Integer roleId = user.getRoleId(); User user = userMapper.selectById(SecurityUtils.getUserId());;//当前登录的人 // //获取当前人所属实验室id // String departLimsId = user.getDepartLimsId(); String laboratory = null; // if (ObjectUtils.isNotEmpty(departLimsId) && !departLimsId.isEmpty()) { // String[] split = departLimsId.split(","); // //查询对应架构名称(通信实验室,电力实验室,检测办) // String departLims = baseMapper.seldepLimsId(Integer.parseInt(split[split.length - 1])); // if (departLims.contains("实验室")) { // laboratory = departLims; // } // } String departLimsId = user.getDepartLimsId(); String laboratory = ""; if (ObjectUtils.isNotEmpty(departLimsId) && !departLimsId.isEmpty()) { String[] split = departLimsId.split(","); //查询对应架构名称(通信实验室,电力实验室,检测办) String departLims = baseMapper.seldepLimsId(Integer.parseInt(split[split.length - 1])); if (departLims.contains("实验室")) { laboratory = departLims; } } // //判断是否是全部权限 // SecurityUtils.hasPermi(""); // Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "selectAllInsOrderParameter")); // if (ObjectUtils.isEmpty(power)) { // if (map1.get("look") == 1) { @@ -174,8 +173,7 @@ i.setSampleCode(split[0]); } }); map.put("body", sampleOrderDtoIPage); return map; return sampleOrderDtoIPage; } @Override inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -840,7 +840,7 @@ </select> <select id="seldepLimsId" resultType="java.lang.String"> select name select `name` from department_lims where id = #{depLimsId} </select>
