zjh 2023/09/14---1

zjh

2023-09-14 e9191e6d4485d94c75f76762b4926439503c20c6

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java

@@ -134,7 +134,7 @@
                            customer.setTjNumber(tjOrder.getTjNumber());
                            customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
                            customer.setOrderId(tjOrder.getOrderId());
                            customer.setTjTime(tjOrder.getFinishTime());
                            customer.setTjTime(tjOrder.getCreateTime());
                            customer.setFinishTime(tjOrder.getFinishTime());
                            customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
                            customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
@@ -211,6 +211,13 @@
                vo.setZhupdateTime(remark.getUpdateTime());
                list.add(vo);
            }

            Collections.sort(list, new Comparator<CsProVo>() {
                @Override
                public int compare(CsProVo o1, CsProVo o2) {
                    return o1.getType()-o2.getType();
                }
            });
        }
        return AjaxResult.success(list);
    }
@@ -221,7 +228,7 @@
     */
    @GetMapping("/confirmOrder")
        @ApiOperation(value = "初审(并修改状态)接口")
    @PreAuthorize("@ss.hasPermi('check:check:confirmOrder')")
//    @PreAuthorize("@ss.hasPermi('check:check:confirmOrder')")
    @Transactional
    public AjaxResult confirmOrder(@ApiParam(value = "tjNumber") @RequestParam String tjNumber,
                                   @ApiParam(value = "状态 0同意1拒绝 默认同意") @RequestParam(defaultValue = "0") Integer status,
@@ -273,7 +280,7 @@
     */
    @GetMapping("/getList")
    @ApiOperation(value = "查询体检记录客户列表")//0待1已
    @PreAuthorize("@ss.hasPermi('check:check:getList')")
//    @PreAuthorize("@ss.hasPermi('check:check:getList')")
    public AjaxResult getList(@ApiParam(value = "审核状态0待审核1已审核") @RequestParam(required = false) Integer checkStatus,
                              @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page,
                              @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize,
@@ -382,7 +389,7 @@
     */
    @PutMapping("/getTjdetailList")
    @ApiOperation(value = "根据体检订单号获取体检详情信息(并修改状态)接口")
    @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')")
//    @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')")
    public AjaxResult getTjdetailList(@ApiParam(value = "体检tjNumber") @RequestParam String tjNumber,
                                      @ApiParam(value = "总检建议") @RequestParam(required = false) String advice,
                                      @ApiParam(value = "审核状态0待审核1已审核") @RequestParam Integer checkStatus) {
@@ -431,7 +438,7 @@
     */
    @GetMapping("/updateCheckType")
    @ApiOperation(value = "总检点击体检信息详情")
    @PreAuthorize("@ss.hasPermi('check:check:updateCheckType')")
//    @PreAuthorize("@ss.hasPermi('check:check:updateCheckType')")
    public AjaxResult updateCheckType(@ApiParam(value = "客户体检号") @RequestParam String tjNumber) {
        List<Map<String, Object>> list = new ArrayList<>();
        LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
@@ -524,7 +531,7 @@

    @GetMapping("/getTm")
    @ApiOperation(value = "获取条码")
    @PreAuthorize("@ss.hasPermi('check:check:getTm')")
//    @PreAuthorize("@ss.hasPermi('check:check:getTm')")
    public AjaxResult getTm(@ApiParam(value = "客户体检号") @RequestParam String tjNumber) {
        return AjaxResult.success(tjNumber);
    }
@@ -585,37 +592,4 @@
        return AjaxResult.success(map);
    }

    /*private boolean getAjaxResult(@RequestParam(defaultValue = "1") @ApiParam("页码数(默认1)") Integer page,
                                  @RequestParam(defaultValue = "10") @ApiParam("显示条数(默认10)") Integer pageSize,
                                  List<TjOrder> orderList,
                                  List<TjCustomer> customerList,
                                  Map<String, Object> map) {
        if (null != orderList && orderList.size() > 0) {
            for (TjOrder tjOrder : orderList) {
                TjCustomer customer = customerService.selectTjCustomerByCusId(tjOrder.getUserId());
                if (null == customer) {
                    continue;
                }
                customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
                customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                customer.setTjNumber(tjOrder.getTjNumber());
                customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
                customer.setOrderId(tjOrder.getOrderId());
                customer.setTjTime(tjOrder.getCreateTime());
                customer.setFinishTime(tjOrder.getFinishTime());
                if (tjOrder.getFirmId() == null || tjOrder.getFirmId().equals("0")) {
                    customer.setTjCompName("无");
                } else {
                    customer.setTjCompName(compService.getById(tjOrder.getFirmId()).getCnName());
                }
                customerList.add(customer);
            }
            List<TjCustomer> customers = customerList.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
            map.put("customers", customers);
            map.put("total", customerList.size());
            return true;
        }
        return false;
    }*/
}