From 3f28b46171934066aeeff9af80d3f0ce6afb3adf Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期四, 30 十一月 2023 17:55:27 +0800
Subject: [PATCH] 优化
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java | 118 +++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/dto/TjChartVo.java | 29 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java | 73 ++++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java | 15 +
ltkj-hosp/src/main/resources/mapper/hosp/TjDiscardInspectionMapper.xml | 234 +++++++++++++------------
ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml | 9
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java | 6
ltkj-admin/src/main/resources/application.yml | 8
8 files changed, 361 insertions(+), 131 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java
index b901dd9..da2382a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java
@@ -2,19 +2,23 @@
import java.util.List;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.TjCustomer;
+import com.ltkj.hosp.domain.TjOrder;
+import com.ltkj.hosp.service.ITjOrderDetailService;
+import com.ltkj.hosp.service.ITjOrderService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.hosp.domain.TjDiscardInspection;
import com.ltkj.hosp.service.ITjDiscardInspectionService;
import com.ltkj.common.core.page.TableDataInfo;
+
+import javax.annotation.Resource;
/**
* 寮冩Controller
@@ -28,30 +32,71 @@
@Autowired
private ITjDiscardInspectionService tjDiscardInspectionService;
-/**
- * 鏌ヨ寮冩鍒楄〃
- */
-//@PreAuthorize("@ss.hasPermi('hosp:inspection:list')")
-@GetMapping("/list")
+ @Resource
+ private ITjOrderService tjOrderService;
+ @Resource
+ private ITjOrderDetailService tjOrderDetailService;
+
+ /**
+ * 鏌ヨ寮冩鍒楄〃
+ */
+ @GetMapping("/list")
public TableDataInfo list(TjDiscardInspection tjDiscardInspection) {
startPage();
List<TjDiscardInspection> list = tjDiscardInspectionService.selectTjDiscardInspectionList(tjDiscardInspection);
- if(null !=list && list.size()>0){
- for (TjDiscardInspection discardInspection : list) {
- discardInspection.setCusName(MatchUtils.hideCusName(discardInspection.getCusName()));
+ if (null != list && list.size() > 0) {
+ for (TjDiscardInspection discardInspection : list) {
+ discardInspection.setCusName(MatchUtils.hideCusName(discardInspection.getCusName()));
+ }
}
- }
return getDataTable(list);
}
/**
* 鑾峰彇寮冩璇︾粏淇℃伅
*/
-// @PreAuthorize("@ss.hasPermi('hosp:inspection:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(tjDiscardInspectionService.selectTjDiscardInspectionById(id));
}
+ /**
+ * 鎭㈠寮冩
+ */
+ @PostMapping("/recall")
+ public AjaxResult recall(@RequestBody List<TjDiscardInspection> tjDiscardInspection) {
+ for (TjDiscardInspection discardInspection : tjDiscardInspection) {
+ //鍒ゆ柇鏄惁瀹℃牳
+ LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrder::getTjNumber,discardInspection.getTjNum());
+ final TjOrder one = tjOrderService.getOne(wq);
+
+ if (one==null){
+ return error("鏃犺浣撴鍙�");
+ }
+
+ if (one.getStatus()==301){
+ return error("鍒濆宸查�氳繃锛屼笉鍙挙鍥�");
+ }else if (one.getStatus()==401){
+ return error("鎬绘宸查�氳繃锛屼笉鍙挙鍥�");
+ }else if (one.getStatus()==402){
+ return error("鎶ュ憡宸插彂甯冿紝涓嶅彲鎾ゅ洖");
+ }
+ if (one.getHeshouStatus()==1){
+ return error("鎶ュ憡宸叉牳鏀讹紝涓嶅彲鎾ゅ洖");
+ }
+ if (one.getCheckStatus()==1){
+ return error("鎬绘宸插鏍革紝涓嶅彲鎾ゅ洖");
+ }
+ //鍒犻櫎寮冩璁板綍
+ final boolean b = tjDiscardInspectionService.removeById(discardInspection.getId());
+ if(b){
+ //灏嗙绂荤姸鎬佹敼鍥炲凡绛惧埌
+ one.setStatus(201);
+ tjOrderService.updateById(one);
+ }
+ }
+ return success("鎾ゅ洖鎴愬姛");
+ }
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
index 9441e70..b8aadcf 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
@@ -9,6 +9,7 @@
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.utils.DateUtils;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.dto.TjChartVo;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.*;
import com.ltkj.system.service.ISysDeptService;
@@ -16,10 +17,12 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -53,6 +56,9 @@
private ISysUserService userService;
@Resource
private ITjOrderRemarkService remarkService;
+
+ @Resource
+ private ITjFlowingWaterService tjFlowingWaterService;
@GetMapping("/GetChartByDate")
@@ -641,4 +647,116 @@
public Integer RegisterToday() {
return orderService.count(new QueryWrapper<TjOrder>().between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
}
+
+
+ @GetMapping("/getChartByDeptId")
+ @ApiOperation("鏍规嵁閮ㄩ棬鏌ヨ浣撴缁熻")
+ public AjaxResult getChartByDeptId(@RequestParam Long deptId,
+ @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
+ List<TjChartVo> res=new ArrayList();
+ LambdaQueryWrapper<TjOrderRemark> wq0 = new LambdaQueryWrapper<>();
+ wq0.eq(TjOrderRemark::getDeptId, deptId);
+ List<TjOrderRemark> remarkList = remarkService.list(wq0);
+
+ List<Long> proIdList = remarkList.stream().map(TjOrderRemark::getProId).distinct().collect(Collectors.toList());
+ for (Long aLong : proIdList) {
+ LambdaQueryWrapper<TjOrderRemark> wq00 = new LambdaQueryWrapper<>();
+ wq00.eq(TjOrderRemark::getDeptId, deptId);
+ List<TjOrderRemark> remarkList1 = remarkService.list(wq00);
+ Integer num1=0;
+ Integer num2=0;
+ Integer num3=0;
+ Integer num4=0;
+ TjChartVo chartVo=new TjChartVo();
+ chartVo.setDeptId(deptId);
+ chartVo.setDeptName(deptService.getById(deptId).getDeptName());
+ for (TjOrderRemark tjOrderRemark : remarkList1) {
+ if (tjOrderRemark.getType()==1){
+ num1+=1;
+ }else if (tjOrderRemark.getType()==0){
+ num1+=1;
+ }else if (tjOrderRemark.getType()==3){
+ num1+=1;
+ }else if (tjOrderRemark.getType()==2){
+ num1+=1;
+ }
+ }
+ chartVo.setYijianNum(String.valueOf(num1));
+ chartVo.setWeijianNum(String.valueOf(num2));
+ chartVo.setYanqiNum(String.valueOf(num3));
+ chartVo.setQijianNum(String.valueOf(num4));
+ res.add(chartVo);
+ }
+ return AjaxResult.success(res);
+ }
+
+
+ @GetMapping("/getTiaoByDeptId")
+ @ApiOperation("鏍规嵁閮ㄩ棬鍜屾椂闂存鏌ヨ浣撴缁熻鍥捐〃")
+ public AjaxResult getTiaoByDeptId(@RequestParam Long deptId,
+ @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
+
+ return AjaxResult.success();
+ }
+
+ @GetMapping("/getTiaoNumsByDate")
+ @ApiOperation("鏍规嵁鏃堕棿鏌ヨ浣撴缁熻鍥捐〃")
+ public AjaxResult getTiaoNumsByDate(@ApiParam(value = "寮�濮嬫椂闂�")String beginTime,
+ @ApiParam(value = "缁撴潫鏃堕棿") String endTime) {
+ TjChartVo chartVo=new TjChartVo();
+ LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
+ wqq.gt(TjOrder::getStatus,200);
+ if (null != beginTime && null != endTime) {
+ wqq.between(TjOrder::getCreateTime, beginTime, endTime);
+ }
+ final List<TjOrder> list = orderService.list(wqq);
+ chartVo.setTijianNum(list.size());
+
+ Integer boys=0;
+ Integer girls=0;
+ Integer person=0;
+ Integer tuan=0;
+ BigDecimal shouyi=new BigDecimal(0);
+ for (TjOrder tjOrder : list) {
+ final TjCustomer byId = customerService.getById(tjOrder.getUserId());
+ if (byId.getCusSex()==0){
+ boys+=1;
+ }else if (byId.getCusSex()==1){
+ girls+=1;
+ }
+
+ if ("2".equals(tjOrder.getTjType())){
+ person+=1;
+ } else if ("1".equals(tjOrder.getTjType())) {
+ tuan+=1;
+ }
+ //璁＄畻鏀剁泭
+ LambdaQueryWrapper<TjFlowingWater> wqqq=new LambdaQueryWrapper<>();
+ wqqq.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
+ final List<TjFlowingWater> list1 = tjFlowingWaterService.list(wqqq);
+ for (TjFlowingWater tjFlowingWater : list1) {
+ shouyi.add(tjFlowingWater.getPaidIn());
+ }
+ }
+ chartVo.setBoysNum(boys);
+ chartVo.setGirlsNum(girls);
+ chartVo.setPersonNum(person);
+ chartVo.setTuanDuiNum(tuan);
+ chartVo.setMoneysNum(shouyi);
+ return AjaxResult.success(chartVo);
+ }
+
+
+ @GetMapping("/getListByTjNumber")
+ @ApiOperation("鏍规嵁浣撴鍙蜂笅鐨勯」鐩垪琛�")
+ public AjaxResult getListByTjNumber(@RequestParam String tjNumber) {
+ LambdaQueryWrapper<TjOrderRemark> wq0 = new LambdaQueryWrapper<>();
+ wq0.eq(TjOrderRemark::getTjNumber, tjNumber);
+ List<TjOrderRemark> remarkList = remarkService.list(wq0);
+ return AjaxResult.success(remarkList);
+ }
+
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java
index 0a31a41..dae3db5 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java
@@ -154,6 +154,17 @@
@Log(title = "浼氳瘖鐢宠璁板綍 ", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TjHzLog tjHzLog) {
+ if (tjHzLog.getHzDeptIdList() != null) {
+ StringBuilder str = new StringBuilder();
+ for (int i = 0; i < tjHzLog.getHzDeptIdList().size(); i++) {
+
+ str = str.append(tjHzLog.getHzDeptIdList().get(i));
+ if (i != tjHzLog.getHzDeptIdList().size() - 1) {
+ str = str.append(",");
+ }
+ }
+ tjHzLog.setHzDeptId(String.valueOf(str));
+ }
return toAjax(tjHzLogService.saveOrUpdate(tjHzLog));
}
@@ -161,8 +172,8 @@
* 鍒犻櫎浼氳瘖鐢宠璁板綍
*/
@Log(title = "浼氳瘖鐢宠璁板綍 ", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids) {
+ @DeleteMapping("/remove")
+ public AjaxResult remove(@RequestBody Long[] ids) {
return toAjax(tjHzLogService.removeByIds(Arrays.asList(ids)));
}
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 57e16e9..7a3e8f8 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -204,13 +204,13 @@
#key-path: E:\mycode\apppwd\1643225121_20230427_cert\apiclient_cert.p12 #鏈湴璇佷功璺緞锛屽湪寰俊鍟嗘埛鍚庡彴涓嬭浇
key-path: D:\WXCertUtil\tjcert\apiclient_cert.p12 #鏈嶅姟鍣ㄨ瘉涔﹁矾寰勶紝鍦ㄥ井淇″晢鎴峰悗鍙颁笅杞�
# pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
- pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
-# pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+# pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+ pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
#绉湪鎶ヨ〃璁块棶鍦板潃
jimu:
- path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
-# path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
+# path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
+ path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
# path: http://192.168.0.99:8080/ltkj-admin
# path: http://192.168.0.99:8081/ltkj-admin
# path: http://192.168.0.101:5011
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
index 0d0dd11..0b9696a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
@@ -413,6 +413,12 @@
@ApiModelProperty(value = "鏈夋棤浼氳瘖")
private Integer isHz;
+ /**
+ * 鎶ュ憡棰嗗彇鏂瑰紡
+ */
+ @ApiModelProperty(value = "鎶ュ憡棰嗗彇鏂瑰紡")
+ private String getType;
+
@Override
public String toString() {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/TjChartVo.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/TjChartVo.java
new file mode 100644
index 0000000..d91aa56
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/TjChartVo.java
@@ -0,0 +1,29 @@
+package com.ltkj.hosp.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
+ * @Author: lige
+ * @Date: 2023/11/30 15:38
+ */
+@Data
+public class TjChartVo {
+
+ private Long deptId; //閮ㄩ棬鍙�
+ private String deptName; //閮ㄩ棬鍚�
+ private String yijianNum; //宸叉浜烘暟
+ private String weijianNum; //鏈浜烘暟
+ private String yanqiNum; //寤舵湡浜烘暟
+ private String qijianNum; //寮冩浜烘暟
+
+
+ private Integer tijianNum; //浣撴浜烘暟
+ private Integer boysNum; //鐢蜂汉鏁�
+ private Integer girlsNum; //濂充汉鏁�
+ private BigDecimal moneysNum; //鏀跺叆
+ private Integer personNum; //涓
+ private Integer tuanDuiNum; //鍥㈤槦
+}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjDiscardInspectionMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjDiscardInspectionMapper.xml
index df4f4ef..4255612 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjDiscardInspectionMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjDiscardInspectionMapper.xml
@@ -5,148 +5,162 @@
<mapper namespace="com.ltkj.hosp.mapper.TjDiscardInspectionMapper">
<resultMap type="TjDiscardInspection" id="TjDiscardInspectionResult">
- <result property="id" column="id"/>
- <result property="deleted" column="deleted"/>
- <result property="createBy" column="create_by"/>
- <result property="createTime" column="create_time"/>
- <result property="updateBy" column="update_by"/>
- <result property="updateTime" column="update_time"/>
- <result property="tjNum" column="tj_num"/>
- <result property="cusId" column="cus_id"/>
- <result property="cusName" column="cus_name"/>
- <result property="registrationTime" column="registration_time"/>
- <result property="proId" column="pro_id"/>
- <result property="proName" column="pro_name"/>
+ <result property="id" column="id"/>
+ <result property="deleted" column="deleted"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="tjNum" column="tj_num"/>
+ <result property="cusId" column="cus_id"/>
+ <result property="cusName" column="cus_name"/>
+ <result property="registrationTime" column="registration_time"/>
+ <result property="proId" column="pro_id"/>
+ <result property="proName" column="pro_name"/>
</resultMap>
<sql id="selectTjDiscardInspectionVo">
- select id, deleted, create_by, create_time, update_by, update_time, tj_num, cus_id, cus_name, registration_time, pro_id, pro_name
+ select id,
+ deleted,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ tj_num,
+ cus_id,
+ cus_name,
+ registration_time,
+ pro_id,
+ pro_name
from tj_discard_inspection
</sql>
- <select id="selectTjDiscardInspectionList" parameterType="TjDiscardInspection" resultMap="TjDiscardInspectionResult">
+ <select id="selectTjDiscardInspectionList" parameterType="TjDiscardInspection"
+ resultMap="TjDiscardInspectionResult">
<include refid="selectTjDiscardInspectionVo"/>
<where>
- <if test="tjNum != null and tjNum != ''">
- and tj_num = #{tjNum}
- </if>
- <if test="cusName != null and cusName != ''">
- and cus_name like concat('%', #{cusName}, '%')
- </if>
- <if test="registrationTime != null ">
- and registration_time = #{registrationTime}
- </if>
- <if test="proName != null and proName != ''">
- and pro_name like concat('%', #{proName}, '%')
- </if>
+ <if test="tjNum != null and tjNum != ''">
+ and tj_num = #{tjNum}
+ </if>
+ <if test="cusName != null and cusName != ''">
+ and cus_name like concat('%', #{cusName}, '%')
+ </if>
+ <if test="registrationTime != null ">
+ and registration_time = #{registrationTime}
+ </if>
+ <if test="proName != null and proName != ''">
+ and pro_name like concat('%', #{proName}, '%')
+ </if>
+ and deleted=0
</where>
</select>
<select id="selectTjDiscardInspectionById" parameterType="Long"
resultMap="TjDiscardInspectionResult">
- <include refid="selectTjDiscardInspectionVo"/>
- where id = #{id}
+ <include refid="selectTjDiscardInspectionVo"/>
+ where id = #{id}
</select>
<insert id="insertTjDiscardInspection" parameterType="TjDiscardInspection">
insert into tj_discard_inspection
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,
- </if>
- <if test="deleted != null">deleted,
- </if>
- <if test="createBy != null">create_by,
- </if>
- <if test="createTime != null">create_time,
- </if>
- <if test="updateBy != null">update_by,
- </if>
- <if test="updateTime != null">update_time,
- </if>
- <if test="tjNum != null">tj_num,
- </if>
- <if test="cusId != null">cus_id,
- </if>
- <if test="cusName != null">cus_name,
- </if>
- <if test="registrationTime != null">registration_time,
- </if>
- <if test="proId != null">pro_id,
- </if>
- <if test="proName != null">pro_name,
- </if>
+ <if test="id != null">id,
+ </if>
+ <if test="deleted != null">deleted,
+ </if>
+ <if test="createBy != null">create_by,
+ </if>
+ <if test="createTime != null">create_time,
+ </if>
+ <if test="updateBy != null">update_by,
+ </if>
+ <if test="updateTime != null">update_time,
+ </if>
+ <if test="tjNum != null">tj_num,
+ </if>
+ <if test="cusId != null">cus_id,
+ </if>
+ <if test="cusName != null">cus_name,
+ </if>
+ <if test="registrationTime != null">registration_time,
+ </if>
+ <if test="proId != null">pro_id,
+ </if>
+ <if test="proName != null">pro_name,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id},
- </if>
- <if test="deleted != null">#{deleted},
- </if>
- <if test="createBy != null">#{createBy},
- </if>
- <if test="createTime != null">#{createTime},
- </if>
- <if test="updateBy != null">#{updateBy},
- </if>
- <if test="updateTime != null">#{updateTime},
- </if>
- <if test="tjNum != null">#{tjNum},
- </if>
- <if test="cusId != null">#{cusId},
- </if>
- <if test="cusName != null">#{cusName},
- </if>
- <if test="registrationTime != null">#{registrationTime},
- </if>
- <if test="proId != null">#{proId},
- </if>
- <if test="proName != null">#{proName},
- </if>
+ <if test="id != null">#{id},
+ </if>
+ <if test="deleted != null">#{deleted},
+ </if>
+ <if test="createBy != null">#{createBy},
+ </if>
+ <if test="createTime != null">#{createTime},
+ </if>
+ <if test="updateBy != null">#{updateBy},
+ </if>
+ <if test="updateTime != null">#{updateTime},
+ </if>
+ <if test="tjNum != null">#{tjNum},
+ </if>
+ <if test="cusId != null">#{cusId},
+ </if>
+ <if test="cusName != null">#{cusName},
+ </if>
+ <if test="registrationTime != null">#{registrationTime},
+ </if>
+ <if test="proId != null">#{proId},
+ </if>
+ <if test="proName != null">#{proName},
+ </if>
</trim>
</insert>
<update id="updateTjDiscardInspection" parameterType="TjDiscardInspection">
update tj_discard_inspection
<trim prefix="SET" suffixOverrides=",">
- <if test="deleted != null">deleted =
- #{deleted},
- </if>
- <if test="createBy != null">create_by =
- #{createBy},
- </if>
- <if test="createTime != null">create_time =
- #{createTime},
- </if>
- <if test="updateBy != null">update_by =
- #{updateBy},
- </if>
- <if test="updateTime != null">update_time =
- #{updateTime},
- </if>
- <if test="tjNum != null">tj_num =
- #{tjNum},
- </if>
- <if test="cusId != null">cus_id =
- #{cusId},
- </if>
- <if test="cusName != null">cus_name =
- #{cusName},
- </if>
- <if test="registrationTime != null">registration_time =
- #{registrationTime},
- </if>
- <if test="proId != null">pro_id =
- #{proId},
- </if>
- <if test="proName != null">pro_name =
- #{proName},
- </if>
+ <if test="deleted != null">deleted =
+ #{deleted},
+ </if>
+ <if test="createBy != null">create_by =
+ #{createBy},
+ </if>
+ <if test="createTime != null">create_time =
+ #{createTime},
+ </if>
+ <if test="updateBy != null">update_by =
+ #{updateBy},
+ </if>
+ <if test="updateTime != null">update_time =
+ #{updateTime},
+ </if>
+ <if test="tjNum != null">tj_num =
+ #{tjNum},
+ </if>
+ <if test="cusId != null">cus_id =
+ #{cusId},
+ </if>
+ <if test="cusName != null">cus_name =
+ #{cusName},
+ </if>
+ <if test="registrationTime != null">registration_time =
+ #{registrationTime},
+ </if>
+ <if test="proId != null">pro_id =
+ #{proId},
+ </if>
+ <if test="proName != null">pro_name =
+ #{proName},
+ </if>
</trim>
where id = #{id}
</update>
<delete id="deleteTjDiscardInspectionById" parameterType="Long">
delete
- from tj_discard_inspection where id = #{id}
+ from tj_discard_inspection
+ where id = #{id}
</delete>
<delete id="deleteTjDiscardInspectionByIds" parameterType="String">
diff --git a/ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml b/ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml
index 469b2ca..a14de93 100644
--- a/ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml
@@ -43,6 +43,7 @@
<result property="giftReceiveTime" column="gift_receive_time"/>
<result property="deptId" column="dept_id"/>
<result property="isSz" column="is_sz"/>
+ <result property="getType" column="get_type"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
@@ -75,6 +76,7 @@
<result property="updateTime" column="sub_update_time"/>
<result property="updateBy" column="sub_update_by"/>
<result property="deleted" column="sub_deleted"/>
+ <result property="getType" column="get_type"/>
</resultMap>
<sql id="selectMallOrderVo">
@@ -121,7 +123,8 @@
update_time,
update_by,
deleted,
- id_card
+ id_card,
+ get_type
from mall_order
</sql>
@@ -236,6 +239,9 @@
<if test="startTime != null and endTime !=null ">
and create_time between #{startTime} and #{endTime}
</if>
+ <if test="getType != null ">
+ and get_type = #{getType}
+ </if>
</where>
order by update_time desc
</select>
@@ -285,6 +291,7 @@
a.update_time,
a.update_by,
a.deleted,
+ a.get_type,
b.id as
sub_id,
b.order_id as
--
Gitblit v1.8.0