推送列表新增返回参数：costType 成本类型

module_kzks/src/main/java/org/jeecg/modules/projectPushList/convert/ProjectPushListConvert.java

@@ -17,5 +17,5 @@ public interface ProjectPushListConvert {
     ProjectPushListConvert INSTANCE = Mappers.getMapper(ProjectPushListConvert .class);
 
     @Mapping(target = "sysOrgCode",source = "sysOrgCode")
-    ProjectPushList toProjectPushList(String taskno, String taskname,String pushSetId, String pushTo,String content,String sysOrgCode,Integer pushType);
+    ProjectPushList toProjectPushList(String taskno, String taskname,String pushSetId, String pushTo,String content,String sysOrgCode,Integer pushType,String costType);
 }

module_kzks/src/main/java/org/jeecg/modules/projectPushList/entity/ProjectPushList.java

@@ -82,4 +82,7 @@ public class ProjectPushList implements Serializable {
     private java.lang.String sysOrgCode;
     @ApiModelProperty(value = "推送类型")
     private java.lang.Integer pushType;
+
+    @ApiModelProperty(value = "成本类型")
+    private java.lang.String costType;
 }

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

@@ -99,7 +99,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                             if (remark == null) remark = "";
                             //组推送对象
                             ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-                                    cost.getTaskno(), cost.getTaskname(), set.getId(), vo.getUsername(), set.getContent() + remark, sysOrgCodes, 0);
+                                    cost.getTaskno(), cost.getTaskname(), set.getId(), vo.getUsername(), set.getContent() + remark, sysOrgCodes, 0,"0");
                             pushList.add(push);
                         }
                     }
@@ -142,7 +142,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                             if (remark == null) remark = "";
                             //组推送对象
                             ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-                                    cost.getTaskno(), cost.getTaskname(), set.getId(), vo.getUsername(), set.getContent() + remark, sysOrgCodes, 0);
+                                    cost.getTaskno(), cost.getTaskname(), set.getId(), vo.getUsername(), set.getContent() + remark, sysOrgCodes, 0,"1");
                             pushList.add(push);
                         }
                     }
@@ -185,7 +185,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                             if (remark == null) remark = "";
                             //组推送对象
                             ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-                                    cost.getTaskno(), cost.getTaskname(), set.getId(), vo.getUsername(), set.getContent() + remark, sysOrgCodes, 0);
+                                    cost.getTaskno(), cost.getTaskname(), set.getId(), vo.getUsername(), set.getContent() + remark, sysOrgCodes, 0,"2");
                             pushList.add(push);
                         }
                     }
@@ -199,7 +199,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
             // 3外协预算超限
             QueryWrapper<ProjectPushSet> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("cost_type", "3");// 3外协预算超限
+                queryWrapper1.eq("cost_type", "3");// 3外协预算超限
             List<ProjectPushSet> list = projectPushSetService.list(queryWrapper1);
             List<ProjectPushList> pushList = new ArrayList<>();//所有的推送列表
             if (list != null && !list.isEmpty()) {
@@ -225,7 +225,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                             if (remark == null) remark = "";
                             //组推送对象
                             ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-                                    cost.getTaskno(), cost.getTaskname(), set.getId(), vo.getUsername(), set.getContent() + remark, sysOrgCodes, 0);
+                                    cost.getTaskno(), cost.getTaskname(), set.getId(), vo.getUsername(), set.getContent() + remark, sysOrgCodes, 0,"3");
                             pushList.add(push);
                         }
                     }
@@ -239,7 +239,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
             // 4材料预算超限
             QueryWrapper<ProjectPushSet> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("cost_type", "3");// 4材料预算超限
+            queryWrapper1.eq("cost_type", "4");// 4材料预算超限
             List<ProjectPushSet> list = projectPushSetService.list(queryWrapper1);
             List<ProjectPushList> pushList = new ArrayList<>();//所有的推送列表
             if (list != null && !list.isEmpty()) {
@@ -265,7 +265,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                             if (remark == null) remark = "";
                             //组推送对象
                             ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-                                    cost.getTaskno(), cost.getTaskname(), set.getId(), vo.getUsername(), set.getContent() + remark, sysOrgCodes, 1);
+                                    cost.getTaskno(), cost.getTaskname(), set.getId(), vo.getUsername(), set.getContent() + remark, sysOrgCodes, 1,"4");
                             pushList.add(push);
                         }
                     }
@@ -309,7 +309,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                 else if (cost.getPccode() != null && Objects.equals(cost.getStatus(), "0")) remark = "（组批之前）";//组批之前
                 if (remark == null) remark = "";
                 ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-                        cost.getTaskno(), cost.getTaskname(), "", username, "请及时处理合同额" + remark, orgcode, 0);
+                        cost.getTaskno(), cost.getTaskname(), "", username, "请及时处理合同额" + remark, orgcode, 0,"5");
                 pushList.add(push);
             }
             return pushList;
@@ -350,7 +350,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                 else if (cost.getPccode() != null && Objects.equals(cost.getStatus(), "0")) remark = "（组批之前）";//组批之前
                 if (remark == null) remark = "";
                 ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
-                        cost.getTaskno(), cost.getTaskname(), "", username, "请及时处理已收款" + remark, orgcode, 0);
+                        cost.getTaskno(), cost.getTaskname(), "", username, "请及时处理已收款" + remark, orgcode, 0,"6");
                 pushList.add(push);
             }
             return pushList;