修改返回格式

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -30,4 +30,6 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     Page<Map<String, Object>> getEquipListPage(@Param("page")Page<Map<String, Object>> page,@Param("factoryNum") String factoryNum,@Param("equList")String equList,@Param("equCategory")String equCategory);
 
     void updatePromoter(@Param("id")Long id);
+
+    List<Map<String, Object>> getDetailById(@Param("id") Long id);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -161,5 +161,36 @@
         from idx_biz_jg_design_info
         where RECORD = #{id}
     </select>
+    <select id="getDetailById" resultType="java.util.Map">
+        select ur.sequence_nbr                                                        as sequenceNbr,
+               ur.audit_status                                                        as auditStatus,
+               date_format(reg_date, '%Y-%m-%d')                                      as regDate,
+               ur.use_unit_name                                                       as useUnitName,
+               ur.status,
+               other.CODE96333                                                           code96333,
+               ur.receive_org_name                                                    as receiveOrgName,
+               (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
+               jri.PRODUCT_NAME                                                       as productName,
+               jri.EQU_CODE                                                           as equCode,
+               use.USE_INNER_CODE                                                     as innerCode,
+               concat(use.PROVINCE_NAME, '-', use.CITY_NAME, '-', use.COUNTY_NAME)    as place,
+               ur.instance_id                                                         as instanceId,
+               re.equ_id                                                              as equipId,
+               ur.apply_no                                                            as applyNo,
+               ur.next_execute_ids                                                    as nextExecuteIds,
+               ur.promoter,
+               ur.supervisory_code                                                    as supervisoryCode,
+               ur.use_registration_code                                               as useRegistrationCode,
+               date_format(ur.audit_pass_date, '%Y-%m-%d')                            as auditPassDate,
+               ur.receive_org_name                                                    as receiveOrgName,
+               ur.next_execute_user_ids                                               as nextExecuteUserIds
+        from tzs_jg_use_registration ur
+                 LEFT JOIN tzs_jg_use_registration_eq re on ur.sequence_nbr = re.equip_transfer_id
+                 LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
+                 LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
+                 LEFT JOIN idx_biz_jg_other_info other on re.equ_id = other.RECORD
+        where ur.sequence_nbr = #{id}
+
+    </select>
 
 </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/JgUseRegistrationController.java

@@ -38,8 +38,7 @@ public class JgUseRegistrationController extends BaseController {
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public ResponseModel<Object> save(@RequestBody JSONObject map) {
-        JgUseRegistration data = jgUseRegistrationServiceImpl.save(map);
-        return ResponseHelper.buildResponse(Collections.singletonList(data));
+        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.save(map));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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/JgUseRegistrationServiceImpl.java

@@ -147,7 +147,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     @Transactional
-    public JgUseRegistration save(JSONObject map) {
+    public List<Map<String, Object>> save(JSONObject map) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         // 使用登记信息
         JgUseRegistration jgUseRegistration = new JgUseRegistration();
@@ -257,7 +257,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             list.add(dto);
             commonServiceImpl.buildTaskModel(list);
         }
-        return jgUseRegistration;
+        return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr());
     }
 
     public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst) {