Skip to content

A
amos-boot-biz
Commit bc24b3af authored by chenzhao's avatar chenzhao
Browse files
Options

修改报检自测问题

parent fc8642d3
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 18 deletions
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 @ bc24b3af
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 @ bc24b3af
...@@ -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/resources/mapper/JyjcInspectionApplicationMapper.xml
View file @ bc24b3af
...@@ -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-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java
View file @ bc24b3af
...@@ -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 @ bc24b3af
...@@ -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));
......
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