Merge branch '元旦前上线版本' into branch2022-1-4

jero-boot-incoming-payment/src/main/java/com/jero/common/dto/PaySendContactsMessageDTO.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class PaySendContactsMessageDTO implements Serializable {
@@ -35,4 +36,8 @@ public class PaySendContactsMessageDTO implements Serializable {
      * 前端需要的参数值
      */
     private JSONObject json;
+    /**
+     * 文件
+     */
+    private List<String> listFile;
 }

jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="queryProject" resultType="com.jero.project.entity.PayCommonProject">
         <!-- 普通项目-->
-        select c.id,c.charge_project, c.charge_use, c.principal_id,su.realname as principal_name,c.contacts_temporary_id,c.contacts_temporary_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,'' as phone,'' as email,c.remarks,c.contract_num,c.charge_company_temporary_id,c.charge_way,c.files,c.charge_notice_no,c.charge_notice_id,c.year,c.mail_contacts_temporary_name
+        select c.id,c.charge_project, c.charge_use, c.principal_id,su.realname as principal_name,c.contacts_temporary_id,c.contacts_temporary_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,'' as phone,'' as email,c.remarks,c.contract_num,c.charge_company_temporary_id,c.charge_way,c.files,c.charge_notice_no,c.charge_notice_id,c.year,c.mail_contacts_temporary_name,'' as mission_and_objectives
         from pay_common_project c
         left join sys_user su on c.principal_id = su.id
         <where>
@@ -14,7 +14,7 @@
         </where>
         <!--工作组项目-->
         UNION ALL
-        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'','',gsub.remarks,gsub.contract_num,gsub.charge_company_temporary_id,gsub.charge_way,'',gsub.charge_notice_no,gsub.charge_notice_id,g.year,gsub.mail_contacts_temporary_name
+        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'','',gsub.remarks,gsub.contract_num,gsub.charge_company_temporary_id,gsub.charge_way,'',gsub.charge_notice_no,gsub.charge_notice_id,g.year,gsub.mail_contacts_temporary_name,g.mission_and_objectives
         from pay_working_group g
         left join sys_user su on g.principal_id_a = su.id
         inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id
@@ -25,7 +25,7 @@
         </where>
         <!-- 会议项目-->
         UNION ALL
-        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, su.realname,sit.company_contact_id,sit.company_contact_name,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,'','',sit.remark,'',sit.company_id,sit.pay_mode,'','','','',''
+        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, su.realname,sit.company_contact_id,sit.company_contact_name,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,'','',sit.remark,'',sit.company_id,sit.pay_mode,'','','','','',''
         from pay_meeting meeting
         left join sys_user su on meeting.director_id = su.id
         inner join pay_meeting_situation sit on meeting.id = sit.meeting_id
@@ -36,7 +36,7 @@
         </where>
         <!-- 会员项目-->
         UNION ALL
-        select msub.id,pmp.project_name,msub.charge_use,pmp.director_id,su.realname,msub.company_contact_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'','',msub.remark,msub.contract_no,msub.company_temporary_id,msub.payment_method,'',msub.charge_notice_no,msub.charge_notice_file_id,pmp.particular_year,msub.post_contact_name
+        select msub.id,pmp.project_name,msub.charge_use,pmp.director_id,su.realname,msub.company_contact_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'','',msub.remark,msub.contract_no,msub.company_temporary_id,msub.payment_method,'',msub.charge_notice_no,msub.charge_notice_file_id,pmp.particular_year,msub.post_contact_name,''
         from pay_member_project pmp
         left join sys_user su on pmp.director_id = su.id
         inner join pay_member_project_subitem msub on pmp.id = msub.project_id
@@ -47,7 +47,7 @@
         </where>
         <!-- 标协会员项目-->
         UNION ALL
-        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,tmsub.liaison_man_id,tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,'','','',tmember.year,''
+        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,tmsub.liaison_man_id,tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,'','','',tmember.year,'',''
         from tb_member_project tmember
         left join sys_user su on tmember.director_id = su.id
         inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
@@ -58,7 +58,7 @@
         </where>
         <!-- 标协会员证书项目-->
         UNION ALL
-        select tmps.id,tmember.project_name,tmps.charge_use,tmember.director_id,su.realname,tmps.liaison_man_id,tmps.liaison_man,tmps.company_name,tmps.amount_receivable,tmps.paid_amount,tmps.invoice_requirements,tmps.pack,tmps.in_account,tmps.make_invoice,tmps.mail,tmps.create_time,5,tmps.mobile,tmps.email,'','',tmps.company_id,tmps.payment_method,'','','',tmember.year,''
+        select tmps.id,tmember.project_name,tmps.charge_use,tmember.director_id,su.realname,tmps.liaison_man_id,tmps.liaison_man,tmps.company_name,tmps.amount_receivable,tmps.paid_amount,tmps.invoice_requirements,tmps.pack,tmps.in_account,tmps.make_invoice,tmps.mail,tmps.create_time,5,tmps.mobile,tmps.email,'','',tmps.company_id,tmps.payment_method,'','','',tmember.year,'',''
         from tb_member_project tmember
         left join sys_user su on tmember.director_id = su.id
         inner join tb_certificate_payment tmps on tmember.id=tmps.project_id

jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ContractCreateProjectSendMessageServiceImpl.java

@@ -12,6 +12,7 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
@@ -81,6 +82,9 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea
                 sendMessageDTO.setPhone(PasswordUtil.decrypt(paySendContactsMessageDTO.getPhone()));
                 sendMessageDTO.setToUser(PasswordUtil.decrypt(paySendContactsMessageDTO.getPhone()));
             }
+            if(!CollectionUtils.isEmpty(paySendContactsMessageDTO.getListFile())){
+                sendMessageDTO.setListFile(paySendContactsMessageDTO.getListFile());
+            }
             HashMap<String,String> map = new HashMap<>();
             map.put("projectName",paySendContactsMessageDTO.getProjectName());
             sendMessageDTO.setFromUser(sysUser.getUsername());

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml

@@ -43,9 +43,10 @@
             where contract_id = pic.id AND accounts_receivable_time is not null AND accounts_receivable_time < DATE_FORMAT( NOW(), '%Y-%m-%d' )
             AND accounts_receivable_amount != 0 AND accounts_receivable_amount > if(paid_amount is null or paid_amount = '',0,paid_amount)
         ) AS chargeStatus,
-            GROUP_CONCAT(project.projectName ORDER BY project.id DESC) AS associatedProject
+            if(pic.status = 6,GROUP_CONCAT(picac.charge_project ORDER BY picac.id DESC),GROUP_CONCAT(project.projectName ORDER BY project.id DESC)) AS associatedProject
             FROM pay_income_contract pic
             LEFT JOIN pay_income_contract_associated pica ON pica.contract_id = pic.id
+            LEFT JOIN pay_income_contract_associated_cancellation picac ON picac.contract_id = pic.id
             LEFT JOIN
             (
             SELECT id,charge_project AS projectName FROM pay_common_project
@@ -204,10 +205,11 @@
         select
             pic.*,
             pmc.post_status as postStatus,
-            GROUP_CONCAT(project.projectName ORDER BY project.id DESC) AS associatedProject
+            if(pic.status = 6,GROUP_CONCAT(picac.charge_project ORDER BY picac.id DESC),GROUP_CONCAT(project.projectName ORDER BY project.id DESC)) AS associatedProject
         from pay_income_contract pic
         LEFT JOIN pay_income_contract_associated pica ON pica.contract_id = pic.id
         left join pay_mail_contract pmc ON pic.id = pmc.contract_id
+        LEFT JOIN pay_income_contract_associated_cancellation picac ON picac.contract_id = pic.id
         LEFT JOIN
         (
             SELECT id,charge_project AS projectName FROM pay_common_project

jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java

@@ -1,24 +1,23 @@
 package com.jero.project.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.jero.common.aspect.annotation.Dict;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
+import com.jero.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @Description: pay_common_project
@@ -246,4 +245,9 @@ public class PayCommonProject implements Serializable {
      */
     @TableField(exist = false)
     private String checkPaymentStatus;
+    /**
+     * 工作组 任务及目标
+     */
+    @TableField(exist = false)
+    private String missionAndObjectives;
 }

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java

@@ -237,6 +237,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                 paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
                 paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
                 paySendContactsMessageDTO.setUserId(payWorkingGroup.getPrincipalIdA());
+                if(!CollectionUtils.isEmpty(listFile)){
+                    paySendContactsMessageDTO.setListFile(listFile);
+                }
                 paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
                 // 项目的应收金额＞0 发送缴费通知
                 if(!Objects.isNull(payWorkingGroupSubItem.getReceivableAmount()) && payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
@@ -245,30 +248,6 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                 paySendContactsMessageDTO.setJson(json);
                 contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
             }
-
-            if(!CollectionUtils.isEmpty(listFile)){
-                // 发送消息
-                SendMessageDTO sendMessageDTO = new SendMessageDTO();
-                if(!StringUtils.isBlank(payContactsManagement.getEmail())){
-                    sendMessageDTO.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
-                }
-                if(!StringUtils.isBlank(payContactsManagement.getPhone())){
-                    sendMessageDTO.setToUser(PasswordUtil.decrypt(payContactsManagement.getPhone()));
-                    sendMessageDTO.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
-                }
-                HashMap<String,String> map = new HashMap<>();
-                map.put("projectName",payWorkingGroup.getWorkingGroupProject());
-                sendMessageDTO.setFromUser(sysUserInfo.getUsername());
-                sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG22.getCode());
-                sendMessageDTO.setTemplateParam(map);
-                sendMessageDTO.setBusType("C_OPEN_TYPE22");
-                sendMessageDTO.setListFile(listFile);
-                JSONObject jsonNew = new JSONObject();
-                jsonNew.put("id",payWorkingGroupSubItem.getId());
-                sendMessageDTO.setBusId(jsonNew.toJSONString());
-                sendMessageService.SendMessageService(sendMessageDTO);
-            }
-
         }
         // 新建项目 给企业联系人2发送消息
         if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdTwo())){
@@ -280,6 +259,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                 paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
                 paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
                 paySendContactsMessageDTO.setUserId(payWorkingGroup.getPrincipalIdA());
+                if(!CollectionUtils.isEmpty(listFile)){
+                    paySendContactsMessageDTO.setListFile(listFile);
+                }
                 paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
                 // 项目的应收金额＞0 发送缴费通知
                 if(payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
@@ -288,28 +270,6 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                 paySendContactsMessageDTO.setJson(json);
                 contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
             }
-            if(!CollectionUtils.isEmpty(listFile)){
-                // 发送消息
-                SendMessageDTO sendMessageDTO = new SendMessageDTO();
-                if(!StringUtils.isBlank(payContactsManagement.getEmail())){
-                    sendMessageDTO.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
-                }
-                if(!StringUtils.isBlank(payContactsManagement.getPhone())){
-                    sendMessageDTO.setToUser(PasswordUtil.decrypt(payContactsManagement.getPhone()));
-                    sendMessageDTO.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
-                }
-                HashMap<String,String> map = new HashMap<>();
-                map.put("projectName",payWorkingGroup.getWorkingGroupProject());
-                sendMessageDTO.setFromUser(sysUserInfo.getUsername());
-                sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG22.getCode());
-                sendMessageDTO.setTemplateParam(map);
-                sendMessageDTO.setBusType("C_OPEN_TYPE22");
-                sendMessageDTO.setListFile(listFile);
-                JSONObject jsonNew = new JSONObject();
-                jsonNew.put("id",payWorkingGroupSubItem.getId());
-                sendMessageDTO.setBusId(jsonNew.toJSONString());
-                sendMessageService.SendMessageService(sendMessageDTO);
-            }
         }
         // 新建项目 给企业联系人3发送消息
         if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdThree())){
@@ -321,6 +281,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                 paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
                 paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
                 paySendContactsMessageDTO.setUserId(payWorkingGroup.getPrincipalIdA());
+                if(!CollectionUtils.isEmpty(listFile)){
+                    paySendContactsMessageDTO.setListFile(listFile);
+                }
                 paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
                 // 项目的应收金额＞0 发送缴费通知
                 if(payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
@@ -329,28 +292,6 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                 paySendContactsMessageDTO.setJson(json);
                 contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
             }
-            if(!CollectionUtils.isEmpty(listFile)){
-                // 发送消息
-                SendMessageDTO sendMessageDTO = new SendMessageDTO();
-                if(!StringUtils.isBlank(payContactsManagement.getEmail())){
-                    sendMessageDTO.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
-                }
-                if(!StringUtils.isBlank(payContactsManagement.getPhone())){
-                    sendMessageDTO.setToUser(PasswordUtil.decrypt(payContactsManagement.getPhone()));
-                    sendMessageDTO.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
-                }
-                HashMap<String,String> map = new HashMap<>();
-                map.put("projectName",payWorkingGroup.getWorkingGroupProject());
-                sendMessageDTO.setFromUser(sysUserInfo.getUsername());
-                sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG22.getCode());
-                sendMessageDTO.setTemplateParam(map);
-                sendMessageDTO.setBusType("C_OPEN_TYPE22");
-                sendMessageDTO.setListFile(listFile);
-                JSONObject jsonNew = new JSONObject();
-                jsonNew.put("id",payWorkingGroupSubItem.getId());
-                sendMessageDTO.setBusId(jsonNew.toJSONString());
-                sendMessageService.SendMessageService(sendMessageDTO);
-            }
         }
     }
 

jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java

@@ -1,11 +1,9 @@
 package com.jero.modules.message.controller;
 
-import java.util.Arrays;
+import com.alibaba.fastjson.JSON;
-import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import javax.servlet.http.HttpServletRequest;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import javax.servlet.http.HttpServletResponse;
-
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
@@ -15,23 +13,17 @@ import com.jero.modules.message.entity.MsgParams;
 import com.jero.modules.message.entity.SysMessageTemplate;
 import com.jero.modules.message.service.ISysMessageTemplateService;
 import com.jero.modules.message.util.PushMsgUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.alibaba.fastjson.JSON;
+import javax.servlet.http.HttpServletRequest;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.Arrays;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.Map;
-
-import lombok.extern.slf4j.Slf4j;
 
 /**
  * @Description: 消息模板
@@ -62,6 +54,9 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
 	public Result<?> queryPageList(SysMessageTemplate sysMessageTemplate, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
 			@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
 		QueryWrapper<SysMessageTemplate> queryWrapper = QueryGenerator.initQueryWrapper(sysMessageTemplate, req.getParameterMap());
+		if(!StringUtils.isBlank(req.getParameter("templateName"))){
+			queryWrapper.eq("template_name",req.getParameter("templateName"));
+		}
 		Page<SysMessageTemplate> page = new Page<SysMessageTemplate>(pageNo, pageSize);
 		IPage<SysMessageTemplate> pageList = sysMessageTemplateService.page(page, queryWrapper);
         return Result.OK(pageList);