feat(检验检测)：报检结果查看

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/common/BizCommonConstant.java

@@ -148,4 +148,9 @@ public interface BizCommonConstant {
      * 检验机构分类
      */
     String JYJGFL_DICT_KEY = "JYJGFL";
+
+    /**
+     * 检验检测申请单据状态
+     */
+    String JYZT = "JYLCZT";
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionResultMapper.java

 package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -27,4 +28,6 @@ public interface JyjcInspectionResultMapper extends BaseMapper<JyjcInspectionRes
     List<InspectionTimelinesDto> queryInspectionTimelinessTopXX(@Param("top") String top, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
 
     List<JyjcInspectionResultVo> queryExportInIds(@Param("ids") List<String> ids);
+
+    IPage<JyjcInspectionResultModel> findByApplicationNo(@Param("page") Page<JyjcInspectionResultModel> page, @Param("applicationNo") String applicationNo);
 }

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

@@ -221,6 +221,9 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "接收人名称")
     private String receiveUserName;
 
+    @ApiModelProperty(value = "实际业务状态，聚合申请和结果状态")
+    private String actualStatus;
+
     public String getProcessInstanceId() {
         return this.instanceId != null ? this.instanceId : this.processInstanceId;
     }

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

@@ -193,4 +193,8 @@ public class JyjcInspectionResultModel extends BaseModel {
      */
     @ApiModelProperty(value = "结果来源")
     private String sourceResult;
+
+
+    @ApiModelProperty(value = "结果表主键，前端详情时使用")
+    private String ids;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -15,10 +15,61 @@
         GROUP BY application_seq
         )
         SELECT
-        tzjia.*,
+             tzjia.sequence_nbr,
+             tzjia.inspection_unit_code,
+             tzjia.inspection_type,
+             tzjia.equip_classify,
+             tzjia.application_no,
+             tzjia.application_date,
+             tzjia.inspection_classify,
+             tzjia.application_contact_name,
+             tzjia.application_contact_phone,
+             tzjia.application_remark,
+             tzjia.inspection_charge_person,
+             tzjia.inspection_charge_phone,
+             tzjia.process_description,
+             tzjia.original_application_no,
+             tzjia.accept_date,
+             tzjia.application_unit_code,
+             tzjia.number_of_equip,
+             tzjia.workflow_role,
+             tzjia.instance_id,
+             tzjia.application_qrcode,
+             tzjia.status,
              case
-                   when tzjia.plan_data<![CDATA[ <>]]> '' then TRUE
-                   else false END                                                                 as isExistPlanData,
+                 when exists(select 1 from tz_jyjc_inspection_result r where r.application_no = tzjia.application_no and r.result_status = '2') then '66161'
+                  else tzjia.status
+             end as actual_status,
+             tzjia.remark,
+             tzjia.rec_user_id,
+             tzjia.rec_date,
+             tzjia.biz_type,
+             tzjia.workflow_node,
+             tzjia.result_type,
+             tzjia.next_execute_ids,
+             tzjia.promoter,
+             tzjia.create_user_id,
+             tzjia.inner_person_code,
+             tzjia.next_task_id,
+             tzjia.next_execute_user_ids,
+             tzjia.application_unit_name,
+             tzjia.inspection_unit_name,
+             tzjia.transfer_to_user_ids,
+             tzjia.docking_unit_code,
+             tzjia.equ_category,
+             tzjia.is_must_accept,
+             tzjia.plan_create_date,
+             tzjia.project_contraption_id,
+             tzjia.equ_define,
+             tzjia.city,
+             tzjia.county,
+             tzjia.plan_inspection_date,
+             tzjia.remark2,
+             tzjia.equip_tag1,
+             tzjia.use_unit_credit_code,
+             tzjia.inspect_app_url,
+             tzjia.receive_user_id,
+             tzjia.receive_user_name,
              cdd1.NAME                                                                          AS inspectionClassify,
              cdd3.NAME                                                                          AS inspectionType,
              (SELECT name FROM "tz_equipment_category" ca where ca.code = tzjia.equip_classify) AS equipClassify,
@@ -34,8 +85,11 @@
         <bind name="statusList" value="@java.util.Arrays@asList('6610','6611','6614','6615','6616','6618')" />
     </sql>
     <select id="selectForPage" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
+        SELECT
+            *
+        FROM
+        (
             <include refid="page-list"/>
-        <include refid="validStatusList"/>
             <where>
                 <if test="jyjcInspectionApplicationModel.applicationNo != null and jyjcInspectionApplicationModel.applicationNo != ''">
                     and tzjia.application_no like concat('%',#{jyjcInspectionApplicationModel.applicationNo},'%')
@@ -53,48 +107,31 @@
                 <if test="jyjcInspectionApplicationModel.acceptDate != null">
                     and tzjia.accept_date = #{jyjcInspectionApplicationModel.acceptDate}
                 </if>
-            <if test="jyjcInspectionApplicationModel.status != null and jyjcInspectionApplicationModel.status != ''">
-                and (
-                <choose>
-                    <when test="statusList.contains(jyjcInspectionApplicationModel.status)">
-                        tzjia.status = #{jyjcInspectionApplicationModel.status}
-                    </when>
-                    <when test='jyjcInspectionApplicationModel.status == "66190"'>
-                        (tzjia.inspection_charge_person is null and tzjia.status = '6616')
-                    </when>
-                    <when test='jyjcInspectionApplicationModel.status == "66191"'>
-                        (tzjia.inspection_charge_person <![CDATA[<>]]>  '' and tzjia.plan_inspection_date is null  and tzjia.status = '6616')
-                    </when>
-                    <when test='jyjcInspectionApplicationModel.status == "66192"'>
-                        (tzjia.plan_inspection_date is not null  and tzjia.status = '6616')
-                    </when>
-                    <otherwise>
-                        1=1
-                    </otherwise>
-                </choose>
-                )
-            </if>
                 <if test="jyjcInspectionApplicationModel.bizType != null and jyjcInspectionApplicationModel.bizType != ''">
                     and tzjia.biz_type = #{jyjcInspectionApplicationModel.bizType}
                 </if>
-
                 <if test="jyjcInspectionApplicationModel.inspectionUnitName != null and jyjcInspectionApplicationModel.inspectionUnitName != ''">
                     and tzjia.inspection_unit_name like concat('%',#{jyjcInspectionApplicationModel.inspectionUnitName},'%')
                 </if>
                 <if test="jyjcInspectionApplicationModel.applicationUnitName != null and jyjcInspectionApplicationModel.applicationUnitName != ''">
-                and tzjia.application_unit_name like concat('%',#{jyjcInspectionApplicationModel.applicationUnitName},'%')
+                    and tzjia.application_unit_name like
+                    concat('%',#{jyjcInspectionApplicationModel.applicationUnitName},'%')
                 </if>
                 <if test="jyjcInspectionApplicationModel.inspectionUnitCode != null and jyjcInspectionApplicationModel.inspectionUnitCode != ''">
-                and tzjia.inspection_unit_code = #{jyjcInspectionApplicationModel.inspectionUnitCode} and tzjia.status != '6610'
+                    and tzjia.inspection_unit_code = #{jyjcInspectionApplicationModel.inspectionUnitCode} and tzjia.status
+                    != '6610'
                 </if>
                 <if test="jyjcInspectionApplicationModel.applicationUnitCode != null and jyjcInspectionApplicationModel.applicationUnitCode != ''">
                     and tzjia.application_unit_code = #{jyjcInspectionApplicationModel.applicationUnitCode}
                 </if>
                 <if test="identity == 'apply'">
-                and (tzjia.application_unit_code = #{currentApplicationUnitCode} or tzjia.inspection_unit_code = #{currentApplicationUnitCode} OR tzjia.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ) or tzjia.inspection_charge_person = #{currentUserId})
+                    and (tzjia.application_unit_code = #{currentApplicationUnitCode} or tzjia.inspection_unit_code =
+                    #{currentApplicationUnitCode} OR tzjia.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' )
+                    or tzjia.inspection_charge_person = #{currentUserId})
                 </if>
                 <if test="identity == 'receive'">
-                and (tzjia.inspection_unit_code = #{currentInspectionUnitCode} OR tzjia.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' )  or tzjia.inspection_charge_person = #{currentUserId})
+                    and (tzjia.inspection_unit_code = #{currentInspectionUnitCode} OR tzjia.transfer_to_user_ids LIKE concat
+                    ( '%', #{currentUserId}, '%' ) or tzjia.inspection_charge_person = #{currentUserId})
                     and tzjia.instance_id <![CDATA[<>]]>  ''
                 </if>
                 <if test="orgCode != null and orgCode != ''">
@@ -105,16 +142,25 @@
                     WHERE elem LIKE concat(#{orgCode},'%' ) )
                 </if>
             </where>
+        )
+        WHERE
+            1=1
+            <if test="jyjcInspectionApplicationModel.status != null and jyjcInspectionApplicationModel.status != ''">
+                and actual_status = #{jyjcInspectionApplicationModel.status}
+            </if>
             order by
             <if test="sort != null">
-            tzjia.${sort.field} ${sort.sortType},
+                ${sort.field} ${sort.sortType},
             </if>
-        tzjia.application_no desc
+            application_no desc
     </select>
 
     <select id="selectForPage2" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
+        SELECT
+            *
+        FROM
+        (
             <include refid="page-list"/>
-        <include refid="validStatusList"/>
             <where>
                 <if test="jyjcInspectionApplicationModel.applicationNo != null and jyjcInspectionApplicationModel.applicationNo != ''">
                      and tzjia.application_no like concat('%',#{jyjcInspectionApplicationModel.applicationNo},'%')
@@ -131,27 +177,6 @@
                 <if test="jyjcInspectionApplicationModel.acceptDate != null">
                     and tzjia.accept_date = #{jyjcInspectionApplicationModel.acceptDate}
                 </if>
-            <if test="jyjcInspectionApplicationModel.status != null and jyjcInspectionApplicationModel.status != ''">
-                and (
-                <choose>
-                    <when test="statusList.contains(jyjcInspectionApplicationModel.status)">
-                        tzjia.status = #{jyjcInspectionApplicationModel.status}
-                    </when>
-                    <when test='jyjcInspectionApplicationModel.status == "66190"'>
-                        (tzjia.inspection_charge_person is null and tzjia.status = '6616')
-                    </when>
-                    <when test='jyjcInspectionApplicationModel.status == "66191"'>
-                        (tzjia.inspection_charge_person <![CDATA[<>]]>  '' and tzjia.plan_inspection_date is null  and tzjia.status = '6616')
-                    </when>
-                    <when test='jyjcInspectionApplicationModel.status == "66192"'>
-                        (tzjia.plan_inspection_date is not null  and tzjia.status = '6616')
-                    </when>
-                    <otherwise>
-                        1=1
-                    </otherwise>
-                </choose>
-                )
-            </if>
                 <if test="jyjcInspectionApplicationModel.bizType != null and jyjcInspectionApplicationModel.bizType != ''">
                     and tzjia.biz_type = #{jyjcInspectionApplicationModel.bizType}
                 </if>
@@ -192,11 +217,17 @@
                     </otherwise>
                 </choose>
             </where>
+        )
+        WHERE
+            1=1
+            <if test="jyjcInspectionApplicationModel.status != null and jyjcInspectionApplicationModel.status != ''">
+                and actual_status = #{jyjcInspectionApplicationModel.status}
+            </if>
             order by
             <if test="sort != null">
-            tzjia.${sort.field} ${sort.sortType},
+                ${sort.field} ${sort.sortType},
             </if>
-        tzjia.application_no desc
+            application_no desc
     </select>
 
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -146,7 +146,7 @@
             res.equ_define,
             res.result_type,
             ot.supervisory_code,
-            concat(ibjui.province_name, ibjui.city_name,ibjui.county_name, ibjui.street_name,ibjui.ADDRESS ) as  equUseAddress
+            concat_ws('', ibjui.province_name, ibjui.city_name,ibjui.county_name, ibjui.street_name,ibjui.ADDRESS ) as  equUseAddress
         FROM
             tz_jyjc_inspection_result res
                 LEFT JOIN idx_biz_jg_use_info ibjui ON ibjui.record = res.equip_unicode
@@ -377,4 +377,21 @@
         </where>
         order by res.application_no desc
     </select>
+    <select id="findByApplicationNo"
+            resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel">
+        select * from (
+        <include refid="page-list2"/>
+        <where>
+            res.equ_list != '8000'
+            and res.application_no = #{applicationNo}
+        </where>
+        union all
+        <include refid="page-list3"/>
+        <where>
+            res.equ_list = '8000'
+            and res.application_no = #{applicationNo}
+        </where>
+        )
+        ORDER BY sequence_nbr DESC
+    </select>
 </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/JyjcInspectionResultController.java

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.PipelineInspectionResultDto;
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.ResultTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultDataModel;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel;
@@ -259,4 +261,17 @@ public class JyjcInspectionResultController extends BaseController {
     public ResponseModel<List<PipelineInspectionResultDto>> savePipelineResultDataBatch(@RequestBody List<PipelineInspectionResultDto> resultData){
         return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.receivePipelineResultData(resultData));
     }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/application/page")
+    @ApiOperation(httpMethod = "GET", value = "查询报检申请单", notes = "查询报检申请单")
+    public ResponseModel<IPage<JyjcInspectionResultModel>> applicationPageList(@RequestParam int current,
+                                                                          @RequestParam int size,
+                                                                          @RequestParam String applicationNo) {
+        Page<JyjcInspectionResultModel> page = new Page<>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryForPageListByApplyNo(page, applicationNo));
+    }
 }

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

@@ -583,15 +583,26 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         if (ValidationUtil.equals("receive", identity)) {
             currentInspectionUnitCode = companyCode;
         }
+        Map<String, String> statusCodeNameMap = getStatusMap();
         String orgCode = "jgLook".equals(client) ? reginParams.getCompany().getOrgCode() : null;
         Page<JyjcInspectionApplicationModel> result = this.getBaseMapper().selectForPage(page, model, identity, currentApplicationUnitCode, currentInspectionUnitCode, currentUserId, sortMap, orgCode);
         result.getRecords().forEach(r -> {
             r.setLoginPersonCompanyCode(companyCode);
+            r.setStatusName(this.buildStatusNameByActualStatus(statusCodeNameMap, r.getActualStatus()));
 //            this.addPlanAndConfirmStatus(r, model);
         });
         return result;
     }
 
+    private Map<String, String> getStatusMap() {
+        List<DataDictionary> dataDictionaries = dataDictionaryService.getByType(BizCommonConstant.JYZT);
+        return dataDictionaries.stream().collect(Collectors.toMap(DataDictionary::getCode, DataDictionary::getName));
+    }
+
+    private String buildStatusNameByActualStatus(Map<String, String> statusCodeNameMap, String actualStatus) {
+        return statusCodeNameMap.get(actualStatus);
+    }
+
     public Page<JyjcInspectionApplicationModel> queryForPageList2(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model, String sort) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String client;
@@ -600,12 +611,14 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         } else {                                                                               // 监管端
             client = BaseController.COMPANY_TYPE_SUPERVISION;
         }
+        Map<String, String> statusCodeNameMap = getStatusMap();
         SortVo sortMap = commonService.sortFieldConversion(sort);
         String companyCode = CommonServiceImpl.getUnitCode(reginParams.getCompany());
         String agencyClassify = this.getAgencyClassify(companyCode);
         Page<JyjcInspectionApplicationModel> result = this.getBaseMapper().selectForPage2(page, model, client, companyCode, sortMap, reginParams.getCompany().getOrgCode(), agencyClassify);
         result.getRecords().forEach(r -> {
             r.setLoginPersonCompanyCode(companyCode);
+            r.setStatusName(this.buildStatusNameByActualStatus(statusCodeNameMap, r.getActualStatus()));
 //            this.addPlanAndConfirmStatus(r, model);
         });
         return result;

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

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -1125,4 +1126,24 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         updateWrapper.set(IdxBizJgTechParamsPipeline::getRemarks, techParamPipeline.getRemarks());
         techParamPipelineMapper.update(null, updateWrapper);
     }
+
+    public IPage<JyjcInspectionResultModel> queryForPageListByApplyNo(Page<JyjcInspectionResultModel> page, String applicationNo) {
+        IPage<JyjcInspectionResultModel>  resultIPage = this.getBaseMapper().findByApplicationNo(page, applicationNo);
+        resultIPage.getRecords().forEach(v->{
+            if (ResultStatusEnum.NO_RESULT.getCode().equals(v.getResultStatus())) {
+                v.setResultStatusName(ResultStatusEnum.NO_RESULT.getName());
+            }
+            if (ResultStatusEnum.YES_RESULT.getCode().equals(v.getResultStatus())) {
+                v.setResultStatusName(ResultStatusEnum.YES_RESULT.getName());
+            }
+            v.setSourceResult(ResultTypeEnum.getNameByCode(v.getResultType()));
+            v.setUseInnerCode("null".equals(v.getUseInnerCode()) ? "" : v.getUseInnerCode());
+            v.setIds(v.getSequenceNbr().toString());
+            // 去掉不使用的字段，防止页面跳转时整行数据加到url上，长度超长
+            v.setEquAddress(null);
+            v.setApplicationUnitName(null);
+            v.setUseUnitName(null);
+        });
+        return resultIPage;
+    }
 }
\ No newline at end of file