Skip to content

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

维保更新

parent e949c996
Expand all Show whitespace changes
Inline Side-by-side
Showing with 346 additions and 105 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgMaintenanceContractDto.java
View file @ 6a376e1a
package com.yeejoin.amos.boot.module.jg.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.checkerframework.checker.formatter.qual.Format;
import java.util.Date;
/**
*
*
* @author system_generator
* @date 2023-12-12
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="JgMaintenanceContractDto", description="")
@ApiModel(value = "JgMaintenanceContractDto", description = "")
public class JgMaintenanceContractDto extends BaseDto {
private static final long serialVersionUID = 1L;
......@@ -27,6 +23,7 @@ public class JgMaintenanceContractDto extends BaseDto {
@ApiModelProperty(value = "维保备案编号")
private String applyNo;
@ApiModelProperty(value = "办理状态")
private String applyStatus;
......@@ -63,11 +60,12 @@ public class JgMaintenanceContractDto extends BaseDto {
@ApiModelProperty(value = "维保合同结束日期")
private Date informEnd;
@ApiModelProperty(value = "维保负责人id")
private String maintenanceManagerId;
@ApiModelProperty(value = "维保负责人一id")
private String maintenanceManagerOneId;
@ApiModelProperty(value = "维保负责人二id")
private String maintenanceManagerTwoId;
@ApiModelProperty(value = "维保负责人身份证号")
private String maintenanceManagerCardNo;
@ApiModelProperty(value = "紧急救援电话")
private String emergencyCall;
......@@ -96,8 +94,6 @@ public class JgMaintenanceContractDto extends BaseDto {
@ApiModelProperty(value = "设备数量")
private Integer equNum;
@ApiModelProperty(value = "维保负责人姓名")
private String maintenanceManagerName;
@ApiModelProperty(value = "创建人ID")
private String createUserId;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgMaintenanceContractEqDto.java
View file @ 6a376e1a
package com.yeejoin.amos.boot.module.jg.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 维保备案设备关系表
*
* @author system_generator
* @date 2023-12-18
* @date 2023-12-12
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="JgMaintenanceContractEqDto", description="维保备案设备关系表")
@ApiModel(value = "JgRelationEquipDto", description = "")
public class JgMaintenanceContractEqDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "设备移交申请id")
/**
* 设备移交申请id
*/
@TableField("equip_transfer_id")
private String equipTransferId;
@ApiModelProperty(value = "设备id")
/**
* 设备id
*/
@TableField("equ_id")
private String equId;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintenanceContract.java
View file @ 6a376e1a
......@@ -101,16 +101,17 @@ public class JgMaintenanceContract extends BaseEntity {
private Date informEnd;
/**
* 维保负责人id
* 维保负责人一id
*/
@TableField("maintenance_manager_id")
private String maintenanceManagerId;
@TableField("maintenance_manager_one_id")
private String maintenanceManagerOneId;
/**
* 维保负责人身份证号
* 维保负责人二id
*/
@TableField("maintenance_manager_card_no")
private String maintenanceManagerCardNo;
@TableField("maintenance_manager_two_id")
private String maintenanceManagerTwoId;
/**
* 紧急救援电话
......@@ -166,11 +167,6 @@ public class JgMaintenanceContract extends BaseEntity {
@TableField("equ_num")
private Integer equNum;
/**
* 维保负责人姓名
*/
@TableField("maintenance_manager_name")
private String maintenanceManagerName;
/**
* 创建人ID
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintenanceContractEq.java
View file @ 6a376e1a
......@@ -6,13 +6,12 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 维保备案设备关系表
*
*
* @author system_generator
* @date 2023-12-18
* @date 2023-12-12
*/
@Data
@EqualsAndHashCode(callSuper = true)
......@@ -28,10 +27,12 @@ public class JgMaintenanceContractEq extends BaseEntity {
@TableField("equip_transfer_id")
private String equipTransferId;
/**
* 设备id
*/
@TableField("equ_id")
private String equId;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/MaintenanceEnum.java
View file @ 6a376e1a
......@@ -27,6 +27,15 @@ public enum MaintenanceEnum {
}
return name;
}
public static MaintenanceEnum getEnumByMsg(String msg) {
for (MaintenanceEnum enumOne : MaintenanceEnum.values()) {
if (enumOne.getMsg().equals(msg)) {
return enumOne;
}
}
return null;
}
public Integer getCode() {
return code;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java
View file @ 6a376e1a
......@@ -18,5 +18,11 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
List<Map<String, Object>> getUnitListByType(String type);
List<Map<String, Object>> getSecurityAdmin(String companyCode, String type);
Map<String, Object> getUserInfo(String sequenceNbr);
Map<String,Object> getEnterpriseInfo(String sequenceNbr);
List<Map<String,Object>> getEnterpriseEmployee(String unitCode);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintenanceContractEqMapper.java
View file @ 6a376e1a
package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 维保备案设备关系表 Mapper 接口
* Mapper 接口
*
* @author system_generator
* @date 2023-12-18
* @date 2023-12-12
*/
public interface JgMaintenanceContractEqMapper extends BaseMapper<JgMaintenanceContractEq> {
public interface JgMaintenanceContractEqMapper extends CustomBaseMapper<JgMaintenanceContractEq> {
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgMaintenanceContractVo.java 0 → 100644
View file @ 6a376e1a
package com.yeejoin.amos.boot.module.jg.api.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class JgMaintenanceContractVo {
@TableField("使用单位-提交-是否可操作")
private Boolean submitIsFlag;
@TableField("使用单位-撤回-是否可操作")
private Boolean revocationIsFlag;
@TableField("维保单位-受理-是否可操作")
private Boolean handleIsFlag;
@TableField("维保单位-驳回-是否可操作")
private Boolean rejectedIsFlag;
@TableField("维保备案编号")
private String applyNo;
@TableField("办理状态")
private String applyStatus;
@TableField("流程实例id")
private String instanceId;
@TableField("维保备案日期")
private Date applyDate;
@TableField("设备类型")
private String equType;
@TableField("使用单位统一信用代码")
private String useUnitCode;
@TableField("使用单位")
private String useUnitName;
@TableField("接收机构统一信用代码")
private String receiveOrgCode;
@TableField("接收机构")
private String receiveOrgName;
@TableField("维保单位统一信用代码")
private String maintenanceUnitCode;
@TableField("维保单位名称")
private String maintenanceUnitName;
@TableField("维保合同开始日期")
private Date informStart;
@TableField("维保合同结束日期")
private Date informEnd;
@TableField("维保负责人一id")
private String maintenanceManagerOneId;
@TableField("维保负责人一姓名")
private String maintenanceManagerOneName;
@TableField("维保负责人一手机号")
private String maintenanceManagerOnePhone;
@TableField("维保负责人二id")
private String maintenanceManagerTwoId;
@TableField("维保负责人二姓名")
private String maintenanceManagerTwoName;
@TableField("维保负责人二手机号")
private String maintenanceManagerTwoPhone;
@TableField("紧急救援电话")
private String emergencyCall;
@TableField("24小时维保电话")
private String maintenance24Tel;
@TableField("办理流程")
private String applyFlow;
@TableField("备注")
private String remark;
@TableField("录入单位ID")
private String inputUnitNo;
@TableField("维保合同照片")
private List maintenanceContract;
@TableField("维保周期")
private Integer maintenanceCycle;
@TableField("大修周期")
private Integer overhaulCycle;
@TableField("设备数量")
private Integer equNum;
@TableField("创建人ID")
private String createUserId;
@TableField("创建时间")
private Date createDate;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml
View file @ 6a376e1a
......@@ -14,6 +14,7 @@
<select id="getSecurityAdmin" resultType="java.util.Map">
SELECT
sequence_nbr sequenceNbr,
name,
phone,
certificate_num
......@@ -24,4 +25,41 @@
AND post_name LIKE CONCAT('%',#{type},'%')
AND is_delete = 'f'
</select>
<select id="getUserInfo" resultType="java.util.Map">
SELECT
*
FROM
"tzs_user_info"
WHERE
sequence_nbr = #{sequenceNbr}
AND is_delete = 0
</select>
<select id="getEnterpriseInfo" resultType="java.util.Map">
SELECT
sequence_nbr sequenceNbr,
supervise_org_code superviseOrgCode,
supervise_org_name superviseOrgName,
use_code useCode,
use_unit useUnit
FROM
tz_base_enterprise_info
WHERE
sequence_nbr =#{sequenceNbr} AND is_delete = '0';
</select>
<select id="getEnterpriseEmployee" resultType="java.util.Map">
SELECT
sequence_nbr sequenceNbr,
name empName,
gender gender,
rec_user_name recUserName,
certificate_num certificateNum,
unit_name unitName,
rec_user_id recUserId,
phone phone
FROM
"tzs_user_info"
WHERE
unit_code = #{unitCode}
AND is_delete = 0
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml
View file @ 6a376e1a
......@@ -2,85 +2,86 @@
<!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
UPDATE amos_tzs_biz.tzs_jg_maintenance_contract
<set>
<if test="dto.applyNo != null and dto.applyNo != ''">
tjmc.apply_no = #{dto.applyNo},
<if test="dto.applyNo != null">
apply_no = #{dto.applyNo},
</if>
<if test="dto.applyStatus != null and dto.applyStatus != ''">
tjmc.apply_status = #{dto.applyStatus},
<if test="dto.applyStatus != null">
apply_status = #{dto.applyStatus},
</if>
<if test="dto.applyDate != null and dto.applyDate != ''">
tjmc.apply_date = #{dto.applyDate},
<if test="dto.applyDate != null">
apply_date = #{dto.applyDate},
</if>
<if test="dto.equType != null and dto.equType != ''">
tjmc.equ_type = #{dto.equType},
<if test="dto.equType != null">
equ_type = #{dto.equType},
</if>
<if test="dto.useUnitCode != null and dto.useUnitCode != ''">
tjmc.use_unit_code = #{dto.useUnitCode},
<if test="dto.useUnitCode != null">
use_unit_code = #{dto.useUnitCode},
</if>
<if test="dto.useUnitName != null and dto.useUnitName != ''">
tjmc.use_unit_name = #{dto.useUnitName},
<if test="dto.useUnitName != null">
use_unit_name = #{dto.useUnitName},
</if>
<if test="dto.receiveOrgCode != null and dto.receiveOrgCode != ''">
tjmc.receive_org_code = #{dto.receiveOrgCode},
<if test="dto.receiveOrgCode != null">
receive_org_code = #{dto.receiveOrgCode},
</if>
<if test="dto.receiveOrgName != null and dto.receiveOrgName != ''">
tjmc.receive_org_name = #{dto.receiveOrgName},
<if test="dto.receiveOrgName != null">
receive_org_name = #{dto.receiveOrgName},
</if>
<if test="dto.maintenanceUnitCode != null and dto.maintenanceUnitCode != ''">
tjmc.maintenance_unit_code = #{dto.maintenanceUnitCode},
<if test="dto.maintenanceUnitCode != null">
maintenance_unit_code = #{dto.maintenanceUnitCode},
</if>
<if test="dto.maintenanceUnitName != null and dto.maintenanceUnitName != ''">
tjmc.maintenance_unit_name = #{dto.maintenanceUnitName},
<if test="dto.maintenanceUnitName != null">
maintenance_unit_name = #{dto.maintenanceUnitName},
</if>
<if test="dto.informStart != null and dto.informStart != ''">
tjmc.inform_start = #{dto.informStart},
<if test="dto.informStart != null">
inform_start = #{dto.informStart},
</if>
<if test="dto.informEnd != null and dto.informEnd != ''">
tjmc.inform_end = #{dto.informEnd},
<if test="dto.informEnd != null">
inform_end = #{dto.informEnd},
</if>
<if test="dto.maintenanceManagerId != null and dto.maintenanceManagerId != ''">
tjmc.maintenance_manager_id = #{dto.maintenanceManagerId},
<if test="dto.maintenanceManagerOneId != null">
maintenance_manager_one_id = #{dto.maintenanceManagerOneId},
</if>
<if test="dto.maintenanceManagerCardNo != null and dto.maintenanceManagerCardNo != ''">
tjmc.maintenance_manager_card_no = #{dto.maintenanceManagerCardNo},
<if test="dto.maintenanceManagerTwoId != null">
maintenance_manager_two_id = #{dto.maintenanceManagerTwoId},
</if>
<if test="dto.emergencyCall != null and dto.emergencyCall != ''">
tjmc.emergency_call = #{dto.emergencyCall},
<if test="dto.emergencyCall != null">
emergency_call = #{dto.emergencyCall},
</if>
<if test="dto.maintenance24Tel != null and dto.maintenance24Tel != ''">
tjmc.maintenance_24_tel = #{dto.maintenance24Tel},
<if test="dto.maintenance24Tel != null">
maintenance_24_tel = #{dto.maintenance24Tel},
</if>
<if test="dto.applyFlow != null and dto.applyFlow != ''">
tjmc.apply_flow = #{dto.applyFlow},
<if test="dto.applyFlow != null">
apply_flow = #{dto.applyFlow},
</if>
<if test="dto.remark != null and dto.remark != ''">
tjmc.remark = #{dto.remark},
<if test="dto.remark != null">
remark = #{dto.remark},
</if>
<if test="dto.isDelete != null and dto.isDelete != ''">
tjmc.is_delete = #{dto.isDelete},
<if test="dto.isDelete != null">
is_delete = #{dto.isDelete},
</if>
<if test="dto.inputUnitNo != null and dto.inputUnitNo != ''">
tjmc.input_unit_no = #{dto.inputUnitNo},
<if test="dto.inputUnitNo != null">
input_unit_no = #{dto.inputUnitNo},
</if>
<if test="dto.maintenanceContract != null and dto.maintenanceContract != ''">
tjmc.maintenance_contract = #{dto.maintenanceContract},
<if test="dto.maintenanceContract != null">
maintenance_contract = #{dto.maintenanceContract},
</if>
<if test="dto.maintenanceCycle != null and dto.maintenanceCycle != ''">
tjmc.maintenance_cycle = #{dto.maintenanceCycle},
<if test="dto.maintenanceCycle != null">
maintenance_cycle = #{dto.maintenanceCycle},
</if>
<if test="dto.overhaulCycle != null and dto.overhaulCycle != ''">
tjmc.overhaul_cycle = #{dto.overhaulCycle},
<if test="dto.overhaulCycle != null">
overhaul_cycle = #{dto.overhaulCycle},
</if>
<if test="dto.equNum != null and dto.equNum != ''">
tjmc.equ_num = #{dto.equNum},
<if test="dto.equNum != null">
equ_num = #{dto.equNum},
</if>
<if test="dto.maintenanceManagerName != null and dto.maintenanceManagerName != ''">
tjmc.maintenance_manager_name = #{dto.maintenanceManagerName}
<if test="dto.instanceId != null">
instance_id = #{dto.instanceId},
</if>
</set>
WHERE tjmc.sequence_nbr = #{dto.sequenceNbr}
WHERE sequence_nbr = #{dto.sequenceNbr}
</update>
<delete id="deleteForBatch">
delete from amos_tzs_biz.tzs_jg_maintenance_contract tjmc
......@@ -105,8 +106,8 @@
maintenance_unit_name,
date_format(IFNULL(inform_start, null),'%Y-%m-%d') informStart,
date_format(IFNULL(inform_end, null),'%Y-%m-%d') informEnd,
maintenance_manager_id,
maintenance_manager_card_no,
maintenance_manager_one_id,
maintenance_manager_two_id,
emergency_call,
maintenance_24_tel,
apply_flow,
......@@ -117,11 +118,11 @@
maintenance_cycle,
overhaul_cycle,
equ_num,
maintenance_manager_name,
rec_user_id,
rec_date,
create_user_id,
create_date
create_date,
instance_id
FROM
amos_tzs_biz.tzs_jg_maintenance_contract
<where>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java
View file @ 6a376e1a
......@@ -83,4 +83,41 @@ public class CommonController extends BaseController {
public ResponseModel<List<Map<String, Object>>> getSecurityAdmin(@RequestParam(value = "type") String type) {
return ResponseHelper.buildResponse(commonService.getSecurityAdmin(type));
}
/**
* 查询安全管理员的基本信息
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getUserInfo")
@ApiOperation(httpMethod = "GET", value = "查询安全管理员的基本信息", notes = "查询安全管理员的基本信息")
public ResponseModel<Map<String,Object>> getUserInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
return ResponseHelper.buildResponse(commonService.getUserInfo(sequenceNbr));
}
/**
* 查询企业的基本信息
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getEnterpriseInfo")
@ApiOperation(httpMethod = "GET", value = "查询企业的基本信息", notes = "查询企业的基本信息")
public ResponseModel<Map<String,Object>> getEnterpriseInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
return ResponseHelper.buildResponse(commonService.getEnterpriseInfo(sequenceNbr));
}
/**
* 查询企业的下面的人员
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getEnterpriseEmployee")
@ApiOperation(httpMethod = "GET", value = "查询企业的下面的人员", notes = "查询企业的下面的人员")
public ResponseModel<List<Map<String,Object>>> getEnterpriseEmployee(@RequestParam(value = "unitCode") String unitCode) {
return ResponseHelper.buildResponse(commonService.getEnterpriseEmployee(unitCode));
}
}
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 @ 6a376e1a
......@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
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.api.vo.JgMaintenanceContractVo;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgMaintenanceContractServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -16,6 +17,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.List;
import java.util.Map;
/**
* 维保合同备案
......@@ -32,16 +34,30 @@ public class JgMaintenanceContractController extends BaseController {
JgMaintenanceContractServiceImpl jgMaintenanceContractServiceImpl;
/**
* 批量新增
* 新增(提交)
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/batchSaveOrUpdate")
@ApiOperation(httpMethod = "POST", value = "批量新增维保合同备案", notes = "批量新增维保合同备案")
public ResponseModel<Object> save(@RequestBody JgMaintenanceContractDto model, List<Integer> equipmentLists) {
@PostMapping(value = "/saveOrSubmit")
@ApiOperation(httpMethod = "POST", value = "新增维保合同备案", notes = "新增维保合同备案")
public ResponseModel<Object> save(@RequestBody Map<String,Object> model,
@RequestParam(value = "submit") String submit) {
ReginParams reginParams = getSelectedOrgInfo();
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.batchSaveOrUpdate(model, equipmentLists, reginParams));
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.saveOrSubmit(submit,model, reginParams));
}
/**
* 更新维保合同和设备对应关系
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/updateMaintenanceAndEquipment")
@ApiOperation(httpMethod = "POST", value = "更新维保合同和设备对应关系", notes = "更新维保合同和设备对应关系")
public ResponseModel<Object> updateMaintenanceAndEquipment(@RequestBody JgMaintenanceContractDto model,
List<Integer> equipmentLists) {
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateMaintenanceAndEquipment(model, equipmentLists));
}
/**
......@@ -98,9 +114,10 @@ public class JgMaintenanceContractController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/update")
@PostMapping(value = "/updateBySequenceNbr")
@ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新维保合同备案", notes = "根据sequenceNbr更新维保合同备案")
public ResponseModel<Object> updateBySequenceNbrJgMaintenanceContract(@RequestBody JgMaintenanceContractDto dto, @RequestParam("sequenceNbr") Long sequenceNbr) {
public ResponseModel<Object> updateBySequenceNbr(@RequestBody JgMaintenanceContractDto dto,
@RequestParam("sequenceNbr") Long sequenceNbr) {
dto.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateBySequenceNbr(dto));
}
......@@ -142,7 +159,7 @@ public class JgMaintenanceContractController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/details")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个维保合同备案", notes = "根据sequenceNbr查询单个维保合同备案")
public ResponseModel<JgMaintenanceContractDto> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
public ResponseModel<JgMaintenanceContractVo> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.queryBySequenceNbr(sequenceNbr));
}
......@@ -156,12 +173,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, @RequestParam(value = "phase") int phase, JgMaintenanceContractDto maintenanceContractDto) {
public ResponseModel<Page<JgMaintenanceContractVo>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@RequestParam(value = "phase") int phase,
JgMaintenanceContractDto maintenanceContractDto) {
Page<JgMaintenanceContract> page = new Page<>();
page.setCurrent(current);
page.setSize(size);
ReginParams reginParams = getSelectedOrgInfo();
Page<JgMaintenanceContractDto> contractDtoPage = jgMaintenanceContractServiceImpl.queryForPage(page, phase, maintenanceContractDto, reginParams);
Page<JgMaintenanceContractVo> contractDtoPage = jgMaintenanceContractServiceImpl.queryForPage(page, phase, maintenanceContractDto, reginParams);
return ResponseHelper.buildResponse(contractDtoPage);
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java
View file @ 6a376e1a
......@@ -26,4 +26,10 @@ public interface ICommonService {
List<Map<String,Object>> getUnitListByType(String type);
List<Map<String,Object>> getSecurityAdmin(String type);
Map<String,Object> getUserInfo(String sequenceNbr);
Map<String,Object> getEnterpriseInfo(String sequenceNbr);
List<Map<String,Object>> getEnterpriseEmployee(String unitCode);
}
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/CommonServiceImpl.java
View file @ 6a376e1a
......@@ -188,6 +188,21 @@ public class CommonServiceImpl implements ICommonService {
return ObjectUtils.isEmpty(postName) ? new ArrayList<>() : commonMapper.getSecurityAdmin(companyCode, postName);
}
@Override
public Map<String, Object> getUserInfo(String sequenceNbr) {
return commonMapper.getUserInfo(sequenceNbr);
}
@Override
public Map<String, Object> getEnterpriseInfo(String sequenceNbr) {
return commonMapper.getEnterpriseInfo(sequenceNbr);
}
@Override
public List<Map<String,Object>> getEnterpriseEmployee(String unitCode) {
return commonMapper.getEnterpriseEmployee(unitCode);
}
/**
* 将管辖机构树中children为[]的修改为null
*
......
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