Skip to content

A
amos-boot-biz
Commit 1074aee4 authored by yangyang's avatar yangyang
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents e0f36b11 08c5d34d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 659 additions and 205 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/JgMaintainNoticeDto.java
View file @ 1074aee4
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 java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Map;
/** /**
* 维修告知 * 维修告知
...@@ -15,10 +19,10 @@ import java.util.Date; ...@@ -15,10 +19,10 @@ import java.util.Date;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="JgMaintainNoticeDto", description="维修告知") @ApiModel(value = "JgMaintainNoticeDto", description = "维修告知")
public class JgMaintainNoticeDto extends BaseDto { public class JgMaintainNoticeDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "申请编号") @ApiModelProperty(value = "申请编号")
...@@ -117,6 +121,12 @@ public class JgMaintainNoticeDto extends BaseDto { ...@@ -117,6 +121,12 @@ public class JgMaintainNoticeDto extends BaseDto {
@ApiModelProperty(value = "施工合同附件") @ApiModelProperty(value = "施工合同附件")
private String constructionContract; private String constructionContract;
@ApiModelProperty(value = "委托书附件")
private List<Map<String, Object>> powerOfAttorneyList;
@ApiModelProperty(value = "施工合同附件")
private List<Map<String, Object>> constructionContractList;
@ApiModelProperty(value = "施工合同是否本单位与甲方直接签署") @ApiModelProperty(value = "施工合同是否本单位与甲方直接签署")
private String isSignedWithA; private String isSignedWithA;
...@@ -135,4 +145,7 @@ public class JgMaintainNoticeDto extends BaseDto { ...@@ -135,4 +145,7 @@ public class JgMaintainNoticeDto extends BaseDto {
@ApiModelProperty(value = "接收机构机构代码") @ApiModelProperty(value = "接收机构机构代码")
private String receiveOrgCode; private String receiveOrgCode;
@TableField(exist = false)
@ApiModelProperty(value = "告知设备列表")
private List<Map<String, Object>> deviceList;
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintainNotice.java
View file @ 1074aee4
...@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; ...@@ -6,6 +6,7 @@ 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; import java.util.Date;
/** /**
...@@ -25,229 +26,229 @@ public class JgMaintainNotice extends BaseEntity { ...@@ -25,229 +26,229 @@ public class JgMaintainNotice extends BaseEntity {
/** /**
* 申请编号 * 申请编号
*/ */
@TableField("apply_no") @TableField("apply_no")
private String applyNo; private String applyNo;
/** /**
* 告知日期 * 告知日期
*/ */
@TableField("notice_date") @TableField("notice_date")
private Date noticeDate; private Date noticeDate;
/** /**
* 告知状态 * 告知状态
*/ */
@TableField("notice_status") @TableField("notice_status")
private String noticeStatus; private String noticeStatus;
/** /**
* 施工单位统一信用代码 * 施工单位统一信用代码
*/ */
@TableField("install_unit_credit_code") @TableField("install_unit_credit_code")
private String installUnitCreditCode; private String installUnitCreditCode;
/** /**
* 施工单位名称 * 施工单位名称
*/ */
@TableField("install_unit_name") @TableField("install_unit_name")
private String installUnitName; private String installUnitName;
/** /**
* 设备数量 * 设备数量
*/ */
@TableField("equip_num") @TableField("equip_num")
private Integer equipNum; private Integer equipNum;
/** /**
* 流程实例id * 流程实例id
*/ */
@TableField("instance_id") @TableField("instance_id")
private String instanceId; private String instanceId;
/** /**
* 下步执行角色/人id * 下步执行角色/人id
*/ */
@TableField("next_executor_ids") @TableField("next_executor_ids")
private String nextExecutorIds; private String nextExecutorIds;
/** /**
* 流程执行顺序标识 * 流程执行顺序标识
*/ */
@TableField("execute_sequence") @TableField("execute_sequence")
private String executeSequence; private String executeSequence;
/** /**
* 创建时间 * 创建时间
*/ */
@TableField("create_date") @TableField("create_date")
private Date createDate; private Date createDate;
/** /**
* 创建人id * 创建人id
*/ */
@TableField("create_user_id") @TableField("create_user_id")
private String createUserId; private String createUserId;
/** /**
* 创建人 * 创建人
*/ */
@TableField("create_user_name") @TableField("create_user_name")
private String createUserName; private String createUserName;
/** /**
* 备注 * 备注
*/ */
@TableField("remark") @TableField("remark")
private String remark; private String remark;
/** /**
* 流程状态 * 流程状态
*/ */
@TableField("instance_status") @TableField("instance_status")
private String instanceStatus; private String instanceStatus;
/** /**
* 受理完成日期 * 受理完成日期
*/ */
@TableField("accept_date") @TableField("accept_date")
private Date acceptDate; private Date acceptDate;
/** /**
* 施工区域-省 * 施工区域-省
*/ */
@TableField("province") @TableField("province")
private String province; private String province;
/** /**
* 施工区域-市 * 施工区域-市
*/ */
@TableField("city") @TableField("city")
private String city; private String city;
/** /**
* 施工区域-区/县 * 施工区域-区/县
*/ */
@TableField("county") @TableField("county")
private String county; private String county;
/** /**
* 施工区域-街道（镇） * 施工区域-街道（镇）
*/ */
@TableField("street") @TableField("street")
private String street; private String street;
/** /**
* 施工设备详细地址 * 施工设备详细地址
*/ */
@TableField("address") @TableField("address")
private String address; private String address;
/** /**
* 计划施工日期 * 计划施工日期
*/ */
@TableField("plan_date") @TableField("plan_date")
private Date planDate; private Date planDate;
/** /**
* 接收机构单位代码 * 接收机构单位代码
*/ */
@TableField("receive_company_code") @TableField("receive_company_code")
private String receiveCompanyCode; private String receiveCompanyCode;
/** /**
* 接收机构 * 接收机构
*/ */
@TableField("receive_org_name") @TableField("receive_org_name")
private String receiveOrgName; private String receiveOrgName;
/** /**
* 施工负责人 * 施工负责人
*/ */
@TableField("construction_manager") @TableField("construction_manager")
private String constructionManager; private String constructionManager;
/** /**
* 施工负责人id * 施工负责人id
*/ */
@TableField("construction_manager_id") @TableField("construction_manager_id")
private String constructionManagerId; private String constructionManagerId;
/** /**
* 施工负责人手机 * 施工负责人手机
*/ */
@TableField("construction_manager_phone") @TableField("construction_manager_phone")
private String constructionManagerPhone; private String constructionManagerPhone;
/** /**
* 检验单位统一信用代码 * 检验单位统一信用代码
*/ */
@TableField("inspection_unit_credit_code") @TableField("inspection_unit_credit_code")
private String inspectionUnitCreditCode; private String inspectionUnitCreditCode;
/** /**
* 检验单位名称 * 检验单位名称
*/ */
@TableField("inspection_unit_name") @TableField("inspection_unit_name")
private String inspectionUnitName; private String inspectionUnitName;
/** /**
* 委托单位统一信用代码 * 委托单位统一信用代码
*/ */
@TableField("entrusting_unit_credit_code") @TableField("entrusting_unit_credit_code")
private String entrustingUnitCreditCode; private String entrustingUnitCreditCode;
/** /**
* 委托单位名称 * 委托单位名称
*/ */
@TableField("entrusting_unit_name") @TableField("entrusting_unit_name")
private String entrustingUnitName; private String entrustingUnitName;
/** /**
* 委托书附件 * 委托书附件
*/ */
@TableField("power_of_attorney") @TableField("power_of_attorney")
private String powerOfAttorney; private String powerOfAttorney;
/** /**
* 施工合同附件 * 施工合同附件
*/ */
@TableField("construction_contract") @TableField("construction_contract")
private String constructionContract; private String constructionContract;
/** /**
* 施工合同是否本单位与甲方直接签署 * 施工合同是否本单位与甲方直接签署
*/ */
@TableField("is_signed_with_a") @TableField("is_signed_with_a")
private String isSignedWithA; private String isSignedWithA;
/** /**
* 使用单位统一信用代码 * 使用单位统一信用代码
*/ */
@TableField("use_unit_credit_code") @TableField("use_unit_credit_code")
private String useUnitCreditCode; private String useUnitCreditCode;
/** /**
* 使用单位名称 * 使用单位名称
*/ */
@TableField("use_unit_name") @TableField("use_unit_name")
private String useUnitName; private String useUnitName;
/** /**
* 维修类型（1一般维修，2重点维修） * 维修类型（1一般维修，2重点维修）
*/ */
@TableField("maintain_type") @TableField("maintain_type")
private String maintainType; private String maintainType;
/** /**
* 是否已报检 * 是否已报检
*/ */
@TableField("is_inspected") @TableField("is_inspected")
private String isInspected; private String isInspected;
/** /**
* 接收机构机构代码 * 接收机构机构代码
*/ */
@TableField("receive_org_code") @TableField("receive_org_code")
private String receiveOrgCode; private String receiveOrgCode;
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintainNoticeEqMapper.java
View file @ 1074aee4
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.JgMaintainNoticeEq; import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* 维修告知设备关系表 Mapper 接口 * 维修告知设备关系表 Mapper 接口
...@@ -9,6 +8,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -9,6 +8,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author system_generator * @author system_generator
* @date 2023-12-19 * @date 2023-12-19
*/ */
public interface JgMaintainNoticeEqMapper extends BaseMapper<JgMaintainNoticeEq> { public interface JgMaintainNoticeEqMapper extends CustomBaseMapper<JgMaintainNoticeEq> {
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintainNoticeMapper.java
View file @ 1074aee4
package com.yeejoin.amos.boot.module.jg.api.mapper; 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.JgMaintainNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice; import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
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 接口 * Mapper 接口
* *
* @author system_generator * @author system_generator
* @date 2023-12-19 * @date 2023-12-12
*/ */
public interface JgMaintainNoticeMapper extends BaseMapper<JgMaintainNotice> { public interface JgMaintainNoticeMapper extends CustomBaseMapper<JgMaintainNotice> {
/**
* 分页查询
*
* @param page 分页对象
* @param model 查询参数
* @param type 类型：enterprise-企业端、supervision-监管端
* @return 维修告知列表
*/
Page<JgMaintainNotice> queryForPage(Page<JgMaintainNotice> page, @Param("param") JgMaintainNoticeDto model, @Param("type") String type, @Param("orgCode") String orgCode);
/**
* 根据维修告知编号查询设备、设计、制造等信息
*
* @param sequenceNbr 维修告知编号
*/
@MapKey("sequenceNbr")
List<Map<String, Object>> queryEquipInformation(@Param("sequenceNbr") 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/IJgMaintainNoticeService.java
View file @ 1074aee4
package com.yeejoin.amos.boot.module.jg.api.service; 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.JgMaintainNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
import java.util.Map;
/** /**
* 维修告知接口类 * 接口类
* *
* @author system_generator * @author system_generator
* @date 2023-12-19 * @date 2023-12-12
*/ */
public interface IJgMaintainNoticeService { public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return 维修告知
*/
Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr);
/**
* 更新维修告知
*
* @param noticeDto 维修告知
* @param op 操作类型
*/
JgMaintainNoticeDto updateMaintainNotice(String submitType, JgMaintainNoticeDto noticeDto, String op);
/**
* 分页查询
*
* @param page 分页对象
* @param model 查询参数
* @param type 类型：enterprise-企业端、supervision-监管端
* @return 维修告知列表
*/
Page<JgMaintainNoticeDto> queryForJgMaintainNoticePage(Page<JgMaintainNotice> page, JgMaintainNoticeDto model, String type, ReginParams reginParams);
/**
* 批量删除
*
* @param sequenceNbrs 主键
* @return 是否删除成功
*/
Boolean deleteForBatch(Long[] sequenceNbrs);
/**
* 保存维修告知单
*
* @param model 数据
* @param submitType 保存类型
*/
void saveNotice(String submitType, Map<String, JgMaintainNoticeDto> model, ReginParams reginParams);
/**
* 打印告知单
*
* @param sequenceNbr 主键
* @return pdf文件路径
*/
String generateMaintainNoticeReport(Long sequenceNbr);
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintainNoticeMapper.xml
View file @ 1074aee4
...@@ -2,4 +2,109 @@ ...@@ -2,4 +2,109 @@
<!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.JgMaintainNoticeMapper"> <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeMapper">
<select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice">
select
tjmn.sequence_nbr AS sequenceNbr,
tjmn.apply_no AS applyNo,
tjmn.supervisory_code AS supervisoryCode,
tjmn.notice_date AS noticeDate,
tjmn.use_unit_name AS useUnitName,
tjmn.receive_org_name AS receiveOrgName,
tjmn.region_no AS regionNo,
tjmn.address AS address,
tjmn.notice_status AS noticeStatus,
tjmn.install_unit_name AS installUnitName,
tjmn.province_name AS provinceName,
tjmn.city_name AS cityName,
tjmn.county_name AS countyName,
tjmn.instance_id AS instanceId,
tjmn.notice_report_url AS noticeReportUrl
FROM
tzs_jg_maintain_notice tjmn
<where>
tjmn.is_delete = false
<if test="param != null ">
<if test="param.applyNo != null and param.applyNo != ''">
AND tjmn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
</if>
<if test="param.receiveOrgName != null and param.receiveOrgName != ''">
AND tjmn.receive_org_name LIKE CONCAT('%', #{param.receiveOrgName}, '%')
</if>
<if test="param.useUnitName != null and param.useUnitName != ''">
AND tjmn.use_unit_name LIKE CONCAT('%', #{param.useUnitName}, '%')
</if>
<if test="param.installUnitName != null and param.installUnitName != ''">
AND tjmn.install_unit_name LIKE CONCAT('%', #{param.installUnitName}, '%')
</if>
<if test="param.noticeStatus != null and param.noticeStatus != ''">
AND tjmn.notice_status = #{param.noticeStatus}
</if>
</if>
<if test="type == 'supervision'">
AND (tjmn.notice_status in ('6612', '6613', '6614') or tjmn.status in('6614') )
</if>
<if test="orgCode != null and orgCode != ''">
AND tjmn.install_unit_credit_code = #{orgCode}
</if>
</where>
ORDER BY
tjmn.notice_date DESC
</select>
<select id="queryEquipInformation" resultType="java.util.Map">
select
tjmn.sequence_nbr AS sequenceNbr,
tjmn.install_unit_name AS installUnitName,
tjmn.apply_no AS applyNo,
tjmn.province,
tjmn.city AS cityName,
tjmn.county AS countyName,
tjmn.address AS address,
tjmn.use_unit_name AS useUnitName,
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_maintain_notice tjmn
LEFT JOIN tzs_jg_installation_notice_eq re ON re.equip_transfer_id = tjmn.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
WHERE
tjmn.sequence_nbr = #{sequenceNbr}
LIMIT 1
</select>
</mapper> </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/JgMaintainByWorkFlowController.java 0 → 100644
View file @ 1074aee4
package com.yeejoin.amos.boot.module.jg.biz.controller;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgMaintainNoticeServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
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.LinkedHashMap;
import java.util.Map;
import java.util.Objects;
/**
* 维修告知
*
* @author system_generator
* @date 2023-12-12
*/
@RestController
@Api(tags = "维修告知工作流相关Api")
@RequestMapping(value = "/jg-maintain-workflow")
public class JgMaintainByWorkFlowController {
@Autowired
JgMaintainNoticeServiceImpl jgMaintainNoticeServiceImpl;
/**
* 提交
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/submit")
@ApiOperation(httpMethod = "POST", value = "维修告知提交", notes = "维修告知提交")
public ResponseModel<JgMaintainNoticeDto> submit(@RequestBody JgMaintainNoticeDto model, String op) {
// TODO 发起维修告知流程
// jgMaintainNoticeServiceImpl.submit(model, op);
return ResponseHelper.buildResponse(model);
}
/**
* 撤销
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/cancel")
@ApiOperation(httpMethod = "POST", value = "维修告知撤销", notes = "维修告知撤销")
public ResponseModel<JgMaintainNoticeDto> cancel(@RequestBody Map<String, Object> model) {
JgMaintainNoticeDto maintainInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("maintainInfo")), JgMaintainNoticeDto.class, true);
if (Objects.isNull(maintainInfo)) {
throw new IllegalArgumentException("参数maintainInfo不能为空");
}
jgMaintainNoticeServiceImpl.cancel(maintainInfo);
return ResponseHelper.buildResponse(maintainInfo);
}
/**
* 受理
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/accept")
@ApiOperation(httpMethod = "POST", value = "维修告知受理", notes = "维修告知受理")
public ResponseModel<JgMaintainNoticeDto> accept(@RequestBody Map<String, Object> model, String op) {
// TODO 受理维修告知流程
LinkedHashMap model1 = (LinkedHashMap) model.get("model");
LinkedHashMap maintainInfo = (LinkedHashMap) model1.get("maintainInfo");
JgMaintainNoticeDto jgMaintainNoticeDto = JSON.parseObject(JSON.toJSONString(maintainInfo), JgMaintainNoticeDto.class);
jgMaintainNoticeServiceImpl.accept(jgMaintainNoticeDto, op);
return ResponseHelper.buildResponse(null);
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgMaintainNoticeEqController.java
View file @ 1074aee4
package com.yeejoin.amos.boot.module.jg.biz.controller; package com.yeejoin.amos.boot.module.jg.biz.controller;
import org.springframework.web.bind.annotation.RequestMapping; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List; import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeEqDto;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgMaintainNoticeEqServiceImpl; import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgMaintainNoticeEqServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import io.swagger.annotations.Api;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeEqDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType; 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 javax.servlet.http.HttpServletRequest;
import java.util.List;
/** /**
* 维修告知设备关系表 * 维修告知设备关系表
* *
* @author system_generator * @author system_generator
* @date 2023-12-19 * @date 2023-12-18
*/ */
@RestController @RestController
@Api(tags = "维修告知设备关系表Api") @Api(tags = "维修告知设备关系表Api")
...@@ -37,28 +36,28 @@ public class JgMaintainNoticeEqController extends BaseController { ...@@ -37,28 +36,28 @@ public class JgMaintainNoticeEqController extends BaseController {
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增维修告知设备关系表", notes = "新增维修告知设备关系表") @ApiOperation(httpMethod = "POST", value = "新增维修告知设备关系表", notes = "新增维修告知设备关系表")
public ResponseModel<JgMaintainNoticeEqDto> save(@RequestBody JgMaintainNoticeEqDto model) { public ResponseModel<JgMaintainNoticeEqDto> save(@RequestBody JgMaintainNoticeEqDto model) {
model = jgMaintainNoticeEqServiceImpl.createWithModel(model); model = jgMaintainNoticeEqServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model); return ResponseHelper.buildResponse(model);
} }
/** /**
* 根据sequenceNbr更新 * 根据sequenceNbr更新
* *
* @param sequenceNbr 主键 * @param sequenceNbr 主键
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}") @PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维修告知设备关系表", notes = "根据sequenceNbr更新维修告知设备关系表") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维修告知设备关系表", notes = "根据sequenceNbr更新维修告知设备关系表")
public ResponseModel<JgMaintainNoticeEqDto> updateBySequenceNbrJgMaintainNoticeEq(@RequestBody JgMaintainNoticeEqDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<JgMaintainNoticeEqDto> updateBySequenceNbrJgMaintainNoticeEq(@RequestBody JgMaintainNoticeEqDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr); model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jgMaintainNoticeEqServiceImpl.updateWithModel(model)); return ResponseHelper.buildResponse(jgMaintainNoticeEqServiceImpl.updateWithModel(model));
} }
/** /**
* 根据sequenceNbr删除 * 根据sequenceNbr删除
* *
* @param sequenceNbr 主键 * @param sequenceNbr 主键
...@@ -67,50 +66,50 @@ public class JgMaintainNoticeEqController extends BaseController { ...@@ -67,50 +66,50 @@ public class JgMaintainNoticeEqController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}") @DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除维修告知设备关系表", notes = "根据sequenceNbr删除维修告知设备关系表") @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除维修告知设备关系表", notes = "根据sequenceNbr删除维修告知设备关系表")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){ public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgMaintainNoticeEqServiceImpl.removeById(sequenceNbr)); return ResponseHelper.buildResponse(jgMaintainNoticeEqServiceImpl.removeById(sequenceNbr));
} }
/** /**
* 根据sequenceNbr查询 * 根据sequenceNbr查询
* *
* @param sequenceNbr 主键 * @param sequenceNbr 主键
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}") @GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个维修告知设备关系表", notes = "根据sequenceNbr查询单个维修告知设备关系表") @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个维修告知设备关系表", notes = "根据sequenceNbr查询单个维修告知设备关系表")
public ResponseModel<JgMaintainNoticeEqDto> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<JgMaintainNoticeEqDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(jgMaintainNoticeEqServiceImpl.queryBySeq(sequenceNbr)); return ResponseHelper.buildResponse(jgMaintainNoticeEqServiceImpl.queryBySeq(sequenceNbr));
} }
/** /**
* 列表分页查询 * 列表分页查询
* *
* @param current 当前页 * @param current 当前页
* @param current 每页大小 * @param current 每页大小
* @return * @return
*/ */
@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<JgMaintainNoticeEqDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam public ResponseModel<Page<JgMaintainNoticeEqDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size) { (value = "size") int size) {
Page<JgMaintainNoticeEqDto> page = new Page<JgMaintainNoticeEqDto>(); Page<JgMaintainNoticeEqDto> page = new Page<JgMaintainNoticeEqDto>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(jgMaintainNoticeEqServiceImpl.queryForJgMaintainNoticeEqPage(page)); return ResponseHelper.buildResponse(jgMaintainNoticeEqServiceImpl.queryForJgMaintainNoticeEqPage(page));
} }
/** /**
* 列表全部数据查询 * 列表全部数据查询
* *
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "维修告知设备关系表列表全部数据查询", notes = "维修告知设备关系表列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "维修告知设备关系表列表全部数据查询", notes = "维修告知设备关系表列表全部数据查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public ResponseModel<List<JgMaintainNoticeEqDto>> selectForList() { public ResponseModel<List<JgMaintainNoticeEqDto>> selectForList() {
return ResponseHelper.buildResponse(jgMaintainNoticeEqServiceImpl.queryForJgMaintainNoticeEqList()); return ResponseHelper.buildResponse(jgMaintainNoticeEqServiceImpl.queryForJgMaintainNoticeEqList());
} }
} }
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/JgInstallationNoticeServiceImpl.java
View file @ 1074aee4
...@@ -135,9 +135,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -135,9 +135,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
installationInfo.put("county", notice.getCounty() + "_" + notice.getCountyName()); installationInfo.put("county", notice.getCounty() + "_" + notice.getCountyName());
installationInfo.put("useUnitCreditCode", notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName()); installationInfo.put("useUnitCreditCode", notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
installationInfo.put("receiveOrgCreditCode", notice.getReceiveOrgCreditCode() + "_" + notice.getReceiveOrgName()); installationInfo.put("receiveOrgCreditCode", notice.getReceiveOrgCreditCode() + "_" + notice.getReceiveOrgName());
if(!ValidationUtil.isEmpty(notice.getInspectUnitId()) && ValidationUtil.isEmpty(notice.getInspectUnitName())) { if(!ValidationUtil.isEmpty(notice.getInspectUnitId()) && !ValidationUtil.isEmpty(notice.getInspectUnitName())) {
installationInfo.put("inspectUnitId", notice.getInspectUnitId() + "_" + notice.getInspectUnitName()); installationInfo.put("inspectUnitId", notice.getInspectUnitId() + "_" + notice.getInspectUnitName());
} }
if(!ValidationUtil.isEmpty(notice.getFactoryUseSiteStreet()) && !ValidationUtil.isEmpty(notice.getStreetName())) {
installationInfo.put("factoryUseSiteStreet", notice.getFactoryUseSiteStreet() + "_" + notice.getStreetName());
}
String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard", String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
"productQualityYieldProve", "insUseMaintainExplain", "inspectReport", "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
...@@ -522,6 +525,15 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -522,6 +525,15 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
} }
} }
String factoryUseSiteStreet = model.getFactoryUseSiteStreet();
if (!ObjectUtils.isEmpty(factoryUseSiteStreet)) {
String[] factoryUseSiteStreetList = factoryUseSiteStreet.split("_");
if (factoryUseSiteStreetList.length > 1) {
model.setFactoryUseSiteStreet(factoryUseSiteStreetList[0]);
model.setStreetName(factoryUseSiteStreetList[1]);
}
}
// 分割单位 // 分割单位
String useUnitId = model.getUseUnitCreditCode(); String useUnitId = model.getUseUnitCreditCode();
if (!ObjectUtils.isEmpty(useUnitId)) { if (!ObjectUtils.isEmpty(useUnitId)) {
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationEquipDto.java 0 → 100644
View file @ 1074aee4
package com.yeejoin.amos.boot.module.jyjc.api.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.typroject.tyboot.core.rdbms.model.BaseModel;
import java.util.Date;
/**
* @author system_generator
* @date 2023-12-14
*/
@Data
@ApiModel(value = "JyjcInspectionApplicationEquipDto", description = "")
public class JyjcInspectionApplicationEquipDto {
private static final long serialVersionUID = 1L;
private String sequenceNbr;
@ApiModelProperty(value = "报检申请表主键")
private Long applicationSeq;
@ApiModelProperty(value = "设备唯一标识")
private String equipUnicode;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "业务类型（与菜单对应拆表使用）")
private String bizType;
@ApiModelProperty(value = "设备类别")
private String equCategory;
@ApiModelProperty(value = "设备类别Code")
private String equCategoryCode;
@ApiModelProperty(value = "设备类别名称")
private String equCategoryName;
@ApiModelProperty(value = "检验检测类型编码")
private String inspectionType;
@ApiModelProperty(value = "检验检测类型名称（冗余）")
private String inspectionTypeName;
@ApiModelProperty(value = "报检日期")
private Date applicationDate;
@ApiModelProperty("检验结果方式")
private String resultType;
@ApiModelProperty(value = "设备种类")
private String equList;
@ApiModelProperty(value = "设备种类Code")
private String equListCode;
@ApiModelProperty(value = "设备种类名称")
private String equListName;
@ApiModelProperty(value = "设备品种")
private String equDefine;
@ApiModelProperty(value = "设备品种Code")
private String equDefineCode;
@ApiModelProperty(value = "使用登记证编号")
private String useOrgCode;
@ApiModelProperty(value = "单位内部编号")
private String useInnerCode;
@ApiModelProperty(value = "注册代码")
private String equCode;
@ApiModelProperty(value = "设备使用地点省")
private String provinceName;
@ApiModelProperty(value = "设备使用地点市")
private String cityName;
@ApiModelProperty(value = "设备使用地点区")
private String countyName;
@ApiModelProperty(value = "设备使用地点街道")
private String streetName;
@ApiModelProperty(value = "设备使用地点详细")
private String address;
@ApiModelProperty(value = "使用单位")
private String useUnitName;
@ApiModelProperty(value = "施工单位")
private String uscUnitName;
@ApiModelProperty(value = "使用单位统一信用代码")
private String useUnitCreditCode;
@ApiModelProperty(value = "设备名称 ")
private String productName;
@ApiModelProperty(value = "品牌")
private String brandName;
@ApiModelProperty(value = "监管码")
private String supervisoryCode;
@ApiModelProperty(value = "型号")
private String equType;
@ApiModelProperty(value = "制造单位名称")
private String produceUnitName;
@ApiModelProperty(value = "制造日期")
private String produceDate;
// @ApiModelProperty(value = "使用年限")
// private String use;
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationModel.java
View file @ 1074aee4
...@@ -24,6 +24,8 @@ public class JyjcInspectionApplicationModel extends BaseModel { ...@@ -24,6 +24,8 @@ public class JyjcInspectionApplicationModel extends BaseModel {
@ApiModelProperty(value = "检验检测单位编码") @ApiModelProperty(value = "检验检测单位编码")
private String inspectionUnitCode; private String inspectionUnitCode;
@ApiModelProperty(value = "检验检测单位名称")
private String inspectionUnitName;
@ApiModelProperty(value = "检验检测类型") @ApiModelProperty(value = "检验检测类型")
private String inspectionType; private String inspectionType;
...@@ -90,6 +92,8 @@ public class JyjcInspectionApplicationModel extends BaseModel { ...@@ -90,6 +92,8 @@ public class JyjcInspectionApplicationModel extends BaseModel {
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
private String status; private String status;
@ApiModelProperty(value = "状态名称")
private String statusName;
@ApiModelProperty(value = "备注(无用预留)") @ApiModelProperty(value = "备注(无用预留)")
private String remark; private String remark;
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionResultModel.java
View file @ 1074aee4
package com.yeejoin.amos.boot.module.jyjc.api.model; package com.yeejoin.amos.boot.module.jyjc.api.model;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -95,6 +97,8 @@ public class JyjcInspectionResultModel extends BaseModel { ...@@ -95,6 +97,8 @@ public class JyjcInspectionResultModel extends BaseModel {
private String inspectionTypeName; private String inspectionTypeName;
@ApiModelProperty(value = "报检日期") @ApiModelProperty(value = "报检日期")
@JsonFormat(pattern="yyyy-MM-dd")
@DateTimeFormat("yyyy-MM-dd")
private Date applicationDate; private Date applicationDate;
@ApiModelProperty("检验结果方式") @ApiModelProperty("检验结果方式")
...@@ -134,4 +138,17 @@ public class JyjcInspectionResultModel extends BaseModel { ...@@ -134,4 +138,17 @@ public class JyjcInspectionResultModel extends BaseModel {
@ApiModelProperty(value = "设备品种") @ApiModelProperty(value = "设备品种")
private String equDefine; private String equDefine;
@ApiModelProperty(value = "设备类别名称")
private String equListName;
@ApiModelProperty(value = "设备使用地址")
private String equUseAddress;
@ApiModelProperty(value = "检验检测单")
private String inspectionUnitName;
@ApiModelProperty(value = "报检单位")
private String applicationUnitName;
} }
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml
View file @ 1074aee4
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
tzjia.workflow_node, tzjia.workflow_node,
tzjia.biz_type, tzjia.biz_type,
tzjia.application_no, tzjia.application_no,
tzjia.inspection_type,
cdd1.NAME AS inspectionClassify, cdd1.NAME AS inspectionClassify,
cdd3.NAME AS inspectionType,
tzjia.inspection_unit_code, tzjia.inspection_unit_code,
cdd.NAME AS equipClassify, cdd.NAME AS equipClassify,
tzjia.number_of_equip, tzjia.number_of_equip,
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
tzjia.accept_date, tzjia.accept_date,
tzjia.inspection_charge_phone, tzjia.inspection_charge_phone,
tzjia.inspection_charge_person, tzjia.inspection_charge_person,
tzjia.status,
tbei1.use_unit AS applicationUnitName, tbei1.use_unit AS applicationUnitName,
tbei.use_unit AS inspectionUnitName, tbei.use_unit AS inspectionUnitName,
cdd.NAME AS status, tzjia.status,
cdd2.NAME AS statusName,
tzjia.next_execute_ids as nextExecuteIds tzjia.next_execute_ids as nextExecuteIds
FROM FROM
tz_jyjc_inspection_application AS tzjia tz_jyjc_inspection_application AS tzjia
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
LEFT JOIN tz_base_enterprise_info tbei1 ON tbei1.use_code = tzjia.inspection_unit_code LEFT JOIN tz_base_enterprise_info tbei1 ON tbei1.use_code = tzjia.inspection_unit_code
LEFT JOIN cb_data_dictionary cdd ON cdd.code = tzjia.equip_classify LEFT JOIN cb_data_dictionary cdd ON cdd.code = tzjia.equip_classify
LEFT JOIN cb_data_dictionary cdd1 ON cdd1.code = tzjia.inspection_classify LEFT JOIN cb_data_dictionary cdd1 ON cdd1.code = tzjia.inspection_classify
LEFT JOIN cb_data_dictionary cdd2 ON cdd1.code = tzjia.status LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = tzjia.status and cdd2.type = 'JYLCZT'
LEFT JOIN cb_data_dictionary cdd3 ON cdd3.code = tzjia.inspection_type
<where> <where>
<if test=" applicationNo != null and applicationNo != ''"> <if test=" applicationNo != null and applicationNo != ''">
and application_no like concat('%',#{applicationNo}.'%') and application_no like concat('%',#{applicationNo}.'%')
</if> </if>
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml
View file @ 1074aee4
...@@ -9,15 +9,18 @@ ...@@ -9,15 +9,18 @@
res.inspection_conclusion, res.inspection_date, res.next_inspection_date, res.inspection_start_date, res.inspection_conclusion, res.inspection_date, res.next_inspection_date, res.inspection_start_date,
res.inspection_end_date, res.inspection_result_summary, res.non_conformance, res.rectification, res.remark, res.inspection_end_date, res.inspection_result_summary, res.non_conformance, res.rectification, res.remark,
res.rec_user_id, res.rec_date, res.biz_type,res.equ_category, res.inspection_type, res.inspection_type_name, res.rec_user_id, res.rec_date, res.biz_type,res.equ_category, res.inspection_type, res.inspection_type_name,
res.application_date,use_unit_name, use_unit_credit_code, province_name, city_name, county_name, street_name, res.application_date,use_unit_name, use_unit_credit_code, province_name, city_name, county_name, street_name, equ_code, use_inner_code, ibjri.equ_list,
address, equ_code, use_inner_code, ibjri.equ_list, tec1.name equ_list_name, ibjri.equ_category, tec.name tec1.name equ_list_name, ibjri.equ_category
equ_category_name, use_org_code , use_org_code, res.equ_define, ibjui.ADDRESS equUseAddress, bei.use_unit inspectionUnitName, bei1.use_unit applicationUnitName, cdb.name inspectionTypeName
from tz_jyjc_inspection_result res from tz_jyjc_inspection_result res
left join idx_biz_jg_other_info ibjoi on res.equip_unicode = ibjoi.supervisory_code -- left join idx_biz_jg_other_info ibjoi on res.equip_unicode = ibjoi.supervisory_code
left join idx_biz_jg_use_info ibjui on ibjui.record = ibjoi.record left join idx_biz_jg_use_info ibjui on ibjui.record = res.equip_unicode
left join idx_biz_jg_register_info ibjri on ibjui.record = ibjri.record left join idx_biz_jg_register_info ibjri on ibjui.record = ibjri.record
left join tz_equipment_category tec on ibjri.equ_category = tec.code left join tz_equipment_category tec on ibjri.equ_category = tec.code
left join tz_equipment_category tec1 on ibjri.equ_list = tec1.code left join tz_equipment_category tec1 on ibjri.equ_list = tec1.code
left join tz_base_enterprise_info bei on res.inspection_unit_code = bei.use_code
left join tz_base_enterprise_info bei1 on res.application_unit_code = bei1.use_code
left join cb_data_dictionary cdb on res.inspection_type = cdb.code
<where> <where>
<if test="jyjcInspectionResultModel.applicationNo != '' and jyjcInspectionResultModel.applicationNo != null"> <if test="jyjcInspectionResultModel.applicationNo != '' and jyjcInspectionResultModel.applicationNo != null">
and res.application_no like concat('%',#{jyjcInspectionResultModel.applicationNo},'%') and res.application_no like concat('%',#{jyjcInspectionResultModel.applicationNo},'%')
...@@ -53,5 +56,6 @@ ...@@ -53,5 +56,6 @@
AND TO_DAYS(res.application_date) = TO_DAYS(#{jyjcInspectionResultModel.applicationDate}) AND TO_DAYS(res.application_date) = TO_DAYS(#{jyjcInspectionResultModel.applicationDate})
</if> </if>
</where> </where>
ORDER BY application_date DESC
</select> </select>
</mapper> </mapper>
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java
View file @ 1074aee4
...@@ -143,7 +143,7 @@ public class JyjcInspectionApplicationController extends BaseController { ...@@ -143,7 +143,7 @@ public class JyjcInspectionApplicationController extends BaseController {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
inspectionUnitCode = reginParams.getCompany().getCompanyCode(); inspectionUnitCode = reginParams.getCompany().getCompanyCode();
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,applicationUnitName,equipClassify,inspectionUnitCode,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType)); return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType));
} }
...@@ -167,7 +167,7 @@ public class JyjcInspectionApplicationController extends BaseController { ...@@ -167,7 +167,7 @@ public class JyjcInspectionApplicationController extends BaseController {
page.setSize(size); page.setSize(size);
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
applicationUnitCode = reginParams.getCompany().getCompanyCode(); applicationUnitCode = reginParams.getCompany().getCompanyCode();
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,applicationUnitName,equipClassify,inspectionUnitCode,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType)); return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType));
} }
/** /**
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
View file @ 1074aee4
...@@ -17,9 +17,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum; ...@@ -17,9 +17,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.jyjc.api.enums.ResultStatusEnum; import com.yeejoin.amos.boot.module.jyjc.api.enums.ResultStatusEnum;
import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper; import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper;
import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper; import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationAttachmentModel; import com.yeejoin.amos.boot.module.jyjc.api.model.*;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationService; import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationService;
import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException; import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
import com.yeejoin.amos.boot.module.jyjc.biz.feign.JgFeignClient; import com.yeejoin.amos.boot.module.jyjc.biz.feign.JgFeignClient;
...@@ -140,12 +138,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -140,12 +138,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
List<JyjcInspectionApplicationEquip> equipInfos = new ArrayList<>(); List<JyjcInspectionApplicationEquip> equipInfos = new ArrayList<>();
if (null != model.getEquip() && model.getEquip().size() > 0) { if (null != model.getEquip() && model.getEquip().size() > 0) {
List<JyjcInspectionApplicationEquipModel> equips = JSONObject.parseArray(JSON.toJSONString(model.getEquip()), JyjcInspectionApplicationEquipModel.class); List<JyjcInspectionApplicationEquipDto> equips = JSONObject.parseArray(JSON.toJSONString(model.getEquip()), JyjcInspectionApplicationEquipDto.class);
for (JyjcInspectionApplicationEquipModel equip : equips) { for (JyjcInspectionApplicationEquipDto equip : equips) {
JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip(); JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip();
equipInfo.setEquDefine(equip.getEquDefineCode()); equipInfo.setEquDefine(equip.getEquDefineCode());
equipInfo.setEquList(equip.getEquListCode()); equipInfo.setEquList(equip.getEquListCode());
equipInfo.setEquipUnicode(equip.getSupervisoryCode()); equipInfo.setEquipUnicode(equip.getSequenceNbr());
equipInfo.setEquCategory(equip.getEquCategoryCode()); equipInfo.setEquCategory(equip.getEquCategoryCode());
// equipInfo.setApplicationSeq(model.getSequenceNbr()); // equipInfo.setApplicationSeq(model.getSequenceNbr());
equipInfos.add(equipInfo); equipInfos.add(equipInfo);
...@@ -185,14 +183,14 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -185,14 +183,14 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
if (model.getEquip().size() > 0) { if (model.getEquip().size() > 0) {
// List<Map<String, Object>> equip = model.getEquip(); // List<Map<String, Object>> equip = model.getEquip();
// List<String> jgm = equip.stream().map(e -> e.get("equipUnicode").toString()).collect(Collectors.toList()); // List<String> jgm = equip.stream().map(e -> e.get("equipUnicode").toString()).collect(Collectors.toList());
List<JyjcInspectionApplicationEquipModel> equips = JSONObject.parseArray(JSON.toJSONString(model.getEquip()), JyjcInspectionApplicationEquipModel.class); List<JyjcInspectionApplicationEquipDto> equips = JSONObject.parseArray(JSON.toJSONString(model.getEquip()), JyjcInspectionApplicationEquipDto.class);
int num = equips.size(); int num = equips.size();
model.setNumberOfEquip(num); model.setNumberOfEquip(num);
for (JyjcInspectionApplicationEquipModel equip : equips) { for (JyjcInspectionApplicationEquipDto equip : equips) {
JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip(); JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip();
equipInfo.setEquDefine(equip.getEquDefineCode()); equipInfo.setEquDefine(equip.getEquDefineCode());
equipInfo.setEquList(equip.getEquListCode()); equipInfo.setEquList(equip.getEquListCode());
equipInfo.setEquipUnicode(equip.getSupervisoryCode()); equipInfo.setEquipUnicode(equip.getSequenceNbr());
equipInfo.setEquCategory(equip.getEquCategoryCode()); equipInfo.setEquCategory(equip.getEquCategoryCode());
equipInfo.setApplicationSeq(model.getSequenceNbr()); equipInfo.setApplicationSeq(model.getSequenceNbr());
jyjcInspectionApplicationEquipService.save(equipInfo); jyjcInspectionApplicationEquipService.save(equipInfo);
...@@ -296,7 +294,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -296,7 +294,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
HashMap<String, Object> hashMap = new HashMap<>(); HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("number", 1); hashMap.put("number", 1);
hashMap.put("size", jyjcInspectionApplicationEquips.size()); hashMap.put("size", jyjcInspectionApplicationEquips.size());
hashMap.put("SUPERVISORY_CODE", collect); hashMap.put("SEQUENCE_NBR", collect);
FeignClientResult<Page<JSONObject>> response = jgFeignClient.queryForPage(hashMap); FeignClientResult<Page<JSONObject>> response = jgFeignClient.queryForPage(hashMap);
if (200 == response.getStatus() && ObjectUtils.isNotEmpty(response.getResult())) { if (200 == response.getStatus() && ObjectUtils.isNotEmpty(response.getResult())) {
List<JSONObject> records = response.getResult().getRecords(); List<JSONObject> records = response.getResult().getRecords();
...@@ -350,7 +348,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -350,7 +348,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
resultModel.setResultStatus(ResultStatusEnum.NO_RESULT.getCode()); resultModel.setResultStatus(ResultStatusEnum.NO_RESULT.getCode());
resultModel.setApplicationDate(inspectionApplicationModel.getApplicationDate()); resultModel.setApplicationDate(inspectionApplicationModel.getApplicationDate());
resultModel.setResultType(inspectionApplicationModel.getResultType()); resultModel.setResultType(inspectionApplicationModel.getResultType());
resultModel.setInspectionType(applicationEquipModels.get(i).getInspectionType()); resultModel.setInspectionType(inspectionApplicationModel.getInspectionType());
// 解析设备 // 解析设备
resultModel.setBizType(inspectionApplicationModel.getBizType()); resultModel.setBizType(inspectionApplicationModel.getBizType());
resultModel.setResultNo(codes.get(i)); resultModel.setResultNo(codes.get(i));
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java
View file @ 1074aee4
...@@ -168,6 +168,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR ...@@ -168,6 +168,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
if (!CollectionUtils.isEmpty(collect)) { if (!CollectionUtils.isEmpty(collect)) {
resultParam.setSequenceNbr(collect.get(0).getSequenceNbr()); resultParam.setSequenceNbr(collect.get(0).getSequenceNbr());
} }
resultParam.setParamType(k);
resultParam.setResultSeq(model.getSequenceNbr()); resultParam.setResultSeq(model.getSequenceNbr());
resultParam.setParamJson(JSON.toJSONString(tableModel.get(k))); resultParam.setParamJson(JSON.toJSONString(tableModel.get(k)));
paramList.add(resultParam); paramList.add(resultParam);
...@@ -183,12 +184,6 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR ...@@ -183,12 +184,6 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
wrapper.lambda().eq(InspectionDetectionInfo::getInspectReportNo, model.getResultNo()); wrapper.lambda().eq(InspectionDetectionInfo::getInspectReportNo, model.getResultNo());
List<InspectionDetectionInfo> list = inspectionDetectionInfoMapper.selectList(wrapper); List<InspectionDetectionInfo> list = inspectionDetectionInfoMapper.selectList(wrapper);
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
QueryWrapper<CategoryOtherInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(CategoryOtherInfo::getSupervisoryCode, model.getEquipUnicode());
List<CategoryOtherInfo> otherInfos = categoryOtherInfoMapper.selectList(queryWrapper);
if (!CollectionUtils.isEmpty(otherInfos)) {
info.setRecord(otherInfos.get(0).getRecord());
}
extracted(model, info); extracted(model, info);
info.setSequenceNbr(sequence.nextId() + ""); info.setSequenceNbr(sequence.nextId() + "");
inspectionDetectionInfoMapper.insert(info); inspectionDetectionInfoMapper.insert(info);
...@@ -203,7 +198,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR ...@@ -203,7 +198,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
private void extracted(JyjcInspectionResultModel model, InspectionDetectionInfo info) { private void extracted(JyjcInspectionResultModel model, InspectionDetectionInfo info) {
info.setInspectType(model.getInspectionType()); info.setInspectType(model.getInspectionType());
info.setInspectOrgName(model.getInspectionUnitCode()); info.setInspectOrgName(model.getInspectionUnitCode());
// info.setInspectReport(JSON.toJSONString(model.getResultAttachmentModelList())); info.setRecord(model.getEquipUnicode());
info.setInspectDate(model.getInspectionDate()); info.setInspectDate(model.getInspectionDate());
info.setInspectConclusion(model.getInspectionConclusion()); info.setInspectConclusion(model.getInspectionConclusion());
info.setProblemRemark(model.getNonConformance()); info.setProblemRemark(model.getNonConformance());
......
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