From c3ce93719730b885be0f9452a46090c0d3979f9f Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期三, 13 三月 2024 14:04:00 +0800
Subject: [PATCH] 检验下单 功能调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 9 +++
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 38 ++++++++++--
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 64 ++++-----------------
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 21 ++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 18 ++++++
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java | 9 +++
6 files changed, 100 insertions(+), 59 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index 2612e99..1449e17 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -22,12 +22,29 @@
private InsOrderService insOrderService;
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
- @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗�")
+ @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/selectInsOrderParameter")
public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
- System.out.println(1);
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
InsOrder itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrder.class);
return Result.success(insOrderService.selectInsOrderParameter(page, itemParameter));
}
+
+ @ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
+ @PostMapping("/addInsOrderParameter")
+ public Result addInsOrderParameter(@RequestBody InsOrder itemParameter) {
+ return Result.success(insOrderService.addInsOrderParameter(itemParameter));
+ }
+
+ @ApiOperation(value = "鍒犻櫎妫�楠屼笅鍗曟暟鎹�")
+ @PostMapping("/delInsOrderParameter")
+ public Result<?> delInsOrderParameter(Integer id) {
+ return Result.success(insOrderService.delInsOrderParameter(id));
+ }
+
+ @ApiOperation(value = "淇敼妫�楠屼笅鍗曟暟鎹�")
+ @PostMapping("/upInsOrderParameter")
+ public Result<?> upInsOrderParameter(@RequestBody InsOrder itemParameter) {
+ return Result.success(insOrderService.upInsOrderParameter(itemParameter));
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
index 908c596..e3d055d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
@@ -20,6 +20,15 @@
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
IPage<InsOrder> selectInsOrderParameter(IPage<InsOrder> page, QueryWrapper<InsOrder> ew);
+
+ //娣诲姞妫�楠屼笅鍗曟暟鎹�
+ int addInsOrderParameter(InsOrder itemParameter);
+
+ //鍒犻櫎妫�楠屼笅鍗曟暟鎹�
+ int delInsOrderParameter(Integer id);
+
+ //淇敼妫�楠屼笅鍗曟暟鎹�
+ int upInsOrderParameter(InsOrder itemParameter);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
index 0b20821..b1ce9bc 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
@@ -45,63 +45,25 @@
@ApiModelProperty(value = "鏍峰搧绫诲瀷")
private String smapleType;
- /**
- * 鏍峰搧鍚嶇О
- */
- @ValueTableShow(4)
- @ApiModelProperty(value = "鏍峰搧鍚嶇О")
- private String sample;
-
- /**
- * 濮旀墭鍏徃
- */
- @ValueTableShow(5)
- @ApiModelProperty(value = "濮旀墭鍏徃")
- private String entrustCompany;
-
- /**
- * 濮旀墭浜�
- */
- @ValueTableShow(6)
- @ApiModelProperty(value = "濮旀墭浜�")
- private String client;
-
- /**
- * 鍒跺崟鏃堕棿
- */
- @ValueTableShow(7)
- @ApiModelProperty("鍒跺崟鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime documentPreparation;
-
- /**
- * 濮旀墭鏃堕棿
- */
- @ValueTableShow(8)
- @ApiModelProperty("濮旀墭鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime entrustmentTime;
/**
* 鏍峰搧鏁伴噺
*/
- @ValueTableShow(9)
+ @ValueTableShow(4)
@ApiModelProperty(value = "鏍峰搧鏁伴噺")
private Double sampleNum;
/**
* 绱ф�ョ▼搴�
*/
- @ValueTableShow(10)
+ @ValueTableShow(5)
@ApiModelProperty(value = "绱ф�ョ▼搴�")
private Integer type;
/**
* 绾﹀畾鏃堕棿
*/
- @ValueTableShow(11)
+ @ValueTableShow(6)
@ApiModelProperty(value = "绾﹀畾鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -110,56 +72,56 @@
/**
* 妫�娴嬭繘搴�
*/
- @ValueTableShow(12)
+ @ValueTableShow(7)
@ApiModelProperty(value = "妫�娴嬭繘搴�")
private String insProgress;
/**
- * 妫�娴嬬粨鏋�
- */
- @ValueTableShow(13)
- @ApiModelProperty(value = "妫�娴嬬粨鏋�")
- private String detectionResult;
-
- /**
* 涓嬪崟瀹㈡埛
*/
+ @ValueTableShow(8)
@ApiModelProperty(value = "涓嬪崟瀹㈡埛")
private String custom;
/**
* 涓嬪崟鍗曚綅
*/
+ @ValueTableShow(9)
@ApiModelProperty(value = "涓嬪崟鍗曚綅")
private String company;
/**
* 宸ュ巶鍩�
*/
+ @ValueTableShow(10)
@ApiModelProperty(value = "宸ュ巶鍩�")
private String code;
/**
* 瀹為獙瀹ゅ悕绉�
*/
+ @ValueTableShow(11)
@ApiModelProperty(value = "瀹為獙瀹ゅ悕绉�")
private String laboratory;
/**
* 瑙勬牸鍨嬪彿
*/
+ @ValueTableShow(12)
@ApiModelProperty(value = "瑙勬牸鍨嬪彿")
private String model;
/**
* 鏄惁鐣欐牱
*/
+ @ValueTableShow(13)
@ApiModelProperty(value = "鏄惁鐣欐牱")
private Integer isLeave;
/**
* 鐣欐牱鏁伴噺
*/
+ @ValueTableShow(14)
@ApiModelProperty(value = "鐣欐牱鏁伴噺")
private Integer leaveNum;
@@ -178,7 +140,7 @@
*/
private String otcCode;
- @ApiModelProperty("")
+ @ApiModelProperty("鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
/**
@@ -191,7 +153,7 @@
/**
*
*/
- @ApiModelProperty("")
+ @ApiModelProperty("淇敼浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
/**
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
index 5dc638c..937e818 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
@@ -20,4 +20,13 @@
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, InsOrder itemParameter);
+ //娣诲姞妫�楠屼笅鍗曟暟鎹�
+ int addInsOrderParameter(InsOrder itemParameter);
+
+ //鍒犻櫎妫�楠屼笅鍗曟暟鎹�
+ int delInsOrderParameter(Integer id);
+
+ //淇敼妫�楠屼笅鍗曟暟鎹�
+ int upInsOrderParameter(InsOrder itemParameter);
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index c103623..6dcaf57 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -45,6 +45,24 @@
map.put("body", insOrderMapper.selectPage(page, QueryWrappers.queryWrappers(itemParameter)));
return map;
}
+
+ //娣诲姞妫�楠屼笅鍗曟暟鎹�
+ @Override
+ public int addInsOrderParameter(InsOrder itemParameter) {
+ return insOrderMapper.insert(itemParameter);
+ }
+
+ //鍒犻櫎妫�楠屼笅鍗曟暟鎹�
+ @Override
+ public int delInsOrderParameter(Integer id) {
+ return insOrderMapper.deleteById(id);
+ }
+
+ //淇敼妫�楠屼笅鍗曟暟鎹�
+ @Override
+ public int upInsOrderParameter(InsOrder itemParameter) {
+ return insOrderMapper.updateById(itemParameter);
+ }
}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index b3c76f0..66b992d 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -104,12 +104,7 @@
create_user,
create_time,
update_user,
- update_time,
- entrust_Company,
- client,
- document_Preparation,
- entrustment_Time,
- detection_Result
+ update_time
from ins_order
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
@@ -117,4 +112,35 @@
</if>
</select>
+ <update id="upInsOrderParameter" parameterType="com.yuanchu.mom.pojo.InsOrder">
+ UPDATE ins_order
+ <set>
+ <if test="entrustCode!=null and entrustCode!='' ">entrust_code=#{entrustCode},</if>
+ <if test="sample_Code!=null ">sample_code=#{sampleCode},</if>
+ <if test="custom!=null ">custom=#{custom},</if>
+ <if test="company!=null ">company=#{company}</if>
+ <if test="code!=null ">code=#{code}</if>
+ <if test="type!=null ">type=#{type}</if>
+ <if test="appointedTime!=null ">appointed_time=#{appointedTime}</if>
+ <if test="laboratory!=null ">laboratory=#{laboratory}</if>
+ <if test="smapleType!=null ">smaple_type=#{smapleType}</if>
+ <if test="model!=null ">model=#{model}</if>
+ <if test="sample!=null ">sample=#{sample}</if>
+ <if test="sampleNum!=null ">sample_num=#{sampleNum}</if>
+ <if test="isLeave!=null ">is_leave=#{isLeave}</if>
+ <if test="leaveNum!=null ">leave_num=#{leaveNum}</if>
+ <if test="insProgress!=null ">ins_progress=#{insProgress}</if>
+ <if test="state!=null ">state=#{state}</if>
+ <if test="remark!=null ">remark=#{remark}</if>
+ <if test="otcCode!=null ">otc_code=#{otcCode}</if>
+ <if test="createUser!=null ">create_user=#{createUser}</if>
+ <if test="createTime!=null ">create_time=#{createTime}</if>
+ <if test="updateUser!=null ">update_user=#{updateUser}</if>
+ <if test="updateTime!=null ">update_time=#{updateTime}</if>
+ </set>
+ <where>
+ id=#{id}
+ </where>
+ </update>
+
</mapper>
--
Gitblit v1.9.3