From 8323ef61c33af551cc167e75dede439f9b0e5d8f Mon Sep 17 00:00:00 2001
From: jiangxiaoming <jiangxiaoming@seaskysh.com>
Date: Wed, 4 Dec 2024 11:06:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E7=BA=BF=E4=B8=8B=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E5=85=B6=E4=BB=96=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../application/command/dto/OffLineCmd.java | 2 ++
.../command/IncomeCommandServiceImpl.java | 12 +++++++++--
.../seasky/ledgerincome/aspect/LogAspect.java | 21 +++++++------------
.../srincomesupplement/components/offline.vue | 5 ++++-
4 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/command/dto/OffLineCmd.java b/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/command/dto/OffLineCmd.java
index ca146308..ce4ab5d3 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/command/dto/OffLineCmd.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/command/dto/OffLineCmd.java
@@ -25,6 +25,8 @@ public class OffLineCmd {
private Boolean multiInvoice;
@ApiModelProperty(value="鏄惁澶氶」鐩�")
private Boolean multiProjectSplit;
+ @ApiModelProperty(value="鍏朵粬")
+ private Boolean other;
@NotEmpty(message = "琛ュ厖鐞嗙敱涓嶈兘涓虹┖")
@ApiModelProperty(value="琛ュ厖璇存槑")
private String offLineReason;
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
index 05f568ab..8377b003 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.ql.util.express.DefaultContext;
import com.ql.util.express.ExpressRunner;
import com.ql.util.express.Operator;
@@ -39,6 +40,7 @@ import com.seasky.ledgerincome.domain.aggregate.invoice.InvoiceRepository;
import com.seasky.ledgerincome.domain.aggregate.voucher.VchDetailEntity;
import com.seasky.ledgerincome.domain.enums.*;
import com.seasky.ledgerincome.domain.value.ReceiptBillVo;
+import com.seasky.ledgerincome.infrastructure.mapper.api.IncomeMapper;
import com.seasky.ledgerincome.infrastructure.mapper.api.IncomeVoucherMapper;
import com.seasky.ledgerincome.infrastructure.po.IncomePo;
import com.seasky.ledgerincome.infrastructure.po.IncomeVoucherPo;
@@ -101,6 +103,8 @@ public class IncomeCommandServiceImpl extends BaseCommandAbstractService<Income
InvoiceCommandServiece invoiceCommandServiece;
@Autowired
IncomeVoucherMapper incomeVoucherMapper;
+ @Autowired
+ IncomeMapper incomeMapper;
@Override
public void automaticIncomeType(List<ReceiptBillCmd> receiptBillCmdList) {
if(receiptBillCmdList == null || receiptBillCmdList.isEmpty()){
@@ -397,9 +401,13 @@ public class IncomeCommandServiceImpl extends BaseCommandAbstractService<Income
@Override
public void offLine(OffLineCmd offLineCmd) {
- IncomeAggregate incomeAggregate=findById(offLineCmd.getIncomeId());
+ /*IncomeAggregate incomeAggregate=findById(offLineCmd.getIncomeId());
incomeAggregate.setIsOffline(true);
- save(incomeAggregate);
+ save(incomeAggregate);*/
+ UpdateWrapper<IncomePo> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("is_offline",1);
+ updateWrapper.eq("id",offLineCmd.getIncomeId());
+ incomeMapper.update(null,updateWrapper);
}
@Transactional
@Override
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/aspect/LogAspect.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/aspect/LogAspect.java
index 46e433a5..9bffce46 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/aspect/LogAspect.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/aspect/LogAspect.java
@@ -318,21 +318,16 @@ public class LogAspect{
logger.info("鐢ㄦ埛 [{}] 瀹屾垚鎿嶄綔 [{}], 鏂规硶 [{}], 杩斿洖鍊� [{}]", personName, operationDesc, methodName, result);
OffLineCmd offLineCmd = (OffLineCmd) arg;
String progressStage = operationDesc.split("-")[0];
- String desc = offLineCmd.getOffLineReason();
- if(offLineCmd.getMultiInvoice()!=null && offLineCmd.getMultiInvoice()
- && offLineCmd.getMultiProjectSplit()!=null && offLineCmd.getMultiProjectSplit()
- ){
- desc = desc+"(澶氶」鐩媶鍒�&澶氬彂绁�)";
+ String desc = offLineCmd.getOffLineReason()+":";
+
+ if(offLineCmd.getMultiInvoice()!=null && offLineCmd.getMultiInvoice()){
+ desc = desc+"澶氬彂绁�";
}
- if(offLineCmd.getMultiInvoice()!=null && offLineCmd.getMultiInvoice()
- && offLineCmd.getMultiProjectSplit()!=null && !offLineCmd.getMultiProjectSplit()
- ){
- desc = desc+"(澶氬彂绁�)";
+ if(offLineCmd.getMultiProjectSplit()!=null && offLineCmd.getMultiProjectSplit()){
+ desc = desc+"澶氶」鐩媶鍒�";
}
- if(offLineCmd.getMultiInvoice()!=null && !offLineCmd.getMultiInvoice()
- && offLineCmd.getMultiProjectSplit()!=null && offLineCmd.getMultiProjectSplit()
- ){
- desc = desc+"(澶氶」鐩媶鍒�)";
+ if(offLineCmd.getOther()!=null && offLineCmd.getOther()){
+ desc = desc+"鍏朵粬";
}
LogPo log = new LogPo(offLineCmd.getIncomeId(),progressStage,personName,userName,desc,new Date());
logMapper.insert(log);
diff --git a/WebSite/src/views/srincomesupplement/components/offline.vue b/WebSite/src/views/srincomesupplement/components/offline.vue
index b2b13d20..21522ae1 100644
--- a/WebSite/src/views/srincomesupplement/components/offline.vue
+++ b/WebSite/src/views/srincomesupplement/components/offline.vue
@@ -15,6 +15,8 @@
<el-form-item label=" ">
<el-checkbox v-model="offLineCmd.multiProjectSplit">澶氶」鐩媶鍒�</el-checkbox>
<el-checkbox v-model="offLineCmd.multiInvoice">澶氬彂绁�</el-checkbox>
+ <el-checkbox v-model="offLineCmd.other">鍏朵粬</el-checkbox>
+
</el-form-item>
<el-form-item label="鐞嗙敱琛ュ厖" >
<el-input clearable style="width:90%;" size="large"
@@ -49,7 +51,8 @@ setup(props,context){
incomeId:props.offlinePara.incomeId,
offLineReason:props.offlinePara.offLineReason==null?'':props.offlinePara.offLineReason,
multiProjectSplit: false, // 鏂板鍙橀噺锛氬椤圭洰鎷嗗垎
- multiInvoice: false // 鏂板鍙橀噺锛氬鍙戠エ
+ multiInvoice: false, // 鏂板鍙橀噺锛氬鍙戠エ
+ other: false // 鍏朵粬
}
});
const closeOfflineDialog=()=>{
--
GitLab