From aa0cc79890f9396ede7cb169878c00490764ac45 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 22 May 2023 10:09:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=B9=E5=8F=98=E6=9A=82?= =?UTF-8?q?=E6=8C=82=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseInvoiceController.java | 61 +++++++++++++++++++ .../base/dao/BaseTDxRecordInvoiceDao.java | 2 + .../base/entity/BaseTDxRecordInvoice.java | 2 + .../com/dxhy/base/model/BaseSggxCxRespVO.java | 2 + .../BaseInvoiceManualCheckServiceImpl.java | 14 +++-- .../BaseIRzTDxRecordInvoiceService.java | 3 + .../BaseRzTDxRecordInvoiceServiceImpl.java | 20 ++++++ .../resources/mapper/BaseSggxcxMapper.xml | 19 +++++- 8 files changed, 116 insertions(+), 7 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index efa7f66a..fe52add2 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -2,6 +2,8 @@ package com.dxhy.base.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dxhy.base.entity.BaseTDxRecordInvoice; import com.dxhy.base.model.BaseDrgxReqVO; import com.dxhy.base.service.fpxxrz.BaseCxrzfpService; import com.dxhy.base.service.fpxxrz.BaseRzFpxxService; @@ -9,7 +11,9 @@ import com.dxhy.base.service.invoicecheck.*; import com.dxhy.base.service.tdxrecordinvoice.BaseIRzTDxRecordInvoiceService; import com.dxhy.common.aspect.SysLog; import com.dxhy.common.constant.CommonConstants; +import com.dxhy.common.constant.DbConstant; import com.dxhy.common.controller.AbstractController; +import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.common.util.InvoiceUtil; import com.dxhy.common.util.StringHelper; import com.dxhy.common.util.UserInfoUtil; @@ -29,6 +33,7 @@ import javax.annotation.Resource; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * @author kangzq @@ -475,6 +480,7 @@ public class BaseInvoiceController extends AbstractController { String companyCode = (String) map.get("companyCode"); String suspendStatus = (String) map.get("suspendStatus"); String suspendDate = (String) map.get("suspendDate"); + String bzr = (String) map.get("bzr"); if (StringUtils.isNotEmpty(suspendDate) && suspendDate.length() >7){ suspendDate = suspendDate.substring(0,7); } @@ -516,6 +522,7 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("imageNumber", map.get("imageNumber")); pramsMap.put("suspendStatus",suspendStatus); pramsMap.put("suspendDate",suspendDate); + pramsMap.put("bzr",bzr); if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) { String accountPeriod = map.get("accountPeriod").toString().substring(0,7); pramsMap.put("accountPeriod", accountPeriod); @@ -1243,4 +1250,58 @@ public class BaseInvoiceController extends AbstractController { } } + @PostMapping("/sgrz/changeSuspend") + @SysLog("修改暂挂状态") + public Object changeSuspend(@RequestBody Map map){ + + if (map == null){ + return ResponseEntity.ok(R.error("缺少请求参数")); + } + List gfshAll = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); + if (gfshAll ==null || gfshAll.isEmpty()){ + return ResponseEntity.ok(R.error("购方信息不能为空")); + } + + JSONObject jsonObject = new JSONObject(map); + String uuids = jsonObject.getString("uuids"); + if (StringUtils.isEmpty(uuids)){ + return ResponseEntity.ok(R.error("请先选择要暂挂的数据")); + } + String suspendType = jsonObject.getString("suspendType"); + if (StringUtils.isEmpty(suspendType)){ + return ResponseEntity.ok(R.error("暂挂状态不能为空")); + } + String[] uuidArray = uuids.split(","); + List uuidList = Arrays.asList(uuidArray); + + //查询库中是否包含对应数据 + QueryWrapper queryWrap = new QueryWrapper<>(); + queryWrap.in("uuid",uuidList); + + DynamicContextHolder.push(getUserInfo().getDbName()+ DbConstant.BUSINESS_READ); + List list = baseIRzTDxRecordInvoiceService.list(queryWrap); + if (list == null || list.isEmpty()){ + return ResponseEntity.ok(R.error("没有可操作的数据")); + } + List suspendTypes = list.stream().map(BaseTDxRecordInvoice::getSuspendStatus).collect(Collectors.toList()); + if (suspendTypes.contains("1")&& (suspendTypes.contains("0")||suspendTypes.contains(null) || suspendTypes.contains(""))){ + return ResponseEntity.ok(R.error("同时存在暂挂状态为是和否的数据，请重新选择！")); + } + + Map pramsMap = new HashMap<>(); + pramsMap.put("suspendType",suspendType); + pramsMap.put("uuids",uuids); + pramsMap.put("dbName",getUserInfo().getDbName()); + + try { + return ResponseEntity + .ok(R.ok().put("data",baseIRzTDxRecordInvoiceService.updateSuspendType(pramsMap))); + } catch (Exception e) { + e.printStackTrace(); + log.error("", e); + return ResponseEntity.ok(R.error(CommonConstants.MSG_ERR_DEFAULT)); + } + + } + } diff --git a/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java b/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java index 86a1ef18..d09f3e73 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java +++ b/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java @@ -214,4 +214,6 @@ public interface BaseTDxRecordInvoiceDao extends BaseMapper pramsMap); List selectInTellingCheck(Map pramsMap); + + void updateSuspendType(Map pramsMap); } diff --git a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java index 02a65deb..695fc016 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java +++ b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java @@ -520,4 +520,6 @@ public class BaseTDxRecordInvoice implements Serializable { private String suspendStatus; private String suspendDate; + + private String bzr; } diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java index 31135a60..ee54d389 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java @@ -163,4 +163,6 @@ public class BaseSggxCxRespVO { private String suspendDate; + private String bzr; + } diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java index b8cabc20..6797e3e8 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java @@ -205,6 +205,13 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl pramsMap); + + String updateSuspendType(Map pramsMap); } diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java index 99fb57c6..70da7d43 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java @@ -421,6 +421,26 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl pramsMap) { + + String suspendType = (String) pramsMap.get("suspendType"); + if ("0".equals(suspendType)){ + pramsMap.put("suspendStatus","0"); + pramsMap.put("suspendDate",""); + + }else { + pramsMap.put("suspendStatus","1"); + String date = DateUtils.dateToStr(new Date()); + String suspendDate = date.substring(0, 7); + pramsMap.put("suspendDate",suspendDate); + } + String dbName = (String) pramsMap.get("dbName"); + DynamicContextHolder.push(dbName+DbConstant.BUSINESS_WRITE); + super.baseMapper.updateSuspendType(pramsMap); + return "操作成功"; + } + @Override public String identifiByAll(Map pramsMap) { diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index a1e74328..5c15a8b3 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -34,6 +34,7 @@ + @@ -60,7 +61,7 @@ + + + update t_dx_record_invoice + set suspend_status = #{suspendStatus}, + suspend_date = #{suspendDate} + where uuid in + + #{uuid} + +