Commit f717b20e authored by 刘林's avatar 刘林

fix(jg):使用登记暂存功能

parent 5532efce
...@@ -53,7 +53,7 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> { ...@@ -53,7 +53,7 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
List<Map<String, Object>> getDetailById(@Param("id") Long id); List<Map<String, Object>> getDetailById(@Param("id") Long id);
String getEquType(@Param("record") String record); String getEquType(@Param("code") String code);
Map<String, Object> getMaintenanceDetail(@Param("id") String id); Map<String, Object> getMaintenanceDetail(@Param("id") String id);
......
...@@ -647,11 +647,7 @@ ...@@ -647,11 +647,7 @@
GROUP BY re.equip_transfer_id GROUP BY re.equip_transfer_id
</select> </select>
<select id="getEquType" resultType="java.lang.String"> <select id="getEquType" resultType="java.lang.String">
SELECT ec.name select name from tz_equipment_category where code=#{code}
from idx_biz_jg_register_info jri
LEFT JOIN tz_equipment_category ec
on ec.code = jri.EQU_LIST
where jri.RECORD = #{record}
</select> </select>
<select id="getInstallDetail" resultType="java.util.Map"> <select id="getInstallDetail" resultType="java.util.Map">
......
...@@ -167,6 +167,7 @@ public class CommonServiceImpl implements ICommonService { ...@@ -167,6 +167,7 @@ public class CommonServiceImpl implements ICommonService {
private static final String basic = "basic"; private static final String basic = "basic";
private static final String useRegFormUpload = "useRegFormUpload"; private static final String useRegFormUpload = "useRegFormUpload";
public static final String HISTORY_EQU_TYPE = "historyEquType"; public static final String HISTORY_EQU_TYPE = "historyEquType";
public static final String HISTORY_SUBMIT_TYPE = "historySubmitType";
public static final String SECOND = "second"; public static final String SECOND = "second";
// 业务通用发起——告知单详情 // 业务通用发起——告知单详情
public static final String notice = "notice"; public static final String notice = "notice";
...@@ -1385,9 +1386,11 @@ public class CommonServiceImpl implements ICommonService { ...@@ -1385,9 +1386,11 @@ public class CommonServiceImpl implements ICommonService {
}) })
public Object invokeBusinessType(Map<String, Object> map) { public Object invokeBusinessType(Map<String, Object> map) {
String historyEquType = (String) map.get(HISTORY_EQU_TYPE); String historyEquType = (String) map.get(HISTORY_EQU_TYPE);
String historySubmitType = (String) map.get(HISTORY_SUBMIT_TYPE);
JSONObject jsonObject = new JSONObject((Map<String, Object>) map.get(SECOND)); JSONObject jsonObject = new JSONObject((Map<String, Object>) map.get(SECOND));
Map<String, Object> useRegFormUploadObj = (Map<String, Object>) map.get(useRegFormUpload); Map<String, Object> useRegFormUploadObj = (Map<String, Object>) map.get(useRegFormUpload);
String uploadMode = String.valueOf(useRegFormUploadObj.get("uploadMode")); String uploadMode = String.valueOf(useRegFormUploadObj.get("uploadMode"));
jsonObject.put("historySubmitType", historySubmitType);
Map<String, Function<JSONObject, Object>> handlerMap = new HashMap<>(); Map<String, Function<JSONObject, Object>> handlerMap = new HashMap<>();
handlerMap.put("unit", jgUseRegistrationServiceImpl::handleUnitHistoryEquip); handlerMap.put("unit", jgUseRegistrationServiceImpl::handleUnitHistoryEquip);
......
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