dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
许允枞 2024-11-09 21:23:54 +08:00
parent fd94f59ee1
commit 8a75e00e26
7 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionStepInfo.java
View File

@ -4,6 +4,7 @@ import java.util.Date;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -39,5 +40,7 @@ public class InspectionStepInfo extends Model<InspectionStepInfo> {
private Date updateTime;
//更新人id
private Integer updater;
@TableField(exist = false)
private String nickname;
}

3
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionStepInfoMapper.java
View File

@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.iocoder.yudao.module.inspection.entity.InspectionStepInfo;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* (InspectionStepInfo)表数据库访问层
*
@ -13,5 +15,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface InspectionStepInfoMapper extends BaseMapper<InspectionStepInfo> {
List<InspectionStepInfo> listByInspectionInfoId(Long inspectionInfoId);
}

3
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/InspectionStepInfoService.java
View File

@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.inspection.service;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.iocoder.yudao.module.inspection.entity.InspectionStepInfo;
import java.util.List;
/**
* (InspectionStepInfo)表服务接口
*
@ -11,5 +13,6 @@ import cn.iocoder.yudao.module.inspection.entity.InspectionStepInfo;
*/
public interface InspectionStepInfoService extends IService<InspectionStepInfo> {
List<InspectionStepInfo> listByInspectionInfoId(Long inspectionInfoId);
}

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java
View File

@ -1482,7 +1482,7 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
LambdaQueryWrapper<InspectionStepInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(InspectionStepInfo::getInspectionInfoId,inspectionInfoId).orderByAsc(InspectionStepInfo::getStepNum);
queryWrapper.orderBy(true, false, InspectionStepInfo::getId);
List<InspectionStepInfo> list = stepInfoService.list(queryWrapper);
List<InspectionStepInfo> list = stepInfoService.listByInspectionInfoId(inspectionInfoId);
if (CollectionUtil.isNotEmpty(list)){
res.setStepInfos(list);
}

6
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionStepInfoServiceImpl.java
View File

@ -6,6 +6,8 @@ import cn.iocoder.yudao.module.inspection.mapper.InspectionStepInfoMapper;
import cn.iocoder.yudao.module.inspection.service.InspectionStepInfoService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* (InspectionStepInfo)表服务实现类
*
@ -15,5 +17,9 @@ import org.springframework.stereotype.Service;
@Service("inspectionStepInfoService")
public class InspectionStepInfoServiceImpl extends ServiceImpl<InspectionStepInfoMapper, InspectionStepInfo> implements InspectionStepInfoService {
@Override
public List<InspectionStepInfo> listByInspectionInfoId(Long inspectionInfoId) {
return baseMapper.listByInspectionInfoId(inspectionInfoId);
}
}

3
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java
View File

@ -325,6 +325,7 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl<InspectionWorkNod
* @param inspectionWorkNode
*/
public void retrial(InspectionWorkNode inspectionWorkNode){
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
//通过流程节点id查询流程
InspectionWorkNode workNode = this.getById(inspectionWorkNode.getId());
//通过工单id获取工单
@ -357,6 +358,8 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl<InspectionWorkNod
if (ObjectUtil.isNotEmpty(inspectionWorkNode.getDealImages())) {
stepInfo.setImages(inspectionWorkNode.getDealImages());
}
stepInfo.setCreateTime(DateUtil.date());
stepInfo.setCreator(Integer.parseInt(loginUser.getId().toString()));
inspectionStepService.save(stepInfo);
}

14
dl-module-inspection/src/main/resources/mapper/inspection/InspectionStepInfoMapper.xml Normal file
View File

@ -0,0 +1,14 @@
<?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="cn.iocoder.yudao.module.inspection.mapper.InspectionStepInfoMapper">
<select id="listByInspectionInfoId" resultType="cn.iocoder.yudao.module.inspection.entity.InspectionStepInfo"
parameterType="java.lang.Long">
SELECT isi.* ,u.nickname AS nickname
FROM inspection_step_info isi
LEFT JOIN system_users u ON u.id = isi.creator
WHERE isi.inspection_info_id = #{inspectionInfoId}
</select>
</mapper>