Skip to content

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

维保更新

parent e949c996
Show whitespace changes
Inline Side-by-side
Showing with 497 additions and 154 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; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.checkerframework.checker.formatter.qual.Format;
import java.util.Date; import java.util.Date;
/** /**
*
*
* @author system_generator * @author system_generator
* @date 2023-12-12 * @date 2023-12-12
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="JgMaintenanceContractDto", description="") @ApiModel(value = "JgMaintenanceContractDto", description = "")
public class JgMaintenanceContractDto extends BaseDto { public class JgMaintenanceContractDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -27,6 +23,7 @@ public class JgMaintenanceContractDto extends BaseDto { ...@@ -27,6 +23,7 @@ public class JgMaintenanceContractDto extends BaseDto {
@ApiModelProperty(value = "维保备案编号") @ApiModelProperty(value = "维保备案编号")
private String applyNo; private String applyNo;
@ApiModelProperty(value = "办理状态") @ApiModelProperty(value = "办理状态")
private String applyStatus; private String applyStatus;
...@@ -63,11 +60,12 @@ public class JgMaintenanceContractDto extends BaseDto { ...@@ -63,11 +60,12 @@ public class JgMaintenanceContractDto extends BaseDto {
@ApiModelProperty(value = "维保合同结束日期") @ApiModelProperty(value = "维保合同结束日期")
private Date informEnd; private Date informEnd;
@ApiModelProperty(value = "维保负责人id") @ApiModelProperty(value = "维保负责人一id")
private String maintenanceManagerId; private String maintenanceManagerOneId;
@ApiModelProperty(value = "维保负责人二id")
private String maintenanceManagerTwoId;
@ApiModelProperty(value = "维保负责人身份证号")
private String maintenanceManagerCardNo;
@ApiModelProperty(value = "紧急救援电话") @ApiModelProperty(value = "紧急救援电话")
private String emergencyCall; private String emergencyCall;
...@@ -96,8 +94,6 @@ public class JgMaintenanceContractDto extends BaseDto { ...@@ -96,8 +94,6 @@ public class JgMaintenanceContractDto extends BaseDto {
@ApiModelProperty(value = "设备数量") @ApiModelProperty(value = "设备数量")
private Integer equNum; private Integer equNum;
@ApiModelProperty(value = "维保负责人姓名")
private String maintenanceManagerName;
@ApiModelProperty(value = "创建人ID") @ApiModelProperty(value = "创建人ID")
private String createUserId; 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; package com.yeejoin.amos.boot.module.jg.api.dto;
import io.swagger.annotations.ApiModel; import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
/** /**
* 维保备案设备关系表
*
* @author system_generator * @author system_generator
* @date 2023-12-18 * @date 2023-12-12
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="JgMaintenanceContractEqDto", description="维保备案设备关系表") @ApiModel(value = "JgRelationEquipDto", description = "")
public class JgMaintenanceContractEqDto extends BaseDto { public class JgMaintenanceContractEqDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "设备移交申请id") /**
* 设备移交申请id
*/
@TableField("equip_transfer_id")
private String equipTransferId; private String equipTransferId;
@ApiModelProperty(value = "设备id")
/**
* 设备id
*/
@TableField("equ_id")
private String equId; 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 { ...@@ -101,16 +101,17 @@ public class JgMaintenanceContract extends BaseEntity {
private Date informEnd; private Date informEnd;
/** /**
* 维保负责人id * 维保负责人一id
*/ */
@TableField("maintenance_manager_id") @TableField("maintenance_manager_one_id")
private String maintenanceManagerId; private String maintenanceManagerOneId;
/** /**
* 维保负责人身份证号 * 维保负责人二id
*/ */
@TableField("maintenance_manager_card_no") @TableField("maintenance_manager_two_id")
private String maintenanceManagerCardNo; private String maintenanceManagerTwoId;
/** /**
* 紧急救援电话 * 紧急救援电话
...@@ -166,11 +167,6 @@ public class JgMaintenanceContract extends BaseEntity { ...@@ -166,11 +167,6 @@ public class JgMaintenanceContract extends BaseEntity {
@TableField("equ_num") @TableField("equ_num")
private Integer equNum; private Integer equNum;
/**
* 维保负责人姓名
*/
@TableField("maintenance_manager_name")
private String maintenanceManagerName;
/** /**
* 创建人ID * 创建人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; ...@@ -6,13 +6,12 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.util.Date;
/** /**
* 维保备案设备关系表 *
* *
* @author system_generator * @author system_generator
* @date 2023-12-18 * @date 2023-12-12
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
...@@ -28,10 +27,12 @@ public class JgMaintenanceContractEq extends BaseEntity { ...@@ -28,10 +27,12 @@ public class JgMaintenanceContractEq extends BaseEntity {
@TableField("equip_transfer_id") @TableField("equip_transfer_id")
private String equipTransferId; private String equipTransferId;
/** /**
* 设备id * 设备id
*/ */
@TableField("equ_id") @TableField("equ_id")
private String equId; 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 { ...@@ -27,6 +27,15 @@ public enum MaintenanceEnum {
} }
return name; 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() { public Integer getCode() {
return code; 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> { ...@@ -18,5 +18,11 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
List<Map<String, Object>> getUnitListByType(String type); List<Map<String, Object>> getUnitListByType(String type);
List<Map<String, Object>> getSecurityAdmin(String companyCode, 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; package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq; import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* 维保备案设备关系表 Mapper 接口 * Mapper 接口
* *
* @author system_generator * @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 @@ ...@@ -14,6 +14,7 @@
<select id="getSecurityAdmin" resultType="java.util.Map"> <select id="getSecurityAdmin" resultType="java.util.Map">
SELECT SELECT
sequence_nbr sequenceNbr,
name, name,
phone, phone,
certificate_num certificate_num
...@@ -24,4 +25,41 @@ ...@@ -24,4 +25,41 @@
AND post_name LIKE CONCAT('%',#{type},'%') AND post_name LIKE CONCAT('%',#{type},'%')
AND is_delete = 'f' AND is_delete = 'f'
</select> </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> </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 @@ ...@@ -2,85 +2,86 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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"> <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper">
<update id="updateBySequenceNbr"> <update id="updateBySequenceNbr">
UPDATE amos_tzs_biz.tzs_jg_maintenance_contract tjmc UPDATE amos_tzs_biz.tzs_jg_maintenance_contract
<set> <set>
<if test="dto.applyNo != null and dto.applyNo != ''"> <if test="dto.applyNo != null">
tjmc.apply_no = #{dto.applyNo}, apply_no = #{dto.applyNo},
</if> </if>
<if test="dto.applyStatus != null and dto.applyStatus != ''"> <if test="dto.applyStatus != null">
tjmc.apply_status = #{dto.applyStatus}, apply_status = #{dto.applyStatus},
</if> </if>
<if test="dto.applyDate != null and dto.applyDate != ''"> <if test="dto.applyDate != null">
tjmc.apply_date = #{dto.applyDate}, apply_date = #{dto.applyDate},
</if> </if>
<if test="dto.equType != null and dto.equType != ''"> <if test="dto.equType != null">
tjmc.equ_type = #{dto.equType}, equ_type = #{dto.equType},
</if> </if>
<if test="dto.useUnitCode != null and dto.useUnitCode != ''"> <if test="dto.useUnitCode != null">
tjmc.use_unit_code = #{dto.useUnitCode}, use_unit_code = #{dto.useUnitCode},
</if> </if>
<if test="dto.useUnitName != null and dto.useUnitName != ''"> <if test="dto.useUnitName != null">
tjmc.use_unit_name = #{dto.useUnitName}, use_unit_name = #{dto.useUnitName},
</if> </if>
<if test="dto.receiveOrgCode != null and dto.receiveOrgCode != ''"> <if test="dto.receiveOrgCode != null">
tjmc.receive_org_code = #{dto.receiveOrgCode}, receive_org_code = #{dto.receiveOrgCode},
</if> </if>
<if test="dto.receiveOrgName != null and dto.receiveOrgName != ''"> <if test="dto.receiveOrgName != null">
tjmc.receive_org_name = #{dto.receiveOrgName}, receive_org_name = #{dto.receiveOrgName},
</if> </if>
<if test="dto.maintenanceUnitCode != null and dto.maintenanceUnitCode != ''"> <if test="dto.maintenanceUnitCode != null">
tjmc.maintenance_unit_code = #{dto.maintenanceUnitCode}, maintenance_unit_code = #{dto.maintenanceUnitCode},
</if> </if>
<if test="dto.maintenanceUnitName != null and dto.maintenanceUnitName != ''"> <if test="dto.maintenanceUnitName != null">
tjmc.maintenance_unit_name = #{dto.maintenanceUnitName}, maintenance_unit_name = #{dto.maintenanceUnitName},
</if> </if>
<if test="dto.informStart != null and dto.informStart != ''"> <if test="dto.informStart != null">
tjmc.inform_start = #{dto.informStart}, inform_start = #{dto.informStart},
</if> </if>
<if test="dto.informEnd != null and dto.informEnd != ''"> <if test="dto.informEnd != null">
tjmc.inform_end = #{dto.informEnd}, inform_end = #{dto.informEnd},
</if> </if>
<if test="dto.maintenanceManagerId != null and dto.maintenanceManagerId != ''"> <if test="dto.maintenanceManagerOneId != null">
tjmc.maintenance_manager_id = #{dto.maintenanceManagerId}, maintenance_manager_one_id = #{dto.maintenanceManagerOneId},
</if> </if>
<if test="dto.maintenanceManagerCardNo != null and dto.maintenanceManagerCardNo != ''"> <if test="dto.maintenanceManagerTwoId != null">
tjmc.maintenance_manager_card_no = #{dto.maintenanceManagerCardNo}, maintenance_manager_two_id = #{dto.maintenanceManagerTwoId},
</if> </if>
<if test="dto.emergencyCall != null and dto.emergencyCall != ''"> <if test="dto.emergencyCall != null">
tjmc.emergency_call = #{dto.emergencyCall}, emergency_call = #{dto.emergencyCall},
</if> </if>
<if test="dto.maintenance24Tel != null and dto.maintenance24Tel != ''"> <if test="dto.maintenance24Tel != null">
tjmc.maintenance_24_tel = #{dto.maintenance24Tel}, maintenance_24_tel = #{dto.maintenance24Tel},
</if> </if>
<if test="dto.applyFlow != null and dto.applyFlow != ''"> <if test="dto.applyFlow != null">
tjmc.apply_flow = #{dto.applyFlow}, apply_flow = #{dto.applyFlow},
</if> </if>
<if test="dto.remark != null and dto.remark != ''"> <if test="dto.remark != null">
tjmc.remark = #{dto.remark}, remark = #{dto.remark},
</if> </if>
<if test="dto.isDelete != null and dto.isDelete != ''"> <if test="dto.isDelete != null">
tjmc.is_delete = #{dto.isDelete}, is_delete = #{dto.isDelete},
</if> </if>
<if test="dto.inputUnitNo != null and dto.inputUnitNo != ''"> <if test="dto.inputUnitNo != null">
tjmc.input_unit_no = #{dto.inputUnitNo}, input_unit_no = #{dto.inputUnitNo},
</if> </if>
<if test="dto.maintenanceContract != null and dto.maintenanceContract != ''"> <if test="dto.maintenanceContract != null">
tjmc.maintenance_contract = #{dto.maintenanceContract}, maintenance_contract = #{dto.maintenanceContract},
</if> </if>
<if test="dto.maintenanceCycle != null and dto.maintenanceCycle != ''"> <if test="dto.maintenanceCycle != null">
tjmc.maintenance_cycle = #{dto.maintenanceCycle}, maintenance_cycle = #{dto.maintenanceCycle},
</if> </if>
<if test="dto.overhaulCycle != null and dto.overhaulCycle != ''"> <if test="dto.overhaulCycle != null">
tjmc.overhaul_cycle = #{dto.overhaulCycle}, overhaul_cycle = #{dto.overhaulCycle},
</if> </if>
<if test="dto.equNum != null and dto.equNum != ''"> <if test="dto.equNum != null">
tjmc.equ_num = #{dto.equNum}, equ_num = #{dto.equNum},
</if> </if>
<if test="dto.maintenanceManagerName != null and dto.maintenanceManagerName != ''"> <if test="dto.instanceId != null">
tjmc.maintenance_manager_name = #{dto.maintenanceManagerName} instance_id = #{dto.instanceId},
</if> </if>
</set> </set>
WHERE tjmc.sequence_nbr = #{dto.sequenceNbr} WHERE sequence_nbr = #{dto.sequenceNbr}
</update> </update>
<delete id="deleteForBatch"> <delete id="deleteForBatch">
delete from amos_tzs_biz.tzs_jg_maintenance_contract tjmc delete from amos_tzs_biz.tzs_jg_maintenance_contract tjmc
...@@ -105,8 +106,8 @@ ...@@ -105,8 +106,8 @@
maintenance_unit_name, maintenance_unit_name,
date_format(IFNULL(inform_start, null),'%Y-%m-%d') informStart, date_format(IFNULL(inform_start, null),'%Y-%m-%d') informStart,
date_format(IFNULL(inform_end, null),'%Y-%m-%d') informEnd, date_format(IFNULL(inform_end, null),'%Y-%m-%d') informEnd,
maintenance_manager_id, maintenance_manager_one_id,
maintenance_manager_card_no, maintenance_manager_two_id,
emergency_call, emergency_call,
maintenance_24_tel, maintenance_24_tel,
apply_flow, apply_flow,
...@@ -117,11 +118,11 @@ ...@@ -117,11 +118,11 @@
maintenance_cycle, maintenance_cycle,
overhaul_cycle, overhaul_cycle,
equ_num, equ_num,
maintenance_manager_name,
rec_user_id, rec_user_id,
rec_date, rec_date,
create_user_id, create_user_id,
create_date create_date,
instance_id
FROM FROM
amos_tzs_biz.tzs_jg_maintenance_contract amos_tzs_biz.tzs_jg_maintenance_contract
<where> <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 { ...@@ -83,4 +83,41 @@ public class CommonController extends BaseController {
public ResponseModel<List<Map<String, Object>>> getSecurityAdmin(@RequestParam(value = "type") String type) { public ResponseModel<List<Map<String, Object>>> getSecurityAdmin(@RequestParam(value = "type") String type) {
return ResponseHelper.buildResponse(commonService.getSecurityAdmin(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; ...@@ -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.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto; 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.entity.JgMaintenanceContract;
import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgMaintenanceContractServiceImpl; import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgMaintenanceContractServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -16,6 +17,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper; ...@@ -16,6 +17,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 维保合同备案 * 维保合同备案
...@@ -32,16 +34,30 @@ public class JgMaintenanceContractController extends BaseController { ...@@ -32,16 +34,30 @@ public class JgMaintenanceContractController extends BaseController {
JgMaintenanceContractServiceImpl jgMaintenanceContractServiceImpl; JgMaintenanceContractServiceImpl jgMaintenanceContractServiceImpl;
/** /**
* 批量新增 * 新增(提交)
* *
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/batchSaveOrUpdate") @PostMapping(value = "/saveOrSubmit")
@ApiOperation(httpMethod = "POST", value = "批量新增维保合同备案", notes = "批量新增维保合同备案") @ApiOperation(httpMethod = "POST", value = "新增维保合同备案", notes = "新增维保合同备案")
public ResponseModel<Object> save(@RequestBody JgMaintenanceContractDto model, List<Integer> equipmentLists) { public ResponseModel<Object> save(@RequestBody Map<String,Object> model,
@RequestParam(value = "submit") String submit) {
ReginParams reginParams = getSelectedOrgInfo(); 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 { ...@@ -98,9 +114,10 @@ public class JgMaintenanceContractController extends BaseController {
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/update") @PostMapping(value = "/updateBySequenceNbr")
@ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新维保合同备案", notes = "根据sequenceNbr更新维保合同备案") @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); dto.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateBySequenceNbr(dto)); return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateBySequenceNbr(dto));
} }
...@@ -142,7 +159,7 @@ public class JgMaintenanceContractController extends BaseController { ...@@ -142,7 +159,7 @@ public class JgMaintenanceContractController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/details") @GetMapping(value = "/details")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个维保合同备案", notes = "根据sequenceNbr查询单个维保合同备案") @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)); return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.queryBySequenceNbr(sequenceNbr));
} }
...@@ -156,12 +173,15 @@ public class JgMaintenanceContractController extends BaseController { ...@@ -156,12 +173,15 @@ public class JgMaintenanceContractController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page") @GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "维保合同备案分页查询", notes = "分页查询维保合同备案") @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<JgMaintenanceContract> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
ReginParams reginParams = getSelectedOrgInfo(); 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); 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 { ...@@ -26,4 +26,10 @@ public interface ICommonService {
List<Map<String,Object>> getUnitListByType(String type); List<Map<String,Object>> getUnitListByType(String type);
List<Map<String,Object>> getSecurityAdmin(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 { ...@@ -188,6 +188,21 @@ public class CommonServiceImpl implements ICommonService {
return ObjectUtils.isEmpty(postName) ? new ArrayList<>() : commonMapper.getSecurityAdmin(companyCode, postName); 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 * 将管辖机构树中children为[]的修改为null
* *
......
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 @ 6a376e1a
package com.yeejoin.amos.boot.module.jg.biz.service.impl; package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo; import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary; import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl; import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jg.api.common.StringUtil;
import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto; 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.entity.JgMaintenanceContract;
import com.yeejoin.amos.boot.module.jg.api.entity.JgRelationEquip; import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum; import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum; import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.MaintenanceEnum; import com.yeejoin.amos.boot.module.jg.api.enums.MaintenanceEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper; 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.service.IJgMaintenanceContractService;
import com.yeejoin.amos.feign.systemctl.Systemctl; import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel; import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
import com.yeejoin.amos.feign.workflow.Workflow;
import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
import com.yeejoin.amos.feign.workflow.model.AjaxResult;
import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.RestHighLevelClient;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.Arrays; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -43,36 +44,42 @@ import java.util.stream.Collectors; ...@@ -43,36 +44,42 @@ import java.util.stream.Collectors;
@Service @Service
public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceContractDto, JgMaintenanceContract, JgMaintenanceContractMapper> implements IJgMaintenanceContractService { public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceContractDto, JgMaintenanceContract, JgMaintenanceContractMapper> implements IJgMaintenanceContractService {
public static final String SUBMIT_TYPE_FLOW = "1";
public static final String WB_PROCESS_DEFINITION_KEY = "maintenanceFiling";
private static final String HANDLING_STATUS_DICTIONARY = "JGGZZZ"; private static final String HANDLING_STATUS_DICTIONARY = "JGGZZZ";
@Autowired @Autowired
RestHighLevelClient restHighLevelClient; RestHighLevelClient restHighLevelClient;
@Autowired @Autowired
WorkFlowFeignService workFlowFeginService;
@Autowired
@SuppressWarnings("all")
private ICreateCodeService iCreateCodeService;
@Autowired
private JgMaintenanceContractMapper maintenanceContractMapper; private JgMaintenanceContractMapper maintenanceContractMapper;
@Autowired @Autowired
private JgRelationEquipServiceImpl jgRelationEquipServiceImpl; private JgMaintenanceContractEqServiceImpl jgMaintenanceContractEqService;
@Autowired @Autowired
private DataDictionaryServiceImpl iDataDictionaryService; private DataDictionaryServiceImpl iDataDictionaryService;
/** /**
* 监管-根据字典type,code获取字典值 * 监管-根据字典type,code获取字典值
*/ */
private DataDictionary getDict(String dictType,String dictCode) { private DataDictionary getDict(String dictType, String dictCode) {
HashMap<String, String> dictMap = new HashMap<>(); HashMap<String, String> dictMap = new HashMap<>();
LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<DataDictionary>() LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getType, dictType).eq(DataDictionary::getCode, dictCode);
.eq(DataDictionary::getType,dictType)
.eq(DataDictionary::getCode, dictCode);
return iDataDictionaryService.getOne(queryWrapper); return iDataDictionaryService.getOne(queryWrapper);
} }
/** /**
* 分页查询 * 分页查询
*/ */
public Page<JgMaintenanceContractDto> queryForPage(Page<JgMaintenanceContract> page, int phase, JgMaintenanceContractDto dto, ReginParams reginParams) { public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page, int phase, JgMaintenanceContractDto dto, ReginParams reginParams) {
Page<JgMaintenanceContractDto> contractList = new Page<>(); Page<JgMaintenanceContractDto> contractList = new Page<>();
Page<JgMaintenanceContractVo> result = new Page<>();
CompanyBo company = reginParams.getCompany(); CompanyBo company = reginParams.getCompany();
if (MaintenanceEnum.SHIYONG.getCode().equals(phase)) { if (MaintenanceEnum.SHIYONG.getCode().equals(phase)) {
//使用单位用"使用单位统一信用代码"匹配数据 //使用单位用"使用单位统一信用代码"匹配数据
dto.setUseUnitCode(company.getCompanyOrgCode().toString()); dto.setUseUnitCode(company.getCompanyCode());
dto.setApplyFlow(MaintenanceEnum.SHIYONG.getMsg()); dto.setApplyFlow(MaintenanceEnum.SHIYONG.getMsg());
contractList = maintenanceContractMapper.getContractList(page, dto); contractList = maintenanceContractMapper.getContractList(page, dto);
} else if (MaintenanceEnum.WEIBAO.getCode().equals(phase)) { } else if (MaintenanceEnum.WEIBAO.getCode().equals(phase)) {
...@@ -86,14 +93,19 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC ...@@ -86,14 +93,19 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
dto.setApplyFlow(MaintenanceEnum.JIANGUAN.getMsg()); dto.setApplyFlow(MaintenanceEnum.JIANGUAN.getMsg());
contractList = maintenanceContractMapper.getContractList(page, dto); contractList = maintenanceContractMapper.getContractList(page, dto);
} }
return contractList; BeanUtils.copyProperties(contractList, result);
return result;
} }
/** /**
* 根据sequenceNbr查询数据 * 根据sequenceNbr查询数据
*/ */
public JgMaintenanceContractDto queryBySequenceNbr(Long sequenceNbr) { public JgMaintenanceContractVo queryBySequenceNbr(Long sequenceNbr) {
return maintenanceContractMapper.queryBySequenceNbr(sequenceNbr); JgMaintenanceContractDto dto = maintenanceContractMapper.queryBySequenceNbr(sequenceNbr);
JgMaintenanceContractVo vo = new JgMaintenanceContractVo();
BeanUtils.copyProperties(dto, vo);
vo.setMaintenanceContract(ObjectUtils.isEmpty(dto.getMaintenanceContract()) ? null : JSON.parseArray(dto.getMaintenanceContract()));
return vo;
} }
/** /**
...@@ -117,20 +129,56 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC ...@@ -117,20 +129,56 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
* 维保合同提交 * 维保合同提交
*/ */
@Transactional @Transactional
public Boolean submit(JgMaintenanceContractDto dto){ public Boolean submit(JgMaintenanceContractDto dto) {
String instanceId = "";
//启动流程
try {
ActWorkflowStartDTO flowDto = new ActWorkflowStartDTO();
flowDto.setProcessDefinitionKey(WB_PROCESS_DEFINITION_KEY);
flowDto.setBusinessKey("1");
HashMap<String, Object> dtoMap = new HashMap<>();
dtoMap.put("condition", "ces");
flowDto.setVariables(dtoMap);
AjaxResult ajaxResult = Workflow.taskClient.startByVariable(flowDto);
instanceId = ((Map<?, ?>) ajaxResult.get("data")).get("id").toString();
ajaxResult = Workflow.taskClient.getTask(instanceId);
// 执行一步
JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
String taskId = dataObject.getString("id");
//组装信息
TaskResultDTO taskResultDTO = new TaskResultDTO();
taskResultDTO.setResultCode("approvalStatus");
taskResultDTO.setTaskId(taskId);
taskResultDTO.setComment("提交流程");
HashMap<String, Object> map = new HashMap<>();
map.put("approvalStatus", "1");
taskResultDTO.setVariable(map);
//执行流程
Workflow.taskClient.completeByTask(taskId, taskResultDTO);
} catch (Exception e) {
e.printStackTrace();
}
String[] split = dto.getApplyFlow().split("-"); String[] split = dto.getApplyFlow().split("-");
String lastFlowName = split[split.length - 1]; String lastFlowName = split[split.length - 1];
String applyFlow = dto.getApplyFlow() + "-" + MaintenanceEnum.getMsgByCode(MaintenanceEnum.valueOf(lastFlowName).getCode()+1); String applyFlow = dto.getApplyFlow() + "-" + MaintenanceEnum.getMsgByCode(Objects.requireNonNull(MaintenanceEnum.getEnumByMsg(lastFlowName)).getCode() + 1);
dto.setApplyFlow(applyFlow); dto.setApplyFlow(applyFlow);
dto.setApplyStatus(FlowStatusEnum.TO_BE_PROCESSED.getName()); dto.setApplyStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
dto.setInstanceId(instanceId);
return this.updateBySequenceNbr(dto); return this.updateBySequenceNbr(dto);
} }
/** /**
* 维保合同撤回 * 维保合同撤回
*/ */
@Transactional @Transactional
public Boolean revocation(JgMaintenanceContractDto dto){ public Boolean revocation(JgMaintenanceContractDto dto) {
String[] split = dto.getApplyFlow().split("-");
String lastFlowName = split[split.length - 1];
String applyFlow = dto.getApplyFlow() + "-" + MaintenanceEnum.getMsgByCode(Objects.requireNonNull(MaintenanceEnum.getEnumByMsg(lastFlowName)).getCode() - 1);
dto.setApplyFlow(applyFlow);
dto.setApplyStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName()); dto.setApplyStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
workFlowFeginService.rollBack(dto.getInstanceId());
return this.updateBySequenceNbr(dto); return this.updateBySequenceNbr(dto);
} }
...@@ -138,10 +186,10 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC ...@@ -138,10 +186,10 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
* 维保合同驳回 * 维保合同驳回
*/ */
@Transactional @Transactional
public Boolean rejected(JgMaintenanceContractDto dto){ public Boolean rejected(JgMaintenanceContractDto dto) {
String[] split = dto.getApplyFlow().split("-"); String[] split = dto.getApplyFlow().split("-");
String lastFlowName = split[split.length - 1]; String lastFlowName = split[split.length - 1];
String applyFlow = dto.getApplyFlow() + "-" + MaintenanceEnum.getMsgByCode(MaintenanceEnum.valueOf(lastFlowName).getCode() - 1); String applyFlow = dto.getApplyFlow() + "-" + MaintenanceEnum.getMsgByCode(Objects.requireNonNull(MaintenanceEnum.getEnumByMsg(lastFlowName)).getCode() - 1);
dto.setApplyFlow(applyFlow); dto.setApplyFlow(applyFlow);
dto.setApplyStatus(FlowStatusEnum.REJECTED.getName()); dto.setApplyStatus(FlowStatusEnum.REJECTED.getName());
return this.updateBySequenceNbr(dto); return this.updateBySequenceNbr(dto);
...@@ -151,53 +199,107 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC ...@@ -151,53 +199,107 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
* 维保合同受理 * 维保合同受理
*/ */
@Transactional @Transactional
public Boolean accepted(JgMaintenanceContractDto dto){ public Boolean accepted(JgMaintenanceContractDto dto) {
String[] split = dto.getApplyFlow().split("-"); String[] split = dto.getApplyFlow().split("-");
String lastFlowName = split[split.length - 1]; String lastFlowName = split[split.length - 1];
String applyFlow = dto.getApplyFlow() + "-" + MaintenanceEnum.getMsgByCode(MaintenanceEnum.valueOf(lastFlowName).getCode() + 1); String applyFlow = dto.getApplyFlow() + "-" + MaintenanceEnum.getMsgByCode(Objects.requireNonNull(MaintenanceEnum.getEnumByMsg(lastFlowName)).getCode() + 1);
dto.setApplyFlow(applyFlow); dto.setApplyFlow(applyFlow);
dto.setApplyStatus(FlowStatusEnum.TO_BE_PROCESSED.getName()); dto.setApplyStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
return this.updateBySequenceNbr(dto); return this.updateBySequenceNbr(dto);
} }
/** /**
* 根据设备批量插入 * 新增维保合同
*/ */
@Transactional @Transactional
public Boolean batchSaveOrUpdate(JgMaintenanceContractDto dto, List<Integer> lists, ReginParams reginParams) { public Boolean saveOrSubmit(String submit, Map<String, Object> map, ReginParams reginParams) {
List<Integer> collect = lists.stream().filter(Objects::nonNull).collect(Collectors.toList()); // 判断当前是否为提交
String instanceId = null;
if (SUBMIT_TYPE_FLOW.equals(submit)) {
// 发起流程
try {
ActWorkflowStartDTO flowDto = new ActWorkflowStartDTO();
flowDto.setProcessDefinitionKey(WB_PROCESS_DEFINITION_KEY);
flowDto.setBusinessKey("1");
HashMap<String, Object> dtoMap = new HashMap<>();
dtoMap.put("condition", "ces");
flowDto.setVariables(dtoMap);
AjaxResult ajaxResult = Workflow.taskClient.startByVariable(flowDto);
instanceId = ((Map<?, ?>) ajaxResult.get("data")).get("id").toString();
ajaxResult = Workflow.taskClient.getTask(instanceId);
// 执行一步
JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
String taskId = dataObject.getString("id");
//组装信息
TaskResultDTO taskResultDTO = new TaskResultDTO();
taskResultDTO.setResultCode("approvalStatus");
taskResultDTO.setTaskId(taskId);
taskResultDTO.setComment("提交流程");
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("approvalStatus", "0");
taskResultDTO.setVariable(hashMap);
//执行流程
Workflow.taskClient.completeByTask(taskId, taskResultDTO);
} catch (Exception e) {
log.error("维保使用单位提交流程启动失败：{}", e);
}
}
JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(map), JgMaintenanceContractDto.class);
Object o = map.get("equipmentLists");
List<Object> equipmentLists = Collections.singletonList(o);
CompanyBo company = reginParams.getCompany(); CompanyBo company = reginParams.getCompany();
JgMaintenanceContract contract = new JgMaintenanceContract(); JgMaintenanceContract contract = new JgMaintenanceContract();
BeanUtils.copyProperties(dto, contract); BeanUtils.copyProperties(dto, contract);
if (StringUtil.isNotEmpty(contract.getApplyNo())){ //获取维保备案编号
//更新操作 String wbApplyNo = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.WB.getCode(), 1).get(0);
LambdaQueryWrapper<JgRelationEquip> queryWrapper = new LambdaQueryWrapper<JgRelationEquip>() contract.setApplyNo(wbApplyNo);
.eq(JgRelationEquip::getBusinessId,contract.getApplyNo()) contract.setInstanceId(instanceId);
.eq(JgRelationEquip::getIsDelete, false);
List<Long> list = jgRelationEquipServiceImpl.list(queryWrapper).stream().map(JgRelationEquip::getSequenceNbr).collect(Collectors.toList());
jgRelationEquipServiceImpl.deleteBatchSeq(list);
}else {
//新增操作
//维保备案编号
//TODO
contract.setApplyNo("维保备案编号");
contract.setUseUnitCode(company.getCompanyCode()); contract.setUseUnitCode(company.getCompanyCode());
contract.setUseUnitName(company.getCompanyName()); contract.setUseUnitName(company.getCompanyName());
contract.setApplyFlow(MaintenanceEnum.SHIYONG.getMsg()); contract.setApplyFlow(MaintenanceEnum.SHIYONG.getMsg());
contract.setApplyStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName()); contract.setApplyStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
contract.setEquNum(collect.size()); contract.setEquNum(equipmentLists.size());
contract.setInstanceId(instanceId);
this.save(contract); this.save(contract);
List<JgMaintenanceContractEq> equipList = new ArrayList<>();
equipmentLists.forEach(x -> {
JgMaintenanceContractEq equip = new JgMaintenanceContractEq();
equip.setEquId(String.valueOf(x));
equipList.add(equip);
});
return jgMaintenanceContractEqService.saveBatch(equipList);
} }
/**
* 更新维保合同和设备对应关系
*/
@Transactional
public Boolean updateMaintenanceAndEquipment(JgMaintenanceContractDto dto, List<Integer> EquipmentLists) {
//更新维保合同表
this.updateBySequenceNbr(dto);
List<Integer> collect = EquipmentLists.stream().filter(Objects::nonNull).collect(Collectors.toList());
if (!collect.isEmpty()) {
//先删除原先设备对应关系
LambdaQueryWrapper<JgMaintenanceContractEq> queryWrapper = new LambdaQueryWrapper<JgMaintenanceContractEq>().eq(JgMaintenanceContractEq::getBusinessId, dto.getApplyNo()).eq(JgMaintenanceContractEq::getIsDelete, false);
List<Long> list = jgMaintenanceContractEqService.list(queryWrapper).stream().map(JgMaintenanceContractEq::getSequenceNbr).collect(Collectors.toList());
jgMaintenanceContractEqService.deleteBatchSeq(list);
//重新生成关系表
List<JgMaintenanceContractEq> equipList = new ArrayList<>();
collect.forEach(x -> { collect.forEach(x -> {
JgRelationEquip equip = new JgRelationEquip(); JgMaintenanceContractEq equip = new JgMaintenanceContractEq();
equip.setBusinessId(contract.getApplyNo()); // equip.setBusinessId(dto.getApplyNo());
equip.setEquipId(String.valueOf(x)); // equip.setEquipId(String.valueOf(x));
equip.setBusinessType(BusinessTypeEnum.MAINTENANCE_RECORD.getName()); // equip.setBusinessType(BusinessTypeEnum.MAINTENANCE_RECORD.getName());
jgRelationEquipServiceImpl.save(equip); equipList.add(equip);
}); });
return jgMaintenanceContractEqService.saveBatch(equipList);
}
return true; 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