From d96220c654a19acad451c7ef389a17d3a992d2b0 Mon Sep 17 00:00:00 2001
From: zhangqinlin <983410zql>
Date: Thu, 23 Dec 2021 11:18:32 +0800
Subject: [PATCH] fix:bug

---
 .../service/impl/SendMessageServiceImpl.java  |  1 -
 .../mapper/xml/PayCaseCommitteeMapper.xml     |  2 +-
 .../xml/PayCaseCommitteeSubitemMapper.xml     |  3 +-
 .../data/mapper/xml/PayCaseCouncilMapper.xml  |  2 +-
 .../xml/PayCaseCouncilSubitemMapper.xml       |  5 +-
 .../impl/PayCaseCommitteeServiceImpl.java     |  2 +-
 .../PayResearchProjectController.java         | 47 ++++++++++---------
 .../PayWorkingGroupStatisticsController.java  |  1 -
 .../entity/PrincipalPeopleList.java           | 12 ++---
 9 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
index 2e218071..9679bc7f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
@@ -151,7 +151,6 @@ public class SendMessageServiceImpl implements SendMessageService {
                 String toUser = sendMessageDTO.getToUser();
                 String busId = sendMessageDTO.getBusId();
                 String busType = sendMessageDTO.getBusType();
-
                 SysAnnouncement announcement = new SysAnnouncement();
                 announcement.setTitile(sysSmsTemplate.getTemplateName());
                 announcement.setMsgContent(content);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml
index dffccaa8..26f8a047 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml
@@ -29,6 +29,6 @@
       <select id="listForChildren" resultType="com.jero.data.entity.Files">
         SELECT  ossf.id as fileId,ossf.file_name as fileName,ossf.create_time as createTime FROM pay_case_committee pcc left join pay_working_group_distribution_record pwgdr on(pcc.id=pwgdr.project_id) left join oss_file
            ossf on(pwgdr.file_id=ossf.id) where pcc.id=#{id}
-             and pwgdr.contacts_id=#{userId} group by pwgdr.id
+             and pwgdr.contacts_id=#{userId} group by ossf.file_name
     </select>
 </mapper>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
index 61859b3f..73814501 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
@@ -20,6 +20,7 @@
         left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
         left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
         left join pay_company_management pcm on(pm.company_id=pcm.id)
+        left join pay_meeting pme on (pe.id=pme.case_committee_id)
         <where>
             <if test=" name!=null and name != ''">
                 AND pt.name LIKE CONCAT('%',#{name},'%')
@@ -31,7 +32,7 @@
                 AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
             </if>
             <if test=" userName!=null and userName != ''">
-                AND pe.create_by = #{userName}
+                AND (pe.create_by = #{userName} or pme.director_name = #{userName})
             </if>
         </where>
         group by pe.id
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml
index 95b5e1a0..a28cf7b2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml
@@ -20,6 +20,6 @@
     <select id="listForChildren" resultType="com.jero.data.entity.Files">
         SELECT  ossf.id as fileId,ossf.file_name as fileName,ossf.create_time as createTime FROM pay_case_council pcc left join pay_working_group_distribution_record pwgdr on(pcc.id=pwgdr.project_id) left join oss_file
            ossf on(pwgdr.file_id=ossf.id) where pcc.id=#{id}
-             and pwgdr.contacts_id=#{userId} group by pwgdr.id
+             and pwgdr.contacts_id=#{userId} group by ossf.file_name
     </select>
 </mapper>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
index 408cd9b3..555bdbfb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
@@ -20,6 +20,7 @@
         left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id)
         left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
         left join pay_company_management pcm on(pm.company_id=pcm.id)
+        left join pay_meeting pme on (pe.id=pme.council_id)
         <where>
             <if test=" contactsNames!=null and contactsNames != ''">
                 AND pt.name LIKE CONCAT('%',#{contactsNames},'%')
@@ -31,7 +32,7 @@
                 AND pe.name LIKE CONCAT('%',#{councilNames},'%')
             </if>
             <if test=" userName!=null and userName != ''">
-                AND pe.create_by = #{userName}
+                AND (pe.create_by = #{userName} or pme.director_name = #{userName})
             </if>
         </where>
         group by pe.id
@@ -135,7 +136,7 @@
     </select>
 
     <select id="listTwo"  resultType="com.jero.data.entity.subCouncil">
-       SELECT pm.id as id, pt.name as contactsName,pm.company_name as companyName,pt.post as post,pt.phone as phone
+       SELECT pm.id as id, pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone
        from
         pay_case_council pe
         left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id)
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java
index db01453d..06fe749f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java
@@ -90,7 +90,7 @@ public class PayCaseCommitteeServiceImpl extends ServiceImpl<PayCaseCommitteeMap
         //判断手机号是否重复
         QueryWrapper<PayContactsManagement> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone",phone);
-        int count = payContactsManagementService.count();
+        int count = payContactsManagementService.count(queryWrapper);
         if(count>0){
             throw new JeroBootException("手机号已存在!");
         }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
index 68493d84..2a59f618 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
@@ -68,7 +68,7 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
 		if(StringUtils.isNotBlank(payResearchProject.getProjectName())){
 			queryWrapper.like("project_name",payResearchProject.getProjectName());
 		}
-		Page<PayResearchProject> page = new Page<PayResearchProject>(pageNo, pageSize);
+		Page<PayResearchProject> page = new Page<>(pageNo, pageSize);
 		IPage<PayResearchProject> pageList = payResearchProjectService.pageList(page, queryWrapper);
 		return Result.OK(pageList);
 	}
@@ -121,6 +121,7 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
 	 @PostMapping(value = "/add")
 	 public Result<?> add(@RequestBody PayResearchProject payResearchProject) {
 		 QueryWrapper<PayResearchProject> queryWrapper = new QueryWrapper<>();
+		 queryWrapper.eq("working_group_id",payResearchProject.getWorkingGroupId());
 		 queryWrapper.eq("project_name",payResearchProject.getProjectName());
 		 int count = payResearchProjectService.count(queryWrapper);
 		 if (count>0) {
@@ -154,33 +155,33 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
 	public Result<?> edit(@RequestBody PayResearchProject payResearchProject) {
 		QueryWrapper<PayResearchProject> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("project_name",payResearchProject.getProjectName());
-		queryWrapper.ne("id",payResearchProject.getId());
+		queryWrapper.eq("id",payResearchProject.getId());
 		int count = payResearchProjectService.count(queryWrapper);
-		if (count>0) {
+		if (count>1) {
 			return Result.error("项目名称已存在");
 		}
 		//删除关联文件表
 		payResearchProjectService.deleteFile(payResearchProject.getId());
-		//删除文件表
-		PayResearchProject byId = payResearchProjectService.getById(payResearchProject.getId());
-		if(StringUtils.isNotBlank(byId.getFiles())){
-			List<String> filesList = Arrays.asList(byId.getFiles().split(","));
-			if(StringUtils.isNotBlank(payResearchProject.getFiles())) {
-				List<String> newFilesList = Arrays.asList(payResearchProject.getFiles().split(","));
-				for(String s:filesList){
-					if(StringUtils.isBlank(s)){
-					throw new JeroBootException("文件id不能为空!");
-					}
-					//旧文件包含在新文件中则不删除
-					if(!newFilesList.contains(s)){
-						iossFileService.removeById(s);
-					}
-				}
-			}else {
-				//新文件为空则全部删除旧文件
-				iossFileService.removeByIds(filesList);
-			}
-		}
+//		//删除文件表
+//		PayResearchProject byId = payResearchProjectService.getById(payResearchProject.getId());
+//		if(StringUtils.isNotBlank(byId.getFiles())){
+//			List<String> filesList = Arrays.asList(byId.getFiles().split(","));
+//			if(StringUtils.isNotBlank(payResearchProject.getFiles())) {
+//				List<String> newFilesList = Arrays.asList(payResearchProject.getFiles().split(","));
+//				for(String s:filesList){
+//					if(StringUtils.isBlank(s)){
+//					throw new JeroBootException("文件id不能为空!");
+//					}
+//					//旧文件包含在新文件中则不删除
+//					if(!newFilesList.contains(s)){
+//						iossFileService.removeById(s);
+//					}
+//				}
+//			}else {
+//				//新文件为空则全部删除旧文件
+//				iossFileService.removeByIds(filesList);
+//			}
+//		}
 		//重新加入关系表
 		if(StringUtils.isNotBlank(payResearchProject.getFiles())){
 			String files = payResearchProject.getFiles();
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
index 08a019a1..cca7415b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
@@ -155,7 +155,6 @@ public class PayWorkingGroupStatisticsController {
 //                ArrayList<PayWorkingGroupStatistics> objects = new ArrayList<>();
 //                return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计");
 //            }
-
                 List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch,null);
                 //处理为空数据为0
                 for (PayWorkingGroupStatistics s : pageList) {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleList.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleList.java
index ed4672f0..51ecdd6f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleList.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleList.java
@@ -14,17 +14,13 @@ public class PrincipalPeopleList {
     @ApiModelProperty(value = "项目负责人id")
     private String principalId;
 
-    @Excel(name = "项目负责人", width = 15)
-    @ApiModelProperty(value = "项目负责人")
-    private String principalName;
-
-    @Excel(name = "来款项目", width = 15)
+    @Excel(name = "应收金额", width = 15)
     @DecimalMax(value = "9999999999.99",message = "应收总金额（元）格式错误")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     @ApiModelProperty(value = "应收总金额")
     private String allMoney;
 
-    @Excel(name = "实收总金额", width = 15)
+    @Excel(name = "实收金额", width = 15)
     @DecimalMax(value = "9999999999.99",message = "实收总金额（元）格式错误")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     @ApiModelProperty(value = "实收总金额")
@@ -34,5 +30,7 @@ public class PrincipalPeopleList {
     @ApiModelProperty(value = "个人完成率")
     private String finishRate;
 
-
+    @Excel(name = "项目负责人", width = 15)
+    @ApiModelProperty(value = "项目负责人")
+    private String principalName;
 }