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

Compare commits

base: dianliang:a2fbf98de6c49be213a616034ca50d29253460ac
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev
..
compare: dianliang:5343f7483936334ac87f5fdeb0dea64f415ec688
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev

No commits in common. "a2fbf98de6c49be213a616034ca50d29253460ac" and "5343f7483936334ac87f5fdeb0dea64f415ec688" have entirely different histories.
a2fbf98de6 ... 5343f74839

8 changed files with 9 additions and 80 deletions
Show Stats Expand all files Collapse all files

12
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java
View File

@ -118,7 +118,7 @@ public class InspectionInfoController extends BaseController {
* @return
*/
@GetMapping("getInspectionInfo")
public CommonResult getInspectionInfo(Integer inspectionId, String workNodeId) {
public CommonResult getInspectionInfo(Integer inspectionId, Integer workNodeId) {
return success(inspectionInfoService.getWorkNode(inspectionId, workNodeId));
}
@ -143,14 +143,4 @@ public class InspectionInfoController extends BaseController {
public void controls(InspectionWorkNode inspectionWorkNode){
inspectionWorkNodeService.updateImageAndStep(inspectionWorkNode);
}
/**
* 通过工单id获取工单流程
* @param inspectionId
* @return
*/
@GetMapping("getWeorkNodesById")
public CommonResult getWeorkNodesById(Integer inspectionId) {
return success(inspectionInfoService.getWeorkNodesById(inspectionId));
}
}

5
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionWorkNode.java
View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.inspection.entity;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDateTime;
@ -87,11 +86,7 @@ public class InspectionWorkNode extends TenantBaseDO {
/**
* 1-退办理 2-选择重审 3-项目完成
*/
@TableField(exist = false)
private Integer selectType;
@TableField(exist = false)
private String projectName;
}

8
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionWorkNodeMapper.java
View File

@ -4,8 +4,6 @@ import cn.iocoder.yudao.module.inspection.entity.InspectionWorkNode;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* <p>
* 检测流程表 Mapper 接口
@ -17,10 +15,4 @@ import java.util.List;
@Mapper
public interface InspectionWorkNodeMapper extends BaseMapper<InspectionWorkNode> {
/**
* 根据检测id获取检测流程
* @param inspectionId
* @return
*/
List<InspectionWorkNode> getWeorkNodesById(Integer inspectionId);
}

10
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java
View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.inspection.service;
import cn.iocoder.yudao.module.inspection.entity.InspectionWorkNode;
import cn.iocoder.yudao.module.inspection.vo.DlInspectionWorkNodeVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -88,12 +87,5 @@ public interface IInspectionInfoService extends IService<InspectionInfo>
* @param id
* @return
*/
DlInspectionWorkNodeVo getWorkNode(Integer inspectionId, String workNodeId);
/**
* 根据工单id获取工单流程
* @param inspectionId
* @return
*/
List<InspectionWorkNode> getWeorkNodesById(Integer inspectionId);
DlInspectionWorkNodeVo getWorkNode(Integer inspectionId, Integer workNodeId);
}

8
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionWorkNodeService.java
View File

@ -3,8 +3,6 @@ package cn.iocoder.yudao.module.inspection.service;
import cn.iocoder.yudao.module.inspection.entity.InspectionWorkNode;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 检测流程表 服务类
@ -27,10 +25,4 @@ public interface IInspectionWorkNodeService extends IService<InspectionWorkNode>
*/
void updateImageAndStep(InspectionWorkNode inspectionWorkNode);
/**
* 根据检测id获取流程信息
* @param inspectionId
* @return
*/
List<InspectionWorkNode> getWeorkNodesById(Integer inspectionId);
}

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

@ -397,11 +397,12 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
* @return
*/
@Override
public DlInspectionWorkNodeVo getWorkNode(Integer inspectionId, String workNodeId) {
public DlInspectionWorkNodeVo getWorkNode(Integer inspectionId, Integer workNodeId) {
//查询工单
InspectionInfo inspectionInfo = this.getById(inspectionId);
//根据工单id查询流程节点
InspectionWorkNode inspectionWorkNode = workNodeService.getById(workNodeId);
InspectionWorkNode inspectionWorkNode = workNodeService.getById(new LambdaQueryWrapper<InspectionWorkNode>()
.eq(InspectionWorkNode::getInspectionInfoId, workNodeId));
//根据工单id查询步骤
List<InspectionStepInfo> inspectionStepInfos = inspectionStepInfoService.list(new LambdaQueryWrapper<InspectionStepInfo>()
.eq(InspectionStepInfo::getInspectionInfoId, inspectionId));
@ -412,15 +413,4 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
dlInspectionWorkNodeVo.setSteps(inspectionStepInfos);
return dlInspectionWorkNodeVo;
}
/**
* 根据工单id获取工单流程
*
* @param inspectionId
* @return
*/
@Override
public List<InspectionWorkNode> getWeorkNodesById(Integer inspectionId) {
return workNodeService.getWeorkNodesById(inspectionId);
}
}

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

@ -76,10 +76,11 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl<InspectionWorkNod
this.updateById(workNode);
//查询用户 信息
AdminUserDO adminUserDO = userService.getUser(workNode.getDealUserId());
//修改工单表中当前施工人
inspectionInfo.setWorkId(workerUser.getId());
inspectionInfo.setWorkerName(workerUser.getNickname());
inspectionInfo.setWorkerPhone(workerUser.getMobile());
inspectionInfo.setWorkId(workNode.getDealUserId());
inspectionInfo.setWorkerName(workNode.getDealUserName());
inspectionInfo.setWorkerPhone(adminUserDO.getMobile());
inspectionInfoService.updateById(inspectionInfo);
}
@ -155,17 +156,6 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl<InspectionWorkNod
inspectionInfoService.updateById(inspectionInfo);
}
/**
* 根据检测id获取流程信息
*
* @param inspectionId
* @return
*/
@Override
public List<InspectionWorkNode> getWeorkNodesById(Integer inspectionId) {
return baseMapper.getWeorkNodesById(inspectionId);
}
/**
* 判断传入的 InspectionWorkNode 对象是否在集合中有后续项目
*

12
dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml
View File

@ -1,12 +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="cn.iocoder.yudao.module.inspection.mapper.InspectionWorkNodeMapper">
<select id="getWeorkNodesById" resultType="cn.iocoder.yudao.module.inspection.entity.InspectionWorkNode"
parameterType="java.lang.Integer">
SELECT wn.*,ip.project_name AS projectName
FROM inspection_work_node wn
LEFT JOIN inspection_project ip ON ip.id = wn.project_id
WHERE wn.inspection_info_id = #{inspectionId}
</select>
</mapper>