Merge remote-tracking branch 'origin/dev2.0' into dev2.0

src/main/java/com/glxp/api/entity/inv/DeptDeviceDetailEntity.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -147,12 +148,14 @@ public class DeptDeviceDetailEntity {
     /**
      * 添加时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(value = "createTime")
     private Date createTime;
 
     /**
      * 更新时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(value = "updateTime")
     private Date updateTime;
 

src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderRequest.java

@@ -4,6 +4,8 @@ package com.glxp.api.req.inv;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 设备领用记录相关参数
  */
@@ -54,5 +56,7 @@ public class FilterDeviceReceiveOrderRequest extends ListPageRequest {
 
     private String receiveUserName;
 
+    private List<Integer> statusList;
+
 
 }

src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailServiceImpl.java

@@ -59,7 +59,6 @@ public class DeptDeviceDetailServiceImpl implements DeptDeviceDetailService {
         for (DeviceReceiveOrderDetailResponse receiveOrderDetailResponse : deviceReceiveOrderDetailResponses) {
             //查询此编码的产品是否已经在科室设备明细中
             Long count = deptDeviceDetailDao.selectCount(new QueryWrapper<DeptDeviceDetailEntity>().eq("deptCode", receiveOrderEntity.getFromDeptCode())
-                    .eq("invCode", receiveOrderEntity.getInvCode())
                     .eq("code", receiveOrderDetailResponse.getCode())
             );
             if (count == 0) {
@@ -84,8 +83,8 @@ public class DeptDeviceDetailServiceImpl implements DeptDeviceDetailService {
                 deviceDetail.setStatus(1);
                 deviceDetail.setAddType(1);
                 deviceDetail.setCreateUser(receiveOrderEntity.getAuditUser());
-                deviceDetail.setCreateTime(date);
+//                deviceDetail.setCreateTime(date);
-                deviceDetail.setUpdateTime(date);
+//                deviceDetail.setUpdateTime(date);
                 deptDeviceDetailDao.insert(deviceDetail);
             }
         }

src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml

@@ -41,6 +41,12 @@
             <if test="receiveUserName != null and receiveUserName != ''">
                 AND au.employeeName like concat('%', #{receiveUserName}, '%')
             </if>
+            <if test="statusList != null and statusList.size()>0">
+                AND dro.status in
+                <foreach close=")" collection="statusList" item="item" open="(" separator=", ">
+                    #{item,jdbcType=INTEGER}
+                </foreach>
+            </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND date_format(dro.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
             </if>