Browse Source

执法记录转发

master
DX 2 months ago
parent
commit
fcfb12de73
  1. 1
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoRespVO.java
  2. 5
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/enterprise/EnterpriseMapper.java
  3. 15
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsServiceImpl.java

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoRespVO.java

@ -21,6 +21,7 @@ public class TaskInfoRespVO {
@ExcelProperty("任务ID,主键")
private Long id;
private Integer reverseStauts;
//任务编号
@Schema(description = "任务编号", example = "你猜")

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/enterprise/EnterpriseMapper.java

@ -9,6 +9,9 @@ import cn.iocoder.yudao.module.system.dal.dataobject.enterprise.EnterpriseDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.*;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
/**
* 企业 Mapper
*
@ -33,7 +36,7 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
.eqIfPresent(EnterpriseDO::getGpsLocation, reqVO.getGpsLocation())
.betweenIfPresent(EnterpriseDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(EnterpriseDO::getUpdater, reqVO.getUpdater())
.or(w->w.eq(EnterpriseDO::getCreator, reqVO.getCreate()))
// .or(w->w.eq( EnterpriseDO::getCreator, getLoginUserId()))
.orderByDesc(EnterpriseDO::getId));
}

15
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsServiceImpl.java

@ -217,7 +217,20 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
LambdaQueryWrapper<EnterpriseInspectionsDO> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(EnterpriseInspectionsDO::getUserId, userId);
wrapper.eq(EnterpriseInspectionsDO::getTaskName, taskName);
return enterpriseInspectionsMapper.selectList(wrapper);
final List<EnterpriseInspectionsDO> enterpriseInspectionsDOS = enterpriseInspectionsMapper.selectList(wrapper);
//筛选出可以转交的检查记录
List<EnterpriseInspectionsDO> list = new ArrayList<>();
if (enterpriseInspectionsDOS != null && enterpriseInspectionsDOS.size() > 0) {
enterpriseInspectionsDOS.forEach(item->{
final InspectionsLogDO inspectionsLogNew = this.getInspectionsLogNew(item.getId());
if (inspectionsLogNew == null || inspectionsLogNew.getStatus() == 3) {
//已经开始 就要判断是否是整改状态 整改状态才能转
list.add(item);
}
});
}
return list;
}
//获得检测记录最新一条

Loading…
Cancel
Save