From 481ad6dfcad7bc346db4bc1abcdf24d5134b301b Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期一, 19 八月 2024 17:23:18 +0800
Subject: [PATCH] order manage
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrOrderMapper.java | 16 +++++
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrderItem.java | 12 ++-
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java | 2
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java | 15 +++-
pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml | 92 ++++++++++++++++++++++++++++++
pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml | 32 +++++++++-
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrOrderItemMapper.java | 3 +
7 files changed, 157 insertions(+), 15 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrOrderItemMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrOrderItemMapper.java
index 0cac5ce..0842ed5 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrOrderItemMapper.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrOrderItemMapper.java
@@ -1,5 +1,6 @@
package com.dy.pmsGlobal.daoPr;
+import com.dy.pmsGlobal.pojoPlt.PltProductParams;
import com.dy.pmsGlobal.pojoPr.PrOrderItem;
import org.apache.ibatis.annotations.Mapper;
@@ -14,6 +15,8 @@
int deleteByPrimaryKey(Long id);
+ int insert(PrOrderItem record);
+
int insertSelective(PrOrderItem record);
PrOrderItem selectByPrimaryKey(Long id);
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrOrderMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrOrderMapper.java
index 6c985b2..86c2365 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrOrderMapper.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrOrderMapper.java
@@ -1,7 +1,12 @@
package com.dy.pmsGlobal.daoPr;
+import com.dy.pmsGlobal.pojoPlt.PltProduct;
import com.dy.pmsGlobal.pojoPr.PrOrder;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
/**
* @author User
@@ -14,10 +19,19 @@
int deleteByPrimaryKey(Long id);
+ int deleteLogicById(Long id);
+
int insertSelective(PrOrder record);
PrOrder selectByPrimaryKey(Long id);
- int updateByPrimaryKeySelective(PrOrder record);
+ Long selectSomeCount(Map<String, Object> params);
+ List<PrOrder> selectSome(Map<String, Object> params);
+
+ List<PrOrder> selectAll(Map<String, Object> params);
+
+ boolean exists(@Param("name") String name, @Param("id") Long id);
+
+ int updateByPrimaryKeySelective(PrOrder record);
}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java
index 81f9282..bee749a 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java
@@ -2,15 +2,18 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
-import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.*;
import java.util.Date;
+import java.util.List;
/**
*
@@ -25,14 +28,15 @@
public class PrOrder implements BaseEntity {
/**
- *
+ * 涓婚敭
*/
- @NotNull(message="涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(value = "id", type = IdType.INPUT)
public Long id;
/**
* 鍚嶇О
*/
+ @NotEmpty(message = "鍚嶇О涓嶈兘涓虹┖")
public String name;
/**
* 瀹㈡埛鍚嶇О
@@ -65,11 +69,14 @@
/**
* 鏄惁鍒犻櫎锛�1鏄紝0鍚�
*/
- public Integer deleted;
+ @JSONField(serialize = false)
+ public Boolean deleted;
/**
* 澶囨敞
*/
public String remark;
+ @NotNull(message = "璁㈠崟椤逛笉鑳戒负绌�")
+ public List<PrOrderItem> items;
}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrderItem.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrderItem.java
index a57d92d..775227c 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrderItem.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrderItem.java
@@ -8,9 +8,6 @@
import jakarta.validation.constraints.NotNull;
import lombok.*;
-
-
-
/**
*
* @TableName pr_order_item
@@ -26,7 +23,6 @@
/**
* 缂栧彿
*/
- @NotNull(message="缂栧彿涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long id;
/**
@@ -34,6 +30,12 @@
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long orderId;
+ /**
+ * 浜у搧瀹炰綋缂栧彿
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long proId;
+
/**
* 鐢熶骇鏁伴噺
*/
@@ -43,5 +45,7 @@
*/
public Integer completeNumber;
+ @JSONField(serialize = false)
+ public Boolean deleted;
}
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml
index 20fbc9f..0332664 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml
@@ -7,13 +7,15 @@
<resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoPr.PrOrderItem">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="orderId" column="order_id" jdbcType="BIGINT"/>
+ <result property="proId" column="pro_id" jdbcType="BIGINT"/>
<result property="number" column="number" jdbcType="INTEGER"/>
<result property="completeNumber" column="complete_number" jdbcType="INTEGER"/>
+ <result column="deleted" property="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
</resultMap>
<sql id="Base_Column_List">
- id,order_id,number,
- complete_number
+ id,order_id,pro_id,number,
+ complete_number, deleted
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -22,24 +24,42 @@
from pr_order_item
where id = #{id,jdbcType=BIGINT}
</select>
-
+ <select id="selectItems" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from pr_order_item
+ where order_id = #{orderId,jdbcType=BIGINT} and deleted !=1
+ </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from pr_order_item
where id = #{id,jdbcType=BIGINT}
</delete>
+ <insert id="insert" parameterType="com.dy.pmsGlobal.pojoPr.PrOrderItem">
+ <!--@mbg.generated-->
+ insert into pr_order_item ( id,order_id,pro_id,number,
+ complete_number, deleted
+ )
+ values (#{id,jdbcType=BIGINT},#{orderId,jdbcType=BIGINT}, #{proId,jdbcType=BIGINT}, #{number,jdbcType=INTEGER},
+ #{completeNumber,jdbcType=INTEGER}, #{deleted,jdbcType=TINYINT}
+ )
+ </insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrOrderItem" useGeneratedKeys="true">
insert into pr_order_item
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="orderId != null">order_id,</if>
+ <if test="proId != null">pro_id,</if>
<if test="number != null">number,</if>
<if test="completeNumber != null">complete_number,</if>
+ <if test="deleted != null">deleted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="orderId != null">#{orderId,jdbcType=BIGINT},</if>
+ <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
<if test="number != null">#{number,jdbcType=INTEGER},</if>
<if test="completeNumber != null">#{completeNumber,jdbcType=INTEGER},</if>
+ <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrOrderItem">
@@ -48,12 +68,18 @@
<if test="orderId != null">
order_id = #{orderId,jdbcType=BIGINT},
</if>
+ <if test="proId != null">
+ pro_id = #{proId,jdbcType=BIGINT},
+ </if>
<if test="number != null">
number = #{number,jdbcType=INTEGER},
</if>
<if test="completeNumber != null">
complete_number = #{completeNumber,jdbcType=INTEGER},
</if>
+ <if test="deleted != null">
+ deleted = #{deleted,jdbcType=TINYINT},
+ </if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
index b4ca8d5..b6914cc 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
@@ -17,7 +17,9 @@
<result property="deleted" column="deleted" jdbcType="TINYINT"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
</resultMap>
-
+ <resultMap id="BaseResultMap2" type="com.dy.pmsGlobal.pojoPr.PrOrder" extends="BaseResultMap">
+ <collection property="items" ofType="com.dy.pmsGlobal.pojoPr.PrOrderItem" fetchType="eager" select="selectItems" column="id" />
+ </resultMap>
<sql id="Base_Column_List">
id,name,customer_name,
director,d_mobile,delivery_date,
@@ -32,10 +34,98 @@
where id = #{id,jdbcType=BIGINT}
</select>
+ <select id="exists" resultType="java.lang.Boolean">
+ select count(1) from pr_order where name = #{name}
+ <if test="id != null">
+ and id != #{id}
+ </if>
+ </select>
+
+ <select id="selectSome" resultMap="BaseResultMap2">
+ select
+ <include refid="Base_Column_List" />
+ from pr_order p
+ where p.deleted!=1
+ <trim prefix="and " suffixOverrides="and">
+ <if test="name != null and name != ''">
+ name like concat('%', #{name}, '%') and
+ </if>
+ <if test="customerName != null and customerName != ''">
+ customer_name like concat('%', #{customerName}, '%') and
+ </if>
+ <if test="director != null and director != ''">
+ director like concat('%', #{director}, '%') and
+ </if>
+ <if test="startTime != null">
+ and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
+ </if>
+ <if test="endTime != null">
+ and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
+ </if>
+ </trim>
+ order by id desc
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start}, #{count}
+ </if>
+ </trim>
+ </select>
+
+ <select id="selectSomeCount" resultType="java.lang.Long">
+ select count(1)
+ from pr_order p
+ where p.deleted!=1
+ <trim prefix="and " suffixOverrides="and">
+ <if test="name != null and name != ''">
+ name like concat('%', #{name}, '%') and
+ </if>
+ <if test="customerName != null and customerName != ''">
+ customer_name like concat('%', #{customerName}, '%') and
+ </if>
+ <if test="director != null and director != ''">
+ director like concat('%', #{director}, '%') and
+ </if>
+ <if test="startTime != null">
+ and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
+ </if>
+ <if test="endTime != null">
+ and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
+ </if>
+ </trim>
+ </select>
+ <select id="selectAll" resultType="com.dy.pmsGlobal.pojoPr.PrOrder">
+ select
+ <include refid="Base_Column_List" />
+ from pr_order p
+ where p.deleted!=1
+ <trim prefix="and " suffixOverrides="and">
+ <if test="name != null and name != ''">
+ name like concat('%', #{name}, '%') and
+ </if>
+ <if test="customerName != null and customerName != ''">
+ customer_name like concat('%', #{customerName}, '%') and
+ </if>
+ <if test="director != null and director != ''">
+ director like concat('%', #{director}, '%') and
+ </if>
+ <if test="startTime != null">
+ and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
+ </if>
+ <if test="endTime != null">
+ and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
+ </if>
+ </trim>
+ order by id desc
+ </select>
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from pr_order
where id = #{id,jdbcType=BIGINT}
</delete>
+ <update id="deleteLogicById" parameterType="java.lang.Long">
+ update pr_order set deleted = 1
+ where id = #{id}
+ </update>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrOrder" useGeneratedKeys="true">
insert into pr_order
<trim prefix="(" suffix=")" suffixOverrides=",">
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
index 871085b..7d13209 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
@@ -98,6 +98,4 @@
Date date = Date.from(dt.atZone(ZoneId.systemDefault()).toInstant());
return date;
}
-
-
}
--
Gitblit v1.8.0