修改报检列表返回

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

@@ -18,7 +18,7 @@ import java.util.Map;
 public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspectionApplication> {
 
 
-   public Page<JyjcInspectionApplication> queryForDataList( Page<JyjcInspectionApplication> page, String applicationNo, String inspectionClassify, String applicationUnitCode,String applicationUnitName, String equipClassify, String inspectionUnitCode,String inspectionUnitName, String applicationDate, String acceptDate, String inspectionChargePerson, String status , String bizType);
+   public Page<JyjcInspectionApplicationModel> queryForDataList( Page<JyjcInspectionApplication> page, String applicationNo, String inspectionClassify, String applicationUnitCode,String applicationUnitName, String equipClassify, String inspectionUnitCode,String inspectionUnitName, String applicationDate, String acceptDate, String inspectionChargePerson, String status , String bizType);
 
    Page<JyjcInspectionApplicationEquipModel> listByCategory(Page<JyjcInspectionApplicationEquipModel> page,@Param("equipClassify")  String equipClassify);
 

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

@@ -3,26 +3,34 @@
 <mapper namespace="com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper">
 
     <select id="queryForDataList"
-            resultType="com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication">
-        select
+            resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
+        SELECT
         tzjia.sequence_nbr,
         tzjia.process_instance_id,
         tzjia.workflow_node,
         tzjia.biz_type,
         tzjia.application_no,
         tzjia.inspection_type,
-        (select name from  cb_data_dictionary  where cb_data_dictionary.code = tzjia.inspection_classify and cb_data_dictionary.type = 'JYJCLB') as inspectionClassify,
+        cdd1.NAME AS inspectionClassify,
         tzjia.inspection_unit_code,
-        (select name from  cb_data_dictionary  where cb_data_dictionary.code = tzjia.equip_classify and cb_data_dictionary.type = 'BJSBZL') as equipClassify,
+        cdd.NAME AS equipClassify,
         tzjia.number_of_equip,
         tzjia.inspection_unit_code,
         tzjia.application_date,
         tzjia.accept_date,
         tzjia.inspection_charge_phone,
         tzjia.inspection_charge_person,
-        tzjia.status
-        from
-        tz_jyjc_inspection_application as tzjia
+        tzjia.status,
+        tbei1.use_unit AS applicationUnitName,
+        tbei.use_unit AS inspectionUnitName,
+        cdd.NAME AS status
+        FROM
+        tz_jyjc_inspection_application AS tzjia
+        LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_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 cdd1 ON cdd1.code = tzjia.inspection_classify
+        LEFT JOIN cb_data_dictionary cdd2 ON cdd1.code = tzjia.status
         <where>
 
         <if test=" applicationNo != null and applicationNo != ''">

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

@@ -124,7 +124,7 @@ public class JyjcInspectionApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/pageByInstitution")
 	@ApiOperation(httpMethod = "GET",value = "分页查询（检验机构）",  notes = "分页查询（检验机构）")
-	public ResponseModel<Page<JyjcInspectionApplication>> queryForPageByInstitution(@RequestParam(value = "current") int current,@RequestParam
+	public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageByInstitution(@RequestParam(value = "current") int current,@RequestParam
                     (value = "size") int size,@RequestParam(required = false) String applicationNo,
 											  @RequestParam(required = false) String inspectionClassify,
 											  @RequestParam(required = false) String applicationUnitCode,
@@ -149,7 +149,7 @@ public class JyjcInspectionApplicationController extends BaseController {
 		@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/pageByCompany")
 	@ApiOperation(httpMethod = "GET",value = "分页查询（报检单位）",  notes = "分页查询（报检单位）")
-	public ResponseModel<Page<JyjcInspectionApplication>> queryForPageByCompany(@RequestParam(value = "current") int current,@RequestParam
+	public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageByCompany(@RequestParam(value = "current") int current,@RequestParam
 			(value = "size") int size,@RequestParam(required = false) String applicationNo,
 																				@RequestParam(required = false) String inspectionClassify,
 																				@RequestParam(required = false) String applicationUnitCode,

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

@@ -255,7 +255,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     }
 
 
-    public Page<JyjcInspectionApplication> queryForJyjcInspectionApplicationPage(Page<JyjcInspectionApplication> page,
+    public Page<JyjcInspectionApplicationModel> queryForJyjcInspectionApplicationPage(Page<JyjcInspectionApplication> page,
                                                                                  String applicationNo,
                                                                                  String inspectionClassify,
                                                                                  String applicationUnitCode,