bugfix(jg):1、车用气瓶单位变更地址错误2、安装告知驳回附件丢失错误3、车用气瓶3级审批通过作废后设备状态未改完未纳管

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgInstallationNoticeController.java

@@ -8,23 +8,19 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
-import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -67,16 +63,9 @@ public class JgInstallationNoticeController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新安装告知", notes = "根据sequenceNbr更新安装告知")
     public ResponseModel<JgInstallationNoticeDto> updateBySequenceNbrJgInstallationNotice(@RequestParam String submitType, @RequestBody Map<String, Object> model, @RequestParam(value = "op", required = false) String op) {
         JgInstallationNoticeDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("installationInfo")), JgInstallationNoticeDto.class, true);
-       // installationInfo.setEquList(((LinkedHashMap<?, ?>) model.get("installationInfo")).get("equListDesc").toString());
         if (Objects.isNull(installationInfo)) {
             throw new IllegalArgumentException("参数installationInfo不能为空");
         }
-        Object o = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("proxyStatementAttachment");
-        Object o1 = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("installContractAttachment");
-        Object o2 = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("otherAccessories");
-        installationInfo.setProxyStatementAttachmentList((List<Map<String, Object>>) o);
-        installationInfo.setInstallContractAttachmentList((List<Map<String, Object>>) o1);
-        installationInfo.setOtherAccessoriesList((List<Map<String, Object>>) o2);
         return ResponseHelper.buildResponse(iJgInstallationNoticeService.updateInstallationNotice(submitType, installationInfo, op));
     }
 

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

@@ -513,6 +513,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         manage.setReceiveCompanyCode(jgChangeVehicleRegistrationUnit.getReceiveOrgCode());
         manage.setReceiveOrgName(jgChangeVehicleRegistrationUnit.getReceiveOrgName());
         manage.setAuditPassDate(new Date());
+        Map<String, Object> enterpriseInfo = commonService.getEnterpriseInfo(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
+        manage.setUseUnitAddress(String.valueOf(enterpriseInfo.get("address")));
         jgUseRegistrationManageService.updateById(manage);
         // 保存证流水信息
         jgCertificateChangeRecord.setUseRegistrationCode(manage.getUseRegistrationCode());
@@ -611,7 +613,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         dto.setFlowStatusLabel(jgChangeVehicleRegistrationUnit.getStatus());
         dto.setStartUserId(jgChangeVehicleRegistrationUnit.getCreateUserId());
         dto.setStartUser(jgChangeVehicleRegistrationUnit.getCreateUserName());
-        dto.setStartUserCompanyName(jgChangeVehicleRegistrationUnit.getCreateUserName());
+        dto.setStartUserCompanyName(jgChangeVehicleRegistrationUnit.getNewUseUnitName());
         dto.setStartDate(new Date());
         jgChangeVehicleRegistrationUnit.setInstanceId(workflowResultDto.getInstanceId());
         jgChangeVehicleRegistrationUnit.setNextExecutorIds(workflowResultDto.getNextExecutorRoleIds());

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

@@ -1429,6 +1429,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             esEquipmentCategoryDto.setEQU_STATE(null);
             esEquipmentCategoryDto.setORG_BRANCH_CODE(null);
             esEquipmentCategoryDto.setORG_BRANCH_NAME(null);
+            esEquipmentCategoryDto.setIS_INTO_MANAGEMENT(Boolean.FALSE);
             esEquipmentCategory.save(esEquipmentCategoryDto);
         }
     }
@@ -1472,6 +1473,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         updateWrapper.set(IdxBizJgUseInfo::getSafetyManagerId, null);
         updateWrapper.set(IdxBizJgUseInfo::getSafetyManager, null);
         updateWrapper.set(IdxBizJgUseInfo::getFactoryUseSiteStreet, null);
+        updateWrapper.set(IdxBizJgUseInfo::getIsIntoManagement, Boolean.FALSE);
         useInfoMapper.update(null, updateWrapper);
     }