特种设备代码更新

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/EquipmentInformMapper.xml

@@ -25,7 +25,8 @@
         ELSE
         ''
         END AS informStatus,
-        IFNULL(t.equipmentNum, 0) as equipmentNum
+        IFNULL(t.equipmentNum, 0) as equipmentNum,
+        a.process_id AS processId
         FROM
         tz_equipment_inform a
         LEFT JOIN (select count(e.sequence_nbr) as equipmentNum, e.inform_id from tcb_inform_equipment e GROUP BY e.inform_id ) t on t.inform_id = a.sequence_nbr
@@ -93,7 +94,8 @@
         ELSE
         ''
         END AS informStatus,
-        IFNULL(t.equipmentNum, 0) as equipmentNum
+        IFNULL(t.equipmentNum, 0) as equipmentNum,
+        a.process_id AS processId
         FROM
         tz_equipment_inform a
         LEFT JOIN (select count(e.sequence_nbr) as equipmentNum, e.inform_id from tcb_inform_equipment e GROUP BY e.inform_id ) t on t.inform_id = a.sequence_nbr

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/InformEquipmentController.java

@@ -113,7 +113,7 @@ public class InformEquipmentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除告知申请-设备信息表", notes = "根据sequenceNbr删除告知申请-设备信息表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+    public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr){
         return ResponseHelper.buildResponse(informEquipmentServiceImpl.update(new LambdaUpdateWrapper<InformEquipment>().eq(InformEquipment::getSequenceNbr,sequenceNbr).set(InformEquipment::getIsDelete,true)));
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/InformProcessInfoController.java

 package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.InformProcessInfo;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -18,13 +20,13 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
 /**
- * 通话记录附件
+ * 流程记录表
  *
  * @author system_generator
  * @date 2021-12-27
  */
 @RestController
-@Api(tags = "通话记录附件Api")
+@Api(tags = "流程记录表Api")
 @RequestMapping(value = "/inform-process-info")
 public class InformProcessInfoController extends BaseController {
 
@@ -32,56 +34,17 @@ public class InformProcessInfoController extends BaseController {
     InformProcessInfoServiceImpl informProcessInfoServiceImpl;
 
     /**
-     * 新增通话记录附件
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增通话记录附件", notes = "新增通话记录附件")
-	public ResponseModel<InformProcessInfoDto> save(@RequestBody InformProcessInfoDto model) {
-	    model = informProcessInfoServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
-
-	/**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新通话记录附件", notes = "根据sequenceNbr更新通话记录附件")
-	public ResponseModel<InformProcessInfoDto> updateBySequenceNbrInformProcessInfo(@RequestBody InformProcessInfoDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(informProcessInfoServiceImpl.updateWithModel(model));
-	}
-
-	/**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除通话记录附件", notes = "根据sequenceNbr删除通话记录附件")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(informProcessInfoServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
      * 根据sequenceNbr查询
      *
-	 * @param sequenceNbr  主键
+	 * @param processId  主键
      * @return
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个通话记录附件",  notes = "根据sequenceNbr查询单个通话记录附件")
-	public ResponseModel<InformProcessInfoDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(informProcessInfoServiceImpl.queryBySeq(sequenceNbr));
+	@GetMapping(value = "/{processId}")
+	@ApiOperation(httpMethod = "GET",value = "根据流程id查询相关流程信息",  notes = "根据流程id查询相关流程信息")
+	public ResponseModel<List<InformProcessInfo>> selectByProcessId(@PathVariable String processId) {
+		List<InformProcessInfo> result = informProcessInfoServiceImpl.list(new LambdaQueryWrapper<InformProcessInfo>().eq(InformProcessInfo::getProcessId,processId).eq(InformProcessInfo::getIsDelete,false).orderByDesc(InformProcessInfo::getRecDate));
+	    return ResponseHelper.buildResponse(result);
 	}
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitInfoController.java

@@ -164,6 +164,23 @@ public class UnitInfoController extends BaseController {
 		return ResponseHelper.buildResponse(flag);
 	}
 
+	/**
+	 * 判断组织机构是否存在
+	 *
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/hasExistUnit/{unitId}/{organizationCode}")
+	@ApiOperation(httpMethod = "GET", value = "判断组织机构是否存在-更新", notes = "判断组织机构是否存在-更新")
+	public ResponseModel<Boolean> hasExistUnitWithId( @PathVariable(value = "unitId") Long unitId,@PathVariable(value = "organizationCode") String organizationCode) {
+		Boolean flag = false;
+		UnitInfo temp = unitInfoServiceImpl.getOne(new LambdaQueryWrapper<UnitInfo>().eq(UnitInfo::getIsDelete,false).eq(UnitInfo::getOrganizationCode,organizationCode).ne(UnitInfo::getSequenceNbr,unitId));
+		if(temp != null) {
+			flag = true;
+		}
+		return ResponseHelper.buildResponse(flag);
+	}
+
 
 
 	/**
@@ -340,7 +357,7 @@ public class UnitInfoController extends BaseController {
 		}
 
 		if(!ValidationUtil.isEmpty(unitInfoDto.getUnitStatus())) {  // 审核状态
-			queryWrapper.like("unit_status",unitInfoDto.getUnitStatus());
+			queryWrapper.eq("unit_status",unitInfoDto.getUnitStatus());
 		}
 
 		if(!ValidationUtil.isEmpty(unitInfoDto.getLegalPerson())) {  // 法人
@@ -485,4 +502,36 @@ public class UnitInfoController extends BaseController {
 
 
 
+	/**
+	 * 列表分页查询
+	 *
+	 * @param pageNum  当前页
+	 * @param pageSize 每页大小
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/listPassed")
+	@ApiOperation(httpMethod = "GET", value = "企业审核列表查询-通过审核", notes = "企业审核列表查询-通过审核")
+	public ResponseModel<IPage<UnitInfoDto>> queryForPagePassed(String pageNum, String pageSize, String sort, UnitInfoDto unitInfoDto) {
+		unitInfoDto.setUnitStatus(1);
+		Page<UnitInfo> pageBean;
+		IPage<UnitInfo> page;
+		QueryWrapper<UnitInfo> unitInfoQueryWrapper = new QueryWrapper<UnitInfo>();
+
+		setQueryWrapper(unitInfoQueryWrapper, unitInfoDto, sort);
+
+		if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+			pageBean = new Page<>(0, Long.MAX_VALUE);
+		} else {
+			pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+		}
+		page = unitInfoServiceImpl.page(pageBean, unitInfoQueryWrapper);
+		int num= unitInfoServiceImpl.count(unitInfoQueryWrapper);
+		pageBean.setTotal(num);
+		IPage<UnitInfoDto> unitInfoVoIPage = BeanDtoVoUtils.unitInfoIPageDto(page);
+		return ResponseHelper.buildResponse(unitInfoVoIPage);
+	}
+
+
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitPersonController.java

@@ -192,14 +192,14 @@ public class UnitPersonController extends BaseController {
 	@GetMapping(value = "/listMyUnitPerson")
 	@ApiOperation(httpMethod = "GET",value = "企业端-根据当前登录人获取人员信息 带分页搜索",  notes = "企业端-根据当前登录人获取人员信息 带分页搜索")
 	public ResponseModel<Object> listMyUnitPerson(@RequestParam(required = false) Map<String, Object> requestBody)  {
-		List<Long> unitIds = getMyUnitList();
+		// 获取本人所在企业id  BUG4349
+		AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
+		CompanyModel userCompany = user.getCompanys().get(0);
 		List<Long> parentIds = new ArrayList<>();
-		unitIds.stream().forEach( id-> {
-			OrgUsr unit = iOrgUsrService.getOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete,false).eq(OrgUsr::getAmosOrgId,id));
-			if(unit != null) {
-				parentIds.add(unit.getSequenceNbr());
-			}
-		});
+		OrgUsr unit = iOrgUsrService.getOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete,false).eq(OrgUsr::getAmosOrgId,userCompany.getSequenceNbr()));
+		if(unit != null) {
+			parentIds.add(unit.getSequenceNbr());
+		}
 		if(parentIds.size() == 0) {
 			parentIds.add(-1l);
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/InformEquipmentServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
@@ -46,9 +47,21 @@ public class InformEquipmentServiceImpl extends BaseService<InformEquipmentDto,I
     @Transactional
     @Override
     public InformEquipmentDto saveInformEquipment(InformEquipmentDto model) {
+        InformEquipment tempEquipment = this.getById(model.getSourceEquipmentId());
         String address = model.getAddress();
         String latitude = model.getLatitude();
         String longitude = model.getLongitude();
+
+        if(tempEquipment != null) { // 已经存在不必再次保存直接返回
+
+            this.update(new LambdaUpdateWrapper<InformEquipment>().eq(InformEquipment::getSequenceNbr,tempEquipment.getSequenceNbr())
+                    .set(InformEquipment::getAddress,address).set(InformEquipment::getLatitude,latitude)
+            .set(InformEquipment::getLongitude,longitude));
+
+            return model;
+        }
+
+
         // 首先获取设备基本信息并复制
         Equipment sourceEquip = equipmentServiceImpl.getById(model.getSourceEquipmentId());
         BeanUtils.copyProperties(sourceEquip,model);

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/UnitPersonServiceImpl.java

@@ -358,12 +358,19 @@ public class UnitPersonServiceImpl  implements IUnitPersonService {
         personEducationServiceImpl.update(new LambdaUpdateWrapper<PersonEducation>().eq(PersonEducation::getPsersonId, sequenceNbr).set(PersonEducation::getIsDelete,true));
         // 删除 人员账号信息
         Boolean flag = false;
-        try {
-            Privilege.agencyUserClient.multDeleteUser(user.getAmosOrgId());
+
+        if(StringUtils.isNotBlank(user.getAmosOrgId())) { // 平台创建账号删除账号  BUG4347
+            try {
+                Privilege.agencyUserClient.multDeleteUser(user.getAmosOrgId());
+                flag = true;
+            } catch (InnerInvokException e) {
+                e.printStackTrace();
+            }
+        } else {
             flag = true;
-        } catch (InnerInvokException e) {
-            e.printStackTrace();
         }
+
+
         return flag;
     }