企业端，消息，个人信息修改

jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java

@@ -106,6 +106,46 @@ public class DictAspect {
                     items.add(item);
                 }
                 ((IPage) ((Result) result).getResult()).setRecords(items);
+            }else {
+                Object record = (Object) ((Result) result).getResult();
+                ObjectMapper mapper = new ObjectMapper();
+                String json = "{}";
+                try {
+                    //解决@JsonFormat注解解析不了的问题详见SysAnnouncement类的@JsonFormat
+                    json = mapper.writeValueAsString(record);
+                } catch (JsonProcessingException e) {
+                    log.error("json解析失败" + e.getMessage(), e);
+                }
+                try {
+                    JSONObject item = JSONObject.parseObject(json);
+                    //update-begin--Author:scott -- Date:20190603 ----for：解决继承实体字段无法翻译问题------
+                    //for (Field field : record.getClass().getDeclaredFields()) {
+                    for (Field field : oConvertUtils.getAllFields(record)) {
+                        //update-end--Author:scott  -- Date:20190603 ----for：解决继承实体字段无法翻译问题------
+                        if (field.getAnnotation(Dict.class) != null) {
+                            String code = field.getAnnotation(Dict.class).dicCode();
+                            String text = field.getAnnotation(Dict.class).dicText();
+                            String table = field.getAnnotation(Dict.class).dictTable();
+                            String key = String.valueOf(item.get(field.getName()));
+
+                            //翻译字典值对应的txt
+                            String textValue = translateDictValue(code, text, table, key);
+
+                            log.debug(" 字典Val : " + textValue);
+                            log.debug(" __翻译字典字段__ " + field.getName() + CommonConstant.DICT_TEXT_SUFFIX + "： " + textValue);
+                            item.put(field.getName() + CommonConstant.DICT_TEXT_SUFFIX, textValue);
+                        }
+                        //date类型默认转换string格式化日期
+                        if (field.getType().getName().equals("java.util.Date") && field.getAnnotation(JsonFormat.class) == null && item.get(field.getName()) != null) {
+                            SimpleDateFormat aDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                            item.put(field.getName(), aDate.format(new Date((Long) item.get(field.getName()))));
+                        }
+                    }
+//                }
+                    ((Result) result).setResult(item);
+                }catch (Exception e){
+                    log.info("########################此返回类型不支持字典翻译########################");
+                }
             }
         }
     }

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

@@ -23,7 +23,7 @@
         </where>
         <!-- 会议项目-->
         UNION ALL
-        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_contact_temporary_id,sit.company_contact_name,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,'','',sit.remark,'',sit.company_temporary_id,sit.pay_mode,''
+        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_contact_id,sit.company_contact_name,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,'','',sit.remark,'',sit.company_id,sit.pay_mode,''
         from pay_meeting meeting
         inner join pay_meeting_situation sit on meeting.id = sit.meeting_id
         <where>

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java

@@ -60,11 +60,11 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("/company/payCompanyManagement")
 @Slf4j
 public class PayCompanyManagementController extends JeroController<PayCompanyManagement, IPayCompanyManagementService> {
-	@Autowired
+	@Resource
 	private IPayCompanyManagementService payCompanyManagementService;
-	@Autowired
+	@Resource
 	private Environment env;
-	@Autowired
+	@Resource
 	private ProjectCountService projectCountService;
 
 	@Resource
@@ -299,6 +299,60 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 		}
 		return Result.OK("添加成功！",payCompanyManagement);
 	}
+
+	 /**
+	  *  企业端-编辑
+	  *
+	  * @param payCompanyManagement 企业管理
+	  * @return
+	  */
+	 @AutoLog(value = "企业管理-企业端-编辑")
+	 @ApiOperation(value="企业管理-企业端-编辑", notes="企业管理-企业端-编辑")
+	 @PostMapping(value = "/companyEdit")
+	 public Result<?> companyEdit(@RequestBody PayCompanyManagement payCompanyManagement) {
+		 StringBuilder msg = ValidUtil.validateAll(payCompanyManagement);
+		 if(!StringUtils.isBlank(msg)){
+			 return Result.error(msg.toString());
+		 }
+		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 int status = PayCompanyManagementCommon.STATUS2;
+		 // 只有财务人员操作不需要重新审核，其他人都需要审核
+		 if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
+			 status = PayCompanyManagementCommon.STATUS1;
+		 }
+		 payCompanyManagement.setStatus(status);
+		 PayCompanyManagement payCompanyManagementOld = payCompanyManagementService.getById(payCompanyManagement.getId());
+		 if(Objects.isNull(payCompanyManagementOld)){
+			 return Result.error("企业不存在!");
+		 }
+		 if(Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){
+			 return Result.error("企业名称不可修改!");
+		 }
+		 payCompanyManagement.setStatus(payCompanyManagementOld.getStatus());
+		 payCompanyManagement.setDataSource(payCompanyManagementOld.getDataSource());
+		 try {
+			 // 编辑保存企业前再次校验企业名称是否存在
+			 LambdaQueryWrapper<PayCompanyManagement> queryWrapper = new LambdaQueryWrapper<>();
+			 queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName());
+			 PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper);
+			 // 企业名称存在，并且编辑id与查询不同，则校验不通过
+			 if(!Objects.isNull(payCompanyManagementNew) && !Objects.equals(payCompanyManagementNew.getId(),payCompanyManagement.getId())) {
+				 return Result.error("企业名称已存在！");
+			 }
+		 }catch (Exception e){
+			 log.info("企业管理-编辑异常",e);
+			 return Result.error("企业名称已存在！");
+		 }
+		 if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){
+			 try {
+				 payCompanyManagement.setCompanyPhone(PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone()));
+			 }catch (Exception e){
+				 log.error("公司电话加密异常！",e);
+			 }
+		 }
+		 payCompanyManagementService.updateById(payCompanyManagement);
+		 return Result.OK("编辑成功!");
+	 }
 	
 	/**
 	 *  编辑

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java

@@ -260,6 +260,10 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 			return Result.error("企业不存在！");
 		}
 		payContactsManagement.setCompanyName(payCompanyManagement.getCompanyName());
+		PayContactsManagement payContactsManagementOld = payContactsManagementService.getById(payContactsManagement.getId());
+		if(Objects.isNull(payContactsManagementOld)){
+			return Result.error("联系人不存在！");
+		}
 		try {
 			String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
 			// 编辑保存联系人前再次校验手机号是否存在
@@ -301,6 +305,77 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		payContactsManagementService.updateById(payContactsManagement);
 		return Result.OK("编辑成功!");
 	}
+
+	 /**
+	  *  企业端-编辑
+	  *
+	  * @param payContactsManagement
+	  * @return
+	  */
+	 @AutoLog(value = "联系人管理-企业端-编辑")
+	 @ApiOperation(value="联系人管理-企业端-编辑", notes="联系人管理-编辑")
+	 @PostMapping(value = "/companyEdit")
+	 public Result<?> companyEdit(@RequestBody PayContactsManagement payContactsManagement) {
+		 StringBuilder msg = ValidUtil.validateAll(payContactsManagement);
+		 if(!StringUtils.isBlank(msg)){
+			 return Result.error(msg.toString());
+		 }
+		 PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(payContactsManagement.getCompanyId());
+		 if(Objects.isNull(payCompanyManagement)){
+			 return Result.error("企业不存在！");
+		 }
+		 payContactsManagement.setCompanyName(payCompanyManagement.getCompanyName());
+		 PayContactsManagement payContactsManagementOld = payContactsManagementService.getById(payContactsManagement.getId());
+		 if(Objects.isNull(payContactsManagementOld)){
+			 return Result.error("联系人不存在！");
+		 }
+		 if(Objects.equals(payContactsManagementOld.getName(),payContactsManagement.getName())){
+			 return Result.error("姓名不可修改！");
+		 }
+		 if(Objects.equals(payContactsManagementOld.getPhone(),payContactsManagement.getPhone())){
+			 return Result.error("手机号不可修改！");
+		 }
+		 try {
+			 String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
+			 // 编辑保存联系人前再次校验手机号是否存在
+			 LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
+			 queryWrapper.eq(PayContactsManagement::getPhone,phone);
+			 PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper);
+			 // 手机号存在，并且编辑id与查询不同，则校验不通过
+			 if(!Objects.isNull(payContactsManagementNew) && !Objects.equals(payContactsManagementNew.getId(),payContactsManagement.getId())) {
+				 return Result.error("手机号已存在！");
+			 }
+		 }catch (Exception e){
+			 log.info("联系人管理-编辑异常",e);
+			 return Result.error("手机号已存在！");
+		 }
+		 try {
+			 // 新增联系人前校验同企业下联系人是否存在
+			 LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
+			 queryWrapper.eq(PayContactsManagement::getName,payContactsManagement.getName());
+			 queryWrapper.eq(PayContactsManagement::getCompanyId,payContactsManagement.getCompanyId());
+			 PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper);
+			 // 姓名存在，并且编辑id与查询不同，则校验不通过
+			 if(!Objects.isNull(payContactsManagementNew) && !Objects.equals(payContactsManagementNew.getId(),payContactsManagement.getId())) {
+				 return Result.error("联系人姓名已存在！");
+			 }
+		 }catch (Exception e){
+			 log.info("联系人管理-编辑异常",e);
+			 return Result.error("联系人姓名已存在！");
+		 }
+		 try {
+			 if (!StringUtils.isBlank(payContactsManagement.getPhone())){
+				 payContactsManagement.setPhone(PasswordUtil.encrypt(payContactsManagement.getPhone()));
+			 }
+			 if (!StringUtils.isBlank(payContactsManagement.getEmail())){
+				 payContactsManagement.setEmail(PasswordUtil.encrypt(payContactsManagement.getEmail()));
+			 }
+		 }catch (Exception e){
+			 log.error("手机号、邮箱加密异常！",e);
+		 }
+		 payContactsManagementService.updateById(payContactsManagement);
+		 return Result.OK("编辑成功!");
+	 }
 	
 	/**
 	 *   通过id删除
@@ -352,7 +427,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  * @param phone 手机号
 	  * @return
 	  */
-	 @AutoLog(value = "联系人管理-通过手机号查询")
+//	 @AutoLog(value = "联系人管理-通过手机号查询")
 	 @ApiOperation(value="联系人管理-通过手机号查询", notes="联系人管理-通过手机号查询")
 	 @GetMapping(value = "/queryByCompanyName")
 	 public Result<?> queryByCompanyName(@RequestParam(name="phone") String phone) {
@@ -385,7 +460,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  * @param name 联系人姓名
 	  * @return
 	  */
-	 @AutoLog(value = "联系人管理-通过联系人姓名查询")
+//	 @AutoLog(value = "联系人管理-通过联系人姓名查询")
 	 @ApiOperation(value="联系人管理-通过联系人姓名查询", notes="联系人管理-通过联系人姓名查询")
 	 @GetMapping(value = "/queryByName")
 	 public Result<?> queryByName(@RequestParam(name="name") String name,@RequestParam(name="companyId") String companyId) {
@@ -441,7 +516,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "联系人管理-查询详情")
+//	@AutoLog(value = "联系人管理-查询详情")
 	@ApiOperation(value="联系人管理-通过id查询", notes="联系人管理-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id") String id) {
@@ -489,7 +564,6 @@ 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) {

jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java

@@ -196,7 +196,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "支出合同-查询详情")
+//	@AutoLog(value = "支出合同-查询详情")
 	@ApiOperation(value="支出合同-通过id查询", notes="支出合同-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id") String id) {

jero-boot-incoming-payment/src/main/java/com/jero/message/common/MessageCommon.java

@@ -1,12 +0,0 @@
-package com.jero.message.common;
-
-public class MessageCommon {
-    /**
-     * 阅读状态（0未读，1已读）
-     */
-    public final static Integer READ_FLAG1 = 1;
-    /**
-     * 阅读状态（0未读，1已读）
-     */
-    public final static Integer READ_FLAG0 = 0;
-}

jero-boot-incoming-payment/src/main/java/com/jero/message/controller/PayAnnouncementMessageController.java

@@ -1,179 +0,0 @@
-package com.jero.message.controller;
-
-import java.util.Arrays;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-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.system.base.controller.JeroController;
-import com.jero.common.system.query.QueryGenerator;
-import com.jero.common.system.vo.LoginUser;
-import com.jero.message.common.MessageCommon;
-import com.jero.message.entity.PayAnnouncementMessage;
-import com.jero.message.service.IPayAnnouncementMessageService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
- /**
- * @Description: 消息
- * @Author: jeecg-boot
- * @Date:   2021-09-22
- * @Version: V1.0
- */
-@Api(tags="消息")
-@RestController
-@RequestMapping("/message/payAnnouncementMessage")
-@Slf4j
-public class PayAnnouncementMessageController extends JeroController<PayAnnouncementMessage, IPayAnnouncementMessageService> {
-	@Autowired
-	private IPayAnnouncementMessageService payAnnouncementMessageService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param payAnnouncementMessage
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "消息-分页列表查询")
-	@ApiOperation(value="消息-分页列表查询", notes="消息-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<?> queryPageList(PayAnnouncementMessage payAnnouncementMessage,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		payAnnouncementMessage.setRecipient(sysUser.getId());
-		QueryWrapper<PayAnnouncementMessage> queryWrapper = QueryGenerator.initQueryWrapper(payAnnouncementMessage, req.getParameterMap());
-		Page<PayAnnouncementMessage> page = new Page<>(pageNo, pageSize);
-		IPage<PayAnnouncementMessage> pageList = payAnnouncementMessageService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	/**
-	* @Description 已读
-	* @Author  lqt
-	* @Date   2021/9/22
-	* @Param
-	* @Return
-	* @Exception
-	*/
-	@AutoLog(value = "消息-已读")
-	@ApiOperation(value="消息-已读", notes="消息-已读")
-	@PostMapping(value = "/add")
-	public Result<?> update(@RequestBody PayAnnouncementMessage payAnnouncementMessage) {
-		LambdaUpdateWrapper<PayAnnouncementMessage> update = new LambdaUpdateWrapper<>();
-		update.eq(PayAnnouncementMessage::getId,payAnnouncementMessage.getId());
-		update.set(PayAnnouncementMessage::getReadFlag,MessageCommon.READ_FLAG1);
-		payAnnouncementMessageService.update(update);
-		return Result.OK("操作成功！");
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param payAnnouncementMessage
-	 * @return
-	 */
-//	@AutoLog(value = "pay_announcement_message-添加")
-//	@ApiOperation(value="pay_announcement_message-添加", notes="pay_announcement_message-添加")
-//	@PostMapping(value = "/add")
-	public Result<?> add(@RequestBody PayAnnouncementMessage payAnnouncementMessage) {
-		payAnnouncementMessageService.save(payAnnouncementMessage);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param payAnnouncementMessage
-	 * @return
-	 */
-//	@AutoLog(value = "pay_announcement_message-编辑")
-//	@ApiOperation(value="pay_announcement_message-编辑", notes="pay_announcement_message-编辑")
-//	@PutMapping(value = "/edit")
-	public Result<?> edit(@RequestBody PayAnnouncementMessage payAnnouncementMessage) {
-		payAnnouncementMessageService.updateById(payAnnouncementMessage);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-//	@AutoLog(value = "pay_announcement_message-通过id删除")
-//	@ApiOperation(value="pay_announcement_message-通过id删除", notes="pay_announcement_message-通过id删除")
-//	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		payAnnouncementMessageService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-//	@AutoLog(value = "pay_announcement_message-批量删除")
-//	@ApiOperation(value="pay_announcement_message-批量删除", notes="pay_announcement_message-批量删除")
-//	@DeleteMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.payAnnouncementMessageService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "pay_announcement_message-通过id查询")
-	@ApiOperation(value="pay_announcement_message-通过id查询", notes="pay_announcement_message-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
-		PayAnnouncementMessage payAnnouncementMessage = payAnnouncementMessageService.getById(id);
-		if(payAnnouncementMessage==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(payAnnouncementMessage);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param payAnnouncementMessage
-    */
-//    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, PayAnnouncementMessage payAnnouncementMessage) {
-        return super.exportXls(request, payAnnouncementMessage, PayAnnouncementMessage.class, "pay_announcement_message");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, PayAnnouncementMessage.class);
-    }
-
-}

jero-boot-incoming-payment/src/main/java/com/jero/message/entity/PayAnnouncementMessage.java

@@ -1,89 +0,0 @@
-package com.jero.message.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: pay_announcement_message
- * @Author: jeecg-boot
- * @Date:   2021-09-22
- * @Version: V1.0
- */
-@Data
-@TableName("pay_announcement_message")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="pay_announcement_message对象", description="pay_announcement_message")
-public class PayAnnouncementMessage implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "id")
-    private String id;
-	/**标题*/
-	@Excel(name = "标题", width = 15)
-    @ApiModelProperty(value = "标题")
-    private String titile;
-	/**内容*/
-	@Excel(name = "内容", width = 15)
-    @ApiModelProperty(value = "内容")
-    private String msgContent;
-	/**发布人*/
-	@Excel(name = "发布人", width = 15)
-    @ApiModelProperty(value = "发布人")
-    private String sender;
-	/**接收用户*/
-	@Excel(name = "接收用户", width = 15)
-    @ApiModelProperty(value = "接收用户")
-    private String recipient;
-    /**消息类型（字典表）*/
-    @Excel(name = "消息类型（字典表）", width = 15)
-    @ApiModelProperty(value = "消息类型（字典表）")
-    private Integer msgCategory;
-    /**操作*/
-    @Excel(name = "操作", width = 15)
-    @ApiModelProperty(value = "操作")
-    private String operation;
-	/**业务id*/
-	@Excel(name = "业务id", width = 15)
-    @ApiModelProperty(value = "业务id")
-    private String busId;
-	/**阅读状态（0未读，1已读）*/
-	@Excel(name = "阅读状态（0未读，1已读）", width = 15)
-    @ApiModelProperty(value = "阅读状态（0未读，1已读）")
-    private Integer readFlag;
-	/**阅读时间*/
-	@Excel(name = "阅读时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "阅读时间")
-    private Date readTime;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-}

jero-boot-incoming-payment/src/main/java/com/jero/message/mapper/PayAnnouncementMessageMapper.java

@@ -1,15 +0,0 @@
-package com.jero.message.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jero.message.entity.PayAnnouncementMessage;
-
-/**
- * @Description: pay_announcement_message
- * @Author: jeecg-boot
- * @Date:   2021-09-22
- * @Version: V1.0
- */
-public interface PayAnnouncementMessageMapper extends BaseMapper<PayAnnouncementMessage> {
-
-}

jero-boot-incoming-payment/src/main/java/com/jero/message/mapper/xml/PayAnnouncementMessageMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jero.message.mapper.PayAnnouncementMessageMapper">
-
-</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/message/service/IPayAnnouncementMessageService.java

@@ -1,16 +0,0 @@
-package com.jero.message.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.jero.message.entity.PayAnnouncementMessage;
-
-/**
- * @Description: pay_announcement_message
- * @Author: jeecg-boot
- * @Date:   2021-09-22
- * @Version: V1.0
- */
-public interface IPayAnnouncementMessageService extends IService<PayAnnouncementMessage> {
-
-    void sendMessage(PayAnnouncementMessage payAnnouncementMessage);
-
-}

jero-boot-incoming-payment/src/main/java/com/jero/message/service/impl/PayAnnouncementMessageServiceImpl.java

@@ -1,46 +0,0 @@
-package com.jero.message.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.constant.WebsocketConst;
-import com.jero.common.exception.JeroBootException;
-import com.jero.message.common.MessageCommon;
-import com.jero.message.entity.PayAnnouncementMessage;
-import com.jero.message.mapper.PayAnnouncementMessageMapper;
-import com.jero.message.service.IPayAnnouncementMessageService;
-import com.jero.modules.message.websocket.WebSocket;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.Objects;
-
-/**
- * @Description: pay_announcement_message
- * @Author: jeecg-boot
- * @Date:   2021-09-22
- * @Version: V1.0
- */
-@Service
-public class PayAnnouncementMessageServiceImpl extends ServiceImpl<PayAnnouncementMessageMapper, PayAnnouncementMessage> implements IPayAnnouncementMessageService {
-    @Autowired
-    private IPayAnnouncementMessageService payAnnouncementMessageService;
-    @Resource
-    private WebSocket webSocket;
-    @Override
-    @Transactional
-    public void sendMessage(PayAnnouncementMessage payAnnouncementMessage) {
-        if(Objects.isNull(payAnnouncementMessage)){
-            throw new JeroBootException("发送消息失败！");
-        }
-        payAnnouncementMessage.setReadFlag(MessageCommon.READ_FLAG0);
-        payAnnouncementMessageService.save(payAnnouncementMessage);
-        JSONObject obj = new JSONObject();
-        obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER);
-        obj.put(WebsocketConst.MSG_USER_ID, payAnnouncementMessage.getRecipient());
-        obj.put(WebsocketConst.MSG_ID, payAnnouncementMessage.getId());
-        obj.put(WebsocketConst.MSG_TXT, payAnnouncementMessage.getTitile());
-        webSocket.sendMessage(payAnnouncementMessage.getRecipient(), obj.toJSONString());
-    }
-}

jero-boot-incoming-payment/src/main/java/com/jero/temporary/common/PayCompanyManagementTemporaryCommon.java

@@ -0,0 +1,12 @@
+package com.jero.temporary.common;
+
+public class PayCompanyManagementTemporaryCommon {
+    /**
+     * 审核状态（1：通过，2：待审核）财务人员添加企业不需要审核默认是通过状态
+     */
+    public final static Integer STATUS2 = 2;
+    /**
+     * 审核状态（1：通过，2：待审核）
+     */
+    public final static String  CHECK = "（待审核）";
+}

jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
 import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.service.IPayCompanyManagementService;
+import com.jero.temporary.common.PayCompanyManagementTemporaryCommon;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.mapper.PayCompanyManagementTemporaryMapper;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
@@ -45,6 +46,9 @@ public class PayCompanyManagementTemporaryServiceImpl extends ServiceImpl<PayCom
             }
             str = JSONObject.toJSONString(temporary);
         }else{
+//            if(Objects.equals(payCompanyManagement.getStatus(), PayCompanyManagementTemporaryCommon.STATUS2)){
+//                payCompanyManagement.setCompanyName(payCompanyManagement.getCompanyName() + PayCompanyManagementTemporaryCommon.CHECK);
+//            }
             str = JSONObject.toJSONString(payCompanyManagement);
         }
         PayCompanyManagementTemporary payCompanyManagementTemporary = JSON.parseObject(str,PayCompanyManagementTemporary.class);

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

@@ -202,6 +202,27 @@ public class SysAnnouncementSendController {
 		result.setSuccess(true);
 		return result;
 	}
+	 /**
+	  * @功能：更新用户系统消息阅读状态
+	  * @param json
+	  * @return
+	  */
+	 @AutoLog(value = "我的消息-已读")
+	 @PostMapping(value = "/editCompanyByAnntIdAndUserId")
+	 public Result<SysAnnouncementSend> editCompanyByAnntIdAndUserId(@RequestBody JSONObject json) {
+		 Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
+		 String anntId = json.getString("anntId");
+		 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+		 String userId = sysUser.getId();
+		 LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
+		 updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
+		 updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
+		 updateWrapper.last("where annt_id ='"+anntId+"' and user_id ='"+userId+"'");
+		 SysAnnouncementSend announcementSend = new SysAnnouncementSend();
+		 sysAnnouncementSendService.update(announcementSend, updateWrapper);
+		 result.setSuccess(true);
+		 return result;
+	 }
 	
 	/**
 	 * @功能：获取我的消息
@@ -225,6 +246,27 @@ public class SysAnnouncementSendController {
 		return result;
 	}
 
+	 /**
+	  * @功能：企业端获取我的消息
+	  * @return
+	  */
+	 @GetMapping(value = "/getCompanyMyAnnouncementSend")
+	 public Result<IPage<AnnouncementSendModel>> getCompanyMyAnnouncementSend(AnnouncementSendModel announcementSendModel,
+												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		 Result<IPage<AnnouncementSendModel>> result = new Result<IPage<AnnouncementSendModel>>();
+		 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+		 String userId = sysUser.getId();
+		 announcementSendModel.setUserId(userId);
+		 announcementSendModel.setPageNo((pageNo-1)*pageSize);
+		 announcementSendModel.setPageSize(pageSize);
+		 Page<AnnouncementSendModel> pageList = new Page<AnnouncementSendModel>(pageNo,pageSize);
+		 pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel);
+		 result.setResult(pageList);
+		 result.setSuccess(true);
+		 return result;
+	 }
+
 	/**
 	 * @功能：一键已读
 	 * @return