zjh20241028

zjh

2024-10-28 0c0324f7ee99febe9c4aee0e149dc3fe73a9a1e1

zjh20241028

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

@@ -8,11 +8,13 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.service.ITjCustomerService;
import com.ltkj.hosp.service.ITjOrderService;
import com.ltkj.system.service.ISysUserService;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -44,6 +46,8 @@
    private ITjOrderService orderService;
    @Resource
    private ITjCustomerService customerService;
    @Autowired
    private ISysUserService userService;

/**
 * 查询体检导检单打印记录列表
@@ -115,6 +119,8 @@
        log.info(json.toJSONString());

        String tjNumber = json.getString("tjNumber");
        String dqdlr = json.getString("dqdlr");
        SysUser user = userService.getById(dqdlr);

        TjOrder order = orderService.getOrderByTjNum(tjNumber);
        if(null !=order){
@@ -130,7 +136,7 @@
                dycs+=1;
                dyjl.setDycs(dycs);
                dyjl.setDysj(date);
//                dyjl.setCreateBy(nickName);
                dyjl.setCreateBy(user.getNickName());
                dyjl.setUpdateTime(date);
                tjDjdDyjlService.updateById(dyjl);
                return AjaxResult.success();
@@ -140,7 +146,7 @@
            djdDyjl.setDylx("0");
            djdDyjl.setCardId(order.getCardId());
            djdDyjl.setHzxm(customer.getCusName());
//            djdDyjl.setCreateBy(nickName);
            djdDyjl.setCreateBy(user.getNickName());
            djdDyjl.setCreateTime(date);
            djdDyjl.setDysj(date);
            tjDjdDyjlService.save(djdDyjl);
@@ -157,6 +163,8 @@
        log.info(json.toJSONString());

        String tjNumber = json.getString("tjNumber");
        String dqdlr = json.getString("dqdlr");
        SysUser user = userService.getById(dqdlr);

        TjOrder order = orderService.getOrderByTjNum(tjNumber);
        if(null !=order){
@@ -172,7 +180,7 @@
                dycs+=1;
                dyjl.setDycs(dycs);
                dyjl.setDysj(date);
//                dyjl.setCreateBy(nickName);
                dyjl.setCreateBy(user.getNickName());
                dyjl.setUpdateTime(date);
                tjDjdDyjlService.updateById(dyjl);
                return AjaxResult.success();
@@ -182,7 +190,7 @@
            djdDyjl.setDylx("1");
            djdDyjl.setCardId(order.getCardId());
            djdDyjl.setHzxm(customer.getCusName());
//            djdDyjl.setCreateBy(nickName);
            djdDyjl.setCreateBy(user.getNickName());
            djdDyjl.setCreateTime(date);
            djdDyjl.setDysj(date);
            tjDjdDyjlService.save(djdDyjl);

 ltkj-system/src/main/java/com/ltkj/system/domain/TjDjdDyjl.java

@@ -1,6 +1,7 @@
package com.ltkj.system.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ltkj.common.annotation.Excel;
@@ -56,6 +57,14 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date dysj;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField(exist = false)
    private String beginTime;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField(exist = false)
    private String endTime;


    public void setId(Long id) {
        this.id = id;

 ltkj-system/src/main/resources/mapper/system/TjDjdDyjlMapper.xml

@@ -20,7 +20,18 @@
    </resultMap>

    <sql id="selectTjDjdDyjlVo">
        select id, tj_num, card_id, dycs, create_time, create_by, update_time, update_by, deleted,dylx,dysj,hzxm
        select id,
               tj_num,
               card_id,
               dycs,
               create_time,
               create_by,
               update_time,
               update_by,
               deleted,
               dylx,
               dysj,
               hzxm
        from tj_djd_dyjl
    </sql>

@@ -36,9 +47,10 @@
                        <if test="dycs != null ">
                            and dycs = #{dycs}
                        </if>
                        <if test="deleted != null ">
                            and deleted = #{deleted}
            <if test="beginTime != null and endTime != null">
                and dysj between #{beginTime} and #{endTime}
                        </if>
            and deleted =0
        </where>
    </select>

@@ -122,7 +134,8 @@

    <delete id="deleteTjDjdDyjlById" parameterType="Long">
        delete
        from tj_djd_dyjl where id = #{id}
        from tj_djd_dyjl
        where id = #{id}
    </delete>

    <delete id="deleteTjDjdDyjlByIds" parameterType="String">