From 0c0324f7ee99febe9c4aee0e149dc3fe73a9a1e1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 28 十月 2024 15:35:59 +0800
Subject: [PATCH] zjh20241028
---
ltkj-system/src/main/java/com/ltkj/system/domain/TjDjdDyjl.java | 9 ++
ltkj-system/src/main/resources/mapper/system/TjDjdDyjlMapper.xml | 181 ++++++++++++++++++++++++---------------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDjdDyjlController.java | 16 +++-
3 files changed, 118 insertions(+), 88 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDjdDyjlController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDjdDyjlController.java
index 47f68c7..19e4d4d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDjdDyjlController.java
+++ b/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);
diff --git a/ltkj-system/src/main/java/com/ltkj/system/domain/TjDjdDyjl.java b/ltkj-system/src/main/java/com/ltkj/system/domain/TjDjdDyjl.java
index 04dbdab..659216b 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/domain/TjDjdDyjl.java
+++ b/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;
diff --git a/ltkj-system/src/main/resources/mapper/system/TjDjdDyjlMapper.xml b/ltkj-system/src/main/resources/mapper/system/TjDjdDyjlMapper.xml
index 3230477..5bf9a6a 100644
--- a/ltkj-system/src/main/resources/mapper/system/TjDjdDyjlMapper.xml
+++ b/ltkj-system/src/main/resources/mapper/system/TjDjdDyjlMapper.xml
@@ -5,124 +5,137 @@
<mapper namespace="com.ltkj.system.mapper.TjDjdDyjlMapper">
<resultMap type="TjDjdDyjl" id="TjDjdDyjlResult">
- <result property="id" column="id"/>
- <result property="tjNum" column="tj_num"/>
- <result property="cardId" column="card_id"/>
- <result property="dycs" column="dycs"/>
- <result property="createTime" column="create_time"/>
- <result property="createBy" column="create_by"/>
- <result property="updateTime" column="update_time"/>
- <result property="updateBy" column="update_by"/>
- <result property="deleted" column="deleted"/>
- <result property="dysj" column="dysj"/>
- <result property="hzxm" column="hzxm"/>
- <result property="dylx" column="dylx"/>
+ <result property="id" column="id"/>
+ <result property="tjNum" column="tj_num"/>
+ <result property="cardId" column="card_id"/>
+ <result property="dycs" column="dycs"/>
+ <result property="createTime" column="create_time"/>
+ <result property="createBy" column="create_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="deleted" column="deleted"/>
+ <result property="dysj" column="dysj"/>
+ <result property="hzxm" column="hzxm"/>
+ <result property="dylx" column="dylx"/>
</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>
<select id="selectTjDjdDyjlList" parameterType="TjDjdDyjl" resultMap="TjDjdDyjlResult">
<include refid="selectTjDjdDyjlVo"/>
<where>
- <if test="tjNum != null and tjNum != ''">
- and tj_num = #{tjNum}
- </if>
- <if test="cardId != null and cardId != ''">
- and card_id = #{cardId}
- </if>
- <if test="dycs != null ">
- and dycs = #{dycs}
- </if>
- <if test="deleted != null ">
- and deleted = #{deleted}
- </if>
+ <if test="tjNum != null and tjNum != ''">
+ and tj_num = #{tjNum}
+ </if>
+ <if test="cardId != null and cardId != ''">
+ and card_id = #{cardId}
+ </if>
+ <if test="dycs != null ">
+ and dycs = #{dycs}
+ </if>
+ <if test="beginTime != null and endTime != null">
+ and dysj between #{beginTime} and #{endTime}
+ </if>
+ and deleted =0
</where>
</select>
<select id="selectTjDjdDyjlById" parameterType="Long"
resultMap="TjDjdDyjlResult">
- <include refid="selectTjDjdDyjlVo"/>
- where id = #{id}
+ <include refid="selectTjDjdDyjlVo"/>
+ where id = #{id}
</select>
<insert id="insertTjDjdDyjl" parameterType="TjDjdDyjl" useGeneratedKeys="true"
keyProperty="id">
insert into tj_djd_dyjl
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="tjNum != null">tj_num,
- </if>
- <if test="cardId != null">card_id,
- </if>
- <if test="dycs != null">dycs,
- </if>
- <if test="createTime != null">create_time,
- </if>
- <if test="createBy != null">create_by,
- </if>
- <if test="updateTime != null">update_time,
- </if>
- <if test="updateBy != null">update_by,
- </if>
- <if test="deleted != null">deleted,
- </if>
+ <if test="tjNum != null">tj_num,
+ </if>
+ <if test="cardId != null">card_id,
+ </if>
+ <if test="dycs != null">dycs,
+ </if>
+ <if test="createTime != null">create_time,
+ </if>
+ <if test="createBy != null">create_by,
+ </if>
+ <if test="updateTime != null">update_time,
+ </if>
+ <if test="updateBy != null">update_by,
+ </if>
+ <if test="deleted != null">deleted,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="tjNum != null">#{tjNum},
- </if>
- <if test="cardId != null">#{cardId},
- </if>
- <if test="dycs != null">#{dycs},
- </if>
- <if test="createTime != null">#{createTime},
- </if>
- <if test="createBy != null">#{createBy},
- </if>
- <if test="updateTime != null">#{updateTime},
- </if>
- <if test="updateBy != null">#{updateBy},
- </if>
- <if test="deleted != null">#{deleted},
- </if>
+ <if test="tjNum != null">#{tjNum},
+ </if>
+ <if test="cardId != null">#{cardId},
+ </if>
+ <if test="dycs != null">#{dycs},
+ </if>
+ <if test="createTime != null">#{createTime},
+ </if>
+ <if test="createBy != null">#{createBy},
+ </if>
+ <if test="updateTime != null">#{updateTime},
+ </if>
+ <if test="updateBy != null">#{updateBy},
+ </if>
+ <if test="deleted != null">#{deleted},
+ </if>
</trim>
</insert>
<update id="updateTjDjdDyjl" parameterType="TjDjdDyjl">
update tj_djd_dyjl
<trim prefix="SET" suffixOverrides=",">
- <if test="tjNum != null">tj_num =
- #{tjNum},
- </if>
- <if test="cardId != null">card_id =
- #{cardId},
- </if>
- <if test="dycs != null">dycs =
- #{dycs},
- </if>
- <if test="createTime != null">create_time =
- #{createTime},
- </if>
- <if test="createBy != null">create_by =
- #{createBy},
- </if>
- <if test="updateTime != null">update_time =
- #{updateTime},
- </if>
- <if test="updateBy != null">update_by =
- #{updateBy},
- </if>
- <if test="deleted != null">deleted =
- #{deleted},
- </if>
+ <if test="tjNum != null">tj_num =
+ #{tjNum},
+ </if>
+ <if test="cardId != null">card_id =
+ #{cardId},
+ </if>
+ <if test="dycs != null">dycs =
+ #{dycs},
+ </if>
+ <if test="createTime != null">create_time =
+ #{createTime},
+ </if>
+ <if test="createBy != null">create_by =
+ #{createBy},
+ </if>
+ <if test="updateTime != null">update_time =
+ #{updateTime},
+ </if>
+ <if test="updateBy != null">update_by =
+ #{updateBy},
+ </if>
+ <if test="deleted != null">deleted =
+ #{deleted},
+ </if>
</trim>
where id = #{id}
</update>
<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">
--
Gitblit v1.8.0