Skip to content

A
amos-boot-biz
Commit 662082ed authored by 刘林's avatar 刘林
Browse files
Options

fix(jg):暂存功能问题处理

parent e1978de1
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 79 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ 662082ed
......@@ -1538,68 +1538,88 @@
<select id="queryRegistrationToBeSubmitPage"
resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgNoticeToBeSubmitDto">
SELECT
ur.sequence_nbr AS sequenceNbr,
'使用登记' AS businessType,
ur.apply_no AS applyNo,
ec1. NAME AS equListName,
ur.receive_org_name AS receiveOrgName,
CASE ur.status WHEN '6610' THEN '待提交' ELSE ur.status END AS status,
DATE_FORMAT (ur.create_date, '%Y-%m-%d') AS createDate
FROM
tzs_jg_use_registration ur
LEFT JOIN tzs_jg_use_registration_eq ure ON ur.sequence_nbr = ure.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info ri ON ri."RECORD" = ure.equ_id
LEFT JOIN tz_equipment_category ec1 ON ec1.code = ri."EQU_LIST"
WHERE
ur.is_delete = FALSE
AND ur.status = '使用单位待提交'
AND ur.use_unit_credit_code = #{companyCode}
UNION ALL
SELECT
crr.sequence_nbr AS sequenceNbr,
'改造变更登记' AS businessType,
crr.apply_no AS applyNo,
crr.equip_list_name AS equListName,
crr.receive_org_name AS receiveOrgName,
CASE crr.status WHEN '6610' THEN '待提交' ELSE crr.status END AS status,
DATE_FORMAT (crr.create_date, '%Y-%m-%d') AS createDate
FROM
tzs_jg_change_registration_reform crr
WHERE
crr.is_delete = FALSE
AND crr.status = '使用单位待提交'
AND crr.use_unit_credit_code = #{companyCode}
UNION ALL
SELECT
crt.sequence_nbr AS sequenceNbr,
'移装变更登记' AS businessType,
crt.apply_no AS applyNo,
crt.equip_list_name AS equListName,
crt.receive_org_name AS receiveOrgName,
CASE crt.status WHEN '6610' THEN '待提交' ELSE crt.status END AS status,
DATE_FORMAT (crt.create_date, '%Y-%m-%d') AS createDate
FROM
tzs_jg_change_registration_transfer crt
WHERE
crt.is_delete = FALSE
AND crt.status = '使用单位待提交'
AND crt.use_unit_credit_code = #{companyCode}
UNION ALL
SELECT
vi.sequence_nbr AS sequenceNbr,
'车用气瓶登记' AS businessType,
vi.apply_no AS applyNo,
'车用气瓶' AS equListName,
vi.receive_org_name AS receiveOrgName,
CASE vi.status WHEN '6610' THEN '待提交' ELSE vi.status END AS status,
DATE_FORMAT (vi.create_date, '%Y-%m-%d') AS createDate
FROM
tzs_jg_vehicle_information vi
WHERE
vi.is_delete = FALSE
AND vi.status = '使用单位待提交'
AND vi.use_unit_credit_code = #{companyCode}
ORDER BY createDate DESC, applyNo DESC
SELECT *
FROM (
SELECT
sequence_nbr AS sequenceNbr,
business_type AS businessType,
apply_no AS applyNo,
equ_list_name AS equListName,
receive_org_name AS receiveOrgName,
CASE status WHEN '6610' THEN '待提交' ELSE status END AS status,
DATE_FORMAT(create_date, '%Y-%m-%d') AS createDate,
ROW_NUMBER() OVER (
PARTITION BY sequence_nbr
ORDER BY create_date DESC, apply_no DESC
) AS rn
FROM (
-- 使用登记
SELECT
ur.sequence_nbr,
'使用登记' AS business_type,
ur.apply_no,
ec1.NAME AS equ_list_name,
ur.receive_org_name,
ur.status,
ur.create_date
FROM tzs_jg_use_registration ur
LEFT JOIN tzs_jg_use_registration_eq ure ON ur.sequence_nbr = ure.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info ri ON ri."RECORD" = ure.equ_id
LEFT JOIN tz_equipment_category ec1 ON ec1.code = ri."EQU_LIST"
WHERE ur.is_delete = FALSE
AND ur.status = '使用单位待提交'
AND ur.use_unit_credit_code = #{companyCode}
UNION ALL
-- 改造变更登记
SELECT
crr.sequence_nbr,
'改造变更登记' AS business_type,
crr.apply_no,
crr.equip_list_name,
crr.receive_org_name,
crr.status,
crr.create_date
FROM tzs_jg_change_registration_reform crr
WHERE crr.is_delete = FALSE
AND crr.status = '使用单位待提交'
AND crr.use_unit_credit_code = #{companyCode}
UNION ALL
-- 移装变更登记
SELECT
crt.sequence_nbr,
'移装变更登记' AS business_type,
crt.apply_no,
crt.equip_list_name,
crt.receive_org_name,
crt.status,
crt.create_date
FROM tzs_jg_change_registration_transfer crt
WHERE crt.is_delete = FALSE
AND crt.status = '使用单位待提交'
AND crt.use_unit_credit_code = #{companyCode}
UNION ALL
-- 车用气瓶登记
SELECT
vi.sequence_nbr,
'车用气瓶登记' AS business_type,
vi.apply_no,
'车用气瓶' AS equ_list_name,
vi.receive_org_name,
vi.status,
vi.create_date
FROM tzs_jg_vehicle_information vi
WHERE vi.is_delete = FALSE
AND vi.status = '使用单位待提交'
AND vi.use_unit_credit_code = #{companyCode}
) all_data
) dedup
WHERE dedup.rn = 1
ORDER BY dedup.createDate DESC, dedup.applyNo DESC
</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/handler/toBeSubmit/InstallNoticeStrategyHandler.java
View file @ 662082ed
......@@ -25,7 +25,8 @@ public class InstallNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
Map<String, Object> basic = new HashMap<>();
basic.put("type", ApplicationFormTypeEnum.AZGZ.getBusinessCode());
basic.put("receiveOrgCreditCode", installationInfo.get("receiveOrgCreditCode"));
basic.put("code", installationInfo.get("equListCode"));
basic.put("equCategory", installationInfo.get("equCategoryCode"));
Map<String, Map<String, Object>> result = new HashMap<>();
result.put("notice", installationInfo);
result.put("basic", basic);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/UseRegistrationStrategyHandler.java
View file @ 662082ed
......@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@Component
public class UseRegistrationStrategyHandler implements ToBeSubmitDetailStrategy {
......@@ -27,7 +28,7 @@ public class UseRegistrationStrategyHandler implements ToBeSubmitDetailStrategy
Map<String, Map<String, Object>> result = new HashMap<>();
result.put("notice", notice);
result.put("basic", basic);
useRegFormUpload.put("uploadMode", notice.get("uploadMode"));
useRegFormUpload.put("uploadMode", Objects.toString(notice.get("uploadMode"),"2"));
useRegFormUpload.put("useRegistrationFormUrl", notice.get("useRegistrationFormUrl"));
result.put("useRegFormUpload", useRegFormUpload);
return result;
......
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/DataDockServiceImpl.java
View file @ 662082ed
......@@ -956,12 +956,12 @@ public class DataDockServiceImpl {
String equCode = data.getEquCode();
if (!StringUtils.isEmpty(equCode)) {
if (equCode.matches("[a-zA-Z0-9]+")) {
// if (equCode.length() < 17) {
// rowError.append("设备代码不能小于17位；");
// }
// if (equCode.length() > 20) {
// rowError.append("设备代码不能大于20位；");
// }
if (equCode.length() < 17) {
rowError.append("设备代码不能小于17位；");
}
if (equCode.length() > 21) {
rowError.append("设备代码不能大于21位；");
}
} else {
rowError.append("设备代码不能包含特殊字符；");
}
......
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/IdxBizJgRegisterInfoServiceImpl.java
View file @ 662082ed
......@@ -1178,12 +1178,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 设备参数
if (equIpClassMap.containsKey(EQU_LIST) && !ValidationUtil.isEmpty(equIpClassMap.get(EQU_LIST).toString())) {
Map<String, Object> equipParamsMap = this.getEquipParamsMap(record, "", equIpClassMap.get(EQU_LIST).toString());
equipParamsMap.put(EQU_LIST, String.valueOf(equIpClassMap.get(EQU_LIST)));
equipParamsMap.put(EQU_CATEGORY, String.valueOf(equIpClassMap.get(EQU_CATEGORY)));
equipParamsMap.put(EQU_DEFINE, String.valueOf(equIpClassMap.get(EQU_DEFINE)));
if (!ValidationUtil.isEmpty(equipParamsMap)) {
// 给技术参数中添加设备种类，标记技术参数属于那个设备
equipParamsMap.put(EQU_LIST, String.valueOf(equIpClassMap.get(EQU_LIST)));
equipParamsMap.put(EQU_CATEGORY, String.valueOf(equIpClassMap.get(EQU_CATEGORY)));
equipParamsMap.put(EQU_DEFINE, String.valueOf(equIpClassMap.get(EQU_DEFINE)));
resultMap.put(EQUIP_PARAMS_FORM_ID, equipParamsMap);
}
equipInfoMap.put("identificationCode", equipParamsMap.get("VIN"));
......
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/JgReformNoticeServiceImpl.java
View file @ 662082ed
......@@ -101,8 +101,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
public static final String RECORD = "record";
public static final String SEQUENCE_NBR = "SEQUENCE_NBR";
public static final String PROJECT_CONTRAPTION = "projectContraption";
public static final String EQU_LIST_CODE = "EQU_LIST_CODE";
public static final String EQU_CATEGORY_CODE = "EQU_CATEGORY_CODE";
public static final String EQU_LIST_CODE = "equListCode";
public static final String EQU_CATEGORY_CODE = "equCategoryCode";
public static final String EQUIP_INFO = "equipInfo";
public static final String PROJECT_CONTRAPTION_ID = "projectContraptionId";
public static final String PRODUCT_PHOTO = "PRODUCT_PHOTO";
......@@ -527,7 +527,11 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
}
// 申请单业务主键seq
long sequenceNbr = sequence.nextId();
Long sequenceNbr = Optional.ofNullable(jsonObject.get("sequenceNbr"))
.map(Object::toString)
.filter(str -> !str.trim().isEmpty())
.map(Long::valueOf)
.orElseGet(sequence::nextId);
// 启动工作流
List<WorkflowResultDto> workflowResultList = this.startWorkFlow(model.getReceiveCompanyCode(), submitType, applyNoList.get(0));
CompanyBo companyBo = commonService.getOneCompany(model.getReceiveCompanyCode());
......
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/JgVehicleInformationServiceImpl.java
View file @ 662082ed
......@@ -351,7 +351,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
BeanUtils.copyProperties(vehicleInfoDto, vehicleInformation);
vehicleInformation.setCreateUserId(reginParams.getUserModel().getUserId());
vehicleInformation.setRegDate(new Date());
vehicleInformation.setUseDate(Optional.ofNullable(String.valueOf(map.get("useDate"))).orElse(""));
vehicleInformation.setUseDate(Objects.toString(map.get("useDate"),""));
vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName());
vehicleInformation.setGasNum(Optional.ofNullable(equipmentLists).map(List::size).orElse(0));
BigDecimal totalVolume = Optional.ofNullable(equipmentLists)
......
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