资料维护调整

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java

@@ -1,5 +1,6 @@
 package com.jero.data.controller;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -14,6 +15,7 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.PasswordUtil;
 import com.jero.data.entity.ChildrenFindByName;
 import com.jero.data.entity.DTO.PayCaseCommitteeSubitemDTO;
+import com.jero.data.entity.PayCaseCommittee;
 import com.jero.data.entity.PayCaseCommitteeSubitem;
 import com.jero.data.entity.VO.payCaseCommitteeSubitemVO;
 import com.jero.data.entity.FindByName;
@@ -64,18 +66,19 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 						  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 						  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize
 								   ) {
-		QueryWrapper<PayCaseCommitteeSubitem> queryWrapper = Wrappers.query();
+		QueryWrapper<PayCaseCommittee> queryWrapper = Wrappers.query();
-		queryWrapper
+		QueryWrapper<PayCaseCommittee> queryWrapper2 = Wrappers.query();
-				.like(StringUtils.isNotBlank(name), "pt.name", name).or()
+		HashMap<String, Object> objectObjectHashMap = new HashMap<>();
-				.like(StringUtils.isNotBlank(companyName), "pm.company_name", companyName)
+		List<FindByName> pageList2 = payCaseCommitteeSubitemService.list4((pageNo-1)*pageSize,pageSize, name,companyName,fenBiaoWeiName,queryWrapper2);
-				.like(StringUtils.isNotBlank(fenBiaoWeiName), "pe.name", fenBiaoWeiName);
+		objectObjectHashMap.put("pages",pageList2.size()/pageSize);
-		Page<PayCaseCommitteeSubitem> page = new Page<>(pageNo, pageSize);
+		objectObjectHashMap.put("total",pageList2.size());
-
+		objectObjectHashMap.put("courent",pageNo);
-		IPage<FindByName> pageList = payCaseCommitteeSubitemService.list3(page, queryWrapper);
+		objectObjectHashMap.put("size",pageSize);
-		List<FindByName> records = pageList.getRecords();
+		objectObjectHashMap.put("pages",(pageList2.size()/pageSize)+1);
-		if (!CollectionUtils.isEmpty(records)) {
+		List<FindByName> pageList = payCaseCommitteeSubitemService.list3((pageNo-1)*pageSize,pageSize, name,companyName,fenBiaoWeiName,queryWrapper);
+		if (!CollectionUtils.isEmpty(pageList)) {
 			try {
-				records.forEach(p -> {
+				pageList.forEach(p -> {
 					if (!CollectionUtils.isEmpty(p.getList())) {
 						for (ChildrenFindByName q:p.getList()
 							 ) {
@@ -85,12 +88,12 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 						}
 					}
 				});
-				pageList.setRecords(records);
+				objectObjectHashMap.put("records",pageList);
 			} catch (Exception e) {
 				log.error("手机号、邮箱解密异常！", e);
 			}
 		}
-		return Result.OK(pageList);
+		return Result.OK(objectObjectHashMap);
 	}
 	/**
 	 * 列表查询

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java

@@ -1,9 +1,6 @@
 package com.jero.data.controller;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -145,12 +142,12 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
 		 return Result.OK("添加成功！");
 	 }
 	 /**
-	  * 添加
+	  * 定时新增父根会议目录
 	  * @return
 	  */
 	 @Transactional
-	 @AutoLog(value = "资料目录管理-新增定时父根会议目录")
+	 @AutoLog(value = "定时任务-定时新增父根会议目录")
-	 @ApiOperation(value = "资料目录管理-新增定时父根会议目录", notes = "资料目录管理-新增定时父根会议目录")
+	 @ApiOperation(value = "定时任务-定时新增父根会议目录", notes = "定时任务-定时新增父根会议目录")
 	 @PostMapping(value = "/addMeetingDataDirectory")
 	 public Result<?> addMeetingDataDirectory() {
 		 PayDataDirectory payDataDirectory = new PayDataDirectory();
@@ -158,10 +155,29 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
 		 payDataDirectory.setParentId("0");
 		 payDataDirectory.setCreateBy("admin");
 		 payDataDirectory.setSort("0");
-
+		 Calendar cal = Calendar.getInstance();
+		 int year = cal.get(Calendar.YEAR);
+		 int month = cal.get(Calendar.MONTH )+1;
+		 payDataDirectory.setName(year + "年" + month + "月"+"会议文件");
 		 payDataDirectoryService.save(payDataDirectory);
 		 return Result.OK("添加成功！");
 	 }
+	 /**
+	  * 获取当前月份会议文件夹的主键id
+	  * @return
+	  */
+	 @AutoLog(value = "定时任务-获取当前月份会议文件夹的主键id")
+	 @ApiOperation(value = "定时任务-获取当前月份会议文件夹的主键id", notes = "定时任务-获取当前月份会议文件夹的主键id")
+	 @PostMapping(value = "/addMeetingDataDirectoridy")
+	 public String addMeetingDataDirectoridy() {
+		 Calendar cal = Calendar.getInstance();
+		 int year = cal.get(Calendar.YEAR);
+		 int month = cal.get(Calendar.MONTH )+1;
+		 LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		 lambdaQueryWrapper.eq(PayDataDirectory::getName,year + "年" + month + "月"+"会议文件");
+		 PayDataDirectory one = payDataDirectoryService.getOne(lambdaQueryWrapper);
+		 return one.getId();
+	 }
 
 	 /**
 	  * 批量删除

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java

@@ -406,8 +406,10 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 				StringBuilder stringBuilder = new StringBuilder("会议邮件注意查收");
 				OSSFile byId = iossFileService.getById(fileId);
 				String fileName = byId.getFileName();
-				EmailSendMsgHandle emailHandle = new EmailSendMsgHandle();
+			ArrayList<String> fileList = new ArrayList<>();
-				emailHandle.SendMsgAndFile(mails, stringBuilder.toString(), stringBuilder.toString(), fileName);
+			fileList.add(fileName);
+			EmailSendMsgHandle emailHandle = new EmailSendMsgHandle();
+			emailHandle.SendMsgAndFile(mails, stringBuilder.toString(), stringBuilder.toString(), fileList);
 		return Result.OK("分发成功!");
 	}
 
@@ -431,15 +433,14 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 		StringBuilder stringBuilder = new StringBuilder("会议邮件注意查收");
 		EmailSendMsgHandle emailHandle = new EmailSendMsgHandle();
 		ArrayList<String> fileList = new ArrayList<>(Arrays.asList(fileIds.split(",")));
-		StringBuilder stringBuilder1 = new StringBuilder();
+		ArrayList<String> list = new ArrayList<>();
 		for(String id:fileList){
 			OSSFile byId = iossFileService.getById(id);
 			String fileName = byId.getFileName();
-			stringBuilder1.append(fileName+",");
+			list.add(fileName);
 		}
-		int i = stringBuilder1.lastIndexOf(",");
+
-		stringBuilder1.deleteCharAt(i);
+		emailHandle.SendMsgAndFile(mails, stringBuilder.toString(), stringBuilder.toString(),list);
-		emailHandle.SendMsgAndFile(mails, stringBuilder.toString(), stringBuilder.toString(), stringBuilder1.toString());
 		return Result.OK("分发成功!");
 	}
 

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.data.entity.PayCaseCommittee;
 import com.jero.data.entity.PayCaseCommitteeExcel;
 import com.jero.data.entity.PayCaseCommitteeSubitem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -24,11 +25,13 @@ import java.util.List;
  */
 public interface PayCaseCommitteeSubitemMapper extends BaseMapper<PayCaseCommitteeSubitem> {
 
-    Page<FindByName> list3 (IPage<PayCaseCommitteeSubitem> page, @Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
+    List<FindByName> list3 (@Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param(Constants.WRAPPER) Wrapper<PayCaseCommittee> wrapper);
 
     List<payCaseCommitteeSubitemVO> list2 (@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
 
     List<PayCaseCommitteeExcel> listExcel(@Param(Constants.WRAPPER) QueryWrapper<PayCaseCommitteeExcel> queryWrapper);
 
+    List<FindByName> list4(@Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param(Constants.WRAPPER) Wrapper<PayCaseCommittee> wrapper);
+
 }
 

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml

@@ -18,9 +18,39 @@
         pay_case_committee pe
         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)
-         ${ew.customSqlSegment}
+        <where>
+            <if test=" name!=null and name != ''">
+                AND pt.name LIKE CONCAT('%',#{name},'%')
+            </if>
+            <if test=" companyName!=null and companyName != ''">
+                AND pm.company_name LIKE CONCAT('%',#{companyName},'%')
+            </if>
+            <if test=" fenBiaoWeiName!=null and fenBiaoWeiName != ''">
+                AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
+            </if>
+        </where>
+        group by pe.id
+         limit #{pageNo},#{pageSize}
+    </select>
+    <select id="list4"  resultMap="people">
+        SELECT pe.id as id,pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name,pm.id as childrenId
+        from
+        pay_case_committee pe
+        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)
+        <where>
+            <if test=" name!=null and name != ''">
+                AND pt.name LIKE CONCAT('%',#{name},'%')
+            </if>
+            <if test=" companyName!=null and companyName != ''">
+                AND pm.company_name LIKE CONCAT('%',#{companyName},'%')
+            </if>
+            <if test=" fenBiaoWeiName!=null and fenBiaoWeiName != ''">
+                AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
+            </if>
+        </where>
+        group by pe.id
     </select>
-
 
     <select id="list2"  resultType="com.jero.data.entity.VO.payCaseCommitteeSubitemVO">
        SELECT pm.id as id,pt.id as contactId, pt.name as contactsName,pm.company_name as companyName,pt.post as post,pt.phone as phoneNamber,pt.email

jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.data.entity.FindByName;
+import com.jero.data.entity.PayCaseCommittee;
 import com.jero.data.entity.PayCaseCommitteeExcel;
 import com.jero.data.entity.PayCaseCommitteeSubitem;
 import com.jero.data.entity.VO.payCaseCommitteeSubitemVO;
@@ -28,5 +29,8 @@ public interface IPayCaseCommitteeSubitemService extends IService<PayCaseCommitt
 
     List<payCaseCommitteeSubitemVO> list2(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
 
-    IPage<FindByName> list3(Page<PayCaseCommitteeSubitem> page, QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
+    List<FindByName> list3(Integer pageNo,Integer pageSize,String name,String companyName,String fenBiaoWeiName, QueryWrapper<PayCaseCommittee> queryWrapper);
+
+    List<FindByName> list4(Integer pageNo,Integer pageSize,String name,String companyName,String fenBiaoWeiName, QueryWrapper<PayCaseCommittee> queryWrapper);
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.data.entity.FindByName;
+import com.jero.data.entity.PayCaseCommittee;
 import com.jero.data.entity.PayCaseCommitteeExcel;
 import com.jero.data.entity.PayCaseCommitteeSubitem;
 import com.jero.data.entity.VO.payCaseCommitteeSubitemVO;
@@ -46,7 +47,12 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl<PayCaseCommi
     }
 
     @Override
-    public IPage<FindByName> list3(Page<PayCaseCommitteeSubitem> page, QueryWrapper<PayCaseCommitteeSubitem> queryWrapper) {
+    public List<FindByName> list3(Integer pageNo,Integer pageSize,String name,String companyName,String fenBiaoWeiName, QueryWrapper<PayCaseCommittee> queryWrapper) {
-        return payCaseCommitteeSubitemMapper.list3(page, queryWrapper);
+        return payCaseCommitteeSubitemMapper.list3(pageNo,pageSize,name,companyName,fenBiaoWeiName, queryWrapper);
+    }
+
+    @Override
+    public List<FindByName> list4(Integer pageNo,Integer pageSize,String name,String companyName,String fenBiaoWeiName, QueryWrapper<PayCaseCommittee> queryWrapper) {
+        return payCaseCommitteeSubitemMapper.list4(pageNo,pageSize,name,companyName,fenBiaoWeiName, queryWrapper);
     }
 }

jero-boot-module-system/src/main/java/com/jero/modules/message/handle/ISendMsgHandle.java

@@ -1,8 +1,10 @@
 package com.jero.modules.message.handle;
 
+import java.util.List;
+
 public interface ISendMsgHandle {
 
 	void SendMsg(String es_receiver, String es_title, String es_content);
 
-	void SendMsgAndFile(String es_receiver, String es_title, String es_content,String fileName);
+	void SendMsgAndFile(String es_receiver, String es_title, String es_content, List<String> list);
 }

jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java

@@ -13,6 +13,7 @@ import javax.mail.internet.MimeMessage;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 public class EmailSendMsgHandle implements ISendMsgHandle {
     static String emailFrom;
@@ -45,9 +46,11 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
         }
 
     }
+
+
     //带附件发送邮件,多人多邮件；
-    @Override
+
-    public void SendMsgAndFile(String es_receiver, String es_title, String es_content, String fileName) {
+    public void SendMsgAndFile(String es_receiver, String es_title, String es_content, List<String> fileList ) {
         JavaMailSender mailSender = (JavaMailSender) SpringContextUtils.getBean("mailSender");
         MimeMessage message = mailSender.createMimeMessage();
         MimeMessageHelper helper = null;
@@ -67,7 +70,6 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
                     helper.setFrom(emailFrom);
                     helper.setSubject(es_title);
                     helper.setText(es_content, true);
-                    ArrayList<String> fileList = new ArrayList<>(Arrays.asList(fileName.split(",")));
                     for(String file :fileList) {
                         if(!StringUtils.isBlank(file)) {
                             FileSystemResource filePath = new FileSystemResource(new File("D:\\opt\\upFiles" + "\\" + file + ".pdf"));

jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/SmsSendMsgHandle.java

@@ -3,6 +3,8 @@ package com.jero.modules.message.handle.impl;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.modules.message.handle.ISendMsgHandle;
 
+import java.util.List;
+
 @Slf4j
 public class SmsSendMsgHandle implements ISendMsgHandle {
 
@@ -13,10 +15,11 @@ public class SmsSendMsgHandle implements ISendMsgHandle {
 	}
 
 	@Override
-	public void SendMsgAndFile(String es_receiver, String es_title, String es_content, String fileName) {
+	public void SendMsgAndFile(String es_receiver, String es_title, String es_content, List<String> list) {
-		// TODO Auto-generated method stub
-		log.info("发短信");
 
 	}
 
-}
+
+	}
+
+

jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/WxSendMsgHandle.java

@@ -2,6 +2,9 @@ package com.jero.modules.message.handle.impl;
 
 import lombok.extern.slf4j.Slf4j;
 import com.jero.modules.message.handle.ISendMsgHandle;
+
+import java.util.List;
+
 @Slf4j
 public class WxSendMsgHandle implements ISendMsgHandle {
 
@@ -12,10 +15,10 @@ public class WxSendMsgHandle implements ISendMsgHandle {
 	}
 
 	@Override
-	public void SendMsgAndFile(String es_receiver, String es_title, String es_content, String fileName) {
+	public void SendMsgAndFile(String es_receiver, String es_title, String es_content, List<String> list) {
-		// TODO Auto-generated method stub
-		log.info("发微信消息模板");
 
 	}
 
+
+
 }