From 8767b8fe0806c7ee91df9ef64493253a979f5e16 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Thu, 29 May 2025 11:30:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(deleted=E8=AE=A2=E5=8D=95=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新ata): 修复销售增 queryCorrectDeptId 和 updateCdeptid 方法 - 添加 QueryCorrectDeptIdVo 和 UpdateSoSaleCdeptId 类 - 在 DeleteU8cDataUtil 中实现 repairSoSaleDepartment 方法 - 优化 DeleteU8cDataUtilEntity 类，增加 cdeptid 字段 - 更新 DeleteU8cDataUtilEntity.xml，添加 cdeptid 映射 --- .../frame/deletedata/DeleteU8cDataUtil.java | 42 +++++++++++++++++-- .../deletedata/dao/DeleteU8cDataUtilDao.java | 18 +++++++- .../dao/impl/DeleteU8cDataUtilDaoImpl.java | 16 +++++-- .../entity/DeleteU8cDataUtilEntity.java | 10 +++++ .../entity/DeleteU8cDataUtilEntity.xml | 33 +++++++++++++++ .../deletedata/vo/QueryCorrectDeptIdVo.java | 25 +++++++++++ .../deletedata/vo/UpdateSoSaleCdeptId.java | 17 ++++++++ 7 files changed, 154 insertions(+), 7 deletions(-) create mode 100644 service/src/main/java/com/hzya/frame/deletedata/vo/QueryCorrectDeptIdVo.java create mode 100644 service/src/main/java/com/hzya/frame/deletedata/vo/UpdateSoSaleCdeptId.java diff --git a/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java b/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java index 7bd4c1ec..2621e694 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java +++ b/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java @@ -81,9 +81,9 @@ public class DeleteU8cDataUtil { // cancelSignatureSoSaleReadExcelV2(); - cancelSignatureSoSaleReadExcel20250528V2(); - abandonmentReviewSoSaleinvoice2505282107(); - cancelSignatureSoSaleReadExcel2505282140V2(); +// cancelSignatureSoSaleReadExcel20250528V2(); +// abandonmentReviewSoSaleinvoice2505282107(); +// cancelSignatureSoSaleReadExcel2505282140V2(); } } } @@ -1334,4 +1334,40 @@ public class DeleteU8cDataUtil { e.printStackTrace(); } } + + /** + * 修复销售订单部门字段错误问题 + */ + public void repairSoSaleDepartment() { + try { + //确定销售订单范围、19648 + List deleteU8cDataUtilEntities = deleteU8cDataUtilDao.cancelSignatureSoSaleReadExcel20250528V2(); + if (deleteU8cDataUtilEntities != null && deleteU8cDataUtilEntities.size() > 0) { + for (DeleteU8cDataUtilEntity deleteU8cDataUtilEntity : deleteU8cDataUtilEntities) { + //找到正确的部门主键 + if (deleteU8cDataUtilEntity.getCdeptid() == null) { + throw new Exception("deleteU8cDataUtilEntity.getCdeptid() == null"); + } + if (deleteU8cDataUtilEntity.getPk_corp() == null) { + throw new Exception("deleteU8cDataUtilEntity.getPk_corp() == null"); + } + QueryCorrectDeptIdVo queryCorrectDeptIdVo = new QueryCorrectDeptIdVo(); + queryCorrectDeptIdVo.setPk_deptdoc(deleteU8cDataUtilEntity.getCdeptid()); + queryCorrectDeptIdVo.setPk_corp(deleteU8cDataUtilEntity.getPk_corp()); + List queryCorrectDeptIdVos = deleteU8cDataUtilDao.queryCorrectDeptId(queryCorrectDeptIdVo); + if (queryCorrectDeptIdVos == null || queryCorrectDeptIdVos.size() != 1) { + throw new Exception("queryCorrectDeptIdVos.size() != 1"); + } + QueryCorrectDeptIdVo queryCorrectDeptIdVo1 = queryCorrectDeptIdVos.get(0); + //发起销售订单表头部门修改 + UpdateSoSaleCdeptId updateSoSaleCdeptId = new UpdateSoSaleCdeptId(); + updateSoSaleCdeptId.setCdeptid(queryCorrectDeptIdVo1.getNewdeptpk());//部门id + updateSoSaleCdeptId.setCsaleid(deleteU8cDataUtilEntity.getCsaleid());//销售订单id + deleteU8cDataUtilDao.updateCdeptid(updateSoSaleCdeptId); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } } diff --git a/service/src/main/java/com/hzya/frame/deletedata/dao/DeleteU8cDataUtilDao.java b/service/src/main/java/com/hzya/frame/deletedata/dao/DeleteU8cDataUtilDao.java index e0b636ad..5b740453 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/dao/DeleteU8cDataUtilDao.java +++ b/service/src/main/java/com/hzya/frame/deletedata/dao/DeleteU8cDataUtilDao.java @@ -2,9 +2,11 @@ package com.hzya.frame.deletedata.dao; import com.hzya.frame.basedao.dao.IBaseDao; import com.hzya.frame.deletedata.entity.DeleteU8cDataUtilEntity; -import com.hzya.frame.deletedata.vo.DeleteArapDjzbVo; +//import com.hzya.frame.deletedata.vo.DeleteArapDjzbVo; import com.hzya.frame.deletedata.vo.DeleteIcGeneralHVo; import com.hzya.frame.deletedata.vo.DeleteSoSaleVo; +import com.hzya.frame.deletedata.vo.QueryCorrectDeptIdVo; +import com.hzya.frame.deletedata.vo.UpdateSoSaleCdeptId; import java.util.List; @@ -101,4 +103,18 @@ public interface DeleteU8cDataUtilDao extends IBaseDao querySoSaleinvoiceByCancelApprovalV2(DeleteU8cDataUtilEntity deleteU8cDataUtilEntity) throws Exception; + + /** + * 查找正确的部门主键 + * + * @author liuyang + */ + List queryCorrectDeptId(QueryCorrectDeptIdVo deleteU8cDataUtilEntity) throws Exception; + + /** + * 修改销售订单表头部门主键 + * + * @author liuyang + */ + void updateCdeptid(UpdateSoSaleCdeptId updateSoSaleCdeptId) throws Exception; } \ No newline at end of file diff --git a/service/src/main/java/com/hzya/frame/deletedata/dao/impl/DeleteU8cDataUtilDaoImpl.java b/service/src/main/java/com/hzya/frame/deletedata/dao/impl/DeleteU8cDataUtilDaoImpl.java index 3b276dfb..09df7286 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/dao/impl/DeleteU8cDataUtilDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/deletedata/dao/impl/DeleteU8cDataUtilDaoImpl.java @@ -4,9 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.deletedata.dao.DeleteU8cDataUtilDao; import com.hzya.frame.deletedata.entity.DeleteU8cDataUtilEntity; -import com.hzya.frame.deletedata.vo.DeleteArapDjzbVo; -import com.hzya.frame.deletedata.vo.DeleteIcGeneralHVo; -import com.hzya.frame.deletedata.vo.DeleteSoSaleVo; +import com.hzya.frame.deletedata.vo.*; import org.springframework.stereotype.Repository; import java.util.List; @@ -92,5 +90,17 @@ public class DeleteU8cDataUtilDaoImpl extends MybatisGenericDao querySoSaleinvoiceByCancelApprovalV2(DeleteU8cDataUtilEntity deleteU8cDataUtilEntity) throws Exception { return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.querySoSaleinvoiceByCancelApprovalV2", deleteU8cDataUtilEntity); } + + @DS("lets_u8c") + @Override + public List queryCorrectDeptId(QueryCorrectDeptIdVo deleteU8cDataUtilEntity) throws Exception { + return (List) selectList("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.queryCorrectDeptId", deleteU8cDataUtilEntity); + } + + @DS("lets_u8c") + @Override + public void updateCdeptid(UpdateSoSaleCdeptId updateSoSaleCdeptId) throws Exception { + update("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.updateCdeptid", updateSoSaleCdeptId); + } } diff --git a/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.java b/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.java index c17dcc2d..b22c06fc 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.java +++ b/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.java @@ -24,6 +24,16 @@ public class DeleteU8cDataUtilEntity extends BaseEntity { private String fstatus; + private String cdeptid; + + public String getCdeptid() { + return cdeptid; + } + + public void setCdeptid(String cdeptid) { + this.cdeptid = cdeptid; + } + public String getFstatus() { return fstatus; } diff --git a/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml b/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml index 2113f8b0..ce28e436 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml +++ b/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml @@ -12,6 +12,7 @@ + @@ -310,6 +311,7 @@ AND a.cdeptid NOT IN ( SELECT pk_deptdoc FROM bd_deptdoc WHERE deptname = '业务部门' AND dr = 0 ) AND a.cdeptid IS NOT NULL and a.pk_corp != c.pk_corp + and a.csaleid = '1015A11000000000OUKB' @@ -336,5 +338,36 @@ ) AND a.dr = 0 + + + + + + + + + + + + + + + + update so_sale set cdeptid=#{cdeptid} where csaleid = #{csaleid} and dr = 0 + diff --git a/service/src/main/java/com/hzya/frame/deletedata/vo/QueryCorrectDeptIdVo.java b/service/src/main/java/com/hzya/frame/deletedata/vo/QueryCorrectDeptIdVo.java new file mode 100644 index 00000000..78866b8b --- /dev/null +++ b/service/src/main/java/com/hzya/frame/deletedata/vo/QueryCorrectDeptIdVo.java @@ -0,0 +1,25 @@ +package com.hzya.frame.deletedata.vo; + +import lombok.Data; + +/** + * @Author：liuyang + * @Package：com.hzya.frame.deletedata.vo + * @Project：kangarooDataCenterV3 + * @name：QueryCorrectDeptIdVo + * @Date：2025/5/29 09:27 + * @Filename：QueryCorrectDeptIdVo + */ +@Data +public class QueryCorrectDeptIdVo { + //入参 + private String pk_deptdoc; + private String pk_corp; + //出参 + private String olddeptpk; + private String olddeptcode; + private String olddeptcorp; + private String newdeptpk; + private String newdeptcode; + private String newdeptcorp; +} diff --git a/service/src/main/java/com/hzya/frame/deletedata/vo/UpdateSoSaleCdeptId.java b/service/src/main/java/com/hzya/frame/deletedata/vo/UpdateSoSaleCdeptId.java new file mode 100644 index 00000000..a7f98798 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/deletedata/vo/UpdateSoSaleCdeptId.java @@ -0,0 +1,17 @@ +package com.hzya.frame.deletedata.vo; + +import lombok.Data; + +/** + * @Author：liuyang + * @Package：com.hzya.frame.deletedata.vo + * @Project：kangarooDataCenterV3 + * @name：UpdateSoSaleCdeptId + * @Date：2025/5/29 10:48 + * @Filename：UpdateSoSaleCdeptId + */ +@Data +public class UpdateSoSaleCdeptId { + private String cdeptid; + private String csaleid; +}