消息修改,添加日志，权限

2021-09-26 09:20:35 +08:00
parent 83c31ceba7
commit 964fa0edb4
46 changed files with 928 additions and 279 deletions
@@ -11,35 +11,7 @@ public enum SysAnnmentTypeEnum {
    /**
     * 工作流跳转链接我的办公
     */
-    BPM("bpm", "url", "/bpm/task/MyTaskList"),
-
-    // 管理端
-    M_OPEN_TYPE1("M_OPEN_TYPE1","component","@comp/ProjectDetailModal"),
-    M_OPEN_TYPE2("M_OPEN_TYPE2","url","/contractManagement/RevenueContractDetail"),
-    M_OPEN_TYPE3("M_OPEN_TYPE3","url","/contractManagement/RevenueContractDetail"),
-    M_OPEN_TYPE4("M_OPEN_TYPE4","url","/contractManagement/RevenueContractDetail"),
-    M_OPEN_TYPE5("M_OPEN_TYPE5","component","@views/incomePayments/meetManage/modules/AuditModal"),
-    M_OPEN_TYPE6("M_OPEN_TYPE6","component","@comp/ProjectDetailModal"),
-    M_OPEN_TYPE7("M_OPEN_TYPE7","component","@comp/ProjectDetailModal"),
-    M_OPEN_TYPE8("M_OPEN_TYPE8","url","/incomePayments/meetManage/SignUpInfoDetail"),
-    M_OPEN_TYPE9("M_OPEN_TYPE9","url","/businessManagement/BusinessManagement"),
-    // todo 待定企业端
-    C_OPEN_TYPE1("C_OPEN_TYPE1","url",""),
-    C_OPEN_TYPE2("C_OPEN_TYPE2","component",""),
-    C_OPEN_TYPE3("C_OPEN_TYPE3","component",""),
-    C_OPEN_TYPE4("C_OPEN_TYPE4","component",""),
-    C_OPEN_TYPE5("C_OPEN_TYPE5","component",""),
-    C_OPEN_TYPE6("C_OPEN_TYPE6","component",""),
-    C_OPEN_TYPE7("C_OPEN_TYPE7","component",""),
-    C_OPEN_TYPE8("C_OPEN_TYPE8","none",""),
-    C_OPEN_TYPE9("C_OPEN_TYPE9","",""),
-    C_OPEN_TYPE10("C_OPEN_TYPE10","",""),
-    C_OPEN_TYPE11("C_OPEN_TYPE11","component",""),
-    C_OPEN_TYPE12("C_OPEN_TYPE12","component","");
-
-
-
-
+    BPM("bpm", "url", "/bpm/task/MyTaskList");

    /**
     * 业务类型(email:邮件 bpm:流程)
@@ -10,4 +10,12 @@ public class RoleCommon {
     * 财务人员
     */
    public final static String CWRY = "cwry";
+    /**
+     * 合同负责人
+     */
+    public final static String HTFZR = "htfzr";
+    /**
+     * 企业信息维护人员
+     */
+    public final static String QYXXWHRY = "qyxxwhry";
 }
@@ -4,6 +4,7 @@ import lombok.Data;

 import java.io.Serializable;
 import java.util.HashMap;
+import java.util.List;

 /**
 * @Description 发送短信，消息，邮件
@@ -44,4 +45,8 @@ public class SendMessageDTO implements Serializable {
     * 模板参数
     */
    private HashMap<String, String> templateParam;
+    /**
+     * 文件名集合(邮箱发送附件)
+     */
+    private List<String> listFile;
 }
@@ -0,0 +1,85 @@
+package com.jero.common.enums;
+
+import com.jero.common.util.oConvertUtils;
+
+public enum MessageUrlEnums {
+
+    // 管理端
+    M_OPEN_TYPE1("M_OPEN_TYPE1","component","/ProjectDetailModal"),
+    M_OPEN_TYPE2("M_OPEN_TYPE2","url","/contractManagement/RevenueContractDetail"),
+    M_OPEN_TYPE3("M_OPEN_TYPE3","url","/contractManagement/RevenueContractDetail"),
+    M_OPEN_TYPE4("M_OPEN_TYPE4","url","/contractManagement/RevenueContractDetail"),
+    M_OPEN_TYPE5("M_OPEN_TYPE5","component","@views/incomePayments/meetManage/modules/AuditModal"),
+    M_OPEN_TYPE6("M_OPEN_TYPE6","component","@comp/ProjectDetailModal"),
+    M_OPEN_TYPE7("M_OPEN_TYPE7","component","@comp/ProjectDetailModal"),
+    M_OPEN_TYPE8("M_OPEN_TYPE8","url","/incomePayments/meetManage/SignUpInfoDetail"),
+    M_OPEN_TYPE9("M_OPEN_TYPE9","url","/businessManagement/BusinessManagement"),
+    // todo 待定企业端
+    C_OPEN_TYPE1("C_OPEN_TYPE1","url",""),
+    C_OPEN_TYPE2("C_OPEN_TYPE2","component",""),
+    C_OPEN_TYPE3("C_OPEN_TYPE3","component",""),
+    C_OPEN_TYPE4("C_OPEN_TYPE4","component",""),
+    C_OPEN_TYPE5("C_OPEN_TYPE5","component",""),
+    C_OPEN_TYPE6("C_OPEN_TYPE6","component",""),
+    C_OPEN_TYPE7("C_OPEN_TYPE7","component",""),
+    C_OPEN_TYPE8("C_OPEN_TYPE8","none",""),
+    C_OPEN_TYPE9("C_OPEN_TYPE9","",""),
+    C_OPEN_TYPE10("C_OPEN_TYPE10","",""),
+    C_OPEN_TYPE11("C_OPEN_TYPE11","component",""),
+    C_OPEN_TYPE12("C_OPEN_TYPE12","component","");
+
+    /**
+     * 业务类型(email:邮件 bpm:流程)
+     */
+    private String type;
+    /**
+     * 打开方式 组件：component 路由：url
+     */
+    private String openType;
+    /**
+     * 组件/路由 地址
+     */
+    private String openPage;
+
+    MessageUrlEnums(String type, String openType, String openPage) {
+        this.type = type;
+        this.openType = openType;
+        this.openPage = openPage;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getOpenType() {
+        return openType;
+    }
+
+    public void setOpenType(String openType) {
+        this.openType = openType;
+    }
+
+    public String getOpenPage() {
+        return openPage;
+    }
+
+    public void setOpenPage(String openPage) {
+        this.openPage = openPage;
+    }
+
+    public static MessageUrlEnums getByType(String type) {
+        if (oConvertUtils.isEmpty(type)) {
+            return null;
+        }
+        for (MessageUrlEnums val : values()) {
+            if (val.getType().equals(type)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
@@ -6,8 +6,9 @@ public interface ContractCreateProjectSendMessageService {
    * @Author  lqt
    * @Date   2021/9/24
    * @Param projectName 项目名称
+    * @Param projectId 项目id
    * @Return
    * @Exception
    */
-    void ContractCreateProjectSendMessageService(String projectName);
+    void ContractCreateProjectSendMessageService(String projectName,String projectId);
 }
@@ -30,7 +30,7 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea
    private SendMessageService sendMessageService;

    @Override
-    public void ContractCreateProjectSendMessageService(String projectName) {
+    public void ContractCreateProjectSendMessageService(String projectName,String projectId) {
        // 获取项目负责人，发送消息
        List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.XMFZR));
        if(!CollectionUtils.isEmpty(list)){
@@ -43,13 +43,13 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea
                }
                HashMap<String,String> map = new HashMap<>();
                map.put("projectName",projectName);
-                sendMessageDTO.setFromUser(sysUser.getId());
+                sendMessageDTO.setFromUser(sysUser.getUsername());
                sendMessageDTO.setToUser(p.getUsername());
                sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG1.getCode());
                sendMessageDTO.setTemplateParam(map);
                sendMessageDTO.setBusType("M_OPEN_TYPE1");
                JSONObject json = new JSONObject();
-                json.put("id",p.getId());
+                json.put("id",projectId);
                sendMessageDTO.setBusId(json.toJSONString());
                sendMessageService.SendMessageService(sendMessageDTO);
            });
@@ -5,6 +5,7 @@ import com.jero.common.common.ProjectCommon;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.WebsocketConst;
 import com.jero.common.dto.SendMessageDTO;
+import com.jero.common.enums.MessageUrlEnums;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.SendMessageService;
 import com.jero.common.system.api.ISysBaseAPI;
@@ -86,7 +87,12 @@ public class SendMessageServiceImpl implements SendMessageService {
        if(templateType.contains(ProjectCommon.MESSAGE_TYPE2) && !StringUtils.isEmpty(sendMessageDTO.getEmail())){
            try {
                EmailSendMsgHandle emailHandle = new EmailSendMsgHandle();
-                emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content);
+                // 发送带附件邮箱
+                if(!CollectionUtils.isEmpty(sendMessageDTO.getListFile())){
+                    emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile());
+                }else{
+                    emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content);
+                }
            }catch (Exception e){
                log.error("发送邮件异常",e);
            }
@@ -112,8 +118,8 @@ public class SendMessageServiceImpl implements SendMessageService {
                announcement.setBusId(busId);
                announcement.setBusType(busType);
                if(!StringUtils.isEmpty(busType)){
-                    announcement.setOpenType(SysAnnmentTypeEnum.getByType(busType).getOpenType());
-                    announcement.setOpenPage(SysAnnmentTypeEnum.getByType(busType).getOpenPage());
+                    announcement.setOpenType(MessageUrlEnums.getByType(busType).getOpenType());
+                    announcement.setOpenPage(MessageUrlEnums.getByType(busType).getOpenPage());
                }
                announcement.setTemplateCode(sendMessageDTO.getTemplateCode());
                sysAnnouncementService.save(announcement);
@@ -2,16 +2,23 @@ package com.jero.company.controller;

 import java.util.*;
 import java.util.stream.Collectors;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.common.RoleCommon;
+import com.jero.common.dto.SendMessageDTO;
+import com.jero.common.enums.ManagementMessageEnums;
+import com.jero.common.service.SendMessageService;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
@@ -23,10 +30,14 @@ import com.jero.company.common.PayContactsManagementCommon;
 import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.service.IPayCompanyManagementService;
 import com.jero.company.service.ProjectCountService;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
+import com.jero.pack.common.PackCommon;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -59,6 +70,11 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	private Environment env;
 	@Autowired
 	private ProjectCountService projectCountService;
+
+	@Resource
+	private ISysUserService sysUserService;
+	@Resource
+	private SendMessageService sendMessageService;
 	
 	/**
 	 * 分页列表查询
@@ -69,6 +85,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	 * @param req
 	 * @return
 	 */
+	@RequiresPermissions("company:search")
 	@ApiOperation(value="企业管理-分页列表查询", notes="企业管理-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayCompanyManagement payCompanyManagement,
@@ -181,6 +198,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 			 }
 		 }
 		 payCompanyManagementService.save(payCompanyManagement);
+
 		 return Result.OK("添加成功！",payCompanyManagement);
 	 }
 	
@@ -190,6 +208,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	 * @param payCompanyManagement 企业管理
 	 * @return
 	 */
+	@AutoLog(value = "企业管理-添加")
+	@RequiresPermissions("company:add")
 	@ApiOperation(value="企业管理-添加", notes="企业管理-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayCompanyManagement payCompanyManagement) {
@@ -241,6 +261,26 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 			}
 		}
 		payCompanyManagementService.save(payCompanyManagement);
+		if(Objects.equals(dataSource,PayCompanyManagementCommon.DATA_SOURCE2)){
+			// 获取项目负责人，发送消息
+			List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.QYXXWHRY));
+			if(!CollectionUtils.isEmpty(list)){
+				list.forEach(item->{
+					// 发送消息
+					SendMessageDTO sendMessageDTO = new SendMessageDTO();
+					if(!StringUtils.isBlank(item.getEmail())){
+						sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail()));
+					}
+					HashMap<String,String> map = new HashMap<>();
+					sendMessageDTO.setFromUser(sysUser.getUsername());
+					sendMessageDTO.setToUser(item.getUsername());
+					sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG9.getCode());
+					sendMessageDTO.setTemplateParam(map);
+					sendMessageDTO.setBusType("M_OPEN_TYPE9");
+					sendMessageService.SendMessageService(sendMessageDTO);
+				});
+			}
+		}
 		return Result.OK("添加成功！",payCompanyManagement);
 	}
 	
@@ -250,6 +290,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	 * @param payCompanyManagement 企业管理
 	 * @return
 	 */
+	@AutoLog(value = "企业管理-编辑")
+	@RequiresPermissions("company:edit")
 	@ApiOperation(value="企业管理-编辑", notes="企业管理-编辑")
 	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayCompanyManagement payCompanyManagement) {
@@ -294,6 +336,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	  * @param id 企业管理id
 	  * @return
 	  */
+	 @AutoLog(value = "企业管理-确认")
+	 @RequiresPermissions("company:confirm")
 	 @ApiOperation(value="企业管理-确认", notes="企业管理-确认")
 	 @GetMapping(value = "/audit")
 	 public Result<?> audit(@RequestParam(name="id") String id) {
@@ -315,6 +359,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	 * @param id 企业管理id
 	 * @return
 	 */
+	@AutoLog(value = "企业管理-删除")
+	@RequiresPermissions("company:delete")
 	@ApiOperation(value="企业管理-通过id删除", notes="企业管理-通过id删除")
 	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id") String id) {
@@ -332,6 +378,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	 * @param ids 企业管理ids 逗号分隔
 	 * @return
 	 */
+	@AutoLog(value = "企业管理-批量删除")
+	@RequiresPermissions("company:batchDel")
 	@ApiOperation(value="企业管理-批量删除", notes="企业管理-批量删除")
 	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
@@ -355,6 +403,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	  * @param dutyCode 信用代码
 	  * @return
 	  */
+	 @AutoLog(value = "企业管理-通过信用代码查询")
 	 @ApiOperation(value="企业管理-通过信用代码查询", notes="企业管理-通过信用代码查询")
 	 @GetMapping(value = "/queryByDutyCode")
 	 public Result<?> queryByDutyCode(@RequestParam(name="dutyCode") String dutyCode) {
@@ -385,6 +434,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	* @param companyName 企业名称
 	* @return
 	*/
+	@AutoLog(value = "企业管理-通过企业名称查询")
 	@ApiOperation(value="企业管理-通过企业名称查询", notes="企业管理-通过企业名称查询")
 	@GetMapping(value = "/queryByCompanyName")
 	public Result<?> queryByCompanyName(@RequestParam(name="companyName") String companyName) {
@@ -415,6 +465,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	 * @param id 企业管理id
 	 * @return
 	 */
+	@AutoLog(value = "企业管理-查询详情")
 	@ApiOperation(value="企业管理-通过id查询", notes="企业管理-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id") String id) {
@@ -431,6 +482,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
    * @param request
    * @param payCompanyManagement 企业管理
    */
+	@AutoLog(value = "企业管理-导出excel")
+	@RequiresPermissions("company:export")
 	@ApiOperation(value="企业管理-导出excel", notes="企业管理-导出excel")
    @GetMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PayCompanyManagement payCompanyManagement) {
@@ -474,6 +527,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	  *
 	  * @return
 	  */
+	 @AutoLog(value = "企业管理-模板下载")
+	 @RequiresPermissions("company:downTemplate")
 	 @ApiOperation(value="企业管理-模板下载", notes="企业管理-模板下载")
 	 @GetMapping(value = "/downloadExcelModel")
 	 public ModelAndView downloadExcelModel() {
@@ -486,6 +541,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
    * @param request
    * @return
    */
+	@AutoLog(value = "企业管理-excel导入数据")
+	@RequiresPermissions("company:import")
 	@ApiOperation(value="企业管理-excel导入数据", notes="企业管理-excel导入数据")
    @PostMapping(value = "/importExcel")
    public Result<?> importExcel(HttpServletRequest request) {
@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.util.PasswordUtil;
@@ -28,6 +29,7 @@ import com.jero.company.service.ProjectCountService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -63,11 +65,9 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	private Environment env;
 	@Autowired
 	private ProjectCountService projectCountService;
-	 @Value("${defaultPassword}")
-	 private String defaultPassword;
+	@Value("${defaultPassword}")
+	private String defaultPassword;

-	// todo 缺少联系人加入到用户表，可以登录
-	
 	/**
 	 * 分页列表查询
 	 *
@@ -76,6 +76,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 * @param pageSize 条数
 	 * @return
 	 */
+	@RequiresPermissions("contact:search")
 	@ApiOperation(value="联系人管理-分页列表查询", notes="联系人管理-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayContactsManagement payContactsManagement,
@@ -181,6 +182,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 * @param payContactsManagement 联系人管理
 	 * @return
 	 */
+	@AutoLog(value = "联系人管理-添加")
+	@RequiresPermissions("contact:add")
 	@ApiOperation(value="联系人管理-添加", notes="联系人管理-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayContactsManagement payContactsManagement) {
@@ -242,6 +245,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 * @param payContactsManagement
 	 * @return
 	 */
+	@AutoLog(value = "联系人管理-编辑")
+	@RequiresPermissions("contact:edit")
 	@ApiOperation(value="联系人管理-编辑", notes="联系人管理-编辑")
 	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayContactsManagement payContactsManagement) {
@@ -302,6 +307,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 * @param id
 	 * @return
 	 */
+	@AutoLog(value = "联系人管理-删除")
+	@RequiresPermissions("contact:delete")
 	@ApiOperation(value="联系人管理-通过id删除", notes="联系人管理-通过id删除")
 	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id") String id) {
@@ -319,6 +326,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 * @param ids
 	 * @return
 	 */
+	@AutoLog(value = "联系人管理-批量删除")
+	@RequiresPermissions("contact:batchDel")
 	@ApiOperation(value="联系人管理-批量删除", notes="联系人管理-批量删除")
 	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
@@ -342,6 +351,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  * @param phone 手机号
 	  * @return
 	  */
+	 @AutoLog(value = "联系人管理-通过手机号查询")
 	 @ApiOperation(value="联系人管理-通过手机号查询", notes="联系人管理-通过手机号查询")
 	 @GetMapping(value = "/queryByCompanyName")
 	 public Result<?> queryByCompanyName(@RequestParam(name="phone") String phone) {
@@ -374,6 +384,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  * @param name 联系人姓名
 	  * @return
 	  */
+	 @AutoLog(value = "联系人管理-通过联系人姓名查询")
 	 @ApiOperation(value="联系人管理-通过联系人姓名查询", notes="联系人管理-通过联系人姓名查询")
 	 @GetMapping(value = "/queryByName")
 	 public Result<?> queryByName(@RequestParam(name="name") String name,@RequestParam(name="companyId") String companyId) {
@@ -429,6 +440,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 * @param id
 	 * @return
 	 */
+	@AutoLog(value = "联系人管理-查询详情")
 	@ApiOperation(value="联系人管理-通过id查询", notes="联系人管理-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id") String id) {
@@ -476,6 +488,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  * @param companyId 企业id
 	  * @return
 	  */
+	 @AutoLog(value = "联系人管理-通过企业id查询用户")
 	 @ApiOperation(value="联系人管理-通过企业id查询用户", notes="联系人管理-通过企业id查询用户")
 	 @GetMapping(value = "/queryByCompany")
 	 public Result<?> queryByCompany(@RequestParam(name="companyId") String companyId) {
@@ -501,6 +514,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
    * @param request
    * @param payContactsManagement 联系人管理
    */
+	@AutoLog(value = "联系人管理-导出excel")
+	@RequiresPermissions("contact:export")
 	@ApiOperation(value="联系人管理-导出excel", notes="联系人管理-导出excel")
    @GetMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PayContactsManagement payContactsManagement) {
@@ -548,6 +563,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  *
 	  * @return
 	  */
+	 @AutoLog(value = "联系人管理-模板下载")
+	 @RequiresPermissions("contact:downTemplate")
 	 @ApiOperation(value="联系人管理-模板下载", notes="联系人管理-模板下载")
 	 @GetMapping(value = "/downloadExcelModel")
 	 public ModelAndView downloadExcelModel() {
@@ -561,6 +578,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
    * @param response
    * @return
    */
+	@AutoLog(value = "联系人管理-excel导入数据")
+	@RequiresPermissions("contact:import")
 	@ApiOperation(value="联系人管理-excel导入数据", notes="联系人管理-excel导入数据")
    @PostMapping(value = "/importExcel")
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
@@ -10,6 +10,5 @@ public interface ProjectCountService {
    * @Return
    * @Exception
    */
-    // todo 缺少标协会员的联系人id
    void getProjectCount(String companyId,String contactsId);
 }
@@ -42,9 +42,9 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "收入合同关联-分页列表查询")
-	// @ApiOperation(value="收入合同关联-分页列表查询", notes="收入合同关联-分页列表查询")
-	@GetMapping(value = "/list")
+//	@AutoLog(value = "收入合同关联-分页列表查询")
+//	// @ApiOperation(value="收入合同关联-分页列表查询", notes="收入合同关联-分页列表查询")
+//	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayIncomeContractAssociated payIncomeContractAssociated,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -61,9 +61,9 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
 	 * @param payIncomeContractAssociated
 	 * @return
 	 */
-	@AutoLog(value = "收入合同关联-添加")
-//	@ApiOperation(value="收入合同关联-添加", notes="收入合同关联-添加")
-	@PostMapping(value = "/add")
+//	@AutoLog(value = "收入合同关联-添加")
+////	@ApiOperation(value="收入合同关联-添加", notes="收入合同关联-添加")
+//	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) {
 		payIncomeContractAssociatedService.save(payIncomeContractAssociated);
 		return Result.OK("添加成功！");
@@ -75,9 +75,9 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
 	 * @param payIncomeContractAssociated
 	 * @return
 	 */
-	@AutoLog(value = "收入合同关联-编辑")
-	// @ApiOperation(value="收入合同关联-编辑", notes="收入合同关联-编辑")
-	@PostMapping(value = "/edit")
+//	@AutoLog(value = "收入合同关联-编辑")
+//	// @ApiOperation(value="收入合同关联-编辑", notes="收入合同关联-编辑")
+//	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) {
 		payIncomeContractAssociatedService.updateById(payIncomeContractAssociated);
 		return Result.OK("编辑成功!");
@@ -89,9 +89,9 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "收入合同关联-通过id删除")
-	// @ApiOperation(value="收入合同关联-通过id删除", notes="收入合同关联-通过id删除")
-	@GetMapping(value = "/delete")
+//	@AutoLog(value = "收入合同关联-通过id删除")
+//	// @ApiOperation(value="收入合同关联-通过id删除", notes="收入合同关联-通过id删除")
+//	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		payIncomeContractAssociatedService.removeById(id);
 		return Result.OK("删除成功!");
@@ -103,9 +103,9 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "收入合同关联-批量删除")
-	// @ApiOperation(value="收入合同关联-批量删除", notes="收入合同关联-批量删除")
-	@GetMapping(value = "/deleteBatch")
+//	@AutoLog(value = "收入合同关联-批量删除")
+//	// @ApiOperation(value="收入合同关联-批量删除", notes="收入合同关联-批量删除")
+//	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.payIncomeContractAssociatedService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
@@ -117,9 +117,9 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "收入合同关联-通过id查询")
-	// @ApiOperation(value="收入合同关联-通过id查询", notes="收入合同关联-通过id查询")
-	@GetMapping(value = "/queryById")
+//	@AutoLog(value = "收入合同关联-通过id查询")
+//	// @ApiOperation(value="收入合同关联-通过id查询", notes="收入合同关联-通过id查询")
+//	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
 		PayIncomeContractAssociated payIncomeContractAssociated = payIncomeContractAssociatedService.getById(id);
 		if(payIncomeContractAssociated==null) {
@@ -134,7 +134,7 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
    * @param request
    * @param payIncomeContractAssociated
    */
-    @RequestMapping(value = "/exportXls")
+//    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PayIncomeContractAssociated payIncomeContractAssociated) {
        return super.exportXls(request, payIncomeContractAssociated, PayIncomeContractAssociated.class, "pay_income_contract_associated");
    }
@@ -146,7 +146,7 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
    * @param response
    * @return
    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, PayIncomeContractAssociated.class);
    }
@@ -41,9 +41,9 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "审核记录-分页列表查询")
-	// @ApiOperation(value="审核记录-分页列表查询", notes="审核记录-分页列表查询")
-	@GetMapping(value = "/list")
+//	@AutoLog(value = "审核记录-分页列表查询")
+//	// @ApiOperation(value="审核记录-分页列表查询", notes="审核记录-分页列表查询")
+//	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayIncomeContractAudit payIncomeContractAudit,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -60,9 +60,9 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
 	 * @param payIncomeContractAudit
 	 * @return
 	 */
-	@AutoLog(value = "审核记录-添加")
-	// @ApiOperation(value="审核记录-添加", notes="审核记录-添加")
-	@PostMapping(value = "/add")
+//	@AutoLog(value = "审核记录-添加")
+//	// @ApiOperation(value="审核记录-添加", notes="审核记录-添加")
+//	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayIncomeContractAudit payIncomeContractAudit) {
 		payIncomeContractAuditService.save(payIncomeContractAudit);
 		return Result.OK("添加成功！");
@@ -74,9 +74,9 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
 	 * @param payIncomeContractAudit
 	 * @return
 	 */
-	@AutoLog(value = "审核记录-编辑")
-	// @ApiOperation(value="审核记录-编辑", notes="审核记录-编辑")
-	@PostMapping(value = "/edit")
+//	@AutoLog(value = "审核记录-编辑")
+//	// @ApiOperation(value="审核记录-编辑", notes="审核记录-编辑")
+//	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayIncomeContractAudit payIncomeContractAudit) {
 		payIncomeContractAuditService.updateById(payIncomeContractAudit);
 		return Result.OK("编辑成功!");
@@ -88,9 +88,9 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "审核记录-通过id删除")
-	// @ApiOperation(value="审核记录-通过id删除", notes="审核记录-通过id删除")
-	@GetMapping(value = "/delete")
+//	@AutoLog(value = "审核记录-通过id删除")
+//	// @ApiOperation(value="审核记录-通过id删除", notes="审核记录-通过id删除")
+//	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		payIncomeContractAuditService.removeById(id);
 		return Result.OK("删除成功!");
@@ -102,9 +102,9 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "审核记录-批量删除")
-	// @ApiOperation(value="审核记录-批量删除", notes="审核记录-批量删除")
-	@GetMapping(value = "/deleteBatch")
+//	@AutoLog(value = "审核记录-批量删除")
+//	// @ApiOperation(value="审核记录-批量删除", notes="审核记录-批量删除")
+//	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.payIncomeContractAuditService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
@@ -116,9 +116,9 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "审核记录-通过id查询")
-	// @ApiOperation(value="审核记录-通过id查询", notes="审核记录-通过id查询")
-	@GetMapping(value = "/queryById")
+//	@AutoLog(value = "审核记录-通过id查询")
+//	// @ApiOperation(value="审核记录-通过id查询", notes="审核记录-通过id查询")
+//	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
 		PayIncomeContractAudit payIncomeContractAudit = payIncomeContractAuditService.getById(id);
 		if(payIncomeContractAudit==null) {
@@ -133,7 +133,7 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
    * @param request
    * @param payIncomeContractAudit
    */
-    @RequestMapping(value = "/exportXls")
+//    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PayIncomeContractAudit payIncomeContractAudit) {
        return super.exportXls(request, payIncomeContractAudit, PayIncomeContractAudit.class, "pay_income_contract_audit");
    }
@@ -145,7 +145,7 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
    * @param response
    * @return
    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, PayIncomeContractAudit.class);
    }
@@ -30,6 +30,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.def.MapExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
@@ -78,7 +79,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	 * @param startTime 开始时间
 	 * @param endTime 结束时间
 	 */
-	@AutoLog(value = "收入合同-分页列表查询")
+	@RequiresPermissions("revenueContract:search")
 	@ApiOperation(value="收入合同-分页列表查询", notes="收入合同-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayIncomeContract payIncomeContract,
@@ -107,7 +108,9 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	 *
 	 * @param input 收入合同
 	 */
+
 	@AutoLog(value = "收入合同-添加")
+	@RequiresPermissions("revenueContract:add")
 	@ApiOperation(value="收入合同-添加", notes="收入合同-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayIncomeContractInput input) {
@@ -121,6 +124,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	  * @param contractNum 合同编号
 	  * @return
 	  */
+	 @AutoLog(value = "收入合同-验证合同编号是否存在")
 	 @ApiOperation(value="收入合同-验证合同编号是否存在", notes="收入合同-验证合同编号是否存在")
 	 @GetMapping(value = "/getContractNum")
 	 public Result<?> getContractNum(@RequestParam(name="contractNum") String contractNum) {
@@ -146,6 +150,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	  * @param contractName 合同名称
 	  * @return
 	  */
+	 @AutoLog(value = "收入合同-验证合同名称是否存在")
 	 @ApiOperation(value="收入合同-验证合同名称是否存在", notes="收入合同-验证合同名称是否存在")
 	 @GetMapping(value = "/getContractName")
 	 public Result<?> getContractName(@RequestParam(name="contractName") String contractName) {
@@ -172,6 +177,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	  * @param id 普通项目管理id
 	  * @return
 	  */
+	 @AutoLog(value = "收入合同-查询该项目是否关联了合同")
 	 @ApiOperation(value="收入合同-通过id查询该项目是否关联了合同", notes="收入合同-通过id查询该项目是否关联了合同")
 	 @GetMapping(value = "/getContractById")
 	 public Result<?> getContractById(@RequestParam(name="id") String id) {
@@ -197,7 +203,9 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	 *
 	 * @param input 收入合同
 	 */
+
 	@AutoLog(value = "收入合同-编辑")
+	@RequiresPermissions("revenueContract:edit")
 	@ApiOperation(value="收入合同-编辑", notes="收入合同-编辑")
 	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayIncomeContractInput input) {
@@ -211,7 +219,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	  * @param contractId 合同id
 	  * @return
 	  */
-	 @AutoLog(value = "收入合同-关联")
+	 @AutoLog(value = "收入合同-关联项目列表")
 	 @ApiOperation(value="收入合同-关联", notes="收入合同-关联")
 	 @GetMapping(value = "/getAssociated")
 	 public Result<?> getAssociated(@RequestParam("contractId") String  contractId) {
@@ -233,6 +241,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	* @return
 	*/
 	@AutoLog(value = "收入合同-关联")
+	@RequiresPermissions("revenueContractModule:chooseProject")
 	@ApiOperation(value="收入合同-关联", notes="收入合同-关联")
 	@PostMapping(value = "/associated")
 	public Result<?> associated(@RequestBody List<PayIncomeContractAssociated> listPayIncomeContractAssociated) {
@@ -247,6 +256,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	  * @return
 	  */
 	 @AutoLog(value = "收入合同-取消关联")
+	 @RequiresPermissions("revenueContractModule:unlinkProject")
 	 @ApiOperation(value="收入合同-取消关联", notes="收入合同-取消关联")
 	 @PostMapping(value = "/cancelAssociated")
 	 public Result<?> cancelAssociated(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) {
@@ -273,6 +283,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	* @param payIncomeContractAudit 审核记录
 	*/
 	@AutoLog(value = "收入合同-审核")
+	@RequiresPermissions("revenueContract:aduit")
 	@ApiOperation(value="收入合同-审核", notes="收入合同-审核")
 	@PostMapping(value = "/audit")
 	public Result<?> audit(@RequestBody PayIncomeContractAudit payIncomeContractAudit) {
@@ -289,6 +300,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	* @param payIncomeContractAudit 审核记录
 	*/
 	@AutoLog(value = "收入合同-归档")
+	@RequiresPermissions("revenueContract:archive")
 	@ApiOperation(value="收入合同-归档", notes="收入合同-归档")
 	@PostMapping(value = "/archive")
 	public Result<?> archive(@RequestBody PayIncomeContractAudit payIncomeContractAudit) {
@@ -304,7 +316,8 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	 *
 	 * @param id 合同id
 	 */
-	@AutoLog(value = "收入合同-通过id删除")
+	@AutoLog(value = "收入合同-删除")
+	@RequiresPermissions("revenueContract:delete")
 	@ApiOperation(value="收入合同-通过id删除", notes="收入合同-通过id删除")
 	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id") String id) {
@@ -321,6 +334,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	 * @param ids 合同id逗号分隔
 	 */
 	@AutoLog(value = "收入合同-批量删除")
+	@RequiresPermissions("revenueContract:batchDel")
 	@ApiOperation(value="收入合同-批量删除", notes="收入合同-批量删除")
 	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
@@ -342,7 +356,6 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	 *
 	 * @param id 合同id
 	 */
-	@AutoLog(value = "收入合同-通过id查询详情")
 	@ApiOperation(value="收入合同-通过id查询详情", notes="收入合同-通过id查询详情")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id") String id) {
@@ -414,6 +427,8 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
    * @param request
    * @param payIncomeContract 收入合同
    */
+	@AutoLog(value = "收入合同-导出excel")
+	@RequiresPermissions("revenueContract:export")
 	@ApiOperation(value="收入合同-导出excel", notes="收入合同-导出excel")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PayIncomeContract payIncomeContract) {
@@ -523,7 +538,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
    * @param response
    * @return
    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, PayIncomeContract.class);
    }
@@ -43,9 +43,9 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "分期信息-分页列表查询")
-	// @ApiOperation(value="分期信息-分页列表查询", notes="分期信息-分页列表查询")
-	@GetMapping(value = "/list")
+//	@AutoLog(value = "分期信息-分页列表查询")
+//	// @ApiOperation(value="分期信息-分页列表查询", notes="分期信息-分页列表查询")
+//	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayIncomeContractInstallment payIncomeContractInstallment,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -62,9 +62,9 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
 	 * @param payIncomeContractInstallment
 	 * @return
 	 */
-	@AutoLog(value = "分期信息-添加")
-	// @ApiOperation(value="分期信息-添加", notes="分期信息-添加")
-	@PostMapping(value = "/add")
+//	@AutoLog(value = "分期信息-添加")
+//	// @ApiOperation(value="分期信息-添加", notes="分期信息-添加")
+//	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayIncomeContractInstallment payIncomeContractInstallment) {
 		payIncomeContractInstallmentService.save(payIncomeContractInstallment);
 		return Result.OK("添加成功！");
@@ -76,9 +76,9 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
 	 * @param payIncomeContractInstallment
 	 * @return
 	 */
-	@AutoLog(value = "分期信息-编辑")
-	// @ApiOperation(value="分期信息-编辑", notes="分期信息-编辑")
-	@PostMapping(value = "/edit")
+//	@AutoLog(value = "分期信息-编辑")
+//	// @ApiOperation(value="分期信息-编辑", notes="分期信息-编辑")
+//	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayIncomeContractInstallment payIncomeContractInstallment) {
 		payIncomeContractInstallmentService.updateById(payIncomeContractInstallment);
 		return Result.OK("编辑成功!");
@@ -90,9 +90,9 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "分期信息-通过id删除")
-	// @ApiOperation(value="分期信息-通过id删除", notes="分期信息-通过id删除")
-	@GetMapping(value = "/delete")
+//	@AutoLog(value = "分期信息-通过id删除")
+//	// @ApiOperation(value="分期信息-通过id删除", notes="分期信息-通过id删除")
+//	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		payIncomeContractInstallmentService.removeById(id);
 		return Result.OK("删除成功!");
@@ -104,9 +104,9 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "分期信息-批量删除")
-	// @ApiOperation(value="分期信息-批量删除", notes="分期信息-批量删除")
-	@GetMapping(value = "/deleteBatch")
+//	@AutoLog(value = "分期信息-批量删除")
+//	// @ApiOperation(value="分期信息-批量删除", notes="分期信息-批量删除")
+//	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.payIncomeContractInstallmentService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
@@ -118,9 +118,9 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "分期信息-通过id查询")
-	// @ApiOperation(value="分期信息-通过id查询", notes="分期信息-通过id查询")
-	@GetMapping(value = "/queryById")
+//	@AutoLog(value = "分期信息-通过id查询")
+//	// @ApiOperation(value="分期信息-通过id查询", notes="分期信息-通过id查询")
+//	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
 		PayIncomeContractInstallment payIncomeContractInstallment = payIncomeContractInstallmentService.getById(id);
 		if(payIncomeContractInstallment==null) {
@@ -135,7 +135,7 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
    * @param request
    * @param payIncomeContractInstallment
    */
-    @RequestMapping(value = "/exportXls")
+//    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PayIncomeContractInstallment payIncomeContractInstallment) {
        return super.exportXls(request, payIncomeContractInstallment, PayIncomeContractInstallment.class, "pay_income_contract_installment");
    }
@@ -147,7 +147,7 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
    * @param response
    * @return
    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, PayIncomeContractInstallment.class);
    }
@@ -29,6 +29,7 @@ import com.jero.contract.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.def.MapExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
@@ -71,7 +72,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 	 * @param endTime 结束时间
 	 * @return
 	 */
-	@AutoLog(value = "支出合同-分页列表查询")
+	@RequiresPermissions("expenditureContract:search")
 	@ApiOperation(value="支出合同-分页列表查询", notes="支出合同-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PaySpendingContract paySpendingContract,
@@ -99,6 +100,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 	 * @return
 	 */
 	@AutoLog(value = "支出合同-添加")
+	@RequiresPermissions("expenditureContract:add")
 	@ApiOperation(value="支出合同-添加", notes="支出合同-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PaySpendingContractInput input) {
@@ -113,6 +115,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 	 * @return
 	 */
 	@AutoLog(value = "支出合同-编辑")
+	@RequiresPermissions("expenditureContract:edit")
 	@ApiOperation(value="支出合同-编辑", notes="支出合同-编辑")
 	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PaySpendingContractInput input) {
@@ -125,6 +128,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 	  * @param contractNum 合同编号
 	  * @return
 	  */
+	 @AutoLog(value = "支出合同-验证合同编号是否存在")
 	 @ApiOperation(value="收入合同-验证合同编号是否存在", notes="收入合同-验证合同编号是否存在")
 	 @GetMapping(value = "/getContractNum")
 	 public Result<?> getContractNum(@RequestParam(name="contractNum") String contractNum) {
@@ -150,7 +154,8 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "支出合同-通过id删除")
+	@AutoLog(value = "支出合同-删除")
+	@RequiresPermissions("expenditureContract:delete")
 	@ApiOperation(value="支出合同-通过id删除", notes="支出合同-通过id删除")
 	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id") String id) {
@@ -168,6 +173,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 	 * @return
 	 */
 	@AutoLog(value = "支出合同-批量删除")
+	@RequiresPermissions("expenditureContract:batchDel")
 	@ApiOperation(value="支出合同-批量删除", notes="支出合同-批量删除")
 	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
@@ -190,7 +196,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "支出合同-通过id查询")
+	@AutoLog(value = "支出合同-查询详情")
 	@ApiOperation(value="支出合同-通过id查询", notes="支出合同-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id") String id) {
@@ -223,6 +229,8 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 	  *
 	  * @return
 	  */
+	 @AutoLog(value = "支出合同-模板下载")
+	 @RequiresPermissions("expenditureContract:downTemplate")
 	 @ApiOperation(value="支出合同-模板下载", notes="支出合同-模板下载")
 	 @GetMapping(value = "/downloadExcelModel")
 	 public ModelAndView downloadExcelModel() {
@@ -235,6 +243,8 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
    * @param request
    * @param paySpendingContract
    */
+	@AutoLog(value = "支出合同-导出excel")
+	@RequiresPermissions("expenditureContract:export")
    @GetMapping(value = "/exportXls")
 	@ApiOperation(value="支出合同-导出excel", notes="支出合同-导出excel")
    public ModelAndView exportXls(HttpServletRequest request, PaySpendingContract paySpendingContract) {
@@ -345,9 +355,10 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
    * @param response
    * @return
    */
+	@AutoLog(value = "支出合同-excel导入数据")
+	@RequiresPermissions("expenditureContract:import")
    @PostMapping(value = "/importExcel")
 	@ApiOperation(value="支出合同-通过excel导入数据", notes="支出合同-通过excel导入数据")
-	@Transactional
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 		paySpendingContractService.importExcel(request);
 		return Result.OK("文件导入成功！");
@@ -41,9 +41,9 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "pay_spending_contract_installment-分页列表查询")
-//	@ApiOperation(value="pay_spending_contract_installment-分页列表查询", notes="pay_spending_contract_installment-分页列表查询")
-	@GetMapping(value = "/list")
+//	@AutoLog(value = "pay_spending_contract_installment-分页列表查询")
+////	@ApiOperation(value="pay_spending_contract_installment-分页列表查询", notes="pay_spending_contract_installment-分页列表查询")
+//	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PaySpendingContractInstallment paySpendingContractInstallment,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -60,9 +60,9 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
 	 * @param paySpendingContractInstallment
 	 * @return
 	 */
-	@AutoLog(value = "pay_spending_contract_installment-添加")
-//	@ApiOperation(value="pay_spending_contract_installment-添加", notes="pay_spending_contract_installment-添加")
-	@PostMapping(value = "/add")
+//	@AutoLog(value = "pay_spending_contract_installment-添加")
+////	@ApiOperation(value="pay_spending_contract_installment-添加", notes="pay_spending_contract_installment-添加")
+//	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) {
 		paySpendingContractInstallmentService.save(paySpendingContractInstallment);
 		return Result.OK("添加成功！");
@@ -76,7 +76,7 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
 	 */
 	@AutoLog(value = "pay_spending_contract_installment-编辑")
 //	@ApiOperation(value="pay_spending_contract_installment-编辑", notes="pay_spending_contract_installment-编辑")
-	@PostMapping(value = "/edit")
+//	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) {
 		paySpendingContractInstallmentService.updateById(paySpendingContractInstallment);
 		return Result.OK("编辑成功!");
@@ -90,7 +90,7 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
 	 */
 	@AutoLog(value = "pay_spending_contract_installment-通过id删除")
 //	@ApiOperation(value="pay_spending_contract_installment-通过id删除", notes="pay_spending_contract_installment-通过id删除")
-	@GetMapping(value = "/delete")
+//	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		paySpendingContractInstallmentService.removeById(id);
 		return Result.OK("删除成功!");
@@ -104,7 +104,7 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
 	 */
 	@AutoLog(value = "pay_spending_contract_installment-批量删除")
 //	@ApiOperation(value="pay_spending_contract_installment-批量删除", notes="pay_spending_contract_installment-批量删除")
-	@GetMapping(value = "/deleteBatch")
+//	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.paySpendingContractInstallmentService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
@@ -118,7 +118,7 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
 	 */
 	@AutoLog(value = "pay_spending_contract_installment-通过id查询")
 //	@ApiOperation(value="pay_spending_contract_installment-通过id查询", notes="pay_spending_contract_installment-通过id查询")
-	@GetMapping(value = "/queryById")
+//	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
 		PaySpendingContractInstallment paySpendingContractInstallment = paySpendingContractInstallmentService.getById(id);
 		if(paySpendingContractInstallment==null) {
@@ -133,7 +133,7 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
    * @param request
    * @param paySpendingContractInstallment
    */
-    @RequestMapping(value = "/exportXls")
+//    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PaySpendingContractInstallment paySpendingContractInstallment) {
        return super.exportXls(request, paySpendingContractInstallment, PaySpendingContractInstallment.class, "pay_spending_contract_installment");
    }
@@ -145,7 +145,7 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
    * @param response
    * @return
    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, PaySpendingContractInstallment.class);
    }
@@ -1,7 +1,13 @@
 package com.jero.contract.service.impl;

+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.dto.SendMessageDTO;
+import com.jero.common.enums.CompanyMessageEnums;
+import com.jero.common.enums.ManagementMessageEnums;
+import com.jero.common.service.SendMessageService;
 import com.jero.common.system.api.ISysBaseAPI;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.HuaWeiSmsUtil;
 import com.jero.common.util.PasswordUtil;
 import com.jero.contract.entity.PayIncomeContractInstallment;
@@ -10,10 +16,13 @@ import com.jero.contract.service.IPayIncomeContractInstallmentService;
 import com.jero.modules.message.handle.impl.EmailSendMsgHandle;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;

 /**
@@ -26,26 +35,31 @@ import java.util.List;
 public class PayIncomeContractInstallmentServiceImpl extends ServiceImpl<PayIncomeContractInstallmentMapper, PayIncomeContractInstallment> implements IPayIncomeContractInstallmentService {
    @Resource
    private PayIncomeContractInstallmentMapper payIncomeContractInstallmentMapper;
-    @Autowired
-    private HuaWeiSmsUtil huaWeiSmsUtil;
-    @Autowired
-    private ISysBaseAPI sysBaseAPI;
+    @Resource
+    private SendMessageService sendMessageService;

    @Override
    public void sendSMSIncomeContract() {
        List<PayIncomeContractInstallment> list = payIncomeContractInstallmentMapper.getIncomeContract();
        list.forEach(p->{
+            // 发送消息
+            SendMessageDTO sendMessageDTO = new SendMessageDTO();
            if(!StringUtils.isBlank(p.getPhone())){
-                String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName()
-                        + "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作";
-                // huaWeiSmsUtil.sendVerificationCode(PasswordUtil.decrypt(p.getPhone()),"5","60",msg);
+                sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
+                sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone()));
            }
            if(!StringUtils.isBlank(p.getEmail())){
-                String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName()
-                        + "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作";
-                sysBaseAPI.sendEmailMsg(PasswordUtil.decrypt(p.getEmail()), "", msg);
+                sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
            }
-            // todo 缺少发消息
+            HashMap<String,String> map = new HashMap<>();
+            map.put("contract",p.getContractName());
+            map.put("num",p.getPhaseName());
+            map.put("amount", String.valueOf(p.getAccountsReceivableAmount()));
+            sendMessageDTO.setFromUser("admin");
+            sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG8.getCode());
+            sendMessageDTO.setTemplateParam(map);
+            sendMessageDTO.setBusType("C_OPEN_TYPE8");
+            sendMessageService.SendMessageService(sendMessageDTO);
        });
    }
 }
@@ -1,5 +1,6 @@
 package com.jero.contract.service.impl;

+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -29,16 +30,21 @@ import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.contract.vo.PayIncomeContractInput;
 import com.jero.contract.vo.ProjectOutput;
 import com.jero.meeting.common.MeetingSubitemCommon;
+import com.jero.meeting.entity.PayMeeting;
 import com.jero.meeting.entity.PayMeetingSituation;
+import com.jero.meeting.service.IPayMeetingService;
 import com.jero.meeting.service.IPayMeetingSituationService;
 import com.jero.member.entity.PayMemberProject;
 import com.jero.member.entity.PayMemberProjectSubitem;
+import com.jero.member.entity.TbMemberProject;
 import com.jero.member.entity.TbMemberProjectSubitem;
 import com.jero.member.service.IPayMemberProjectService;
 import com.jero.member.service.IPayMemberProjectSubitemService;
+import com.jero.member.service.ITbMemberProjectService;
 import com.jero.member.service.ITbMemberProjectSubitemService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
+import com.jero.pack.common.PackCommon;
 import com.jero.pack.entity.PayPackCompanyProject;
 import com.jero.pack.service.IPayPackCompanyProjectService;
 import com.jero.project.common.PayProjectCommon;
@@ -107,6 +113,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
    private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
    @Resource
    private SendMessageService sendMessageService;
+    @Resource
+    private ITbMemberProjectService tbMemberProjectService;
+    @Resource
+    private IPayMeetingService payMeetingService;

    @Override
    public IPage<PayIncomeContract> queryPageList(Page<PayIncomeContract> page, PayIncomeContract payIncomeContract, String chargeStatus,String projectName, String startTime, String endTime) {
@@ -296,6 +306,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        listPayIncomeContractAssociated.forEach(p->{
+            String projectName = "";
            ProjectOutput projectOutput = new ProjectOutput();
            StringBuilder msgPayIncomeContractAssociated = ValidUtil.validateAll(p);
            if(!StringUtils.isBlank(msgPayIncomeContractAssociated)){
@@ -338,6 +349,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                            payPackCompanyProjectService.setPack(payCommonProject.getChargeCompanyId(),payCommonProject.getContactsId(),payIncomeContract.getPackYear(),payCommonProject.getId(),PayIncomeContractCommon.PROJECT_TYPE1,payIncomeContract.getPack());
                        }
                    }
+                    projectName = payCommonProject.getChargeProject();
                    // 更新项目id
                    p.setProjectId(payCommonProject.getId());
                    break;
@@ -379,6 +391,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                            payPackCompanyProjectService.setPack(listPayWorkingGroupSubItem.get(0).getChargeCompanyId(),listPayWorkingGroupSubItem.get(0).getContactsIdOne(),payIncomeContract.getPackYear(),listPayWorkingGroupSubItem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE2,payIncomeContract.getPack());
                        }
                    }
+                    projectName = payWorkingGroup.getWorkingGroupProject();
                    // 更新项目id
                    p.setProjectId(listPayWorkingGroupSubItem.get(0).getId());
                    break;
@@ -392,6 +405,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                    if(Objects.isNull(payMeetingSituation)){
                        throw new JeroBootException("会员项目不存在！");
                    }
+                    PayMeeting payMeeting = payMeetingService.getById(payMeetingSituation.getMeetingId());
+                    if (Objects.isNull(payMeeting)) {
+                        throw new JeroBootException("会员项目不存在！");
+                    }
                    // 验证企业是否正确
                    if(!Objects.equals(payMeetingSituation.getCompanyId(),payIncomeContract.getSignedCompanyId())){
                        throw new JeroBootException("企业不匹配！");
@@ -403,6 +420,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                    }
                    // 验证项目是否已被关联
                    getIncomeContractAssociated(p.getContractId(),payMeetingSituation.getId());
+                    projectName = payMeeting.getMeetingName();
                    // 更新项目id
                    p.setProjectId(payMeetingSituation.getId());
                    break;
@@ -443,6 +461,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                            payPackCompanyProjectService.setPack(listPayMemberProjectSubitem.get(0).getCompanyId(),listPayMemberProjectSubitem.get(0).getCompanyContactId(),payIncomeContract.getPackYear(),listPayMemberProjectSubitem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE4,payIncomeContract.getPack());
                        }
                    }
+                    projectName = payMemberProject.getProjectName();
                    p.setProjectId(listPayMemberProjectSubitem.get(0).getId());
                    break;
                case PayIncomeContractCommon.PROJECT_TYPE5:
@@ -451,6 +470,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                    if(Objects.isNull(tbMemberProjectSubitem)){
                        throw new JeroBootException("标协会员项目不存在！");
                    }
+                    TbMemberProject tbMemberProject = tbMemberProjectService.getById(tbMemberProjectSubitem.getProjectId());
+                    if(Objects.isNull(tbMemberProject)){
+                        throw new JeroBootException("标协会员项目不存在！");
+                    }
                    // 验证企业是否正确
                    if(!Objects.equals(tbMemberProjectSubitem.getCompanyId(),payIncomeContract.getSignedCompanyId())){
                        throw new JeroBootException("企业不匹配！");
@@ -472,6 +495,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                            payPackCompanyProjectService.setPack(tbMemberProjectSubitem.getCompanyId(),tbMemberProjectSubitem.getLiaisonManId(),payIncomeContract.getPackYear(),tbMemberProjectSubitem.getId(),PayIncomeContractCommon.PROJECT_TYPE5,payIncomeContract.getPack());
                        }
                    }
+                    projectName = tbMemberProject.getProjectName();
                    p.setProjectId(tbMemberProjectSubitem.getId());
                    break;
                default:break;
@@ -479,6 +503,32 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
            payIncomeContractAssociatedService.save(p);
            projectOutput.setContractId(p.getContractId());
            projectOutput.setId(p.getId());
+            // 合同选择了打包
+            if(Objects.equals(payIncomeContract.getPack(), PackCommon.PACKAGING1)){
+                // 获取项目负责人，发送消息
+                List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.XMFZR));
+                if(!CollectionUtils.isEmpty(list)){
+                    String finalProjectName = projectName;
+                    list.forEach(item->{
+                        // 发送消息
+                        SendMessageDTO sendMessageDTO = new SendMessageDTO();
+                        if(!StringUtils.isBlank(item.getEmail())){
+                            sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail()));
+                        }
+                        HashMap<String,String> map = new HashMap<>();
+                        map.put("projectName", finalProjectName);
+                        sendMessageDTO.setFromUser(sysUser.getUsername());
+                        sendMessageDTO.setToUser(item.getUsername());
+                        sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG7.getCode());
+                        sendMessageDTO.setTemplateParam(map);
+                        sendMessageDTO.setBusType("M_OPEN_TYPE7");
+                        JSONObject json = new JSONObject();
+                        json.put("id",p.getProjectId());
+                        sendMessageDTO.setBusId(json.toJSONString());
+                        sendMessageService.SendMessageService(sendMessageDTO);
+                    });
+                }
+            }
        });
    }
    /**
@@ -667,7 +717,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
        updatePayIncomeContract.eq(PayIncomeContract::getId,payIncomeContract.getId());
        updatePayIncomeContract.set(PayIncomeContract::getStatus,PayIncomeContractCommon.STATUS2);
        payIncomeContractService.update(updatePayIncomeContract);
-        // todo 缺少发送消息
        // 获取项目负责人，发送消息
        List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY));
        if(!CollectionUtils.isEmpty(list)){
@@ -680,12 +729,14 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                HashMap<String,String> map = new HashMap<>();
                map.put("contractNum",payIncomeContractNew.getContractNum());
                map.put("contractName",payIncomeContractNew.getContractName());
-                sendMessageDTO.setFromUser(sysUser.getId());
+                sendMessageDTO.setFromUser(sysUser.getUsername());
                sendMessageDTO.setToUser(p.getUsername());
                sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG2.getCode());
                sendMessageDTO.setTemplateParam(map);
-                sendMessageDTO.setBusType("email");
-                sendMessageDTO.setBusId(p.getId());
+                sendMessageDTO.setBusType("M_OPEN_TYPE2");
+                JSONObject json = new JSONObject();
+                json.put("revenueId",payIncomeContractNew.getId());
+                sendMessageDTO.setBusId(json.toJSONString());
                sendMessageService.SendMessageService(sendMessageDTO);
            });
        }
@@ -799,6 +850,46 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
        payIncomeContractService.update(update);
        // 添加审核记录
        payIncomeContractAuditService.save(payIncomeContractAudit);
+        String code = "";
+        String role = "";
+        String type = "";
+        // 审核通过
+        if(Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS3)){
+            code = ManagementMessageEnums.MSG3.getCode();
+            type = "M_OPEN_TYPE3";
+            role = RoleCommon.CWRY;
+        }
+        // 审核未通过
+        if(Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS4)){
+            code = ManagementMessageEnums.MSG4.getCode();
+            type = "M_OPEN_TYPE4";
+            role = RoleCommon.HTFZR;
+        }
+        // 获取项目负责人，发送消息
+        List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(role));
+        if(!CollectionUtils.isEmpty(list)){
+            String finalType = type;
+            String finalCode = code;
+            list.forEach(p->{
+                // 发送消息
+                SendMessageDTO sendMessageDTO = new SendMessageDTO();
+                if(!StringUtils.isBlank(p.getEmail())){
+                    sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
+                }
+                HashMap<String,String> map = new HashMap<>();
+                map.put("contractNum",payIncomeContractStatus.getContractNum());
+                map.put("contractName",payIncomeContractStatus.getContractName());
+                sendMessageDTO.setFromUser(sysUser.getUsername());
+                sendMessageDTO.setToUser(p.getUsername());
+                sendMessageDTO.setTemplateCode(finalCode);
+                sendMessageDTO.setTemplateParam(map);
+                sendMessageDTO.setBusType(finalType);
+                JSONObject json = new JSONObject();
+                json.put("revenueId",payIncomeContractStatus.getId());
+                sendMessageDTO.setBusId(json.toJSONString());
+                sendMessageService.SendMessageService(sendMessageDTO);
+            });
+        }
    }

    @Override
@@ -1,6 +1,9 @@
 package com.jero.contract.service.impl;

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.dto.SendMessageDTO;
+import com.jero.common.enums.CompanyMessageEnums;
+import com.jero.common.service.SendMessageService;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.util.HuaWeiSmsUtil;
 import com.jero.common.util.PasswordUtil;
@@ -13,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;

 /**
@@ -23,31 +27,34 @@ import java.util.List;
 */
@Service
 public class PaySpendingContractInstallmentServiceImpl extends ServiceImpl<PaySpendingContractInstallmentMapper, PaySpendingContractInstallment> implements IPaySpendingContractInstallmentService {
-
-    @Autowired
-    private HuaWeiSmsUtil huaWeiSmsUtil;
-    @Autowired
-    private ISysBaseAPI sysBaseAPI;
-
+    @Resource
+    private SendMessageService sendMessageService;
    @Resource
    private PaySpendingContractInstallmentMapper paySpendingContractInstallmentMapper;
+
    @Override
    public void sendSMSSpendingContract() {
        List<PaySpendingContractInstallment> list = paySpendingContractInstallmentMapper.getSpendingContract();
        if(!CollectionUtils.isEmpty(list)){
-            // todo 发短信
            list.forEach(p->{
+                // 发送消息
+                SendMessageDTO sendMessageDTO = new SendMessageDTO();
                if(!StringUtils.isBlank(p.getPhone())){
-                    String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName()
-                            + "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作";
-                    // huaWeiSmsUtil.sendVerificationCode(PasswordUtil.decrypt(p.getPhone()),"5","60",msg);
+                    sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
+                    sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone()));
                }
                if(!StringUtils.isBlank(p.getEmail())){
-                    String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName()
-                            + "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作";
-                    sysBaseAPI.sendEmailMsg(PasswordUtil.decrypt(p.getEmail()), "", msg);
+                    sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
                }
-                // todo 缺少发消息
+                HashMap<String,String> map = new HashMap<>();
+                map.put("contract",p.getContractName());
+                map.put("num",p.getPhaseName());
+                map.put("amount", String.valueOf(p.getAccountsReceivableAmount()));
+                sendMessageDTO.setFromUser("admin");
+                sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG8.getCode());
+                sendMessageDTO.setTemplateParam(map);
+                sendMessageDTO.setBusType("C_OPEN_TYPE8");
+                sendMessageService.SendMessageService(sendMessageDTO);
            });
        }
    }
@@ -1,40 +0,0 @@
-package com.jero.home;
-
-import com.jero.common.api.vo.Result;
-import com.jero.payment.service.IPayPaymentRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * @Description: 首页
- * @Author: jeecg-boot
- * @Date:   2021-09-24
- * @Version: V1.0
- */
-@Api(tags="首页")
-@RestController
-@RequestMapping("/home")
-@Slf4j
-public class HomeController {
-
-    @Autowired
-    private IPayPaymentRecordService payPaymentRecordService;
-
-    /**
-     *   首页-数据统计
-     *
-     * @return
-     */
-    @ApiOperation(value="首页-数据统计", notes="首页-数据统计")
-    @GetMapping(value = "/dataStatistics")
-    public Result<?> dataStatistics() {
-
-        return null;
-    }
-}
@@ -0,0 +1,69 @@
+package com.jero.home.controller;
+
+import com.jero.common.api.vo.Result;
+import com.jero.home.vo.DataStatisticsVO;
+import com.jero.mail.service.IPayMailBillService;
+import com.jero.payment.service.IPayPaymentRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Objects;
+
+
+/**
+ * @Description: 首页
+ * @Author: jeecg-boot
+ * @Date:   2021-09-24
+ * @Version: V1.0
+ */
+@Api(tags="首页")
+@RestController
+@RequestMapping("/home")
+@Slf4j
+public class HomeController {
+
+    @Resource
+    private IPayPaymentRecordService payPaymentRecordService;
+
+    @Resource
+    private IPayMailBillService payMailBillService;
+
+    /**
+     *   首页-数据统计
+     *
+     * @return
+     */
+    @ApiOperation(value="首页-数据统计", notes="首页-数据统计")
+    @GetMapping(value = "/dataStatistics")
+    public Result<?> dataStatistics() {
+        DataStatisticsVO dataStatisticsVO = new DataStatisticsVO();
+        DateTimeFormatter formatters = DateTimeFormatter.ofPattern("yyyy-MM");
+        LocalDate today = LocalDate.now();
+        // 本月
+        String d1 = formatters.format(today);
+        // 上月
+        String d2 = formatters.format(today.minusMonths(1));
+        // 本月应收总额
+        BigDecimal b1 = payPaymentRecordService.getMonthAmountCount(d1);
+        if(Objects.isNull(b1)){
+            b1 = new BigDecimal("0.00");
+        }
+        // 上月应收总额
+        BigDecimal b2 = payPaymentRecordService.getMonthAmountCount(d2);
+        if(Objects.isNull(b2)){
+            b2 = new BigDecimal("0.00");
+        }
+        dataStatisticsVO.setNowMonthAddAmount(b1.subtract(b2));
+        dataStatisticsVO.setNowMonthAmount(b1.divide(new BigDecimal("10000")));
+        int m = payMailBillService.getMonthMailCount(d1);
+        dataStatisticsVO.setNowMonthMail(m);
+        return Result.OK(dataStatisticsVO);
+    }
+}
@@ -0,0 +1,33 @@
+package com.jero.home.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.DecimalMax;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class DataStatisticsVO implements Serializable {
+    /**
+     * 本月新增收款项
+     */
+    @ApiModelProperty(value = "本月新增收款项")
+    @DecimalMax(value = "9999999999.99",message = "本月新增收款项格式错误")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private BigDecimal nowMonthAddAmount;
+    /**
+     * 本月到账（万元）
+     */
+    @ApiModelProperty(value = "本月到账（万元）")
+    @DecimalMax(value = "9999999999.99",message = "本月到账（万元）格式错误")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private BigDecimal nowMonthAmount;
+    /**
+     * 本月邮寄项
+     */
+    @ApiModelProperty(value = "本月邮寄项")
+    private Integer nowMonthMail;
+
+}
@@ -32,6 +32,13 @@ public interface PayMailBillMapper extends BaseMapper<PayMailBill> {

    List<PayMailBill> selectInvoicingStage(@Param("projectId")String projectId);

-
-
+    /**
+     * @Description 查询月份邮寄数量
+     * @Author  lqt
+     * @Date   2021/9/25
+     * @Param  time 年月
+     * @Return
+     * @Exception
+     */
+    Integer getMonthMailCount(String time);
 }
@@ -49,6 +49,7 @@
        inner JOIN pay_mail_bill_project pmbp on pmb.id = pmbp.bill_id
        where pmbp.project_id=#{projectId}
    </select>
-
-
+    <select id="getMonthMailCount" resultType="java.lang.Integer">
+        SELECT count(*) FROM pay_mail_bill WHERE DATE_FORMAT(create_time,'%Y-%m') = #{time} AND post_status = '1'
+    </select>
 </mapper>
@@ -1,14 +1,9 @@
 package com.jero.mail.service;

-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.common.api.vo.Result;
 import com.jero.mail.PayMailBillVO;
 import com.jero.mail.entity.PayMailBill;
-import com.jero.mail.entity.PayMailBillProject;
-import com.jero.mail.entity.PayMailBillSearch;

 import java.util.List;

@@ -56,4 +51,13 @@ public interface IPayMailBillService extends IService<PayMailBill> {
     * @param payMailBill
     */
    void addFromStandards(PayMailBill payMailBill);
+    /**
+    * @Description 查询月份邮寄数量
+    * @Author  lqt
+    * @Date   2021/9/25
+    * @Param  time 年月
+    * @Return
+    * @Exception
+    */
+    Integer getMonthMailCount(String time);
 }
@@ -242,6 +242,11 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
        payMailBillProjectService.save(bmp);
    }

+    @Override
+    public Integer getMonthMailCount(String time) {
+        return payMailBillMapper.getMonthMailCount(time);
+    }
+

    //校验不同项目是否属于同一个公司
    private String checkCompanyProject(List<PayMailBillProject> bmpList) {
@@ -123,7 +123,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
        // 收入合同创建项目发送消息到项目负责人
        if(Objects.equals(ProjectCommon.FLAG,payMeetingSituation.getFlag())){
            PayMeeting payMeeting = meetingService.getById(payMeetingSituation.getMeetingId());
-            contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payMeeting.getMeetingName() + "的" + payMeetingSituation.getCompanyName());
+            contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payMeeting.getMeetingName() + "的" + payMeetingSituation.getCompanyName(),payMeetingSituation.getId());
        }
    }

@@ -117,7 +117,7 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
 		}
 		// 收入合同创建项目发送消息到项目负责人
 		if(Objects.equals(ProjectCommon.FLAG,payMemberProjectSubitem.getFlag())){
-			contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(memberProject.getProjectName() + "的" + payMemberProjectSubitem.getCompanyName());
+			contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(memberProject.getProjectName() + "的" + payMemberProjectSubitem.getCompanyName(),payMemberProjectSubitem.getId());
 		}
    }

@@ -32,6 +32,7 @@ import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 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.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -67,7 +68,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "打包企业管理-分页列表查询")
+	@RequiresPermissions("packCompany:search")
 	@ApiOperation(value="打包企业管理-分页列表查询", notes="打包企业管理-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayPackCompany payPackCompany,
@@ -106,6 +107,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 	 * @return
 	 */
 	@AutoLog(value = "打包企业管理-添加")
+	@RequiresPermissions("packCompany:add")
 	@ApiOperation(value="打包企业管理-添加", notes="打包企业管理-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayPackCompany payPackCompany) {
@@ -124,6 +126,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 	 * @return
 	 */
 	@AutoLog(value = "打包企业管理-编辑")
+	@RequiresPermissions("packCompany:edit")
 	@ApiOperation(value="打包企业管理-编辑", notes="打包企业管理-编辑")
 	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayPackCompany payPackCompany) {
@@ -141,7 +144,8 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "打包关联-通过id删除")
+	@AutoLog(value = "打包关联-删除")
+	@RequiresPermissions("packCompany:delete")
 	@ApiOperation(value="打包关联-通过id删除", notes="打包关联-通过id删除")
 	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id") String id) {
@@ -165,6 +169,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 	 * @return
 	 */
 	@AutoLog(value = "打包企业管理-批量删除")
+	@RequiresPermissions("packCompany:batchDel")
 	@ApiOperation(value="打包企业管理-批量删除", notes="打包企业管理-批量删除")
 	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
@@ -193,7 +198,6 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "打包企业管理-通过id查询")
 	@ApiOperation(value="打包企业管理-通过id查询", notes="打包企业管理-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id") String id) {
@@ -247,7 +251,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
    * @param request
    * @param payPackCompany
    */
-    @GetMapping(value = "/exportXls")
+//    @GetMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PayPackCompany payPackCompany) {
        return super.exportXls(request, payPackCompany, PayPackCompany.class, "打包企业管理");
    }
@@ -259,7 +263,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
    * @param response
    * @return
    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, PayPackCompany.class);
    }
@@ -37,6 +37,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -78,7 +79,7 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	 */
 	@AutoLog(value = "打包项目维护-分页列表查询")
 //	@ApiOperation(value="打包项目维护-分页列表查询", notes="打包项目维护-分页列表查询")
-	@GetMapping(value = "/list")
+//	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayPackCompanyProject payPackCompanyProject,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -95,7 +96,7 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	  * @param input 参数
 	  * @return
 	  */
-	 @AutoLog(value = "打包项目维护-列表查询")
+	 @RequiresPermissions("packProject:search")
 	 @ApiOperation(value="打包项目维护-列表查询", notes="打包项目维护-列表查询")
 	 @GetMapping(value = "/listAll")
 	 public Result<?> queryListAll(PayPackCompanyProjectInput input) {
@@ -129,7 +130,6 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	  * @param input 参数
 	  * @return
 	  */
-	 @AutoLog(value = "打包项目维护-未打包列表查询")
 	 @ApiOperation(value="打包项目维护-未打包列表查询", notes="打包项目维护-未打包列表查询")
 	 @GetMapping(value = "/queryNotPackListAll")
 	 public Result<?> queryNotPackListAll(PayPackCompanyProjectInput input) {
@@ -164,6 +164,7 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	 * @return
 	 */
 	@AutoLog(value = "打包项目维护-添加打包")
+	@RequiresPermissions("packProject:pack")
 	@ApiOperation(value="打包项目维护-添加打包", notes="打包项目维护-添加打包")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayPackCompanyProject payPackCompanyProject) {
@@ -177,6 +178,7 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	  * @return
 	  */
 	 @AutoLog(value = "打包项目维护-取消打包")
+	 @RequiresPermissions("packProject:cancelPack")
 	 @ApiOperation(value="打包项目维护-取消打包", notes="打包项目维护-取消打包")
 	 @PostMapping(value = "/remove")
 	 public Result<?> remove(@RequestBody PayPackCompanyProject payPackCompanyProject) {
@@ -193,6 +195,7 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	  * @return
 	  */
 	 @AutoLog(value = "打包项目维护-批量取消打包")
+	 @RequiresPermissions("packProject:batchCancelPack")
 	 @ApiOperation(value="打包项目维护-批量取消打包", notes="打包项目维护-批量取消打包")
 	 @PostMapping(value = "/removeBatch")
 	 public Result<?> removeBatch(@RequestBody PayPackCompanyProject payPackCompanyProject) {
@@ -209,9 +212,9 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	 * @param payPackCompanyProject
 	 * @return
 	 */
-	@AutoLog(value = "pay_pack_company_project-编辑")
+//	@AutoLog(value = "pay_pack_company_project-编辑")
 //	@ApiOperation(value="pay_pack_company_project-编辑", notes="pay_pack_company_project-编辑")
-	@PostMapping(value = "/edit")
+//	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayPackCompanyProject payPackCompanyProject) {
 		payPackCompanyProjectService.updateById(payPackCompanyProject);
 		return Result.OK("编辑成功!");
@@ -223,9 +226,9 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "pay_pack_company_project-通过id删除")
+//	@AutoLog(value = "pay_pack_company_project-通过id删除")
 //	@ApiOperation(value="pay_pack_company_project-通过id删除", notes="pay_pack_company_project-通过id删除")
-	@GetMapping(value = "/delete")
+//	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		payPackCompanyProjectService.removeById(id);
 		return Result.OK("删除成功!");
@@ -239,7 +242,7 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	 */
 	@AutoLog(value = "pay_pack_company_project-批量删除")
 //	@ApiOperation(value="pay_pack_company_project-批量删除", notes="pay_pack_company_project-批量删除")
-	@GetMapping(value = "/deleteBatch")
+//	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.payPackCompanyProjectService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
@@ -253,7 +256,7 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	 */
 	@AutoLog(value = "pay_pack_company_project-通过id查询")
 //	@ApiOperation(value="pay_pack_company_project-通过id查询", notes="pay_pack_company_project-通过id查询")
-	@GetMapping(value = "/queryById")
+//	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
 		PayPackCompanyProject payPackCompanyProject = payPackCompanyProjectService.getById(id);
 		if(payPackCompanyProject==null) {
@@ -268,6 +271,8 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
    * @param request
    * @param payPackCompanyProject
    */
+	@AutoLog(value = "打包项目维护-导出excel")
+	@RequiresPermissions("packProject:export")
    @GetMapping(value = "/exportXls")
 	@ApiOperation(value="打包项目维护-导出excel", notes="打包项目维护-导出excel")
    public ModelAndView exportXls(HttpServletRequest request, PayPackCompanyProject payPackCompanyProject) {
@@ -323,7 +328,7 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
    * @param response
    * @return
    */
-    @PostMapping(value = "/importExcel")
+//    @PostMapping(value = "/importExcel")
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, PayPackCompanyProject.class);
    }
@@ -1,11 +1,21 @@
 package com.jero.pack.service.impl;

+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
+import com.jero.common.common.RoleCommon;
+import com.jero.common.dto.SendMessageDTO;
+import com.jero.common.enums.ManagementMessageEnums;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.mapper.ProjectDetailMapper;
 import com.jero.common.service.ProjectPackService;
+import com.jero.common.service.SendMessageService;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.PasswordUtil;
 import com.jero.contract.common.PayIncomeContractCommon;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
 import com.jero.pack.common.PackCommon;
 import com.jero.pack.entity.PayPackCompany;
 import com.jero.pack.entity.PayPackCompanyProject;
@@ -17,16 +27,14 @@ import com.jero.pack.vo.PayProjectExcel;
 import com.jero.project.entity.PayCommonProject;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;

 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;

 /**
 * @Description: pay_pack_company_project
@@ -45,6 +53,12 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
    private IPayPackCompanyService payPackCompanyService;
    @Autowired
    private ProjectPackService projectPackService;
+    @Resource
+    private ISysUserService sysUserService;
+    @Resource
+    private ProjectDetailMapper projectDetailMapper;
+    @Resource
+    private SendMessageService sendMessageService;


    @Override
@@ -108,6 +122,39 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
            });
            payPackCompanyProjectService.saveBatch(listPayPackCompanyProject);
        }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // 获取项目负责人，发送消息
+        List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.XMFZR));
+        for (String s1 : s) {
+            if (StringUtils.isBlank(s1)) {
+                continue;
+            }
+            // 获取项目信息
+            PayCommonProject payCommonProject = projectDetailMapper.queryProject(s1);
+            if(Objects.isNull(payCommonProject)){
+                continue;
+            }
+            if(!CollectionUtils.isEmpty(list)){
+                list.forEach(p->{
+                    // 发送消息
+                    SendMessageDTO sendMessageDTO = new SendMessageDTO();
+                    if(!StringUtils.isBlank(p.getEmail())){
+                        sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
+                    }
+                    HashMap<String,String> map = new HashMap<>();
+                    map.put("projectName",payCommonProject.getChargeProject());
+                    sendMessageDTO.setFromUser(sysUser.getUsername());
+                    sendMessageDTO.setToUser(p.getUsername());
+                    sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG6.getCode());
+                    sendMessageDTO.setTemplateParam(map);
+                    sendMessageDTO.setBusType("M_OPEN_TYPE6");
+                    JSONObject json = new JSONObject();
+                    json.put("id",payCommonProject.getId());
+                    sendMessageDTO.setBusId(json.toJSONString());
+                    sendMessageService.SendMessageService(sendMessageDTO);
+                });
+            }
+        }
    }

    @Override
@@ -2,11 +2,13 @@ package com.jero.payment.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.home.vo.DataStatisticsVO;
 import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.project.entity.PayCommonProject;
 import com.jero.project.vo.PayCommonProjectOutput;
 import io.lettuce.core.dynamic.annotation.Param;

+import java.math.BigDecimal;
 import java.util.List;

 /**
@@ -36,4 +38,14 @@ public interface PayPaymentRecordMapper extends BaseMapper<PayPaymentRecord> {
            @Param("payCommonProject")PayCommonProject payCommonProject,
            @Param("projectType") String projectType,
            @Param("paymentDate") String paymentDate);
+
+    /**
+     * @Description 查询月份应收总额
+     * @Author  lqt
+     * @Date   2021/9/25
+     * @Param  time 年-月
+     * @Return
+     * @Exception
+     */
+    BigDecimal getMonthAmountCount(String time);
 }
@@ -201,4 +201,7 @@
        </if>
        GROUP BY p.id ORDER BY p.create_time
    </select>
+    <select id="getMonthAmountCount" resultType="java.math.BigDecimal">
+        SELECT sum(amount_received) AS nowMonthAmount  FROM pay_payment_record WHERE DATE_FORMAT(payment_date,'%Y-%m') = #{time}
+    </select>
 </mapper>
@@ -1,9 +1,9 @@
 package com.jero.payment.service;

-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.common.api.vo.Result;
+import com.jero.home.vo.DataStatisticsVO;
 import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.vo.TbCheckVo;
 import com.jero.project.entity.PayCommonProject;
@@ -11,6 +11,7 @@ import com.jero.project.vo.PayCommonProjectOutput;
 import org.springframework.web.servlet.ModelAndView;

 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.util.List;

 /**
@@ -55,4 +56,13 @@ public interface IPayPaymentRecordService extends IService<PayPaymentRecord> {
     * @return
     */
    public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject,String projectType, String paymentDate, Class<PayCommonProjectOutput> clazz, String title);
+    /**
+    * @Description 查询月份应收总额
+    * @Author  lqt
+    * @Date   2021/9/25
+    * @Param  time 年-月
+    * @Return
+    * @Exception
+    */
+    BigDecimal getMonthAmountCount(String time);
 }
@@ -1,6 +1,5 @@
 package com.jero.payment.service.impl;

-import cn.hutool.http.HttpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,6 +8,7 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.util.oConvertUtils;
 import com.jero.contract.common.PayIncomeContractCommon;
+import com.jero.home.vo.DataStatisticsVO;
 import com.jero.meeting.entity.PayMeetingSituation;
 import com.jero.meeting.mapper.PayMeetingSituationMapper;
 import com.jero.member.entity.PayMemberProjectSubitem;
@@ -25,7 +25,6 @@ import com.jero.project.mapper.PayCommonProjectMapper;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
 import com.jero.common.util.AuthenticationUtils;
 import com.jero.project.vo.PayCommonProjectOutput;
-import io.lettuce.core.dynamic.annotation.Param;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -38,7 +37,6 @@ import org.springframework.web.servlet.ModelAndView;

 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.beans.Transient;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -424,6 +422,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
        return mv;
    }

+    @Override
+    public BigDecimal getMonthAmountCount(String time) {
+        return payPaymentRecordMapper.getMonthAmountCount(time);
+    }
+
    /**
     * 获取对象ID
     *
@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.common.ProjectCommon;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.ProjectDetailService;
@@ -37,6 +38,7 @@ import com.jero.project.vo.PayCommonProjectOutput;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 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.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -77,6 +79,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	 * @param paymentDate 日期
 	 * @return
 	 */
+	@RequiresPermissions("generalProject:search")
 	@ApiOperation(value="普通项目管理-分页列表查询", notes="普通项目管理-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayCommonProject payCommonProject,
@@ -185,6 +188,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	 * @param payCommonProject 普通项目管理
 	 * @return
 	 */
+	@AutoLog(value = "普通项目管理-添加")
+	@RequiresPermissions("generalProject:add")
 	@ApiOperation(value="普通项目管理-添加", notes="普通项目管理-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayCommonProject payCommonProject) {
@@ -202,6 +207,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	 * @param payCommonProject 普通项目管理
 	 * @return
 	 */
+	@AutoLog(value = "普通项目管理-编辑")
+	@RequiresPermissions("generalProject:edit")
 	@ApiOperation(value="普通项目管理-编辑", notes="普通项目管理-编辑")
 	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayCommonProject payCommonProject) {
@@ -221,6 +228,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	 * @param id 普通项目管理id
 	 * @return
 	 */
+	@AutoLog(value = "普通项目管理-删除")
+	@RequiresPermissions("generalProject:delete")
 	@ApiOperation(value="普通项目管理-通过id删除", notes="普通项目管理-通过id删除")
 	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id") String id) {
@@ -234,6 +243,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	 * @param ids 普通项目管理ids 逗号分隔
 	 * @return
 	 */
+	@AutoLog(value = "普通项目管理-批量删除")
+	@RequiresPermissions("generalProject:batchDel")
 	@ApiOperation(value="普通项目管理-批量删除", notes="普通项目管理-批量删除")
 	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
@@ -298,7 +309,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
    * @param payCommonProject 普通项目管理
    */
 	@ApiOperation(value="普通项目管理-导出excel", notes="普通项目管理-导出excel")
-    @GetMapping(value = "/exportXls")
+//    @GetMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject) {
        return super.exportXls(request, payCommonProject, PayCommonProject.class, "pay_common_project");
    }
@@ -311,7 +322,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
    * @return
    */
 	@ApiOperation(value="普通项目管理-通过excel导入数据", notes="普通项目管理-通过excel导入数据")
-    @PostMapping(value = "/importExcel")
+//    @PostMapping(value = "/importExcel")
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, PayCommonProject.class);
    }
@@ -33,6 +33,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -62,8 +63,6 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	private IPayPackCompanyProjectService payPackCompanyProjectService;
 	@Autowired
 	private IPayIncomeContractService payIncomeContractService;
-
-	// todo 缺少工作组A,B权限查询
 	
 	/**
 	 * 分页列表查询
@@ -73,6 +72,8 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	 * @param pageSize 条数
 	 * @return
 	 */
+	@AutoLog(value = "普通项目管理-批量删除")
+	@RequiresPermissions("workingGroupProject:search")
 	@ApiOperation(value="工作组项目-分页列表查询", notes="工作组项目-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayWorkingGroup payWorkingGroup,
@@ -101,7 +102,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	* @param req
 	* @return
 	*/
-	@AutoLog(value = "工作组项目-列表查询")
+//	@AutoLog(value = "工作组项目-列表查询")
 	@ApiOperation(value="工作组项目-列表查询", notes="工作组项目-列表查询")
 	@GetMapping(value = "/listAll")
 	public Result<?> queryList(PayWorkingGroup payWorkingGroup,HttpServletRequest req) {
@@ -116,7 +117,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	* @param id  工作组id
 	* @return
 	*/
-	@AutoLog(value = "工作组项目-校验登录人是否可以操作工作组")
+//	@AutoLog(value = "工作组项目-校验登录人是否可以操作工作组")
 	@ApiOperation(value="工作组项目-列表查询", notes="工作组项目-校验登录人是否可以操作工作组")
 	@GetMapping(value = "/checkoutOperation")
 	public Result<?> checkoutOperation(@RequestParam("id") String id) {
@@ -143,7 +144,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	* @param year 运行年份
 	* @return
 	*/
-	@AutoLog(value = "工作组项目-根据成员单位列表查询")
+//	@AutoLog(value = "工作组项目-根据成员单位列表查询")
 	@ApiOperation(value="工作组项目-根据成员单位列表查询", notes="工作组项目-根据单位列表查询")
 	@GetMapping(value = "/queryListByCompany")
 	public Result<?> queryListByCompany(@RequestParam(name = "companyId") String companyId,
@@ -187,7 +188,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	  * @param companyId  企业id
 	  * @return
 	  */
-	 @AutoLog(value = "工作组项目-查询不存在成员单位的列表")
+//	 @AutoLog(value = "工作组项目-查询不存在成员单位的列表")
 	 @ApiOperation(value="工作组项目-查询不存在成员单位的列表", notes="工作组项目-查询不存在成员单位的列表")
 	 @GetMapping(value = "/queryListByNotCompany")
 	 public Result<?> queryListByNotCompany(@RequestParam(name = "companyId") String companyId) {
@@ -247,6 +248,8 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	  * @param payWorkingGroup 工作组项目
 	  * @return
 	  */
+	 @AutoLog(value = "工作组项目-复制")
+	 @RequiresPermissions("workingGroupProject:copy")
 	 @ApiOperation(value="工作组项目-复制", notes="工作组项目-复制")
 	 @PostMapping(value = "/copy")
 	 public Result<?> copy(@RequestBody PayWorkingGroup payWorkingGroup) {
@@ -263,6 +266,8 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	 * @param payWorkingGroup 工作组项目
 	 * @return
 	 */
+	@AutoLog(value = "工作组项目-添加")
+	@RequiresPermissions("workingGroupProject:add")
 	@ApiOperation(value="工作组项目-添加", notes="工作组项目-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayWorkingGroup payWorkingGroup) {
@@ -294,6 +299,8 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	 * @param payWorkingGroup 工作组项目
 	 * @return
 	 */
+	@AutoLog(value = "工作组项目-编辑")
+	@RequiresPermissions("workingGroupProject:edit")
 	@ApiOperation(value="工作组项目-编辑", notes="工作组项目-编辑")
 	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayWorkingGroup payWorkingGroup) {
@@ -324,6 +331,8 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	 * @param id 工作组项目id
 	 * @return
 	 */
+	@AutoLog(value = "工作组项目-删除")
+	@RequiresPermissions("workingGroupProject:delete")
 	@ApiOperation(value="工作组项目-通过id删除", notes="工作组项目-通过id删除")
 	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id") String id) {
@@ -340,6 +349,8 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	 * @param ids 工作组项目ids 逗号分隔
 	 * @return
 	 */
+	@AutoLog(value = "工作组项目-批量删除")
+	@RequiresPermissions("workingGroupProject:batchDel")
 	@ApiOperation(value="工作组项目-批量删除", notes="工作组项目-批量删除")
 	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
@@ -378,7 +389,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
    * @param request
    * @param payWorkingGroup  工作组项目
    */
-    @GetMapping(value = "/exportXls")
+//    @GetMapping(value = "/exportXls")
 	@ApiOperation(value="工作组项目-导出excel", notes="工作组项目-导出excel")
    public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroup payWorkingGroup) {
        return super.exportXls(request, payWorkingGroup, PayWorkingGroup.class, "pay_working_group");
@@ -392,7 +403,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
    * @param response
    * @return
    */
-    @PostMapping(value = "/importExcel")
+//    @PostMapping(value = "/importExcel")
 	@ApiOperation(value="工作组项目-通过excel导入数据", notes="工作组项目-通过excel导入数据")
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, PayWorkingGroup.class);
@@ -20,6 +20,7 @@ import com.jero.project.service.IPayWorkingGroupDataFileService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -55,7 +56,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "资料维护-分页列表查询")
+	@RequiresPermissions("fileMaintenance:search")
 	@ApiOperation(value="资料维护-分页列表查询", notes="资料维护-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayWorkingGroupDataFile payWorkingGroupDataFile,
@@ -80,7 +81,9 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 	 * @param payWorkingGroupDataFile
 	 * @return
 	 */
+
 	@AutoLog(value = "资料维护-上传")
+	@RequiresPermissions("fileMaintenance:add")
 	@ApiOperation(value="资料维护-上传", notes="资料维护-上传")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayWorkingGroupDataFile payWorkingGroupDataFile) {
@@ -136,7 +139,8 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "资料维护-通过id删除")
+	@AutoLog(value = "资料维护-删除")
+	@RequiresPermissions("fileMaintenance:delete")
 	@ApiOperation(value="资料维护-通过id删除", notes="资料维护-通过id删除")
 	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id") String id) {
@@ -154,6 +158,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 	 * @return
 	 */
 	@AutoLog(value = "资料维护-批量删除")
+	@RequiresPermissions("fileMaintenance:batchDel")
 	@ApiOperation(value="资料维护-批量删除", notes="资料维护-批量删除")
 	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
@@ -194,6 +199,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
    * @param payWorkingGroupDataFile
    */
 	@AutoLog(value = "资料维护-导出excel")
+	@RequiresPermissions("fileMaintenance:export")
 	@ApiOperation(value="资料维护-导出excel", notes="资料维护-导出excel")
    @GetMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroupDataFile payWorkingGroupDataFile) {
@@ -27,6 +27,7 @@ import com.jero.project.service.IPayWorkingGroupSubItemService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 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.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -79,7 +80,6 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
 	  * @param projectType 项目类型
 	  * @return
 	  */
-	 @AutoLog(value = "资料分发-分发成员列表")
 	 @ApiOperation(value="资料分发-分发成员列表", notes="资料分发-分发成员列表")
 	 @GetMapping(value = "/list")
 	 public Result<?> list(@RequestParam("projectId") String projectId,@RequestParam("projectType") Integer projectType) {
@@ -129,6 +129,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
 	 * @return
 	 */
 	@AutoLog(value = "资料分发-分发")
+	@RequiresPermissions("fileMaintenance:distribute")
 	@ApiOperation(value="资料分发-分发", notes="资料分发-分发")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
@@ -143,6 +144,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
 	  * @return
 	  */
 	 @AutoLog(value = "资料分发-批量分发")
+	 @RequiresPermissions("fileMaintenance:batchDistribute")
 	 @ApiOperation(value="资料分发-分发", notes="资料分发-批量分发")
 	 @PostMapping(value = "/addBatch")
 	 public Result<?> addBatch(@RequestBody PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.dto.message.BusTemplateMessageDTO;
 import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.common.ProjectCommon;
 import com.jero.common.dto.SendMessageDTO;
 import com.jero.common.enums.CompanyMessageEnums;
@@ -31,6 +32,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -69,6 +71,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	  * @param paymentDate            日期
 	  * @return
 	  */
+	 @RequiresPermissions("workingGroupMember:search")
 	 @ApiOperation(value = "工作组成员-分页列表查询", notes = "工作组成员-分页列表查询")
 	 @GetMapping(value = "/list")
 	 public Result<?> queryPageList(PayWorkingGroupSubItem payWorkingGroupSubItem,
@@ -94,6 +97,8 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	  * @param payWorkingGroupSubItem 工作组成员
 	  * @return
 	  */
+	 @AutoLog(value = "工作组成员-添加")
+	 @RequiresPermissions("workingGroupMember:add")
 	 @ApiOperation(value = "工作组成员-添加", notes = "工作组成员-添加")
 	 @PostMapping(value = "/add")
 	 public Result<?> add(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) {
@@ -111,6 +116,8 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	  * @param payWorkingGroupSubItem 工作组成员
 	  * @return
 	  */
+	 @AutoLog(value = "工作组成员-编辑")
+	 @RequiresPermissions("workingGroupMember:edit")
 	 @ApiOperation(value = "工作组成员-编辑", notes = "工作组成员-编辑")
 	 @PostMapping(value = "/edit")
 	 public Result<?> edit(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) {
@@ -128,6 +135,8 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	  * @param payWorkingGroupSubItem 工作组成员
 	  * @return
 	  */
+	 @AutoLog(value = "工作组成员-催款提醒")
+	 @RequiresPermissions("workingGroupMember:setDunningReminder")
 	 @ApiOperation(value = "工作组成员-催款提醒", notes = "工作组成员-催款提醒")
 	 @PostMapping(value = "/reminders")
 	 public Result<?> reminders(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) {
@@ -170,11 +179,10 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 			 }
 			 HashMap<String,String> map = new HashMap<>();
 			 map.put("projectName",payWorkingGroup.getWorkingGroupProject());
-			 sendMessageDTO.setFromUser(sysUser.getId());
+			 sendMessageDTO.setFromUser(sysUser.getUsername());
 			 sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG11.getCode());
 			 sendMessageDTO.setTemplateParam(map);
-			 sendMessageDTO.setBusType("email");
-			 sendMessageDTO.setBusId(p.getId());
+			 sendMessageDTO.setBusType("C_OPEN_TYPE11");
 			 sendMessageService.SendMessageService(sendMessageDTO);
 		 });
 		 return Result.OK("添加成功！");
@@ -186,6 +194,8 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	  * @param id 工作组成员id
 	  * @return
 	  */
+	 @AutoLog(value = "工作组成员-删除")
+	 @RequiresPermissions("workingGroupMember:delete")
 	 @ApiOperation(value = "工作组成员-通过id删除", notes = "工作组成员-通过id删除")
 	 @GetMapping(value = "/delete")
 	 public Result<?> delete(@RequestParam(name = "id") String id) {
@@ -199,6 +209,8 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	  * @param ids 工作组成员ids 逗号分隔
 	  * @return
 	  */
+	 @AutoLog(value = "工作组成员-批量删除")
+	 @RequiresPermissions("workingGroupMember:batchDel")
 	 @ApiOperation(value = "工作组成员-批量删除", notes = "工作组成员-批量删除")
 	 @GetMapping(value = "/deleteBatch")
 	 public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
@@ -246,6 +258,8 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	  * @param input 收费通知
 	  * @return
 	  */
+	 @AutoLog(value = "工作组成员-设置收费通知")
+	 @RequiresPermissions("workingGroupMember:setChargeNotic")
 	 @ApiOperation(value = "工作组成员-设置收费通知", notes = "工作组成员-设置收费通知")
 	 @PostMapping(value = "/setCharge")
 	 public Result<?> setCharge(@RequestBody SetChargeInput input) {
@@ -286,6 +300,8 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	  * @param request
 	  * @param payWorkingGroupSubItem 工作组成员
 	  */
+	 @AutoLog(value = "工作组成员-导出excel")
+	 @RequiresPermissions("workingGroupMember:export")
 	 @GetMapping(value = "/exportXls")
 	 @ApiOperation(value = "工作组成员-导出excel", notes = "工作组成员-导出excel")
 	 public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroupSubItem payWorkingGroupSubItem) {
@@ -297,6 +313,8 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	  *
 	  * @return
 	  */
+	 @AutoLog(value = "工作组成员-模板下载")
+	 @RequiresPermissions("workingGroupMember:downTemplate")
 	 @ApiOperation(value = "工作组成员-模板下载", notes = "工作组成员-模板下载")
 	 @GetMapping(value = "/downloadExcelModel")
 	 public ModelAndView downloadExcelModel() {
@@ -311,6 +329,8 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	  * @param request
 	  * @return
 	  */
+	 @AutoLog(value = "工作组成员-excel导入数据")
+	 @RequiresPermissions("workingGroupMember:import")
 	 @PostMapping(value = "/importExcel")
 	 @ApiOperation(value = "工作组成员-通过excel导入数据", notes = "工作组成员-通过excel导入数据")
 	 public Result<?> importExcel(HttpServletRequest request) {
@@ -134,7 +134,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
        }
        // 收入合同创建项目发送消息到项目负责人
        if(Objects.equals(ProjectCommon.FLAG,payCommonProject.getFlag())){
-            contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payCommonProject.getChargeProject());
+            contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payCommonProject.getChargeProject(),payCommonProject.getId());
        }

    }
@@ -1,9 +1,17 @@
 package com.jero.project.service.impl;

+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.dto.SendMessageDTO;
+import com.jero.common.enums.CompanyMessageEnums;
+import com.jero.common.enums.ManagementMessageEnums;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.service.SendMessageService;
 import com.jero.common.system.api.ISysBaseAPI;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayContactsManagementService;
@@ -25,16 +33,14 @@ import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;

 import javax.annotation.Resource;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;

 /**
@@ -62,6 +68,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
    private IOSSFileService iossFileService;
    @Autowired
    private ISysBaseAPI sysBaseAPI;
+    @Resource
+    private SendMessageService sendMessageService;

    @Override
    public void add(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
@@ -87,14 +95,14 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
        // 文件路径
        String url = byId.getUrl();
        listFile.add(path + url);
-        List<String> list = new ArrayList<>();
+        List<PayContactsManagementTemporary> list = new ArrayList<>();
        String msg = "";
        if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
            LambdaQueryWrapper<PayContactsManagementTemporary> queryPayContactsManagementTemporary = new LambdaQueryWrapper<>();
            queryPayContactsManagementTemporary.in(PayContactsManagementTemporary::getId, Arrays.asList(s));
            List<PayContactsManagementTemporary> listContacts = payContactsManagementTemporaryService.list(queryPayContactsManagementTemporary);
            if(!CollectionUtils.isEmpty(listContacts)){
-                list = listContacts.stream().map(PayContactsManagementTemporary::getEmail).collect(Collectors.toList());
+                list = listContacts;
            }
            PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId());
            if(Objects.isNull(payWorkingGroup)){
@@ -106,7 +114,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
            queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(payWorkingGroupDistributionRecord.getContactsIds().split(",")));
            List<PayContactsManagement> listContacts = payContactsManagementService.list(queryPayContactsManagement);
            if(!CollectionUtils.isEmpty(listContacts)){
-                list = listContacts.stream().map(PayContactsManagement::getEmail).collect(Collectors.toList());
+                String str = JSON.toJSONString(listContacts);
+                list = JSONArray.parseArray(str,PayContactsManagementTemporary.class);
            }
            PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(payWorkingGroupDistributionRecord.getProjectId());
            if(Objects.isNull(payCaseCommittee)){
@@ -119,14 +128,28 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
        if(CollectionUtils.isEmpty(list) || CollectionUtils.isEmpty(listFile)){
            throw new JeroBootException("分发失败！");
        }
-        String content = msg + "文件已发送到您的账号和邮箱，可通过手机号登录系统XXX（点击链接可进入系统）或微信小程序搜素XXX进入查看";
+        // 发送消息
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String finalMsg = msg;
        list.forEach(p->{
-            if(StringUtils.isBlank(p)){
-                return;
+            // 发送消息
+            SendMessageDTO sendMessageDTO = new SendMessageDTO();
+            if(!StringUtils.isBlank(p.getEmail())){
+                sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
            }
-            sysBaseAPI.sendEmailMsgAndFile(PasswordUtil.decrypt(p), "", content, listFile);
+            if(!StringUtils.isEmpty(p.getPhone())){
+                sendMessageDTO.setToUser(PasswordUtil.encrypt(p.getPhone()));
+                sendMessageDTO.setPhone(PasswordUtil.encrypt(p.getPhone()));
+            }
+            HashMap<String,String> map = new HashMap<>();
+            map.put("workGroupName", finalMsg);
+            sendMessageDTO.setFromUser(sysUser.getUsername());
+            sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG12.getCode());
+            sendMessageDTO.setTemplateParam(map);
+            sendMessageDTO.setListFile(listFile);
+            sendMessageDTO.setBusType("C_OPEN_TYPE12");
+            sendMessageService.SendMessageService(sendMessageDTO);
        });
-        // todo 缺少发送消息
    }

    @Override
@@ -163,13 +186,13 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
            listFile.add(path + url);
        });
        String msg = "";
-        List<String> list = new ArrayList<>();
+        List<PayContactsManagementTemporary> list = new ArrayList<>();
        if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
            LambdaQueryWrapper<PayContactsManagementTemporary> queryPayContactsManagementTemporary = new LambdaQueryWrapper<>();
            queryPayContactsManagementTemporary.in(PayContactsManagementTemporary::getId, Arrays.asList(s));
            List<PayContactsManagementTemporary> listContacts = payContactsManagementTemporaryService.list(queryPayContactsManagementTemporary);
            if(!CollectionUtils.isEmpty(listContacts)){
-                list = listContacts.stream().map(PayContactsManagementTemporary::getEmail).collect(Collectors.toList());
+                list = listContacts;
            }
            PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId());
            if(Objects.isNull(payWorkingGroup)){
@@ -181,7 +204,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
            queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(n));
            List<PayContactsManagement> listContacts = payContactsManagementService.list(queryPayContactsManagement);
            if(!CollectionUtils.isEmpty(listContacts)){
-                list = listContacts.stream().map(PayContactsManagement::getEmail).collect(Collectors.toList());
+                String str = JSON.toJSONString(listContacts);
+                list = JSONArray.parseArray(str,PayContactsManagementTemporary.class);
            }
            PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(payWorkingGroupDistributionRecord.getProjectId());
            if(Objects.isNull(payCaseCommittee)){
@@ -194,13 +218,27 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
        if(CollectionUtils.isEmpty(list) || CollectionUtils.isEmpty(listFile)){
            throw new JeroBootException("分发失败！");
        }
-        String content = msg + "文件已发送到您的账号和邮箱，可通过手机号登录系统XXX（点击链接可进入系统）或微信小程序搜素XXX进入查看";
+        // 发送消息
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String finalMsg = msg;
        list.forEach(p->{
-            if(StringUtils.isBlank(p)){
-                return;
+            // 发送消息
+            SendMessageDTO sendMessageDTO = new SendMessageDTO();
+            if(!StringUtils.isBlank(p.getEmail())){
+                sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
            }
-            sysBaseAPI.sendEmailMsgAndFile(PasswordUtil.decrypt(p), "", content, listFile);
+            if(!StringUtils.isEmpty(p.getPhone())){
+                sendMessageDTO.setToUser(PasswordUtil.encrypt(p.getPhone()));
+                sendMessageDTO.setPhone(PasswordUtil.encrypt(p.getPhone()));
+            }
+            HashMap<String,String> map = new HashMap<>();
+            map.put("workGroupName", finalMsg);
+            sendMessageDTO.setFromUser(sysUser.getUsername());
+            sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG12.getCode());
+            sendMessageDTO.setTemplateParam(map);
+            sendMessageDTO.setListFile(listFile);
+            sendMessageDTO.setBusType("C_OPEN_TYPE12");
+            sendMessageService.SendMessageService(sendMessageDTO);
        });
-        // todo 缺少发送消息
    }
 }
@@ -186,7 +186,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
        }
        // 收入合同创建项目发送消息到项目负责人
        if(Objects.equals(ProjectCommon.FLAG,payWorkingGroupSubItem.getFlag())){
-            contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payWorkingGroup.getWorkingGroupProject() + "的" + payWorkingGroupSubItem.getChargeCompanyTemporaryName());
+            contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payWorkingGroup.getWorkingGroupProject() + "的" + payWorkingGroupSubItem.getChargeCompanyTemporaryName(),payWorkingGroupSubItem.getId());
        }
    }

@@ -43,7 +43,7 @@ public class PayCompanyManagementTemporaryController extends JeroController<PayC
 	 * @return
 	 */
 	@ApiOperation(value="pay_company_management_temporary-分页列表查询", notes="pay_company_management_temporary-分页列表查询")
-	@GetMapping(value = "/list")
+//	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayCompanyManagementTemporary payCompanyManagementTemporary,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -61,7 +61,7 @@ public class PayCompanyManagementTemporaryController extends JeroController<PayC
 	 * @return
 	 */
 	@ApiOperation(value="pay_company_management_temporary-添加", notes="pay_company_management_temporary-添加")
-	@PostMapping(value = "/add")
+//	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayCompanyManagementTemporary payCompanyManagementTemporary) {
 		payCompanyManagementTemporaryService.save(payCompanyManagementTemporary);
 		return Result.OK("添加成功！");
@@ -74,7 +74,7 @@ public class PayCompanyManagementTemporaryController extends JeroController<PayC
 	 * @return
 	 */
 	@ApiOperation(value="pay_company_management_temporary-编辑", notes="pay_company_management_temporary-编辑")
-	@PutMapping(value = "/edit")
+//	@PutMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayCompanyManagementTemporary payCompanyManagementTemporary) {
 		payCompanyManagementTemporaryService.updateById(payCompanyManagementTemporary);
 		return Result.OK("编辑成功!");
@@ -87,7 +87,7 @@ public class PayCompanyManagementTemporaryController extends JeroController<PayC
 	 * @return
 	 */
 	@ApiOperation(value="pay_company_management_temporary-通过id删除", notes="pay_company_management_temporary-通过id删除")
-	@DeleteMapping(value = "/delete")
+//	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		payCompanyManagementTemporaryService.removeById(id);
 		return Result.OK("删除成功!");
@@ -100,7 +100,7 @@ public class PayCompanyManagementTemporaryController extends JeroController<PayC
 	 * @return
 	 */
 	@ApiOperation(value="pay_company_management_temporary-批量删除", notes="pay_company_management_temporary-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+//	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.payCompanyManagementTemporaryService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
@@ -113,7 +113,7 @@ public class PayCompanyManagementTemporaryController extends JeroController<PayC
 	 * @return
 	 */
 	@ApiOperation(value="pay_company_management_temporary-通过id查询", notes="pay_company_management_temporary-通过id查询")
-	@GetMapping(value = "/queryById")
+//	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
 		PayCompanyManagementTemporary payCompanyManagementTemporary = payCompanyManagementTemporaryService.getById(id);
 		if(payCompanyManagementTemporary==null) {
@@ -128,7 +128,7 @@ public class PayCompanyManagementTemporaryController extends JeroController<PayC
    * @param request
    * @param payCompanyManagementTemporary
    */
-    @RequestMapping(value = "/exportXls")
+//    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PayCompanyManagementTemporary payCompanyManagementTemporary) {
        return super.exportXls(request, payCompanyManagementTemporary, PayCompanyManagementTemporary.class, "pay_company_management_temporary");
    }
@@ -140,7 +140,7 @@ public class PayCompanyManagementTemporaryController extends JeroController<PayC
    * @param response
    * @return
    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, PayCompanyManagementTemporary.class);
    }
@@ -43,7 +43,7 @@ public class PayContactsManagementTemporaryController extends JeroController<Pay
 	 * @return
 	 */
 	@ApiOperation(value="pay_contacts_management_temporary-分页列表查询", notes="pay_contacts_management_temporary-分页列表查询")
-	@GetMapping(value = "/list")
+//	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayContactsManagementTemporary payContactsManagementTemporary,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -61,7 +61,7 @@ public class PayContactsManagementTemporaryController extends JeroController<Pay
 	 * @return
 	 */
 	@ApiOperation(value="pay_contacts_management_temporary-添加", notes="pay_contacts_management_temporary-添加")
-	@PostMapping(value = "/add")
+//	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayContactsManagementTemporary payContactsManagementTemporary) {
 		payContactsManagementTemporaryService.save(payContactsManagementTemporary);
 		return Result.OK("添加成功！");
@@ -74,7 +74,7 @@ public class PayContactsManagementTemporaryController extends JeroController<Pay
 	 * @return
 	 */
 	@ApiOperation(value="pay_contacts_management_temporary-编辑", notes="pay_contacts_management_temporary-编辑")
-	@PutMapping(value = "/edit")
+//	@PutMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayContactsManagementTemporary payContactsManagementTemporary) {
 		payContactsManagementTemporaryService.updateById(payContactsManagementTemporary);
 		return Result.OK("编辑成功!");
@@ -87,7 +87,7 @@ public class PayContactsManagementTemporaryController extends JeroController<Pay
 	 * @return
 	 */
 	@ApiOperation(value="pay_contacts_management_temporary-通过id删除", notes="pay_contacts_management_temporary-通过id删除")
-	@DeleteMapping(value = "/delete")
+//	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		payContactsManagementTemporaryService.removeById(id);
 		return Result.OK("删除成功!");
@@ -100,7 +100,7 @@ public class PayContactsManagementTemporaryController extends JeroController<Pay
 	 * @return
 	 */
 	@ApiOperation(value="pay_contacts_management_temporary-批量删除", notes="pay_contacts_management_temporary-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+//	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.payContactsManagementTemporaryService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
@@ -113,7 +113,7 @@ public class PayContactsManagementTemporaryController extends JeroController<Pay
 	 * @return
 	 */
 	@ApiOperation(value="pay_contacts_management_temporary-通过id查询", notes="pay_contacts_management_temporary-通过id查询")
-	@GetMapping(value = "/queryById")
+//	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
 		PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(id);
 		if(payContactsManagementTemporary==null) {
@@ -128,7 +128,7 @@ public class PayContactsManagementTemporaryController extends JeroController<Pay
    * @param request
    * @param payContactsManagementTemporary
    */
-    @RequestMapping(value = "/exportXls")
+//    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PayContactsManagementTemporary payContactsManagementTemporary) {
        return super.exportXls(request, payContactsManagementTemporary, PayContactsManagementTemporary.class, "pay_contacts_management_temporary");
    }
@@ -140,7 +140,7 @@ public class PayContactsManagementTemporaryController extends JeroController<Pay
    * @param response
    * @return
    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, PayContactsManagementTemporary.class);
    }
@@ -0,0 +1,108 @@
+package com.jero.util;
+
+
+import cn.hutool.core.date.DateUtil;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @author Lxq
+ * @version 1.0
+ * @date 2020/9/11 9:48
+ * java日期转cron表达式工具类
+ */
+public class CronUtil {
+
+    /**
+     * 每年时间format格式
+     */
+    private static final String DATEFORMAT_YEAR = "ss mm HH dd MM ? yyyy";
+
+    /**
+     * 每天时间format格式
+     */
+    private static final String DATEFORMAT_EVERYDAY = "ss mm HH * * ?";
+
+    /**
+     * 每周时间format格式
+     */
+    private static final String DATEFORMAT_SUN = "ss mm HH ? * 1";
+    private static final String DATEFORMAT_MON = "ss mm HH ? * 2";
+    private static final String DATEFORMAT_TUE = "ss mm HH ? * 3";
+    private static final String DATEFORMAT_WED = "ss mm HH ? * 4";
+    private static final String DATEFORMAT_THU = "ss mm HH ? * 5";
+    private static final String DATEFORMAT_FRI = "ss mm HH ? * 6";
+    private static final String DATEFORMAT_SAT = "ss mm HH ? * 7";
+
+
+    /***
+     *
+     * @param date
+     * @param dateFormat : e.g:yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    public static String formatDateByPattern(Date date, String dateFormat) {
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+        String formatTimeStr = null;
+        if (date != null) {
+            formatTimeStr = sdf.format(date);
+        }
+        return formatTimeStr;
+    }
+
+
+    /**
+     * 时间转换时间表达式
+     * convert Date to cron ,eg.  "0 06 10 15 1 ? 2020"
+     *
+     * @param date       : 时间点
+     * @param dateFormat
+     * @return
+     */
+    public static String getCron(Date date, String dateFormat) {
+        return formatDateByPattern(date, dateFormat);
+    }
+
+    /**
+     * 时间字符串转换时间表达式
+     *
+     * @param date       HH:mm:ss
+     * @param dateFormat
+     * @return
+     */
+    public static String getCron(String date, String dateFormat) {
+        Date parse = DateUtil.parse(date, "HH:mm:ss");
+        return formatDateByPattern(parse, dateFormat);
+    }
+
+    /**
+     * 时间字符串转时间表达式（年）
+     *
+     * @param date
+     * @param dateFormat
+     * @return
+     */
+    public static String getCronByYear(String date, String dateFormat) {
+        Date parse = DateUtil.parse(date, "yyyy-MM-dd HH:mm:ss");
+        return formatDateByPattern(parse, dateFormat);
+    }
+
+
+    public static void main(String[] args) {
+        String cron = getCron(new Date(), DATEFORMAT_TUE);
+        System.out.println(cron);
+
+        String cron1 = getCron(new Date(), DATEFORMAT_EVERYDAY);
+        System.out.println(cron1);
+
+        String cron2 = getCron(new Date(), DATEFORMAT_YEAR);
+        System.out.println(cron2);
+
+        String cron4 = getCron("12:12:12", DATEFORMAT_EVERYDAY);
+        System.out.println(cron4);
+
+        String cron5 = getCronByYear("2020-9-11 12:12:12", DATEFORMAT_YEAR);
+        System.out.println(cron5);
+    }
+}