Browse Source

domain-app: https://localhost:5173/# #app域名地址

phoenix 1 year ago
parent
commit
2c2fe92045

+ 2 - 2
src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImpl.java

@@ -317,7 +317,7 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
 
                     //添加教材征订记录
                     textbookTextbookSubscriptionRecordMapper.insert(new TextbookSubscriptionRecord() {{
-                        setWfTextbookSubscriptionId(textbook.getId());
+                        setTextbookId(textbook.getId());
                         setWfTextbookSubscriptionId(wfExerciseBook.getId());
                     }});
                 }
@@ -335,7 +335,7 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                 }
                 //添加教材征订记录
                 textbookTextbookSubscriptionRecordMapper.insert(new TextbookSubscriptionRecord() {{
-                    setWfTextbookSubscriptionId(textbook.getId());
+                    setTextbookId(textbook.getId());
                     setWfTextbookSubscriptionId(wfExerciseBook.getId());
                 }});
             }

+ 10 - 9
src/main/java/com/xjrsoft/module/textbook/service/impl/WfTextbookClaimServiceImpl.java

@@ -209,24 +209,25 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
             }
 
             //判断总发放数量是否超出该申请像的申请数量
-            Integer stock = textbook.getStock();
+            Integer stock = ObjectUtil.isNull(textbook.getStock()) ? 0 : textbook.getStock() ;
             if (stock < textbookClaimItem.getConfirmNumber()) {
                 throw new MyException(textbook.getBookName() + "库存不足");
             }
 
             //更新教材管理中的库存数量
-            Textbook newTextbook = new Textbook();
-            newTextbook.setId(textbook.getId());
-            newTextbook.setStock(stock - textbookClaimItem.getConfirmNumber());
-            textbookService.updateById(newTextbook);
+            textbookService.updateById(new Textbook(){{
+                setId(textbook.getId());
+                setStock(stock - textbookClaimItem.getConfirmNumber());
+            }});
 
             //TODO 增加出库记录
 
             //更新申领项中的已经发放数量
-            WfTextbookClaimItem newWfTextbookClaimItem = new WfTextbookClaimItem();
-            newWfTextbookClaimItem.setId(wfTextbookClaimItem.getId());
-            newWfTextbookClaimItem.setIssueNumber(wfTextbookClaimItem.getIssueNumber() + textbookClaimItem.getConfirmNumber());
-            wfTextbookClaimWfTextbookClaimItemMapper.updateById(newWfTextbookClaimItem);
+            wfTextbookClaimWfTextbookClaimItemMapper.updateById(new WfTextbookClaimItem(){{
+                setId(wfTextbookClaimItem.getId());
+                        setIssueNumber(issueNumber + textbookClaimItem.getConfirmNumber());
+            }});
+
 
             //为班级每个学生生成领取(确认信息)认领记录
             //查出班上的所有学生id

+ 2 - 1
src/main/resources/application-dev.yml

@@ -64,7 +64,8 @@ xjrsoft:
     druid-password: admin # druid 监控密码
     default-password: "cqtlzjzx2023" #默认密码(用户重置密码后为该密码)
     domain-api: http://10.150.10.139:8888/api #api域名地址
-    domain-app: https://yxh-web.ngrok.yingcaibx.com/# #app域名地址
+#    domain-app: https://yxh-web.ngrok.yingcaibx.com/# #app域名地址
+    domain-app: https://localhost:5173/# #app域名地址
     domain-web: http://10.150.10.139:8888 #web域名地址
 #    domain-api: http://127.0.0.1:9000/api #api域名地址
 #    domain-web: http://127.0.0.1:9000 #web域名地址