Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -132,9 +132,9 @@ spring:
         master: ## 声明第一个数据源所需的数据
           url: jdbc:mysql://152.136.206.27:3306/yecai?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: itdm-boot
-          password:  itdm-boot@2023
+          password: itdm-boot@2023
           driver-class-name: com.mysql.cj.jdbc.Driver
-        slave:
+        slave:  # 第二个数据源
           url: jdbc:mysql://152.136.206.27:3306/kezhikeshiceshi?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: itdm-boot
           password: itdm-boot@2023

module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/mapper/KyBgInfoMapper.java

@@ -16,7 +16,6 @@ import java.util.List;
  * @Date:   2023-08-18
  * @Version: V1.0
  */
-@TargetDataSource(value = DataSourceType.SLAVE)
 public interface KyBgInfoMapper extends BaseMapper<KyBgInfo> {
 
     /**项目成本——工时详情*/

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/mapper/KyTaskInfoMapper.java

@@ -15,7 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Date:   2023-08-30
  * @Version: V1.0
  */
-@TargetDataSource(value = DataSourceType.SLAVE)
 public interface KyTaskInfoMapper extends BaseMapper<KyTaskInfo> {
 
     /**根据任务号查科研任务的业务员和下达部门*/

module_kzks/src/main/java/org/jeecg/modules/mesInfo/mapper/MesInfoMapper.java

@@ -16,7 +16,6 @@ import org.jeecg.modules.mesInfo.vo.MesInfoDetailListVO;
  * @Date:   2023-08-18
  * @Version: V1.0
  */
-@TargetDataSource(value = DataSourceType.SLAVE)
 public interface MesInfoMapper extends BaseMapper<MesInfo> {
 
     /**项目成本——装机明细*/

module_kzks/src/main/java/org/jeecg/modules/mesInfoInstallationcost/mapper/MesInfoInstallationcostMapper.java

@@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Date:   2023-08-22
  * @Version: V1.0
  */
-@TargetDataSource(value = DataSourceType.SLAVE)
 public interface MesInfoInstallationcostMapper extends BaseMapper<MesInfoInstallationcost> {
 
 }

module_kzks/src/main/java/org/jeecg/modules/projectCost/mapper/ProjectCostMapper.java

@@ -17,7 +17,6 @@ import org.jeecg.modules.projectCost.vo.ProjectCostVO;
  * @Date:   2023-08-15
  * @Version: V1.0
  */
-@TargetDataSource(value = DataSourceType.SLAVE)
 public interface ProjectCostMapper extends BaseMapper<ProjectCost> {
 
     /**根据任务号查询项目成本的主任务及组批后的主任务*/

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/mapper/ProjectCostHuijiMapper.java

@@ -14,7 +14,6 @@ import java.util.List;
  * @Date:   2023-08-15
  * @Version: V1.0
  */
-@TargetDataSource(value = DataSourceType.SLAVE)
 public interface ProjectCostHuijiMapper extends BaseMapper<ProjectCostHuiji> {
 
     /**

module_kzks/src/main/java/org/jeecg/modules/projectPushList/service/impl/ProjectPushListServiceImpl.java

@@ -28,6 +28,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -94,9 +95,14 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                         List<String> sysOrgCodeList = this.selectDeptCodeByUserId(vo.getUserId());
                         String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
 
+                        //判断是否为组批任务、是组批前还是组批后的任务
+                        String remark = null;
+                        if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"1")) remark = "（组批之后）";//组批之后
+                        else if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"0")) remark = "（组批之前）";//组批之前
+
                         //组推送对象
                         ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-                                cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
+                                cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent()+remark,sysOrgCodes);
                         pushList.add(push);
                     }
                 }
@@ -122,9 +128,14 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                         List<String> sysOrgCodeList = this.selectDeptCodeByUserId(vo.getUserId());
                         String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
 
+                        //判断是否为组批任务、是组批前还是组批后的任务
+                        String remark = null;
+                        if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"1")) remark = "（组批之后）";//组批之后
+                        else if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"0")) remark = "（组批之前）";//组批之前
+
                         //组推送对象
                         ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-                                cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
+                                cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent()+remark,sysOrgCodes);
                         pushList.add(push);
                     }
                 }
@@ -148,9 +159,14 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                         List<String> sysOrgCodeList = this.selectDeptCodeByUserId(vo.getUserId());
                         String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
 
+                        //判断是否为组批任务、是组批前还是组批后的任务
+                        String remark = null;
+                        if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"1")) remark = "（组批之后）";//组批之后
+                        else if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"0")) remark = "（组批之前）";//组批之前
+
                         //组推送对象
                         ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-                                cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
+                                cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent()+remark,sysOrgCodes);
                         pushList.add(push);
                     }
                 }
@@ -182,8 +198,14 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                     }
                 }
             }
+
+            //判断是否为组批任务、是组批前还是组批后的任务
+            String remark = null;
+            if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"1")) remark = "（组批之后）";//组批之后
+            else if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"0")) remark = "（组批之前）";//组批之前
+
             ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-                    cost.getTaskno(),cost.getTaskname(),"", username, "请及时处理合同额",orgcode);
+                    cost.getTaskno(),cost.getTaskname(),"", username, "请及时处理合同额"+remark,orgcode);
             pushList.add(push);
         }
 
@@ -212,8 +234,14 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                     }
                 }
             }
+
+            //判断是否为组批任务、是组批前还是组批后的任务
+            String remark = null;
+            if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"1")) remark = "（组批之后）";//组批之后
+            else if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"0")) remark = "（组批之前）";//组批之前
+
             ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-                    cost.getTaskno(),cost.getTaskname(),"", username, "请及时处理已收款",orgcode);
+                    cost.getTaskno(),cost.getTaskname(),"", username, "请及时处理已收款"+remark,orgcode);
             pushList.add(push);
         }
         this.saveBatch(pushList);

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/mapper/WzOutboundOrderBMapper.java

@@ -17,7 +17,6 @@ import org.jeecg.modules.wzOutboundOrder.vo.WzOutboundOrderBWLBMListVO;
  * @Date:   2023-08-17
  * @Version: V1.0
  */
-@TargetDataSource(value = DataSourceType.SLAVE)
 public interface WzOutboundOrderBMapper extends BaseMapper<WzOutboundOrderB> {
 
 

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/mapper/WzOutboundOrderHMapper.java

@@ -15,7 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Date:   2023-08-17
  * @Version: V1.0
  */
-@TargetDataSource(value = DataSourceType.SLAVE)
 public interface WzOutboundOrderHMapper extends BaseMapper<WzOutboundOrderH> {
 
     /**根据任务号列表查询所有出库单号*/