Skip to content

A
amos-boot-biz
Commit aa632bb9 authored by H2T's avatar H2T
Browse files
Options

维保部分接口

parent 7c303317
Show whitespace changes
Inline Side-by-side
Showing with 223 additions and 34 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintenanceContractMapper.java
View file @ aa632bb9
package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* Mapper 接口
......@@ -11,4 +14,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface JgMaintenanceContractMapper extends BaseMapper<JgMaintenanceContract> {
Page<JgMaintenanceContractDto> getContractList(@Param("page")Page<JgMaintenanceContract> page,
@Param("contractDto") JgMaintenanceContractDto contractDto);
Boolean updateBySequenceNbr(@Param("dto") JgMaintenanceContractDto dto);
JgMaintenanceContractDto queryBySequenceNbr(@Param("sequenceNbr") Long sequenceNbr);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml
View file @ aa632bb9
<?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="com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper">
<update id="updateBySequenceNbr">
UPDATE amos_tzs_biz.tzs_jg_maintenance_contract tjmc
<set>
<if test="dto.applyNo != null and dto.applyNo != ''">
tjmc.apply_no = #{dto.applyNo},
</if>
<if test="dto.applyStatus != null and dto.applyStatus != ''">
tjmc.apply_status = #{dto.applyStatus},
</if>
<if test="dto.applyDate != null and dto.applyDate != ''">
tjmc.apply_date = #{dto.applyDate},
</if>
<if test="dto.equType != null and dto.equType != ''">
tjmc.equ_type = #{dto.equType},
</if>
<if test="dto.useUnitId != null and dto.useUnitId != ''">
tjmc.use_unit_id = #{dto.useUnitId},
</if>
<if test="dto.useUnitName != null and dto.useUnitName != ''">
tjmc.use_unit_name = #{dto.useUnitName},
</if>
<if test="dto.receiveOrgId != null and dto.receiveOrgId != ''">
tjmc.receive_org_id = #{dto.receiveOrgId},
</if>
<if test="dto.receiveOrgName != null and dto.receiveOrgName != ''">
tjmc.receive_org_name = #{dto.receiveOrgName},
</if>
<if test="dto.maintenanceUnitId != null and dto.maintenanceUnitId != ''">
tjmc.maintenance_unit_id = #{dto.maintenanceUnitId},
</if>
<if test="dto.maintenanceUnitName != null and dto.maintenanceUnitName != ''">
tjmc.maintenance_unit_name = #{dto.maintenanceUnitName},
</if>
<if test="dto.informStart != null and dto.informStart != ''">
tjmc.inform_start = #{dto.informStart},
</if>
<if test="dto.informEnd != null and dto.informEnd != ''">
tjmc.inform_end = #{dto.informEnd},
</if>
<if test="dto.maintenanceManagerId != null and dto.maintenanceManagerId != ''">
tjmc.maintenance_manager_id = #{dto.maintenanceManagerId},
</if>
<if test="dto.maintenanceManagerCardNo != null and dto.maintenanceManagerCardNo != ''">
tjmc.maintenance_manager_card_no = #{dto.maintenanceManagerCardNo},
</if>
<if test="dto.emergencyCall != null and dto.emergencyCall != ''">
tjmc.emergency_call = #{dto.emergencyCall},
</if>
<if test="dto.maintenance24Tel != null and dto.maintenance24Tel != ''">
tjmc.maintenance_24_tel = #{dto.maintenance24Tel},
</if>
<if test="dto.status != null and dto.status != ''">
tjmc.status = #{dto.status},
</if>
<if test="dto.remark != null and dto.remark != ''">
tjmc.remark = #{dto.remark},
</if>
<if test="dto.isDelete != null and dto.isDelete != ''">
tjmc.is_delete = #{dto.isDelete},
</if>
<if test="dto.inputUnitNo != null and dto.inputUnitNo != ''">
tjmc.input_unit_no = #{dto.inputUnitNo},
</if>
<if test="dto.maintenanceContract != null and dto.maintenanceContract != ''">
tjmc.maintenance_contract = #{dto.maintenanceContract},
</if>
<if test="dto.maintenanceCycle != null and dto.maintenanceCycle != ''">
tjmc.maintenance_cycle = #{dto.maintenanceCycle},
</if>
<if test="dto.overhaulCycle != null and dto.overhaulCycle != ''">
tjmc.overhaul_cycle = #{dto.overhaulCycle},
</if>
<if test="dto.equNum != null and dto.equNum != ''">
tjmc.equ_num = #{dto.equNum},
</if>
<if test="dto.maintenanceManagerName != null and dto.maintenanceManagerName != ''">
tjmc.maintenance_manager_name = #{dto.maintenanceManagerName}
</if>
</set>
WHERE tjmc.sequence_nbr = #{dto.sequenceNbr}
</update>
<select id="getContractList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto">
SELECT
sequence_nbr,
apply_no,
apply_status,
apply_date,
equ_type,
use_unit_id,
use_unit_name,
receive_org_id,
receive_org_name,
maintenance_unit_id,
maintenance_unit_name,
inform_start,
inform_end,
maintenance_manager_id,
maintenance_manager_card_no,
emergency_call,
maintenance_24_tel,
status,
remark,
is_delete,
input_unit_no,
maintenance_contract,
maintenance_cycle,
overhaul_cycle,
equ_num,
maintenance_manager_name,
rec_user_id,
rec_date,
create_user_id,
create_date
FROM
amos_tzs_biz.tzs_jg_maintenance_contract
<where>
<if test="contractDto.applyNo != '' and contractDto.applyNo != null">
and apply_no like concat('%',#{contractDto.applyNo},'%')
</if>
<if test="contractDto.maintenanceUnitName != '' and contractDto.maintenanceUnitName != null">
and maintenance_unit_name like concat('%',#{contractDto.maintenanceUnitName},'%')
</if>
<if test="contractDto.useUnitName != '' and contractDto.useUnitName != null">
and use_unit_name like concat('%',#{contractDto.useUnitName},'%')
</if>
<if test="contractDto.applyStatus != '' and contractDto.applyStatus != null">
and apply_status like concat('%',#{contractDto.applyStatus},'%')
</if>
</where>
</select>
<select id="queryBySequenceNbr"
resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto">
select *
from amos_tzs_biz.tzs_jg_maintenance_contract
where is_delete = 0 and sequence_nbr = #{sequenceNbr}
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgMaintenanceContractController.java
View file @ aa632bb9
package com.yeejoin.amos.boot.module.jg.biz.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List;
import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgMaintenanceContractServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.List;
/**
* 维保合同备案
......@@ -32,16 +32,16 @@ public class JgMaintenanceContractController extends BaseController {
JgMaintenanceContractServiceImpl jgMaintenanceContractServiceImpl;
/**
* 新增
* 批量新增
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增维保合同备案", notes = "新增维保合同备案")
public ResponseModel<JgMaintenanceContractDto> save(@RequestBody JgMaintenanceContractDto model) {
model = jgMaintenanceContractServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
@PostMapping(value = "/batchSave")
@ApiOperation(httpMethod = "POST", value = "批量新增维保合同备案", notes = "批量新增维保合同备案")
public ResponseModel<Object> save(@RequestBody JgMaintenanceContractDto model,
List<Integer> equipmentLists) {
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.batchSave(model, equipmentLists));
}
/**
......@@ -53,9 +53,10 @@ public class JgMaintenanceContractController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保合同备案", notes = "根据sequenceNbr更新维保合同备案")
public ResponseModel<JgMaintenanceContractDto> updateBySequenceNbrJgMaintenanceContract(@RequestBody JgMaintenanceContractDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateWithModel(model));
public ResponseModel<Object> updateBySequenceNbrJgMaintenanceContract(@RequestBody JgMaintenanceContractDto dto,
@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
dto.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateBySequenceNbr(dto));
}
/**
......@@ -67,8 +68,11 @@ public class JgMaintenanceContractController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除维保合同备案", notes = "根据sequenceNbr删除维保合同备案")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.removeById(sequenceNbr));
public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
JgMaintenanceContractDto jgMaintenanceContractDto = new JgMaintenanceContractDto();
jgMaintenanceContractDto.setSequenceNbr(sequenceNbr);
jgMaintenanceContractDto.setIsDelete(true);
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateBySequenceNbr(jgMaintenanceContractDto));
}
/**
......@@ -78,10 +82,10 @@ public class JgMaintenanceContractController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个维保合同备案", notes = "根据sequenceNbr查询单个维保合同备案")
public ResponseModel<JgMaintenanceContractDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.queryBySeq(sequenceNbr));
@GetMapping(value = "/details")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个维保合同备案", notes = "根据sequenceNbr查询单个维保合同备案")
public ResponseModel<JgMaintenanceContractDto> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.queryBySequenceNbr(sequenceNbr));
}
/**
......@@ -93,13 +97,15 @@ public class JgMaintenanceContractController extends BaseController {
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "维保合同备案分页查询", notes = "分页查询维保合同备案")
public ResponseModel<Page<JgMaintenanceContractDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<JgMaintenanceContractDto> page = new Page<JgMaintenanceContractDto>();
@ApiOperation(httpMethod = "GET", value = "维保合同备案分页查询", notes = "分页查询维保合同备案")
public ResponseModel<Page<JgMaintenanceContractDto>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
JgMaintenanceContractDto maintenanceContractDto) {
Page<JgMaintenanceContract> page = new Page<>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.queryForJgMaintenanceContractPage(page));
Page<JgMaintenanceContractDto> contractDtoPage = jgMaintenanceContractServiceImpl.queryForPage(page, maintenanceContractDto);
return ResponseHelper.buildResponse(contractDtoPage);
}
/**
......@@ -108,7 +114,7 @@ public class JgMaintenanceContractController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询维保合同备案", notes = "列表全部数据查询维保合同备案")
@ApiOperation(httpMethod = "GET", value = "列表全部数据查询维保合同备案", notes = "列表全部数据查询维保合同备案")
@GetMapping(value = "/list")
public ResponseModel<List<JgMaintenanceContractDto>> selectForList() {
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.queryForJgMaintenanceContractList());
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgMaintenanceContractServiceImpl.java
View file @ aa632bb9
......@@ -4,10 +4,14 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractService;
import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* 服务实现类
......@@ -17,11 +21,44 @@ import java.util.List;
*/
@Service
public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceContractDto,JgMaintenanceContract,JgMaintenanceContractMapper> implements IJgMaintenanceContractService {
@Autowired
private JgMaintenanceContractMapper maintenanceContractMapper;
/**
* 分页查询
*/
public Page<JgMaintenanceContractDto> queryForJgMaintenanceContractPage(Page<JgMaintenanceContractDto> page) {
return this.queryForPage(page, null, false);
public Page<JgMaintenanceContractDto> queryForPage(Page<JgMaintenanceContract> page,JgMaintenanceContractDto dto) {
return maintenanceContractMapper.getContractList(page, dto);
}
/**
* 根据sequenceNbr查询数据
*/
public JgMaintenanceContractDto queryBySequenceNbr(Long sequenceNbr) {
return maintenanceContractMapper.queryBySequenceNbr(sequenceNbr);
}
/**
* 根据sequenceNbr更新数据
* @param dto
* @return
*/
public Boolean updateBySequenceNbr(JgMaintenanceContractDto dto){
return maintenanceContractMapper.updateBySequenceNbr(dto);
}
/**
* 根据设备批量插入
* @param dto
* @param lists
*/
public Boolean batchSave(JgMaintenanceContractDto dto,List<Integer> lists){
List<Integer> collect = lists.stream().filter(Objects::nonNull).collect(Collectors.toList());
JgMaintenanceContract contract = new JgMaintenanceContract();
BeanUtils.copyProperties(dto,contract);
//TODO 待补充详细信息
collect.forEach(x-> maintenanceContractMapper.insert(contract));
return true;
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment