From b2c1822dc9ae8a67872193d182d9335d9a99655c Mon Sep 17 00:00:00 2001 From: ZQN <364596817@qq.com> Date: 星期六, 22 六月 2024 15:16:53 +0800 Subject: [PATCH] 执法评价相关添加 --- project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java | 81 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java index 64157bd..e47ca72 100644 --- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java +++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java @@ -4,11 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.project.common.core.domain.entity.SysUser; +import com.project.common.exception.base.BaseException; +import com.project.common.utils.DateUtils; +import com.project.common.utils.SecurityUtils; import com.project.common.utils.StringUtils; import com.project.enforce.domain.EnforceComplaintLog; +import com.project.enforce.domain.bo.editBo.ComplaintResultBo; import com.project.enforce.domain.bo.editBo.EnforceComplaintLogBo; import com.project.enforce.domain.bo.queryBo.EnforceComplaintLogQueryBo; import com.project.enforce.domain.vo.EnforceComplaintLogVo; +import com.project.enforce.domain.vo.OrderNodeVo; import com.project.enforce.mapper.EnforceComplaintLogMapper; import com.project.enforce.service.IEnforceComplaintLogService; import com.project.system.service.ISysDeptService; @@ -17,6 +23,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -76,6 +83,53 @@ return this.removeByIds(ids); } + @Override//鎶曡瘔鍗曡妭鐐� + public List<OrderNodeVo> orderNodeList(Long id) + { + List<OrderNodeVo> vos = new ArrayList<>(); + EnforceComplaintLog order = this.getById(id); + if (order.getComplaintTime()!=null){ + vos.add(new OrderNodeVo("鍙戣捣鎶曡瘔",order.getCompanyUser(),order.getComplaintTime(), null)); + } + if (order.getInTime()!=null){ + vos.add(new OrderNodeVo("鍝嶅簲鎶曡瘔",order.getInUser(),order.getInTime(), null)); + } + if (order.getResultTime()!=null){ + vos.add(new OrderNodeVo("鎶曡瘔缁撴灉",order.getExecuteUser(),order.getResultTime(), order.getComplaintResult())); + } + return vos; + } + + @Override//鍝嶅簲鎶曡瘔 + @Transactional + public Boolean inComplaint(ComplaintResultBo bo) + { + SysUser loginUser = SecurityUtils.getLoginUser().getUser(); + return this.update(lu() + .set(EnforceComplaintLog::getInId,loginUser.getUserId()) + .set(EnforceComplaintLog::getInUser,loginUser.getNickName()) + .set(EnforceComplaintLog::getInTime, DateUtils.getNowDate()) + .eq(EnforceComplaintLog::getId, bo.getId()) + ); + } + + @Override//澶勭悊缁撴灉 + @Transactional + public Boolean doComplaint(ComplaintResultBo bo) + { + if (StringUtils.isEmpty(bo.getResult())){ + throw new BaseException("璇峰~鍐欏鐞嗙粨鏋�"); + } + SysUser loginUser = SecurityUtils.getLoginUser().getUser(); + return this.update(lu() + .set(EnforceComplaintLog::getResultId,loginUser.getUserId()) + .set(EnforceComplaintLog::getResultUser,loginUser.getNickName()) + .set(EnforceComplaintLog::getResultTime, DateUtils.getNowDate()) + .set(EnforceComplaintLog::getComplaintResult, bo.getResult()) + .eq(EnforceComplaintLog::getId, bo.getId()) + ); + } + //------------------------------------------------------------------------------------- @@ -85,6 +139,33 @@ if (StringUtils.isEmpty(entity.getExecuteDeptName()) && entity.getExecuteDeptName()!=null){ entity.setExecuteDeptName(deptService.getDeptAllName(entity.getExecuteDeptId())); } + if (entity.getCompanyId()==null + || StringUtils.isEmpty(entity.getCompanyName()) + || StringUtils.isEmpty(entity.getCompanyUser()) + || StringUtils.isEmpty(entity.getCompanyPhone()) + ){ + throw new BaseException("鎶曡瘔浼佷笟涓嶈兘涓虹┖锛�"); + } + if (entity.getExecuteDeptId() == null + || StringUtils.isEmpty(entity.getExecuteDeptName()) + ){ + throw new BaseException("鎶曡瘔鍗曚綅涓嶈兘涓虹┖锛�"); + } + if (StringUtils.isEmpty(entity.getComplaintType())){ + throw new BaseException("璇烽�夋嫨瑕佹姇璇夌被鍨嬶紒"); + } + if (StringUtils.isEmpty(entity.getComplaintReason())){ + throw new BaseException("璇峰~鍐欐姇璇夊唴瀹癸紒"); + } + if (entity.getId()==null){ + if (entity.getOrderId()!=null){ //鎵ф硶鍗曟姇璇� + int count = this.count(lq().eq(EnforceComplaintLog::getOrderId, entity.getOrderId())); + if (count >0){ + throw new BaseException("璇ユ墽娉曞崟宸叉姇璇夛紒"); + } + } + entity.setComplaintTime(DateUtils.getNowDate()); + } } //鑾峰彇鏌ヨ鍙傛暟 -- Gitblit v1.9.1