Browse Source
# Conflicts: # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/enterprise/EnterpriseDO.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/enterprise/EnterpriseMapper.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/enterpriseinspections/EnterpriseInspectionsMapper.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsService.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsServiceImpl.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoServiceImpl.javamaster
30 changed files with 994 additions and 22 deletions
@ -0,0 +1,13 @@
|
||||
package cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.util.List; |
||||
|
||||
@Data |
||||
public class PassOnSaveVO { |
||||
//转交的执法记录id 转交是否需要审核
|
||||
private List<Long> inspectionsId; |
||||
//转给的专管员id
|
||||
private Long userId; |
||||
} |
||||
@ -0,0 +1,126 @@
|
||||
package cn.iocoder.yudao.module.system.controller.admin.inspectionslog; |
||||
|
||||
import cn.iocoder.yudao.module.system.service.fileInfo.FileInfoService; |
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import org.springframework.web.bind.annotation.*; |
||||
import org.springframework.validation.annotation.Validated; |
||||
import org.springframework.security.access.prepost.PreAuthorize; |
||||
import io.swagger.v3.oas.annotations.tags.Tag; |
||||
import io.swagger.v3.oas.annotations.Parameter; |
||||
import io.swagger.v3.oas.annotations.Operation; |
||||
|
||||
import java.util.*; |
||||
import java.io.IOException; |
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam; |
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult; |
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
||||
|
||||
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; |
||||
|
||||
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; |
||||
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; |
||||
|
||||
import cn.iocoder.yudao.module.system.controller.admin.inspectionslog.vo.*; |
||||
import cn.iocoder.yudao.module.system.dal.dataobject.inspectionslog.InspectionsLogDO; |
||||
import cn.iocoder.yudao.module.system.service.inspectionslog.InspectionsLogService; |
||||
|
||||
import javax.annotation.Resource; |
||||
import javax.servlet.http.HttpServletResponse; |
||||
import javax.validation.Valid; |
||||
|
||||
@Tag(name = "管理后台 - 检查结果日志") |
||||
@RestController |
||||
@RequestMapping("/system/inspections-log") |
||||
@Validated |
||||
public class InspectionsLogController { |
||||
|
||||
@Resource |
||||
private InspectionsLogService inspectionsLogService; |
||||
@Resource |
||||
private FileInfoService fileInfoService; |
||||
|
||||
@PostMapping("/create") |
||||
@Operation(summary = "创建检查结果日志") |
||||
@PreAuthorize("@ss.hasPermission('system:inspections-log:create')") |
||||
public CommonResult<Long> createInspectionsLog(@Valid @RequestBody InspectionsLogSaveReqVO createReqVO) { |
||||
return success(inspectionsLogService.createInspectionsLog(createReqVO)); |
||||
} |
||||
|
||||
@PutMapping("/cooperateWithSignIn") |
||||
@Operation(summary = "协同人员打开") |
||||
@PreAuthorize("@ss.hasPermission('system:inspections-log:update')") |
||||
public CommonResult<Boolean> cooperateWithSignIn(Long inspectionsLogId) { |
||||
inspectionsLogService.cooperateWithSignIn(inspectionsLogId); |
||||
return success(true); |
||||
} |
||||
|
||||
@PutMapping("/update") |
||||
@Operation(summary = "更新检查结果日志") |
||||
@PreAuthorize("@ss.hasPermission('system:inspections-log:update')") |
||||
public CommonResult<Boolean> updateInspectionsLog(@Valid @RequestBody InspectionsLogSaveReqVO updateReqVO) { |
||||
inspectionsLogService.updateInspectionsLog(updateReqVO); |
||||
return success(true); |
||||
} |
||||
|
||||
@DeleteMapping("/delete") |
||||
@Operation(summary = "删除检查结果日志") |
||||
@Parameter(name = "id", description = "编号", required = true) |
||||
@PreAuthorize("@ss.hasPermission('system:inspections-log:delete')") |
||||
public CommonResult<Boolean> deleteInspectionsLog(@RequestParam("id") Long id) { |
||||
inspectionsLogService.deleteInspectionsLog(id); |
||||
return success(true); |
||||
} |
||||
|
||||
@GetMapping("/get") |
||||
@Operation(summary = "获得检查结果日志") |
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024") |
||||
@PreAuthorize("@ss.hasPermission('system:inspections-log:query')") |
||||
public CommonResult<InspectionsLogRespVO> getInspectionsLog(@RequestParam("id") Long id) { |
||||
InspectionsLogDO inspectionsLog = inspectionsLogService.getInspectionsLog(id); |
||||
return success(BeanUtils.toBean(inspectionsLog, InspectionsLogRespVO.class)); |
||||
} |
||||
|
||||
@GetMapping("/page") |
||||
@Operation(summary = "获得检查结果日志分页") |
||||
@PreAuthorize("@ss.hasPermission('system:inspections-log:query')") |
||||
public CommonResult<PageResult<InspectionsLogRespVO>> getInspectionsLogPage(@Valid InspectionsLogPageReqVO pageReqVO) { |
||||
PageResult<InspectionsLogDO> pageResult = inspectionsLogService.getInspectionsLogPage(pageReqVO); |
||||
|
||||
|
||||
return success(BeanUtils.toBean(pageResult, InspectionsLogRespVO.class)); |
||||
} |
||||
|
||||
@GetMapping("/list") |
||||
@Operation(summary = "pc端获得检查状态列表") |
||||
@PreAuthorize("@ss.hasPermission('system:inspections-log:query')") |
||||
public CommonResult<List<InspectionsLogRespVO>> getInspectionsLogList(@Valid InspectionsLogPageReqVO pageReqVO) { |
||||
List<InspectionsLogDO> list = inspectionsLogService.list(pageReqVO); |
||||
|
||||
if (list != null && list.size() > 0) { |
||||
list.forEach(item->{ |
||||
//图片相关
|
||||
final List<Map<String, String>> fileList = fileInfoService.getFileList("644", "2", item.getId().toString()); |
||||
item.setFileList(fileList); |
||||
}); |
||||
} |
||||
|
||||
return success(BeanUtils.toBean(list, InspectionsLogRespVO.class)); |
||||
} |
||||
|
||||
@GetMapping("/export-excel") |
||||
@Operation(summary = "导出检查结果日志 Excel") |
||||
@PreAuthorize("@ss.hasPermission('system:inspections-log:export')") |
||||
@ApiAccessLog(operateType = EXPORT) |
||||
public void exportInspectionsLogExcel(@Valid InspectionsLogPageReqVO pageReqVO, |
||||
HttpServletResponse response) throws IOException { |
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); |
||||
List<InspectionsLogDO> list = inspectionsLogService.getInspectionsLogPage(pageReqVO).getList(); |
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "检查结果日志.xls", "数据", InspectionsLogRespVO.class, |
||||
BeanUtils.toBean(list, InspectionsLogRespVO.class)); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,40 @@
|
||||
package cn.iocoder.yudao.module.system.controller.admin.inspectionslog.vo; |
||||
|
||||
import lombok.*; |
||||
import java.util.*; |
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam; |
||||
import org.springframework.format.annotation.DateTimeFormat; |
||||
import java.time.LocalDateTime; |
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; |
||||
|
||||
@Schema(description = "管理后台 - 检查结果日志分页 Request VO") |
||||
@Data |
||||
@EqualsAndHashCode(callSuper = true) |
||||
@ToString(callSuper = true) |
||||
public class InspectionsLogPageReqVO extends PageParam { |
||||
|
||||
@Schema(description = "检查记录id", example = "18375") |
||||
private Long inspectionsId; |
||||
|
||||
@Schema(description = "检查状态1.签到2.通过.3整改", example = "2") |
||||
private Integer status; |
||||
|
||||
@Schema(description = "检查人员签到位置信息，格式：经纬度") |
||||
private String gpsLocation; |
||||
|
||||
@Schema(description = "反馈信息") |
||||
private String feedBack; |
||||
|
||||
@Schema(description = "协同人员姓名", example = "张三") |
||||
private String cooperateWithName; |
||||
|
||||
@Schema(description = "执法人员姓名", example = "李四") |
||||
private String inspectName; |
||||
|
||||
@Schema(description = "创建时间") |
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
||||
private LocalDateTime[] createTime; |
||||
|
||||
} |
||||
@ -0,0 +1,53 @@
|
||||
package cn.iocoder.yudao.module.system.controller.admin.inspectionslog.vo; |
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import lombok.*; |
||||
import java.util.*; |
||||
import org.springframework.format.annotation.DateTimeFormat; |
||||
import java.time.LocalDateTime; |
||||
import com.alibaba.excel.annotation.*; |
||||
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
||||
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
||||
|
||||
@Schema(description = "管理后台 - 检查结果日志 Response VO") |
||||
@Data |
||||
@ExcelIgnoreUnannotated |
||||
public class InspectionsLogRespVO { |
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2308") |
||||
@ExcelProperty("主键") |
||||
private Long id; |
||||
|
||||
@Schema(description = "检查记录id", requiredMode = Schema.RequiredMode.REQUIRED, example = "18375") |
||||
@ExcelProperty("检查记录id") |
||||
private Long inspectionsId; |
||||
|
||||
@Schema(description = "检查状态1.签到2.通过.3整改", example = "2") |
||||
@ExcelProperty(value = "检查状态1.签到2.通过.3整改", converter = DictConvert.class) |
||||
@DictFormat("Inspections_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
|
||||
private Integer status; |
||||
|
||||
@Schema(description = "检查人员签到位置信息，格式：经纬度") |
||||
@ExcelProperty("检查人员签到位置信息，格式：经纬度") |
||||
private String gpsLocation; |
||||
|
||||
@Schema(description = "反馈信息") |
||||
@ExcelProperty("反馈信息") |
||||
private String feedBack; |
||||
|
||||
@Schema(description = "协同人员姓名", example = "张三") |
||||
@ExcelProperty("协同人员姓名") |
||||
private String cooperateWithName; |
||||
|
||||
@Schema(description = "执法人员姓名", example = "李四") |
||||
@ExcelProperty("执法人员姓名") |
||||
private String inspectName; |
||||
|
||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
||||
@ExcelProperty("创建时间") |
||||
private LocalDateTime createTime; |
||||
|
||||
@Schema(description = "相关文件") |
||||
private List<Map<String, String>> fileList; |
||||
|
||||
} |
||||
@ -0,0 +1,44 @@
|
||||
package cn.iocoder.yudao.module.system.controller.admin.inspectionslog.vo; |
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import lombok.*; |
||||
|
||||
import javax.validation.constraints.NotNull; |
||||
import java.util.*; |
||||
|
||||
@Schema(description = "管理后台 - 检查结果日志新增/修改 Request VO") |
||||
@Data |
||||
public class InspectionsLogSaveReqVO { |
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2308") |
||||
private Long id; |
||||
|
||||
@Schema(description = "检查记录id", requiredMode = Schema.RequiredMode.REQUIRED, example = "18375") |
||||
@NotNull(message = "检查记录id不能为空") |
||||
private Long inspectionsId; |
||||
|
||||
@Schema(description = "检查状态1.签到2.通过.3整改", example = "2") |
||||
private Integer status; |
||||
|
||||
@Schema(description = "检查人员签到位置信息，格式：经纬度") |
||||
private String gpsLocation; |
||||
|
||||
@Schema(description = "反馈信息") |
||||
private String feedBack; |
||||
|
||||
@Schema(description = "协同人员姓名", example = "张三") |
||||
private String cooperateWithName; |
||||
|
||||
@Schema(description = "执法人员姓名", example = "李四") |
||||
private String inspectName; |
||||
|
||||
//协同人员的id 还是要加上 会有同名的情况
|
||||
@Schema(description = "协同人员id", example = "1") |
||||
private String cooperateWithIds; |
||||
|
||||
//协同人员的id 还是要加上 会有同名的情况
|
||||
@Schema(description = "执法人ID", example = "1") |
||||
private Long inspectId; |
||||
|
||||
//协同人员是否可以看到任务记录
|
||||
} |
||||
@ -0,0 +1,20 @@
|
||||
package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; |
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import lombok.Data; |
||||
|
||||
@Data |
||||
public class DeptUserReqVO { |
||||
|
||||
@Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
||||
private Long id; |
||||
|
||||
@Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") |
||||
private String realName; |
||||
|
||||
@Schema(description = "部门ID", example = "我是一个用户") |
||||
private Long deptId; |
||||
@Schema(description = "部门名称", example = "IT 部") |
||||
private String deptName; |
||||
|
||||
} |
||||
@ -0,0 +1,53 @@
|
||||
package cn.iocoder.yudao.module.system.controller.app.task; |
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult; |
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
||||
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; |
||||
import cn.iocoder.yudao.module.system.controller.admin.taskinfo.vo.TaskInfoPageReqVO; |
||||
import cn.iocoder.yudao.module.system.controller.admin.taskinfo.vo.TaskInfoRespVO; |
||||
import cn.iocoder.yudao.module.system.controller.admin.taskinfo.vo.TaskInfoSaveReqVO; |
||||
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; |
||||
import cn.iocoder.yudao.module.system.dal.dataobject.taskinfo.TaskInfoDO; |
||||
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; |
||||
import cn.iocoder.yudao.module.system.service.dept.DeptService; |
||||
import cn.iocoder.yudao.module.system.service.taskinfo.TaskInfoService; |
||||
import cn.iocoder.yudao.module.system.service.user.AdminUserService; |
||||
import io.swagger.v3.oas.annotations.Operation; |
||||
import io.swagger.v3.oas.annotations.Parameter; |
||||
import io.swagger.v3.oas.annotations.tags.Tag; |
||||
import org.springframework.security.access.prepost.PreAuthorize; |
||||
import org.springframework.validation.annotation.Validated; |
||||
import org.springframework.web.bind.annotation.*; |
||||
|
||||
import javax.annotation.Resource; |
||||
import javax.validation.Valid; |
||||
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
||||
|
||||
@Tag(name = "管理后台 - 任务表，用于存储所有的任务信息，任务可由不同用户创建并管理。") |
||||
@RestController |
||||
@RequestMapping("/system/app/task-info") |
||||
@Validated |
||||
public class AppTaskController { |
||||
@Resource |
||||
private TaskInfoService taskInfoService; |
||||
@Resource |
||||
private AdminUserService adminUserService; |
||||
@Resource |
||||
private DeptService deptService; |
||||
|
||||
@GetMapping("/page") |
||||
@Operation(summary = "获得任务表，用于存储所有的任务信息，任务可由不同用户创建并管理。分页") |
||||
@PreAuthorize("@ss.hasPermission('system:task-info:query')") |
||||
public CommonResult<PageResult<TaskInfoRespVO>> getTaskInfoPage(@Valid TaskInfoPageReqVO pageReqVO) { |
||||
PageResult<TaskInfoDO> pageResult = taskInfoService.getTaskInfoPage(pageReqVO); |
||||
AdminUserDO user = adminUserService.getUser(SecurityFrameworkUtils.getLoginUserId()); |
||||
DeptDO dep= deptService.getDept( user.getDeptId()); |
||||
pageResult.getList().forEach(item->{ |
||||
item.setPublishDep(dep.getName()); |
||||
item.setCreateName(adminUserService.getUser(Long.valueOf(item.getCreator())).getRealName()); |
||||
}); |
||||
return success(BeanUtils.toBean(pageResult, TaskInfoRespVO.class)); |
||||
} |
||||
} |
||||
@ -0,0 +1,64 @@
|
||||
package cn.iocoder.yudao.module.system.dal.dataobject.inspectionslog; |
||||
|
||||
import com.sun.xml.bind.v2.TODO; |
||||
import lombok.*; |
||||
import java.util.*; |
||||
import java.time.LocalDateTime; |
||||
import java.time.LocalDateTime; |
||||
import com.baomidou.mybatisplus.annotation.*; |
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
||||
|
||||
/** |
||||
* 检查结果日志 DO |
||||
* |
||||
* @author 芋道源码 |
||||
*/ |
||||
@TableName("inspections_log") |
||||
@KeySequence("inspections_log_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data |
||||
@EqualsAndHashCode(callSuper = true) |
||||
@ToString(callSuper = true) |
||||
@Builder |
||||
@NoArgsConstructor |
||||
@AllArgsConstructor |
||||
public class InspectionsLogDO extends BaseDO { |
||||
|
||||
/** |
||||
* 主键 |
||||
*/ |
||||
@TableId |
||||
private Long id; |
||||
/** |
||||
* 检查记录id |
||||
*/ |
||||
private Long inspectionsId; |
||||
/** |
||||
* 检查状态1.签到2.通过.3整改 |
||||
* |
||||
* 枚举 {@link TODO Inspections_status 对应的类} |
||||
*/ |
||||
private Integer status; |
||||
/** |
||||
* 检查人员签到位置信息，格式：经纬度 |
||||
*/ |
||||
private String gpsLocation; |
||||
/** |
||||
* 反馈信息 |
||||
*/ |
||||
private String feedBack; |
||||
/** |
||||
* 协同人员姓名 |
||||
*/ |
||||
private String cooperateWithName; |
||||
/** |
||||
* 执法人员姓名 |
||||
*/ |
||||
private String inspectName; |
||||
|
||||
//协同人员的id 还是要加上 会有同名的情况
|
||||
private String cooperateWithIds; |
||||
//协同人员是否可以看到任务记录
|
||||
//相关文件
|
||||
@TableField(exist = false) |
||||
private List<Map<String, String>> fileList; |
||||
} |
||||
@ -0,0 +1,32 @@
|
||||
package cn.iocoder.yudao.module.system.dal.mysql.inspectionslog; |
||||
|
||||
import java.util.*; |
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult; |
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; |
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; |
||||
import cn.iocoder.yudao.module.system.dal.dataobject.inspectionslog.InspectionsLogDO; |
||||
import org.apache.ibatis.annotations.Mapper; |
||||
import cn.iocoder.yudao.module.system.controller.admin.inspectionslog.vo.*; |
||||
|
||||
/** |
||||
* 检查结果日志 Mapper |
||||
* |
||||
* @author 芋道源码 |
||||
*/ |
||||
@Mapper |
||||
public interface InspectionsLogMapper extends BaseMapperX<InspectionsLogDO> { |
||||
|
||||
default PageResult<InspectionsLogDO> selectPage(InspectionsLogPageReqVO reqVO) { |
||||
return selectPage(reqVO, new LambdaQueryWrapperX<InspectionsLogDO>() |
||||
.eqIfPresent(InspectionsLogDO::getInspectionsId, reqVO.getInspectionsId()) |
||||
.eqIfPresent(InspectionsLogDO::getStatus, reqVO.getStatus()) |
||||
.eqIfPresent(InspectionsLogDO::getGpsLocation, reqVO.getGpsLocation()) |
||||
.eqIfPresent(InspectionsLogDO::getFeedBack, reqVO.getFeedBack()) |
||||
.likeIfPresent(InspectionsLogDO::getCooperateWithName, reqVO.getCooperateWithName()) |
||||
.likeIfPresent(InspectionsLogDO::getInspectName, reqVO.getInspectName()) |
||||
.betweenIfPresent(InspectionsLogDO::getCreateTime, reqVO.getCreateTime()) |
||||
.orderByDesc(InspectionsLogDO::getId)); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,60 @@
|
||||
package cn.iocoder.yudao.module.system.service.inspectionslog; |
||||
|
||||
import java.util.*; |
||||
import cn.iocoder.yudao.module.system.controller.admin.inspectionslog.vo.*; |
||||
import cn.iocoder.yudao.module.system.dal.dataobject.inspectionslog.InspectionsLogDO; |
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult; |
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam; |
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
|
||||
import javax.validation.Valid; |
||||
|
||||
/** |
||||
* 检查结果日志 Service 接口 |
||||
* |
||||
* @author 芋道源码 |
||||
*/ |
||||
public interface InspectionsLogService { |
||||
|
||||
/** |
||||
* 创建检查结果日志 |
||||
* |
||||
* @param createReqVO 创建信息 |
||||
* @return 编号 |
||||
*/ |
||||
Long createInspectionsLog(@Valid InspectionsLogSaveReqVO createReqVO); |
||||
|
||||
/** |
||||
* 更新检查结果日志 |
||||
* |
||||
* @param updateReqVO 更新信息 |
||||
*/ |
||||
void updateInspectionsLog(@Valid InspectionsLogSaveReqVO updateReqVO); |
||||
|
||||
/** |
||||
* 删除检查结果日志 |
||||
* |
||||
* @param id 编号 |
||||
*/ |
||||
void deleteInspectionsLog(Long id); |
||||
|
||||
/** |
||||
* 获得检查结果日志 |
||||
* |
||||
* @param id 编号 |
||||
* @return 检查结果日志 |
||||
*/ |
||||
InspectionsLogDO getInspectionsLog(Long id); |
||||
|
||||
/** |
||||
* 获得检查结果日志分页 |
||||
* |
||||
* @param pageReqVO 分页查询 |
||||
* @return 检查结果日志分页 |
||||
*/ |
||||
PageResult<InspectionsLogDO> getInspectionsLogPage(InspectionsLogPageReqVO pageReqVO); |
||||
|
||||
List<InspectionsLogDO> list(InspectionsLogPageReqVO pageReqVO); |
||||
|
||||
void cooperateWithSignIn(Long inspectionsLogId); |
||||
} |
||||
@ -0,0 +1,179 @@
|
||||
package cn.iocoder.yudao.module.system.service.inspectionslog; |
||||
|
||||
import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO; |
||||
import cn.iocoder.yudao.module.system.dal.dataobject.taskinfo.TaskInfoDO; |
||||
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; |
||||
import cn.iocoder.yudao.module.system.dal.mysql.enterpriseinspections.EnterpriseInspectionsMapper; |
||||
import cn.iocoder.yudao.module.system.dal.mysql.taskinfo.TaskInfoMapper; |
||||
import cn.iocoder.yudao.module.system.service.user.AdminUserService; |
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import org.springframework.stereotype.Service; |
||||
import org.springframework.validation.annotation.Validated; |
||||
import org.springframework.transaction.annotation.Transactional; |
||||
|
||||
import java.util.*; |
||||
import cn.iocoder.yudao.module.system.controller.admin.inspectionslog.vo.*; |
||||
import cn.iocoder.yudao.module.system.dal.dataobject.inspectionslog.InspectionsLogDO; |
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult; |
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam; |
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
||||
|
||||
import cn.iocoder.yudao.module.system.dal.mysql.inspectionslog.InspectionsLogMapper; |
||||
|
||||
import javax.annotation.Resource; |
||||
|
||||
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
||||
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; |
||||
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
||||
import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; |
||||
|
||||
/** |
||||
* 检查结果日志 Service 实现类 |
||||
* |
||||
* @author 芋道源码 |
||||
*/ |
||||
@Service |
||||
@Validated |
||||
public class InspectionsLogServiceImpl implements InspectionsLogService { |
||||
|
||||
@Resource |
||||
private InspectionsLogMapper inspectionsLogMapper; |
||||
@Resource |
||||
private AdminUserService adminUserService; |
||||
@Resource |
||||
private EnterpriseInspectionsMapper enterpriseInspectionsMapper; |
||||
@Resource |
||||
private TaskInfoMapper taskInfoMapper; |
||||
|
||||
@Override |
||||
public Long createInspectionsLog(InspectionsLogSaveReqVO createReqVO) { |
||||
//当前用户id
|
||||
Long loginUserId = getLoginUserId(); |
||||
AdminUserDO user = adminUserService.getUser(loginUserId); |
||||
//根据查询出的列表判断执行到哪一步
|
||||
LambdaQueryWrapper<InspectionsLogDO> wrapper = new LambdaQueryWrapper<>(); |
||||
wrapper.eq(InspectionsLogDO::getInspectionsId, createReqVO.getInspectionsId()); |
||||
wrapper.orderByDesc(InspectionsLogDO::getCreateTime); |
||||
List<InspectionsLogDO> list = inspectionsLogMapper.selectList(wrapper); |
||||
|
||||
if (list == null || list.size() == 0) { |
||||
//签到
|
||||
createReqVO.setStatus(1); |
||||
createReqVO.setInspectId(loginUserId); |
||||
createReqVO.setInspectName(user.getRealName()); |
||||
} |
||||
|
||||
if (list != null && createReqVO.getStatus() != null && createReqVO.getStatus() == 1) { |
||||
//请不要重复签到
|
||||
throw exception(INSPECTIONS_SUCCESS); |
||||
} |
||||
|
||||
if (list != null && list.get(0).getStatus() == 2) { |
||||
throw exception(INSPECTIONS_SUCCESS); |
||||
} |
||||
|
||||
// 插入
|
||||
InspectionsLogDO inspectionsLog = BeanUtils.toBean(createReqVO, InspectionsLogDO.class); |
||||
inspectionsLogMapper.insert(inspectionsLog); |
||||
|
||||
//整改需要重新创建子任务
|
||||
if (list != null && createReqVO.getStatus() != null && createReqVO.getStatus() == 3) { |
||||
|
||||
//查询父任务，和执法记录
|
||||
EnterpriseInspectionsDO enterpriseInspectionsDO = enterpriseInspectionsMapper.selectById(createReqVO.getInspectionsId()); |
||||
if (enterpriseInspectionsDO == null) { |
||||
throw exception(ENTERPRISE_INSPECTIONS_NOT_EXISTS); |
||||
} |
||||
|
||||
//添加子任务
|
||||
TaskInfoDO taskInfo = new TaskInfoDO(); |
||||
taskInfo.setTitle(enterpriseInspectionsDO.getEnterpriseId() + "-" + "整改任务"); |
||||
taskInfo.setTaskType(1); //整改默认是普通专项任务类型
|
||||
taskInfo.setParentId(enterpriseInspectionsDO.getTaskId()); |
||||
taskInfo.setParentType(21); //父子任务类型
|
||||
taskInfoMapper.insert(taskInfo); |
||||
//添加执法记录
|
||||
EnterpriseInspectionsDO enterpriseInspectionsDO1 = new EnterpriseInspectionsDO(); |
||||
enterpriseInspectionsDO1.setUserId(getLoginUserId()); |
||||
enterpriseInspectionsDO1.setEnterpriseId(enterpriseInspectionsDO.getEnterpriseId()); |
||||
enterpriseInspectionsDO1.setTaskId(taskInfo.getId()); |
||||
enterpriseInspectionsDO1.setStatus(2); //整改任务默认是启动的状态
|
||||
enterpriseInspectionsMapper.insert(enterpriseInspectionsDO1); |
||||
} |
||||
|
||||
// 返回
|
||||
return inspectionsLog.getId(); |
||||
} |
||||
|
||||
@Override |
||||
public void updateInspectionsLog(InspectionsLogSaveReqVO updateReqVO) { |
||||
// 校验存在
|
||||
validateInspectionsLogExists(updateReqVO.getId()); |
||||
// 更新
|
||||
InspectionsLogDO updateObj = BeanUtils.toBean(updateReqVO, InspectionsLogDO.class); |
||||
inspectionsLogMapper.updateById(updateObj); |
||||
} |
||||
|
||||
@Override |
||||
public void deleteInspectionsLog(Long id) { |
||||
// 校验存在
|
||||
validateInspectionsLogExists(id); |
||||
// 删除
|
||||
inspectionsLogMapper.deleteById(id); |
||||
} |
||||
|
||||
private void validateInspectionsLogExists(Long id) { |
||||
if (inspectionsLogMapper.selectById(id) == null) { |
||||
throw exception(INSPECTIONS_LOG_NOT_EXISTS); |
||||
} |
||||
} |
||||
|
||||
@Override |
||||
public InspectionsLogDO getInspectionsLog(Long id) { |
||||
return inspectionsLogMapper.selectById(id); |
||||
} |
||||
|
||||
@Override |
||||
public PageResult<InspectionsLogDO> getInspectionsLogPage(InspectionsLogPageReqVO pageReqVO) { |
||||
return inspectionsLogMapper.selectPage(pageReqVO); |
||||
} |
||||
|
||||
@Override |
||||
public List<InspectionsLogDO> list(InspectionsLogPageReqVO pageReqVO) { |
||||
QueryWrapper<InspectionsLogDO> wrapper = new QueryWrapper<>(); |
||||
wrapper.eq("inspections_id", pageReqVO.getInspectionsId()); |
||||
return inspectionsLogMapper.selectList(wrapper); |
||||
} |
||||
|
||||
/** |
||||
* 协作人员签到 |
||||
* @param inspectionsLogId |
||||
*/ |
||||
@Override |
||||
public void cooperateWithSignIn(Long inspectionsLogId) { |
||||
// 校验存在
|
||||
InspectionsLogDO inspectionsLogDO = inspectionsLogMapper.selectById(inspectionsLogId); |
||||
if (inspectionsLogDO == null) { |
||||
throw exception(INSPECTIONS_LOG_NOT_EXISTS); |
||||
} |
||||
|
||||
//查询真实名称并插入
|
||||
AdminUserDO user = adminUserService.getUser(getLoginUserId()); |
||||
if (user == null) { |
||||
throw exception(USER_NOT_EXISTS); |
||||
} |
||||
|
||||
// 更新
|
||||
if (inspectionsLogDO.getCooperateWithIds() == null ) { |
||||
inspectionsLogDO.setCooperateWithIds(getLoginUserId().toString()); |
||||
inspectionsLogDO.setCooperateWithName(user.getRealName()); |
||||
} else { |
||||
inspectionsLogDO.setCooperateWithIds(inspectionsLogDO.getCooperateWithIds() + "," + getLoginUserId()); |
||||
inspectionsLogDO.setCooperateWithName(inspectionsLogDO.getCooperateWithName() + "," + user.getRealName()); |
||||
} |
||||
|
||||
inspectionsLogMapper.updateById(inspectionsLogDO); |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue