改造变更登记接口调整

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

@@ -33,4 +33,6 @@ public interface JgChangeRegistrationReformMapper extends BaseMapper<JgChangeReg
 
     @Select("select name from tz_equipment_category  where code=#{code}")
     String getEquiplistNameByEquiplist(String code);
+
+    List<Map<String, Object>> getDetailById(@Param("id") Long id);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationReformService.java

@@ -20,7 +20,7 @@ import java.util.Map;
  */
 public interface IJgChangeRegistrationReformService {
     Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto, Page<Map<String, Object>> page, List<String> roleIds);
-    JgChangeRegistrationReform save(JSONObject map);
+    List<Map<String, Object>> save(JSONObject map);
     void updateExecuteIds(String instanceId, JgChangeRegistrationReform jgChangeRegistrationReform, String operate, ProcessTaskDTO processTaskDTO);
     void flowExecute(Long id, String instanceId, String operate, String comment);
     void withdraw(String instanceId);

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

@@ -20,7 +20,7 @@
         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,
+        concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME) as place,
         ifnull(ur.instance_id, '') as instanceId,
         re.equ_id as equipId,
         ur.apply_no as applyNo,
@@ -140,4 +140,33 @@
         </where>
     </select>
 
+
+        <select id="getDetailById" resultType="java.util.Map">
+            select ur.sequence_nbr as sequenceNbr,
+            ur.audit_status as auditStatus,
+            ur.use_unit_name as useUnitName,
+            ur.use_registration_code as useRegistrationCode,
+            ur.status,
+            ur.receive_org_name as receiveOrgName,
+            DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
+            DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
+            (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,
+            ifnull(ur.instance_id, '') as instanceId,
+            re.equ_id as equipId,
+            ur.apply_no as applyNo,
+            ifnull(ur.next_executor_ids,'') as nextExecutorIds,
+            ur.promoter,
+            ur.next_execute_user_ids as nextExecuteUserIds
+            from tzs_jg_change_registration_reform ur
+            LEFT JOIN tzs_jg_change_registration_reform_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/JgChangeRegistrationReformController.java

@@ -49,7 +49,7 @@ public class JgChangeRegistrationReformController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增改造变更登记", notes = "新增改造变更登记")
-	public ResponseModel<JgChangeRegistrationReform> save(@RequestBody JSONObject map) {
+	public ResponseModel<Object> save(@RequestBody JSONObject map) {
 	    return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.save(map));
 	}
 	@TycloudOperation(ApiLevel = UserType.AGENCY)