huangguoce 4 днів тому
батько
коміт
cc032ee288

+ 6 - 6
jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/InvoiceConfirmStatusService.java

@@ -22,14 +22,14 @@ public class InvoiceConfirmStatusService {
     private InvoiceConfirmStatusMapper invoiceConfirmStatusMapper;
 
     public String save(InvoiceConfirmStatus dto) {
-        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        //UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         try {
             String invoiceIds = dto.getInvoiceId();
             String[] split = invoiceIds.split(",");
             for (String invoiceId : split) {
                 QueryWrapper<InvoiceConfirmStatus> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("invoice_id", invoiceId);  // 假设你按 invoice_id 查一条记录
-                queryWrapper.eq("user_id", userDTO.getId());  // 假设你按 invoice_id 查一条记录
+                queryWrapper.eq("invoice_id", invoiceId);
+                //queryWrapper.eq("user_id", userDTO.getId());
                 InvoiceConfirmStatus invoiceConfirmStatus = invoiceConfirmStatusMapper.selectOne(queryWrapper);
                 InvoiceConfirmStatus invoiceConfirmStatus1 = new InvoiceConfirmStatus();
                 if (invoiceConfirmStatus == null) {
@@ -86,10 +86,10 @@ public class InvoiceConfirmStatusService {
     }
 
     public List<InvoiceConfirmStatus> getListByUser(InvoiceConfirmStatus invoiceConfirmStatus){
-        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        //UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         QueryWrapper<InvoiceConfirmStatus> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("reimbursement_id", invoiceConfirmStatus.getReimbursementId());  // 假设你按 invoice_id 查一条记录
-        queryWrapper.eq("user_id", userDTO.getId());  // 假设你按 invoice_id 查一条记录
+        queryWrapper.eq("reimbursement_id", invoiceConfirmStatus.getReimbursementId());
+        //queryWrapper.eq("user_id", userDTO.getId());
         List<InvoiceConfirmStatus> invoiceConfirmStatuses = invoiceConfirmStatusMapper.selectList(queryWrapper);
         return invoiceConfirmStatuses;
     }

+ 6 - 6
jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/service/InvoiceConfirmStatusService.java

@@ -22,14 +22,14 @@ public class InvoiceConfirmStatusService {
     private InvoiceConfirmStatusMapper invoiceConfirmStatusMapper;
 
     public String save(InvoiceConfirmStatus dto) {
-        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        //UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         try {
             String invoiceIds = dto.getInvoiceId();
             String[] split = invoiceIds.split(",");
             for (String invoiceId : split) {
                 QueryWrapper<InvoiceConfirmStatus> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("invoice_id", invoiceId);  // 假设你按 invoice_id 查一条记录
-                queryWrapper.eq("user_id", userDTO.getId());  // 假设你按 invoice_id 查一条记录
+                queryWrapper.eq("invoice_id", invoiceId);  //  invoice_id
+                //queryWrapper.eq("user_id", userDTO.getId());
                 InvoiceConfirmStatus invoiceConfirmStatus = invoiceConfirmStatusMapper.selectOne(queryWrapper);
                 InvoiceConfirmStatus invoiceConfirmStatus1 = new InvoiceConfirmStatus();
                 if (invoiceConfirmStatus == null) {
@@ -86,10 +86,10 @@ public class InvoiceConfirmStatusService {
     }
 
     public List<InvoiceConfirmStatus> getListByUser(InvoiceConfirmStatus invoiceConfirmStatus){
-        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        //UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         QueryWrapper<InvoiceConfirmStatus> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("reimbursement_id", invoiceConfirmStatus.getReimbursementId());  // 假设你按 invoice_id 查一条记录
-        queryWrapper.eq("user_id", userDTO.getId());  // 假设你按 invoice_id 查一条记录
+        queryWrapper.eq("reimbursement_id", invoiceConfirmStatus.getReimbursementId());  // 按 invoice_id 查一条记录
+        //queryWrapper.eq("user_id", userDTO.getId());  //
         List<InvoiceConfirmStatus> invoiceConfirmStatuses = invoiceConfirmStatusMapper.selectList(queryWrapper);
         return invoiceConfirmStatuses;
     }

+ 6 - 6
jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/InvoiceConfirmStatusService.java

@@ -22,14 +22,14 @@ public class InvoiceConfirmStatusService {
     private InvoiceConfirmStatusMapper invoiceConfirmStatusMapper;
 
     public String save(InvoiceConfirmStatus dto) {
-        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        //UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         try {
             String invoiceIds = dto.getInvoiceId();
             String[] split = invoiceIds.split(",");
             for (String invoiceId : split) {
                 QueryWrapper<InvoiceConfirmStatus> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("invoice_id", invoiceId);  // 假设你按 invoice_id 查一条记录
-                queryWrapper.eq("user_id", userDTO.getId());  // 假设你按 invoice_id 查一条记录
+                queryWrapper.eq("invoice_id", invoiceId);  //
+                //queryWrapper.eq("user_id", userDTO.getId());  //
                 InvoiceConfirmStatus invoiceConfirmStatus = invoiceConfirmStatusMapper.selectOne(queryWrapper);
                 InvoiceConfirmStatus invoiceConfirmStatus1 = new InvoiceConfirmStatus();
                 if (invoiceConfirmStatus == null) {
@@ -86,10 +86,10 @@ public class InvoiceConfirmStatusService {
     }
 
     public List<InvoiceConfirmStatus> getListByUser(InvoiceConfirmStatus invoiceConfirmStatus){
-        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        //UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         QueryWrapper<InvoiceConfirmStatus> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("reimbursement_id", invoiceConfirmStatus.getReimbursementId());  // 假设你按 invoice_id 查一条记录
-        queryWrapper.eq("user_id", userDTO.getId());  // 假设你按 invoice_id 查一条记录
+        queryWrapper.eq("reimbursement_id", invoiceConfirmStatus.getReimbursementId());  //  invoice_id 查
+        //queryWrapper.eq("user_id", userDTO.getId());  //
         List<InvoiceConfirmStatus> invoiceConfirmStatuses = invoiceConfirmStatusMapper.selectList(queryWrapper);
         return invoiceConfirmStatuses;
     }

+ 6 - 6
jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/service/InvoiceConfirmStatusService.java

@@ -22,14 +22,14 @@ public class InvoiceConfirmStatusService {
     private InvoiceConfirmStatusMapper invoiceConfirmStatusMapper;
 
     public String save(InvoiceConfirmStatus dto) {
-        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        //UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         try {
             String invoiceIds = dto.getInvoiceId();
             String[] split = invoiceIds.split(",");
             for (String invoiceId : split) {
                 QueryWrapper<InvoiceConfirmStatus> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("invoice_id", invoiceId);  // 假设你按 invoice_id 查一条记录
-                queryWrapper.eq("user_id", userDTO.getId());  // 假设你按 invoice_id 查一条记录
+                queryWrapper.eq("invoice_id", invoiceId);
+                //queryWrapper.eq("user_id", userDTO.getId());
                 InvoiceConfirmStatus invoiceConfirmStatus = invoiceConfirmStatusMapper.selectOne(queryWrapper);
                 InvoiceConfirmStatus invoiceConfirmStatus1 = new InvoiceConfirmStatus();
                 if (invoiceConfirmStatus == null) {
@@ -86,10 +86,10 @@ public class InvoiceConfirmStatusService {
     }
 
     public List<InvoiceConfirmStatus> getListByUser(InvoiceConfirmStatus invoiceConfirmStatus){
-        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        //UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         QueryWrapper<InvoiceConfirmStatus> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("reimbursement_id", invoiceConfirmStatus.getReimbursementId());  // 假设你按 invoice_id 查一条记录
-        queryWrapper.eq("user_id", userDTO.getId());  // 假设你按 invoice_id 查一条记录
+        queryWrapper.eq("reimbursement_id", invoiceConfirmStatus.getReimbursementId());  //
+        //queryWrapper.eq("user_id", userDTO.getId());  //
         List<InvoiceConfirmStatus> invoiceConfirmStatuses = invoiceConfirmStatusMapper.selectList(queryWrapper);
         return invoiceConfirmStatuses;
     }

+ 4 - 5
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/InvoiceConfirmStatusService.java

@@ -22,14 +22,14 @@ public class InvoiceConfirmStatusService {
     private InvoiceConfirmStatusMapper invoiceConfirmStatusMapper;
 
     public String save(InvoiceConfirmStatus dto) {
-        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        //UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         try {
             String invoiceIds = dto.getInvoiceId();
             String[] split = invoiceIds.split(",");
             for (String invoiceId : split) {
                 QueryWrapper<InvoiceConfirmStatus> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("invoice_id", invoiceId);  //  invoice_id
-                queryWrapper.eq("user_id", userDTO.getId());  // user_id
+                //queryWrapper.eq("user_id", userDTO.getId());  // user_id
                 InvoiceConfirmStatus invoiceConfirmStatus = invoiceConfirmStatusMapper.selectOne(queryWrapper);
                 InvoiceConfirmStatus invoiceConfirmStatus1 = new InvoiceConfirmStatus();
                 if (invoiceConfirmStatus == null) {
@@ -80,16 +80,15 @@ public class InvoiceConfirmStatusService {
         detail.setUpdateById(userDTO.getId());
         detail.setUpdateTime(new Date());
         detail.setStatus(dto.getStatus());
-        detail.setStatus(dto.getStatus());
         invoiceConfirmStatusMapper.updateById(detail);
         return "操作完成";
     }
 
     public List<InvoiceConfirmStatus> getListByUser(InvoiceConfirmStatus invoiceConfirmStatus){
-        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        //UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         QueryWrapper<InvoiceConfirmStatus> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("reimbursement_id", invoiceConfirmStatus.getReimbursementId());  // 假设你按 invoice_id 查一条记录
-        queryWrapper.eq("user_id", userDTO.getId());  // 假设你按 invoice_id 查一条记录
+        //queryWrapper.eq("user_id", userDTO.getId());  // 假设你按 invoice_id 查一条记录
         List<InvoiceConfirmStatus> invoiceConfirmStatuses = invoiceConfirmStatusMapper.selectList(queryWrapper);
         return invoiceConfirmStatuses;
     }