Skip to content

A
amos-boot-biz
Commit 8f394f5c authored by LiuLin's avatar LiuLin
Browse files
Options

fix(jg):设备移交代码提交

parent 59202b18
Hide whitespace changes
Inline Side-by-side
Showing with 254 additions and 74 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/JgEquipTransferDto.java
View file @ 8f394f5c
......@@ -33,6 +33,9 @@ public class JgEquipTransferDto extends BaseDto {
@ApiModelProperty(value = "申请状态")
private String applyStatus;
@ApiModelProperty(value = "申请状态描述")
private String applyStatusDesc;
@ApiModelProperty(value = "申请日期")
private Date applyDate;
......@@ -49,7 +52,7 @@ public class JgEquipTransferDto extends BaseDto {
private String instanceId;
@ApiModelProperty(value = "下步执行角色/人id")
private String nextExecutorIds;
private String nextExecuteIds;
@ApiModelProperty(value = "流程执行顺序标识")
private String executeSequence;
......@@ -73,6 +76,6 @@ public class JgEquipTransferDto extends BaseDto {
private Date acceptDate;
@ApiModelProperty(value = "任务发起人id")
private String executorUserId;
private String promoter;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgEquipTransfer.java
View file @ 8f394f5c
......@@ -77,12 +77,6 @@ public class JgEquipTransfer extends BaseEntity {
private String instanceId;
/**
* 下步执行角色/人id
*/
@TableField("next_executor_ids")
private String nextExecutorIds;
/**
* 流程执行顺序标识
*/
@TableField("execute_sequence")
......@@ -125,9 +119,21 @@ public class JgEquipTransfer extends BaseEntity {
private Date acceptDate;
/**
* 下一执行节点ids
*/
@TableField("next_execute_ids")
private String nextExecuteIds;
/**
* 任务发起人id
*/
@TableField(value = "promoter")
private String promoter;
/**
* 任务发起人id
*/
@TableField("executor_user_id")
private String executorUserId;
@TableField(value = "task_name")
private String taskName;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgEquipTransferMapper.java
View file @ 8f394f5c
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.JgEquipTransferDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 设备移交 Mapper 接口
......@@ -9,6 +14,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author system_generator
* @date 2023-12-20
*/
public interface JgEquipTransferMapper extends BaseMapper<JgEquipTransfer> {
public interface JgEquipTransferMapper extends CustomBaseMapper<JgEquipTransfer> {
Page<JgEquipTransfer> queryForPage(Page<JgEquipTransfer> page, JgEquipTransferDto dto, String type, String companyCode);
void updatePromoter(@Param("id")Long id);
@MapKey("sequenceNbr")
List<Map<String, Object>> queryEquipInformation(Long sequenceNbr);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgEquipTransferService.java
View file @ 8f394f5c
package com.yeejoin.amos.boot.module.jg.api.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
import java.util.Map;
/**
* 设备移交接口类
*
* @author system_generator
* @date 2023-12-20
*/
public interface IJgEquipTransferService {
public interface IJgEquipTransferService extends IService<JgEquipTransfer> {
/**
* 分页查询设备移交接口
*
* @param page 分页对象
* @param dto 查询参数
* @param type 类型：enterprise-企业端、supervision-监管端
* @return 设备移交分页列表
*/
Page<JgEquipTransferDto> queryForJgEquipTransferPage(Page<JgEquipTransfer> page, JgEquipTransferDto dto, String type, ReginParams reginParams);
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return 设备移交详情
*/
Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr);
/**
* 保存设备移交接口
* @param submitType 按钮类型
* @param dto dto
* @param selectedOrgInfo reginParams
*/
void saveEquipTransfer(String submitType, Map<String, JgEquipTransferDto> dto, ReginParams selectedOrgInfo);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipTransferMapper.xml
View file @ 8f394f5c
<?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.JgEquipTransferMapper">
<update id="updatePromoter">
</update>
<select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer">
select
jet.sequence_nbr AS sequenceNbr,
jet.apply_no AS applyNo,
jet.use_unit_credit_code AS useUnitCreditCode,
jet.use_unit_name AS useUnitName,
jet.apply_status AS applyStatus,
jet.apply_date AS applyDate,
jet.install_unit_credit_code AS installUnitCreditCode,
jet.equip_num AS equipNum,
jet.install_unit_name AS installUnitName,
jet.instance_id AS instanceId,
jet.promoter,
jet.next_execute_ids AS nextExecuteIds,
jet.execute_sequence AS executeSequence,
jet.instance_status AS instanceStatus,
jet.accept_date AS acceptDate,
jet.task_name AS taskName
FROM
tzs_jg_equip_transfer jet
<where>
jet.is_delete = false
<if test="param != null ">
<if test="param.applyNo != null and param.applyNo != ''">
AND jet.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
</if>
<if test="param.useUnitName != null and param.useUnitName != ''">
AND jet.use_unit_name LIKE CONCAT('%', #{param.useUnitName}, '%')
</if>
<if test="param.installUnitName != null and param.installUnitName != ''">
AND jet.install_unit_name LIKE CONCAT('%', #{param.installUnitName}, '%')
</if>
<if test="param.applyStatus != null and param.applyStatus != ''">
AND jet.apply_status = #{param.applyStatus}
</if>
</if>
<if test="type == 'useUnit'">
AND jet.use_unit_credit_code = #{companyCode}
</if>
<if test="type == 'installUnit'">
AND jet.install_unit_credit_code = #{companyCode}
</if>
</where>
ORDER BY jet.apply_date DESC
</select>
<select id="queryEquipInformation" resultType="java.util.Map">
select
jet.sequence_nbr AS sequenceNbr,
jet.apply_no AS applyNo,
jet.use_unit_credit_code AS useUnitCreditCode,
jet.use_unit_name AS useUnitName,
jet.apply_status AS applyStatus,
jet.apply_date AS applyDate,
jet.install_unit_credit_code AS installUnitCreditCode,
jet.equip_num AS equipNum,
jet.install_unit_name AS installUnitName,
jet.instance_id AS instanceId,
jet.promoter,
jet.next_execute_ids AS nextExecuteIds,
jet.execute_sequence AS executeSequence,
jet.instance_status AS instanceStatus,
jet.accept_date AS acceptDate,
jet.task_name AS taskName
ri.equ_list AS equList,
ri.equ_category AS equCategory,
ri.equ_define AS equDefine,
ri.product_name AS productName,
ri.brand_name AS brandName,
ri.equ_type AS equType,
ri.equ_price AS equPrice,
ri.product_photo AS productPhoto,
di.design_unit_credit_code AS designUnitCreditCode,
di.design_unit_name AS designUnitName,
di.design_license_num AS designLicenseNum,
di.design_use_date AS designUseDate,
di.design_date AS designDate,
di.drawing_do AS drawingDo,
di.appraisal_unit AS appraisalUnit,
di.appraisal_date AS appraisalDate,
di.design_doc AS designDoc,
di.design_standard AS designStandard,
fi.produce_unit_credit_code AS produceUnitCreditCode,
fi.produce_unit_name AS produceUnitName,
fi.produce_license_num AS produceLicenseNum,
fi.factory_num AS factoryNum,
fi.produce_date AS produceDate,
fi.imported AS imported,
fi.produce_country AS produceCountry,
fi.factory_standard AS factoryStandard,
fi.product_quality_yield_prove AS productQualityYieldProve,
fi.ins_use_maintain_explain AS insUseMaintainExplain,
ui.safety_manager AS safetyManager,
ui.phone AS safetyManagerPhone,
ui.PROVINCE_NAME AS useUnitProvinceName,
ui.CITY_NAME AS useUnitCityName,
ui.COUNTY_NAME AS useUnitCountyName,
ui.ADDRESS AS useUnitAddress
FROM
tzs_jg_equip_transfer jet
LEFT JOIN tzs_jg_equip_transfer_eq ete ON re.equip_transfer_id = jet.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = ete.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = ete.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = ete.equ_id
LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = ete.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = ete.equ_id
WHERE
jet.sequence_nbr = #{sequenceNbr}
LIMIT 1
</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/JgEquipTransferController.java
View file @ 8f394f5c
package com.yeejoin.amos.boot.module.jg.biz.controller;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
......@@ -10,9 +9,7 @@ import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgEquipTransferServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -34,67 +31,66 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
@RequestMapping(value = "/jg-equip-transfer")
public class JgEquipTransferController extends BaseController {
@Autowired
JgEquipTransferServiceImpl jgEquipTransferServiceImpl;
@Autowired
JgEquipTransferServiceImpl jgEquipTransferServiceImpl;
/**
* 新增设备移交
*
* @return s
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增设备移交", notes = "新增设备移交")
public ResponseModel<String> save(@RequestBody JSONObject map) {
jgEquipTransferServiceImpl.save(map);
return ResponseHelper.buildResponse("ok");
}
/**
* 新增设备移交
*
* @return String
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增设备移交", notes = "新增设备移交")
public ResponseModel<JgEquipTransferDto> save(@RequestParam String submitType, @RequestBody Map<String, JgEquipTransferDto> dto) {
return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.saveOrUpdateModel(dto, false));
}
/**
* 批量删除
*
* @param ids 主键
* @return ResponseModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/deleteBatch")
@ApiOperation(httpMethod = "POST", value = "批量删除设备移交", notes = "批量删除设备移交")
public ResponseModel<Object> deleteBySequenceNbr(@RequestParam String ids) {
if (StringUtils.isEmpty(ids)) {
throw new RuntimeException("请选择需要删除的行！");
}
return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.removeByIds(Arrays.asList(ids.split(","))));
}
/**
* 批量删除
*
* @param ids 主键
* @return ResponseModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/deleteBatch")
@ApiOperation(httpMethod = "POST", value = "批量删除设备移交", notes = "批量删除设备移交")
public ResponseModel<Object> deleteBySequenceNbr(@RequestParam String ids) {
if (StringUtils.isEmpty(ids)) {
throw new RuntimeException("请选择需要删除的行！");
}
return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.removeByIds(Arrays.asList(ids.split(","))));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return Map
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/details")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个设备移交", notes = "根据sequenceNbr查询单个设备移交")
public ResponseModel<Map<String, Map<String, Object>>> selectOne(@RequestParam Long sequenceNbr) {
return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryBySequenceNbr(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return Map
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/details")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个设备移交", notes = "根据sequenceNbr查询单个设备移交")
public ResponseModel<Map<String, Map<String, Object>>> selectOne(@RequestParam Long sequenceNbr) {
return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryBySequenceNbr(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param size 每页大小
* @return Page
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "设备移交分页查询", notes = "设备移交分页查询")
public ResponseModel<Page<JgEquipTransferDto>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@ApiParam(value = "类型：enterprise-企业端、supervision-监管端", required = true) @RequestParam(value = "type", defaultValue = "enterprise") String type,
@RequestBody(required = false) JgEquipTransferDto dto) {
Page<JgEquipTransfer> page = new Page<>(current, size);
return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryForJgEquipTransferPage(page, dto, type, getSelectedOrgInfo()));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param size 每页大小
* @return Page
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "设备移交分页查询", notes = "设备移交分页查询")
public ResponseModel<Page<JgEquipTransferDto>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@ApiParam(value = "类型：enterprise-企业端、supervision-监管端", required = true) @RequestParam(value = "type", defaultValue = "enterprise") String type,
@RequestBody(required = false) JgEquipTransferDto dto) {
Page<JgEquipTransfer> page = new Page<>(current, size);
return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryForJgEquipTransferPage(page, dto, type, getSelectedOrgInfo()));
}
}
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/JgEquipTransferServiceImpl.java
View file @ 8f394f5c
......@@ -7,8 +7,10 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipTransferService;
import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
import com.yeejoin.amos.boot.module.ymt.api.common.BaseException;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -25,6 +27,18 @@ import java.util.Objects;
*/
@Service
public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,JgEquipTransfer, JgEquipTransferMapper> implements IJgEquipTransferService {
@Transactional(rollbackFor = {Exception.class, BaseException.class})
public JgEquipTransferDto saveOrUpdateModel(Map<String, JgEquipTransferDto> dto, Boolean enableStartFlow) {
String[] taskName = new String[]{"流程结束"};
boolean isUpdate = false;
String instanceId = null;
JgEquipTransfer entity = null;
return null;
}
@Override
public Page<JgEquipTransferDto> queryForJgEquipTransferPage(Page<JgEquipTransfer> page, JgEquipTransferDto dto, String type, ReginParams reginParams) {
......@@ -71,6 +85,12 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
return result;
}
@Override
@Transactional(rollbackFor = {Exception.class, BaseException.class})
public void saveEquipTransfer(String submitType, Map<String, JgEquipTransferDto> dto, ReginParams selectedOrgInfo) {
String[] taskName = new String[]{"流程结束"};
}
private Map<String, Object> createEquipTransferInfo(JgEquipTransfer equipTransfer) {
Map<String, Object> equipTransferInfo = new HashMap<>(BeanUtil.beanToMap(equipTransfer));
equipTransferInfo.put("useUnitCreditCode", equipTransfer.getUseUnitCreditCode() + "_" + equipTransfer.getUseUnitName());
......
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