Commit 60e9a51e authored by suhuiguang's avatar suhuiguang Committed by tianbo

fix(jyjc):报价结果

1.安改维显示监督检验和检测
parent 9ea7312f
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
</if> </if>
<choose> <choose>
<when test="identity == 'apply'"> <when test="identity == 'apply'">
and res.application_unit_code = #{jyjcInspectionResultModel.companyCode} and (res.application_unit_code = #{jyjcInspectionResultModel.companyCode} or res.inspection_unit_code = #{jyjcInspectionResultModel.companyCode})
</when> </when>
<when test="identity == 'receive'"> <when test="identity == 'receive'">
and res.inspection_unit_code = #{jyjcInspectionResultModel.companyCode} and res.inspection_unit_code = #{jyjcInspectionResultModel.companyCode}
......
...@@ -216,6 +216,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR ...@@ -216,6 +216,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
if (ResultStatusEnum.YES_RESULT.getCode().equals(v.getResultStatus())) { if (ResultStatusEnum.YES_RESULT.getCode().equals(v.getResultStatus())) {
v.setResultStatusName(ResultStatusEnum.YES_RESULT.getName()); v.setResultStatusName(ResultStatusEnum.YES_RESULT.getName());
} }
v.setCompanyCode(CommonServiceImpl.getUnitCode(reginParams.getCompany()));
v.setSourceResult(ResultTypeEnum.getNameByCode(v.getResultType())); v.setSourceResult(ResultTypeEnum.getNameByCode(v.getResultType()));
v.setIdentity(identity); v.setIdentity(identity);
v.setUseInnerCode("null".equals(v.getUseInnerCode()) ? "" : v.getUseInnerCode()); v.setUseInnerCode("null".equals(v.getUseInnerCode()) ? "" : v.getUseInnerCode());
......
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