Переглянути джерело

药品临购功能审核优化

hsh 6 місяців тому
батько
коміт
21bce55191

+ 4 - 4
src/main/java/thyyxxk/webserver/entity/highreport/ReportBaseInfo.java

@@ -66,22 +66,22 @@ public class ReportBaseInfo implements Serializable {
     /**
      * 页面展示
      **/
-    @TableField("exist = false")
+    @TableField(exist = false)
     private List<TableDisplayInfo> tableDisplays;
     /**
      * 页面查询的数据结果
      **/
-    @TableField("exist = false")
+    @TableField(exist = false)
     private List<Map<String, Object>> dataList;
     /**
      * 页面合计
      **/
-    @TableField("exist = false")
+    @TableField(exist = false)
     private Map<String, Object> total;
     /**
      * 报表统计总览结果
      **/
-    @TableField("exist = false")
+    @TableField(exist = false)
     private String overview;
 
 }

+ 1 - 1
src/main/java/thyyxxk/webserver/entity/highreport/TableDisplayInfo.java

@@ -42,7 +42,7 @@ public class TableDisplayInfo {
     /**
      * 图表X,Y轴参数
      **/
-    @TableField("exist = false")
+    @TableField(exist = false)
     private List<XYBean> beans;
 
 }

+ 1 - 1
src/main/java/thyyxxk/webserver/entity/medicine/YpTempPurchase.java

@@ -48,7 +48,7 @@ public class YpTempPurchase implements Serializable {
     private String purchaseName; // 采购人
     private String storageId; // 入库人id
     private String storageName; // 入库人
-    @TableField("exist = false")
+    @TableField(exist = false)
     private String permissions; // 0: 修改权限; 1: 审核权限
 
 }

+ 2 - 2
src/main/java/thyyxxk/webserver/entity/targetmanagement/ZbZdBaseInfo.java

@@ -97,11 +97,11 @@ public class ZbZdBaseInfo {
     /**
      * 计算分子sql
      **/
-    @TableField("exist = false")
+    @TableField(exist = false)
     private String calcChild;
     /**
      * 计算分母sql
      **/
-    @TableField("exist = false")
+    @TableField(exist = false)
     private String calcMom;
 }

+ 6 - 1
src/main/java/thyyxxk/webserver/service/medicine/YpTempPurchaseService.java

@@ -1,5 +1,6 @@
 package thyyxxk.webserver.service.medicine;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -184,7 +185,10 @@ public class YpTempPurchaseService {
                     ypTempPurchase.setStorageId("");
                     ypTempPurchase.setStorageName("");
                 }
-                num = dao.updateYpTempPurchaseFlagByApplyId(ypTempPurchase);
+                UpdateWrapper<YpTempPurchase> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("apply_id", ypTempPurchase.getApplyId());
+                num = dao.update(ypTempPurchase, updateWrapper);
+//                num = dao.updateYpTempPurchaseFlagByApplyId(ypTempPurchase);
             } else {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "未查到临购药品审核信息!");
             }
@@ -194,6 +198,7 @@ public class YpTempPurchaseService {
             resultMap.put("cg", "更新临购药品审核信息成功!");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
+            log.info("更新临购药品审核信息失败: " + e.getMessage());
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新临购药品审核信息失败!");
         }
     }