dev

src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeLog.java

@@ -3,6 +3,7 @@ package com.syjiaer.clinic.server.entity.charge;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
@@ -71,6 +72,7 @@ public class ChargeLog implements Serializable {
     private String dockerName;
 
     @ApiModelProperty("收费时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime chargeTime;
 
     @ApiModelProperty("收费项目 code 零售单code或其他表code")

src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryLogQuery.java

@@ -11,7 +11,7 @@ public class InventoryLogQuery {
     private Integer pageNum;
     private Integer pageSize;
     private Integer uploadStatus;
-    private Integer type;
+    private Integer socialType;
     private LocalDateTime createTimeBefore;
     private LocalDateTime createTimeAfter;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryPurchaseLogQuery.java

@@ -9,5 +9,5 @@ public class InventoryPurchaseLogQuery {
     private Integer pageNum;
     private Integer pageSize;
     private Integer uploadStatus;
-    private Integer type;
+    private Integer socialType;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/dto/RetailInventoryQuery.java

@@ -8,6 +8,7 @@ import lombok.Setter;
 public class RetailInventoryQuery {
     private Integer pageNum;
     private Integer pageSize;
+    private String code;
     private Integer uploadStatus;
-    private Integer type;
+    private Integer socialType;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryInitVo.java

@@ -9,6 +9,7 @@ import lombok.ToString;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -36,7 +37,7 @@ public class SocialInventoryInitVo implements Serializable {
 
     private Integer wholeNumber;
 
-    private Date createDate;
+    private LocalDate createDate;
 
     private Integer uploadStatus;
 

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryLogVo.java

@@ -2,6 +2,7 @@ package com.syjiaer.clinic.server.entity.social.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -58,6 +59,12 @@ public class SocialInventoryLogVo implements Serializable {
 
     private LocalDateTime uploadDatetime;
 
+    private Integer type;
+
+    private Integer operateId;
+
+    private String operateName;
+
     private String name;
 
     private String packagingUnit;

src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java

@@ -713,6 +713,7 @@ public class ChargeService extends BaseService {
             chargeInventoryLog.setTrdnFlag(false);
             chargeInventoryLog.setUnit(dbGoods.getPackagingUnit());
             chargeInventoryLog.setNumber(log.getChangeWholeNumber());
+            chargeInventoryLog.setGoodsName(dbGoods.getName());
             if (log.getChangeFragmentNumber() != 0) {
                 chargeInventoryLog.setTrdnFlag(true);
                 chargeInventoryLog.setUnit(dbGoods.getMinPackagingUnit());

src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java

@@ -139,8 +139,8 @@ public class SocialInventoryUploadService extends BaseService {
         if (logQuery.getUploadStatus() != null && UploadStatusEnum.getByStatus(logQuery.getUploadStatus()) != null) {
             queryWrapper.eq("upload_status", logQuery.getUploadStatus());
         }
-        if (logQuery.getType() != null && InventorySocialTypeEnum.getByType(logQuery.getType()) != null) {
+        if (logQuery.getSocialType() != null && InventorySocialTypeEnum.getByType(logQuery.getSocialType()) != null) {
-            queryWrapper.eq("type", logQuery.getType());
+            queryWrapper.eq("social_type", logQuery.getSocialType());
         }
         if (logQuery.getCreateTimeBefore() != null) {
             queryWrapper.ge("create_time", logQuery.getCreateTimeBefore());
@@ -183,8 +183,8 @@ public class SocialInventoryUploadService extends BaseService {
         if (pLogQuery.getUploadStatus() != null && UploadStatusEnum.getByStatus(pLogQuery.getUploadStatus()) != null) {
             queryWrapper.eq("upload_status", pLogQuery.getUploadStatus());
         }
-        if (pLogQuery.getType() != null && InventorySocialTypeEnum.getByType(pLogQuery.getType()) != null) {
+        if (pLogQuery.getSocialType() != null && InventorySocialTypeEnum.getByType(pLogQuery.getSocialType()) != null) {
-            queryWrapper.eq("type", pLogQuery.getType());
+            queryWrapper.eq("social_type", pLogQuery.getSocialType());
         }
         Page<InventoryPurchaseLog> page = pageHelper(pLogQuery.getPageNum(), pLogQuery.getPageSize(), queryWrapper, inventoryPurchaseLogMapper, "id", false);
         List<SocialInventoryPurchaseLogVo> voList = new ArrayList<>();
@@ -416,11 +416,14 @@ public class SocialInventoryUploadService extends BaseService {
         if (rlQuery.getPageSize() == null || rlQuery.getPageSize() == 0) {
             rlQuery.setPageSize(Constants.DetailPageSize);
         }
+        if (rlQuery.getCode() != null && !rlQuery.getCode().isEmpty()){
+            queryWrapper.like("charge_order_code", rlQuery.getCode());
+        }
         if (rlQuery.getUploadStatus() != null && UploadStatusEnum.getByStatus(rlQuery.getUploadStatus()) != null) {
             queryWrapper.eq("upload_status", rlQuery.getUploadStatus());
         }
-        if (rlQuery.getType() != null && InventorySocialTypeEnum.getByType(rlQuery.getType()) != null) {
+        if (rlQuery.getSocialType() != null && InventorySocialTypeEnum.getByType(rlQuery.getSocialType()) != null) {
-            queryWrapper.eq("type", rlQuery.getType());
+            queryWrapper.eq("social_type", rlQuery.getSocialType());
         }
         Page<ChargeInventoryLog> chargeInventoryLogPage = pageHelper(rlQuery.getPageNum(), rlQuery.getPageSize(), queryWrapper, chargeInventoryLogMapper);